From da83517ab0bf8bb919e355133bfe335cab2f3c15 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 30 May 2024 01:32:49 +0200 Subject: [PATCH 01/13] home: hide ignore mode in tridactyl --- home/tridactylrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/tridactylrc b/home/tridactylrc index 7601c0e..9b74c6c 100644 --- a/home/tridactylrc +++ b/home/tridactylrc @@ -18,6 +18,8 @@ bind , nohlsearch " case insensitive if lowercase, case sensitive if using some uppercase letters set findcase smart +set modeindicatormodes {"ignore": "false"} + " New reddit is bad " autocmd DocStart ^http(s?)://www.reddit.com js tri.excmds.urlmodify("-t", "www", "old") From db03c81eeb76cd58168cfa2ff26628deaa66a0cd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 30 May 2024 01:54:19 +0200 Subject: [PATCH 02/13] flake: bump NixOS to 24.05 --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index b8ea09f..ed2a454 100644 --- a/flake.lock +++ b/flake.lock @@ -109,16 +109,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -189,16 +189,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716966868, + "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4f3c492..34faf67 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.11"; + ref = "nixos-24.05"; }; nixpkgs-unstable-small = { @@ -25,7 +25,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-23.11"; + ref = "release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From 8bfdb62a528edec8ac9c34434edf62f189375925 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 26 May 2024 23:40:55 +0200 Subject: [PATCH 03/13] base: update pinentry option --- base/gui-programs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/gui-programs.nix b/base/gui-programs.nix index b141890..e592fbf 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -23,7 +23,7 @@ in { programs.gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }; services = { From 0438a91039f6ae6218a2719a24273c0f1b1b2a06 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 30 May 2024 01:45:26 +0200 Subject: [PATCH 04/13] adapt displayManager options --- hosts/talos/default.nix | 4 ++-- modules/sddm.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 9da872c..16d0d00 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -148,11 +148,11 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; wayland.enable = true; }; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.displayManager.defaultSession = "plasmawayland"; services.xserver.desktopManager.plasma5.enable = true; services.power-profiles-daemon.enable = true; diff --git a/modules/sddm.nix b/modules/sddm.nix index ee50f5e..41941ba 100644 --- a/modules/sddm.nix +++ b/modules/sddm.nix @@ -15,7 +15,7 @@ in { options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup"; config = mkIf cfg.enable { - services.xserver.displayManager.sddm = { + services.displayManager.sddm = { enable = true; theme = "sugar-candy"; }; From 3225652d575492a2019aeac7e36e49bfef3a8dc1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 30 May 2024 01:45:57 +0200 Subject: [PATCH 05/13] adapt xserver options --- base/gui-programs.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/gui-programs.nix b/base/gui-programs.nix index e592fbf..7431a12 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -34,13 +34,16 @@ in { if config.my.gui.isNvidia then ["nvidia"] else options.services.xserver.videoDrivers.default; - layout = "fr"; - xkbVariant = "us"; - libinput = { - enable = true; - touchpad = { - naturalScrolling = true; - }; + xkb = { + layout = "fr"; + variant = "us"; + }; + }; + + libinput = { + enable = true; + touchpad = { + naturalScrolling = true; }; }; From b7dc2ce532b6cfb5638a32fcfcafa29bd272b656 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 30 May 2024 13:08:30 +0200 Subject: [PATCH 06/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/8cb01a0e717311680e0cbca06a76cbceba6f3ed6' (2024-02-13) → 'github:ryantm/agenix/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9' (2024-05-24) • Updated input 'disko': 'github:nix-community/disko/611c9ea53250f7bb22286b3d26872280a0e608f9' (2024-04-01) → 'github:nix-community/disko/8ea5bcccc03111bdedaeaae9380dfab61e9deb33' (2024-05-30) • Updated input 'disko/nixpkgs': 'github:NixOS/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29) → 'github:NixOS/nixpkgs/4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4' (2024-05-28) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25) → 'github:NixOS/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009' (2024-05-29) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/8bea75f6bdceecb9a349e7425ae2ca5c91c01b9c' (2024-04-01) → 'github:NixOS/nixpkgs/1f1bda965c8e6e19d7656caf4821632b7e77d317' (2024-05-29) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index ed2a454..edb0d7a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1717032306, + "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1711983799, - "narHash": "sha256-Wo9rOsVxGIMcLmFilSai2Fi7kN50doxsuksoTIXPytI=", + "lastModified": 1717011309, + "narHash": "sha256-VKnhQoXMNqX6uOUSKTsmRVBWz+TbTaz1nejq4oTN0z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bea75f6bdceecb9a349e7425ae2ca5c91c01b9c", + "rev": "1f1bda965c8e6e19d7656caf4821632b7e77d317", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1716914467, + "narHash": "sha256-KkT6YM/yNQqirtYj/frn6RRakliB8RDvGqVGGaNhdcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "4a3fc4cf736b7d2d288d7a8bf775ac8d4c0920b4", "type": "github" }, "original": { From 29a0fa6a253e38c6c1458ae69ab4a8ceee9c645e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 31 May 2024 16:16:21 +0200 Subject: [PATCH 07/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8' (2024-05-29) → 'github:NixOS/nixpkgs/d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8' (2024-05-30) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index edb0d7a..0497e98 100644 --- a/flake.lock +++ b/flake.lock @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716966868, - "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", + "lastModified": 1717090882, + "narHash": "sha256-Up5tvtY9YlVEyVn9hfZcxFQi5qVhQ5hdVNGPQOUchNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", + "rev": "d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8", "type": "github" }, "original": { From 19dcc7ea01e037530b42cbdbe32b21fb760b3429 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 4 Jun 2024 15:00:28 +0200 Subject: [PATCH 08/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8' (2024-05-30) → 'github:NixOS/nixpkgs/b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1' (2024-06-01) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0497e98..e0f24e3 100644 --- a/flake.lock +++ b/flake.lock @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717090882, - "narHash": "sha256-Up5tvtY9YlVEyVn9hfZcxFQi5qVhQ5hdVNGPQOUchNw=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { From 6b7f821e7db7836972d12ae461bd78a7b7f57268 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 4 Jun 2024 16:53:37 +0200 Subject: [PATCH 09/13] talos: switch to Plasma 6 --- hosts/talos/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 16d0d00..f2def3e 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -152,8 +152,7 @@ enable = true; wayland.enable = true; }; - services.displayManager.defaultSession = "plasmawayland"; - services.xserver.desktopManager.plasma5.enable = true; + services.desktopManager.plasma6.enable = true; services.power-profiles-daemon.enable = true; environment.systemPackages = [ From f80fcd4a55ad59c31dc9a624b2caaf045fed08eb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 7 Jun 2024 09:49:57 +0200 Subject: [PATCH 10/13] talos: try out zed --- hosts/talos/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index f2def3e..5c28e33 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -157,6 +157,8 @@ environment.systemPackages = [ pkgs.framework-tool + + pkgs.zed-editor ]; #programs.hyprland.enable = true; From 6a4b7790fd7a8318c4d0bdd9833f4c86ce2101c6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 7 Jun 2024 15:32:24 +0200 Subject: [PATCH 11/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/1f1bda965c8e6e19d7656caf4821632b7e77d317' (2024-05-29) → 'github:NixOS/nixpkgs/bf3faad723ca984fc4ea95c1cee1d975a8ca2a28' (2024-06-07) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e0f24e3..4420824 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1717011309, - "narHash": "sha256-VKnhQoXMNqX6uOUSKTsmRVBWz+TbTaz1nejq4oTN0z4=", + "lastModified": 1717737457, + "narHash": "sha256-hqHp0W7ibfdu5DFc6EG3S3c+GSAbti7VUldFXSf/WiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f1bda965c8e6e19d7656caf4821632b7e77d317", + "rev": "bf3faad723ca984fc4ea95c1cee1d975a8ca2a28", "type": "github" }, "original": { From b8bb582c148e63b132b037421f9b14ce58a55cdb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 7 Jun 2024 15:34:58 +0200 Subject: [PATCH 12/13] talos: use unstable for zed --- hosts/talos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 5c28e33..4b4e7e9 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -158,7 +158,7 @@ environment.systemPackages = [ pkgs.framework-tool - pkgs.zed-editor + pkgs.unstable.zed-editor ]; #programs.hyprland.enable = true; From a3926692d44986a8665f9691a636bd11be632031 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 7 Jun 2024 15:35:17 +0200 Subject: [PATCH 13/13] talos: framework-tool is added by nixos-hardware --- hosts/talos/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/talos/default.nix b/hosts/talos/default.nix index 4b4e7e9..ede0970 100644 --- a/hosts/talos/default.nix +++ b/hosts/talos/default.nix @@ -156,8 +156,6 @@ services.power-profiles-daemon.enable = true; environment.systemPackages = [ - pkgs.framework-tool - pkgs.unstable.zed-editor ];