From bc623830e619cef86a2d3750625ffe4e24ea7e64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:44:28 +0200
Subject: [PATCH 001/546] ci: bump cachix/install-nix-action from 27 to 30

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 27 to 30.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v27...v30)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/github_pages.yml | 2 +-
 .github/workflows/test.yml         | 2 +-
 .github/workflows/update-flake.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 9f49d49a8..4e10f9ccb 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
+    - uses: cachix/install-nix-action@v30
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: cachix/cachix-action@v15
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99a2f5a1a..ff67b6760 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
+    - uses: cachix/install-nix-action@v30
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - run: |
diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml
index ba9b5f818..9b0e4b443 100644
--- a/.github/workflows/update-flake.yml
+++ b/.github/workflows/update-flake.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v24
         with:

From fcf5e608ac65f64463bc0ccc5ea86f2170f20689 Mon Sep 17 00:00:00 2001
From: MithicSpirit <rpc01234@gmail.com>
Date: Mon, 7 Oct 2024 06:18:19 -0400
Subject: [PATCH 002/546] kitty: allow float values in settings (#5925)

Some settings in kitty allow floating-point values, but this was not
reflected in the type.
---
 modules/programs/kitty.nix                                  | 4 ++--
 tests/modules/programs/kitty/example-settings-expected.conf | 1 +
 tests/modules/programs/kitty/example-settings.nix           | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index e9594ec12..9854fe69c 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.programs.kitty;
 
-  eitherStrBoolInt = with types; either str (either bool int);
+  settingsValueType = with types; oneOf [ str bool int float ];
 
   optionalPackage = opt:
     optional (opt != null && opt.package != null) opt.package;
@@ -102,7 +102,7 @@ in {
     };
 
     settings = mkOption {
-      type = types.attrsOf eitherStrBoolInt;
+      type = types.attrsOf settingsValueType;
       default = { };
       example = literalExpression ''
         {
diff --git a/tests/modules/programs/kitty/example-settings-expected.conf b/tests/modules/programs/kitty/example-settings-expected.conf
index aca1b0c18..41a9cb772 100644
--- a/tests/modules/programs/kitty/example-settings-expected.conf
+++ b/tests/modules/programs/kitty/example-settings-expected.conf
@@ -7,6 +7,7 @@ font_size 8
 # Shell integration is sourced and configured manually
 shell_integration no-rc
 
+background_opacity 0.500000
 enable_audio_bell no
 scrollback_lines 10000
 update_check_interval 0
diff --git a/tests/modules/programs/kitty/example-settings.nix b/tests/modules/programs/kitty/example-settings.nix
index 8d609a5ab..8f2e0b894 100644
--- a/tests/modules/programs/kitty/example-settings.nix
+++ b/tests/modules/programs/kitty/example-settings.nix
@@ -17,6 +17,7 @@ with lib;
         scrollback_lines = 10000;
         enable_audio_bell = false;
         update_check_interval = 0;
+        background_opacity = 0.5;
       };
 
       font.name = "DejaVu Sans";

From 3ac39b2a8b7cbfc0f96628d8a84867c885bc988b Mon Sep 17 00:00:00 2001
From: Akshett Rai Jindal <akshett.jindal@research.iiit.ac.in>
Date: Mon, 7 Oct 2024 18:46:25 +0530
Subject: [PATCH 003/546] zathura: Fix the type for config options (#5934)

* zathura: add float to acceptable types for `options` attrset

The man page states that the `set` directive can take 4 types of values:
INT, FLOAT, STRING, BOOL. But the FLOAT part was missing from the
home-manager module

* zathura: make type of `programs.zathura.options` more readable

Change from cascading mess of `either` to `oneOf`
---
 modules/programs/zathura.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/zathura.nix b/modules/programs/zathura.nix
index ba34af590..3e41256d3 100644
--- a/modules/programs/zathura.nix
+++ b/modules/programs/zathura.nix
@@ -31,7 +31,7 @@ in {
 
     options = mkOption {
       default = { };
-      type = with types; attrsOf (either str (either bool int));
+      type = with types; attrsOf (oneOf [ str bool int float ]);
       description = ''
         Add {option}`:set` command options to zathura and make
         them permanent. See

From 271c83e21ea81f39a42ad128384e0e6804956a88 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 7 Oct 2024 17:06:52 -0400
Subject: [PATCH 004/546] firefox: organize tests by submodule (#5698)

Split off from #5697, organizes firefox tests by submodule.

This is intended to match directory structure setup for the new search submodule.
---
 tests/modules/programs/firefox/firefox.nix    |  15 +-
 .../programs/firefox/profile-settings.nix     | 215 ------------------
 .../firefox/profiles/bookmarks/default.nix    |  84 +++++++
 .../bookmarks/expected-bookmarks-user.js}     |   0
 .../bookmarks/expected-bookmarks.html}        |   0
 .../firefox/profiles/containers/default.nix   |  32 +++
 .../containers/duplicate-ids.nix}             |   2 +-
 .../containers/expected-containers.json}      |   2 +-
 .../containers/id-out-of-range.nix}           |   2 +-
 .../duplicate-ids.nix}                        |   2 +-
 .../firefox/profiles/search/default.nix       | 112 +++++++++
 .../expected-search-without-default.json}     |   0
 .../search/expected-search.json}              |   0
 .../firefox/profiles/settings/default.nix     |  43 ++++
 .../settings/expected-user.js}                |   0
 15 files changed, 285 insertions(+), 224 deletions(-)
 delete mode 100644 tests/modules/programs/firefox/profile-settings.nix
 create mode 100644 tests/modules/programs/firefox/profiles/bookmarks/default.nix
 rename tests/modules/programs/firefox/{profile-settings-expected-bookmarks-user.js => profiles/bookmarks/expected-bookmarks-user.js} (100%)
 rename tests/modules/programs/firefox/{profile-settings-expected-bookmarks.html => profiles/bookmarks/expected-bookmarks.html} (100%)
 create mode 100644 tests/modules/programs/firefox/profiles/containers/default.nix
 rename tests/modules/programs/firefox/{duplicate-container-ids.nix => profiles/containers/duplicate-ids.nix} (90%)
 rename tests/modules/programs/firefox/{profile-settings-expected-containers.json => profiles/containers/expected-containers.json} (66%)
 rename tests/modules/programs/firefox/{container-id-out-of-range.nix => profiles/containers/id-out-of-range.nix} (86%)
 rename tests/modules/programs/firefox/{duplicate-profile-ids.nix => profiles/duplicate-ids.nix} (87%)
 create mode 100644 tests/modules/programs/firefox/profiles/search/default.nix
 rename tests/modules/programs/firefox/{profile-settings-expected-search-without-default.json => profiles/search/expected-search-without-default.json} (100%)
 rename tests/modules/programs/firefox/{profile-settings-expected-search.json => profiles/search/expected-search.json} (100%)
 create mode 100644 tests/modules/programs/firefox/profiles/settings/default.nix
 rename tests/modules/programs/firefox/{profile-settings-expected-user.js => profiles/settings/expected-user.js} (100%)

diff --git a/tests/modules/programs/firefox/firefox.nix b/tests/modules/programs/firefox/firefox.nix
index 6598d6ec2..6d92a5f49 100644
--- a/tests/modules/programs/firefox/firefox.nix
+++ b/tests/modules/programs/firefox/firefox.nix
@@ -1,11 +1,16 @@
 let name = "firefox";
 
 in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
-  "${name}-profile-settings" = ./profile-settings.nix;
-  "${name}-state-version-19_09" = ./state-version-19_09.nix;
   "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
-  "${name}-duplicate-profile-ids" = ./duplicate-profile-ids.nix;
-  "${name}-duplicate-container-ids" = ./duplicate-container-ids.nix;
-  "${name}-container-id-out-of-range" = ./container-id-out-of-range.nix;
   "${name}-policies" = ./policies.nix;
+  "${name}-profiles-bookmarks" = ./profiles/bookmarks;
+  "${name}-profiles-containers" = ./profiles/containers;
+  "${name}-profiles-containers-duplicate-ids" =
+    ./profiles/containers/duplicate-ids.nix;
+  "${name}-profiles-containers-id-out-of-range" =
+    ./profiles/containers/id-out-of-range.nix;
+  "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profiles-search" = ./profiles/search;
+  "${name}-profiles-settings" = ./profiles/settings;
+  "${name}-state-version-19_09" = ./state-version-19_09.nix;
 }
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
deleted file mode 100644
index d7776eb4f..000000000
--- a/tests/modules/programs/firefox/profile-settings.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
-in {
-  imports = [ firefoxMockOverlay ];
-
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
-    enable = true;
-    profiles.basic.isDefault = true;
-
-    profiles.test = {
-      id = 1;
-      settings = {
-        "general.smoothScroll" = false;
-        "browser.newtabpage.pinned" = [{
-          title = "NixOS";
-          url = "https://nixos.org";
-        }];
-      };
-    };
-
-    profiles.bookmarks = {
-      id = 2;
-      settings = { "general.smoothScroll" = false; };
-      bookmarks = [
-        {
-          toolbar = true;
-          bookmarks = [{
-            name = "Home Manager";
-            url = "https://wiki.nixos.org/wiki/Home_Manager";
-          }];
-        }
-        {
-          name = "wikipedia";
-          tags = [ "wiki" ];
-          keyword = "wiki";
-          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
-        }
-        {
-          name = "kernel.org";
-          url = "https://www.kernel.org";
-        }
-        {
-          name = "Nix sites";
-          bookmarks = [
-            {
-              name = "homepage";
-              url = "https://nixos.org/";
-            }
-            {
-              name = "wiki";
-              tags = [ "wiki" "nix" ];
-              url = "https://wiki.nixos.org/";
-            }
-            {
-              name = "Nix sites";
-              bookmarks = [
-                {
-                  name = "homepage";
-                  url = "https://nixos.org/";
-                }
-                {
-                  name = "wiki";
-                  url = "https://wiki.nixos.org/";
-                }
-              ];
-            }
-          ];
-        }
-      ];
-    };
-
-    profiles.search = {
-      id = 3;
-      search = {
-        force = true;
-        default = "Google";
-        privateDefault = "DuckDuckGo";
-        order = [ "Nix Packages" "NixOS Wiki" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            icon =
-              "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-
-            definedAliases = [ "@np" ];
-          };
-
-          "NixOS Wiki" = {
-            urls = [{
-              template =
-                "https://wiki.nixos.org/index.php?search={searchTerms}";
-            }];
-            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-            updateInterval = 24 * 60 * 60 * 1000;
-            definedAliases = [ "@nw" ];
-          };
-
-          "Bing".metaData.hidden = true;
-          "Google".metaData.alias = "@g";
-        };
-      };
-    };
-
-    profiles.searchWithoutDefault = {
-      id = 4;
-      search = {
-        force = true;
-        order = [ "Google" "Nix Packages" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            definedAliases = [ "@np" ];
-          };
-        };
-      };
-    };
-
-    profiles.containers = {
-      id = 5;
-      containers = {
-        "shopping" = {
-          id = 6;
-          icon = "circle";
-          color = "yellow";
-        };
-      };
-    };
-  } // {
-
-    nmt.script = ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-
-      assertDirectoryExists home-files/${cfg.configPath}/basic
-
-      assertFileContent \
-        home-files/${cfg.configPath}/test/user.js \
-        ${./profile-settings-expected-user.js}
-
-      assertFileContent \
-        home-files/${cfg.configPath}/containers/containers.json \
-        ${./profile-settings-expected-containers.json}
-
-      bookmarksUserJs=$(normalizeStorePaths \
-        home-files/${cfg.configPath}/bookmarks/user.js)
-
-      assertFileContent \
-        $bookmarksUserJs \
-        ${./profile-settings-expected-bookmarks-user.js}
-
-      bookmarksFile="$(sed -n \
-        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
-        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
-
-      assertFileContent \
-        $bookmarksFile \
-        ${./profile-settings-expected-bookmarks.html}
-
-      function assertFirefoxSearchContent() {
-        compressedSearch=$(normalizeStorePaths "$1")
-
-        decompressedSearch=$(dirname $compressedSearch)/search.json
-        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq . > "$decompressedSearch")
-
-        assertFileContent \
-          $decompressedSearch \
-          "$2"
-      }
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/search/search.json.mozlz4 \
-        ${./profile-settings-expected-search.json}
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
-        ${./profile-settings-expected-search-without-default.json}
-    '';
-  });
-}
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
new file mode 100644
index 000000000..7bf508ab0
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -0,0 +1,84 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.bookmarks = {
+      settings = { "general.smoothScroll" = false; };
+      bookmarks = [
+        {
+          toolbar = true;
+          bookmarks = [{
+            name = "Home Manager";
+            url = "https://wiki.nixos.org/wiki/Home_Manager";
+          }];
+        }
+        {
+          name = "wikipedia";
+          tags = [ "wiki" ];
+          keyword = "wiki";
+          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+        }
+        {
+          name = "kernel.org";
+          url = "https://www.kernel.org";
+        }
+        {
+          name = "Nix sites";
+          bookmarks = [
+            {
+              name = "homepage";
+              url = "https://nixos.org/";
+            }
+            {
+              name = "wiki";
+              tags = [ "wiki" "nix" ];
+              url = "https://wiki.nixos.org/";
+            }
+            {
+              name = "Nix sites";
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  url = "https://wiki.nixos.org/";
+                }
+              ];
+            }
+          ];
+        }
+      ];
+    };
+  } // {
+    nmt.script = ''
+      bookmarksUserJs=$(normalizeStorePaths \
+        home-files/${cfg.configPath}/bookmarks/user.js)
+
+      assertFileContent \
+        $bookmarksUserJs \
+        ${./expected-bookmarks-user.js}
+
+      bookmarksFile="$(sed -n \
+        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
+        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
+
+      assertFileContent \
+        $bookmarksFile \
+        ${./expected-bookmarks.html}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks-user.js b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-bookmarks-user.js
rename to tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
diff --git a/tests/modules/programs/firefox/profile-settings-expected-bookmarks.html b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks.html
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
rename to tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks.html
diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix
new file mode 100644
index 000000000..6a0d9e93f
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/containers/default.nix
@@ -0,0 +1,32 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.containers = {
+      containers = {
+        "shopping" = {
+          icon = "circle";
+          color = "yellow";
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileContent \
+        home-files/${cfg.configPath}/containers/containers.json \
+        ${./expected-containers.json}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/duplicate-container-ids.nix b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
similarity index 90%
rename from tests/modules/programs/firefox/duplicate-container-ids.nix
rename to tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
index 2ad99b4b7..a60522165 100644
--- a/tests/modules/programs/firefox/duplicate-container-ids.nix
+++ b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/profile-settings-expected-containers.json b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
similarity index 66%
rename from tests/modules/programs/firefox/profile-settings-expected-containers.json
rename to tests/modules/programs/firefox/profiles/containers/expected-containers.json
index 8eea55558..d957b0c50 100644
--- a/tests/modules/programs/firefox/profile-settings-expected-containers.json
+++ b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
@@ -1 +1 @@
-{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":6},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":6,"version":4}
+{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":0},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":0,"version":4}
diff --git a/tests/modules/programs/firefox/container-id-out-of-range.nix b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
similarity index 86%
rename from tests/modules/programs/firefox/container-id-out-of-range.nix
rename to tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
index 2ea08e880..f39666723 100644
--- a/tests/modules/programs/firefox/container-id-out-of-range.nix
+++ b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
@@ -5,7 +5,7 @@ with lib;
 
 let
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/duplicate-profile-ids.nix b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
similarity index 87%
rename from tests/modules/programs/firefox/duplicate-profile-ids.nix
rename to tests/modules/programs/firefox/profiles/duplicate-ids.nix
index ad946af10..dc5557b47 100644
--- a/tests/modules/programs/firefox/duplicate-profile-ids.nix
+++ b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix
new file mode 100644
index 000000000..8a4c98e9b
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/search/default.nix
@@ -0,0 +1,112 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles = {
+      search = {
+        id = 0;
+        search = {
+          force = true;
+          default = "Google";
+          privateDefault = "DuckDuckGo";
+          order = [ "Nix Packages" "NixOS Wiki" ];
+          engines = {
+            "Nix Packages" = {
+              urls = [{
+                template = "https://search.nixos.org/packages";
+                params = [
+                  {
+                    name = "type";
+                    value = "packages";
+                  }
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }];
+
+              icon =
+                "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+
+              definedAliases = [ "@np" ];
+            };
+
+            "NixOS Wiki" = {
+              urls = [{
+                template =
+                  "https://wiki.nixos.org/index.php?search={searchTerms}";
+              }];
+              iconUpdateURL = "https://wiki.nixos.org/favicon.png";
+              updateInterval = 24 * 60 * 60 * 1000;
+              definedAliases = [ "@nw" ];
+            };
+
+            "Bing".metaData.hidden = true;
+            "Google".metaData.alias = "@g";
+          };
+        };
+      };
+
+      searchWithoutDefault = {
+        id = 1;
+        search = {
+          force = true;
+          order = [ "Google" "Nix Packages" ];
+          engines = {
+            "Nix Packages" = {
+              urls = [{
+                template = "https://search.nixos.org/packages";
+                params = [
+                  {
+                    name = "type";
+                    value = "packages";
+                  }
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }];
+
+              definedAliases = [ "@np" ];
+            };
+          };
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      function assertFirefoxSearchContent() {
+        compressedSearch=$(normalizeStorePaths "$1")
+
+        decompressedSearch=$(dirname $compressedSearch)/search.json
+        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq . > "$decompressedSearch")
+
+        assertFileContent \
+          $decompressedSearch \
+          "$2"
+      }
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/search/search.json.mozlz4 \
+        ${./expected-search.json}
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
+        ${./expected-search-without-default.json}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-search-without-default.json b/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-search-without-default.json
rename to tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
diff --git a/tests/modules/programs/firefox/profile-settings-expected-search.json b/tests/modules/programs/firefox/profiles/search/expected-search.json
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-search.json
rename to tests/modules/programs/firefox/profiles/search/expected-search.json
diff --git a/tests/modules/programs/firefox/profiles/settings/default.nix b/tests/modules/programs/firefox/profiles/settings/default.nix
new file mode 100644
index 000000000..39d329ece
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/settings/default.nix
@@ -0,0 +1,43 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles = {
+      basic.isDefault = true;
+      test = {
+        id = 1;
+        settings = {
+          "general.smoothScroll" = false;
+          "browser.newtabpage.pinned" = [{
+            title = "NixOS";
+            url = "https://nixos.org";
+          }];
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileRegex \
+        home-path/bin/${cfg.wrappedPackageName} \
+        MOZ_APP_LAUNCHER
+
+      assertDirectoryExists home-files/${cfg.configPath}/basic
+
+      assertFileContent \
+        home-files/${cfg.configPath}/test/user.js \
+        ${./expected-user.js}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profile-settings-expected-user.js b/tests/modules/programs/firefox/profiles/settings/expected-user.js
similarity index 100%
rename from tests/modules/programs/firefox/profile-settings-expected-user.js
rename to tests/modules/programs/firefox/profiles/settings/expected-user.js

From 038630363e7de57c36c417fd2f5d7c14773403e4 Mon Sep 17 00:00:00 2001
From: Timothy Gallion <timbama@gmail.com>
Date: Mon, 7 Oct 2024 17:39:24 -0400
Subject: [PATCH 005/546] xdg-mime type package options (#5920)

* xdg-mime: allow overrides to shared-mime-info and desktop-file-utils

The `xdg-mime` module now exposes packages to determine what will be run
for update-mime-database and update-desktop-database. This allows users
to select a different version of these packages if the are incompatible.
This should, in combination with an override to the version of
`shared-mime-info` (can be found here notalltim/home-manager-config#4),
resolve #4955, #5102, #4682, and possibly #4941. The problem seems to stem
from a mismatch in the version of `shared-mime-info` with the host.

I also switched from using `buildPackages` to `pkgs` to improve
cross-compilation compatibility.

* xdg-mime: Add tests for xdg-mime module

The xdg-mime module was missing tests so I added basic test for all the
options and checked the basic behavior. It covers ensuring that the
proper files/folders are created and that the package overrides work.
---
 modules/misc/xdg-mime.nix                  | 55 ++++++++++++++--------
 tests/modules/misc/xdg/default.nix         |  3 ++
 tests/modules/misc/xdg/mime-disabled.nix   | 10 ++++
 tests/modules/misc/xdg/mime-expected.cache |  3 ++
 tests/modules/misc/xdg/mime-packages.nix   | 38 +++++++++++++++
 tests/modules/misc/xdg/mime.nix            | 24 ++++++++++
 6 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 tests/modules/misc/xdg/mime-disabled.nix
 create mode 100644 tests/modules/misc/xdg/mime-expected.cache
 create mode 100644 tests/modules/misc/xdg/mime-packages.nix
 create mode 100644 tests/modules/misc/xdg/mime.nix

diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg-mime.nix
index 09f62aaff..78b569fa5 100644
--- a/modules/misc/xdg-mime.nix
+++ b/modules/misc/xdg-mime.nix
@@ -5,33 +5,50 @@ with lib;
 let
 
   cfg = config.xdg.mime;
+  inherit (lib) getExe getExe';
 
 in {
   options = {
-    xdg.mime.enable = mkOption {
-      type = types.bool;
-      default = pkgs.stdenv.hostPlatform.isLinux;
-      defaultText =
-        literalExpression "true if host platform is Linux, false otherwise";
-      description = ''
-        Whether to install programs and files to support the
-        XDG Shared MIME-info specification and XDG MIME Applications
-        specification at
-        <https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html>
-        and
-        <https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html>,
-        respectively.
-      '';
+    xdg.mime = {
+      enable = mkOption {
+        type = types.bool;
+        default = pkgs.stdenv.hostPlatform.isLinux;
+        defaultText =
+          literalExpression "true if host platform is Linux, false otherwise";
+        description = ''
+          Whether to install programs and files to support the
+          XDG Shared MIME-info specification and XDG MIME Applications
+          specification at
+          <https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html>
+          and
+          <https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html>,
+          respectively.
+        '';
+      };
+
+      sharedMimeInfoPackage = mkOption {
+        type = types.package;
+        default = pkgs.shared-mime-info;
+        defaultText = literalExpression "pkgs.shared-mime-info";
+        description = "The package to use when running update-mime-database.";
+      };
+
+      desktopFileUtilsPackage = mkOption {
+        type = types.package;
+        default = pkgs.desktop-file-utils;
+        defaultText = literalExpression "pkgs.desktop-file-utils";
+        description =
+          "The package to use when running update-desktop-database.";
+      };
     };
   };
-
-  config = mkIf config.xdg.mime.enable {
+  config = mkIf cfg.enable {
     assertions =
       [ (hm.assertions.assertPlatform "xdg.mime" pkgs platforms.linux) ];
 
     home.packages = [
       # Explicitly install package to provide basic mime types.
-      pkgs.shared-mime-info
+      cfg.sharedMimeInfoPackage
 
       # Make sure the target directories will be real directories.
       (pkgs.runCommandLocal "dummy-xdg-mime-dirs1" { } ''
@@ -46,12 +63,12 @@ in {
       if [[ -w $out/share/mime && -w $out/share/mime/packages && -d $out/share/mime/packages ]]; then
         XDG_DATA_DIRS=$out/share \
         PKGSYSTEM_ENABLE_FSYNC=0 \
-        ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database \
+        ${getExe cfg.sharedMimeInfoPackage} \
           -V $out/share/mime > /dev/null
       fi
 
       if [[ -w $out/share/applications ]]; then
-        ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database \
+        ${getExe' cfg.desktopFileUtilsPackage "update-desktop-database"} \
           $out/share/applications
       fi
     '';
diff --git a/tests/modules/misc/xdg/default.nix b/tests/modules/misc/xdg/default.nix
index bc2f9a9df..87f74e22f 100644
--- a/tests/modules/misc/xdg/default.nix
+++ b/tests/modules/misc/xdg/default.nix
@@ -6,4 +6,7 @@
   xdg-default-locations = ./default-locations.nix;
   xdg-user-dirs-null = ./user-dirs-null.nix;
   xdg-portal = ./portal.nix;
+  xdg-mime = ./mime.nix;
+  xdg-mime-disabled = ./mime-disabled.nix;
+  xdg-mime-package = ./mime-packages.nix;
 }
diff --git a/tests/modules/misc/xdg/mime-disabled.nix b/tests/modules/misc/xdg/mime-disabled.nix
new file mode 100644
index 000000000..a3df63091
--- /dev/null
+++ b/tests/modules/misc/xdg/mime-disabled.nix
@@ -0,0 +1,10 @@
+{ ... }: {
+  config = {
+    xdg.mime.enable = false;
+    nmt.script = ''
+      # assert that neither application is run
+      assertPathNotExists home-path/share/applications/mimeinfo.cache
+      assertPathNotExists home-path/share/applications/mime
+    '';
+  };
+}
diff --git a/tests/modules/misc/xdg/mime-expected.cache b/tests/modules/misc/xdg/mime-expected.cache
new file mode 100644
index 000000000..6907f8f88
--- /dev/null
+++ b/tests/modules/misc/xdg/mime-expected.cache
@@ -0,0 +1,3 @@
+[MIME Cache]
+text/html=mime-test.desktop;
+text/xml=mime-test.desktop;
diff --git a/tests/modules/misc/xdg/mime-packages.nix b/tests/modules/misc/xdg/mime-packages.nix
new file mode 100644
index 000000000..0eaaddcec
--- /dev/null
+++ b/tests/modules/misc/xdg/mime-packages.nix
@@ -0,0 +1,38 @@
+{ config, ... }:
+let inherit (config.lib.test) mkStubPackage;
+in {
+  config = {
+    xdg.mime.enable = true;
+    xdg.mime.sharedMimeInfoPackage = mkStubPackage {
+      name = "update-mime-database";
+      buildScript = ''
+        mkdir -p $out/bin
+        echo '#!/bin/sh' > $out/bin/update-mime-database
+        echo 'mkdir -p $out/share/mime && touch $out/share/mime/mime.cache' >> $out/bin/update-mime-database
+        chmod +x $out/bin/update-mime-database
+      '';
+    };
+    xdg.mime.desktopFileUtilsPackage = mkStubPackage {
+      name = "desktop-file-utils";
+      buildScript = ''
+        mkdir -p $out/bin
+        echo '#!/bin/sh' > $out/bin/update-desktop-database
+        echo 'mkdir -p $out/share/applications/ && ln -s ${
+          ./mime-expected.cache
+        } $out/share/applications/mimeinfo.cache' >> $out/bin/update-desktop-database
+        chmod +x $out/bin/update-desktop-database
+      '';
+    };
+    nmt.script = ''
+      assertFileExists home-path/share/applications/mimeinfo.cache # Check that update-desktop-database created file
+      # Check that update-desktop-database file matches expected
+      assertFileContent \
+      home-path/share/applications/mimeinfo.cache \
+        ${./mime-expected.cache}
+
+      assertDirectoryExists home-path/share/mime # Check that update-mime-database created directory
+      assertFileExists home-path/share/mime/mime.cache # Check that update-mime-database created file
+
+    '';
+  };
+}
diff --git a/tests/modules/misc/xdg/mime.nix b/tests/modules/misc/xdg/mime.nix
new file mode 100644
index 000000000..90d21d567
--- /dev/null
+++ b/tests/modules/misc/xdg/mime.nix
@@ -0,0 +1,24 @@
+{ ... }: {
+  config = {
+    xdg.mime.enable = true;
+    xdg.desktopEntries = {
+      mime-test = { # mime info test
+        name = "mime-test";
+        mimeType = [ "text/html" "text/xml" ];
+      };
+
+    };
+
+    nmt.script = ''
+      assertFileExists home-path/share/applications/mimeinfo.cache # Check that update-desktop-database created file
+      # Check that update-desktop-database file matches expected
+      assertFileContent \
+        home-path/share/applications/mimeinfo.cache \
+        ${./mime-expected.cache}
+
+      assertDirectoryExists home-path/share/mime # Check that update-mime-database created directory
+      assertDirectoryNotEmpty home-path/share/mime # Check that update-mime-database created files
+
+    '';
+  };
+}

From d3ee25c07848725e924a74a4813de2ad0f5d0878 Mon Sep 17 00:00:00 2001
From: Utkarsh Sharma <utkasharma19@gmail.com>
Date: Wed, 9 Oct 2024 16:31:58 +0200
Subject: [PATCH 006/546] Translate using Weblate (Hindi)

Currently translated at 5.5% (1 of 18 strings)

Translate using Weblate (Hindi)

Currently translated at 13.5% (5 of 37 strings)

Co-authored-by: Utkarsh Sharma <utkasharma19@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/hi/
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/hi/
Translation: Home Manager/Home Manager CLI
Translation: Home Manager/Home Manager Modules
---
 home-manager/po/hi.po |  8 ++++----
 modules/po/hi.po      | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/home-manager/po/hi.po b/home-manager/po/hi.po
index 43d873123..3921eff11 100644
--- a/home-manager/po/hi.po
+++ b/home-manager/po/hi.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-09-13 03:09+0000\n"
-"Last-Translator: Jay Thomas <jay@gfax.ch>\n"
+"PO-Revision-Date: 2024-10-09 14:31+0000\n"
+"Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/cli/"
 "hi/>\n"
 "Language: hi\n"
@@ -22,11 +22,11 @@ msgstr ""
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: ‌%s के लिए कोई आर्ग्यूमेंट नहीं दिया"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
-msgstr ""
+msgstr "%s में कोई कन्फि़गरेशन फाइल नहीं मिली"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
diff --git a/modules/po/hi.po b/modules/po/hi.po
index 02a7f8528..80781aba5 100644
--- a/modules/po/hi.po
+++ b/modules/po/hi.po
@@ -8,13 +8,16 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2024-10-09 14:31+0000\n"
+"Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
+"Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/"
+"modules/hi/>\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.8-dev\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@@ -22,7 +25,7 @@ msgstr ""
 
 #: modules/files.nix:204
 msgid "Cleaning up orphan links from %s"
-msgstr ""
+msgstr "%s से ऑर्फे़न लिंक्स मिटाई जा रही है"
 
 #: modules/files.nix:220
 msgid "Creating profile generation %s"

From d47d33254fbf4fdbdee9f1f14095f689662e479d Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 10 Oct 2024 20:29:24 +0200
Subject: [PATCH 007/546] home-manager-manual: expose options.json

---
 docs/home-manager-manual.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/home-manager-manual.nix b/docs/home-manager-manual.nix
index 23b2d1e65..f87803962 100644
--- a/docs/home-manager-manual.nix
+++ b/docs/home-manager-manual.nix
@@ -59,5 +59,7 @@ in stdenv.mkDerivation {
     echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
   '';
 
+  passthru = { inherit home-manager-options; };
+
   meta = { maintainers = [ lib.maintainers.considerate ]; };
 }

From 8bb5d53c5847d9a9b2ad1bda49f9aa9df0de282a Mon Sep 17 00:00:00 2001
From: Andrew Voynov <37143421+Andrew15-5@users.noreply.github.com>
Date: Thu, 10 Oct 2024 22:22:52 +0300
Subject: [PATCH 008/546] docs: add XDG_*_HOME mentions to xdg.*Home options

---
 modules/misc/xdg.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index a47a33f56..b916e88fb 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -30,6 +30,8 @@ in {
       apply = toString;
       description = ''
         Absolute path to directory holding application caches.
+
+        Sets `XDG_CACHE_HOME` for the user if `xdg.enable` is set `true`.
       '';
     };
 
@@ -48,6 +50,8 @@ in {
       apply = toString;
       description = ''
         Absolute path to directory holding application configurations.
+
+        Sets `XDG_CONFIG_HOME` for the user if `xdg.enable` is set `true`.
       '';
     };
 
@@ -67,6 +71,8 @@ in {
       apply = toString;
       description = ''
         Absolute path to directory holding application data.
+
+        Sets `XDG_DATA_HOME` for the user if `xdg.enable` is set `true`.
       '';
     };
 
@@ -86,6 +92,8 @@ in {
       apply = toString;
       description = ''
         Absolute path to directory holding application states.
+
+        Sets `XDG_STATE_HOME` for the user if `xdg.enable` is set `true`.
       '';
     };
   };

From 03f8e0b3b3ca4f49d11bf0264dbff465d6ae9aae Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 11 Oct 2024 00:14:36 +0200
Subject: [PATCH 009/546] snixembed: add module

This is used by SafeEyes (another home-manager) module to show a
systemtray icon. See https://git.sr.ht/~steef/snixembed.

Fixes #5728
---
 modules/misc/news.nix                         | 12 +++++
 modules/modules.nix                           |  1 +
 modules/services/snixembed.nix                | 50 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../snixembed/basic-configuration.desktop     |  7 +++
 .../snixembed/basic-configuration.nix         | 16 ++++++
 .../snixembed/basic-configuration.service     | 14 ++++++
 tests/modules/services/snixembed/default.nix  |  1 +
 8 files changed, 102 insertions(+)
 create mode 100644 modules/services/snixembed.nix
 create mode 100644 tests/modules/services/snixembed/basic-configuration.desktop
 create mode 100644 tests/modules/services/snixembed/basic-configuration.nix
 create mode 100644 tests/modules/services/snixembed/basic-configuration.service
 create mode 100644 tests/modules/services/snixembed/default.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index f8786de2f..abd9957cb 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1748,6 +1748,18 @@ in {
           add `-w` to your assignment of `services.swayidle.extraArgs`.
         '';
       }
+
+      {
+        time = "2024-10-09T06:16:23+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.snixembed'.
+
+          snixembed proxies StatusNotifierItems as XEmbedded systemtray-spec
+          icons. This is useful for some tools in some environments, e.g., Safe
+          Eyes in i3, lxde or mate.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index ed2e177f2..c69c66b15 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -361,6 +361,7 @@ let
     ./services/screen-locker.nix
     ./services/sctd.nix
     ./services/signaturepdf.nix
+    ./services/snixembed.nix
     ./services/spotifyd.nix
     ./services/ssh-agent.nix
     ./services/stalonetray.nix
diff --git a/modules/services/snixembed.nix b/modules/services/snixembed.nix
new file mode 100644
index 000000000..a470836b0
--- /dev/null
+++ b/modules/services/snixembed.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.snixembed;
+in {
+  meta.maintainers = [ maintainers.DamienCassou ];
+
+  options = {
+    services.snixembed = {
+      enable = mkEnableOption
+        "snixembed: proxy StatusNotifierItems as XEmbedded systemtray-spec icons";
+
+      package = mkPackageOption pkgs "snixembed" { };
+
+      beforeUnits = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "safeeyes.service" ];
+        description = ''
+          List of other units that should be started after snixembed.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (hm.assertions.assertPlatform "services.snixembed" pkgs platforms.linux)
+    ];
+
+    systemd.user.services.snixembed = {
+      Install.WantedBy = [ "graphical-session.target" ];
+
+      Unit = {
+        Description = "snixembed";
+        PartOf = [ "graphical-session.target" ];
+        StartLimitIntervalSec = 100;
+        StartLimitBurst = 10;
+        Before = cfg.beforeUnits;
+      };
+
+      Service = {
+        ExecStart = getExe pkgs.snixembed;
+        Restart = "on-failure";
+        RestartSec = 3;
+      };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 4117ea8ea..4cc705b18 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -270,6 +270,7 @@ in import nmtSrc {
     ./modules/services/remmina
     ./modules/services/screen-locker
     ./modules/services/signaturepdf
+    ./modules/services/snixembed
     ./modules/services/swayidle
     ./modules/services/swaync
     ./modules/services/swayosd
diff --git a/tests/modules/services/snixembed/basic-configuration.desktop b/tests/modules/services/snixembed/basic-configuration.desktop
new file mode 100644
index 000000000..a606d8f2f
--- /dev/null
+++ b/tests/modules/services/snixembed/basic-configuration.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Exec=@xdg-utils@/bin/xdg-open http://localhost:9494
+Icon=/snixembed/share/snixembed/public/favicon.ico
+Name=Snixembed
+Terminal=false
+Type=Application
+Version=1.4
diff --git a/tests/modules/services/snixembed/basic-configuration.nix b/tests/modules/services/snixembed/basic-configuration.nix
new file mode 100644
index 000000000..fd8ec4701
--- /dev/null
+++ b/tests/modules/services/snixembed/basic-configuration.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  services.snixembed = {
+    enable = true;
+    beforeUnits = [ "safeeyes.service" ];
+  };
+
+  test.stubs = { snixembed = { outPath = "/snixembed"; }; };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/systemd/user/snixembed.service \
+      ${./basic-configuration.service}
+  '';
+}
diff --git a/tests/modules/services/snixembed/basic-configuration.service b/tests/modules/services/snixembed/basic-configuration.service
new file mode 100644
index 000000000..97e87664b
--- /dev/null
+++ b/tests/modules/services/snixembed/basic-configuration.service
@@ -0,0 +1,14 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=/snixembed/bin/dummy
+Restart=on-failure
+RestartSec=3
+
+[Unit]
+Before=safeeyes.service
+Description=snixembed
+PartOf=graphical-session.target
+StartLimitBurst=10
+StartLimitIntervalSec=100
diff --git a/tests/modules/services/snixembed/default.nix b/tests/modules/services/snixembed/default.nix
new file mode 100644
index 000000000..b49917197
--- /dev/null
+++ b/tests/modules/services/snixembed/default.nix
@@ -0,0 +1 @@
+{ snixembed-basic-configuration = ./basic-configuration.nix; }

From 342a1d682386d3a1d74f9555cb327f2f311dda6e Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Fri, 11 Oct 2024 00:19:04 +0200
Subject: [PATCH 010/546] 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/9357f4f23713673f310988025d9dc261c20e70c6?narHash=sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c%3D' (2024-09-21)
  → 'github:NixOS/nixpkgs/c31898adf5a8ed202ce5bea9f347b1c6871f32d1?narHash=sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw%3D' (2024-10-06)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 557a2e855..76920c875 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {

From 582830954264080aae93f751c3cdc58df600d2d1 Mon Sep 17 00:00:00 2001
From: aabccd021 <aabccd021@gmail.com>
Date: Fri, 9 Sep 2022 07:42:53 +0700
Subject: [PATCH 011/546] vifm: add module

---
 modules/lib/maintainers.nix                   |  6 ++++
 modules/misc/news.nix                         | 10 ++++++
 modules/modules.nix                           |  3 +-
 modules/programs/vifm.nix                     | 33 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/vifm/default.nix       |  4 +++
 .../modules/programs/vifm/empty-settings.nix  | 11 +++++++
 .../programs/vifm/example-settings.nix        | 21 ++++++++++++
 8 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 modules/programs/vifm.nix
 create mode 100644 tests/modules/programs/vifm/default.nix
 create mode 100644 tests/modules/programs/vifm/empty-settings.nix
 create mode 100644 tests/modules/programs/vifm/example-settings.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 70f480d06..501917ffb 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -7,6 +7,12 @@
 # [1] https://github.com/NixOS/nixpkgs/blob/fca0d6e093c82b31103dc0dacc48da2a9b06e24b/maintainers/maintainer-list.nix#LC1
 
 {
+  aabccd021 = {
+    name = "Muhamad Abdurahman";
+    email = "aabccd021@gmail.com";
+    github = "aabccd021";
+    githubId = 33031950;
+  };
   abayomi185 = {
     name = "Yomi";
     email = "yomi+nix@yomitosh.com";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index abd9957cb..732c92478 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1760,6 +1760,16 @@ in {
           Eyes in i3, lxde or mate.
         '';
       }
+
+      {
+        time = "2024-10-11T08:23:19+00:00";
+        message = ''
+          A new module is available: 'programs.vifm'.
+
+          Vifm is a curses based Vim-like file manager extended with some useful
+          ideas from mutt.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index c69c66b15..72f4adaae 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -241,8 +241,9 @@ let
     ./programs/translate-shell.nix
     ./programs/urxvt.nix
     ./programs/vdirsyncer.nix
-    ./programs/vim.nix
+    ./programs/vifm.nix
     ./programs/vim-vint.nix
+    ./programs/vim.nix
     ./programs/vscode.nix
     ./programs/vscode/haskell.nix
     ./programs/pywal.nix
diff --git a/modules/programs/vifm.nix b/modules/programs/vifm.nix
new file mode 100644
index 000000000..2bf31d52d
--- /dev/null
+++ b/modules/programs/vifm.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  inherit (lib) mkIf mkOption types;
+
+  cfg = config.programs.vifm;
+
+in {
+  meta.maintainers = [ lib.hm.maintainers.aabccd021 ];
+
+  options.programs.vifm = {
+    enable = lib.mkEnableOption "vifm, a Vim-like file manager";
+
+    package = lib.mkPackageOption pkgs "vifm" { };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = "mark h ~/";
+      description = ''
+        Extra lines added to the {file}`$XDG_CONFIG_HOME/vifm/vifmrc` file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."vifm/vifmrc" =
+      mkIf (cfg.extraConfig != "") { text = cfg.extraConfig; };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 4cc705b18..83ed42a70 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -155,6 +155,7 @@ in import nmtSrc {
     ./modules/programs/tmux
     ./modules/programs/topgrade
     ./modules/programs/translate-shell
+    ./modules/programs/vifm
     ./modules/programs/vim-vint
     ./modules/programs/vscode
     ./modules/programs/watson
diff --git a/tests/modules/programs/vifm/default.nix b/tests/modules/programs/vifm/default.nix
new file mode 100644
index 000000000..5a75a54aa
--- /dev/null
+++ b/tests/modules/programs/vifm/default.nix
@@ -0,0 +1,4 @@
+{
+  vifm-example-settings = ./example-settings.nix;
+  vifm-empty-settings = ./empty-settings.nix;
+}
diff --git a/tests/modules/programs/vifm/empty-settings.nix b/tests/modules/programs/vifm/empty-settings.nix
new file mode 100644
index 000000000..4e1df9c18
--- /dev/null
+++ b/tests/modules/programs/vifm/empty-settings.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  programs.vifm.enable = true;
+
+  test.stubs.vifm = { };
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/vifm
+  '';
+}
diff --git a/tests/modules/programs/vifm/example-settings.nix b/tests/modules/programs/vifm/example-settings.nix
new file mode 100644
index 000000000..8f562aa62
--- /dev/null
+++ b/tests/modules/programs/vifm/example-settings.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+
+{
+  programs.vifm = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    extraConfig = ''
+      mark h ~/
+    '';
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/vifm/vifmrc \
+      ${
+        builtins.toFile "vifm-expected.conf" ''
+          mark h ~/
+        ''
+      }
+  '';
+}

From 65ae9c147349829d3df0222151f53f79821c5134 Mon Sep 17 00:00:00 2001
From: Perchun Pak <github@perchun.it>
Date: Fri, 11 Oct 2024 14:48:52 +0200
Subject: [PATCH 012/546] git: add module for `git maintenance` (#5772)

Adds module for git-scm.com/docs/git-maintenance.
---
 modules/programs/git.nix | 77 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 07d01ab9d..dfdac2d4b 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -214,6 +214,41 @@ in {
         };
       };
 
+      maintenance = {
+        enable = mkEnableOption "" // {
+          description = ''
+            Enable the automatic {command}`git maintenance`.
+
+            See <https://git-scm.com/docs/git-maintenance>.
+          '';
+        };
+
+        repositories = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+          description = ''
+            Repositories on which {command}`git maintenance` should run.
+
+            Should be a list of absolute paths.
+          '';
+        };
+
+        timers = mkOption {
+          type = types.attrsOf types.str;
+          default = {
+            hourly = "*-*-* 1..23:53:00";
+            daily = "Tue..Sun *-*-* 0:53:00";
+            weekly = "Mon 0:53:00";
+          };
+          description = ''
+            Systemd timers to create for scheduled {command}`git maintenance`.
+
+            Key is passed to `--schedule` argument in {command}`git maintenance run`
+            and value is passed to `Timer.OnCalendar` in `systemd.user.timers`.
+          '';
+        };
+      };
+
       diff-highlight = {
         enable = mkEnableOption "" // {
           description = ''
@@ -501,6 +536,48 @@ in {
         };
     })
 
+    (mkIf cfg.maintenance.enable {
+      programs.git.iniContent.maintenance.repo = cfg.maintenance.repositories;
+
+      systemd.user.services."git-maintenance@" = {
+        Unit = {
+          Description = "Optimize Git repositories data";
+          Documentation = [ "man:git-maintenance(1)" ];
+        };
+
+        Service = {
+          Type = "oneshot";
+          ExecStart = let exe = lib.getExe cfg.package;
+          in ''
+            "${exe}" --exec-path="${exe}" for-each-repo --config=maintenance.repo maintenance run --schedule=%i
+          '';
+          LockPersonality = "yes";
+          MemoryDenyWriteExecute = "yes";
+          NoNewPrivileges = "yes";
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_VSOCK";
+          RestrictNamespaces = "yes";
+          RestrictRealtime = "yes";
+          RestrictSUIDSGID = "yes";
+          SystemCallArchitectures = "native";
+          SystemCallFilter = "@system-service";
+        };
+      };
+
+      systemd.user.timers = let
+        toSystemdTimer = name: time:
+          lib.attrsets.nameValuePair "git-maintenance@${name}" {
+            Unit.Description = "Optimize Git repositories data";
+
+            Timer = {
+              OnCalendar = time;
+              Persistent = true;
+            };
+
+            Install.WantedBy = [ "timers.target" ];
+          };
+      in lib.attrsets.mapAttrs' toSystemdTimer cfg.maintenance.timers;
+    })
+
     (mkIf cfg.diff-highlight.enable {
       programs.git.iniContent = let
         dhCommand =

From 2b13611eaed8326789f76f70d21d06fbb14e3e47 Mon Sep 17 00:00:00 2001
From: Kilian Mio <86004375+Mikilio@users.noreply.github.com>
Date: Sat, 12 Oct 2024 00:21:33 +0200
Subject: [PATCH 013/546] floorp: add module

Also fix tests for Firefox module derivatives.
---
 modules/modules.nix                           |   1 +
 modules/programs/floorp.nix                   |  29 +++
 tests/default.nix                             |   1 +
 tests/modules/programs/firefox/common.nix     |  15 ++
 tests/modules/programs/firefox/firefox.nix    |  17 +-
 tests/modules/programs/firefox/floorp.nix     |   1 +
 tests/modules/programs/firefox/policies.nix   |   4 +-
 .../programs/firefox/profile-settings.nix     | 241 ++++++++++++++++++
 .../firefox/profiles/bookmarks/default.nix    |   8 +-
 .../bookmarks/expected-bookmarks-user.js      |   2 +-
 .../firefox/profiles/search/default.nix       |  34 ++-
 .../expected-search-without-default.json      |   2 +-
 .../profiles/search/expected-search.json      |   8 +-
 13 files changed, 334 insertions(+), 29 deletions(-)
 create mode 100644 modules/programs/floorp.nix
 create mode 100644 tests/modules/programs/firefox/common.nix
 create mode 100644 tests/modules/programs/firefox/floorp.nix
 create mode 100644 tests/modules/programs/firefox/profile-settings.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 72f4adaae..b6880e62f 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -92,6 +92,7 @@ let
     ./programs/feh.nix
     ./programs/firefox.nix
     ./programs/fish.nix
+    ./programs/floorp.nix
     ./programs/foot.nix
     ./programs/freetube.nix
     ./programs/fuzzel.nix
diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix
new file mode 100644
index 000000000..0f231bdf4
--- /dev/null
+++ b/modules/programs/floorp.nix
@@ -0,0 +1,29 @@
+{ lib, ... }:
+
+with lib;
+
+let
+
+  modulePath = [ "programs" "floorp" ];
+
+  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+
+in {
+  meta.maintainers = [ hm.maintainers.bricked ];
+
+  imports = [
+    (mkFirefoxModule {
+      inherit modulePath;
+      name = "Floorp";
+      wrappedPackageName = "floorp";
+      unwrappedPackageName = "floorp-unwrapped";
+      visible = true;
+
+      platforms.linux = {
+        configPath = ".floorp";
+        vendorPath = ".floorp";
+      };
+      platforms.darwin = { configPath = "Library/Application Support/Floorp"; };
+    })
+  ];
+}
diff --git a/tests/default.nix b/tests/default.nix
index 83ed42a70..90371aafe 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -193,6 +193,7 @@ in import nmtSrc {
     ./modules/programs/bemenu
     ./modules/programs/boxxy
     ./modules/programs/firefox/firefox.nix
+    ./modules/programs/firefox/floorp.nix
     ./modules/programs/foot
     ./modules/programs/freetube
     ./modules/programs/fuzzel
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
new file mode 100644
index 000000000..7d05382f1
--- /dev/null
+++ b/tests/modules/programs/firefox/common.nix
@@ -0,0 +1,15 @@
+name:
+builtins.mapAttrs (test: module: import module [ "programs" name ]) {
+  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
+  "${name}-policies" = ./policies.nix;
+  "${name}-profiles-bookmarks" = ./profiles/bookmarks;
+  "${name}-profiles-containers" = ./profiles/containers;
+  "${name}-profiles-containers-duplicate-ids" =
+    ./profiles/containers/duplicate-ids.nix;
+  "${name}-profiles-containers-id-out-of-range" =
+    ./profiles/containers/id-out-of-range.nix;
+  "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profiles-search" = ./profiles/search;
+  "${name}-profiles-settings" = ./profiles/settings;
+  "${name}-state-version-19_09" = ./state-version-19_09.nix;
+}
diff --git a/tests/modules/programs/firefox/firefox.nix b/tests/modules/programs/firefox/firefox.nix
index 6d92a5f49..dd126e260 100644
--- a/tests/modules/programs/firefox/firefox.nix
+++ b/tests/modules/programs/firefox/firefox.nix
@@ -1,16 +1 @@
-let name = "firefox";
-
-in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
-  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
-  "${name}-policies" = ./policies.nix;
-  "${name}-profiles-bookmarks" = ./profiles/bookmarks;
-  "${name}-profiles-containers" = ./profiles/containers;
-  "${name}-profiles-containers-duplicate-ids" =
-    ./profiles/containers/duplicate-ids.nix;
-  "${name}-profiles-containers-id-out-of-range" =
-    ./profiles/containers/id-out-of-range.nix;
-  "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
-  "${name}-profiles-search" = ./profiles/search;
-  "${name}-profiles-settings" = ./profiles/settings;
-  "${name}-state-version-19_09" = ./state-version-19_09.nix;
-}
+import ./common.nix "firefox"
diff --git a/tests/modules/programs/firefox/floorp.nix b/tests/modules/programs/firefox/floorp.nix
new file mode 100644
index 000000000..67a13659c
--- /dev/null
+++ b/tests/modules/programs/firefox/floorp.nix
@@ -0,0 +1 @@
+import ./common.nix "floorp"
diff --git a/tests/modules/programs/firefox/policies.nix b/tests/modules/programs/firefox/policies.nix
index 5e02a1916..5cda1406a 100644
--- a/tests/modules/programs/firefox/policies.nix
+++ b/tests/modules/programs/firefox/policies.nix
@@ -20,7 +20,7 @@ in {
     package = pkgs.${cfg.wrappedPackageName}.override {
       extraPolicies = { DownloadDirectory = "/foo"; };
     };
-  }) // {
+  } // {
     nmt.script = ''
       jq=${lib.getExe pkgs.jq}
       config_file="${cfg.finalPackage}/lib/${cfg.wrappedPackageName}/distribution/policies.json"
@@ -39,5 +39,5 @@ in {
         fail "Expected '$config_file' to set 'policies.DownloadDirectory' to \"/foo\""
       fi
     '';
-  };
+  });
 }
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
new file mode 100644
index 000000000..897067625
--- /dev/null
+++ b/tests/modules/programs/firefox/profile-settings.nix
@@ -0,0 +1,241 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+
+  withName = path:
+    pkgs.substituteAll {
+      src = path;
+      name = cfg.wrappedPackageName;
+    };
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.basic.isDefault = true;
+
+    profiles.test = {
+      id = 1;
+      settings = {
+        "general.smoothScroll" = false;
+        "browser.newtabpage.pinned" = [{
+          title = "NixOS";
+          url = "https://nixos.org";
+        }];
+      };
+    };
+
+    profiles.bookmarks = {
+      id = 2;
+      settings = { "general.smoothScroll" = false; };
+      bookmarks = [
+        {
+          toolbar = true;
+          bookmarks = [{
+            name = "Home Manager";
+            url = "https://wiki.nixos.org/wiki/Home_Manager";
+          }];
+        }
+        {
+          name = "wikipedia";
+          tags = [ "wiki" ];
+          keyword = "wiki";
+          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+        }
+        {
+          name = "kernel.org";
+          url = "https://www.kernel.org";
+        }
+        {
+          name = "Nix sites";
+          bookmarks = [
+            {
+              name = "homepage";
+              url = "https://nixos.org/";
+            }
+            {
+              name = "wiki";
+              tags = [ "wiki" "nix" ];
+              url = "https://wiki.nixos.org/";
+            }
+            {
+              name = "Nix sites";
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  url = "https://wiki.nixos.org/";
+                }
+              ];
+            }
+          ];
+        }
+      ];
+    };
+
+    profiles.search = {
+      id = 3;
+      search = {
+        force = true;
+        default = "Google";
+        privateDefault = "DuckDuckGo";
+        order = [ "Nix Packages" "NixOS Wiki" ];
+        engines = {
+          "Nix Packages" = {
+            urls = [{
+              template = "https://search.nixos.org/packages";
+              params = [
+                {
+                  name = "type";
+                  value = "packages";
+                }
+                {
+                  name = "query";
+                  value = "{searchTerms}";
+                }
+              ];
+            }];
+
+            icon =
+              "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+
+            definedAliases = [ "@np" ];
+          };
+
+          "NixOS Wiki" = {
+            urls = [{
+              template =
+                "https://wiki.nixos.org/index.php?search={searchTerms}";
+            }];
+            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
+            updateInterval = 24 * 60 * 60 * 1000;
+            definedAliases = [ "@nw" ];
+          };
+
+          "Bing".metaData.hidden = true;
+          "Google".metaData.alias = "@g";
+        };
+      };
+    };
+
+    profiles.searchWithoutDefault = {
+      id = 4;
+      search = {
+        force = true;
+        order = [ "Google" "Nix Packages" ];
+        engines = {
+          "Nix Packages" = {
+            urls = [{
+              template = "https://search.nixos.org/packages";
+              params = [
+                {
+                  name = "type";
+                  value = "packages";
+                }
+                {
+                  name = "query";
+                  value = "{searchTerms}";
+                }
+              ];
+            }];
+
+            definedAliases = [ "@np" ];
+          };
+        };
+      };
+    };
+
+    profiles.containers = {
+      id = 5;
+      containers = {
+        "shopping" = {
+          id = 6;
+          icon = "circle";
+          color = "yellow";
+        };
+      };
+    };
+  } // {
+
+    nmt.script = let
+
+      noHashQuery = ''
+        'def walk(f):
+             . as $in
+             | if type == "object" then
+                 reduce keys[] as $key
+                 ( {}; . + { ($key): ($in[$key] | walk(f)) } | f )
+               elif type == "array" then
+                 map( walk(f) )
+               else
+                 f
+               end;
+             walk(if type == "object" then
+                     if has("hash") then .hash = null else . end |
+                     if has("privateHash") then .privateHash = null else . end
+                  else
+                     .
+                  end)' '';
+
+    in ''
+      assertFileRegex \
+        home-path/bin/${cfg.wrappedPackageName} \
+        MOZ_APP_LAUNCHER
+
+      assertDirectoryExists home-files/${cfg.configPath}/basic
+
+      assertFileContent \
+        home-files/${cfg.configPath}/test/user.js \
+        ${withName ./profile-settings-expected-user.js}
+
+      assertFileContent \
+        home-files/${cfg.configPath}/containers/containers.json \
+        ${withName ./profile-settings-expected-containers.json}
+
+      bookmarksUserJs=$(normalizeStorePaths \
+        home-files/${cfg.configPath}/bookmarks/user.js)
+
+      assertFileContent \
+        $bookmarksUserJs \
+        ${withName ./profile-settings-expected-bookmarks-user.js}
+
+      bookmarksFile="$(sed -n \
+        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
+        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
+
+      assertFileContent \
+        $bookmarksFile \
+        ${withName ./profile-settings-expected-bookmarks.html}
+
+      function assertFirefoxSearchContent() {
+        compressedSearch=$(normalizeStorePaths "$1")
+
+        decompressedSearch=$(dirname $compressedSearch)/search.json
+        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq ${noHashQuery} > "$decompressedSearch")
+
+        assertFileContent \
+          $decompressedSearch \
+          "$2"
+      }
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/search/search.json.mozlz4 \
+        ${withName ./profile-settings-expected-search.json}
+
+      assertFirefoxSearchContent \
+        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
+        ${withName ./profile-settings-expected-search-without-default.json}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
index 7bf508ab0..dfbcfbd92 100644
--- a/tests/modules/programs/firefox/profiles/bookmarks/default.nix
+++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -9,6 +9,12 @@ let
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
+  withName = path:
+    pkgs.substituteAll {
+      src = path;
+      name = cfg.wrappedPackageName;
+    };
+
 in {
   imports = [ firefoxMockOverlay ];
 
@@ -70,7 +76,7 @@ in {
 
       assertFileContent \
         $bookmarksUserJs \
-        ${./expected-bookmarks-user.js}
+        ${withName ./expected-bookmarks-user.js}
 
       bookmarksFile="$(sed -n \
         '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
index 922d3651e..47448a6e4 100644
--- a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
+++ b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
@@ -1,6 +1,6 @@
 // Generated by Home Manager.
 
-user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-firefox-bookmarks.html");
+user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-@name@-bookmarks.html");
 user_pref("browser.places.importBookmarksHTML", true);
 user_pref("general.smoothScroll", false);
 
diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix
index 8a4c98e9b..76acfcd3a 100644
--- a/tests/modules/programs/firefox/profiles/search/default.nix
+++ b/tests/modules/programs/firefox/profiles/search/default.nix
@@ -9,6 +9,12 @@ let
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
+  withName = path:
+    pkgs.substituteAll {
+      src = path;
+      name = cfg.wrappedPackageName;
+    };
+
 in {
   imports = [ firefoxMockOverlay ];
 
@@ -88,12 +94,32 @@ in {
       };
     };
   } // {
-    nmt.script = ''
+    nmt.script = let
+
+      noHashQuery = ''
+        'def walk(f):
+             . as $in
+             | if type == "object" then
+                 reduce keys[] as $key
+                 ( {}; . + { ($key): ($in[$key] | walk(f)) } | f )
+               elif type == "array" then
+                 map( walk(f) )
+               else
+                 f
+               end;
+             walk(if type == "object" then
+                     if has("hash") then .hash = null else . end |
+                     if has("privateHash") then .privateHash = null else . end
+                  else
+                     .
+                  end)' '';
+
+    in ''
       function assertFirefoxSearchContent() {
         compressedSearch=$(normalizeStorePaths "$1")
 
         decompressedSearch=$(dirname $compressedSearch)/search.json
-        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq . > "$decompressedSearch")
+        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq ${noHashQuery} > "$decompressedSearch")
 
         assertFileContent \
           $decompressedSearch \
@@ -102,11 +128,11 @@ in {
 
       assertFirefoxSearchContent \
         home-files/${cfg.configPath}/search/search.json.mozlz4 \
-        ${./expected-search.json}
+        ${withName ./expected-search.json}
 
       assertFirefoxSearchContent \
         home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
-        ${./expected-search-without-default.json}
+        ${withName ./expected-search-without-default.json}
     '';
   });
 }
diff --git a/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json b/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
index b845dad42..ec1ce14c8 100644
--- a/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
+++ b/tests/modules/programs/firefox/profiles/search/expected-search-without-default.json
@@ -12,7 +12,7 @@
         "@np"
       ],
       "_isAppProvided": false,
-      "_loadPath": "[home-manager]/programs.firefox.profiles.searchWithoutDefault.search.engines.\"Nix Packages\"",
+      "_loadPath": "[home-manager]/programs.@name@.profiles.searchWithoutDefault.search.engines.\"Nix Packages\"",
       "_metaData": {
         "order": 2
       },
diff --git a/tests/modules/programs/firefox/profiles/search/expected-search.json b/tests/modules/programs/firefox/profiles/search/expected-search.json
index 832b6c09c..a661cf3fe 100644
--- a/tests/modules/programs/firefox/profiles/search/expected-search.json
+++ b/tests/modules/programs/firefox/profiles/search/expected-search.json
@@ -6,7 +6,7 @@
       ],
       "_iconURL": "file:///run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg",
       "_isAppProvided": false,
-      "_loadPath": "[home-manager]/programs.firefox.profiles.search.search.engines.\"Nix Packages\"",
+      "_loadPath": "[home-manager]/programs.@name@.profiles.search.search.engines.\"Nix Packages\"",
       "_metaData": {
         "order": 1
       },
@@ -34,7 +34,7 @@
       "_iconURL": "https://wiki.nixos.org/favicon.png",
       "_iconUpdateURL": "https://wiki.nixos.org/favicon.png",
       "_isAppProvided": false,
-      "_loadPath": "[home-manager]/programs.firefox.profiles.search.search.engines.\"NixOS Wiki\"",
+      "_loadPath": "[home-manager]/programs.@name@.profiles.search.search.engines.\"NixOS Wiki\"",
       "_metaData": {
         "order": 2
       },
@@ -68,9 +68,9 @@
   ],
   "metaData": {
     "current": "Google",
-    "hash": "IRmKVSQlAYnvLO8kdZyNUR/g5hzVn4++T0PLPGm+kZk=",
+    "hash": null,
     "private": "DuckDuckGo",
-    "privateHash": "BWvqUiaCuMJ20lbymFf2dqzWyl1cgm1LZhhdWNEp0Cc=",
+    "privateHash": null,
     "useSavedOrder": true
   },
   "version": 6

From d57112db877f07387ce7104b5ac346ede556d2d7 Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Sat, 12 Oct 2024 05:43:52 -0400
Subject: [PATCH 014/546] pls: fixed perm argument to pass via pls

---
 modules/programs/pls.nix            | 2 +-
 tests/modules/programs/pls/bash.nix | 2 +-
 tests/modules/programs/pls/fish.nix | 2 +-
 tests/modules/programs/pls/zsh.nix  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/programs/pls.nix b/modules/programs/pls.nix
index b9f509a76..8abb82618 100644
--- a/modules/programs/pls.nix
+++ b/modules/programs/pls.nix
@@ -9,7 +9,7 @@ let
   aliases = {
     ls = "${cfg.package}/bin/pls";
     ll =
-      "${cfg.package}/bin/pls -d perms -d user -d group -d size -d mtime -d git";
+      "${cfg.package}/bin/pls -d perm -d user -d group -d size -d mtime -d git";
   };
 
 in {
diff --git a/tests/modules/programs/pls/bash.nix b/tests/modules/programs/pls/bash.nix
index f7e0429b5..dc1743997 100644
--- a/tests/modules/programs/pls/bash.nix
+++ b/tests/modules/programs/pls/bash.nix
@@ -23,7 +23,7 @@ with lib;
         "alias ls=@pls@/bin/pls"
       assertFileContains \
         home-files/.bashrc \
-        "alias ll='@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"
+        "alias ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
     '';
   };
 }
diff --git a/tests/modules/programs/pls/fish.nix b/tests/modules/programs/pls/fish.nix
index 05dbb10b0..c745cd768 100644
--- a/tests/modules/programs/pls/fish.nix
+++ b/tests/modules/programs/pls/fish.nix
@@ -27,7 +27,7 @@ with lib;
         "alias ls @pls@/bin/pls"
       assertFileContains \
         home-files/.config/fish/config.fish \
-        "alias ll '@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"
+        "alias ll '@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
     '';
   };
 }
diff --git a/tests/modules/programs/pls/zsh.nix b/tests/modules/programs/pls/zsh.nix
index 8f644e753..bbe68abb5 100644
--- a/tests/modules/programs/pls/zsh.nix
+++ b/tests/modules/programs/pls/zsh.nix
@@ -26,7 +26,7 @@ with lib;
         "alias -- ls=@pls@/bin/pls"
       assertFileContains \
         home-files/.zshrc \
-        "alias -- ll='@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"
+        "alias -- ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
     '';
   };
 }

From 64c6325b28ebd708653dd41d88f306023f296184 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 03:59:22 +0000
Subject: [PATCH 015/546] 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/c31898adf5a8ed202ce5bea9f347b1c6871f32d1?narHash=sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw%3D' (2024-10-06)
  → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 76920c875..0ce117f43 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728241625,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {

From e1aec543f5caf643ca0d94b6a633101942fd065f Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 14 Oct 2024 07:01:26 -0400
Subject: [PATCH 016/546] thunderbird: support setting search engines (#5697)

* firefox: split search into separate submodule file

* thunderbird: support setting search engines
---
 modules/programs/firefox.nix                 |   3 +-
 modules/programs/firefox/mkFirefoxModule.nix | 250 ++----------------
 modules/programs/firefox/profiles/search.nix | 251 +++++++++++++++++++
 modules/programs/thunderbird.nix             |  20 ++
 4 files changed, 288 insertions(+), 236 deletions(-)
 create mode 100644 modules/programs/firefox/profiles/search.nix

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index ac85990ff..2a2667c35 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -11,8 +11,7 @@ let
   mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
 
 in {
-  meta.maintainers =
-    [ maintainers.rycee maintainers.kira-bruneau hm.maintainers.bricked ];
+  meta.maintainers = [ maintainers.rycee hm.maintainers.bricked ];
 
   imports = [
     (mkFirefoxModule {
diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 2e4c23cde..dd4920666 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -547,93 +547,17 @@ in {
             description = "Whether this is a default profile.";
           };
 
-          search = {
-            force = mkOption {
-              type = with types; bool;
-              default = false;
-              description = ''
-                Whether to force replace the existing search
-                configuration. This is recommended since ${name} will
-                replace the symlink for the search configuration on every
-                launch, but note that you'll lose any existing
-                configuration by enabling this.
-              '';
-            };
-
-            default = mkOption {
-              type = with types; nullOr str;
-              default = null;
-              example = "DuckDuckGo";
-              description = ''
-                The default search engine used in the address bar and search bar.
-              '';
-            };
-
-            privateDefault = mkOption {
-              type = with types; nullOr str;
-              default = null;
-              example = "DuckDuckGo";
-              description = ''
-                The default search engine used in the Private Browsing.
-              '';
-            };
-
-            order = mkOption {
-              type = with types; uniq (listOf str);
-              default = [ ];
-              example = [ "DuckDuckGo" "Google" ];
-              description = ''
-                The order the search engines are listed in. Any engines
-                that aren't included in this list will be listed after
-                these in an unspecified order.
-              '';
-            };
-
-            engines = mkOption {
-              type = with types; attrsOf (attrsOf jsonFormat.type);
-              default = { };
-              example = literalExpression ''
-                {
-                  "Nix Packages" = {
-                    urls = [{
-                      template = "https://search.nixos.org/packages";
-                      params = [
-                        { name = "type"; value = "packages"; }
-                        { name = "query"; value = "{searchTerms}"; }
-                      ];
-                    }];
-
-                    icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                    definedAliases = [ "@np" ];
-                  };
-
-                  "NixOS Wiki" = {
-                    urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }];
-                    iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-                    updateInterval = 24 * 60 * 60 * 1000; # every day
-                    definedAliases = [ "@nw" ];
-                  };
-
-                  "Bing".metaData.hidden = true;
-                  "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
-                }
-              '';
-              description = ''
-                Attribute set of search engine configurations. Engines
-                that only have {var}`metaData` specified will
-                be treated as builtin to ${name}.
-
-                See [SearchEngine.jsm](https://searchfox.org/mozilla-central/rev/669329e284f8e8e2bb28090617192ca9b4ef3380/toolkit/components/search/SearchEngine.jsm#1138-1177)
-                in Firefox's source for available options. We maintain a
-                mapping to let you specify all options in the referenced
-                link without underscores, but it may fall out of date with
-                future options.
-
-                Note, {var}`icon` is also a special option
-                added by Home Manager to make it convenient to specify
-                absolute icon paths.
-              '';
-            };
+          search = mkOption {
+            type = types.submodule (args:
+              import ./profiles/search.nix {
+                inherit (args) config;
+                inherit lib pkgs;
+                appName = cfg.name;
+                modulePath = modulePath ++ [ "profiles" name "search" ];
+                profilePath = config.path;
+              });
+            default = { };
+            description = "Declarative search engine configuration.";
           };
 
           containersForce = mkOption {
@@ -853,152 +777,11 @@ in {
           force = profile.containersForce;
         };
 
-      "${profilesPath}/${profile.path}/search.json.mozlz4" = mkIf
-        (profile.search.default != null || profile.search.privateDefault != null
-          || profile.search.order != [ ] || profile.search.engines != { }) {
-            force = profile.search.force;
-            source = let
-              settings = {
-                version = 6;
-                engines = let
-                  # Map of nice field names to internal field names.
-                  # This is intended to be exhaustive and should be
-                  # updated at every version bump.
-                  internalFieldNames = (genAttrs [
-                    "name"
-                    "isAppProvided"
-                    "loadPath"
-                    "hasPreferredIcon"
-                    "updateInterval"
-                    "updateURL"
-                    "iconUpdateURL"
-                    "iconURL"
-                    "iconMapObj"
-                    "metaData"
-                    "orderHint"
-                    "definedAliases"
-                    "urls"
-                  ] (name: "_${name}")) // {
-                    searchForm = "__searchForm";
-                  };
-
-                  processCustomEngineInput = input:
-                    (removeAttrs input [ "icon" ])
-                    // optionalAttrs (input ? icon) {
-                      # Convenience to specify absolute path to icon
-                      iconURL = "file://${input.icon}";
-                    } // (optionalAttrs (input ? iconUpdateURL) {
-                      # Convenience to default iconURL to iconUpdateURL so
-                      # the icon is immediately downloaded from the URL
-                      iconURL = input.iconURL or input.iconUpdateURL;
-                    } // {
-                      # Required for custom engine configurations, loadPaths
-                      # are unique identifiers that are generally formatted
-                      # like: [source]/path/to/engine.xml
-                      loadPath = ''
-                        [home-manager]/${moduleName}.profiles.${profile.name}.search.engines."${
-                          replaceStrings [ "\\" ] [ "\\\\" ] input.name
-                        }"'';
-                    });
-
-                  processEngineInput = name: input:
-                    let
-                      requiredInput = {
-                        inherit name;
-                        isAppProvided = input.isAppProvided or removeAttrs input
-                          [ "metaData" ] == { };
-                        metaData = input.metaData or { };
-                      };
-                    in if requiredInput.isAppProvided then
-                      requiredInput
-                    else
-                      processCustomEngineInput (input // requiredInput);
-
-                  buildEngineConfig = name: input:
-                    mapAttrs' (name: value: {
-                      name = internalFieldNames.${name} or name;
-                      inherit value;
-                    }) (processEngineInput name input);
-
-                  sortEngineConfigs = configs:
-                    let
-                      buildEngineConfigWithOrder = order: name:
-                        let
-                          config = configs.${name} or {
-                            _name = name;
-                            _isAppProvided = true;
-                            _metaData = { };
-                          };
-                        in config // {
-                          _metaData = config._metaData // { inherit order; };
-                        };
-
-                      engineConfigsWithoutOrder =
-                        attrValues (removeAttrs configs profile.search.order);
-
-                      sortedEngineConfigs =
-                        (imap buildEngineConfigWithOrder profile.search.order)
-                        ++ engineConfigsWithoutOrder;
-                    in sortedEngineConfigs;
-
-                  engineInput = profile.search.engines // {
-                    # Infer profile.search.default as an app provided
-                    # engine if it's not in profile.search.engines
-                    ${profile.search.default} =
-                      profile.search.engines.${profile.search.default} or { };
-                  } // {
-                    ${profile.search.privateDefault} =
-                      profile.search.engines.${profile.search.privateDefault} or { };
-                  };
-                in sortEngineConfigs (mapAttrs buildEngineConfig engineInput);
-
-                metaData = optionalAttrs (profile.search.default != null) {
-                  current = profile.search.default;
-                  hash = "@hash@";
-                } // optionalAttrs (profile.search.privateDefault != null) {
-                  private = profile.search.privateDefault;
-                  privateHash = "@privateHash@";
-                } // {
-                  useSavedOrder = profile.search.order != [ ];
-                };
-              };
-
-              # Home Manager doesn't circumvent user consent and isn't acting
-              # maliciously. We're modifying the search outside of the browser, but
-              # a claim by Mozilla to remove this would be very anti-user, and
-              # is unlikely to be an issue for our use case.
-              disclaimer = appName:
-                "By modifying this file, I agree that I am doing so "
-                + "only within ${appName} itself, using official, user-driven search "
-                + "engine selection processes, and in a way which does not circumvent "
-                + "user consent. I acknowledge that any attempt to change this file "
-                + "from outside of ${appName} is a malicious act, and will be responded "
-                + "to accordingly.";
-
-              salt = if profile.search.default != null then
-                profile.path + profile.search.default + disclaimer cfg.name
-              else
-                null;
-
-              privateSalt = if profile.search.privateDefault != null then
-                profile.path + profile.search.privateDefault
-                + disclaimer cfg.name
-              else
-                null;
-            in pkgs.runCommand "search.json.mozlz4" {
-              nativeBuildInputs = with pkgs; [ mozlz4a openssl ];
-              json = builtins.toJSON settings;
-              inherit salt privateSalt;
-            } ''
-              if [[ -n $salt ]]; then
-                export hash=$(echo -n "$salt" | openssl dgst -sha256 -binary | base64)
-                export privateHash=$(echo -n "$privateSalt" | openssl dgst -sha256 -binary | base64)
-                mozlz4a <(substituteStream json search.json.in --subst-var hash --subst-var privateHash) "$out"
-              else
-                mozlz4a <(echo "$json") "$out"
-              fi
-            '';
-          };
+      "${profilesPath}/${profile.path}/search.json.mozlz4" = {
+        enable = profile.search.enable;
+        force = profile.search.force;
+        source = profile.search.file;
+      };
 
       "${profilesPath}/${profile.path}/extensions" =
         mkIf (profile.extensions != [ ]) {
@@ -1025,4 +808,3 @@ in {
     };
   });
 }
-
diff --git a/modules/programs/firefox/profiles/search.nix b/modules/programs/firefox/profiles/search.nix
new file mode 100644
index 000000000..69b771aa4
--- /dev/null
+++ b/modules/programs/firefox/profiles/search.nix
@@ -0,0 +1,251 @@
+{ config, lib, pkgs, appName, modulePath, profilePath }:
+
+with lib;
+
+let
+  jsonFormat = pkgs.formats.json { };
+
+  # Map of nice field names to internal field names.
+  # This is intended to be exhaustive and should be
+  # updated at every version bump.
+  internalFieldNames = (genAttrs [
+    "name"
+    "isAppProvided"
+    "loadPath"
+    "hasPreferredIcon"
+    "updateInterval"
+    "updateURL"
+    "iconUpdateURL"
+    "iconURL"
+    "iconMapObj"
+    "metaData"
+    "orderHint"
+    "definedAliases"
+    "urls"
+  ] (name: "_${name}")) // {
+    searchForm = "__searchForm";
+  };
+
+  processCustomEngineInput = input:
+    (removeAttrs input [ "icon" ]) // optionalAttrs (input ? icon) {
+      # Convenience to specify absolute path to icon
+      iconURL = "file://${input.icon}";
+    } // (optionalAttrs (input ? iconUpdateURL) {
+      # Convenience to default iconURL to iconUpdateURL so
+      # the icon is immediately downloaded from the URL
+      iconURL = input.iconURL or input.iconUpdateURL;
+    } // {
+      # Required for custom engine configurations, loadPaths
+      # are unique identifiers that are generally formatted
+      # like: [source]/path/to/engine.xml
+      loadPath = "[home-manager]/${
+          concatStringsSep "." (map strings.escapeNixIdentifier
+            (modulePath ++ [ "engines" input.name ]))
+        }";
+    });
+
+  processEngineInput = name: input:
+    let
+      requiredInput = {
+        inherit name;
+        isAppProvided = input.isAppProvided or removeAttrs input [ "metaData" ]
+          == { };
+        metaData = input.metaData or { };
+      };
+    in if requiredInput.isAppProvided then
+      requiredInput
+    else
+      processCustomEngineInput (input // requiredInput);
+
+  buildEngineConfig = name: input:
+    mapAttrs' (name: value: {
+      name = internalFieldNames.${name} or name;
+      inherit value;
+    }) (processEngineInput name input);
+
+  sortEngineConfigs = configs:
+    let
+      buildEngineConfigWithOrder = order: name:
+        let
+          config = configs.${name} or {
+            _name = name;
+            _isAppProvided = true;
+            _metaData = { };
+          };
+        in config // { _metaData = config._metaData // { inherit order; }; };
+
+      engineConfigsWithoutOrder = attrValues (removeAttrs configs config.order);
+
+      sortedEngineConfigs = (imap buildEngineConfigWithOrder config.order)
+        ++ engineConfigsWithoutOrder;
+    in sortedEngineConfigs;
+
+  engineInput = config.engines // {
+    # Infer config.default as an app provided
+    # engine if it's not in config.engines
+    ${config.default} = config.engines.${config.default} or { };
+  } // {
+    ${config.privateDefault} = config.engines.${config.privateDefault} or { };
+  };
+
+  settings = {
+    version = 6;
+    engines = sortEngineConfigs (mapAttrs buildEngineConfig engineInput);
+
+    metaData = optionalAttrs (config.default != null) {
+      current = config.default;
+      hash = "@hash@";
+    } // optionalAttrs (config.privateDefault != null) {
+      private = config.privateDefault;
+      privateHash = "@privateHash@";
+    } // {
+      useSavedOrder = config.order != [ ];
+    };
+  };
+
+  # Home Manager doesn't circumvent user consent and isn't acting
+  # maliciously. We're modifying the search outside of the browser, but
+  # a claim by Mozilla to remove this would be very anti-user, and
+  # is unlikely to be an issue for our use case.
+  disclaimer = "By modifying this file, I agree that I am doing so "
+    + "only within ${appName} itself, using official, user-driven search "
+    + "engine selection processes, and in a way which does not circumvent "
+    + "user consent. I acknowledge that any attempt to change this file "
+    + "from outside of ${appName} is a malicious act, and will be responded "
+    + "to accordingly.";
+
+  salt = if config.default != null then
+    profilePath + config.default + disclaimer
+  else
+    null;
+
+  privateSalt = if config.privateDefault != null then
+    profilePath + config.privateDefault + disclaimer
+  else
+    null;
+
+  file = pkgs.runCommand "search.json.mozlz4" {
+    nativeBuildInputs = with pkgs; [ mozlz4a openssl ];
+    json = builtins.toJSON settings;
+    inherit salt privateSalt;
+  } ''
+    if [[ -n $salt ]]; then
+      export hash=$(echo -n "$salt" | openssl dgst -sha256 -binary | base64)
+      export privateHash=$(echo -n "$privateSalt" | openssl dgst -sha256 -binary | base64)
+      mozlz4a <(substituteStream json search.json.in --subst-var hash --subst-var privateHash) "$out"
+    else
+      mozlz4a <(echo "$json") "$out"
+    fi
+  '';
+in {
+  imports = [ (pkgs.path + "/nixos/modules/misc/meta.nix") ];
+
+  meta.maintainers = with maintainers; [ kira-bruneau ];
+
+  options = {
+    enable = mkOption {
+      type = with types; bool;
+      default = config.default != null || config.privateDefault != null
+        || config.order != [ ] || config.engines != { };
+      internal = true;
+    };
+
+    force = mkOption {
+      type = with types; bool;
+      default = false;
+      description = ''
+        Whether to force replace the existing search
+        configuration. This is recommended since ${appName} will
+        replace the symlink for the search configuration on every
+        launch, but note that you'll lose any existing configuration
+        by enabling this.
+      '';
+    };
+
+    default = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      example = "DuckDuckGo";
+      description = ''
+        The default search engine used in the address bar and search
+        bar.
+      '';
+    };
+
+    privateDefault = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      example = "DuckDuckGo";
+      description = ''
+        The default search engine used in the Private Browsing.
+      '';
+    };
+
+    order = mkOption {
+      type = with types; uniq (listOf str);
+      default = [ ];
+      example = [ "DuckDuckGo" "Google" ];
+      description = ''
+        The order the search engines are listed in. Any engines that
+        aren't included in this list will be listed after these in an
+        unspecified order.
+      '';
+    };
+
+    engines = mkOption {
+      type = with types; attrsOf (attrsOf jsonFormat.type);
+      default = { };
+      example = literalExpression ''
+        {
+          "Nix Packages" = {
+            urls = [{
+              template = "https://search.nixos.org/packages";
+              params = [
+                { name = "type"; value = "packages"; }
+                { name = "query"; value = "{searchTerms}"; }
+              ];
+            }];
+
+            icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+            definedAliases = [ "@np" ];
+          };
+
+          "NixOS Wiki" = {
+            urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }];
+            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
+            updateInterval = 24 * 60 * 60 * 1000; # every day
+            definedAliases = [ "@nw" ];
+          };
+
+          "Bing".metaData.hidden = true;
+          "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
+        }
+      '';
+
+      description = ''
+        Attribute set of search engine configurations. Engines that
+        only have {var}`metaData` specified will be treated as builtin
+        to ${appName}.
+
+        See [SearchEngine.jsm](https://searchfox.org/mozilla-central/rev/669329e284f8e8e2bb28090617192ca9b4ef3380/toolkit/components/search/SearchEngine.jsm#1138-1177)
+        in ${appName}'s source for available options. We maintain a
+        mapping to let you specify all options in the referenced link
+        without underscores, but it may fall out of date with future
+        options.
+
+        Note, {var}`icon` is also a special option added by Home
+        Manager to make it convenient to specify absolute icon paths.
+      '';
+    };
+
+    file = mkOption {
+      type = with types; path;
+      default = file;
+      internal = true;
+      readOnly = true;
+      description = ''
+        Resulting search.json.mozlz4 file.
+      '';
+    };
+  };
+}
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 2001e806f..a5ba0e63e 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -225,6 +225,20 @@ in {
                   Extra preferences to add to {file}`user.js`.
                 '';
               };
+
+              search = mkOption {
+                type = types.submodule (args:
+                  import ./firefox/profiles/search.nix {
+                    inherit (args) config;
+                    inherit lib pkgs;
+                    appName = "Thunderbird";
+                    modulePath =
+                      [ "programs" "thunderbird" "profiles" name "search" ];
+                    profilePath = name;
+                  });
+                default = { };
+                description = "Declarative search engine configuration.";
+              };
             };
           }));
         description = "Attribute set of Thunderbird profiles.";
@@ -393,6 +407,12 @@ in {
         ] ++ (map (a: toThunderbirdAccount a profile) accounts)))
           profile.extraConfig;
       };
+
+      "${thunderbirdProfilesPath}/${name}/search.json.mozlz4" = {
+        enable = profile.search.enable;
+        force = profile.search.force;
+        source = profile.search.file;
+      };
     }));
   };
 }

From 2a4fd1cfd8ed5648583dadef86966a8231024221 Mon Sep 17 00:00:00 2001
From: Sergey <kuzzz99@gmail.com>
Date: Tue, 8 Oct 2024 22:34:31 +0100
Subject: [PATCH 017/546] eza: fix icons option

Fixes the icons option for eza which was breaking completion in zsh.
---
 docs/release-notes/rl-2411.md |  5 +++++
 modules/programs/eza.nix      | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/rl-2411.md b/docs/release-notes/rl-2411.md
index 6f7a6b7b0..626624640 100644
--- a/docs/release-notes/rl-2411.md
+++ b/docs/release-notes/rl-2411.md
@@ -18,6 +18,11 @@ This release has the following notable changes:
   add `-w` to your assignment of
   [services.swayidle.extraArgs](#opt-services.swayidle.extraArgs).
 
+- Support for Boolean values in the option
+  [programs.eza.icons](#opt-programs.eza.icons) is deprecated for
+  future removal. The new value for `true` is `"auto"`, and for
+  `false` it is `null`.
+
 ## State Version Changes {#sec-release-24.11-state-version-changes}
 
 The state version in this release includes the changes below. These
diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix
index d55d6f56e..679f53499 100644
--- a/modules/programs/eza.nix
+++ b/modules/programs/eza.nix
@@ -49,10 +49,13 @@ with lib;
     };
 
     icons = mkOption {
-      type = types.bool;
-      default = false;
+      type = types.enum [ null true false "auto" "always" "never" ];
+      default = null;
       description = ''
         Display icons next to file names ({option}`--icons` argument).
+
+        Note, the support for Boolean values is deprecated.
+        Setting this option to `true` corresponds to `--icons=auto`.
       '';
     };
 
@@ -70,8 +73,15 @@ with lib;
   config = let
     cfg = config.programs.eza;
 
-    args = escapeShellArgs (optional cfg.icons "--icons"
-      ++ optional cfg.git "--git" ++ cfg.extraOptions);
+    iconsOption = let
+      v = if isBool cfg.icons then
+        (if cfg.icons then "auto" else null)
+      else
+        cfg.icons;
+    in optionals (v != null) [ "--icons" v ];
+
+    args = escapeShellArgs
+      (iconsOption ++ optional cfg.git "--git" ++ cfg.extraOptions);
 
     optionsAlias = optionalAttrs (args != "") { eza = "eza ${args}"; };
 
@@ -83,6 +93,12 @@ with lib;
       lla = "eza -la";
     };
   in mkIf cfg.enable {
+    warnings = optional (isBool cfg.icons) ''
+      Setting programs.eza.icons to a Boolean is deprecated.
+      Please update your configuration so that
+
+        programs.eza.icons = ${if cfg.icons then ''"auto"'' else "null"}'';
+
     home.packages = [ cfg.package ];
 
     programs.bash.shellAliases = optionsAlias

From 994a0baf7be821c6c1487ffb3ab2884a5581a293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sat, 14 Sep 2024 14:48:32 +0200
Subject: [PATCH 018/546] nushell: add joaquintrinanes as maintainer

---
 modules/programs/nushell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index 2ebd9554c..b69ec88f0 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -39,7 +39,7 @@ let
       };
     });
 in {
-  meta.maintainers = [ maintainers.Philipp-M ];
+  meta.maintainers = [ maintainers.Philipp-M maintainers.joaquintrinanes ];
 
   imports = [
     (mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''

From edf15f1549a2f4e65d704f7d6ab6be715d932976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sat, 14 Sep 2024 02:15:02 +0200
Subject: [PATCH 019/546] nushell: create generator helpers

---
 modules/lib/default.nix |  1 +
 modules/lib/nushell.nix | 65 +++++++++++++++++++++++++++++++++++++++++
 modules/lib/types.nix   | 23 +++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 modules/lib/nushell.nix

diff --git a/modules/lib/default.nix b/modules/lib/default.nix
index 5d732a83f..8014c625e 100644
--- a/modules/lib/default.nix
+++ b/modules/lib/default.nix
@@ -14,4 +14,5 @@ rec {
 
   shell = import ./shell.nix { inherit lib; };
   zsh = import ./zsh.nix { inherit lib; };
+  nushell = import ./nushell.nix { inherit lib; };
 }
diff --git a/modules/lib/nushell.nix b/modules/lib/nushell.nix
new file mode 100644
index 000000000..e831380cd
--- /dev/null
+++ b/modules/lib/nushell.nix
@@ -0,0 +1,65 @@
+{ lib }: rec {
+  mkNushellInline = expr: lib.setType "nushell-inline" { inherit expr; };
+
+  toNushell = { indent ? "", multiline ? true, asBindings ? false }@args:
+    v:
+    let
+      innerIndent = "${indent}    ";
+      introSpace = if multiline then ''
+
+        ${innerIndent}'' else
+        " ";
+      outroSpace = if multiline then ''
+
+        ${indent}'' else
+        " ";
+      innerArgs = args // {
+        indent = if asBindings then indent else innerIndent;
+        asBindings = false;
+      };
+      concatItems = lib.concatStringsSep introSpace;
+      isNushellInline = lib.isType "nushell-inline";
+
+      generatedBindings = assert lib.assertMsg (badVarNames == [ ])
+        "Bad Nushell variable names: ${
+          lib.generators.toPretty { } badVarNames
+        }";
+        lib.concatStrings (lib.mapAttrsToList (key: value: ''
+          ${indent}let ${key} = ${toNushell innerArgs value}
+        '') v);
+
+      isBadVarName = name:
+        # Extracted from https://github.com/nushell/nushell/blob/ebc7b80c23f777f70c5053cca428226b3fe00d30/crates/nu-parser/src/parser.rs#L33
+        # Variables with numeric or even empty names are allowed. The only requisite is not containing any of the following characters
+        let invalidVariableCharacters = ".[({+-*^/=!<>&|";
+        in lib.match "^[$]?[^${lib.escapeRegex invalidVariableCharacters}]+$"
+        name == null;
+      badVarNames = lib.filter isBadVarName (builtins.attrNames v);
+    in if asBindings then
+      generatedBindings
+    else if v == null then
+      "null"
+    else if lib.isInt v || lib.isFloat v || lib.isString v || lib.isBool v then
+      lib.strings.toJSON v
+    else if lib.isList v then
+      (if v == [ ] then
+        "[]"
+      else
+        "[${introSpace}${
+          concatItems (map (value: "${toNushell innerArgs value}") v)
+        }${outroSpace}]")
+    else if lib.isAttrs v then
+      (if isNushellInline v then
+        "(${v.expr})"
+      else if v == { } then
+        "{}"
+      else if lib.isDerivation v then
+        toString v
+      else
+        "{${introSpace}${
+          concatItems (lib.mapAttrsToList (key: value:
+            "${lib.strings.toJSON key}: ${toNushell innerArgs value}") v)
+        }${outroSpace}}")
+    else
+      abort "nushell.toNushell: type ${lib.typeOf v} is unsupported";
+}
diff --git a/modules/lib/types.nix b/modules/lib/types.nix
index 056d3165b..14d1c2192 100644
--- a/modules/lib/types.nix
+++ b/modules/lib/types.nix
@@ -107,4 +107,27 @@ in rec {
         mergeDefaultOption loc defs;
   };
 
+  nushellValue = let
+    valueType = types.nullOr (types.oneOf [
+      (lib.mkOptionType {
+        name = "nushell";
+        description = "Nushell inline value";
+        descriptionClass = "name";
+        check = lib.isType "nushell-inline";
+      })
+      types.bool
+      types.int
+      types.float
+      types.str
+      types.path
+      (types.attrsOf valueType // {
+        description = "attribute set of Nushell values";
+        descriptionClass = "name";
+      })
+      (types.listOf valueType // {
+        description = "list of Nushell values";
+        descriptionClass = "name";
+      })
+    ]);
+  in valueType;
 }

From 628b15d275a536fd4d4b9ab4405dd1f0eb34fe18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sat, 14 Sep 2024 18:09:15 +0200
Subject: [PATCH 020/546] nushell: allow arbitrary environment variables

---
 modules/programs/nushell.nix                  | 27 ++++++++++++++-----
 .../modules/programs/nushell/env-expected.nu  | 15 ++++++++++-
 .../programs/nushell/example-settings.nix     | 14 ++++++++--
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index b69ec88f0..6586d1e1a 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -145,11 +145,24 @@ in {
     };
 
     environmentVariables = mkOption {
-      type = types.attrsOf types.str;
+      type = types.attrsOf hm.types.nushellValue;
       default = { };
-      example = { FOO = "BAR"; };
+      example = literalExpression ''
+        {
+          FOO = "BAR";
+          LIST_VALUE = [ "foo" "bar" ];
+          NU_LIB_DIRS = lib.concatStringsSep ":" [ ./scripts ];
+          PROMPT_COMMAND = lib.hm.nushell.mkNushellInline '''{|| "> "}''';
+          ENV_CONVERSIONS.PATH = {
+            from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
+            to_string = lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
+          };
+        }
+      '';
       description = ''
-        An attribute set that maps an environment variable to a shell interpreted string.
+        Environment variables to be set.
+
+        Inline values can be set with `lib.hm.nushell.mkNushellInline`.
       '';
     };
   };
@@ -173,9 +186,11 @@ in {
       })
 
       (let
-        envVarsStr = concatStringsSep "\n"
-          (mapAttrsToList (k: v: "$env.${k} = ${v}") cfg.environmentVariables);
-      in mkIf (cfg.envFile != null || cfg.extraEnv != "" || envVarsStr != "") {
+        hasEnvVars = cfg.environmentVariables != { };
+        envVarsStr = ''
+          load-env ${hm.nushell.toNushell { } cfg.environmentVariables}
+        '';
+      in mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
         "${configDir}/env.nu".text = mkMerge [
           (mkIf (cfg.envFile != null) cfg.envFile.text)
           cfg.extraEnv
diff --git a/tests/modules/programs/nushell/env-expected.nu b/tests/modules/programs/nushell/env-expected.nu
index 07105fc54..50f6f767b 100644
--- a/tests/modules/programs/nushell/env-expected.nu
+++ b/tests/modules/programs/nushell/env-expected.nu
@@ -1,4 +1,17 @@
 $env.FOO = 'BAR'
 
 
-$env.BAR = $'(echo BAZ)'
\ No newline at end of file
+load-env {
+    "ENV_CONVERSIONS": {
+        "PATH": {
+            "from_string": ({|s| $s | split row (char esep) })
+            "to_string": ({|v| $v | str join (char esep) })
+        }
+    }
+    "FOO": "BAR"
+    "LIST_VALUE": [
+        "foo"
+        "bar"
+    ]
+    "PROMPT_COMMAND": ({|| "> "})
+}
diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index d870eb9db..4fc1402a4 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
 
 {
   programs.nushell = {
@@ -28,7 +28,17 @@
       "ll" = "ls -a";
     };
 
-    environmentVariables = { BAR = "$'(echo BAZ)'"; };
+    environmentVariables = {
+      FOO = "BAR";
+      LIST_VALUE = [ "foo" "bar" ];
+      PROMPT_COMMAND = lib.hm.nushell.mkNushellInline ''{|| "> "}'';
+      ENV_CONVERSIONS.PATH = {
+        from_string =
+          lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
+        to_string =
+          lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
+      };
+    };
   };
 
   test.stubs.nushell = { };

From b53427656655174c50c050b50c497d0e91405ab7 Mon Sep 17 00:00:00 2001
From: AtomicDude <vasilescutoma4@gmail.com>
Date: Thu, 17 Oct 2024 02:20:16 +0200
Subject: [PATCH 021/546] Translate using Weblate (Romanian)

Currently translated at 100.0% (18 of 18 strings)

Co-authored-by: AtomicDude <vasilescutoma4@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/ro/
Translation: Home Manager/Home Manager Modules
---
 modules/po/ro.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/po/ro.po b/modules/po/ro.po
index d817496a7..71e9243c9 100644
--- a/modules/po/ro.po
+++ b/modules/po/ro.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2023-08-11 19:51+0000\n"
-"Last-Translator: HeartBlin913861820c094e37 <heartblin@proton.me>\n"
+"PO-Revision-Date: 2024-10-13 22:15+0000\n"
+"Last-Translator: AtomicDude <vasilescutoma4@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/home-manager/"
 "modules/ro/>\n"
 "Language: ro\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.8-dev\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@@ -26,7 +26,7 @@ msgstr "Se creează legături ale fișierelor personale în %s"
 
 #: modules/files.nix:204
 msgid "Cleaning up orphan links from %s"
-msgstr "Se curăță legăturiile orfane din %s"
+msgstr "Se curăță legăturile orfane din %s"
 
 #: modules/files.nix:220
 msgid "Creating profile generation %s"

From f81be125ff5a47b2f0a2289ccb6d4c752083659b Mon Sep 17 00:00:00 2001
From: Viktor Illmer <accounts@viktor.im>
Date: Thu, 17 Oct 2024 02:20:16 +0200
Subject: [PATCH 022/546] Translate using Weblate (German)

Currently translated at 100.0% (18 of 18 strings)

Co-authored-by: Viktor Illmer <accounts@viktor.im>
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/de/
Translation: Home Manager/Home Manager Modules
---
 modules/po/de.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/po/de.po b/modules/po/de.po
index 5783cd7d7..d9cdbc944 100644
--- a/modules/po/de.po
+++ b/modules/po/de.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2023-12-29 02:09+0000\n"
-"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
+"PO-Revision-Date: 2024-10-15 21:37+0000\n"
+"Last-Translator: Viktor Illmer <accounts@viktor.im>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/"
 "modules/de/>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.4-dev\n"
+"X-Generator: Weblate 5.8-rc\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@@ -120,7 +120,7 @@ msgstr "Fehler: HOME ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""
 
 #: modules/lib-bash/activation-init.sh:153
 msgid "Starting Home Manager activation"
-msgstr "Starte Home Manager Aktivierung"
+msgstr "Starte Home-Manager-Aktivierung"
 
 #: modules/lib-bash/activation-init.sh:157
 msgid "Sanity checking Nix"

From 5bb057a7b527f8061f5b3dfaaf06650a23034f18 Mon Sep 17 00:00:00 2001
From: Julius Marozas <marozas.julius@gmail.com>
Date: Thu, 17 Oct 2024 02:20:16 +0200
Subject: [PATCH 023/546] Translate using Weblate (Lithuanian)

Currently translated at 97.2% (36 of 37 strings)

Co-authored-by: Julius Marozas <marozas.julius@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/lt/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/lt.po | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/home-manager/po/lt.po b/home-manager/po/lt.po
index 458ac14a7..c635d93a6 100644
--- a/home-manager/po/lt.po
+++ b/home-manager/po/lt.po
@@ -8,22 +8,22 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-02-16 22:01+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2024-10-17 00:20+0000\n"
+"Last-Translator: Julius Marozas <marozas.julius@gmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/home-manager/"
 "cli/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && ("
+"n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.8-rc\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: trūksta argumento %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@@ -55,6 +55,8 @@ msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
+"Atsarginis kelias %s į Home Manager jau nebenaudojamas, tačiau jame buvo "
+"rastas failas/katalogas."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:118
@@ -77,6 +79,24 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
+"Norėdami pašalinti šį įspėjimą, atlikite vieną iš šių veiksmų.\n"
+"\n"
+"1. Aiškiai nurodykite kelią į Home Manager, pavyzdžiui, pridėdami\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   prie jūsų konfigūracijos.\n"
+"\n"
+"   Jei importuojate Home Manager tiesiogiai, galite naudoti parametrą `path`."
+"\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   kviečiant į Home Manager paketą.\n"
+"\n"
+"2. Pašalinkite nebenaudojamą kelią.\n"
+"\n"
+"     $ rm -r \"%s\""
 
 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
@@ -175,10 +195,9 @@ msgstr "Nežinomas \"news.display\" nustatymas \"%s\"."
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "Nustatykite $EDITOR arba $VISUAL aplinkos kintamuosius"
 
 #: home-manager/home-manager:612
-#, fuzzy
 msgid "Cannot run build in read-only directory"
 msgstr "Negalima vykdyti kompiliavimo read-only kataloge"
 

From 1d9b4a3e60398572f4a760bc93f89ebeebbdb3e2 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Mon, 5 Feb 2024 19:34:52 -0600
Subject: [PATCH 024/546] fish: make generation of completions optional

Add a config option to optionally disable the generation of command
completions based upon man pages.
---
 modules/programs/fish.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 8cd7f9f92..02141042d 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -253,6 +253,12 @@ in {
         '';
       };
 
+      generateCompletions = mkEnableOption
+        "the automatic generation of completions based upon installed man pages"
+        // {
+          default = true;
+        };
+
       shellAliases = mkOption {
         type = with types; attrsOf str;
         default = { };
@@ -390,9 +396,9 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
-    {
-      home.packages = [ cfg.package ];
+    { home.packages = [ cfg.package ]; }
 
+    (mkIf cfg.generateCompletions {
       # Support completion for `man` by building a cache for `apropos`.
       programs.man.generateCaches = mkDefault true;
 
@@ -456,7 +462,9 @@ in {
           set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
         end
       '';
+    })
 
+    {
       xdg.configFile."fish/config.fish".source = fishIndent "config.fish" ''
         # ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated
         # automatically by home-manager.

From 800a191f33ce7311e5070ff10d6fb5030b55fdde Mon Sep 17 00:00:00 2001
From: xwjqv <35635774+xwjqv@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:26:47 +0200
Subject: [PATCH 025/546] broot: allow multiple keyboard keys per verb

To allow multiple keys the verb options need to accept listOf str.
---
 modules/programs/broot.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index 6a1680e07..b4cd6d620 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -15,7 +15,7 @@ let
       modal = mkEnableOption "modal (vim) mode";
 
       verbs = mkOption {
-        type = with types; listOf (attrsOf (either bool str));
+        type = with types; listOf (attrsOf (oneOf [ bool str (listOf str) ]));
         default = [ ];
         example = literalExpression ''
           [
@@ -46,6 +46,9 @@ let
           `key` (optional)
           : a keyboard key triggering execution
 
+          `keys` (optional)
+          : multiple keyboard keys each triggering execution
+
           `shortcut` (optional)
           : an alternate way to call the verb (without
             the arguments part)

From e43902a7d6df1ce25063d59fa35ab786fa9f7704 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 Oct 2024 13:51:49 +0200
Subject: [PATCH 026/546] broot: fix minor documentation bug

---
 modules/programs/broot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index b4cd6d620..c1ce94776 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -57,7 +57,7 @@ let
           : whether to quit broot on execution
             (default: `true`)
 
-          `from_shell` (optional)</term>
+          `from_shell` (optional)
           : whether the verb must be executed from the
             parent shell (default: `false`)
         '';

From 78a7a070bbcc3b37cc36080c2a3514207d427b3b Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:53:03 +0200
Subject: [PATCH 027/546] 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/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
  → 'github:NixOS/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c?narHash=sha256-nsNdSldaAyu6PE3YUA%2BYQLqUDJh%2BgRbBooMMekZJwvI%3D' (2024-10-14)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0ce117f43..6837fdba2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
         "type": "github"
       },
       "original": {

From 9c1a1c7df49a9b28539ccb509b36d0b81e41391c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 Oct 2024 15:29:43 +0200
Subject: [PATCH 028/546] activitywatch: reduce test closure

This also reduces test flakiness.
---
 tests/modules/services/activitywatch/basic-setup.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/modules/services/activitywatch/basic-setup.nix b/tests/modules/services/activitywatch/basic-setup.nix
index d3a14ae87..a8ba1cb49 100644
--- a/tests/modules/services/activitywatch/basic-setup.nix
+++ b/tests/modules/services/activitywatch/basic-setup.nix
@@ -5,6 +5,7 @@ let stubPackage = config.lib.test.mkStubPackage { };
 in {
   services.activitywatch = {
     enable = true;
+    package = stubPackage;
     settings = {
       port = 3012;
       custom_static = { custom-watcher = stubPackage; };

From e78cbb20276f09c1802e62d2f77fc93ec32da268 Mon Sep 17 00:00:00 2001
From: libewa <libewa.git@icloud.com>
Date: Sun, 26 May 2024 11:41:16 +0200
Subject: [PATCH 029/546] zed-editor: add module

Add a simple module for zed-editor, a simple editor written in Rust.
---
 modules/lib/maintainers.nix                   |  5 ++
 modules/misc/news.nix                         | 10 +++
 modules/modules.nix                           |  1 +
 modules/programs/zed-editor.nix               | 89 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/zed-editor/default.nix |  5 ++
 .../programs/zed-editor/extensions.nix        | 24 +++++
 tests/modules/programs/zed-editor/keymap.nix  | 39 ++++++++
 .../modules/programs/zed-editor/settings.nix  | 36 ++++++++
 9 files changed, 210 insertions(+)
 create mode 100644 modules/programs/zed-editor.nix
 create mode 100644 tests/modules/programs/zed-editor/default.nix
 create mode 100644 tests/modules/programs/zed-editor/extensions.nix
 create mode 100644 tests/modules/programs/zed-editor/keymap.nix
 create mode 100644 tests/modules/programs/zed-editor/settings.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 501917ffb..5916024b0 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -349,6 +349,11 @@
     githubId = 12465195;
     name = "Bruno BELANYI";
   };
+  libewa = {
+    email = "libewa-git@icloud.com";
+    github = "libewa";
+    githubId = 67926131;
+  };
   malvo = {
     email = "malte@malvo.org";
     github = "malte-v";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 732c92478..bf5e4be76 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1770,6 +1770,16 @@ in {
           ideas from mutt.
         '';
       }
+
+      {
+        time = "2024-10-17T13:07:55+00:00";
+        message = ''
+          A new module is available: 'programs.zed-editor'.
+
+          Zed is a fast text editor for macOS and Linux.
+          See https://zed.dev for more.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index b6880e62f..b2b98e231 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -262,6 +262,7 @@ let
     ./programs/yt-dlp.nix
     ./programs/z-lua.nix
     ./programs/zathura.nix
+    ./programs/zed-editor.nix
     ./programs/zellij.nix
     ./programs/zk.nix
     ./programs/zoxide.nix
diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix
new file mode 100644
index 000000000..250d891bb
--- /dev/null
+++ b/modules/programs/zed-editor.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zed-editor;
+  jsonFormat = pkgs.formats.json { };
+
+  mergedSettings = cfg.userSettings // {
+    # this part by @cmacrae
+    auto_install_extensions = lib.genAttrs cfg.extensions (_: true);
+  };
+in {
+  meta.maintainers = [ hm.maintainers.libewa ];
+
+  options = {
+    # TODO: add vscode option parity (installing extensions, configuring
+    # keybinds with nix etc.)
+    programs.zed-editor = {
+      enable = mkEnableOption
+        "Zed, the high performance, multiplayer code editor from the creators of Atom and Tree-sitter";
+
+      package = mkPackageOption pkgs "zed-editor" { };
+
+      userSettings = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          {
+            features = {
+              copilot = false;
+            };
+            telemetry = {
+              metrics = false;
+            };
+            vim_mode = false;
+            ui_font_size = 16;
+            buffer_font_size = 16;
+          }
+        '';
+        description = ''
+          Configuration written to Zed's {file}`settings.json`.
+        '';
+      };
+
+      userKeymaps = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          [
+            {
+              context = "Workspace";
+              bindings = {
+                ctrl-shift-t = "workspace::NewTerminal";
+              };
+            };
+          ]
+        '';
+        description = ''
+          Configuration written to Zed's {file}`keymap.json`.
+        '';
+      };
+
+      extensions = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = literalExpression ''
+          [ "swift" "nix" "xy-zed" ]
+        '';
+        description = ''
+          A list of the extensions Zed should install on startup.
+          Use the name of a repository in the [extension list](https://github.com/zed-industries/extensions/tree/main/extensions).
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) {
+      source = jsonFormat.generate "zed-user-settings" mergedSettings;
+    });
+
+    xdg.configFile."zed/keymap.json" = (mkIf (cfg.userKeymaps != { }) {
+      source = jsonFormat.generate "zed-user-keymaps" cfg.userKeymaps;
+    });
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 90371aafe..9e431e473 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -161,6 +161,7 @@ in import nmtSrc {
     ./modules/programs/watson
     ./modules/programs/wezterm
     ./modules/programs/yazi
+    ./modules/programs/zed-editor
     ./modules/programs/zellij
     ./modules/programs/zk
     ./modules/programs/zplug
diff --git a/tests/modules/programs/zed-editor/default.nix b/tests/modules/programs/zed-editor/default.nix
new file mode 100644
index 000000000..3c5c894fe
--- /dev/null
+++ b/tests/modules/programs/zed-editor/default.nix
@@ -0,0 +1,5 @@
+{
+  zed-extensions = ./extensions.nix;
+  zed-keymap = ./keymap.nix;
+  zed-settings = ./settings.nix;
+}
diff --git a/tests/modules/programs/zed-editor/extensions.nix b/tests/modules/programs/zed-editor/extensions.nix
new file mode 100644
index 000000000..82b79aed8
--- /dev/null
+++ b/tests/modules/programs/zed-editor/extensions.nix
@@ -0,0 +1,24 @@
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    extensions = [ "swift" "html" "xy-zed" ];
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      {
+        "auto_install_extensions": {
+          "html": true,
+          "swift": true,
+          "xy-zed": true
+        }
+      }
+    '';
+  in ''
+    assertFileExists "home-files/.config/zed/settings.json"
+    assertFileContent "home-files/.config/zed/settings.json" "${expectedContent}"
+  '';
+}
diff --git a/tests/modules/programs/zed-editor/keymap.nix b/tests/modules/programs/zed-editor/keymap.nix
new file mode 100644
index 000000000..df6abebdf
--- /dev/null
+++ b/tests/modules/programs/zed-editor/keymap.nix
@@ -0,0 +1,39 @@
+# Test custom keymap functionality
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    userKeymaps = [
+      { bindings = { up = "menu::SelectPrev"; }; }
+      {
+        context = "Editor";
+        bindings = { escape = "editor::Cancel"; };
+      }
+    ];
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      [
+        {
+          "bindings": {
+            "up": "menu::SelectPrev"
+          }
+        },
+        {
+          "bindings": {
+            "escape": "editor::Cancel"
+          },
+          "context": "Editor"
+        }
+      ]
+    '';
+
+    keymapPath = ".config/zed/keymap.json";
+  in ''
+    assertFileExists "home-files/${keymapPath}"
+    assertFileContent "home-files/${keymapPath}" "${expectedContent}"
+  '';
+}
diff --git a/tests/modules/programs/zed-editor/settings.nix b/tests/modules/programs/zed-editor/settings.nix
new file mode 100644
index 000000000..701caab13
--- /dev/null
+++ b/tests/modules/programs/zed-editor/settings.nix
@@ -0,0 +1,36 @@
+# Test custom keymap functionality
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    userSettings = {
+      theme = "XY-Zed";
+      features = { copilot = false; };
+      vim_mode = false;
+      ui_font_size = 16;
+      buffer_font_size = 16;
+    };
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      {
+        "auto_install_extensions": {},
+        "buffer_font_size": 16,
+        "features": {
+          "copilot": false
+        },
+        "theme": "XY-Zed",
+        "ui_font_size": 16,
+        "vim_mode": false
+      }
+    '';
+
+    settingsPath = ".config/zed/settings.json";
+  in ''
+    assertFileExists "home-files/${settingsPath}"
+    assertFileContent "home-files/${settingsPath}" "${expectedContent}"
+  '';
+}

From 1834304bc3849bfec635cab408e6090d536a549f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 17 Oct 2024 22:10:39 +0300
Subject: [PATCH 030/546] direnv: simplify, work around nushell/nushell#14112

nushell 0.99 does not like early returns in hooks. So, what if we just
didn't? Rewrite the entire hook to work as one single pipeline.
---
 modules/programs/direnv.nix | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 4d4862afb..228430c24 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -162,28 +162,20 @@ in {
           $env.config.hooks.pre_prompt?
           | default []
           | append {||
-              let direnv = (
-                  ${direnvWrapped}
-                  | from json --strict
-                  | default {}
-              )
-              if ($direnv | is-empty) {
-                  return
-              }
-              $direnv
+              ${direnvWrapped}
+              | from json --strict
+              | default {}
               | items {|key, value|
-                  {
-                      key: $key
-                      value: (do (
-                          $env.ENV_CONVERSIONS?
-                          | default {}
-                          | get -i $key
-                          | get -i from_string
-                          | default {|x| $x}
-                      ) $value)
-                  }
+                  let value = do (
+                      $env.ENV_CONVERSIONS?
+                      | default {}
+                      | get -i $key
+                      | get -i from_string
+                      | default {|x| $x}
+                  ) $value
+                  return [ $key $value ]
               }
-              | transpose -ird
+              | into record
               | load-env
           }
       )

From cb93ab1c990c5719ec199e8c397e688de06cb46d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 18 Oct 2024 07:54:12 +0300
Subject: [PATCH 031/546] direnv: remove nushell hack

---
 modules/programs/direnv.nix               | 31 +++--------------------
 tests/modules/programs/direnv/nushell.nix |  2 +-
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 228430c24..6d0af3ac1 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -130,39 +130,16 @@ in {
         ${getExe cfg.package} hook fish | source
       '');
 
-    programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration (let
-      # We want to get the stdout from direnv even if it exits with non-zero,
-      # because it will have the DIRENV_ internal variables defined.
-      #
-      # However, nushell's current implementation of try-catch is subtly
-      # broken with external commands in pipelines[0].
-      #
-      # This means we don't have a good way to ignore the exit code
-      # without using do | complete, which has a side effect of also
-      # capturing stderr, which we don't want.
-      #
-      # So, as a workaround, we wrap nushell in a second script that
-      # just ignores the exit code and does nothing else, allowing
-      # nushell to capture our stdout, but letting stderr go through
-      # and not causing a spurious "command failed" message.
-      #
-      # [0]: https://github.com/nushell/nushell/issues/13868
-      #
-      # FIXME: remove the wrapper once the upstream issue is fixed
-
-      direnvWrapped = pkgs.writeShellScript "direnv-wrapped" ''
-        ${getExe cfg.package} export json || true
-      '';
-      # Using mkAfter to make it more likely to appear after other
-      # manipulations of the prompt.
-    in mkAfter ''
+    # Using mkAfter to make it more likely to appear after other
+    # manipulations of the prompt.
+    programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration (mkAfter ''
       $env.config = ($env.config? | default {})
       $env.config.hooks = ($env.config.hooks? | default {})
       $env.config.hooks.pre_prompt = (
           $env.config.hooks.pre_prompt?
           | default []
           | append {||
-              ${direnvWrapped}
+              ${getExe cfg.package} export json
               | from json --strict
               | default {}
               | items {|key, value|
diff --git a/tests/modules/programs/direnv/nushell.nix b/tests/modules/programs/direnv/nushell.nix
index 86293e1d7..502b325d5 100644
--- a/tests/modules/programs/direnv/nushell.nix
+++ b/tests/modules/programs/direnv/nushell.nix
@@ -13,6 +13,6 @@
       "home-files/.config/nushell/config.nu";
   in ''
     assertFileExists "${configFile}"
-    assertFileRegex "${configFile}" '/nix/store/.*direnv-wrapped'
+    assertFileRegex "${configFile}" '/nix/store/.*direnv.*/bin/direnv export json'
   '';
 }

From d4a3186de0eeb37d1e43ed65791b0af677e440a1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 17 Oct 2024 09:19:51 -0500
Subject: [PATCH 032/546] firefox: conditional search file

---
 modules/programs/firefox/mkFirefoxModule.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index dd4920666..f7403e59a 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -777,11 +777,12 @@ in {
           force = profile.containersForce;
         };
 
-      "${profilesPath}/${profile.path}/search.json.mozlz4" = {
-        enable = profile.search.enable;
-        force = profile.search.force;
-        source = profile.search.file;
-      };
+      "${profilesPath}/${profile.path}/search.json.mozlz4" =
+        mkIf (profile.search.enable) {
+          enable = profile.search.enable;
+          force = profile.search.force;
+          source = profile.search.file;
+        };
 
       "${profilesPath}/${profile.path}/extensions" =
         mkIf (profile.extensions != [ ]) {

From 2ffb68e20981d78bfcc73b2271f2dfa003df182c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 17 Oct 2024 09:29:42 -0500
Subject: [PATCH 033/546] thunderbird: conditional search file

---
 modules/programs/thunderbird.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index a5ba0e63e..ad7a1360f 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -408,11 +408,12 @@ in {
           profile.extraConfig;
       };
 
-      "${thunderbirdProfilesPath}/${name}/search.json.mozlz4" = {
-        enable = profile.search.enable;
-        force = profile.search.force;
-        source = profile.search.file;
-      };
+      "${thunderbirdProfilesPath}/${name}/search.json.mozlz4" =
+        mkIf (profile.search.enable) {
+          enable = profile.search.enable;
+          force = profile.search.force;
+          source = profile.search.file;
+        };
     }));
   };
 }

From 346973b338365240090eded0de62f7edce4ce3d1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 17 Oct 2024 10:03:51 -0500
Subject: [PATCH 034/546] tests/firefox: add shared path test

Used to make sure that profiles that share a common generated path still
build properly.
---
 tests/modules/programs/firefox/common.nix     |  1 +
 .../programs/firefox/profiles/shared-path.nix | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 tests/modules/programs/firefox/profiles/shared-path.nix

diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index 7d05382f1..a3af6d4ab 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -12,4 +12,5 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-profiles-search" = ./profiles/search;
   "${name}-profiles-settings" = ./profiles/settings;
   "${name}-state-version-19_09" = ./state-version-19_09.nix;
+  "${name}-profiles-shared-path" = ./profiles/shared-path.nix;
 }
diff --git a/tests/modules/programs/firefox/profiles/shared-path.nix b/tests/modules/programs/firefox/profiles/shared-path.nix
new file mode 100644
index 000000000..e6d4a06d4
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/shared-path.nix
@@ -0,0 +1,53 @@
+modulePath:
+{ config, lib, ... }:
+
+with lib;
+
+let firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+
+    profiles = {
+      main = {
+        isDefault = true;
+        id = 1;
+        bookmarks = [{
+          toolbar = true;
+          bookmarks = [{
+            name = "Home Manager";
+            url = "https://wiki.nixos.org/wiki/Home_Manager";
+          }];
+        }];
+        containers = {
+          "shopping" = {
+            icon = "circle";
+            color = "yellow";
+          };
+        };
+        search = {
+          force = true;
+          default = "Google";
+          privateDefault = "DuckDuckGo";
+          engines = {
+            "Bing".metaData.hidden = true;
+            "Google".metaData.alias = "@g";
+          };
+        };
+        settings = {
+          "general.smoothScroll" = false;
+          "browser.newtabpage.pinned" = [{
+            title = "NixOS";
+            url = "https://nixos.org";
+          }];
+        };
+      };
+      "dev-edition-default" = {
+        id = 2;
+        path = "main";
+      };
+    };
+  });
+}

From 09a0c0c02953318bf94425738c7061ffdc4cba75 Mon Sep 17 00:00:00 2001
From: joygnu <mail@joygnu.org>
Date: Thu, 10 Oct 2024 00:08:02 +0200
Subject: [PATCH 035/546] cmus: add module

PR #5951
---
 modules/lib/maintainers.nix             |  6 ++++
 modules/misc/news.nix                   |  9 +++++
 modules/modules.nix                     |  1 +
 modules/programs/cmus.nix               | 44 +++++++++++++++++++++++++
 tests/default.nix                       |  1 +
 tests/modules/programs/cmus/cmus.nix    | 20 +++++++++++
 tests/modules/programs/cmus/default.nix |  1 +
 7 files changed, 82 insertions(+)
 create mode 100644 modules/programs/cmus.nix
 create mode 100644 tests/modules/programs/cmus/cmus.nix
 create mode 100644 tests/modules/programs/cmus/default.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 5916024b0..ce88b1cf0 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -604,6 +604,12 @@
     github = "zorrobert";
     githubId = 118135271;
   };
+  joygnu = {
+    name = "joygnu";
+    email = "contact@joygnu.org";
+    github = "joygnu";
+    githubId = 152063003;
+  };
   callumio = {
     name = "Callum Leslie";
     email = "git+nix@cleslie.uk";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index bf5e4be76..6c1b9b89b 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1780,6 +1780,15 @@ in {
           See https://zed.dev for more.
         '';
       }
+
+      {
+        time = "2024-10-18T14:01:07+00:00";
+        message = ''
+          A new module is available: 'programs.cmus'.
+
+          cmus is a small, fast and powerful console music player.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index b2b98e231..133a0dfff 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -77,6 +77,7 @@ let
     ./programs/carapace.nix
     ./programs/cava.nix
     ./programs/chromium.nix
+    ./programs/cmus.nix
     ./programs/command-not-found/command-not-found.nix
     ./programs/comodoro.nix
     ./programs/darcs.nix
diff --git a/modules/programs/cmus.nix b/modules/programs/cmus.nix
new file mode 100644
index 000000000..ac3e46ee1
--- /dev/null
+++ b/modules/programs/cmus.nix
@@ -0,0 +1,44 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.cmus;
+
+in {
+  meta.maintainers = [ hm.maintainers.joygnu ];
+
+  options.programs.cmus = {
+    enable = mkEnableOption "Enable cmus, the music player.";
+
+    theme = mkOption {
+      type = types.lines;
+      default = "";
+      example = "gruvbox";
+      description = ''
+        Select color theme. A list of available color themes can be found
+        here: <https://github.com/cmus/cmus/tree/master/data>.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        set audio_backend = "mpd"
+        set status_display = "default"
+      '';
+      description = "Extra configuration to add to cmus {file}`rc`.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.cmus ];
+
+    home.file.".config/cmus/rc".text = ''
+      ${optionalString (cfg.theme != "") "colorscheme ${cfg.theme}"}
+      ${cfg.extraConfig}
+    '';
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 9e431e473..f4b03275b 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -67,6 +67,7 @@ in import nmtSrc {
     ./modules/programs/btop
     ./modules/programs/carapace
     ./modules/programs/cava
+    ./modules/programs/cmus
     ./modules/programs/comodoro
     ./modules/programs/darcs
     ./modules/programs/dircolors
diff --git a/tests/modules/programs/cmus/cmus.nix b/tests/modules/programs/cmus/cmus.nix
new file mode 100644
index 000000000..8d1bbbd3a
--- /dev/null
+++ b/tests/modules/programs/cmus/cmus.nix
@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  programs.cmus = {
+    enable = true;
+    theme = "gruvbox";
+    extraConfig = "test";
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/cmus/rc \
+      ${
+        builtins.toFile "cmus-expected-rc" ''
+          colorscheme gruvbox
+          test
+        ''
+      }
+  '';
+}
diff --git a/tests/modules/programs/cmus/default.nix b/tests/modules/programs/cmus/default.nix
new file mode 100644
index 000000000..1b606bab3
--- /dev/null
+++ b/tests/modules/programs/cmus/default.nix
@@ -0,0 +1 @@
+{ cmus = ./cmus.nix; }

From 802b3cb2d45ad66619ea8ad19b280baa460556d2 Mon Sep 17 00:00:00 2001
From: Muhammad Talal Anwar <talalanwar@outlook.com>
Date: Sat, 19 Oct 2024 09:01:11 +0200
Subject: [PATCH 036/546] espanso: use `launcher` command on Linux

The source uses `launcher` instead of `daemon`. Additionally we remove
`Type` and add `RestartSec` as defined in the source:

https://github.com/espanso/espanso/blob/b421bcf73fa13506938d62425459d6c16c6a8d0a/espanso/src/res/linux/systemd.service#L5-L7C1
---
 modules/services/espanso.nix                               | 4 ++--
 tests/modules/services/espanso/basic-configuration.service | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/espanso.nix b/modules/services/espanso.nix
index f6e27e796..dbfa05875 100644
--- a/modules/services/espanso.nix
+++ b/modules/services/espanso.nix
@@ -121,9 +121,9 @@ in {
     systemd.user.services.espanso = {
       Unit = { Description = "Espanso: cross platform text expander in Rust"; };
       Service = {
-        Type = "exec";
-        ExecStart = "${cfg.package}/bin/espanso daemon";
+        ExecStart = "${cfg.package}/bin/espanso launcher";
         Restart = "on-failure";
+        RestartSec = 3;
       };
       Install = { WantedBy = [ "default.target" ]; };
     };
diff --git a/tests/modules/services/espanso/basic-configuration.service b/tests/modules/services/espanso/basic-configuration.service
index 593196e59..2c07465a0 100644
--- a/tests/modules/services/espanso/basic-configuration.service
+++ b/tests/modules/services/espanso/basic-configuration.service
@@ -2,9 +2,9 @@
 WantedBy=default.target
 
 [Service]
-ExecStart=@espanso@/bin/espanso daemon
+ExecStart=@espanso@/bin/espanso launcher
 Restart=on-failure
-Type=exec
+RestartSec=3
 
 [Unit]
 Description=Espanso: cross platform text expander in Rust

From 122f70545b29ccb922e655b08acfe05bfb44ec68 Mon Sep 17 00:00:00 2001
From: Scharada <scharada@marmels.de>
Date: Fri, 18 Oct 2024 21:24:18 +0200
Subject: [PATCH 037/546] firefox: change container.json version to 5

---
 modules/programs/firefox/mkFirefoxModule.nix                    | 2 +-
 .../firefox/profiles/containers/expected-containers.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index f7403e59a..8ef3f12d3 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -101,7 +101,7 @@ let
       };
     in ''
       ${builtins.toJSON {
-        version = 4;
+        version = 5;
         lastUserContextId =
           foldlAttrs (acc: _: value: if value.id > acc then value.id else acc) 0
           containers;
diff --git a/tests/modules/programs/firefox/profiles/containers/expected-containers.json b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
index d957b0c50..28d8143d0 100644
--- a/tests/modules/programs/firefox/profiles/containers/expected-containers.json
+++ b/tests/modules/programs/firefox/profiles/containers/expected-containers.json
@@ -1 +1 @@
-{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":0},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":0,"version":4}
+{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":0},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":0,"version":5}

From 892a6443b7676207490c83d181367ba3abcb1f23 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:07:08 +0530
Subject: [PATCH 038/546] nh: add module

---
 modules/misc/news.nix   | 12 ++++++
 modules/modules.nix     |  1 +
 modules/programs/nh.nix | 94 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 modules/programs/nh.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 6c1b9b89b..8f9a77cfa 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1789,6 +1789,18 @@ in {
           cmus is a small, fast and powerful console music player.
         '';
       }
+
+      {
+        time = "2024-10-20T07:53:54+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'programs.nh'.
+
+          nh is yet another Nix CLI helper. Adding functionality on top of the
+          existing solutions, like nixos-rebuild, home-manager cli or nix
+          itself.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 133a0dfff..ba8414721 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -172,6 +172,7 @@ let
     ./programs/neovide.nix
     ./programs/neovim.nix
     ./programs/newsboat.nix
+    ./programs/nh.nix
     ./programs/nheko.nix
     ./programs/nix-index.nix
     ./programs/nnn.nix
diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
new file mode 100644
index 000000000..a5e8dcfaf
--- /dev/null
+++ b/modules/programs/nh.nix
@@ -0,0 +1,94 @@
+{ config, osConfig, lib, pkgs, ... }:
+
+let
+
+  cfg = config.programs.nh;
+
+in {
+  meta.maintainers = with lib.maintainers; [ johnrtitor ];
+
+  options.programs.nh = {
+    enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
+
+    package = lib.mkPackageOption pkgs "nh" { };
+
+    flake = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        The path that will be used for the {env}`FLAKE` environment variable.
+
+        {env}`FLAKE` is used by nh as the default flake for performing actions,
+        like {command}`nh os switch`.
+      '';
+    };
+
+    clean = {
+      enable = lib.mkEnableOption ''
+        periodic garbage collection for user profile and nix store with nh clean
+        user'';
+
+      dates = lib.mkOption {
+        type = lib.types.singleLineStr;
+        default = "weekly";
+        description = ''
+          How often cleanup is performed.
+
+          The format is described in {manpage}`systemd.time(7)`.
+        '';
+      };
+
+      extraArgs = lib.mkOption {
+        type = lib.types.singleLineStr;
+        default = "";
+        example = "--keep 5 --keep-since 3d";
+        description = ''
+          Options given to nh clean when the service is run automatically.
+
+          See `nh clean all --help` for more information.
+        '';
+      };
+    };
+  };
+
+  config = {
+    warnings = lib.optionals (!(cfg.clean.enable -> !osConfig.nix.gc.automatic))
+      [
+        "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict."
+      ];
+
+    assertions = [{
+      assertion = (cfg.flake != null) -> !(lib.hasSuffix ".nix" cfg.flake);
+      message = "nh.flake must be a directory, not a nix file";
+    }];
+
+    home = lib.mkIf cfg.enable {
+      packages = [ cfg.package ];
+      sessionVariables = lib.mkIf (cfg.flake != null) { FLAKE = cfg.flake; };
+    };
+
+    systemd.user = lib.mkIf cfg.clean.enable {
+      services.nh-clean = {
+        Unit.Description = "Nh clean (user)";
+
+        Service = {
+          Type = "oneshot";
+          ExecStart =
+            "exec ${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}";
+          Environment = "PATH=$PATH:${config.nix.package}";
+        };
+      };
+
+      timers.nh-clean = {
+        Unit.Description = "Run nh clean";
+
+        Timer = {
+          OnCalendar = cfg.clean.dates;
+          Persistent = true;
+        };
+
+        Install.WantedBy = [ "timers.target" ];
+      };
+    };
+  };
+}

From fe56302339bb28e3471632379d733547caec8103 Mon Sep 17 00:00:00 2001
From: Talha Can Havadar <havadartalha@gmail.com>
Date: Fri, 11 Oct 2024 21:19:14 +0000
Subject: [PATCH 039/546] zoxide: fix fzf bash-completion conflict

When zoxide initializes after fzf it causes fzf " ** " trigger to not
work.

To fix the issue we needed to make zoxide initialize earlier than fzf
but after bash-completion.

PR #5955
---
 modules/programs/zoxide.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index cab75cecf..f5e258af9 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -68,9 +68,9 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 150 ''
       eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
-    '';
+    '');
 
     programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"

From 1e27f213d77fc842603628bcf2df6681d7d08f7e Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:21:28 +0200
Subject: [PATCH 040/546] 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/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c?narHash=sha256-nsNdSldaAyu6PE3YUA%2BYQLqUDJh%2BgRbBooMMekZJwvI%3D' (2024-10-14)
  → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6837fdba2..d052ebff2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {

From 5ec753a1fc4454df9285d8b3ec0809234defb975 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 21 Oct 2024 17:58:46 -0500
Subject: [PATCH 041/546] modules/neovim: fix config generation (#5976)

---
 modules/programs/neovim.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 8632a7ec8..e8be25f92 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -398,6 +398,13 @@ in {
       customRC = cfg.extraConfig;
     };
 
+    wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package (neovimConfig // {
+      wrapperArgs =
+        (lib.escapeShellArgs (neovimConfig.wrapperArgs ++ cfg.extraWrapperArgs))
+        + " " + extraMakeWrapperArgs + " " + extraMakeWrapperLuaCArgs + " "
+        + extraMakeWrapperLuaArgs;
+      wrapRc = false;
+    });
   in mkIf cfg.enable {
 
     programs.neovim.generatedConfigViml = neovimConfig.neovimRcContent;
@@ -422,11 +429,10 @@ in {
         # writes runtime
         (map (x: x.runtime) pluginsNormalized) ++ [{
           "nvim/init.lua" = let
-            luaRcContent =
-              lib.optionalString (neovimConfig.neovimRcContent != "")
+            luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "")
               "vim.cmd [[source ${
                 pkgs.writeText "nvim-init-home-manager.vim"
-                neovimConfig.neovimRcContent
+                wrappedNeovim'.initRc
               }]]" + config.programs.neovim.extraLuaConfig
               + lib.optionalString hasLuaConfig
               config.programs.neovim.generatedConfigs.lua;
@@ -437,13 +443,6 @@ in {
           };
         }]);
 
-    programs.neovim.finalPackage = pkgs.wrapNeovimUnstable cfg.package
-      (neovimConfig // {
-        wrapperArgs = (lib.escapeShellArgs
-          (neovimConfig.wrapperArgs ++ cfg.extraWrapperArgs)) + " "
-          + extraMakeWrapperArgs + " " + extraMakeWrapperLuaCArgs + " "
-          + extraMakeWrapperLuaArgs;
-        wrapRc = false;
-      });
+    programs.neovim.finalPackage = wrappedNeovim';
   };
 }

From 5765fe4feb78092cf3cbe2aa5cd523513eea7769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 23 Oct 2024 22:55:42 +0200
Subject: [PATCH 042/546] accounts/calendar: fix defaultText rendering

---
 modules/accounts/calendar.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix
index bfbc3e124..86f1b38c5 100644
--- a/modules/accounts/calendar.nix
+++ b/modules/accounts/calendar.nix
@@ -12,7 +12,8 @@ let
         path = mkOption {
           type = types.str;
           default = "${cfg.basePath}/${name}";
-          defaultText = "‹accounts.calendar.basePath›/‹name›";
+          defaultText =
+            lib.literalExpression "‹accounts.calendar.basePath›/‹name›";
           description = "The path of the storage.";
         };
 

From a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 23 Oct 2024 22:55:53 +0200
Subject: [PATCH 043/546] accounts/contacts: fix defaultText rendering

---
 modules/accounts/contacts.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix
index 272594b18..d00f5d071 100644
--- a/modules/accounts/contacts.nix
+++ b/modules/accounts/contacts.nix
@@ -12,7 +12,8 @@ let
         path = mkOption {
           type = types.str;
           default = "${cfg.basePath}/${name}";
-          defaultText = "‹accounts.contact.basePath›/‹name›";
+          defaultText =
+            lib.literalExpression "‹accounts.contact.basePath›/‹name›";
           description = "The path of the storage.";
         };
 

From 0a0b1b18bdd16d3f810178c7aec9eca730699631 Mon Sep 17 00:00:00 2001
From: Omer Naveed <me@omernaveed.dev>
Date: Thu, 24 Oct 2024 23:41:24 -0500
Subject: [PATCH 044/546] maintainers: remove omernaveedxyz

---
 modules/lib/maintainers.nix | 6 ------
 modules/programs/bemenu.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index ce88b1cf0..6b7dc8b42 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -432,12 +432,6 @@
     github = "nurelin";
     githubId = 5276274;
   };
-  omernaveedxyz = {
-    name = "Omer Naveed";
-    email = "omer@omernaveed.dev";
-    github = "omernaveedxyz";
-    githubId = 112912585;
-  };
   otavio = {
     email = "otavio.salvador@ossystems.com.br";
     github = "otavio";
diff --git a/modules/programs/bemenu.nix b/modules/programs/bemenu.nix
index 58d24dcc2..f90067216 100644
--- a/modules/programs/bemenu.nix
+++ b/modules/programs/bemenu.nix
@@ -7,7 +7,7 @@ let
   cfg = config.programs.bemenu;
 
 in {
-  meta.maintainers = [ hm.maintainers.omernaveedxyz ];
+  meta.maintainers = [ ];
 
   options.programs.bemenu = {
     enable = mkEnableOption "bemenu";

From 454e8d6b15aafb02fd22bba0edc4cc0b06dd0f41 Mon Sep 17 00:00:00 2001
From: Willi Carlsen <carlsenwilli@gmail.com>
Date: Wed, 23 Oct 2024 14:07:07 +0200
Subject: [PATCH 045/546] granted: use assume directly

The `.assume-wrapped` path is not available since the merge of

    https://github.com/NixOS/nixpkgs/pull/347816

Use assume directly instead.

PR #5994
---
 modules/programs/granted.nix                            | 2 +-
 tests/modules/programs/granted/integration-disabled.nix | 2 +-
 tests/modules/programs/granted/integration-enabled.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix
index a09169250..93cdb97df 100644
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@@ -28,7 +28,7 @@ in {
     programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
       function assume() {
         export GRANTED_ALIAS_CONFIGURED="true"
-        source ${package}/bin/.assume-wrapped "$@"
+        source ${package}/bin/assume "$@"
         unset GRANTED_ALIAS_CONFIGURED
       }
     '';
diff --git a/tests/modules/programs/granted/integration-disabled.nix b/tests/modules/programs/granted/integration-disabled.nix
index 6e43b4777..90f8d494a 100644
--- a/tests/modules/programs/granted/integration-disabled.nix
+++ b/tests/modules/programs/granted/integration-disabled.nix
@@ -19,7 +19,7 @@
       'export GRANTED_ALIAS_CONFIGURED="true"'
     assertFileNotRegex \
       home-files/.zshrc \
-      'source @granted@/bin/.assume-wrapped "$@"'
+      'source @granted@/bin/assume "$@"'
     assertFileNotRegex \
       home-files/.zshrc \
       'unset GRANTED_ALIAS_CONFIGURED'
diff --git a/tests/modules/programs/granted/integration-enabled.nix b/tests/modules/programs/granted/integration-enabled.nix
index daf843676..5bb903aae 100644
--- a/tests/modules/programs/granted/integration-enabled.nix
+++ b/tests/modules/programs/granted/integration-enabled.nix
@@ -18,7 +18,7 @@
       'export GRANTED_ALIAS_CONFIGURED="true"'
     assertFileContains \
       home-files/.zshrc \
-      'source @granted@/bin/.assume-wrapped "$@"'
+      'source @granted@/bin/assume "$@"'
     assertFileContains \
       home-files/.zshrc \
       'unset GRANTED_ALIAS_CONFIGURED'

From eea1bc607249f0b79fb437b5e9709aa6d2218bac Mon Sep 17 00:00:00 2001
From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:15:43 -0700
Subject: [PATCH 046/546] gpg-agent: use $TTY parameter in zsh integration

---
 modules/services/gpg-agent.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 7af58c8df..8bfe68aae 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -18,6 +18,10 @@ let
     export GPG_TTY
   '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
 
+  gpgZshInitStr = ''
+    export GPG_TTY=$TTY
+  '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
+
   gpgFishInitStr = ''
     set -gx GPG_TTY (tty)
   '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
@@ -287,7 +291,7 @@ in {
       '';
 
       programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
-      programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
+      programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgZshInitStr;
       programs.fish.interactiveShellInit =
         mkIf cfg.enableFishIntegration gpgFishInitStr;
 

From c7cfdb386430b01fd9748139a0e9cfa40e36c265 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sun, 29 Sep 2024 14:55:46 +0200
Subject: [PATCH 047/546] spotify-player: add support for actions

Actions were added in the v0.19.1 release.
---
 modules/programs/spotify-player.nix           | 44 ++++++++++++++++---
 .../programs/spotify-player/keymap.toml       | 13 ++++++
 .../programs/spotify-player/settings.nix      | 16 +++++++
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/modules/programs/spotify-player.nix b/modules/programs/spotify-player.nix
index 83eefe12d..35d3933bc 100644
--- a/modules/programs/spotify-player.nix
+++ b/modules/programs/spotify-player.nix
@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (lib)
-    mkEnableOption mkPackageOption mkOption types literalExpression mkIf;
+  inherit (lib) mkEnableOption mkPackageOption mkOption literalExpression mkIf;
+  inherit (lib.types) listOf;
 
   cfg = config.programs.spotify-player;
   tomlFormat = pkgs.formats.toml { };
-
+  tomlType = tomlFormat.type;
 in {
   meta.maintainers = with lib.hm.maintainers; [ diniamo ];
 
@@ -16,7 +16,7 @@ in {
     package = mkPackageOption pkgs "spotify-player" { };
 
     settings = mkOption {
-      type = tomlFormat.type;
+      type = tomlType;
       default = { };
       example = literalExpression ''
         {
@@ -43,7 +43,7 @@ in {
     };
 
     themes = mkOption {
-      type = types.listOf tomlFormat.type;
+      type = listOf tomlType;
       default = [ ];
       example = literalExpression ''
         [
@@ -94,7 +94,7 @@ in {
     };
 
     keymaps = mkOption {
-      type = types.listOf tomlFormat.type;
+      type = listOf tomlType;
       default = [ ];
       example = literalExpression ''
         [
@@ -129,6 +129,36 @@ in {
         for the full list of options.
       '';
     };
+
+    actions = mkOption {
+      type = listOf tomlType;
+      default = [ ];
+      example = literalExpression ''
+        [
+          {
+            action = "GoToArtist";
+            key_sequence = "g A";
+          }
+          {
+            action = "GoToAlbum";
+            key_sequence = "g B";
+            target = "PlayingTrack";
+          }
+          {
+            action = "ToggleLiked";
+            key_sequence = "C-l";
+          }
+        ]
+      '';
+      description = ''
+        Configuration written to the `actions` field of
+        {file}`$XDG_CONFIG_HOME/spotify-player/keymap.toml`.
+
+        See
+        <https://github.com/aome510/spotify-player/blob/master/docs/config.md#actions>
+        for the full list of options.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -146,7 +176,7 @@ in {
 
       "spotify-player/keymap.toml" = mkIf (cfg.keymaps != [ ]) {
         source = tomlFormat.generate "spotify-player-keymap" {
-          inherit (cfg) keymaps;
+          inherit (cfg) keymaps actions;
         };
       };
     };
diff --git a/tests/modules/programs/spotify-player/keymap.toml b/tests/modules/programs/spotify-player/keymap.toml
index d11c86e41..29cac4781 100644
--- a/tests/modules/programs/spotify-player/keymap.toml
+++ b/tests/modules/programs/spotify-player/keymap.toml
@@ -1,3 +1,16 @@
+[[actions]]
+action = "GoToArtist"
+key_sequence = "g A"
+
+[[actions]]
+action = "GoToAlbum"
+key_sequence = "g B"
+target = "PlayingTrack"
+
+[[actions]]
+action = "ToggleLiked"
+key_sequence = "C-l"
+
 [[keymaps]]
 command = "NextTrack"
 key_sequence = "g n"
diff --git a/tests/modules/programs/spotify-player/settings.nix b/tests/modules/programs/spotify-player/settings.nix
index dc7fe8c6a..e0442360b 100644
--- a/tests/modules/programs/spotify-player/settings.nix
+++ b/tests/modules/programs/spotify-player/settings.nix
@@ -87,6 +87,22 @@
         key_sequence = "q";
       }
     ];
+
+    actions = [
+      {
+        action = "GoToArtist";
+        key_sequence = "g A";
+      }
+      {
+        action = "GoToAlbum";
+        key_sequence = "g B";
+        target = "PlayingTrack";
+      }
+      {
+        action = "ToggleLiked";
+        key_sequence = "C-l";
+      }
+    ];
   };
 
   test.stubs.spotify-player = { };

From 82378b3f7f8c12ecfab8539df780e495e6ba4cb6 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 21 Jun 2024 17:30:18 +0200
Subject: [PATCH 048/546] htop: use attrsOf instead of attrs as settings type

---
 modules/programs/htop.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix
index 1c569c404..b4004942c 100644
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@@ -113,7 +113,8 @@ in {
     enable = mkEnableOption "htop";
 
     settings = mkOption {
-      type = types.attrs;
+      type = with types;
+        attrsOf (oneOf [ bool int str (listOf (oneOf [ int str ])) ]);
       default = { };
       example = literalExpression ''
         {

From 446293584f10d56b91368f500c022f7a93edbe2c Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Mon, 29 Apr 2024 19:37:24 -0500
Subject: [PATCH 049/546] nixgl: add module

This module enables wrapping programs which require access to libGL
with nixGL on non-NixOS systems.
---
 modules/misc/news.nix  | 12 ++++++++
 modules/misc/nixgl.nix | 64 ++++++++++++++++++++++++++++++++++++++++++
 modules/modules.nix    |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 modules/misc/nixgl.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 8f9a77cfa..801391cc2 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1801,6 +1801,18 @@ in {
           itself.
         '';
       }
+
+      {
+        time = "2024-10-25T08:18:30+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'nixGL'.
+
+          NixGL solve the "OpenGL" problem with nix. The 'nixGL' module provides
+          integration of NixGL into Home Manager. See the "GPU on non-NixOS
+          systems" section in the Home Manager mantual for more.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
new file mode 100644
index 000000000..b6cff7cc0
--- /dev/null
+++ b/modules/misc/nixgl.nix
@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.nixGL;
+in {
+  meta.maintainers = [ lib.maintainers.smona ];
+
+  options.nixGL.prefix = lib.mkOption {
+    type = lib.types.str;
+    default = "";
+    example = lib.literalExpression
+      ''"''${inputs.nixGL.packages.x86_64-linux.nixGLIntel}/bin/nixGLIntel"'';
+    description = ''
+      The nixGL command that `lib.nixGL.wrap` should wrap packages with.
+      This can be used to provide libGL access to applications on non-NixOS systems.
+
+      Some packages are wrapped by default (e.g. kitty, firefox), but you can wrap other packages
+      as well, with `(config.lib.nixGL.wrap <package>)`. If this option is empty (the default),
+      then `lib.nixGL.wrap` is a no-op.
+    '';
+  };
+
+  config = {
+    lib.nixGL.wrap = # Wrap a single package with the configured nixGL wrapper
+      pkg:
+
+      if cfg.prefix == "" then
+        pkg
+      else
+      # Wrap the package's binaries with nixGL, while preserving the rest of
+      # the outputs and derivation attributes.
+        (pkg.overrideAttrs (old: {
+          name = "nixGL-${pkg.name}";
+
+          # Make sure this is false for the wrapper derivation, so nix doesn't expect
+          # a new debug output to be produced. We won't be producing any debug info
+          # for the original package.
+          separateDebugInfo = false;
+
+          buildCommand = ''
+            set -eo pipefail
+
+            ${
+            # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
+            pkgs.lib.concatStringsSep "\n" (map (outputName: ''
+              echo "Copying output ${outputName}"
+              set -x
+              cp -rs --no-preserve=mode "${
+                pkg.${outputName}
+              }" "''$${outputName}"
+              set +x
+            '') (old.outputs or [ "out" ]))}
+
+            rm -rf $out/bin/*
+            shopt -s nullglob # Prevent loop from running if no files
+            for file in ${pkg.out}/bin/*; do
+              echo "#!${pkgs.bash}/bin/bash" > "$out/bin/$(basename $file)"
+              echo "exec -a \"\$0\" ${cfg.prefix} $file \"\$@\"" >> "$out/bin/$(basename $file)"
+              chmod +x "$out/bin/$(basename $file)"
+            done
+            shopt -u nullglob # Revert nullglob back to its normal default state
+          '';
+        }));
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index ba8414721..3b4985083 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -31,6 +31,7 @@ let
     ./misc/gtk.nix
     ./misc/lib.nix
     ./misc/news.nix
+    ./misc/nixgl.nix
     ./misc/numlock.nix
     ./misc/pam.nix
     ./misc/qt.nix

From bbd4254d00e8c69c4c958ddb51fb18637ca7f9b8 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Wed, 19 Jun 2024 18:25:56 -0500
Subject: [PATCH 050/546] nixgl: make desktop files point to wrapped exe

Some desktop files will refer to the absolute path of the original
derivation, which would bypass nixGL wrapping. So we need to replace the
path with the path to the wrapper derivation to ensure the wrapped
version is always launched.
---
 modules/misc/nixgl.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index b6cff7cc0..16a00a755 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -57,6 +57,17 @@ in {
               echo "exec -a \"\$0\" ${cfg.prefix} $file \"\$@\"" >> "$out/bin/$(basename $file)"
               chmod +x "$out/bin/$(basename $file)"
             done
+
+            # If .desktop files refer to the old package, replace the references
+            for dsk in "$out/share/applications"/*.desktop ; do
+              if ! grep "${pkg.out}" "$dsk" > /dev/null; then
+                continue
+              fi
+              src="$(readlink "$dsk")"
+              rm "$dsk"
+              sed "s|${pkg.out}|$out|g" "$src" > "$dsk"
+            done
+
             shopt -u nullglob # Revert nullglob back to its normal default state
           '';
         }));

From b9fe747915d95c3ea37539cccea67d3df39526a9 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Wed, 19 Jun 2024 18:35:53 -0500
Subject: [PATCH 051/546] nixgl: use makeWrapper and update docs

makeWrapper is more consistent with the rest of nixpkgs & home-manager,
so it should be a little more maintainable. It can also validate that
the wrapper command is executable at build time.
---
 modules/misc/nixgl.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index 16a00a755..c84397fc5 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -13,9 +13,9 @@ in {
       The nixGL command that `lib.nixGL.wrap` should wrap packages with.
       This can be used to provide libGL access to applications on non-NixOS systems.
 
-      Some packages are wrapped by default (e.g. kitty, firefox), but you can wrap other packages
-      as well, with `(config.lib.nixGL.wrap <package>)`. If this option is empty (the default),
-      then `lib.nixGL.wrap` is a no-op.
+      Wrap individual packages like so: `(config.lib.nixGL.wrap <package>)`. The returned package
+      can be used just like the original one, but will have access to libGL. If this option is empty (the default),
+      then `lib.nixGL.wrap` is a no-op. This is useful on NixOS, where the wrappers are unnecessary.
     '';
   };
 
@@ -53,9 +53,12 @@ in {
             rm -rf $out/bin/*
             shopt -s nullglob # Prevent loop from running if no files
             for file in ${pkg.out}/bin/*; do
-              echo "#!${pkgs.bash}/bin/bash" > "$out/bin/$(basename $file)"
-              echo "exec -a \"\$0\" ${cfg.prefix} $file \"\$@\"" >> "$out/bin/$(basename $file)"
-              chmod +x "$out/bin/$(basename $file)"
+              local prog="$(basename "$file")"
+              makeWrapper \
+                "${cfg.prefix}" \
+                "$out/bin/$prog" \
+                --argv0 "$prog" \
+                --add-flags "$file"
             done
 
             # If .desktop files refer to the old package, replace the references

From 199cf5634c2ed39fceae0da3b1d0a76f7d47e1b1 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Wed, 26 Jun 2024 21:14:08 -0500
Subject: [PATCH 052/546] nixgl: use -q to silence grep

Co-authored-by: V. <150687949+vigress8@users.noreply.github.com>
---
 modules/misc/nixgl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index c84397fc5..76b05296b 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -63,7 +63,7 @@ in {
 
             # If .desktop files refer to the old package, replace the references
             for dsk in "$out/share/applications"/*.desktop ; do
-              if ! grep "${pkg.out}" "$dsk" > /dev/null; then
+              if ! grep -q "${pkg.out}" "$dsk"; then
                 continue
               fi
               src="$(readlink "$dsk")"

From d0c036ca4904701289e0a779253f241feeacbf40 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Wed, 26 Jun 2024 21:16:22 -0500
Subject: [PATCH 053/546] nixgl: ensure makeWrapper is present during build

Co-authored-by: V. <150687949+vigress8@users.noreply.github.com>
---
 modules/misc/nixgl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index 76b05296b..90bd1f3aa 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -35,7 +35,7 @@ in {
           # a new debug output to be produced. We won't be producing any debug info
           # for the original package.
           separateDebugInfo = false;
-
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ];
           buildCommand = ''
             set -eo pipefail
 

From 7dee0dc8f0c7d4f174c481f36d04b9edadba3b7e Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Mon, 1 Jul 2024 15:42:10 -0500
Subject: [PATCH 054/546] nixgl: reference lib directly

Co-authored-by: V. <150687949+vigress8@users.noreply.github.com>
---
 modules/misc/nixgl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index 90bd1f3aa..ca674ff13 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -41,7 +41,7 @@ in {
 
             ${
             # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
-            pkgs.lib.concatStringsSep "\n" (map (outputName: ''
+            lib.concatStringsSep "\n" (map (outputName: ''
               echo "Copying output ${outputName}"
               set -x
               cp -rs --no-preserve=mode "${

From e61f87969ae179139164c7fb5e0bb76b791144e5 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Fri, 9 Aug 2024 19:40:33 -0500
Subject: [PATCH 055/546] nixgl: Improve option documentation

---
 modules/misc/nixgl.nix | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index ca674ff13..47314b9c2 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -10,12 +10,28 @@ in {
     example = lib.literalExpression
       ''"''${inputs.nixGL.packages.x86_64-linux.nixGLIntel}/bin/nixGLIntel"'';
     description = ''
-      The nixGL command that `lib.nixGL.wrap` should wrap packages with.
-      This can be used to provide libGL access to applications on non-NixOS systems.
+      The [nixGL](https://github.com/nix-community/nixGL) command that `lib.nixGL.wrap` should prefix
+      package binaries with. nixGL provides your system's version of libGL to applications, enabling
+      them to access the GPU on non-NixOS systems.
 
-      Wrap individual packages like so: `(config.lib.nixGL.wrap <package>)`. The returned package
-      can be used just like the original one, but will have access to libGL. If this option is empty (the default),
-      then `lib.nixGL.wrap` is a no-op. This is useful on NixOS, where the wrappers are unnecessary.
+      Wrap individual packages which require GPU access with the function like so: `(config.lib.nixGL.wrap <package>)`.
+      The returned package can be used just like the original one, but will have access to libGL. For example:
+
+      ```nix
+      # If you're using a Home Manager module to configure the package,
+      # pass it into the module's package argument:
+      programs.kitty = {
+        enable = true;
+        package = (config.lib.nixGL.wrap pkgs.kitty);
+      };
+
+      # Otherwise, pass it to any option where a package is expected:
+      home.packages = [ (config.lib.nixGL.wrap pkgs.hello) ];
+      ```
+
+      If this option is empty (the default), then `lib.nixGL.wrap` is a no-op. This is useful for sharing your Home Manager
+      configurations between NixOS and non-NixOS systems, since NixOS already provides libGL to applications without the
+      need for nixGL.
     '';
   };
 
@@ -35,7 +51,8 @@ in {
           # a new debug output to be produced. We won't be producing any debug info
           # for the original package.
           separateDebugInfo = false;
-          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ];
+          nativeBuildInputs = old.nativeBuildInputs or [ ]
+            ++ [ pkgs.makeWrapper ];
           buildCommand = ''
             set -eo pipefail
 

From 7a5879707bb49c350aee7ab270c917584d430193 Mon Sep 17 00:00:00 2001
From: Jure Varlec <jure@varlec.si>
Date: Wed, 10 Jul 2024 10:51:32 +0200
Subject: [PATCH 056/546] nixgl: API rework for flexibility and dual-GPU

---
 docs/manual/usage.md               |   1 +
 docs/manual/usage/gpu-non-nixos.md |  70 ++++++++
 modules/misc/nixgl.nix             | 252 +++++++++++++++++++++++++----
 3 files changed, 288 insertions(+), 35 deletions(-)
 create mode 100644 docs/manual/usage/gpu-non-nixos.md

diff --git a/docs/manual/usage.md b/docs/manual/usage.md
index 2a569aaf9..88e884546 100644
--- a/docs/manual/usage.md
+++ b/docs/manual/usage.md
@@ -59,5 +59,6 @@ usage/configuration.md
 usage/rollbacks.md
 usage/dotfiles.md
 usage/graphical.md
+usage/gpu-non-nixos.md
 usage/updating.md
 ```
diff --git a/docs/manual/usage/gpu-non-nixos.md b/docs/manual/usage/gpu-non-nixos.md
new file mode 100644
index 000000000..7b7cfbaea
--- /dev/null
+++ b/docs/manual/usage/gpu-non-nixos.md
@@ -0,0 +1,70 @@
+# GPU on non-NixOS systems {#sec-usage-gpu-non-nixos}
+
+To access the GPU, programs need access to OpenGL and Vulkan libraries. While
+this works transparently on NixOS, it does not on other Linux systems. A
+solution is provided by [NixGL](https://github.com/nix-community/nixGL), which
+can be integrated into Home Manager.
+
+To enable the integration, import NixGL into your home configuration, either as
+a channel, or as a flake input passed via `extraSpecialArgs`. Then, set the
+`nixGL.packages` option to the package set provided by NixGL.
+
+Once integration is enabled, it can be used in two ways: as Nix functions for
+wrapping programs installed via Home Manager, and as shell commands for running
+programs installed by other means (such as `nix shell`). In either case, there
+are several wrappers available. They can be broadly categorized
+
+- by vendor: as Mesa (for Free drivers of all vendors) and Nvidia (for
+  Nvidia-specific proprietary drivers).
+- by GPU selection: as primary and secondary (offloading).
+
+For example, the `mesa` wrapper provides support for running programs on the
+primary GPU for Intel, AMD and Nouveau drivers, while the `mesaPrime` wrapper
+does the same for the secondary GPU.
+
+**Note:** when using Nvidia wrappers together with flakes, your home
+configuration will not be pure and needs to be built using `home-manager switch
+--impure`. Otherwise, the build will fail, complaining about missing attribute
+`currentTime`.
+
+Wrapper functions are available under `config.lib.nixGL.wrappers`. However, it
+can be more convenient to use the `config.lib.nixGL.wrap` alias, which can be
+configured to use any of the wrappers. It is intended to provide a customization
+point when the same home configuration is used across several machines with
+different hardware. There is also the `config.lib.nixGL.wrapOffload` alias for
+two-GPU systems.
+
+Another convenience is that all wrapper functions are always available. However,
+when `nixGL.packages` option is unset, they are no-ops. This allows them to be
+used even when the home configuration is used on NixOS machines. The exception
+is the `prime-offload` script which ignores `nixGL.packages` and is installed
+into the environment whenever `nixGL.prime.installScript` is set. This script,
+which can be used to start a program on a secondary GPU, does not depend on
+NixGL and is useful on NixOS systems as well.
+
+Below is an abbreviated example for an Optimus laptop that makes use of both
+Mesa and Nvidia wrappers, where the latter is used in dGPU offloading mode. It
+demonstrates how to wrap `mpv` to run on the integrated Intel GPU, wrap FreeCAD
+to run on the Nvidia dGPU, and how to install the wrapper scripts. It also wraps
+Xonotic to run on the dGPU, but uses the wrapper function directly for
+demonstration purposes.
+
+```nix
+{ config, lib, pkgs, nixGL, ... }:
+{
+  nixGL.packages = nixGL.packages;
+  nixGL.defaultWrapper = "mesa";
+  nixGL.offloadWrapper = "nvidiaPrime";
+  nixGL.installScripts = [ "mesa" "nvidiaPrime" ];
+
+  programs.mpv = {
+    enable = true;
+    package = config.lib.nixGL.wrap pkgs.mpv;
+  };
+
+  home.packages = [
+    (config.lib.nixGL.wrapOffload pkgs.freecad)
+    (config.lib.nixGL.wrappers.nvidiaPrime pkgs.xonotic)
+  ];
+}
+```
diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index 47314b9c2..f45c483bc 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -1,45 +1,166 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.nixGL;
+let
+  cfg = config.nixGL;
+  wrapperListMarkdown = with builtins;
+    foldl' (list: name:
+      list + ''
+        - ${name}
+      '') "" (attrNames config.lib.nixGL.wrappers);
 in {
   meta.maintainers = [ lib.maintainers.smona ];
 
-  options.nixGL.prefix = lib.mkOption {
-    type = lib.types.str;
-    default = "";
-    example = lib.literalExpression
-      ''"''${inputs.nixGL.packages.x86_64-linux.nixGLIntel}/bin/nixGLIntel"'';
-    description = ''
-      The [nixGL](https://github.com/nix-community/nixGL) command that `lib.nixGL.wrap` should prefix
-      package binaries with. nixGL provides your system's version of libGL to applications, enabling
-      them to access the GPU on non-NixOS systems.
+  options.nixGL = {
+    packages = lib.mkOption {
+      type = with lib.types; nullOr attrs;
+      default = null;
+      example = lib.literalExpression "inputs.nixGL.packages";
+      description = ''
+        The nixGL package set containing GPU library wrappers. This can be used
+        to provide OpenGL and Vulkan access to applications on non-NixOS systems
+        by using `(config.lib.nixGL.wrap <package>)` for the default wrapper, or
+        `(config.lib.nixGL.wrappers.<wrapper> <package>)` for any available
+        wrapper.
 
-      Wrap individual packages which require GPU access with the function like so: `(config.lib.nixGL.wrap <package>)`.
-      The returned package can be used just like the original one, but will have access to libGL. For example:
+        The wrapper functions are always available. If this option is empty (the
+        default), they are a no-op. This is useful on NixOS where the wrappers
+        are unnecessary.
 
-      ```nix
-      # If you're using a Home Manager module to configure the package,
-      # pass it into the module's package argument:
-      programs.kitty = {
-        enable = true;
-        package = (config.lib.nixGL.wrap pkgs.kitty);
-      };
+        Note that using any Nvidia wrapper requires building the configuration
+        with the `--impure` option.
+      '';
+    };
 
-      # Otherwise, pass it to any option where a package is expected:
-      home.packages = [ (config.lib.nixGL.wrap pkgs.hello) ];
-      ```
+    defaultWrapper = lib.mkOption {
+      type = lib.types.enum (builtins.attrNames config.lib.nixGL.wrappers);
+      default = "mesa";
+      description = ''
+        The package wrapper function available for use as `(config.lib.nixGL.wrap
+        <package>)`. Intended to start programs on the main GPU.
 
-      If this option is empty (the default), then `lib.nixGL.wrap` is a no-op. This is useful for sharing your Home Manager
-      configurations between NixOS and non-NixOS systems, since NixOS already provides libGL to applications without the
-      need for nixGL.
-    '';
+        Wrapper functions can be found under `config.lib.nixGL.wrappers`. They
+        can be used directly, however, setting this option provides a convenient
+        shorthand.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    offloadWrapper = lib.mkOption {
+      type = lib.types.enum (builtins.attrNames config.lib.nixGL.wrappers);
+      default = "mesaPrime";
+      description = ''
+        The package wrapper function available for use as
+        `(config.lib.nixGL.wrapOffload <package>)`. Intended to start programs
+        on the secondary GPU.
+
+        Wrapper functions can be found under `config.lib.nixGL.wrappers`. They
+        can be used directly, however, setting this option provides a convenient
+        shorthand.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    prime.card = lib.mkOption {
+      type = lib.types.str;
+      default = "1";
+      example = "pci-0000_06_00_0";
+      description = ''
+        Selects the non-default graphics card used for PRIME render offloading.
+        The value can be:
+
+        - a number, selecting the n-th non-default GPU;
+        - a PCI bus id in the form `pci-XXX_YY_ZZ_U`;
+        - a PCI id in the form `vendor_id:device_id`
+
+        For more information, consult the Mesa documentation on the `DRI_PRIME`
+        environment variable.
+      '';
+    };
+
+    prime.nvidiaProvider = lib.mkOption {
+      type = with lib.types; nullOr str;
+      default = null;
+      example = "NVIDIA-G0";
+      description = ''
+        If this option is set, it overrides the offload provider for Nvidia
+        PRIME offloading. Consult the proprietary Nvidia driver documentation
+        on the `__NV_PRIME_RENDER_OFFLOAD_PROVIDER` environment variable.
+      '';
+    };
+
+    prime.installScript = lib.mkOption {
+      type = with lib.types; nullOr (enum [ "mesa" "nvidia" ]);
+      default = null;
+      example = "mesa";
+      description = ''
+        If this option is set, the wrapper script `prime-offload` is installed
+        into the environment. It allows starting programs on the secondary GPU
+        selected by the `nixGL.prime.card` option. This makes sense when the
+        program is not already using one of nixGL PRIME wrappers, or for
+        programs not installed from Nixpkgs.
+
+        This option can be set to either "mesa" or "nvidia", making the script
+        use one or the other graphics library.
+      '';
+    };
+
+    installScripts = lib.mkOption {
+      type = with lib.types;
+        nullOr (listOf (enum (builtins.attrNames config.lib.nixGL.wrappers)));
+      default = null;
+      example = [ "mesa" "mesaPrime" ];
+      description = ''
+        For each wrapper `wrp` named in the provided list, a wrapper script
+        named `nixGLWrp` is installed into the environment. These scripts are
+        useful for running programs not installed via Home Manager.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    vulkan.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to enable Vulkan in nixGL wrappers.
+
+        This is disabled by default bacause Vulkan brings in several libraries
+        that can cause symbol version conflicts in wrapped programs. Your
+        mileage may vary.
+      '';
+    };
   };
 
-  config = {
-    lib.nixGL.wrap = # Wrap a single package with the configured nixGL wrapper
-      pkg:
+  config = let
+    getWrapperExe = vendor:
+      let
+        glPackage = cfg.packages.${pkgs.system}."nixGL${vendor}";
+        glExe = lib.getExe glPackage;
+        vulkanPackage = cfg.packages.${pkgs.system}."nixVulkan${vendor}";
+        vulkanExe = if cfg.vulkan.enable then lib.getExe vulkanPackage else "";
+      in "${glExe} ${vulkanExe}";
 
-      if cfg.prefix == "" then
+    mesaOffloadEnv = { "DRI_PRIME" = "${cfg.prime.card}"; };
+
+    nvOffloadEnv = {
+      "DRI_PRIME" = "${cfg.prime.card}";
+      "__NV_PRIME_RENDER_OFFLOAD" = "1";
+      "__GLX_VENDOR_LIBRARY_NAME" = "nvidia";
+      "__VK_LAYER_NV_optimus" = "NVIDIA_only";
+    } // (let provider = cfg.prime.nvidiaProvider;
+    in if !isNull provider then {
+      "__NV_PRIME_RENDER_OFFLOAD_PROVIDER" = "${provider}";
+    } else
+      { });
+
+    makePackageWrapper = vendor: environment: pkg:
+      if builtins.isNull cfg.packages then
         pkg
       else
       # Wrap the package's binaries with nixGL, while preserving the rest of
@@ -53,11 +174,17 @@ in {
           separateDebugInfo = false;
           nativeBuildInputs = old.nativeBuildInputs or [ ]
             ++ [ pkgs.makeWrapper ];
-          buildCommand = ''
+          buildCommand = let
+            # We need an intermediate wrapper package because makeWrapper
+            # requires a single executable as the wrapper.
+            combinedWrapperPkg =
+              pkgs.writeShellScriptBin "nixGLCombinedWrapper-${vendor}" ''
+                exec ${getWrapperExe vendor} "$@"
+              '';
+          in ''
             set -eo pipefail
 
-            ${
-            # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
+            ${ # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
             lib.concatStringsSep "\n" (map (outputName: ''
               echo "Copying output ${outputName}"
               set -x
@@ -72,10 +199,14 @@ in {
             for file in ${pkg.out}/bin/*; do
               local prog="$(basename "$file")"
               makeWrapper \
-                "${cfg.prefix}" \
+                "${lib.getExe combinedWrapperPkg}" \
                 "$out/bin/$prog" \
                 --argv0 "$prog" \
-                --add-flags "$file"
+                --add-flags "$file" \
+                ${
+                  lib.concatStringsSep " " (lib.attrsets.mapAttrsToList
+                    (var: val: "--set '${var}' '${val}'") environment)
+                }
             done
 
             # If .desktop files refer to the old package, replace the references
@@ -91,5 +222,56 @@ in {
             shopt -u nullglob # Revert nullglob back to its normal default state
           '';
         }));
+
+    wrappers = {
+      mesa = makePackageWrapper "Intel" { };
+      mesaPrime = makePackageWrapper "Intel" mesaOffloadEnv;
+      nvidia = makePackageWrapper "Nvidia" { };
+      nvidiaPrime = makePackageWrapper "Nvidia" nvOffloadEnv;
+    };
+  in {
+    lib.nixGL.wrap = wrappers.${cfg.defaultWrapper};
+    lib.nixGL.wrapOffload = wrappers.${cfg.offloadWrapper};
+    lib.nixGL.wrappers = wrappers;
+
+    home.packages = let
+      wantsPrimeWrapper = (!isNull cfg.prime.installScript);
+      wantsWrapper = wrapper:
+        (!isNull cfg.packages) && (!isNull cfg.installScripts)
+        && (builtins.elem wrapper cfg.installScripts);
+      envVarsAsScript = environment:
+        lib.concatStringsSep "\n"
+        (lib.attrsets.mapAttrsToList (var: val: "export ${var}=${val}")
+          environment);
+    in [
+      (lib.mkIf wantsPrimeWrapper (pkgs.writeShellScriptBin "prime-offload" ''
+        ${if cfg.prime.installScript == "mesa" then
+          (envVarsAsScript mesaOffloadEnv)
+        else
+          (envVarsAsScript nvOffloadEnv)}
+        exec "$@"
+      ''))
+
+      (lib.mkIf (wantsWrapper "mesa") (pkgs.writeShellScriptBin "nixGLMesa" ''
+        exec ${getWrapperExe "Intel"} "$@"
+      ''))
+
+      (lib.mkIf (wantsWrapper "mesaPrime")
+        (pkgs.writeShellScriptBin "nixGLMesaPrime" ''
+          ${envVarsAsScript mesaOffloadEnv}
+          exec ${getWrapperExe "Intel"} "$@"
+        ''))
+
+      (lib.mkIf (wantsWrapper "nvidia")
+        (pkgs.writeShellScriptBin "nixGLNvidia" ''
+          exec ${getWrapperExe "Nvidia"} "$@"
+        ''))
+
+      (lib.mkIf (wantsWrapper "nvidia")
+        (pkgs.writeShellScriptBin "nixGLNvidiaPrime" ''
+          ${envVarsAsScript nvOffloadEnv}
+          exec ${getWrapperExe "Nvidia"} "$@"
+        ''))
+    ];
   };
 }

From 8bd6e0a1a805c373686e21678bb07f23293d357b Mon Sep 17 00:00:00 2001
From: Jure Varlec <jure.varlec@cosylab.com>
Date: Wed, 2 Oct 2024 20:19:53 +0200
Subject: [PATCH 057/546] nixgl: add support for channel-based configuration

---
 docs/manual/usage/gpu-non-nixos.md | 15 +++++++++++++--
 modules/misc/nixgl.nix             | 23 +++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/manual/usage/gpu-non-nixos.md b/docs/manual/usage/gpu-non-nixos.md
index 7b7cfbaea..0aefa4ae3 100644
--- a/docs/manual/usage/gpu-non-nixos.md
+++ b/docs/manual/usage/gpu-non-nixos.md
@@ -50,9 +50,9 @@ Xonotic to run on the dGPU, but uses the wrapper function directly for
 demonstration purposes.
 
 ```nix
-{ config, lib, pkgs, nixGL, ... }:
+{ config, lib, pkgs, nixgl, ... }:
 {
-  nixGL.packages = nixGL.packages;
+  nixGL.packages = nixgl.packages;
   nixGL.defaultWrapper = "mesa";
   nixGL.offloadWrapper = "nvidiaPrime";
   nixGL.installScripts = [ "mesa" "nvidiaPrime" ];
@@ -68,3 +68,14 @@ demonstration purposes.
   ];
 }
 ```
+
+The above example assumes a flake-based setup where `nixgl` was passed from the
+flake. When using channels, the example would instead begin with
+
+```nix
+{ config, lib, pkgs, ... }:
+{
+  nixGL.packages = import <nixgl> { inherit pkgs; };
+  # The rest is the same as above
+  ...
+```
diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index f45c483bc..2c7fcaffc 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -138,11 +138,30 @@ in {
   };
 
   config = let
+    findWrapperPackage = packageAttr:
+      # NixGL has wrapper packages in different places depending on how you
+      # access it. We want HM configuration to be the same, regardless of how
+      # NixGL is imported.
+      #
+      # First, let's see if we have a flake.
+      if builtins.hasAttr pkgs.system cfg.packages then
+        cfg.packages.${pkgs.system}.${packageAttr}
+      else
+      # Next, let's see if we have a channel.
+      if builtins.hasAttr packageAttr cfg.packages then
+        cfg.packages.${packageAttr}
+      else
+      # Lastly, with channels, some wrappers are grouped under "auto".
+      if builtins.hasAttr "auto" cfg.packages then
+        cfg.packages.auto.${packageAttr}
+      else
+        throw "Incompatible NixGL package layout";
+
     getWrapperExe = vendor:
       let
-        glPackage = cfg.packages.${pkgs.system}."nixGL${vendor}";
+        glPackage = findWrapperPackage "nixGL${vendor}";
         glExe = lib.getExe glPackage;
-        vulkanPackage = cfg.packages.${pkgs.system}."nixVulkan${vendor}";
+        vulkanPackage = findWrapperPackage "nixVulkan${vendor}";
         vulkanExe = if cfg.vulkan.enable then lib.getExe vulkanPackage else "";
       in "${glExe} ${vulkanExe}";
 

From c77c3bb23390a9ba91860e721edde54856fc5f7a Mon Sep 17 00:00:00 2001
From: "Giovanni Nicosia (mood)" <74420740+no-mood@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:04:00 +0200
Subject: [PATCH 058/546] yazi: enable shell integration values by default

Previously,

  - `programs.yazi.enableNushellIntegration`,
  - `programs.yazi.enableFishIntegration`, and
  - `programs.yazi.enableZshIntegration`

were set to false by default. It seems more appropriate to enable
these integrations by default.
---
 modules/programs/yazi.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index d7b880200..0f5117dbd 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -56,13 +56,21 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration";
+    enableBashIntegration = mkEnableOption "Bash integration" // {
+      default = true;
+    };
 
-    enableZshIntegration = mkEnableOption "Zsh integration";
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
+      default = true;
+    };
 
-    enableFishIntegration = mkEnableOption "Fish integration";
+    enableFishIntegration = mkEnableOption "Fish integration" // {
+      default = true;
+    };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration";
+    enableNushellIntegration = mkEnableOption "Nushell integration" // {
+      default = true;
+    };
 
     keymap = mkOption {
       type = tomlFormat.type;

From 6cc03e337aa1d0222e5942f58839d965075a9781 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 21 Oct 2024 10:29:57 +0000
Subject: [PATCH 059/546] nix-gc: add `randomizedDelaySec` option

There's no launchd equivalent to this option, so this is a no-op on
Darwin.
---
 modules/services/nix-gc.nix                  | 13 +++++++++++++
 tests/modules/services/nix-gc/basic.nix      |  1 +
 tests/modules/services/nix-gc/expected.timer |  1 +
 3 files changed, 15 insertions(+)

diff --git a/modules/services/nix-gc.nix b/modules/services/nix-gc.nix
index 50e8b6351..7789aeffb 100644
--- a/modules/services/nix-gc.nix
+++ b/modules/services/nix-gc.nix
@@ -81,6 +81,18 @@ in {
         '';
       };
 
+      randomizedDelaySec = lib.mkOption {
+        default = "0";
+        type = lib.types.singleLineStr;
+        example = "45min";
+        description = ''
+          Add a randomized delay before each garbage collection.
+          The delay will be chosen between zero and this value.
+          This value must be a time span in the format specified by
+          {manpage}`systemd.time(7)`
+        '';
+      };
+
       options = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -121,6 +133,7 @@ in {
         Unit = { Description = "Nix Garbage Collector"; };
         Timer = {
           OnCalendar = "${cfg.frequency}";
+          RandomizedDelaySec = cfg.randomizedDelaySec;
           Persistent = cfg.persistent;
           Unit = "nix-gc.service";
         };
diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/basic.nix
index a06b67238..1fc019da7 100644
--- a/tests/modules/services/nix-gc/basic.nix
+++ b/tests/modules/services/nix-gc/basic.nix
@@ -4,6 +4,7 @@
   nix.gc = {
     automatic = true;
     frequency = "monthly";
+    randomizedDelaySec = "42min";
     options = "--delete-older-than 30d --max-freed $((64 * 1024**3))";
   };
 
diff --git a/tests/modules/services/nix-gc/expected.timer b/tests/modules/services/nix-gc/expected.timer
index ef30df435..70232bb47 100644
--- a/tests/modules/services/nix-gc/expected.timer
+++ b/tests/modules/services/nix-gc/expected.timer
@@ -4,6 +4,7 @@ WantedBy=timers.target
 [Timer]
 OnCalendar=monthly
 Persistent=true
+RandomizedDelaySec=42min
 Unit=nix-gc.service
 
 [Unit]

From c0e23159872e2e2135c7eb5cf96cd36cfe6ee1f4 Mon Sep 17 00:00:00 2001
From: Tomo <tomodachi94@protonmail.com>
Date: Fri, 25 Oct 2024 06:56:37 -0700
Subject: [PATCH 060/546] git-credential-oauth: add extraFlags option

This facilitates a legitimate use-case for browserless systems. From the
README:
> On systems without a web browser, set the -device flag to authenticate
> on another device using [OAuth device flow]:
> ```ini
  [credential]
	  helper = cache --timeout 7200	# two hours
	  helper = oauth -device
  ```

[OAuth device flow]: https://www.rfc-editor.org/rfc/rfc8628

Please note that, for the documentation about the man-page to be
accurate, https://github.com/NixOS/nixpkgs/pull/302922 must be merged.
---
 modules/programs/git-credential-oauth.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
index 4833e8068..1f4b99247 100644
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@@ -12,13 +12,26 @@ in {
       enable = lib.mkEnableOption "Git authentication handler for OAuth";
 
       package = lib.mkPackageOption pkgs "git-credential-oauth" { };
+
+      extraFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        example = lib.literalExpression ''[ "-device" ]'';
+        description = ''
+          Extra command-line arguments passed to git-credential-oauth.
+
+          For valid arguments, see {manpage}`git-credential-oauth(1)`.
+        '';
+      };
     };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.git.extraConfig.credential.helper =
-      [ "${cfg.package}/bin/git-credential-oauth" ];
+    programs.git.extraConfig.credential.helper = [
+      ("${cfg.package}/bin/git-credential-oauth" + lib.mkIf cfg.extraFlags
+        " ${lib.strings.concatStringsSep " " cfg.extraFlags}")
+    ];
   };
 }

From 0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0 Mon Sep 17 00:00:00 2001
From: nyadiia <nyadiia@pm.me>
Date: Wed, 23 Oct 2024 16:35:08 -0500
Subject: [PATCH 061/546] eza: add color option

---
 modules/programs/eza.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix
index 679f53499..f35912b8c 100644
--- a/modules/programs/eza.nix
+++ b/modules/programs/eza.nix
@@ -59,6 +59,14 @@ with lib;
       '';
     };
 
+    colors = mkOption {
+      type = types.enum [ null "auto" "always" "never" ];
+      default = null;
+      description = ''
+        Use terminal colors in output ({option}`--color` argument).
+      '';
+    };
+
     git = mkOption {
       type = types.bool;
       default = false;
@@ -80,8 +88,9 @@ with lib;
         cfg.icons;
     in optionals (v != null) [ "--icons" v ];
 
-    args = escapeShellArgs
-      (iconsOption ++ optional cfg.git "--git" ++ cfg.extraOptions);
+    args = escapeShellArgs (iconsOption
+      ++ optionals (cfg.colors != null) [ "--color" cfg.colors ]
+      ++ optional cfg.git "--git" ++ cfg.extraOptions);
 
     optionsAlias = optionalAttrs (args != "") { eza = "eza ${args}"; };
 

From 93435d27d250fa986bfec6b2ff263161ff8288cb Mon Sep 17 00:00:00 2001
From: William Phetsinorath <william.phetsinorath@shikanime.studio>
Date: Fri, 25 Oct 2024 17:06:02 +0200
Subject: [PATCH 062/546] direnv: add support for mise integration

---
 modules/programs/direnv.nix               | 16 +++++++++++++++-
 tests/modules/programs/direnv/default.nix |  1 +
 tests/modules/programs/direnv/mise.nix    | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/programs/direnv/mise.nix

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 6d0af3ac1..37899c4a2 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -19,7 +19,7 @@ in {
       "Flake support is now always enabled.")
   ];
 
-  meta.maintainers = [ lib.maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee lib.maintainers.shikanime ];
 
   options.programs.direnv = {
     enable = mkEnableOption "direnv, the environment switcher";
@@ -95,6 +95,14 @@ in {
       package = mkPackageOption pkgs "nix-direnv" { };
     };
 
+    mise = {
+      enable = mkEnableOption ''
+        [mise](https://mise.jdx.dev/direnv.html),
+        integration of use_mise for direnv'';
+
+      package = mkPackageOption pkgs "mise" { };
+    };
+
     silent = mkEnableOption "silent mode, that is, disabling direnv logging";
   };
 
@@ -112,6 +120,12 @@ in {
     xdg.configFile."direnv/direnvrc" =
       lib.mkIf (cfg.stdlib != "") { text = cfg.stdlib; };
 
+    xdg.configFile."direnv/lib/hm-mise.sh" = mkIf cfg.mise.enable {
+      text = ''
+        eval "$(${getExe cfg.mise.package} direnv activate)"
+      '';
+    };
+
     programs.bash.initExtra = mkIf cfg.enableBashIntegration (
       # Using mkAfter to make it more likely to appear after other
       # manipulations of the prompt.
diff --git a/tests/modules/programs/direnv/default.nix b/tests/modules/programs/direnv/default.nix
index a0e618481..b61fb1e33 100644
--- a/tests/modules/programs/direnv/default.nix
+++ b/tests/modules/programs/direnv/default.nix
@@ -1,5 +1,6 @@
 {
   direnv-bash = ./bash.nix;
+  direnv-mise = ./mise.nix;
   direnv-nix-direnv = ./nix-direnv.nix;
   direnv-nushell = ./nushell.nix;
   direnv-stdlib = ./stdlib.nix;
diff --git a/tests/modules/programs/direnv/mise.nix b/tests/modules/programs/direnv/mise.nix
new file mode 100644
index 000000000..b205df627
--- /dev/null
+++ b/tests/modules/programs/direnv/mise.nix
@@ -0,0 +1,17 @@
+{ config, ... }:
+
+{
+  programs.bash.enable = true;
+  programs.direnv = {
+    enable = true;
+    mise = {
+      enable = true;
+      package = config.lib.test.mkStubPackage { name = "mise"; };
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileExists home-files/.config/direnv/lib/hm-mise.sh
+  '';
+}

From 05d9bee4a5155758aec3c3807c0e342b9f253522 Mon Sep 17 00:00:00 2001
From: Tomo <tomodachi94@protonmail.com>
Date: Sat, 26 Oct 2024 23:45:32 -0700
Subject: [PATCH 063/546] git-credential-oauth: fix use of mkIf and add tests

Closes #6005
---
 modules/programs/git-credential-oauth.nix     |  3 ++-
 tests/default.nix                             |  1 +
 .../programs/git-credential-oauth/basic.nix   | 16 ++++++++++++++++
 .../programs/git-credential-oauth/default.nix |  4 ++++
 .../git-credential-oauth/extra-flags.nix      | 19 +++++++++++++++++++
 5 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/programs/git-credential-oauth/basic.nix
 create mode 100644 tests/modules/programs/git-credential-oauth/default.nix
 create mode 100644 tests/modules/programs/git-credential-oauth/extra-flags.nix

diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
index 1f4b99247..5fa54276c 100644
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@@ -30,7 +30,8 @@ in {
     home.packages = [ cfg.package ];
 
     programs.git.extraConfig.credential.helper = [
-      ("${cfg.package}/bin/git-credential-oauth" + lib.mkIf cfg.extraFlags
+      ("${cfg.package}/bin/git-credential-oauth"
+        + lib.optionalString (cfg.extraFlags != [ ])
         " ${lib.strings.concatStringsSep " " cfg.extraFlags}")
     ];
   };
diff --git a/tests/default.nix b/tests/default.nix
index f4b03275b..3271d3052 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -81,6 +81,7 @@ in import nmtSrc {
     ./modules/programs/gh-dash
     ./modules/programs/git
     ./modules/programs/git-cliff
+    ./modules/programs/git-credential-oauth
     ./modules/programs/gpg
     ./modules/programs/gradle
     ./modules/programs/granted
diff --git a/tests/modules/programs/git-credential-oauth/basic.nix b/tests/modules/programs/git-credential-oauth/basic.nix
new file mode 100644
index 000000000..741adfbfb
--- /dev/null
+++ b/tests/modules/programs/git-credential-oauth/basic.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  programs.git-credential-oauth = { enable = true; };
+
+  programs.git = { enable = true; };
+
+  test.stubs.git-credential-oauth = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContains \
+      home-files/.config/git/config \
+      "${config.programs.git-credential-oauth.package}/bin/git-credential-oauth"
+  '';
+}
diff --git a/tests/modules/programs/git-credential-oauth/default.nix b/tests/modules/programs/git-credential-oauth/default.nix
new file mode 100644
index 000000000..63ecb183a
--- /dev/null
+++ b/tests/modules/programs/git-credential-oauth/default.nix
@@ -0,0 +1,4 @@
+{
+  git-credential-oauth-basic = ./basic.nix;
+  git-credential-oauth-extra-flags = ./extra-flags.nix;
+}
diff --git a/tests/modules/programs/git-credential-oauth/extra-flags.nix b/tests/modules/programs/git-credential-oauth/extra-flags.nix
new file mode 100644
index 000000000..7a586ede6
--- /dev/null
+++ b/tests/modules/programs/git-credential-oauth/extra-flags.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  programs.git-credential-oauth = {
+    enable = true;
+    extraFlags = [ "-device" ];
+  };
+
+  programs.git = { enable = true; };
+
+  test.stubs.git-credential-oauth = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContains \
+      home-files/.config/git/config \
+      "${config.programs.git-credential-oauth.package}/bin/git-credential-oauth -device"
+  '';
+}

From e83414058edd339148dc142a8437edb9450574c8 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:15:08 +0100
Subject: [PATCH 064/546] 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/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
  → 'github:NixOS/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a?narHash=sha256-RP%2BOQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM%3D' (2024-10-25)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index d052ebff2..b03cf135b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729256560,
-        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {

From 8ca921e5a806b5b6171add542defe7bdac79d189 Mon Sep 17 00:00:00 2001
From: Kosta Gorodetsky <korolx147@gmail.com>
Date: Fri, 1 Nov 2024 10:46:22 +0200
Subject: [PATCH 065/546] git-credential-oauth: fix ordering of git extraConfig

Added `mkAfter` to `git.extraConfig` to ensure our oauth is last, as
required to work with additional helpers.
---
 modules/programs/git-credential-oauth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
index 5fa54276c..499c7c4c1 100644
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@@ -29,7 +29,7 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.git.extraConfig.credential.helper = [
+    programs.git.extraConfig.credential.helper = lib.mkAfter [
       ("${cfg.package}/bin/git-credential-oauth"
         + lib.optionalString (cfg.extraFlags != [ ])
         " ${lib.strings.concatStringsSep " " cfg.extraFlags}")

From 1743615b61c7285976f85b303a36cdf88a556503 Mon Sep 17 00:00:00 2001
From: Nicholas Hassan <nick@hassan.host>
Date: Fri, 22 Dec 2023 10:54:18 +1030
Subject: [PATCH 066/546] podman: add module

Adds a new Podman module for creating user containers and networks as
systemd services. These are installed to the user's
`$XDG_CONFIG/systemd/user` directory.
---
 modules/lib/maintainers.nix                   |  16 +
 modules/misc/news.nix                         |  14 +
 modules/modules.nix                           |   1 +
 modules/services/podman-linux/activation.nix  |  99 ++++++
 modules/services/podman-linux/containers.nix  | 313 ++++++++++++++++++
 modules/services/podman-linux/default.nix     |  17 +
 .../services/podman-linux/install-quadlet.nix |  88 +++++
 modules/services/podman-linux/networks.nix    | 168 ++++++++++
 modules/services/podman-linux/options.nix     |  52 +++
 modules/services/podman-linux/podman-lib.nix  | 136 ++++++++
 modules/services/podman-linux/services.nix    |  65 ++++
 tests/default.nix                             |   1 +
 .../podman-linux/container-expected.service   |  51 +++
 .../services/podman-linux/container.nix       |  60 ++++
 .../modules/services/podman-linux/default.nix |   6 +
 .../integration-container-expected.service    |  41 +++
 .../integration-network-expected.service      |  29 ++
 .../services/podman-linux/integration.nix     |  29 ++
 .../services/podman-linux/manifest.nix        |  64 ++++
 .../podman-linux/network-expected.service     |  33 ++
 .../modules/services/podman-linux/network.nix |  44 +++
 21 files changed, 1327 insertions(+)
 create mode 100644 modules/services/podman-linux/activation.nix
 create mode 100644 modules/services/podman-linux/containers.nix
 create mode 100644 modules/services/podman-linux/default.nix
 create mode 100644 modules/services/podman-linux/install-quadlet.nix
 create mode 100644 modules/services/podman-linux/networks.nix
 create mode 100644 modules/services/podman-linux/options.nix
 create mode 100644 modules/services/podman-linux/podman-lib.nix
 create mode 100644 modules/services/podman-linux/services.nix
 create mode 100644 tests/modules/services/podman-linux/container-expected.service
 create mode 100644 tests/modules/services/podman-linux/container.nix
 create mode 100644 tests/modules/services/podman-linux/default.nix
 create mode 100644 tests/modules/services/podman-linux/integration-container-expected.service
 create mode 100644 tests/modules/services/podman-linux/integration-network-expected.service
 create mode 100644 tests/modules/services/podman-linux/integration.nix
 create mode 100644 tests/modules/services/podman-linux/manifest.nix
 create mode 100644 tests/modules/services/podman-linux/network-expected.service
 create mode 100644 tests/modules/services/podman-linux/network.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 6b7dc8b42..91ecb47be 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -43,6 +43,12 @@
     github = "Avimitin";
     githubId = 30021675;
   };
+  bamhm182 = {
+    name = "bamhm182";
+    email = "bamhm182@gmail.com";
+    github = "bamhm182";
+    githubId = 920269;
+  };
   blmhemu = {
     name = "blmhemu";
     email = "19410501+blmhemu@users.noreply.github.com";
@@ -288,6 +294,16 @@
     github = "NitroSniper";
     githubId = 44097331;
   };
+  n-hass = {
+    name = "Nicholas Hassan";
+    email = "nick@hassan.host";
+    github = "n-hass";
+    githubId = 72363381;
+    keys = [{
+      longkeyid = "rsa4096/0xFC95AB946A781EE7";
+      fingerprint = "FDEE 6116 DBA7 8840 7323  4466 A371 5973 2728 A6A6";
+    }];
+  };
   seylerius = {
     email = "sable@seyleri.us";
     name = "Sable Seyler";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 801391cc2..aeec8f9a0 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1813,6 +1813,20 @@ in {
           systems" section in the Home Manager mantual for more.
         '';
       }
+
+      {
+        time = "2024-11-01T19:44:59+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.podman'.
+
+          Podman is a daemonless container engine that lets you manage
+          containers, pods, and images.
+
+          This Home Manager module allows you to define containers that will run
+          as systemd services.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 3b4985083..75f8ac461 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -352,6 +352,7 @@ let
     ./services/plan9port.nix
     ./services/playerctld.nix
     ./services/plex-mpv-shim.nix
+    ./services/podman-linux
     ./services/polybar.nix
     ./services/poweralertd.nix
     ./services/psd.nix
diff --git a/modules/services/podman-linux/activation.nix b/modules/services/podman-linux/activation.nix
new file mode 100644
index 000000000..5791f19b0
--- /dev/null
+++ b/modules/services/podman-linux/activation.nix
@@ -0,0 +1,99 @@
+{ config, podman-lib, ... }:
+
+{
+  cleanup = ''
+    PATH=$PATH:${podman-lib.newuidmapPaths}
+    export VERBOSE=true
+
+    DRYRUN_ENABLED() {
+      return $([ -n "''${DRY_RUN:-}" ] && echo 0 || echo 1)
+    }
+
+    VERBOSE_ENABLED() {
+      return $([ -n "''${VERBOSE:-}" ] && echo 0 || echo 1)
+    }
+
+    cleanup() {
+      local resourceType=$1
+      local manifestFile="${config.xdg.configHome}/podman/$2"
+      local extraListCommands="''${3:-}"
+      [[ $resourceType = "container" ]] && extraListCommands+=" -a"
+
+      [ ! -f "$manifestFile" ] && VERBOSE_ENABLED && echo "Manifest does not exist: $manifestFile" && return 0
+
+      VERBOSE_ENABLED && echo "Cleaning up ''${resourceType}s not in manifest..." || true
+
+      loadManifest "$manifestFile"
+
+      formatString="{{.Name}}"
+      [[ $resourceType = "container" ]] && formatString="{{.Names}}"
+
+      local listOutput=$(${config.services.podman.package}/bin/podman $resourceType ls $extraListCommands --filter 'label=nix.home-manager.managed=true' --format "$formatString")
+
+      IFS=$'\n' read -r -d "" -a podmanResources <<< "$listOutput" || true
+
+      if [ ''${#podmanResources[@]} -eq 0 ]; then
+        VERBOSE_ENABLED && echo "No ''${resourceType}s available to process." || true
+      else
+        for resource in "''${podmanResources[@]}"; do
+            if ! isResourceInManifest "$resource"; then
+              removeResource "$resourceType" "$resource"
+            else
+              VERBOSE_ENABLED && echo "Keeping managed $resourceType: $resource" || true
+            fi
+          done
+      fi
+    }
+
+    isResourceInManifest() {
+      local resource="$1"
+      for manifestEntry in "''${resourceManifest[@]}"; do
+        if [ "$resource" = "$manifestEntry" ]; then
+          return 0  # Resource found in manifest
+        fi
+      done
+      return 1  # Resource not found in manifest
+    }
+
+    # Function to fill resourceManifest from the manifest file
+    loadManifest() {
+      local manifestFile="$1"
+      VERBOSE_ENABLED && echo "Loading manifest from $manifestFile..." || true
+      IFS=$'\n' read -r -d "" -a resourceManifest <<< "$(cat "$manifestFile")" || true
+    }
+
+    removeResource() {
+      local resourceType="$1"
+      local resource="$2"
+      echo "Removing orphaned $resourceType: $resource"
+      commands=()
+      case "$resourceType" in
+        "container")
+          commands+="${config.services.podman.package}/bin/podman $resourceType stop $resource"
+          commands+="${config.services.podman.package}/bin/podman $resourceType rm -f $resource"
+          ;;
+        "network")
+          commands+="${config.services.podman.package}/bin/podman $resourceType rm $resource"
+          ;;
+      esac
+      for command in "''${commands[@]}"; do
+        command=$(echo $command | tr -d ';&|`')
+        DRYRUN_ENABLED && echo "Would run: $command" && continue || true
+        VERBOSE_ENABLED && echo "Running: $command" || true
+        if [[ "$(eval "$command")" != "$resource" ]]; then
+          echo -e "\tCommand failed: ''${command}"
+          usedByContainers=$(${config.services.podman.package}/bin/podman container ls -a --filter "$resourceType=$resource" --format "{{.Names}}")
+          echo -e "\t$resource in use by containers: $usedByContainers"
+        fi
+      done
+    }
+
+    resourceManifest=()
+    [[ "$@" == *"--verbose"* ]] && VERBOSE="true"
+    [[ "$@" == *"--dry-run"* ]] && DRY_RUN="true"
+
+    for type in "container" "network"; do
+      cleanup "$type" "''${type}s.manifest"
+    done
+  '';
+}
diff --git a/modules/services/podman-linux/containers.nix b/modules/services/podman-linux/containers.nix
new file mode 100644
index 000000000..41ab29130
--- /dev/null
+++ b/modules/services/podman-linux/containers.nix
@@ -0,0 +1,313 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit lib config; };
+
+  createQuadletSource = name: containerDef:
+    let
+      mapHmNetworks = network:
+        if builtins.hasAttr network cfg.networks then
+          "podman-${network}-network.service"
+        else
+          null;
+
+      finalConfig = let
+        managedNetworks = if lib.isList containerDef.network then
+          map mapHmNetworks containerDef.network
+        else if containerDef.network != null then
+          map mapHmNetworks [ containerDef.network ]
+        else
+          [ ];
+      in (podman-lib.deepMerge {
+        Container = {
+          AddCapability = containerDef.addCapabilities;
+          AddDevice = containerDef.devices;
+          AutoUpdate = containerDef.autoUpdate;
+          ContainerName = name;
+          DropCapability = containerDef.dropCapabilities;
+          Entrypoint = containerDef.entrypoint;
+          Environment = containerDef.environment;
+          EnvironmentFile = containerDef.environmentFile;
+          Exec = containerDef.exec;
+          Group = containerDef.group;
+          Image = containerDef.image;
+          IP = containerDef.ip4;
+          IP6 = containerDef.ip6;
+          Label =
+            (containerDef.labels // { "nix.home-manager.managed" = true; });
+          Network = containerDef.network;
+          NetworkAlias = containerDef.networkAlias;
+          PodmanArgs = containerDef.extraPodmanArgs;
+          PublishPort = containerDef.ports;
+          UserNS = containerDef.userNS;
+          User = containerDef.user;
+          Volume = containerDef.volumes;
+        };
+        Install = {
+          WantedBy = (if containerDef.autoStart then [
+            "default.target"
+            "multi-user.target"
+          ] else
+            [ ]);
+        };
+        Service = {
+          Environment = {
+            PATH = (builtins.concatStringsSep ":" [
+              "/run/wrappers/bin"
+              "/run/current-system/sw/bin"
+              "${config.home.homeDirectory}/.nix-profile/bin"
+            ]);
+          };
+          Restart = "always";
+          TimeoutStopSec = 30;
+        };
+        Unit = {
+          After = [ "network.target" ] ++ managedNetworks;
+          Requires = managedNetworks;
+          Description = (if (builtins.isString containerDef.description) then
+            containerDef.description
+          else
+            "Service for container ${name}");
+        };
+      } containerDef.extraConfig);
+    in ''
+      # Automatically generated by home-manager podman container configuration
+      # DO NOT EDIT THIS FILE DIRECTLY
+      #
+      # ${name}.container
+      ${podman-lib.toQuadletIni finalConfig}
+    '';
+
+  toQuadletInternal = name: containerDef: {
+    assertions = podman-lib.buildConfigAsserts name containerDef.extraConfig;
+    resourceType = "container";
+    serviceName =
+      "podman-${name}"; # quadlet service name: 'podman-<name>.service'
+    source =
+      podman-lib.removeBlankLines (createQuadletSource name containerDef);
+  };
+
+  # Define the container user type as the user interface
+  containerDefinitionType = types.submodule {
+    options = {
+
+      addCapabilities = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "CAP_DAC_OVERRIDE" "CAP_IPC_OWNER" ];
+        description = "The capabilities to add to the container.";
+      };
+
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to start the container on boot (requires user lingering).
+        '';
+      };
+
+      autoUpdate = mkOption {
+        type = types.enum [ null "registry" "local" ];
+        default = null;
+        example = "registry";
+        description = "The autoupdate policy for the container.";
+      };
+
+      description = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "My Container";
+        description = "The description of the container.";
+      };
+
+      devices = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "/dev/<host>:/dev/<container>" ];
+        description = "The devices to mount into the container";
+      };
+
+      dropCapabilities = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "CAP_DAC_OVERRIDE" "CAP_IPC_OWNER" ];
+        description = "The capabilities to drop from the container.";
+      };
+
+      entrypoint = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "/foo.sh";
+        description = "The container entrypoint.";
+      };
+
+      environment = mkOption {
+        type = podman-lib.primitiveAttrs;
+        default = { };
+        example = literalExpression ''
+          {
+            VAR1 = "0:100";
+            VAR2 = true;
+            VAR3 = 5;
+          }
+        '';
+        description = "Environment variables to set in the container.";
+      };
+
+      environmentFile = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "/etc/environment" "/etc/other-env" ];
+        description = ''
+          Paths to files containing container environment variables.
+        '';
+      };
+
+      exec = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "sleep inf";
+        description = "The command to run after the container start.";
+      };
+
+      extraPodmanArgs = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [
+          "--security-opt=no-new-privileges"
+          "--security-opt=seccomp=unconfined"
+        ];
+        description = "Extra arguments to pass to the podman run command.";
+      };
+
+      extraConfig = mkOption {
+        type = podman-lib.extraConfigType;
+        default = { };
+        example = literalExpression ''
+          {
+            Container = {
+              User = 1000;
+            };
+            Service = {
+              TimeoutStartSec = 15;
+            };
+          }
+        '';
+        description = ''
+          INI sections and values to populate the Container Quadlet.
+        '';
+      };
+
+      group = mkOption {
+        type = with types; nullOr (either int str);
+        default = null;
+        description = "The group ID inside the container.";
+      };
+
+      image = mkOption {
+        type = types.str;
+        example = "registry.access.redhat.com/ubi9-minimal:latest";
+        description = "The container image.";
+      };
+
+      ip4 = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "Set an IPv4 address for the container.";
+      };
+
+      ip6 = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "Set an IPv6 address for the container.";
+      };
+
+      labels = mkOption {
+        type = with types; attrsOf str;
+        default = { };
+        example = {
+          app = "myapp";
+          some-label = "somelabel";
+        };
+        description = "The labels to apply to the container.";
+      };
+
+      network = mkOption {
+        type = with types; either str (listOf str);
+        default = [ ];
+        apply = value: if isString value then [ value ] else value;
+        example = literalMD ''
+          `"host"`
+          or
+          `"bridge_network_1"`
+          or
+          `[ "bridge_network_1" "bridge_network_2" ]`
+        '';
+        description = ''
+          The network mode or network/s to connect the container to. Equivalent
+          to `podman run --network=<option>`.
+        '';
+      };
+
+      networkAlias = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "mycontainer" "web" ];
+        description = "Network aliases for the container.";
+      };
+
+      ports = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "8080:80" "8443:443" ];
+        description = "A mapping of ports between host and container";
+      };
+
+      userNS = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "Use a user namespace for the container.";
+      };
+
+      user = mkOption {
+        type = with types; nullOr (either int str);
+        default = null;
+        description = "The user ID inside the container.";
+      };
+
+      volumes = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "/tmp:/tmp" "/var/run/test.secret:/etc/secret:ro" ];
+        description = "The volumes to mount into the container.";
+      };
+
+    };
+  };
+
+in {
+
+  imports = [ ./options.nix ];
+
+  options.services.podman.containers = mkOption {
+    type = types.attrsOf containerDefinitionType;
+    default = { };
+    description = "Defines Podman container quadlet configurations.";
+  };
+
+  config =
+    let containerQuadlets = mapAttrsToList toQuadletInternal cfg.containers;
+    in mkIf cfg.enable {
+      services.podman.internal.quadletDefinitions = containerQuadlets;
+      assertions =
+        flatten (map (container: container.assertions) containerQuadlets);
+
+      # manifest file
+      home.file."${config.xdg.configHome}/podman/containers.manifest".text =
+        podman-lib.generateManifestText containerQuadlets;
+    };
+}
diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix
new file mode 100644
index 000000000..3a77d1595
--- /dev/null
+++ b/modules/services/podman-linux/default.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }:
+
+{
+  meta.maintainers = with lib.hm.maintainers; [ bamhm182 n-hass ];
+
+  imports =
+    [ ./containers.nix ./install-quadlet.nix ./networks.nix ./services.nix ];
+
+  options.services.podman = {
+    enable = lib.mkEnableOption "Podman, a daemonless container engine";
+  };
+
+  config = lib.mkIf config.services.podman.enable {
+    assertions =
+      [ (lib.hm.assertions.assertPlatform "podman" pkgs lib.platforms.linux) ];
+  };
+}
diff --git a/modules/services/podman-linux/install-quadlet.nix b/modules/services/podman-linux/install-quadlet.nix
new file mode 100644
index 000000000..8ce6a33e8
--- /dev/null
+++ b/modules/services/podman-linux/install-quadlet.nix
@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit lib config; };
+  activation = import ./activation.nix { inherit config podman-lib; };
+
+  activationCleanupScript = activation.cleanup;
+
+  # derivation to build a single Podman quadlet, outputting its systemd unit files
+  buildPodmanQuadlet = quadlet:
+    pkgs.stdenv.mkDerivation {
+      name = "home-${quadlet.resourceType}-${quadlet.serviceName}";
+
+      buildInputs = [ cfg.package ];
+
+      dontUnpack = true;
+
+      installPhase = ''
+        mkdir $out
+        # Directory for the quadlet file
+        mkdir -p $out/quadlets
+        # Directory for systemd unit files
+        mkdir -p $out/units
+
+        # Write the quadlet file
+        echo -n "${quadlet.source}" > $out/quadlets/${quadlet.serviceName}.${quadlet.resourceType}
+
+        # Generate systemd unit file/s from the quadlet file
+        export QUADLET_UNIT_DIRS=$out/quadlets
+        ${cfg.package}/lib/systemd/user-generators/podman-user-generator $out/units
+      '';
+
+      passthru = {
+        outPath = self.out;
+        quadletData = quadlet;
+      };
+    };
+
+  # Create a derivation for each quadlet spec
+  builtQuadlets = map buildPodmanQuadlet cfg.internal.quadletDefinitions;
+
+  accumulateUnitFiles = prefix: path: quadlet:
+    let
+      entries = builtins.readDir path;
+      processEntry = name: type:
+        let
+          newPath = "${path}/${name}";
+          newPrefix = prefix + (if prefix == "" then "" else "/") + name;
+        in if type == "directory" then
+          accumulateUnitFiles newPrefix newPath quadlet
+        else [{
+          key = newPrefix;
+          value = {
+            path = newPath;
+            parentQuadlet = quadlet;
+          };
+        }];
+    in flatten
+    (map (name: processEntry name (getAttr name entries)) (attrNames entries));
+
+  allUnitFiles = concatMap (builtQuadlet:
+    accumulateUnitFiles "" "${builtQuadlet.outPath}/units"
+    builtQuadlet.quadletData) builtQuadlets;
+
+  # we're doing this because the home-manager recursive file linking implementation can't
+  # merge from multiple sources. so we link each file explicitly, which is fine for all unique files
+  generateSystemdFileLinks = files:
+    listToAttrs (map (unitFile: {
+      name = "${config.xdg.configHome}/systemd/user/${unitFile.key}";
+      value = { source = unitFile.value.path; };
+    }) files);
+
+in {
+  imports = [ ./options.nix ];
+
+  config = mkIf cfg.enable {
+    home.file = generateSystemdFileLinks allUnitFiles;
+
+    # if the length of builtQuadlets is 0, then we don't need register the activation script
+    home.activation.podmanQuadletCleanup =
+      lib.mkIf (lib.length builtQuadlets >= 1)
+      (lib.hm.dag.entryAfter [ "reloadSystemd" ] activationCleanupScript);
+  };
+}
diff --git a/modules/services/podman-linux/networks.nix b/modules/services/podman-linux/networks.nix
new file mode 100644
index 000000000..bb4ac5915
--- /dev/null
+++ b/modules/services/podman-linux/networks.nix
@@ -0,0 +1,168 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit lib config; };
+
+  awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" ''
+    until ${cfg.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do
+      sleep 1;
+    done
+  '';
+
+  createQuadletSource = name: networkDef:
+    let
+      cfg = (podman-lib.deepMerge {
+        Install = {
+          WantedBy = (if networkDef.autoStart then [
+            "default.target"
+            "multi-user.target"
+          ] else
+            [ ]);
+        };
+        Network = {
+          Driver = networkDef.driver;
+          Gateway = networkDef.gateway;
+          Internal = networkDef.internal;
+          NetworkName = name;
+          Label = networkDef.labels // { "nix.home-manager.managed" = true; };
+          PodmanArgs = networkDef.extraPodmanArgs;
+          Subnet = networkDef.subnet;
+        };
+        Service = {
+          Environment = {
+            PATH = (builtins.concatStringsSep ":" [
+              "${podman-lib.newuidmapPaths}"
+              "${makeBinPath [ pkgs.su pkgs.coreutils ]}"
+            ]);
+          };
+          ExecStartPre = [ "${awaitPodmanUnshare}" ];
+          TimeoutStartSec = 15;
+          RemainAfterExit = "yes";
+        };
+        Unit = {
+          After = [ "network.target" ];
+          Description = (if (builtins.isString networkDef.description) then
+            networkDef.description
+          else
+            "Service for network ${name}");
+        };
+      } networkDef.extraConfig);
+    in ''
+      # Automatically generated by home-manager for podman network configuration
+      # DO NOT EDIT THIS FILE DIRECTLY
+      #
+      # ${name}.network
+      ${podman-lib.toQuadletIni cfg}
+    '';
+
+  toQuadletInternal = name: networkDef: {
+    assertions = podman-lib.buildConfigAsserts name networkDef.extraConfig;
+    serviceName =
+      "podman-${name}"; # quadlet service name: 'podman-<name>-network.service'
+    source = podman-lib.removeBlankLines (createQuadletSource name networkDef);
+    resourceType = "network";
+  };
+
+in let
+  networkDefinitionType = types.submodule {
+    options = {
+
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to start the network on boot (requires user lingering).
+        '';
+      };
+
+      description = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "My Network";
+        description = "The description of the network.";
+      };
+
+      driver = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "bridge";
+        description = "The network driver to use.";
+      };
+
+      extraConfig = mkOption {
+        type = podman-lib.extraConfigType;
+        default = { };
+        example = literalExpression ''
+          {
+            Network = {
+              ContainerConfModule = "/etc/nvd.conf";
+            };
+            Service = {
+              TimeoutStartSec = 30;
+            };
+          }
+        '';
+        description = "INI sections and values to populate the Network Quadlet";
+      };
+
+      extraPodmanArgs = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "--dns=192.168.55.1" "--ipam-driver" ];
+        description = ''
+          Extra arguments to pass to the podman network create command.
+        '';
+      };
+
+      gateway = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "192.168.20.1";
+        description = "The gateway IP to use for the network.";
+      };
+
+      internal = mkOption {
+        type = with types; nullOr bool;
+        default = null;
+        description = "Whether the network should be internal";
+      };
+
+      labels = mkOption {
+        type = with types; attrsOf str;
+        default = { };
+        example = {
+          app = "myapp";
+          some-label = "somelabel";
+        };
+        description = "The labels to apply to the network.";
+      };
+
+      subnet = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "192.168.20.0/24";
+        description = "The subnet to use for the network.";
+      };
+
+    };
+  };
+in {
+  options.services.podman.networks = mkOption {
+    type = types.attrsOf networkDefinitionType;
+    default = { };
+    description = "Defines Podman network quadlet configurations.";
+  };
+
+  config = let networkQuadlets = mapAttrsToList toQuadletInternal cfg.networks;
+  in mkIf cfg.enable {
+    services.podman.internal.quadletDefinitions = networkQuadlets;
+    assertions = flatten (map (network: network.assertions) networkQuadlets);
+
+    home.file."${config.xdg.configHome}/podman/networks.manifest".text =
+      podman-lib.generateManifestText networkQuadlets;
+  };
+}
diff --git a/modules/services/podman-linux/options.nix b/modules/services/podman-linux/options.nix
new file mode 100644
index 000000000..242028aea
--- /dev/null
+++ b/modules/services/podman-linux/options.nix
@@ -0,0 +1,52 @@
+{ lib, pkgs, ... }:
+
+let
+  # Define the systemd service type
+  quadletInternalType = lib.types.submodule {
+    options = {
+      assertions = lib.mkOption {
+        type = with lib.types; listOf unspecified;
+        default = [ ];
+        internal = true;
+        description = "List of Nix type assertions.";
+      };
+
+      resourceType = lib.mkOption {
+        type = lib.types.str;
+        default = "";
+        internal = true;
+        description = "The type of the podman Quadlet resource.";
+      };
+
+      serviceName = lib.mkOption {
+        type = lib.types.str;
+        internal = true;
+        description = "The name of the systemd service.";
+      };
+
+      source = lib.mkOption {
+        type = lib.types.str;
+        internal = true;
+        description = "The quadlet source file content.";
+      };
+    };
+  };
+in {
+  options.services.podman = {
+    internal.quadletDefinitions = lib.mkOption {
+      type = lib.types.listOf quadletInternalType;
+      default = { };
+      internal = true;
+      description = "List of quadlet source file content and service names.";
+    };
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.podman;
+      defaultText = lib.literalExpression "pkgs.podman";
+      description = "The podman package to use.";
+    };
+
+    enableTypeChecks = lib.mkEnableOption "type checks for podman quadlets";
+  };
+}
diff --git a/modules/services/podman-linux/podman-lib.nix b/modules/services/podman-linux/podman-lib.nix
new file mode 100644
index 000000000..1acc930fc
--- /dev/null
+++ b/modules/services/podman-linux/podman-lib.nix
@@ -0,0 +1,136 @@
+{ lib, config, ... }:
+
+with lib;
+
+let
+  normalizeKeyValue = k: v:
+    let
+      v' = (if builtins.isBool v then
+        (if v then "true" else "false")
+      else if builtins.isAttrs v then
+        (concatStringsSep ''
+
+          ${k}='' (mapAttrsToList normalizeKeyValue v))
+      else
+        builtins.toString v);
+    in if builtins.isNull v then "" else "${k}=${v'}";
+
+  primitiveAttrs = with types; attrsOf (either primitive (listOf primitive));
+  primitiveList = with types; listOf primitive;
+  primitive = with types; nullOr (oneOf [ bool int str path ]);
+
+  toQuadletIni = generators.toINI {
+    listsAsDuplicateKeys = true;
+    mkKeyValue = normalizeKeyValue;
+  };
+
+  # meant for ini. favours b when two values are unmergeable
+  deepMerge = a: b:
+    foldl' (result: key:
+      let
+        aVal = if builtins.hasAttr key a then a.${key} else null;
+        bVal = if builtins.hasAttr key b then b.${key} else null;
+
+        # check if the types inside a list match the type of a primitive
+        listMatchesType = (list: val:
+          isList list && builtins.length list > 0
+          && builtins.typeOf (builtins.head list) == builtins.typeOf val);
+      in if isAttrs aVal && isAttrs bVal then
+        result // { ${key} = deepMerge aVal bVal; }
+      else if isList aVal && isList bVal then
+        result // { ${key} = aVal ++ bVal; }
+      else if aVal == bVal then
+        result // { ${key} = aVal; }
+      else if aVal == null then
+        result // { ${key} = bVal; }
+      else if bVal == null then
+        result // { ${key} = aVal; }
+      else if isList aVal && listMatchesType aVal bVal then
+        result // { ${key} = aVal ++ [ bVal ]; }
+      else if isList bVal && listMatchesType bVal aVal then
+        result // { ${key} = [ aVal ] ++ bVal; }
+      else if builtins.typeOf aVal == builtins.typeOf bVal then
+        result // { ${key} = bVal; }
+      else
+        result // { ${key} = bVal; }) a (builtins.attrNames b);
+in {
+  inherit primitiveAttrs;
+  inherit primitiveList;
+  inherit primitive;
+  inherit toQuadletIni;
+  inherit deepMerge;
+
+  buildConfigAsserts = quadletName: extraConfig:
+    let
+      configRules = {
+        Container = { ContainerName = types.enum [ quadletName ]; };
+        Network = { NetworkName = types.enum [ quadletName ]; };
+      };
+
+      # Function to build assertions for a specific section and its attributes.
+      buildSectionAsserts = section: attrs:
+        if builtins.hasAttr section configRules then
+          flatten (mapAttrsToList (attrName: attrValue:
+            if builtins.hasAttr attrName configRules.${section} then [{
+              assertion = configRules.${section}.${attrName}.check attrValue;
+              message = "In '${quadletName}' config. ${section}.${attrName}: '${
+                  toString attrValue
+                }' does not match expected type: ${
+                  configRules.${section}.${attrName}.description
+                }";
+            }] else
+              [ ]) attrs)
+        else
+          [ ];
+
+      # Flatten assertions from all sections in `extraConfig`.
+    in flatten (mapAttrsToList buildSectionAsserts extraConfig);
+
+  extraConfigType = with types;
+    attrsOf (attrsOf (oneOf [ primitiveAttrs primitiveList primitive ]));
+
+  # input expects a list of quadletInternalType with all the same resourceType
+  generateManifestText = quadlets:
+    let
+      # create a list of all unique quadlet.resourceType in quadlets
+      quadletTypes = unique (map (quadlet: quadlet.resourceType) quadlets);
+      # if quadletTypes is > 1, then all quadlets are not the same type
+      allQuadletsSameType = length quadletTypes <= 1;
+
+      # ensures the service name is formatted correctly to be easily read
+      #   by the activation script and matches `podman <resource> ls` output
+      formatServiceName = quadlet:
+        let
+          # remove the podman- prefix from the service name string
+          strippedName =
+            builtins.replaceStrings [ "podman-" ] [ "" ] quadlet.serviceName;
+          # specific logic for writing the unit name goes here. It should be
+          #   identical to what `podman <resource> ls` shows
+        in {
+          "container" = strippedName;
+          "network" = strippedName;
+        }."${quadlet.resourceType}";
+    in if allQuadletsSameType then ''
+      ${concatStringsSep "\n"
+      (map (quadlet: formatServiceName quadlet) quadlets)}
+    '' else
+      abort ''
+        All quadlets must be of the same type.
+          Quadlet types in this manifest: ${concatStringsSep ", " quadletTypes}
+      '';
+
+  # podman requires setuid on newuidmad, so it cannot be provided by pkgs.shadow
+  # Including all possible locations in PATH for newuidmap is a workaround.
+  # NixOS provides a 'wrapped' variant at /run/wrappers/bin/newuidmap.
+  # Other distros must install the 'uidmap' package, ie for ubuntu: apt install uidmap.
+  # Extra paths are added to handle where distro package managers may put the uidmap binaries.
+  #
+  # Tracking for a potential solution: https://github.com/NixOS/nixpkgs/issues/138423
+  newuidmapPaths = "/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+
+  removeBlankLines = text:
+    let
+      lines = splitString "\n" text;
+      nonEmptyLines = filter (line: line != "") lines;
+    in concatStringsSep "\n" nonEmptyLines;
+}
diff --git a/modules/services/podman-linux/services.nix b/modules/services/podman-linux/services.nix
new file mode 100644
index 000000000..e7191e4cd
--- /dev/null
+++ b/modules/services/podman-linux/services.nix
@@ -0,0 +1,65 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.podman;
+in {
+  options.services.podman = {
+    autoUpdate = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Automatically update the podman images.";
+      };
+
+      onCalendar = mkOption {
+        type = types.str;
+        default = "Sun *-*-* 00:00";
+        description = ''
+          The systemd `OnCalendar` expression for the update. See
+          {manpage}`systemd.time(7)` for a description of the format.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.autoUpdate.enable {
+      systemd.user.services."podman-auto-update" = {
+        Unit = {
+          Description = "Podman auto-update service";
+          Documentation = "man:podman-auto-update(1)";
+          Wants = [ "network-online.target" ];
+          After = [ "network-online.target" ];
+        };
+
+        Service = {
+          Type = "oneshot";
+          Environment = "PATH=${
+              builtins.concatStringsSep ":" [
+                "/run/wrappers/bin"
+                "/run/current-system/sw/bin"
+                "${config.home.homeDirectory}/.nix-profile/bin"
+              ]
+            }";
+          ExecStart = "${pkgs.podman}/bin/podman auto-update";
+          ExecStartPost = "${pkgs.podman}/bin/podman image prune -f";
+          TimeoutStartSec = "300s";
+          TimeoutStopSec = "10s";
+        };
+      };
+
+      systemd.user.timers."podman-auto-update" = {
+        Unit = { Description = "Podman auto-update timer"; };
+
+        Timer = {
+          OnCalendar = cfg.autoUpdate.onCalendar;
+          RandomizedDelaySec = 300;
+          Persistent = true;
+        };
+
+        Install = { WantedBy = [ "timers.target" ]; };
+      };
+    })
+  ]);
+}
diff --git a/tests/default.nix b/tests/default.nix
index 3271d3052..2eaaaa436 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -269,6 +269,7 @@ in import nmtSrc {
     ./modules/services/pbgopy
     ./modules/services/picom
     ./modules/services/playerctld
+    ./modules/services/podman-linux
     ./modules/services/polybar
     ./modules/services/recoll
     ./modules/services/redshift-gammastep
diff --git a/tests/modules/services/podman-linux/container-expected.service b/tests/modules/services/podman-linux/container-expected.service
new file mode 100644
index 000000000..c9cfe6551
--- /dev/null
+++ b/tests/modules/services/podman-linux/container-expected.service
@@ -0,0 +1,51 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager podman container configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-container.container
+[X-Container]
+AddDevice=/dev/null:/dev/null
+AutoUpdate=registry
+ContainerName=my-container
+Entrypoint=/sleep.sh
+Environment=VAL_A=A
+Environment=VAL_B=2
+Environment=VAL_C=false
+Image=docker.io/alpine:latest
+Label=nix.home-manager.managed=true
+Network=mynet
+NetworkAlias=test-alias-1
+NetworkAlias=test-alias-2
+PodmanArgs=--security-opt=no-new-privileges
+PublishPort=8080:80
+ReadOnlyTmpfs=true
+Volume=/tmp:/tmp
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin
+Restart=on-failure
+TimeoutStopSec=30
+Environment=PODMAN_SYSTEMD_UNIT=%n
+KillMode=mixed
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+Delegate=yes
+Type=notify
+NotifyAccess=all
+SyslogIdentifier=%N
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name=my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network=mynet --network-alias test-alias-1 --network-alias test-alias-2 --sdnotify=conmon -d --device=/dev/null:/dev/null --entrypoint=/sleep.sh --read-only-tmpfs -v /tmp:/tmp --label io.containers.autoupdate=registry --publish 8080:80 --env VAL_A=A --env VAL_B=2 --env VAL_C=false --label nix.home-manager.managed=true --security-opt=no-new-privileges docker.io/alpine:latest
+
+[Unit]
+Wants=network-online.target
+After=network-online.target
+After=network.target
+Before=fake.target
+Description=home-manager test
+SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container
+RequiresMountsFor=%t/containers
+RequiresMountsFor=/tmp
diff --git a/tests/modules/services/podman-linux/container.nix b/tests/modules/services/podman-linux/container.nix
new file mode 100644
index 000000000..102a7fb10
--- /dev/null
+++ b/tests/modules/services/podman-linux/container.nix
@@ -0,0 +1,60 @@
+{ ... }:
+
+{
+  services.podman = {
+    enable = true;
+    containers = {
+      "my-container" = {
+        description = "home-manager test";
+        autoStart = true;
+        autoUpdate = "registry";
+        devices = [ "/dev/null:/dev/null" ];
+        entrypoint = "/sleep.sh";
+        environment = {
+          "VAL_A" = "A";
+          "VAL_B" = 2;
+          "VAL_C" = false;
+        };
+        extraPodmanArgs = [ "--security-opt=no-new-privileges" ];
+        extraConfig = {
+          Container = {
+            ReadOnlyTmpfs = true;
+            NetworkAlias = "test-alias-2";
+          };
+          Service.Restart = "on-failure";
+          Unit.Before = "fake.target";
+        };
+        image = "docker.io/alpine:latest";
+        # Should not generate Requires/After for network because there is no
+        # services.podman.networks.mynet.
+        network = "mynet";
+        networkAlias = [ "test-alias-1" ];
+        ports = [ "8080:80" ];
+        volumes = [ "/tmp:/tmp" ];
+      };
+
+      "my-container-2" = {
+        image = "docker.io/alpine:latest";
+        extraConfig = {
+          Container.ContainerName = "some-other-container-name";
+        };
+      };
+    };
+  };
+
+  test.asserts.assertions.expected = [
+    ''
+      In 'my-container-2' config. Container.ContainerName: 'some-other-container-name' does not match expected type: value "my-container-2" (singular enum)''
+  ];
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    containerFile=$configPath/podman-my-container.service
+
+    assertFileExists $containerFile
+
+    containerFile=$(normalizeStorePaths $containerFile)
+
+    assertFileContent $containerFile ${./container-expected.service}
+  '';
+}
diff --git a/tests/modules/services/podman-linux/default.nix b/tests/modules/services/podman-linux/default.nix
new file mode 100644
index 000000000..e17ffddf5
--- /dev/null
+++ b/tests/modules/services/podman-linux/default.nix
@@ -0,0 +1,6 @@
+{
+  podman-container = ./container.nix;
+  podman-integration = ./integration.nix;
+  podman-manifest = ./manifest.nix;
+  podman-network = ./network.nix;
+}
diff --git a/tests/modules/services/podman-linux/integration-container-expected.service b/tests/modules/services/podman-linux/integration-container-expected.service
new file mode 100644
index 000000000..32f8e5195
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-container-expected.service
@@ -0,0 +1,41 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager podman container configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-container.container
+[X-Container]
+ContainerName=my-container
+Environment=
+Image=docker.io/alpine:latest
+Label=nix.home-manager.managed=true
+Network=my-net
+Network=externalnet
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin
+Restart=always
+TimeoutStopSec=30
+Environment=PODMAN_SYSTEMD_UNIT=%n
+KillMode=mixed
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+Delegate=yes
+Type=notify
+NotifyAccess=all
+SyslogIdentifier=%N
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name=my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network=my-net --network=externalnet --sdnotify=conmon -d --label nix.home-manager.managed=true docker.io/alpine:latest
+
+[Unit]
+Wants=network-online.target
+After=network-online.target
+After=network.target
+After=podman-my-net-network.service
+Description=Service for container my-container
+Requires=podman-my-net-network.service
+SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/integration-network-expected.service b/tests/modules/services/podman-linux/integration-network-expected.service
new file mode 100644
index 000000000..3fd14857d
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-network-expected.service
@@ -0,0 +1,29 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman network configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-net.network
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[X-Network]
+Gateway=192.168.123.1
+Label=nix.home-manager.managed=true
+NetworkName=my-net
+Subnet=192.168.123.0/24
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=15
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet=192.168.123.0/24 --gateway=192.168.123.1 --label nix.home-manager.managed=true my-net
+Type=oneshot
+SyslogIdentifier=%N
+
+[Unit]
+After=network.target
+Description=Service for network my-net
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/integration.nix b/tests/modules/services/podman-linux/integration.nix
new file mode 100644
index 000000000..de213092d
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration.nix
@@ -0,0 +1,29 @@
+{ ... }:
+
+{
+  services.podman = {
+    enable = true;
+    containers."my-container" = {
+      image = "docker.io/alpine:latest";
+      network = [ "my-net" "externalnet" ];
+    };
+    networks."my-net" = {
+      gateway = "192.168.123.1";
+      subnet = "192.168.123.0/24";
+    };
+  };
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    containerFile=$configPath/podman-my-container.service
+    networkFile=$configPath/podman-my-net-network.service
+    assertFileExists $containerFile
+    assertFileExists $networkFile
+
+    containerFile=$(normalizeStorePaths $containerFile)
+    networkFile=$(normalizeStorePaths $networkFile)
+
+    assertFileContent $containerFile ${./integration-container-expected.service}
+    assertFileContent $networkFile ${./integration-network-expected.service}
+  '';
+}
diff --git a/tests/modules/services/podman-linux/manifest.nix b/tests/modules/services/podman-linux/manifest.nix
new file mode 100644
index 000000000..b692ea7ae
--- /dev/null
+++ b/tests/modules/services/podman-linux/manifest.nix
@@ -0,0 +1,64 @@
+{ ... }:
+
+{
+  services.podman = {
+    enable = true;
+    containers."my-container-1" = {
+      description = "home-manager test";
+      autoUpdate = "registry";
+      autoStart = true;
+      image = "docker.io/alpine:latest";
+      entrypoint = "sleep 1000";
+      environment = {
+        "VAL_A" = "A";
+        "VAL_B" = 2;
+        "VAL_C" = false;
+      };
+    };
+  };
+
+  services.podman.containers."my-container-2" = {
+    description = "home-manager test";
+    autoUpdate = "registry";
+    autoStart = true;
+    image = "docker.io/alpine:latest";
+    entrypoint = "sleep 1000";
+    environment = {
+      "VAL_A" = "B";
+      "VAL_B" = 3;
+      "VAL_C" = true;
+    };
+  };
+
+  services.podman.networks."mynet-1" = {
+    subnet = "192.168.1.0/24";
+    gateway = "192.168.1.1";
+  };
+  services.podman.networks."mynet-2" = {
+    subnet = "192.168.2.0/24";
+    gateway = "192.168.2.1";
+  };
+
+  nmt.script = ''
+    configPath=home-files/.config/podman
+    containerManifest=$configPath/containers.manifest
+    networkManifest=$configPath/networks.manifest
+
+    assertFileExists $containerManifest
+    assertFileExists $networkManifest
+
+    assertFileContent $containerManifest ${
+      builtins.toFile "containers.expected" ''
+        my-container-1
+        my-container-2
+      ''
+    }
+
+    assertFileContent $networkManifest ${
+      builtins.toFile "networks.expected" ''
+        mynet-1
+        mynet-2
+      ''
+    }
+  '';
+}
diff --git a/tests/modules/services/podman-linux/network-expected.service b/tests/modules/services/podman-linux/network-expected.service
new file mode 100644
index 000000000..e2287a1f4
--- /dev/null
+++ b/tests/modules/services/podman-linux/network-expected.service
@@ -0,0 +1,33 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman network configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-net.network
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[X-Network]
+Gateway=192.168.1.1
+Label=nix.home-manager.managed=true
+NetworkName=my-net
+Options=isolate=true
+PodmanArgs=--ipam-driver dhcp
+PodmanArgs=--dns=192.168.55.1
+PodmanArgs=--log-level=debug
+Subnet=192.168.1.0/24
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=15
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet=192.168.1.0/24 --gateway=192.168.1.1 --opt isolate=true --label nix.home-manager.managed=true --ipam-driver dhcp --dns=192.168.55.1 --log-level=debug my-net
+Type=oneshot
+SyslogIdentifier=%N
+
+[Unit]
+After=network.target
+Description=Service for network my-net
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/network.nix b/tests/modules/services/podman-linux/network.nix
new file mode 100644
index 000000000..b6a46eba5
--- /dev/null
+++ b/tests/modules/services/podman-linux/network.nix
@@ -0,0 +1,44 @@
+{ ... }:
+
+{
+  services.podman = {
+    enable = true;
+    networks = {
+      "my-net" = {
+        subnet = "192.168.1.0/24";
+        gateway = "192.168.1.1";
+        extraPodmanArgs = [ "--ipam-driver dhcp" ];
+        extraConfig = {
+          Network = {
+            NetworkName = "my-net";
+            Options = { isolate = "true"; };
+            PodmanArgs = [ "--dns=192.168.55.1" "--log-level=debug" ];
+          };
+        };
+      };
+
+      "my-net-2" = {
+        subnet = "192.168.2.0/24";
+        gateway = "192.168.2.1";
+        extraConfig = {
+          Network = { NetworkName = "some-other-network-name"; };
+        };
+      };
+    };
+  };
+
+  test.asserts.assertions.expected = [
+    ''
+      In 'my-net-2' config. Network.NetworkName: 'some-other-network-name' does not match expected type: value "my-net-2" (singular enum)''
+  ];
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    networkFile=$configPath/podman-my-net-network.service
+    assertFileExists $networkFile
+
+    networkFile=$(normalizeStorePaths $networkFile)
+
+    assertFileContent $networkFile ${./network-expected.service}
+  '';
+}

From 2c6a9b3ccf1bb0930befadfed13195c2168d1287 Mon Sep 17 00:00:00 2001
From: sinavir <36380103+sinavir@users.noreply.github.com>
Date: Sun, 3 Nov 2024 12:29:02 +0100
Subject: [PATCH 067/546] git: fix maintenance service

Call to git-maintenance in the systemd user service was using a
erroneous value for exec-path flag. Removing the flag is fine.
---
 modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index dfdac2d4b..e76085192 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -549,7 +549,7 @@ in {
           Type = "oneshot";
           ExecStart = let exe = lib.getExe cfg.package;
           in ''
-            "${exe}" --exec-path="${exe}" for-each-repo --config=maintenance.repo maintenance run --schedule=%i
+            "${exe}" for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
           '';
           LockPersonality = "yes";
           MemoryDenyWriteExecute = "yes";

From 8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 3 Nov 2024 12:34:30 +0100
Subject: [PATCH 068/546] 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/18536bf04cd71abd345f9579158841376fdd0c5a?narHash=sha256-RP%2BOQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM%3D' (2024-10-25)
  → 'github:NixOS/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd?narHash=sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU%3D' (2024-10-29)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index b03cf135b..b9e8c1d0d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "lastModified": 1730200266,
+        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
         "type": "github"
       },
       "original": {

From 2f607e07f3ac7e53541120536708e824acccfaa8 Mon Sep 17 00:00:00 2001
From: rodrigovillarbello <empty>
Date: Sat, 2 Nov 2024 03:43:32 +0100
Subject: [PATCH 069/546] docs: home.sessionVariable clarification

Closes: https://github.com/nix-community/home-manager/issues/6027
---
 modules/home-environment.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 59497ec4a..2673d1711 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -280,8 +280,9 @@ in
         };
         ```
         may not work as expected. If you need to reference another
-        session variable, then do so inside Nix instead. The above
-        example then becomes
+        session variable (even if it is declared by using other options
+        like [](#opt-xdg.configHome)), then do so inside Nix instead.
+        The above example then becomes
         ```nix
         home.sessionVariables = {
           FOO = "Hello";

From 73090072715c823dd19478a58ba4f241d27a577f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Sun, 10 Nov 2024 11:38:24 +0100
Subject: [PATCH 070/546] news: fix typo

---
 modules/misc/news.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index aeec8f9a0..32394f335 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1810,7 +1810,7 @@ in {
 
           NixGL solve the "OpenGL" problem with nix. The 'nixGL' module provides
           integration of NixGL into Home Manager. See the "GPU on non-NixOS
-          systems" section in the Home Manager mantual for more.
+          systems" section in the Home Manager manual for more.
         '';
       }
 

From 60bb110917844d354f3c18e05450606a435d2d10 Mon Sep 17 00:00:00 2001
From: Milo Moisson <milomoisson@gmail.com>
Date: Sun, 10 Nov 2024 11:42:08 +0100
Subject: [PATCH 071/546] helix: fix wrapping of extraPackages

This makes extraPackages the default, but they do not shadow the env
so you can still have packages (e.g. LSPs) with a different version
than the global one in you local env like nix's shells.
---
 modules/programs/helix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix
index 01af7b14e..840f5d82f 100644
--- a/modules/programs/helix.nix
+++ b/modules/programs/helix.nix
@@ -188,7 +188,7 @@ in {
           nativeBuildInputs = [ pkgs.makeWrapper ];
           postBuild = ''
             wrapProgram $out/bin/hx \
-              --prefix PATH : ${lib.makeBinPath cfg.extraPackages}
+              --suffix PATH : ${lib.makeBinPath cfg.extraPackages}
           '';
         })
       ]

From 149a48da315988e36a6e12a82c49667a90d8031f Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 13 Nov 2024 22:50:06 +0100
Subject: [PATCH 072/546] 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/807e9154dcb16384b1b765ebe9cd2bba2ac287fd?narHash=sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU%3D' (2024-10-29)
  → 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2?narHash=sha256-IigrKK3vYRpUu%2BHEjPL/phrfh7Ox881er1UEsZvw9Q4%3D' (2024-11-09)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index b9e8c1d0d..2f5f887cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {

From 40746b5c77e9ab3fc2196802b637676574aaeb48 Mon Sep 17 00:00:00 2001
From: RedEtherbloom <etherbloom+github@mailbox.org>
Date: Wed, 6 Nov 2024 23:29:13 +0100
Subject: [PATCH 073/546] alacritty: fix test for nixpkgs update

Recent nixpkgs update made a small change to how TOML is generated,
causing the test toml to be out of date.
---
 tests/modules/programs/alacritty/settings-toml-expected.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/modules/programs/alacritty/settings-toml-expected.toml b/tests/modules/programs/alacritty/settings-toml-expected.toml
index 018881bcd..986c92f91 100644
--- a/tests/modules/programs/alacritty/settings-toml-expected.toml
+++ b/tests/modules/programs/alacritty/settings-toml-expected.toml
@@ -1,4 +1,3 @@
-[font]
 [font.bold]
 family = "SFMono"
 

From 7e42a37bf7dffd7fe4c2b14e42161433d7182d66 Mon Sep 17 00:00:00 2001
From: RedEtherbloom <etherbloom+github@mailbox.org>
Date: Wed, 6 Nov 2024 23:32:10 +0100
Subject: [PATCH 074/546] spotify-player: fix test for nixpkgs update

Recent nixpkgs update made a small change to how TOML is generated,
causing the test toml to be out of date.
---
 tests/modules/programs/spotify-player/theme.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/modules/programs/spotify-player/theme.toml b/tests/modules/programs/spotify-player/theme.toml
index cb5fa99d4..f963e707d 100644
--- a/tests/modules/programs/spotify-player/theme.toml
+++ b/tests/modules/programs/spotify-player/theme.toml
@@ -1,7 +1,6 @@
 [[themes]]
 name = "default2"
 
-[themes.component_style]
 [themes.component_style.block_title]
 fg = "Magenta"
 

From ee8ff6d53fca9adec60238f63eb632300d0dffa0 Mon Sep 17 00:00:00 2001
From: RedEtherbloom <etherbloom+github@mailbox.org>
Date: Wed, 6 Nov 2024 23:35:57 +0100
Subject: [PATCH 075/546] espanso: fix test for nixpkgs update

Recent nixpkgs update made a small change how YAML is generated,
causing the test YAML to be out of date.

The replacement match is also an exact example from the espanso wiki
https://espanso.org/docs/matches/basics/#multi-line-expansions.
---
 tests/modules/services/espanso/basic-matches.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/modules/services/espanso/basic-matches.yaml b/tests/modules/services/espanso/basic-matches.yaml
index 3cf98c989..ba9f8ef84 100644
--- a/tests/modules/services/espanso/basic-matches.yaml
+++ b/tests/modules/services/espanso/basic-matches.yaml
@@ -10,9 +10,7 @@ global_vars:
 matches:
 - replace: It's {{currentdate}} {{currenttime}}
   trigger: :now
-- replace: 'line1
-
-    line2'
+- replace: "line1\nline2"
   trigger: :hello
 - regex: :hi(?P<person>.*)\.
   replace: Hi {{person}}!

From cd21d2e61b2da9cc5b96f848ac6fd3c4dc377a1b Mon Sep 17 00:00:00 2001
From: RedEtherbloom <etherbloom+github@mailbox.org>
Date: Thu, 31 Oct 2024 21:55:36 +0100
Subject: [PATCH 076/546] git-sync: fix crash when whitespace in path

systemd rejects the service unit due to whitespace in the environment
variable assignment, pointing to the repo path, being invalid for
systemd's unit format.

See https://github.com/nix-community/home-manager/issues/6023 for
details.

The git-sync variable should also be escaped due to similar issues
with e.g. local git urls.
---
 modules/services/git-sync.nix                 |  4 +-
 tests/modules/services/git-sync/basic.nix     |  2 +-
 tests/modules/services/git-sync/default.nix   |  5 ++-
 .../modules/services/git-sync/whitespace.nix  | 42 +++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 tests/modules/services/git-sync/whitespace.nix

diff --git a/modules/services/git-sync.nix b/modules/services/git-sync.nix
index 2d90d6331..4bc2381b2 100644
--- a/modules/services/git-sync.nix
+++ b/modules/services/git-sync.nix
@@ -16,9 +16,9 @@ let
         "PATH=${
           lib.makeBinPath (with pkgs; [ openssh git ] ++ repo.extraPackages)
         }"
-        "GIT_SYNC_DIRECTORY=${repo.path}"
+        "GIT_SYNC_DIRECTORY=${strings.escapeShellArg repo.path}"
         "GIT_SYNC_COMMAND=${cfg.package}/bin/git-sync"
-        "GIT_SYNC_REPOSITORY=${repo.uri}"
+        "GIT_SYNC_REPOSITORY=${strings.escapeShellArg repo.uri}"
         "GIT_SYNC_INTERVAL=${toString repo.interval}"
       ];
       ExecStart = "${cfg.package}/bin/git-sync-on-inotify";
diff --git a/tests/modules/services/git-sync/basic.nix b/tests/modules/services/git-sync/basic.nix
index a82e9a4b1..0412f93b1 100644
--- a/tests/modules/services/git-sync/basic.nix
+++ b/tests/modules/services/git-sync/basic.nix
@@ -27,7 +27,7 @@
         Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin
         Environment=GIT_SYNC_DIRECTORY=/a/path
         Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
-        Environment=GIT_SYNC_REPOSITORY=git+ssh://user@example.com:/~user/path/to/repo.git
+        Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path/to/repo.git'
         Environment=GIT_SYNC_INTERVAL=500
         ExecStart=@git-sync@/bin/git-sync-on-inotify
         Restart=on-abort
diff --git a/tests/modules/services/git-sync/default.nix b/tests/modules/services/git-sync/default.nix
index 0e9db79d0..7a2000a3e 100644
--- a/tests/modules/services/git-sync/default.nix
+++ b/tests/modules/services/git-sync/default.nix
@@ -1 +1,4 @@
-{ git-sync = ./basic.nix; }
+{
+  git-sync = ./basic.nix;
+  git-sync-with-whitespace = ./whitespace.nix;
+}
diff --git a/tests/modules/services/git-sync/whitespace.nix b/tests/modules/services/git-sync/whitespace.nix
new file mode 100644
index 000000000..871843553
--- /dev/null
+++ b/tests/modules/services/git-sync/whitespace.nix
@@ -0,0 +1,42 @@
+{ config, ... }:
+
+{
+  services.git-sync = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = "@git-sync@"; };
+    repositories = {
+      testWithWhitespace = {
+        path = "/a path";
+        uri = "git+ssh://user@example.com:/~user/path to/repo.git";
+      };
+    };
+  };
+
+  test.stubs.openssh = { name = "openssh"; };
+
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/git-sync-testWithWhitespace.service
+
+    assertFileExists $serviceFile
+
+    serviceFile=$(normalizeStorePaths $serviceFile)
+    assertFileContent $serviceFile ${
+      builtins.toFile "expected" ''
+        [Install]
+        WantedBy=default.target
+
+        [Service]
+        Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin
+        Environment=GIT_SYNC_DIRECTORY='/a path'
+        Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
+        Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path to/repo.git'
+        Environment=GIT_SYNC_INTERVAL=500
+        ExecStart=@git-sync@/bin/git-sync-on-inotify
+        Restart=on-abort
+
+        [Unit]
+        Description=Git Sync testWithWhitespace
+      ''
+    }
+  '';
+}

From 3c044aefe610ceeec9cf3e83e55fa62715df27e2 Mon Sep 17 00:00:00 2001
From: RedEtherbloom <etherbloom+github@mailbox.org>
Date: Thu, 31 Oct 2024 22:22:16 +0100
Subject: [PATCH 077/546] git-sync: add example to repository option

---
 modules/services/git-sync.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/git-sync.nix b/modules/services/git-sync.nix
index 4bc2381b2..ba16085b3 100644
--- a/modules/services/git-sync.nix
+++ b/modules/services/git-sync.nix
@@ -112,6 +112,15 @@ in {
         description = ''
           The repositories that should be synchronized.
         '';
+        example = literalExpression ''
+          {
+            xyz = {
+              path = "''${config.home.homeDirectory}/foo/home-manager";
+              uri = "git@github.com:nix-community/home-manager.git";
+              interval = 1000;
+            };
+          }
+        '';
       };
     };
   };

From 35b055009afd0107b69c286fca34d2ad98940d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:07:20 +0100
Subject: [PATCH 078/546] kanshi: add package to home.packages

---
 modules/services/kanshi.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix
index 3b1bdf2cf..2eda74876 100644
--- a/modules/services/kanshi.nix
+++ b/modules/services/kanshi.nix
@@ -330,6 +330,8 @@ in {
     })
 
     {
+      home.packages = [ cfg.package ];
+
       xdg.configFile."kanshi/config".text =
         if cfg.profiles == { } && cfg.extraConfig == "" then
           directivesStr

From 1d0862ee2d7c6f6cd720d6f32213fa425004be10 Mon Sep 17 00:00:00 2001
From: gmvar <gmvar@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:16:21 -0800
Subject: [PATCH 079/546] feh: add themes option (#6074)

- added themes option
- added themes test
- updated broken man page links
---
 modules/programs/feh.nix                      | 40 ++++++++++++++++++-
 tests/modules/programs/feh/default.nix        |  1 +
 .../programs/feh/feh-empty-settings.nix       |  1 +
 .../modules/programs/feh/feh-themes-expected  |  6 +++
 tests/modules/programs/feh/feh-themes.nix     | 32 +++++++++++++++
 5 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/programs/feh/feh-themes-expected
 create mode 100644 tests/modules/programs/feh/feh-themes.nix

diff --git a/modules/programs/feh.nix b/modules/programs/feh.nix
index f44f184a3..bef9caac3 100644
--- a/modules/programs/feh.nix
+++ b/modules/programs/feh.nix
@@ -8,6 +8,12 @@ let
 
   bindingsOf = t: with types; attrsOf (nullOr (either t (listOf t)));
 
+  renderThemes = options:
+    let
+      render =
+        mapAttrsToList (theme: options: "${theme} ${escapeShellArgs options}");
+    in concatStringsSep "\n" (render options);
+
   renderBindings = bindings:
     let
       enabled = filterAttrs (n: v: v != null) bindings;
@@ -41,7 +47,7 @@ in {
         Override feh's default mouse button mapping. If you want to disable an
         action, set its value to null. If you want to bind multiple buttons to
         an action, set its value to a list.
-        See <https://man.finalrewind.org/1/feh/#x425554544f4e53> for
+        See <https://man.finalrewind.org/1/feh/#BUTTONS_CONFIG_SYNTAX> for
         default bindings and available commands.
       '';
     };
@@ -58,10 +64,37 @@ in {
         Override feh's default keybindings. If you want to disable a keybinding
         set its value to null. If you want to bind multiple keys to an action,
         set its value to a list.
-        See <https://man.finalrewind.org/1/feh/#x4b455953> for
+        See <https://man.finalrewind.org/1/feh/#KEYS_CONFIG_SYNTAX> for
         default bindings and available commands.
       '';
     };
+
+    themes = mkOption {
+      default = { };
+      type = with types; attrsOf (listOf str);
+      example = {
+        feh = [ "--image-bg" "black" ];
+        webcam = [ "--multiwindow" "--reload" "20" ];
+        present = [ "--full-screen" "--sort" "name" "--hide-pointer" ];
+        booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ];
+        imagemap = [
+          "-rVq"
+          "--thumb-width"
+          "40"
+          "--thumb-height"
+          "30"
+          "--index-info"
+          "%n\\n%wx%h"
+        ];
+        example = [ "--info" "foo bar" ];
+      };
+      description = ''
+        Define themes for feh.
+        See <https://man.finalrewind.org/1/feh/#THEMES_CONFIG_SYNTAX> for
+        important guidelines and limitations related to theme configuration.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -79,5 +112,8 @@ in {
     xdg.configFile."feh/keys" = mkIf (cfg.keybindings != { }) {
       text = renderBindings cfg.keybindings + "\n";
     };
+
+    xdg.configFile."feh/themes" =
+      mkIf (cfg.themes != { }) { text = renderThemes cfg.themes + "\n"; };
   };
 }
diff --git a/tests/modules/programs/feh/default.nix b/tests/modules/programs/feh/default.nix
index 48bab8ab6..e1051adcd 100644
--- a/tests/modules/programs/feh/default.nix
+++ b/tests/modules/programs/feh/default.nix
@@ -1,4 +1,5 @@
 {
   feh-empty-config = ./feh-empty-settings.nix;
   feh-bindings = ./feh-bindings.nix;
+  feh-themes = ./feh-themes.nix;
 }
diff --git a/tests/modules/programs/feh/feh-empty-settings.nix b/tests/modules/programs/feh/feh-empty-settings.nix
index 62feb8230..9a50e20bf 100644
--- a/tests/modules/programs/feh/feh-empty-settings.nix
+++ b/tests/modules/programs/feh/feh-empty-settings.nix
@@ -9,6 +9,7 @@
     nmt.script = ''
       assertPathNotExists home-files/.config/feh/buttons
       assertPathNotExists home-files/.config/feh/keys
+      assertPathNotExists home-files/.config/feh/themes
     '';
   };
 }
diff --git a/tests/modules/programs/feh/feh-themes-expected b/tests/modules/programs/feh/feh-themes-expected
new file mode 100644
index 000000000..5dce2792d
--- /dev/null
+++ b/tests/modules/programs/feh/feh-themes-expected
@@ -0,0 +1,6 @@
+booth --full-screen --hide-pointer --slideshow-delay 20
+example --info 'foo bar'
+feh --image-bg black
+imagemap -rVq --thumb-width 40 --thumb-height 30 --index-info '%n\n%wx%h'
+present --full-screen --sort name --hide-pointer
+webcam --multiwindow --reload 20
diff --git a/tests/modules/programs/feh/feh-themes.nix b/tests/modules/programs/feh/feh-themes.nix
new file mode 100644
index 000000000..f06ea0716
--- /dev/null
+++ b/tests/modules/programs/feh/feh-themes.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+
+{
+  config = {
+    programs.feh.enable = true;
+
+    programs.feh.themes = {
+      feh = [ "--image-bg" "black" ];
+      webcam = [ "--multiwindow" "--reload" "20" ];
+      present = [ "--full-screen" "--sort" "name" "--hide-pointer" ];
+      booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ];
+      imagemap = [
+        "-rVq"
+        "--thumb-width"
+        "40"
+        "--thumb-height"
+        "30"
+        "--index-info"
+        "%n\\n%wx%h"
+      ];
+      example = [ "--info" "foo bar" ];
+    };
+
+    test.stubs.feh = { };
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/.config/feh/themes \
+        ${./feh-themes-expected}
+    '';
+  };
+}

From 400e3c0152793ece616081870f979a2081a04f63 Mon Sep 17 00:00:00 2001
From: Michael Hoang <Enzime@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:25:31 +0000
Subject: [PATCH 080/546] nixos: always run home-manager on NixOS activation
 (#5780)

Currently, the home-manager systemd service will only get restarted when
the home-manager configuration changes. This can lead to issues in
users' home directories not getting corrected for a while.

    $ rm ~/.zshrc
    $ sudo nixos-rebuild switch
    $ ls ~/.zshrc
    ls: cannot access '/home/enzime/.zshrc': No such file or directory
---
 nixos/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 95d5943fc..2b542238a 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -48,7 +48,6 @@ in {
           serviceConfig = {
             User = usercfg.home.username;
             Type = "oneshot";
-            RemainAfterExit = "yes";
             TimeoutStartSec = "5m";
             SyslogIdentifier = "hm-activate-${username}";
 

From 192f123e4b5a4605c30566409ccacffc416e45c4 Mon Sep 17 00:00:00 2001
From: Michael Hoang <Enzime@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:31:16 +0000
Subject: [PATCH 081/546] nixos: add `key` to shared module to allow disabling
 it (#6017)

By adding `key`, this allows users to disable this shared module or they can choose to not disable this shared module (by filtering by key before disabling)

This means users can disable all shared modules if all modules are paths or attrsets with a key:

`configuration.nix`:

```nix
{ config, ... }:

{
  home-manager.users.enzime = { ... }: {
    disabledModules = config.home-manager.sharedModules;
  };
}
```

Or disabling just this module specifically:

```nix
{ ... }:

{
  home-manager.users.enzime = { ... }: {
    disabledModules = [ { key = "home-manager#nixos-shared-module"; } ];
  };
}
```

Or disabling all modules when you have modules you can't disable (like lambdas):

```nix
{ ... }:

{
  home-manager.users.enzime = { ... }: {
    disabledModules = lib.filter (v: lib.isString v || lib.isPath v || (lib.isAttrs v && v ? key)) config.home-manager.sharedModules;
  };
}
```


https://nixos.org/manual/nixos/unstable/#sec-replace-modules
---
 nixos/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 2b542238a..4484d28f8 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -19,13 +19,17 @@ in {
         extraSpecialArgs.nixosConfig = config;
 
         sharedModules = [{
-          # The per-user directory inside /etc/profiles is not known by
-          # fontconfig by default.
-          fonts.fontconfig.enable = lib.mkDefault
-            (cfg.useUserPackages && config.fonts.fontconfig.enable);
+          key = "home-manager#nixos-shared-module";
 
-          # Inherit glibcLocales setting from NixOS.
-          i18n.glibcLocales = lib.mkDefault config.i18n.glibcLocales;
+          config = {
+            # The per-user directory inside /etc/profiles is not known by
+            # fontconfig by default.
+            fonts.fontconfig.enable = lib.mkDefault
+              (cfg.useUserPackages && config.fonts.fontconfig.enable);
+
+            # Inherit glibcLocales setting from NixOS.
+            i18n.glibcLocales = lib.mkDefault config.i18n.glibcLocales;
+          };
         }];
       };
     }

From d154a557da07645aaea3b3375317c234cf2eed82 Mon Sep 17 00:00:00 2001
From: Jany <127505435+janydoe@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:38:16 +0000
Subject: [PATCH 082/546] aerc: add support of account gpg config (#5298)

---
 modules/programs/aerc-accounts.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/programs/aerc-accounts.nix b/modules/programs/aerc-accounts.nix
index 6a6153e5e..04f0165a0 100644
--- a/modules/programs/aerc-accounts.nix
+++ b/modules/programs/aerc-accounts.nix
@@ -230,8 +230,15 @@ in {
         else
           { };
 
+      gpgCfg = account:
+        optionalAttrs (account.gpg != null) {
+          pgp-key-id = account.gpg.key;
+          pgp-auto-sign = account.gpg.signByDefault;
+          pgp-opportunistic-encrypt = account.gpg.encryptByDefault;
+        };
+
     in (basicCfg account) // (sourceCfg account) // (outgoingCfg account)
-    // account.aerc.extraAccounts;
+    // (gpgCfg account) // account.aerc.extraAccounts;
 
   mkAccountConfig = name: account:
     mapAttrNames (addAccountName name) account.aerc.extraConfig;

From c7c251761235282acfc681accf8d3deea6681cc0 Mon Sep 17 00:00:00 2001
From: Nanotwerp <Nanotwerp@gmail.com>
Date: Sat, 16 Nov 2024 13:36:13 -0500
Subject: [PATCH 083/546] {gtk, dunst}: replace `pkgs.gnome.adwaita-icon-theme`
 with `pkgs.adwaita-icon-theme` in the examples (#5712)

`adwaita-icon-theme` has been moved out of the `gnome` scope and into the top level with https://github.com/NixOS/nixpkgs/pull/319659
---
 modules/misc/gtk.nix       | 2 +-
 modules/services/dunst.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index e1ae250fd..65ed1de2f 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -53,7 +53,7 @@ let
       package = mkOption {
         type = types.nullOr types.package;
         default = null;
-        example = literalExpression "pkgs.gnome.adwaita-icon-theme";
+        example = literalExpression "pkgs.adwaita-icon-theme";
         description = ''
           Package providing the icon theme. This package will be installed
           to your profile. If `null` then the theme
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 5bd82a399..6b2727b3f 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -25,7 +25,7 @@ let
     options = {
       package = mkOption {
         type = types.package;
-        example = literalExpression "pkgs.gnome.adwaita-icon-theme";
+        example = literalExpression "pkgs.adwaita-icon-theme";
         description = "Package providing the theme.";
       };
 

From 1bd5616e33c0c54d7a5b37db94160635a9b27aeb Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 16 Nov 2024 14:54:20 -0500
Subject: [PATCH 084/546] lib/file-type: Make `force` option visible (#6003)

This is something that is useful, we should not hide it from the docs.
---
 modules/lib/file-type.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/lib/file-type.nix b/modules/lib/file-type.nix
index 3fb51fd56..48ff00f1b 100644
--- a/modules/lib/file-type.nix
+++ b/modules/lib/file-type.nix
@@ -99,7 +99,6 @@ in {
         force = mkOption {
           type = types.bool;
           default = false;
-          visible = false;
           description = ''
             Whether the target path should be unconditionally replaced
             by the managed file source. Warning, this will silently

From 5056a1cf0ce7c2a08ab50713b6c4af77975f6111 Mon Sep 17 00:00:00 2001
From: Juanjo Presa <juanjo.presa@nadanix.com>
Date: Sun, 17 Nov 2024 09:34:39 +0100
Subject: [PATCH 085/546] version: allow 25.05 as state version

Nixpkgs updated upstream:
https://github.com/NixOS/nixpkgs/commit/90fcf3aa7eba70f18dad15b634e9336b997d25ac
---
 modules/misc/version.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index d068a3869..176901f3e 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -22,6 +22,7 @@ in {
         "23.11"
         "24.05"
         "24.11"
+        "25.05"
       ];
       description = ''
         It is occasionally necessary for Home Manager to change

From aecd341dfead1c3ef7a3c15468ecd71e8343b7c6 Mon Sep 17 00:00:00 2001
From: Kacper Koniuszy <120419423+kkoniuszy@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:55:09 +0200
Subject: [PATCH 086/546] firefox: improve search engine disclaimer generation

Using a fixed application name in the salt for the search engine name
hash can break with minor branding changes. For example, LibreWolf 127
used the application name "LibreWolf", but in version 128 it is
"Firefox".

The proper name can be found in about:support -> Application Basics.

Because it doesn't have to be related to the product name visible in
most of the browser (for example in the window title and help menus),
we shouldn't rely on cfg.name for that.

The application name can be read from lib/*/application.ini and we can
use that if the browser was installed via Home Manager. If not, we can
fall back to cfg.name.
---
 modules/programs/firefox/mkFirefoxModule.nix |  1 +
 modules/programs/firefox/profiles/search.nix | 24 +++++++++++++++++---
 modules/programs/thunderbird.nix             |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 8ef3f12d3..da7c96722 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -553,6 +553,7 @@ in {
                 inherit (args) config;
                 inherit lib pkgs;
                 appName = cfg.name;
+                package = cfg.finalPackage;
                 modulePath = modulePath ++ [ "profiles" name "search" ];
                 profilePath = config.path;
               });
diff --git a/modules/programs/firefox/profiles/search.nix b/modules/programs/firefox/profiles/search.nix
index 69b771aa4..99a226744 100644
--- a/modules/programs/firefox/profiles/search.nix
+++ b/modules/programs/firefox/profiles/search.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, appName, modulePath, profilePath }:
+{ config, lib, pkgs, appName, package, modulePath, profilePath }:
 
 with lib;
 
@@ -108,10 +108,10 @@ let
   # a claim by Mozilla to remove this would be very anti-user, and
   # is unlikely to be an issue for our use case.
   disclaimer = "By modifying this file, I agree that I am doing so "
-    + "only within ${appName} itself, using official, user-driven search "
+    + "only within @appName@ itself, using official, user-driven search "
     + "engine selection processes, and in a way which does not circumvent "
     + "user consent. I acknowledge that any attempt to change this file "
-    + "from outside of ${appName} is a malicious act, and will be responded "
+    + "from outside of @appName@ is a malicious act, and will be responded "
     + "to accordingly.";
 
   salt = if config.default != null then
@@ -124,11 +124,29 @@ let
   else
     null;
 
+  appNameVariable = if package == null then
+    "appName=${lib.escapeShellArg appName}"
+  else ''
+    applicationIni="$(find ${lib.escapeShellArg package} -maxdepth 3 -path ${
+      lib.escapeShellArg package
+    }'/lib/*/application.ini' -print -quit)"
+    if test -n "$applicationIni"; then
+      appName="$(sed -n 's/^Name=\(.*\)$/\1/p' "$applicationIni" | head -n1)"
+    else
+      appName=${lib.escapeShellArg appName}
+    fi
+  '';
+
   file = pkgs.runCommand "search.json.mozlz4" {
     nativeBuildInputs = with pkgs; [ mozlz4a openssl ];
     json = builtins.toJSON settings;
     inherit salt privateSalt;
   } ''
+    ${appNameVariable}
+
+    salt=''${salt//@appName@/"$appName"}
+    privateSalt=''${privateSalt//@appName@/"$appName"}
+
     if [[ -n $salt ]]; then
       export hash=$(echo -n "$salt" | openssl dgst -sha256 -binary | base64)
       export privateHash=$(echo -n "$privateSalt" | openssl dgst -sha256 -binary | base64)
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index ad7a1360f..b3713f655 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -232,6 +232,7 @@ in {
                     inherit (args) config;
                     inherit lib pkgs;
                     appName = "Thunderbird";
+                    package = cfg.package;
                     modulePath =
                       [ "programs" "thunderbird" "profiles" name "search" ];
                     profilePath = name;

From 0918bb02385a6897e7a0180d23ee4587491eb0d4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 17 Nov 2024 23:31:31 +0100
Subject: [PATCH 087/546] ci: make dependabot consider release-24.11

---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2aea2da27..b34df60ea 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,3 +15,11 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "ci:"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "release-24.11"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "ci:"

From 05d3b6215afa733fed6f025a59a562f98330acc3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 17 Nov 2024 23:39:12 +0100
Subject: [PATCH 088/546] home-manager: prepare 25.05-pre

---
 docs/manual/manual.md               |  2 +-
 docs/release-notes/release-notes.md |  1 +
 docs/release-notes/rl-2505.md       | 18 ++++++++++++++++++
 home-manager/home-manager           |  2 +-
 release.json                        |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 docs/release-notes/rl-2505.md

diff --git a/docs/manual/manual.md b/docs/manual/manual.md
index 0f81642f7..2aa6024ae 100644
--- a/docs/manual/manual.md
+++ b/docs/manual/manual.md
@@ -1,6 +1,6 @@
 # Home Manager Manual {#home-manager-manual}
 
-## Version 24.05 (unstable)
+## Version 25.05 (unstable)
 
 
 ```{=include=} preface
diff --git a/docs/release-notes/release-notes.md b/docs/release-notes/release-notes.md
index dabeba0c9..b7d1b4380 100644
--- a/docs/release-notes/release-notes.md
+++ b/docs/release-notes/release-notes.md
@@ -4,6 +4,7 @@ This section lists the release notes for stable versions of Home Manager
 and the current unstable version.
 
 ```{=include=} chapters
+rl-2505.md
 rl-2411.md
 rl-2405.md
 rl-2311.md
diff --git a/docs/release-notes/rl-2505.md b/docs/release-notes/rl-2505.md
new file mode 100644
index 000000000..dec0f2131
--- /dev/null
+++ b/docs/release-notes/rl-2505.md
@@ -0,0 +1,18 @@
+# Release 25.05 {#sec-release-25.05}
+
+This is the current unstable branch and the information in this
+section is therefore not final.
+
+## Highlights {#sec-release-25.05-highlights}
+
+This release has the following notable changes:
+
+- No changes.
+
+## State Version Changes {#sec-release-25.05-state-version-changes}
+
+The state version in this release includes the changes below. These
+changes are only active if the `home.stateVersion` option is set to
+\"25.05\" or later.
+
+- No changes.
diff --git a/home-manager/home-manager b/home-manager/home-manager
index 5bf796b47..71b982f40 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -1044,7 +1044,7 @@ while [[ $# -gt 0 ]]; do
             export VERBOSE=1
             ;;
         --version)
-            echo 24.11-pre
+            echo 25.05-pre
             exit 0
             ;;
         *)
diff --git a/release.json b/release.json
index e5d3102cf..1d2863a09 100644
--- a/release.json
+++ b/release.json
@@ -1,4 +1,4 @@
 {
-  "release": "24.11",
+  "release": "25.05",
   "isReleaseBranch": false
 }

From f3a2ff69586f3a54b461526e5702b1a2f81e740a Mon Sep 17 00:00:00 2001
From: Ilham AM <ilaumjd@gmail.com>
Date: Mon, 18 Nov 2024 06:44:26 +0700
Subject: [PATCH 089/546] zsh-abbr: update source path (#6084)

---
 modules/programs/zsh/zsh-abbr.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/zsh/zsh-abbr.nix b/modules/programs/zsh/zsh-abbr.nix
index 8b6189c52..47f29f211 100644
--- a/modules/programs/zsh/zsh-abbr.nix
+++ b/modules/programs/zsh/zsh-abbr.nix
@@ -28,7 +28,7 @@ in {
     programs.zsh.plugins = [{
       name = "zsh-abbr";
       src = pkgs.zsh-abbr;
-      file = "/share/zsh/zsh-abbr/abbr.plugin.zsh";
+      file = "share/zsh/zsh-abbr/zsh-abbr.plugin.zsh";
     }];
 
     xdg.configFile = {

From 18462998b126c8e32bc34c56156690052d1b46c2 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Mon, 29 Jul 2024 17:27:11 +0700
Subject: [PATCH 090/546] librewolf: use mkFirefoxModule

---
 modules/programs/librewolf.nix | 43 +++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index d8b6dfabb..2508591bd 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -14,20 +14,33 @@ let
     '') prefs)}
   '';
 
+  modulePath = [ "programs" "librewolf" ];
+
+  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+
 in {
-  meta.maintainers = [ maintainers.onny ];
+  meta.maintainers = [ maintainers.chayleaf maintainers.onny ];
+
+  imports = [
+    (mkFirefoxModule {
+      inherit modulePath;
+      name = "LibreWolf";
+      description = "LibreWolf is a privacy enhanced Firefox fork.";
+      wrappedPackageName = "librewolf";
+      unwrappedPackageName = "librewolf-unwrapped";
+
+      platforms.linux = {
+        vendorPath = ".librewolf";
+        configPath = ".librewolf";
+      };
+      platforms.darwin = {
+        vendorPath = "Library/Application Support/LibreWolf";
+        configPath = "Library/Application Support/LibreWolf";
+      };
+    })
+  ];
 
   options.programs.librewolf = {
-    enable =
-      mkEnableOption "Librewolf browser, a privacy enhanced Firefox fork";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.librewolf;
-      defaultText = literalExpression "pkgs.librewolf";
-      description = "The LibreWolf package to use.";
-    };
-
     settings = mkOption {
       type = with types; attrsOf (either bool (either int str));
       default = { };
@@ -38,7 +51,7 @@ in {
         }
       '';
       description = ''
-        Attribute set of LibreWolf settings and overrides. Refer to
+        Attribute set of global LibreWolf settings and overrides. Refer to
         <https://librewolf.net/docs/settings/>
         for details on supported values.
       '';
@@ -51,9 +64,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
-
-    home.file.".librewolf/librewolf.overrides.cfg".text =
-      mkOverridesFile cfg.settings;
+    home.file.".librewolf/librewolf.overrides.cfg" =
+      lib.mkIf (cfg.settings != { }) { text = mkOverridesFile cfg.settings; };
   };
 }

From 0bd5e9c76c9f2f486f4bec0524e16026547df414 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Tue, 6 Aug 2024 08:15:54 +0700
Subject: [PATCH 091/546] librewolf: hide bookmarks option

---
 modules/programs/firefox/mkFirefoxModule.nix | 4 +++-
 modules/programs/librewolf.nix               | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index da7c96722..1bb2253f1 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -1,5 +1,6 @@
 { modulePath, name, description ? null, wrappedPackageName ? null
-, unwrappedPackageName ? null, platforms, visible ? false }:
+, unwrappedPackageName ? null, platforms, visible ? false
+, enableBookmarks ? true }:
 
 { config, lib, pkgs, ... }:
 
@@ -435,6 +436,7 @@ in {
           };
 
           bookmarks = mkOption {
+            internal = !enableBookmarks;
             type = let
               bookmarkSubmodule = types.submodule ({ config, name, ... }: {
                 options = {
diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index 2508591bd..7363d9e53 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -37,6 +37,8 @@ in {
         vendorPath = "Library/Application Support/LibreWolf";
         configPath = "Library/Application Support/LibreWolf";
       };
+
+      enableBookmarks = false;
     })
   ];
 

From 094265fca0e000f8af3c38e4dde0e459f91d59f0 Mon Sep 17 00:00:00 2001
From: Lorenzo Bevilacqua <lorenzobevilacqua02@gmail.com>
Date: Mon, 18 Nov 2024 15:00:22 +0000
Subject: [PATCH 092/546] Translate using Weblate (Italian)

Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: Lorenzo Bevilacqua <lorenzobevilacqua02@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/it/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home-manager/po/it.po b/home-manager/po/it.po
index 8ffe648f4..1637a62dc 100644
--- a/home-manager/po/it.po
+++ b/home-manager/po/it.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-02-29 10:10+0000\n"
-"Last-Translator: FedFer98123 <fede.ferrari123@gmail.com>\n"
+"PO-Revision-Date: 2024-11-18 15:00+0000\n"
+"Last-Translator: Lorenzo Bevilacqua <lorenzobevilacqua02@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/home-manager/cli/"
 "it/>\n"
 "Language: it\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: argomento mancante per %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"

From 705cf3763a6d6074c1b7edb3ff0bb44efa7f091b Mon Sep 17 00:00:00 2001
From: wadsaek <wadsaek@gmail.com>
Date: Mon, 18 Nov 2024 15:00:23 +0000
Subject: [PATCH 093/546] Translate using Weblate (Ukrainian)

Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: wadsaek <wadsaek@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/uk/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/uk.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home-manager/po/uk.po b/home-manager/po/uk.po
index 55aa12de0..9e6fc3997 100644
--- a/home-manager/po/uk.po
+++ b/home-manager/po/uk.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-02-18 14:02+0000\n"
-"Last-Translator: Сергій <sergiy.goncharuk.1@gmail.com>\n"
+"PO-Revision-Date: 2024-11-18 15:00+0000\n"
+"Last-Translator: wadsaek <wadsaek@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/home-manager/"
 "cli/uk/>\n"
 "Language: uk\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.4\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: відсутній аргумент для %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"

From a42fa14b53ceab66274a21da480c9f8e06204173 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sat, 31 Aug 2024 11:12:40 +0300
Subject: [PATCH 094/546] syncthing: expand declarative configuration

This expands the Syncthing configuration to allow declarative
settings. Code mostly pulled from the Nixpkgs module.

Changes compared to the NixOS module are:

Removed the following options:

- user, group, systemService: Unnecessary since Syncthing always runs
  as the user declaring the configuration.

- dataDir configDir, databaseDir: Pointed to ~/.local/state/syncthing,
  the default Syncthing directory.

- openDefaultPorts: We don't have access to the system firewall.

Furthermore, multiple changes to systemd services were made to
maintain consistency with other Home Manager modules, sandboxing
options might need to be reviewed further.

Fixes #4049
---
 modules/services/syncthing.nix                | 599 +++++++++++++++++-
 .../syncthing/common/extra-options.nix        |   2 +-
 2 files changed, 588 insertions(+), 13 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index b6cebfa5f..165ff1455 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -5,44 +5,584 @@ with lib;
 let
 
   cfg = config.services.syncthing;
+  settingsFormat = pkgs.formats.json { };
+  cleanedConfig =
+    converge (filterAttrsRecursive (_: v: v != null && v != { })) cfg.settings;
+
+  isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
+
+  # Syncthing supports serving the GUI over Unix sockets. If that happens, the
+  # API is served over the Unix socket as well.  This function returns the correct
+  # curl arguments for the address portion of the curl command for both network
+  # and Unix socket addresses.
+  curlAddressArgs = path:
+    if isUnixGui
+    # if cfg.guiAddress is a unix socket, tell curl explicitly about it
+    # note that the dot in front of `${path}` is the hostname, which is
+    # required.
+    then
+      "--unix-socket ${cfg.guiAddress} http://.${path}"
+      # no adjustements are needed if cfg.guiAddress is a network address
+    else
+      "${cfg.guiAddress}${path}";
+
+  devices = mapAttrsToList (_: device: device // { deviceID = device.id; })
+    cfg.settings.devices;
+
+  folders = mapAttrsToList (_: folder:
+    folder // {
+      devices = map (device:
+        if builtins.isString device then {
+          deviceId = cfg.settings.devices.${device}.id;
+        } else
+          device) folder.devices;
+    }) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
+
+  jq = "${pkgs.jq}/bin/jq";
+  sleep = "${pkgs.coreutils}/bin/sleep";
+  printf = "${pkgs.coreutils}/bin/printf";
+  cat = "${pkgs.coreutils}/bin/cat";
+  curl = "${pkgs.curl}/bin/curl";
+  install = "${pkgs.coreutils}/bin/install";
+  syncthing = "${pkgs.syncthing}/bin/syncthing";
+
+  updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
+    set -efu
+
+    # be careful not to leak secrets in the filesystem or in process listings
+    umask 0077
+
+    curl() {
+        # get the api key by parsing the config.xml
+        while
+            ! ${pkgs.libxml2}/bin/xmllint \
+                --xpath 'string(configuration/gui/apikey)' \
+                ''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing/config.xml \
+                >"$RUNTIME_DIRECTORY/api_key"
+        do ${sleep} 1; done
+        (${printf} "X-API-Key: "; ${cat} "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"
+        ${curl} -sSLk -H "@$RUNTIME_DIRECTORY/headers" \
+            --retry 1000 --retry-delay 1 --retry-all-errors \
+            "$@"
+    }
+  '' +
+
+    /* Syncthing's rest API for the folders and devices is almost identical.
+       Hence we iterate them using lib.pipe and generate shell commands for both at
+       the same time.
+    */
+    (lib.pipe {
+      # The attributes below are the only ones that are different for devices /
+      # folders.
+      devs = {
+        new_conf_IDs = map (v: v.id) devices;
+        GET_IdAttrName = "deviceID";
+        override = cfg.overrideDevices;
+        conf = devices;
+        baseAddress = curlAddressArgs "/rest/config/devices";
+      };
+      dirs = {
+        new_conf_IDs = map (v: v.id) folders;
+        GET_IdAttrName = "id";
+        override = cfg.overrideFolders;
+        conf = folders;
+        baseAddress = curlAddressArgs "/rest/config/folders";
+      };
+    } [
+      # Now for each of these attributes, write the curl commands that are
+      # identical to both folders and devices.
+      (mapAttrs (conf_type: s:
+        # We iterate the `conf` list now, and run a curl -X POST command for each, that
+        # should update that device/folder only.
+        lib.pipe s.conf [
+          # Quoting https://docs.syncthing.net/rest/config.html:
+          #
+          # > PUT takes an array and POST a single object. In both cases if a
+          # given folder/device already exists, it’s replaced, otherwise a new
+          # one is added.
+          #
+          # What's not documented, is that using PUT will remove objects that
+          # don't exist in the array given. That's why we use here `POST`, and
+          # only if s.override == true then we DELETE the relevant folders
+          # afterwards.
+          (map (new_cfg: ''
+            curl -d ${
+              lib.escapeShellArg (builtins.toJSON new_cfg)
+            } -X POST ${s.baseAddress}
+          ''))
+          (lib.concatStringsSep "\n")
+        ]
+        /* If we need to override devices/folders, we iterate all currently configured
+           IDs, via another `curl -X GET`, and we delete all IDs that are not part of
+           the Nix configured list of IDs
+        */
+        + lib.optionalString s.override ''
+          stale_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} \
+            --argjson new_ids ${
+              lib.escapeShellArg (builtins.toJSON s.new_conf_IDs)
+            } \
+            --raw-output \
+            '[.[].${s.GET_IdAttrName}] - $new_ids | .[]'
+          )"
+          for id in ''${stale_${conf_type}_ids}; do
+            curl -X DELETE ${s.baseAddress}/$id
+          done
+        ''))
+      builtins.attrValues
+      (lib.concatStringsSep "\n")
+    ]) +
+    /* Now we update the other settings defined in cleanedConfig which are not
+       "folders" or "devices".
+    */
+    (lib.pipe cleanedConfig [
+      builtins.attrNames
+      (lib.subtractLists [ "folders" "devices" ])
+      (map (subOption: ''
+        curl -X PUT -d ${
+          lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})
+        } ${curlAddressArgs "/rest/config/${subOption}"}
+      ''))
+      (lib.concatStringsSep "\n")
+    ]) + lib.optionalString (cfg.passwordFile != null) ''
+      syncthing_password=$(${cat} ${cfg.passwordFile})
+      curl -X PATCH -d '{"password": "'$syncthing_password'"}' ${
+        curlAddressArgs "/rest/config/gui"
+      }
+    '' + ''
+      # restart Syncthing if required
+      if curl ${curlAddressArgs "/rest/config/restart-required"} |
+         ${jq} -e .requiresRestart > /dev/null; then
+          curl -X POST ${curlAddressArgs "/rest/system/restart"}
+      fi
+    '');
 
   defaultSyncthingArgs = [
-    "${pkgs.syncthing}/bin/syncthing"
+    "${syncthing}"
     "-no-browser"
     "-no-restart"
+    "-no-upgrade"
+    "-gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress}"
     "-logflags=0"
   ];
 
   syncthingArgs = defaultSyncthingArgs ++ cfg.extraOptions;
-
 in {
   meta.maintainers = [ maintainers.rycee ];
 
-  options = {
+  options = with types; {
     services.syncthing = {
-      enable = mkEnableOption "Syncthing continuous file synchronization";
+      enable = mkEnableOption ''
+        Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync.
+        Further declarative configuration options only supported on Linux devices.
+      '';
 
-      extraOptions = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "--gui-apikey=apiKey" ];
+      cert = mkOption {
+        type = nullOr str;
+        default = null;
         description = ''
-          Extra command-line arguments to pass to {command}`syncthing`.
+          Path to the `cert.pem` file, which will be copied into Syncthing's
+          config directory.
         '';
       };
 
+      key = mkOption {
+        type = nullOr str;
+        default = null;
+        description = ''
+          Path to the `key.pem` file, which will be copied into Syncthing's
+          config directory.
+        '';
+      };
+
+      passwordFile = mkOption {
+        type = nullOr path;
+        default = null;
+        description = ''
+          Path to the gui password file.
+        '';
+      };
+
+      overrideDevices = mkOption {
+        type = bool;
+        default = true;
+        description = ''
+          Whether to delete the devices which are not configured via the
+          [devices](#opt-services.syncthing.settings.devices) option.
+          If set to `false`, devices added via the web
+          interface will persist and will have to be deleted manually.
+        '';
+      };
+
+      overrideFolders = mkOption {
+        type = bool;
+        default = true;
+        description = ''
+          Whether to delete the folders which are not configured via the
+          [folders](#opt-services.syncthing.settings.folders) option.
+          If set to `false`, folders added via the web
+          interface will persist and will have to be deleted manually.
+        '';
+      };
+
+      settings = mkOption {
+        type = submodule {
+          freeformType = settingsFormat.type;
+          options = {
+            # global options
+            options = mkOption {
+              default = { };
+              description = ''
+                The options element contains all other global configuration options
+              '';
+              type = submodule ({ name, ... }: {
+                freeformType = settingsFormat.type;
+                options = {
+                  localAnnounceEnabled = mkOption {
+                    type = nullOr bool;
+                    default = null;
+                    description = ''
+                      Whether to send announcements to the local LAN, also use such announcements to find other devices.
+                    '';
+                  };
+
+                  localAnnouncePort = mkOption {
+                    type = nullOr int;
+                    default = null;
+                    description = ''
+                      The port on which to listen and send IPv4 broadcast announcements to.
+                    '';
+                  };
+
+                  relaysEnabled = mkOption {
+                    type = nullOr bool;
+                    default = null;
+                    description = ''
+                      When true, relays will be connected to and potentially used for device to device connections.
+                    '';
+                  };
+
+                  urAccepted = mkOption {
+                    type = nullOr int;
+                    default = null;
+                    description = ''
+                      Whether the user has accepted to submit anonymous usage data.
+                      The default, 0, mean the user has not made a choice, and Syncthing will ask at some point in the future.
+                      "-1" means no, a number above zero means that that version of usage reporting has been accepted.
+                    '';
+                  };
+
+                  limitBandwidthInLan = mkOption {
+                    type = nullOr bool;
+                    default = null;
+                    description = ''
+                      Whether to apply bandwidth limits to devices in the same broadcast domain as the local device.
+                    '';
+                  };
+
+                  maxFolderConcurrency = mkOption {
+                    type = nullOr int;
+                    default = null;
+                    description = ''
+                      This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning.
+                      The mechanism is described in detail in a [separate chapter](https://docs.syncthing.net/advanced/option-max-concurrency.html).
+                    '';
+                  };
+                };
+              });
+            };
+
+            # device settings
+            devices = mkOption {
+              default = { };
+              description = ''
+                Peers/devices which Syncthing should communicate with.
+
+                Note that you can still add devices manually, but those changes
+                will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices)
+                is enabled.
+              '';
+              example = {
+                bigbox = {
+                  id =
+                    "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
+                  addresses = [ "tcp://192.168.0.10:51820" ];
+                };
+              };
+              type = attrsOf (submodule ({ name, ... }: {
+                freeformType = settingsFormat.type;
+                options = {
+
+                  name = mkOption {
+                    type = str;
+                    default = name;
+                    description = ''
+                      The name of the device.
+                    '';
+                  };
+
+                  id = mkOption {
+                    type = str;
+                    description = ''
+                      The device ID. See <https://docs.syncthing.net/dev/device-ids.html>.
+                    '';
+                  };
+
+                  autoAcceptFolders = mkOption {
+                    type = bool;
+                    default = false;
+                    description = ''
+                      Automatically create or share folders that this device advertises at the default path.
+                      See <https://docs.syncthing.net/users/config.html?highlight=autoaccept#config-file-format>.
+                    '';
+                  };
+
+                };
+              }));
+            };
+
+            # folder settings
+            folders = mkOption {
+              default = { };
+              description = ''
+                Folders which should be shared by Syncthing.
+
+                Note that you can still add folders manually, but those changes
+                will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders)
+                is enabled.
+              '';
+              example = literalExpression ''
+                {
+                  "/home/user/sync" = {
+                    id = "syncme";
+                    devices = [ "bigbox" ];
+                  };
+                }
+              '';
+              type = attrsOf (submodule ({ name, ... }: {
+                freeformType = settingsFormat.type;
+                options = {
+
+                  enable = mkOption {
+                    type = bool;
+                    default = true;
+                    description = ''
+                      Whether to share this folder.
+                      This option is useful when you want to define all folders
+                      in one place, but not every machine should share all folders.
+                    '';
+                  };
+
+                  path = mkOption {
+                    type = str // {
+                      check = x:
+                        str.check x
+                        && (substring 0 1 x == "/" || substring 0 2 x == "~/");
+                      description = str.description + " starting with / or ~/";
+                    };
+                    default = name;
+                    description = ''
+                      The path to the folder which should be shared.
+                      Only absolute paths (starting with `/`) and paths relative to
+                      the user's home directory (starting with `~/`) are allowed.
+                    '';
+                  };
+
+                  id = mkOption {
+                    type = str;
+                    default = name;
+                    description = ''
+                      The ID of the folder. Must be the same on all devices.
+                    '';
+                  };
+
+                  label = mkOption {
+                    type = str;
+                    default = name;
+                    description = ''
+                      The label of the folder.
+                    '';
+                  };
+
+                  type = mkOption {
+                    type = enum [
+                      "sendreceive"
+                      "sendonly"
+                      "receiveonly"
+                      "receiveencrypted"
+                    ];
+                    default = "sendreceive";
+                    description = ''
+                      Controls how the folder is handled by Syncthing.
+                      See <https://docs.syncthing.net/users/config.html#config-option-folder.type>.
+                    '';
+                  };
+
+                  devices = mkOption {
+                    type = listOf str;
+                    default = [ ];
+                    description = ''
+                      The devices this folder should be shared with. Each device must
+                      be defined in the [devices](#opt-services.syncthing.settings.devices) option.
+                    '';
+                  };
+
+                  versioning = mkOption {
+                    default = null;
+                    description = ''
+                      How to keep changed/deleted files with Syncthing.
+                      There are 4 different types of versioning with different parameters.
+                      See <https://docs.syncthing.net/users/versioning.html>.
+                    '';
+                    example = literalExpression ''
+                      [
+                        {
+                          versioning = {
+                            type = "simple";
+                            params.keep = "10";
+                          };
+                        }
+                        {
+                          versioning = {
+                            type = "trashcan";
+                            params.cleanoutDays = "1000";
+                          };
+                        }
+                        {
+                          versioning = {
+                            type = "staggered";
+                            fsPath = "/syncthing/backup";
+                            params = {
+                              cleanInterval = "3600";
+                              maxAge = "31536000";
+                            };
+                          };
+                        }
+                        {
+                          versioning = {
+                            type = "external";
+                            params.versionsPath = pkgs.writers.writeBash "backup" '''
+                              folderpath="$1"
+                              filepath="$2"
+                              rm -rf "$folderpath/$filepath"
+                            ''';
+                          };
+                        }
+                      ]
+                    '';
+                    type = with types;
+                      nullOr (submodule {
+                        freeformType = settingsFormat.type;
+                        options = {
+                          type = mkOption {
+                            type = enum [
+                              "external"
+                              "simple"
+                              "staggered"
+                              "trashcan"
+                            ];
+                            description = ''
+                              The type of versioning.
+                              See <https://docs.syncthing.net/users/versioning.html>.
+                            '';
+                          };
+                        };
+                      });
+                  };
+
+                  copyOwnershipFromParent = mkOption {
+                    type = bool;
+                    default = false;
+                    description = ''
+                      On Unix systems, tries to copy file/folder ownership from
+                      the parent directory (the directory it’s located in).
+                      Requires running Syncthing as a privileged user, or
+                      granting it additional capabilities (e.g. CAP_CHOWN on
+                      Linux).
+                    '';
+                  };
+                };
+              }));
+            };
+
+          };
+        };
+        default = { };
+        description = ''
+          Extra configuration options for Syncthing.
+          See <https://docs.syncthing.net/users/config.html>.
+          Note that this attribute set does not exactly match the documented
+          XML format. Instead, this is the format of the JSON REST API. There
+          are slight differences. For example, this XML:
+          ```xml
+          <options>
+            <listenAddress>default</listenAddress>
+            <minHomeDiskFree unit="%">1</minHomeDiskFree>
+          </options>
+          ```
+          corresponds to the Nix code:
+          ```nix
+          {
+            options = {
+              listenAddresses = [
+                "default"
+              ];
+              minHomeDiskFree = {
+                unit = "%";
+                value = 1;
+              };
+            };
+          }
+          ```
+        '';
+        example = {
+          options.localAnnounceEnabled = false;
+          gui.theme = "black";
+        };
+      };
+
+      guiAddress = mkOption {
+        type = str;
+        default = "127.0.0.1:8384";
+        description = ''
+          The address to serve the web interface at.
+        '';
+      };
+
+      allProxy = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "socks5://address.com:1234";
+        description = ''
+          Overwrites the {env}`all_proxy` environment variable for the Syncthing
+          process to the given value. This is normally used to let Syncthing
+          connect through a SOCKS5 proxy server. See
+          <https://docs.syncthing.net/users/proxying.html>.
+        '';
+      };
+
+      extraOptions = mkOption {
+        type = listOf str;
+        default = [ ];
+        example = [ "--reset-deltas" ];
+        description = ''
+          Extra command-line arguments to pass to {command}`syncthing`
+        '';
+      };
+
+      package = mkPackageOption pkgs "syncthing" { };
+
       tray = mkOption {
         type = with types;
           either bool (submodule {
             options = {
               enable = mkOption {
-                type = types.bool;
+                type = bool;
                 default = false;
                 description = "Whether to enable a syncthing tray service.";
               };
 
               command = mkOption {
-                type = types.str;
+                type = str;
                 default = "syncthingtray";
                 defaultText = literalExpression "syncthingtray";
                 example = literalExpression "qsyncthingtray";
@@ -50,7 +590,7 @@ in {
               };
 
               package = mkOption {
-                type = types.package;
+                type = package;
                 default = pkgs.syncthingtray-minimal;
                 defaultText = literalExpression "pkgs.syncthingtray-minimal";
                 example = literalExpression "pkgs.qsyncthingtray";
@@ -78,10 +618,28 @@ in {
           };
 
           Service = {
+            ExecStartPre = mkIf (cfg.cert != null || cfg.key != null) "+${
+                pkgs.writers.writeBash "syncthing-copy-keys" ''
+                  syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"
+                  ${install} -dm700 "$syncthing_dir"
+                  ${optionalString (cfg.cert != null) ''
+                    ${install} -Dm400 ${
+                      toString cfg.cert
+                    } "$syncthing_dir/cert.pem"
+                  ''}
+                  ${optionalString (cfg.key != null) ''
+                    ${install} -Dm400 ${
+                      toString cfg.key
+                    } "$syncthing_dir/key.pem"
+                  ''}
+                ''
+              }";
             ExecStart = escapeShellArgs syncthingArgs;
             Restart = "on-failure";
             SuccessExitStatus = [ 3 4 ];
             RestartForceExitStatus = [ 3 4 ];
+            Environment =
+              mkIf (cfg.allProxy != null) { all_proxy = cfg.allProxy; };
 
             # Sandboxing.
             LockPersonality = true;
@@ -95,6 +653,23 @@ in {
 
           Install = { WantedBy = [ "default.target" ]; };
         };
+
+        syncthing-init = mkIf (cleanedConfig != { }) {
+          Unit = {
+            Description = "Syncthing configuration updater";
+            Requires = [ "syncthing.service" ];
+            After = [ "syncthing.service" ];
+          };
+
+          Service = {
+            Type = "oneshot";
+            ExecStart = updateConfig;
+            RuntimeDirectory = "syncthing-init";
+            RemainAfterExit = true;
+          };
+
+          Install = { WantedBy = [ "default.target" ]; };
+        };
       };
 
       launchd.agents.syncthing = {
diff --git a/tests/modules/services/syncthing/common/extra-options.nix b/tests/modules/services/syncthing/common/extra-options.nix
index df968636f..f861e2a63 100644
--- a/tests/modules/services/syncthing/common/extra-options.nix
+++ b/tests/modules/services/syncthing/common/extra-options.nix
@@ -13,7 +13,7 @@ lib.mkMerge [
     nmt.script = ''
       assertFileExists home-files/.config/systemd/user/syncthing.service
       assertFileContains home-files/.config/systemd/user/syncthing.service \
-      "ExecStart=@syncthing@/bin/syncthing -no-browser -no-restart '-logflags=0' -foo '-bar \"baz\"'"
+      "ExecStart=@syncthing@/bin/syncthing -no-browser -no-restart -no-upgrade '-gui-address=127.0.0.1:8384' '-logflags=0' -foo '-bar \"baz\"'"
     '';
   })
   (lib.mkIf pkgs.stdenv.isDarwin {

From d37f154dba0d4c015f17a24314e89b77a7ba5ff3 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:40:06 +0100
Subject: [PATCH 095/546] 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/76612b17c0ce71689921ca12d9ffdc9c23ce40b2?narHash=sha256-IigrKK3vYRpUu%2BHEjPL/phrfh7Ox881er1UEsZvw9Q4%3D' (2024-11-09)
  → 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add?narHash=sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg%3D' (2024-11-15)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2f5f887cb..725679fac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {

From a46e702093a5c46e192243edbd977d5749e7f294 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 19 Nov 2024 15:05:03 +0100
Subject: [PATCH 096/546] espanso: fix test failure

---
 tests/modules/services/espanso/basic-matches.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/modules/services/espanso/basic-matches.yaml b/tests/modules/services/espanso/basic-matches.yaml
index ba9f8ef84..3cf98c989 100644
--- a/tests/modules/services/espanso/basic-matches.yaml
+++ b/tests/modules/services/espanso/basic-matches.yaml
@@ -10,7 +10,9 @@ global_vars:
 matches:
 - replace: It's {{currentdate}} {{currenttime}}
   trigger: :now
-- replace: "line1\nline2"
+- replace: 'line1
+
+    line2'
   trigger: :hello
 - regex: :hi(?P<person>.*)\.
   replace: Hi {{person}}!

From 8cf9cb2ee78aa129e5b8220135a511a2be254c0c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 22 Nov 2024 20:32:42 +0100
Subject: [PATCH 097/546] tests: fix integration test

---
 tests/integration/nixos/basics.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/nixos/basics.nix b/tests/integration/nixos/basics.nix
index e2bff229f..41bddefea 100644
--- a/tests/integration/nixos/basics.nix
+++ b/tests/integration/nixos/basics.nix
@@ -49,7 +49,7 @@
 
     start_all()
 
-    machine.wait_for_unit("home-manager-alice.service")
+    machine.wait_for_console_text("Finished Home Manager environment for alice.")
 
     with subtest("Home Manager file"):
       # The file should be linked with the expected content.
@@ -73,7 +73,7 @@
       fail_as_alice("pueue status")
 
       machine.systemctl("restart home-manager-alice.service")
-      machine.wait_for_unit("home-manager-alice.service")
+      machine.wait_for_console_text("Finished Home Manager environment for alice.")
 
       actual = succeed_as_alice("pueue status")
       expected = "running"

From 445d721ecfbd92d83f857f12f1f99f5c8fa79951 Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Fri, 2 Aug 2024 10:15:18 +0200
Subject: [PATCH 098/546] home-cursor: add hyprcursor support

Add the option to enable hyprcursor support by setting the relevant
environment variables.
---
 modules/config/home-cursor.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index cb9a2ab28..0a8fb378b 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -45,6 +45,17 @@ let
           gtk config generation for {option}`home.pointerCursor`
         '';
       };
+
+      hyprcursor = {
+        enable = mkEnableOption "hyprcursor config generation";
+
+        size = mkOption {
+          type = types.nullOr types.int;
+          example = 32;
+          default = null;
+          description = "The cursor size for hyprcursor.";
+        };
+      };
     };
   };
 
@@ -178,5 +189,13 @@ in {
     (mkIf cfg.gtk.enable {
       gtk.cursorTheme = mkDefault { inherit (cfg) package name size; };
     })
+
+    (mkIf cfg.hyprcursor.enable {
+      home.sessionVariables = {
+        HYPRCURSOR_THEME = cfg.name;
+        HYPRCURSOR_SIZE =
+          if cfg.hyprcursor.size != null then cfg.hyprcursor.size else cfg.size;
+      };
+    })
   ]);
 }

From 16fe78182e924c9a2b0cffa1f343efea80945ef2 Mon Sep 17 00:00:00 2001
From: Nithin S Varrier <nithin486@hotmail.com>
Date: Fri, 22 Nov 2024 22:52:15 +0530
Subject: [PATCH 099/546] conky: update systemd exec path to config package

Currently systemd ExecStart uses pkgs.conky as executable path, this
commit changes it to the package defined by services.conky.package.
---
 modules/services/conky.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/conky.nix b/modules/services/conky.nix
index bf7eeea8b..657c29bf5 100644
--- a/modules/services/conky.nix
+++ b/modules/services/conky.nix
@@ -41,7 +41,7 @@ in with lib; {
       Service = {
         Restart = "always";
         RestartSec = "3";
-        ExecStart = toString ([ "${pkgs.conky}/bin/conky" ]
+        ExecStart = toString ([ "${cfg.package}/bin/conky" ]
           ++ optional (cfg.extraConfig != "")
           "--config ${pkgs.writeText "conky.conf" cfg.extraConfig}");
       };

From ba9367b5a98402fb3d2afe7aa58c432c43996720 Mon Sep 17 00:00:00 2001
From: klchen0112 <klchen0112@gmail.com>
Date: Fri, 22 Nov 2024 23:35:22 +0800
Subject: [PATCH 100/546] emacs: add darwin service

---
 modules/services/emacs.nix                    | 27 ++++++++++++-------
 tests/default.nix                             |  1 +
 tests/modules/services/emacs-darwin/basic.nix | 23 ++++++++++++++++
 .../modules/services/emacs-darwin/default.nix |  1 +
 .../emacs-darwin/expected-agent.plist         | 22 +++++++++++++++
 5 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 tests/modules/services/emacs-darwin/basic.nix
 create mode 100644 tests/modules/services/emacs-darwin/default.nix
 create mode 100644 tests/modules/services/emacs-darwin/expected-agent.plist

diff --git a/modules/services/emacs.nix b/modules/services/emacs.nix
index d319abf01..e280b3219 100644
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -41,7 +41,6 @@ let
   # to work without wrapping it.
   socketDir = "%t/emacs";
   socketPath = "${socketDir}/server";
-
 in {
   meta.maintainers = [ maintainers.tadfisher ];
 
@@ -112,12 +111,7 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
-    {
-      assertions = [
-        (lib.hm.assertions.assertPlatform "services.emacs" pkgs
-          lib.platforms.linux)
-      ];
-
+    (mkIf pkgs.stdenv.isLinux {
       systemd.user.services.emacs = {
         Unit = {
           Description = "Emacs text editor";
@@ -190,9 +184,9 @@ in {
             }/bin/emacsclient "''${@:---create-frame}"'');
         };
       };
-    }
+    })
 
-    (mkIf cfg.socketActivation.enable {
+    (mkIf (cfg.socketActivation.enable && pkgs.stdenv.isLinux) {
       systemd.user.sockets.emacs = {
         Unit = {
           Description = "Emacs text editor";
@@ -222,5 +216,20 @@ in {
         };
       };
     })
+
+    (mkIf pkgs.stdenv.isDarwin {
+      launchd.agents.emacs = {
+        enable = true;
+        config = {
+          ProgramArguments = [ "${cfg.package}/bin/emacs" "--fg-daemon" ]
+            ++ cfg.extraOptions;
+          RunAtLoad = true;
+          KeepAlive = {
+            Crashed = true;
+            SuccessfulExit = false;
+          };
+        };
+      };
+    })
   ]);
 }
diff --git a/tests/default.nix b/tests/default.nix
index 2eaaaa436..8fac3280a 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -173,6 +173,7 @@ in import nmtSrc {
     ./modules/xresources
   ] ++ lib.optionals isDarwin [
     ./modules/launchd
+    ./modules/services/emacs-darwin
     ./modules/services/espanso-darwin
     ./modules/services/git-sync-darwin
     ./modules/services/imapnotify-darwin
diff --git a/tests/modules/services/emacs-darwin/basic.nix b/tests/modules/services/emacs-darwin/basic.nix
new file mode 100644
index 000000000..dac7c2d63
--- /dev/null
+++ b/tests/modules/services/emacs-darwin/basic.nix
@@ -0,0 +1,23 @@
+{ lib, pkgs, ... }:
+
+{
+  nixpkgs.overlays = [
+    (self: super: rec {
+      emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // {
+        outPath = "@emacs@";
+      };
+      emacsPackagesFor = _:
+        lib.makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
+    })
+  ];
+
+  services.emacs = { enable = true; };
+
+  nmt.script = ''
+    serviceFile=LaunchAgents/org.nix-community.home.emacs.plist
+
+    assertFileExists "$serviceFile"
+
+    assertFileContent "$serviceFile" ${./expected-agent.plist}
+  '';
+}
diff --git a/tests/modules/services/emacs-darwin/default.nix b/tests/modules/services/emacs-darwin/default.nix
new file mode 100644
index 000000000..11de5fc79
--- /dev/null
+++ b/tests/modules/services/emacs-darwin/default.nix
@@ -0,0 +1 @@
+{ emacs-service-basic = ./basic.nix; }
diff --git a/tests/modules/services/emacs-darwin/expected-agent.plist b/tests/modules/services/emacs-darwin/expected-agent.plist
new file mode 100644
index 000000000..819457582
--- /dev/null
+++ b/tests/modules/services/emacs-darwin/expected-agent.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>KeepAlive</key>
+	<dict>
+		<key>Crashed</key>
+		<true/>
+		<key>SuccessfulExit</key>
+		<false/>
+	</dict>
+	<key>Label</key>
+	<string>org.nix-community.home.emacs</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>@emacs@/bin/emacs</string>
+		<string>--fg-daemon</string>
+	</array>
+	<key>RunAtLoad</key>
+	<true/>
+</dict>
+</plist>
\ No newline at end of file

From 92fef254a9071fa41a13908281284e6a62b9c92e Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Sat, 23 Nov 2024 22:36:33 +0100
Subject: [PATCH 101/546] podman: install package and create config files

Co-authored-by: Dylan Wilson <dylan@bytepen.com>
---
 modules/services/podman-linux/default.nix     | 88 ++++++++++++++++++-
 .../configuration-containers-expected.conf    | 10 +++
 .../configuration-policy-expected.json        |  1 +
 .../configuration-registries-expected.conf    |  8 ++
 .../configuration-storage-expected.conf       |  4 +
 .../services/podman-linux/configuration.nix   | 63 +++++++++++++
 .../modules/services/podman-linux/default.nix |  1 +
 7 files changed, 172 insertions(+), 3 deletions(-)
 create mode 100644 tests/modules/services/podman-linux/configuration-containers-expected.conf
 create mode 100644 tests/modules/services/podman-linux/configuration-policy-expected.json
 create mode 100644 tests/modules/services/podman-linux/configuration-registries-expected.conf
 create mode 100644 tests/modules/services/podman-linux/configuration-storage-expected.conf
 create mode 100644 tests/modules/services/podman-linux/configuration.nix

diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix
index 3a77d1595..459762d46 100644
--- a/modules/services/podman-linux/default.nix
+++ b/modules/services/podman-linux/default.nix
@@ -1,6 +1,8 @@
 { config, pkgs, lib, ... }:
-
-{
+let
+  cfg = config.services.podman;
+  toml = pkgs.formats.toml { };
+in {
   meta.maintainers = with lib.hm.maintainers; [ bamhm182 n-hass ];
 
   imports =
@@ -8,10 +10,90 @@
 
   options.services.podman = {
     enable = lib.mkEnableOption "Podman, a daemonless container engine";
+
+    settings = {
+      containers = lib.mkOption {
+        type = toml.type;
+        default = { };
+        description = "containers.conf configuration";
+      };
+
+      storage = lib.mkOption {
+        type = toml.type;
+        description = "storage.conf configuration";
+      };
+
+      registries = {
+        search = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          default = [ "docker.io" ];
+          description = ''
+            List of repositories to search.
+          '';
+        };
+
+        insecure = lib.mkOption {
+          default = [ ];
+          type = lib.types.listOf lib.types.str;
+          description = ''
+            List of insecure repositories.
+          '';
+        };
+
+        block = lib.mkOption {
+          default = [ ];
+          type = lib.types.listOf lib.types.str;
+          description = ''
+            List of blocked repositories.
+          '';
+        };
+      };
+
+      policy = lib.mkOption {
+        default = { };
+        type = lib.types.attrs;
+        example = lib.literalExpression ''
+          {
+            default = [ { type = "insecureAcceptAnything"; } ];
+            transports = {
+              docker-daemon = {
+                "" = [ { type = "insecureAcceptAnything"; } ];
+              };
+            };
+          }
+        '';
+        description = ''
+          Signature verification policy file.
+          If this option is empty the default policy file from
+          `skopeo` will be used.
+        '';
+      };
+    };
   };
 
-  config = lib.mkIf config.services.podman.enable {
+  config = lib.mkIf cfg.enable {
     assertions =
       [ (lib.hm.assertions.assertPlatform "podman" pkgs lib.platforms.linux) ];
+
+    home.packages = [ cfg.package ];
+
+    services.podman.settings.storage = {
+      storage.driver = lib.mkDefault "overlay";
+    };
+
+    xdg.configFile = {
+      "containers/policy.json".source = if cfg.settings.policy != { } then
+        pkgs.writeText "policy.json" (builtins.toJSON cfg.settings.policy)
+      else
+        "${pkgs.skopeo.policy}/default-policy.json";
+      "containers/registries.conf".source = toml.generate "registries.conf" {
+        registries =
+          lib.mapAttrs (n: v: { registries = v; }) cfg.settings.registries;
+      };
+      "containers/storage.conf".source =
+        toml.generate "storage.conf" cfg.settings.storage;
+      "containers/containers.conf".source =
+        toml.generate "containers.conf" cfg.settings.containers;
+    };
   };
 }
diff --git a/tests/modules/services/podman-linux/configuration-containers-expected.conf b/tests/modules/services/podman-linux/configuration-containers-expected.conf
new file mode 100644
index 000000000..3b77b570a
--- /dev/null
+++ b/tests/modules/services/podman-linux/configuration-containers-expected.conf
@@ -0,0 +1,10 @@
+[network]
+default_subnet = "172.16.10.0/24"
+
+[[network.default_subnet_pools]]
+base = "172.16.11.0/24"
+size = 24
+
+[[network.default_subnet_pools]]
+base = "172.16.12.0/24"
+size = 24
diff --git a/tests/modules/services/podman-linux/configuration-policy-expected.json b/tests/modules/services/podman-linux/configuration-policy-expected.json
new file mode 100644
index 000000000..d247fb9b8
--- /dev/null
+++ b/tests/modules/services/podman-linux/configuration-policy-expected.json
@@ -0,0 +1 @@
+{"default":[{"type":"insecureAcceptAnything"}]}
\ No newline at end of file
diff --git a/tests/modules/services/podman-linux/configuration-registries-expected.conf b/tests/modules/services/podman-linux/configuration-registries-expected.conf
new file mode 100644
index 000000000..9d458f36b
--- /dev/null
+++ b/tests/modules/services/podman-linux/configuration-registries-expected.conf
@@ -0,0 +1,8 @@
+[registries.block]
+registries = ["ghcr.io", "gallery.ecr.aws"]
+
+[registries.insecure]
+registries = ["quay.io"]
+
+[registries.search]
+registries = ["docker.io"]
diff --git a/tests/modules/services/podman-linux/configuration-storage-expected.conf b/tests/modules/services/podman-linux/configuration-storage-expected.conf
new file mode 100644
index 000000000..dc25b5ec1
--- /dev/null
+++ b/tests/modules/services/podman-linux/configuration-storage-expected.conf
@@ -0,0 +1,4 @@
+[storage]
+driver = "overlay"
+graphroot = "$HOME/.containers/graphroot"
+runroot = "$HOME/.containers/runroot"
diff --git a/tests/modules/services/podman-linux/configuration.nix b/tests/modules/services/podman-linux/configuration.nix
new file mode 100644
index 000000000..b1c0d596b
--- /dev/null
+++ b/tests/modules/services/podman-linux/configuration.nix
@@ -0,0 +1,63 @@
+{ ... }:
+
+{
+  services.podman = {
+    enable = true;
+    settings = {
+      containers = {
+        network = {
+          default_subnet = "172.16.10.0/24";
+          default_subnet_pools = [
+            {
+              base = "172.16.11.0/24";
+              size = 24;
+            }
+            {
+              base = "172.16.12.0/24";
+              size = 24;
+            }
+          ];
+        };
+      };
+      storage = {
+        storage = {
+          runroot = "$HOME/.containers/runroot";
+          graphroot = "$HOME/.containers/graphroot";
+        };
+      };
+      registries = {
+        block = [ "ghcr.io" "gallery.ecr.aws" ];
+        insecure = [ "quay.io" ];
+        search = [ "docker.io" ];
+      };
+      policy = { default = [{ type = "insecureAcceptAnything"; }]; };
+    };
+  };
+
+  nmt.script = ''
+    configPath=home-files/.config/containers
+    containersFile=$configPath/containers.conf
+    policyFile=$configPath/policy.json
+    registriesFile=$configPath/registries.conf
+    storageFile=$configPath/storage.conf
+
+    assertFileExists $containersFile
+    assertFileExists $policyFile
+    assertFileExists $registriesFile
+    assertFileExists $storageFile
+
+    containersFile=$(normalizeStorePaths $containersFile)
+    policyFile=$(normalizeStorePaths $policyFile)
+    registriesFile=$(normalizeStorePaths $registriesFile)
+    storageFile=$(normalizeStorePaths $storageFile)
+
+    assertFileContent $containersFile ${
+      ./configuration-containers-expected.conf
+    }
+    assertFileContent $policyFile ${./configuration-policy-expected.json}
+    assertFileContent $registriesFile ${
+      ./configuration-registries-expected.conf
+    }
+    assertFileContent $storageFile ${./configuration-storage-expected.conf}
+  '';
+}
diff --git a/tests/modules/services/podman-linux/default.nix b/tests/modules/services/podman-linux/default.nix
index e17ffddf5..a5ba9467e 100644
--- a/tests/modules/services/podman-linux/default.nix
+++ b/tests/modules/services/podman-linux/default.nix
@@ -1,4 +1,5 @@
 {
+  podman-configuration = ./configuration.nix;
   podman-container = ./container.nix;
   podman-integration = ./integration.nix;
   podman-manifest = ./manifest.nix;

From 67cd4814a247fd0fe97171acb90659f7e304bcb8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Nov 2024 03:59:24 +0000
Subject: [PATCH 102/546] 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/5e4fbfb6b3de1aa2872b76d49fafc942626e2add?narHash=sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg%3D' (2024-11-15)
  → 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 725679fac..d98d6b864 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {

From bd58a1132e9b7f121f65313bc662ad6c8a05f878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?=
 <sebaszv@proton.me>
Date: Sun, 24 Nov 2024 08:05:10 -0500
Subject: [PATCH 103/546] hyprpaper: fix service when no config file

The systemd user service depends on

  config.xdg.configFile."hypr/hyprpaper.conf".source

for `X-Restart-Triggers`. When `cfg.settings` is the default `{}`,
this causes failure since

  config.xdg.configFile."hypr/hyprpaper.conf".source

will not exist.

Making the addition conditional on `cfg.settings` actually having
content, which would mean `xdg.configFile."hypr/hyprpaper.conf"` does
exist, avoids the error.
---
 modules/services/hyprpaper.nix                  |  2 +-
 tests/modules/services/hyprpaper/default.nix    |  5 ++++-
 .../services/hyprpaper/no-configuration.nix     | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/services/hyprpaper/no-configuration.nix

diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix
index ede09b258..6c9ddb2cf 100644
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -75,7 +75,7 @@ in {
         Description = "hyprpaper";
         After = [ "graphical-session-pre.target" ];
         PartOf = [ "graphical-session.target" ];
-        X-Restart-Triggers =
+        X-Restart-Triggers = mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hyprpaper.conf".source}" ];
       };
 
diff --git a/tests/modules/services/hyprpaper/default.nix b/tests/modules/services/hyprpaper/default.nix
index 2a5abbfed..d3e87df43 100644
--- a/tests/modules/services/hyprpaper/default.nix
+++ b/tests/modules/services/hyprpaper/default.nix
@@ -1 +1,4 @@
-{ hyprpaper-basic-configuration = ./basic-configuration.nix; }
+{
+  hyprpaper-basic-configuration = ./basic-configuration.nix;
+  hyprpaper-no-configuration = ./no-configuration.nix;
+}
diff --git a/tests/modules/services/hyprpaper/no-configuration.nix b/tests/modules/services/hyprpaper/no-configuration.nix
new file mode 100644
index 000000000..15775e886
--- /dev/null
+++ b/tests/modules/services/hyprpaper/no-configuration.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+  services.hyprpaper = {
+    enable = true;
+    settings = { };
+  };
+
+  test.stubs.hyprpaper = { };
+
+  nmt.script = ''
+    config=home-files/.config/hypr/hyprpaper.conf
+    clientServiceFile=home-files/.config/systemd/user/hyprpaper.service
+    assertPathNotExists $config
+    assertFileExists $clientServiceFile
+  '';
+}

From 5e2f47c5a52707d250364401091e88021ba052a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?=
 <sebaszv@proton.me>
Date: Sat, 23 Nov 2024 16:16:15 -0500
Subject: [PATCH 104/546] hypridle: fix service when no config file

The systemd user service depends on

  config.xdg.configFile."hypr/hypridle.conf".source

for `X-Restart-Triggers`. When `cfg.settings` is the default `{}`,
this causes failure since

  config.xdg.configFile."hypr/hypridle.conf".source

will not exist.

Making the addition conditional on `cfg.settings` actually having
content, which would mean `xdg.configFile."hypr/hypridle.conf"` does
exist, avoids the error.
---
 modules/services/hypridle.nix                      |  2 +-
 tests/modules/services/hypridle/default.nix        |  5 ++++-
 .../modules/services/hypridle/no-configuration.nix | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/services/hypridle/no-configuration.nix

diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix
index 0e28c5438..0d8a337b4 100644
--- a/modules/services/hypridle.nix
+++ b/modules/services/hypridle.nix
@@ -81,7 +81,7 @@ in {
         Description = "hypridle";
         After = [ "graphical-session-pre.target" ];
         PartOf = [ "graphical-session.target" ];
-        X-Restart-Triggers =
+        X-Restart-Triggers = mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hypridle.conf".source}" ];
       };
 
diff --git a/tests/modules/services/hypridle/default.nix b/tests/modules/services/hypridle/default.nix
index c959983c0..b351f1c00 100644
--- a/tests/modules/services/hypridle/default.nix
+++ b/tests/modules/services/hypridle/default.nix
@@ -1 +1,4 @@
-{ hypridle-basic-configuration = ./basic-configuration.nix; }
+{
+  hypridle-basic-configuration = ./basic-configuration.nix;
+  hypridle-no-configuration = ./no-configuration.nix;
+}
diff --git a/tests/modules/services/hypridle/no-configuration.nix b/tests/modules/services/hypridle/no-configuration.nix
new file mode 100644
index 000000000..805e49561
--- /dev/null
+++ b/tests/modules/services/hypridle/no-configuration.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  services.hypridle.enable = true;
+
+  test.stubs.hypridle = { };
+
+  nmt.script = ''
+    config=home-files/.config/hypr/hypridle.conf
+    clientServiceFile=home-files/.config/systemd/user/hypridle.service
+    assertPathNotExists $config
+    assertFileExists $clientServiceFile
+  '';
+}

From 9ae941a4cff40575feb7a64eb6cce70f733b12ed Mon Sep 17 00:00:00 2001
From: Christian Segundo <christian@segundo.io>
Date: Sun, 24 Nov 2024 17:45:26 +0100
Subject: [PATCH 105/546] abook: remove platform linux assertion

Abook is also available on other platforms, e.g., Darwin.
---
 modules/programs/abook.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/programs/abook.nix b/modules/programs/abook.nix
index a9945d0e7..68d9ca75f 100644
--- a/modules/programs/abook.nix
+++ b/modules/programs/abook.nix
@@ -27,9 +27,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "programs.abook" pkgs platforms.linux) ];
-
     home.packages = [ pkgs.abook ];
 
     xdg.configFile."abook/abookrc" = mkIf (cfg.extraConfig != "") {

From f9fd45c512ef02c69557823543bb04051a41fa37 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 10 Aug 2024 14:13:35 -0700
Subject: [PATCH 106/546] volnoti: add self to maintainers

---
 modules/services/volnoti.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/volnoti.nix b/modules/services/volnoti.nix
index e90db2c20..7d4e725f0 100644
--- a/modules/services/volnoti.nix
+++ b/modules/services/volnoti.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.volnoti;
 
 in {
-  meta.maintainers = [ maintainers.imalison ];
+  meta.maintainers = with maintainers; [ imalison tomodachi94 ];
 
   options = {
     services.volnoti = {

From 98bf8de65dc1ed12c6443b18f6f24d36e9c438d6 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 10 Aug 2024 14:13:51 -0700
Subject: [PATCH 107/546] volnoti: use cfg.package instead of pkgs

---
 modules/services/volnoti.nix                  |  2 +-
 tests/default.nix                             |  1 +
 tests/modules/services/volnoti/default.nix    |  1 +
 .../services/volnoti/package-option.nix       | 31 +++++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/services/volnoti/default.nix
 create mode 100644 tests/modules/services/volnoti/package-option.nix

diff --git a/modules/services/volnoti.nix b/modules/services/volnoti.nix
index 7d4e725f0..47b45aab4 100644
--- a/modules/services/volnoti.nix
+++ b/modules/services/volnoti.nix
@@ -37,7 +37,7 @@ in {
 
       Install = { WantedBy = [ "graphical-session.target" ]; };
 
-      Service = { ExecStart = "${pkgs.volnoti}/bin/volnoti -v -n"; };
+      Service = { ExecStart = "${lib.getExe cfg.package} -v -n"; };
     };
   };
 }
diff --git a/tests/default.nix b/tests/default.nix
index 8fac3280a..7ddddc166 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -287,6 +287,7 @@ in import nmtSrc {
     ./modules/services/trayscale
     ./modules/services/twmn
     ./modules/services/udiskie
+    ./modules/services/volnoti
     ./modules/services/window-managers/bspwm
     ./modules/services/window-managers/herbstluftwm
     ./modules/services/window-managers/hyprland
diff --git a/tests/modules/services/volnoti/default.nix b/tests/modules/services/volnoti/default.nix
new file mode 100644
index 000000000..d4621e62f
--- /dev/null
+++ b/tests/modules/services/volnoti/default.nix
@@ -0,0 +1 @@
+{ volnoti-package-option = ./package-option.nix; }
diff --git a/tests/modules/services/volnoti/package-option.nix b/tests/modules/services/volnoti/package-option.nix
new file mode 100644
index 000000000..ab403cdb2
--- /dev/null
+++ b/tests/modules/services/volnoti/package-option.nix
@@ -0,0 +1,31 @@
+{ config, ... }:
+
+{
+  services.volnoti = {
+    enable = true;
+    package = config.lib.test.mkStubPackage {
+      name = "volnoti";
+      outPath = "@volnoti@";
+    };
+  };
+
+  test.stubs.volnoti = { };
+
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/volnoti.service
+    assertFileExists $serviceFile
+    assertFileContent $serviceFile \
+      ${
+        builtins.toFile "expected-volnoti.service" ''
+          [Install]
+          WantedBy=graphical-session.target
+
+          [Service]
+          ExecStart=@volnoti@/bin/volnoti -v -n
+
+          [Unit]
+          Description=volnoti
+        ''
+      }
+  '';
+}

From 83002f18468c4471d5f8de8c542ed2422badbf8f Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Sun, 24 Nov 2024 12:26:14 -0600
Subject: [PATCH 108/546] mopidy: restart the systemd service on failure

---
 modules/services/mopidy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix
index b02708578..fc04d3d07 100644
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -130,6 +130,7 @@ in {
 
       Service = {
         ExecStart = "${mopidyEnv}/bin/mopidy --config ${configFilePaths}";
+        Restart = "on-failure";
       };
 
       Install.WantedBy = [ "default.target" ];

From 4d8d8c385e78f5f744e2e2f81f5c56fade6ca4eb Mon Sep 17 00:00:00 2001
From: Ingo Reitz <9l@9lo.re>
Date: Sun, 24 Nov 2024 21:15:57 +0100
Subject: [PATCH 109/546] zed-editor: add extraPackages option

Add extraPackages option to make for example language servers
available to Zed without having to add them to `home.packages` or
similar.
---
 modules/programs/zed-editor.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix
index 250d891bb..a9baebf90 100644
--- a/modules/programs/zed-editor.nix
+++ b/modules/programs/zed-editor.nix
@@ -22,6 +22,13 @@ in {
 
       package = mkPackageOption pkgs "zed-editor" { };
 
+      extraPackages = mkOption {
+        type = with types; listOf package;
+        default = [ ];
+        example = literalExpression "[ pkgs.nixd ]";
+        description = "Extra packages available to Zed.";
+      };
+
       userSettings = mkOption {
         type = jsonFormat.type;
         default = { };
@@ -76,7 +83,22 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = if cfg.extraPackages != [ ] then
+      [
+        (pkgs.symlinkJoin {
+          name =
+            "${lib.getName cfg.package}-wrapped-${lib.getVersion cfg.package}";
+          paths = [ cfg.package ];
+          preferLocalBuild = true;
+          nativeBuildInputs = [ pkgs.makeWrapper ];
+          postBuild = ''
+            wrapProgram $out/bin/zeditor \
+              --suffix PATH : ${lib.makeBinPath cfg.extraPackages}
+          '';
+        })
+      ]
+    else
+      [ cfg.package ];
 
     xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) {
       source = jsonFormat.generate "zed-user-settings" mergedSettings;

From a9953635d7f34e7358d5189751110f87e3ac17da Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Tue, 12 Nov 2024 14:13:32 -0600
Subject: [PATCH 110/546] mopidy: restart service on config changes

Also extend basic configuration test a bit to verify the restart
trigger.
---
 modules/services/mopidy.nix                   |  2 ++
 .../services/mopidy/basic-configuration.nix   | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix
index fc04d3d07..d50a81294 100644
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -126,6 +126,8 @@ in {
         Description = "mopidy music player daemon";
         Documentation = [ "https://mopidy.com/" ];
         After = [ "network.target" "sound.target" ];
+        X-Restart-Triggers = mkIf (cfg.settings != { })
+          [ "${config.xdg.configFile."mopidy/mopidy.conf".source}" ];
       };
 
       Service = {
diff --git a/tests/modules/services/mopidy/basic-configuration.nix b/tests/modules/services/mopidy/basic-configuration.nix
index 2bffbd681..99aaeece8 100644
--- a/tests/modules/services/mopidy/basic-configuration.nix
+++ b/tests/modules/services/mopidy/basic-configuration.nix
@@ -29,7 +29,28 @@
   };
 
   nmt.script = ''
-    assertFileExists home-files/.config/systemd/user/mopidy.service
+    serviceFile=home-files/.config/systemd/user/mopidy.service
+    assertFileExists $serviceFile
+    serviceFile=$(normalizeStorePaths $serviceFile)
+    assertFileContent $serviceFile \
+      ${
+        builtins.toFile "expected-mopidy.service" ''
+          [Install]
+          WantedBy=default.target
+
+          [Service]
+          ExecStart=/nix/store/00000000000000000000000000000000-mopidy-with-extensions/bin/mopidy --config /home/hm-user/.config/mopidy/mopidy.conf
+          Restart=on-failure
+
+          [Unit]
+          After=network.target
+          After=sound.target
+          Description=mopidy music player daemon
+          Documentation=https://mopidy.com/
+          X-Restart-Triggers=/nix/store/00000000000000000000000000000000-mopidy-hm-user
+        ''
+      }
+
     assertPathNotExists home-files/.config/systemd/user/mopidy-scan.service
 
     assertFileExists home-files/.config/mopidy/mopidy.conf

From 0941a2e14486ee30e2088afa1d2869f2486dd3b8 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Thu, 28 Nov 2024 10:44:48 +0100
Subject: [PATCH 111/546] 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/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
  → 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index d98d6b864..a6a23e526 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732014248,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "lastModified": 1732521221,
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
         "type": "github"
       },
       "original": {

From f83dc9f25a5915c70b013102e30f3ee2a72ba633 Mon Sep 17 00:00:00 2001
From: Gen <54583542+gen740@users.noreply.github.com>
Date: Thu, 28 Nov 2024 19:30:10 +0900
Subject: [PATCH 112/546] tmux: set `sensibleOnTop = false` as a default

Fixes #5952
---
 modules/programs/tmux.nix                                    | 2 +-
 tests/modules/programs/tmux/default-shell.conf               | 5 -----
 tests/modules/programs/tmux/disable-confirmation-prompt.conf | 5 -----
 tests/modules/programs/tmux/emacs-with-plugins.conf          | 5 -----
 tests/modules/programs/tmux/mouse-enabled.conf               | 5 -----
 tests/modules/programs/tmux/prefix.conf                      | 5 -----
 tests/modules/programs/tmux/shortcut-without-prefix.conf     | 5 -----
 tests/modules/programs/tmux/vi-all-true.conf                 | 5 -----
 8 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index b68fd8d5e..38a184c94 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -239,7 +239,7 @@ in {
 
       sensibleOnTop = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Run the sensible plugin at the top of the configuration. It
           is possible to override the sensible settings using the
diff --git a/tests/modules/programs/tmux/default-shell.conf b/tests/modules/programs/tmux/default-shell.conf
index 8eb4e40fa..473ec0d6f 100644
--- a/tests/modules/programs/tmux/default-shell.conf
+++ b/tests/modules/programs/tmux/default-shell.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/tests/modules/programs/tmux/disable-confirmation-prompt.conf
index b4359316c..0adb521fb 100644
--- a/tests/modules/programs/tmux/disable-confirmation-prompt.conf
+++ b/tests/modules/programs/tmux/disable-confirmation-prompt.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.conf b/tests/modules/programs/tmux/emacs-with-plugins.conf
index 54ddce136..556a682df 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.conf
+++ b/tests/modules/programs/tmux/emacs-with-plugins.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @tmuxplugin_sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/mouse-enabled.conf b/tests/modules/programs/tmux/mouse-enabled.conf
index 2069920de..2fcd9f54a 100644
--- a/tests/modules/programs/tmux/mouse-enabled.conf
+++ b/tests/modules/programs/tmux/mouse-enabled.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/prefix.conf b/tests/modules/programs/tmux/prefix.conf
index 00f950e09..3bc7c63ac 100644
--- a/tests/modules/programs/tmux/prefix.conf
+++ b/tests/modules/programs/tmux/prefix.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/shortcut-without-prefix.conf b/tests/modules/programs/tmux/shortcut-without-prefix.conf
index 938ecfa82..e3c27610a 100644
--- a/tests/modules/programs/tmux/shortcut-without-prefix.conf
+++ b/tests/modules/programs/tmux/shortcut-without-prefix.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0
diff --git a/tests/modules/programs/tmux/vi-all-true.conf b/tests/modules/programs/tmux/vi-all-true.conf
index 03bf2f5a1..3bcc51ddd 100644
--- a/tests/modules/programs/tmux/vi-all-true.conf
+++ b/tests/modules/programs/tmux/vi-all-true.conf
@@ -1,8 +1,3 @@
-# ============================================= #
-# Start with defaults from the Sensible plugin  #
-# --------------------------------------------- #
-run-shell @sensible_rtp@
-# ============================================= #
 
 set  -g default-terminal "screen"
 set  -g base-index      0

From 21396857fdceb61239a7ae67b9be4dbfd90c12c1 Mon Sep 17 00:00:00 2001
From: Etherbloom <etherbloom+github@mailbox.org>
Date: Thu, 28 Nov 2024 11:32:21 +0100
Subject: [PATCH 113/546] kdeconnect: upgrade default version

Plasma6 has been out for a while now and the service still points to
the old, incompatible version.
---
 modules/services/kdeconnect.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix
index f0b1da5be..f30d79fc5 100644
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@@ -14,8 +14,8 @@ in {
       enable = mkEnableOption "KDE connect";
       package = mkOption {
         type = types.package;
-        default = pkgs.plasma5Packages.kdeconnect-kde;
-        example = literalExpression "pkgs.kdePackages.kdeconnect-kde";
+        default = pkgs.kdePackages.kdeconnect-kde;
+        example = literalExpression "pkgs.plasma5Packages.kdeconnect-kde";
         description = "The KDE connect package to use";
       };
 

From de7d67b8bae8aa2ac920fa10918c89ce44b66d00 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Wed, 6 Nov 2024 13:36:42 -0600
Subject: [PATCH 114/546] mopidy: make makeWrapper a native build input

This fixes the error message

    error: makeWrapper/makeShellWrapper must be in nativeBuildInputs
---
 modules/services/mopidy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix
index d50a81294..3f962edf6 100644
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -23,7 +23,7 @@ let
     name = "mopidy-with-extensions-${pkgs.mopidy.version}";
     paths = closePropagation cfg.extensionPackages;
     pathsToLink = [ "/${pkgs.mopidyPackages.python.sitePackages}" ];
-    buildInputs = [ pkgs.makeWrapper ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
     postBuild = ''
       makeWrapper ${pkgs.mopidy}/bin/mopidy $out/bin/mopidy \
         --prefix PYTHONPATH : $out/${pkgs.mopidyPackages.python.sitePackages}

From b7219652387ce4331ae49ddac8b0286f50e0ed68 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Wed, 6 Nov 2024 13:38:19 -0600
Subject: [PATCH 115/546] mopidy: ignore collisions between extensions

---
 modules/services/mopidy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix
index 3f962edf6..397ed287e 100644
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -24,6 +24,7 @@ let
     paths = closePropagation cfg.extensionPackages;
     pathsToLink = [ "/${pkgs.mopidyPackages.python.sitePackages}" ];
     nativeBuildInputs = [ pkgs.makeWrapper ];
+    ignoreCollisions = true;
     postBuild = ''
       makeWrapper ${pkgs.mopidy}/bin/mopidy $out/bin/mopidy \
         --prefix PYTHONPATH : $out/${pkgs.mopidyPackages.python.sitePackages}

From 2f7739d01080feb4549524e8f6927669b61c6ee3 Mon Sep 17 00:00:00 2001
From: Philip Wilk <p.wilk@student.reading.ac.uk>
Date: Sat, 20 Jul 2024 20:04:28 +0100
Subject: [PATCH 116/546] kakoune: add colorSchemePackage option

This makes it easy to declaratively manage the color scheme for
kakoune via a nix package in your `~/.config/kak/colors` folder. The
color scheme can then be declaratively selected by name using the
existing Home Manager option `programs.kakoune.config.colorScheme`.
---
 modules/programs/kakoune.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index da0af0c06..e68a8568e 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -658,12 +658,29 @@ in {
           {command}`nix-env -f '<nixpkgs>' -qaP -A kakounePlugins`.
         '';
       };
+
+      colorSchemePackage = mkOption {
+        type = with types; nullOr package;
+        default = null;
+        example = literalExpression "pkgs.kakounePlugins.kakoune-catppuccin";
+        description = ''
+          A kakoune color schemes to add to your colors folder. This works
+          because kakoune recursively checks
+          {file}`$XDG_CONFIG_HOME/kak/colors/`. To apply the color scheme use
+          `programs.kakoune.config.colorScheme = "theme"`.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
     home.packages = [ kakouneWithPlugins ];
     home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "kak"; };
-    xdg.configFile."kak/kakrc".source = configFile;
+    xdg.configFile = mkMerge [
+      { "kak/kakrc".source = configFile; }
+      (mkIf (cfg.colorSchemePackage != null) {
+        "kak/colors/${cfg.colorSchemePackage.name}" = cfg.colorSchemePackage;
+      })
+    ];
   };
 }

From 819f682269f4e002884702b87e445c82840c68f2 Mon Sep 17 00:00:00 2001
From: Ken Micklas <git@kmicklas.com>
Date: Fri, 29 Nov 2024 12:43:55 +0000
Subject: [PATCH 117/546] lorri: fix ReadWritePaths for new gcroots behavior

---
 modules/services/lorri.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/lorri.nix b/modules/services/lorri.nix
index 533a53441..93673dd8f 100644
--- a/modules/services/lorri.nix
+++ b/modules/services/lorri.nix
@@ -59,7 +59,6 @@ in {
             "%C/lorri"
             # Needs %C/nix/fetcher-cache-v1.sqlite
             "%C/nix"
-            "/nix/var/nix/gcroots/per-user/%u"
           ];
           CacheDirectory = [ "lorri" ];
           Restart = "on-failure";

From 8eeda281e70cbadabb7f0095c5f34e354e85f307 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 1 Dec 2024 10:04:56 +0100
Subject: [PATCH 118/546] 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/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25)
  → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index a6a23e526..77ef362c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1732837521,
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {

From 4964f3c6fc17ae4578e762d3dc86b10fe890860e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 22 Nov 2024 10:22:28 +0100
Subject: [PATCH 119/546] home-manager: prepare 24.11 release

---
 README.md                                              | 4 ++--
 docs/manual/installation/nix-darwin.md                 | 6 +++---
 docs/manual/installation/nixos.md                      | 6 +++---
 docs/manual/installation/standalone.md                 | 4 ++--
 docs/manual/nix-flakes/standalone.md                   | 6 +++---
 docs/manual/usage/configuration.md                     | 4 ++--
 docs/release-notes/rl-2411.md                          | 5 ++---
 home-manager/home-manager                              | 4 ++--
 modules/misc/uninstall.nix                             | 2 +-
 tests/integration/nixos/basics.nix                     | 2 +-
 tests/integration/standalone/alice-home-init.nix       | 2 +-
 tests/integration/standalone/alice-home-next.nix       | 2 +-
 tests/integration/standalone/kitty-theme-bad-home.nix  | 2 +-
 tests/integration/standalone/kitty-theme-good-home.nix | 2 +-
 14 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 075ccaae8..d90efb9e6 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Releases
 Home Manager is developed against `nixpkgs-unstable` branch, which often causes
 it to contain tweaks for changes/packages not yet released in stable [NixOS][].
 To avoid breaking users' configurations, Home Manager is released in branches
-corresponding to NixOS releases (e.g. `release-24.05`). These branches get
+corresponding to NixOS releases (e.g. `release-24.11`). These branches get
 fixes, but usually not new modules. If you need a module to be backported, then
 feel free to open an issue.
 
@@ -49,7 +49,7 @@ dconf store and cannot tell whether a configuration that it is about to be
 overwritten was from a previous Home Manager generation or from manual
 configuration.
 
-Home Manager targets [NixOS][] unstable and NixOS version 24.05 (the current
+Home Manager targets [NixOS][] unstable and NixOS version 24.11 (the current
 stable version), it may or may not work on other Linux distributions and NixOS
 versions.
 
diff --git a/docs/manual/installation/nix-darwin.md b/docs/manual/installation/nix-darwin.md
index f10253064..97ff95dab 100644
--- a/docs/manual/installation/nix-darwin.md
+++ b/docs/manual/installation/nix-darwin.md
@@ -15,10 +15,10 @@ $ nix-channel --add https://github.com/nix-community/home-manager/archive/master
 $ nix-channel --update
 ```
 
-and if you follow a Nixpkgs version 24.05 channel, you can run
+and if you follow a Nixpkgs version 24.11 channel, you can run
 
 ``` shell
-$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
+$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
 $ nix-channel --update
 ```
 
@@ -45,7 +45,7 @@ home-manager.users.eve = { pkgs, ... }: {
 
   # The state version is required and should stay at the version you
   # originally installed.
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 };
 ```
 
diff --git a/docs/manual/installation/nixos.md b/docs/manual/installation/nixos.md
index d432a54be..6c9807ee8 100644
--- a/docs/manual/installation/nixos.md
+++ b/docs/manual/installation/nixos.md
@@ -17,10 +17,10 @@ $ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/m
 $ sudo nix-channel --update
 ```
 
-and if you follow a Nixpkgs version 24.05 channel, you can run
+and if you follow a Nixpkgs version 24.11 channel, you can run
 
 ``` shell
-$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
+$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
 $ sudo nix-channel --update
 ```
 
@@ -44,7 +44,7 @@ home-manager.users.eve = { pkgs, ... }: {
 
   # The state version is required and should stay at the version you
   # originally installed.
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 };
 ```
 
diff --git a/docs/manual/installation/standalone.md b/docs/manual/installation/standalone.md
index 4afb7f347..4d430af9d 100644
--- a/docs/manual/installation/standalone.md
+++ b/docs/manual/installation/standalone.md
@@ -19,10 +19,10 @@
     $ nix-channel --update
     ```
 
-    and if you follow a Nixpkgs version 24.05 channel you can run
+    and if you follow a Nixpkgs version 24.11 channel you can run
 
     ``` shell
-    $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
+    $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
     $ nix-channel --update
     ```
 
diff --git a/docs/manual/nix-flakes/standalone.md b/docs/manual/nix-flakes/standalone.md
index fc967f460..4cfac424c 100644
--- a/docs/manual/nix-flakes/standalone.md
+++ b/docs/manual/nix-flakes/standalone.md
@@ -11,10 +11,10 @@ then to generate and activate a basic configuration run the command
 $ nix run home-manager/master -- init --switch
 ```
 
-For Nixpkgs or NixOS version 24.05 run
+For Nixpkgs or NixOS version 24.11 run
 
 ``` shell
-$ nix run home-manager/release-24.05 -- init --switch
+$ nix run home-manager/release-24.11 -- init --switch
 ```
 
 This will generate a `flake.nix` and a `home.nix` file in
@@ -30,7 +30,7 @@ $ # Edit files in ~/.config/home-manager
 $ nix run home-manager/$branch -- init --switch
 ```
 
-Where `$branch` is one of `master` or `release-24.05`.
+Where `$branch` is one of `master` or `release-24.11`.
 
 After the initial activation has completed successfully then building
 and activating your flake-based configuration is as simple as
diff --git a/docs/manual/usage/configuration.md b/docs/manual/usage/configuration.md
index deb046a6b..868b93521 100644
--- a/docs/manual/usage/configuration.md
+++ b/docs/manual/usage/configuration.md
@@ -20,7 +20,7 @@ A fresh install of Home Manager will generate a minimal
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -65,7 +65,7 @@ follows:
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
diff --git a/docs/release-notes/rl-2411.md b/docs/release-notes/rl-2411.md
index 626624640..c03394c54 100644
--- a/docs/release-notes/rl-2411.md
+++ b/docs/release-notes/rl-2411.md
@@ -1,7 +1,6 @@
 # Release 24.11 {#sec-release-24.11}
 
-This is the current unstable branch and the information in this section
-is therefore not final.
+The 24.05 release branch became stable in November, 2024.
 
 ## Highlights {#sec-release-24.11-highlights}
 
@@ -29,4 +28,4 @@ The state version in this release includes the changes below. These
 changes are only active if the `home.stateVersion` option is set to
 \"24.11\" or later.
 
-- No changes.
+- There was no state version change in this release.
diff --git a/home-manager/home-manager b/home-manager/home-manager
index 71b982f40..712954476 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -359,7 +359,7 @@ $xdgVars
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "24.05"; # Please read the comment before changing.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
@@ -857,7 +857,7 @@ function doUninstall() {
   uninstall = true;
   home.username = "$USER";
   home.homeDirectory = "$HOME";
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }
 EOF
             # shellcheck disable=2064
diff --git a/modules/misc/uninstall.nix b/modules/misc/uninstall.nix
index b34732b0b..3086d21b8 100644
--- a/modules/misc/uninstall.nix
+++ b/modules/misc/uninstall.nix
@@ -21,7 +21,7 @@ in {
   config = mkIf config.uninstall {
     home.packages = lib.mkForce [ ];
     home.file = lib.mkForce { };
-    home.stateVersion = lib.mkForce "24.05";
+    home.stateVersion = lib.mkForce "24.11";
     home.enableNixpkgsReleaseCheck = lib.mkForce false;
     manual.manpages.enable = lib.mkForce false;
     news.display = lib.mkForce "silent";
diff --git a/tests/integration/nixos/basics.nix b/tests/integration/nixos/basics.nix
index 41bddefea..61c6b3e49 100644
--- a/tests/integration/nixos/basics.nix
+++ b/tests/integration/nixos/basics.nix
@@ -17,7 +17,7 @@
     };
 
     home-manager.users.alice = { ... }: {
-      home.stateVersion = "24.05";
+      home.stateVersion = "24.11";
       home.file.test.text = "testfile";
       # Enable a light-weight systemd service.
       services.pueue.enable = true;
diff --git a/tests/integration/standalone/alice-home-init.nix b/tests/integration/standalone/alice-home-init.nix
index ab9786f80..e09fad68b 100644
--- a/tests/integration/standalone/alice-home-init.nix
+++ b/tests/integration/standalone/alice-home-init.nix
@@ -13,7 +13,7 @@
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "24.05"; # Please read the comment before changing.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
diff --git a/tests/integration/standalone/alice-home-next.nix b/tests/integration/standalone/alice-home-next.nix
index 6f948b0b4..577214a4f 100644
--- a/tests/integration/standalone/alice-home-next.nix
+++ b/tests/integration/standalone/alice-home-next.nix
@@ -3,7 +3,7 @@
 {
   home.username = "alice";
   home.homeDirectory = "/home/alice";
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
   home.packages = [ pkgs.hello ];
   home.file.test.text = "test";
   home.sessionVariables.EDITOR = "emacs";
diff --git a/tests/integration/standalone/kitty-theme-bad-home.nix b/tests/integration/standalone/kitty-theme-bad-home.nix
index e4851701b..4c4594173 100644
--- a/tests/integration/standalone/kitty-theme-bad-home.nix
+++ b/tests/integration/standalone/kitty-theme-bad-home.nix
@@ -1,7 +1,7 @@
 { ... }: {
   home.username = "alice";
   home.homeDirectory = "/home/alice";
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
diff --git a/tests/integration/standalone/kitty-theme-good-home.nix b/tests/integration/standalone/kitty-theme-good-home.nix
index f6085b1e1..606724bab 100644
--- a/tests/integration/standalone/kitty-theme-good-home.nix
+++ b/tests/integration/standalone/kitty-theme-good-home.nix
@@ -2,7 +2,7 @@
   home.username = "alice";
   home.homeDirectory = "/home/alice";
 
-  home.stateVersion = "24.05"; # Please read the comment before changing.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

From 441fae847ddfe20f9f9a4c47345691a205bb772c Mon Sep 17 00:00:00 2001
From: Nova Leary <coder.nova99@mailbox.org>
Date: Sun, 1 Dec 2024 11:23:18 -0600
Subject: [PATCH 120/546] zsh-abbr: add package option

---
 modules/programs/zsh/zsh-abbr.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/zsh/zsh-abbr.nix b/modules/programs/zsh/zsh-abbr.nix
index 47f29f211..096e5da5a 100644
--- a/modules/programs/zsh/zsh-abbr.nix
+++ b/modules/programs/zsh/zsh-abbr.nix
@@ -9,6 +9,8 @@ in {
     enable =
       mkEnableOption "zsh-abbr - zsh manager for auto-expanding abbreviations";
 
+    package = mkPackageOption pkgs "zsh-abbr" { };
+
     abbreviations = mkOption {
       type = types.attrsOf types.str;
       default = { };
@@ -27,7 +29,7 @@ in {
   config = mkIf cfg.enable {
     programs.zsh.plugins = [{
       name = "zsh-abbr";
-      src = pkgs.zsh-abbr;
+      src = cfg.package;
       file = "share/zsh/zsh-abbr/zsh-abbr.plugin.zsh";
     }];
 

From 7f78e2d1c6a9db76444e02a73f0669ebb79f8833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Sun, 1 Dec 2024 18:47:01 +0100
Subject: [PATCH 121/546] yazi: update keymap config

---
 modules/programs/yazi.nix                     | 18 ++++++------
 .../programs/yazi/keymap-expected.toml        | 28 +++++++++----------
 tests/modules/programs/yazi/settings.nix      | 18 ++++++------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 0f5117dbd..9c47345f5 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -77,16 +77,16 @@ in {
       default = { };
       example = literalExpression ''
         {
-          input.keymap = [
-            { exec = "close"; on = [ "<C-q>" ]; }
-            { exec = "close --submit"; on = [ "<Enter>" ]; }
-            { exec = "escape"; on = [ "<Esc>" ]; }
-            { exec = "backspace"; on = [ "<Backspace>" ]; }
+          input.prepend_keymap = [
+            { run = "close"; on = [ "<C-q>" ]; }
+            { run = "close --submit"; on = [ "<Enter>" ]; }
+            { run = "escape"; on = [ "<Esc>" ]; }
+            { run = "backspace"; on = [ "<Backspace>" ]; }
           ];
-          manager.keymap = [
-            { exec = "escape"; on = [ "<Esc>" ]; }
-            { exec = "quit"; on = [ "q" ]; }
-            { exec = "close"; on = [ "<C-q>" ]; }
+          manager.prepend_keymap = [
+            { run = "escape"; on = [ "<Esc>" ]; }
+            { run = "quit"; on = [ "q" ]; }
+            { run = "close"; on = [ "<C-q>" ]; }
           ];
         }
       '';
diff --git a/tests/modules/programs/yazi/keymap-expected.toml b/tests/modules/programs/yazi/keymap-expected.toml
index 6733978ad..09f300086 100644
--- a/tests/modules/programs/yazi/keymap-expected.toml
+++ b/tests/modules/programs/yazi/keymap-expected.toml
@@ -1,27 +1,27 @@
-[[input.keymap]]
-exec = "close"
+[[input.prepend_keymap]]
 on = ["<C-q>"]
+run = "close"
 
-[[input.keymap]]
-exec = "close --submit"
+[[input.prepend_keymap]]
 on = ["<Enter>"]
+run = "close --submit"
 
-[[input.keymap]]
-exec = "escape"
+[[input.prepend_keymap]]
 on = ["<Esc>"]
+run = "escape"
 
-[[input.keymap]]
-exec = "backspace"
+[[input.prepend_keymap]]
 on = ["<Backspace>"]
+run = "backspace"
 
-[[manager.keymap]]
-exec = "escape"
+[[manager.prepend_keymap]]
 on = ["<Esc>"]
+run = "escape"
 
-[[manager.keymap]]
-exec = "quit"
+[[manager.prepend_keymap]]
 on = ["q"]
+run = "quit"
 
-[[manager.keymap]]
-exec = "close"
+[[manager.prepend_keymap]]
 on = ["<C-q>"]
+run = "close"
diff --git a/tests/modules/programs/yazi/settings.nix b/tests/modules/programs/yazi/settings.nix
index 2694dadec..8c44870af 100644
--- a/tests/modules/programs/yazi/settings.nix
+++ b/tests/modules/programs/yazi/settings.nix
@@ -5,35 +5,35 @@
     enable = true;
 
     keymap = {
-      input.keymap = [
+      input.prepend_keymap = [
         {
-          exec = "close";
+          run = "close";
           on = [ "<C-q>" ];
         }
         {
-          exec = "close --submit";
+          run = "close --submit";
           on = [ "<Enter>" ];
         }
         {
-          exec = "escape";
+          run = "escape";
           on = [ "<Esc>" ];
         }
         {
-          exec = "backspace";
+          run = "backspace";
           on = [ "<Backspace>" ];
         }
       ];
-      manager.keymap = [
+      manager.prepend_keymap = [
         {
-          exec = "escape";
+          run = "escape";
           on = [ "<Esc>" ];
         }
         {
-          exec = "quit";
+          run = "quit";
           on = [ "q" ];
         }
         {
-          exec = "close";
+          run = "close";
           on = [ "<C-q>" ];
         }
       ];

From e71e678d18d1a24e01d823ccb72df13f9e82f65b Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Thu, 18 Jul 2024 14:15:10 +0200
Subject: [PATCH 122/546] nix-your-shell: add module

---
 modules/misc/news.nix                         | 10 ++++
 modules/modules.nix                           |  1 +
 modules/programs/nix-your-shell.nix           | 55 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../programs/nix-your-shell/default.nix       |  1 +
 .../programs/nix-your-shell/enable-shells.nix | 48 ++++++++++++++++
 6 files changed, 116 insertions(+)
 create mode 100644 modules/programs/nix-your-shell.nix
 create mode 100644 tests/modules/programs/nix-your-shell/default.nix
 create mode 100644 tests/modules/programs/nix-your-shell/enable-shells.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 32394f335..75990f087 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1827,6 +1827,16 @@ in {
           as systemd services.
         '';
       }
+
+      {
+        time = "2024-12-01T19:17:40+00:00";
+        message = ''
+          A new module is available: 'programs.nix-your-shell'.
+
+          nix-your-shell is a wrapper for `nix develop` or `nix-shell` to retain
+          the same shell inside the new environment.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 75f8ac461..7d23c950a 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -176,6 +176,7 @@ let
     ./programs/nh.nix
     ./programs/nheko.nix
     ./programs/nix-index.nix
+    ./programs/nix-your-shell.nix
     ./programs/nnn.nix
     ./programs/noti.nix
     ./programs/notmuch.nix
diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell.nix
new file mode 100644
index 000000000..5e19e8801
--- /dev/null
+++ b/modules/programs/nix-your-shell.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.nix-your-shell;
+
+in {
+  meta.maintainers = [ maintainers.terlar ];
+
+  options.programs.nix-your-shell = {
+    enable = mkEnableOption ''
+      {command}`nix-your-shell`, a wrapper for `nix develop` or `nix-shell`
+      to retain the same shell inside the new environment'';
+
+    package = mkPackageOption pkgs "nix-your-shell" { };
+
+    enableFishIntegration = mkEnableOption "Fish integration" // {
+      default = true;
+    };
+
+    enableNushellIntegration = mkEnableOption "Nushell integration" // {
+      default = true;
+    };
+
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
+      default = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    programs = {
+      fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+        ${cfg.package}/bin/nix-your-shell fish | source
+      '';
+
+      nushell = mkIf cfg.enableNushellIntegration {
+        extraEnv = ''
+          ${cfg.package}/bin/nix-your-shell nu | save --force ${config.xdg.cacheHome}/nix-your-shell/init.nu
+        '';
+
+        extraConfig = ''
+          source ${config.xdg.cacheHome}/nix-your-shell/init.nu
+        '';
+      };
+
+      zsh.initExtra = mkIf cfg.enableZshIntegration ''
+        ${cfg.package}/bin/nix-your-shell zsh | source /dev/stdin
+      '';
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 7ddddc166..ec381414c 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -118,6 +118,7 @@ in import nmtSrc {
     ./modules/programs/newsboat
     ./modules/programs/nheko
     ./modules/programs/nix-index
+    ./modules/programs/nix-your-shell
     ./modules/programs/nnn
     ./modules/programs/nushell
     ./modules/programs/oh-my-posh
diff --git a/tests/modules/programs/nix-your-shell/default.nix b/tests/modules/programs/nix-your-shell/default.nix
new file mode 100644
index 000000000..06d2f688c
--- /dev/null
+++ b/tests/modules/programs/nix-your-shell/default.nix
@@ -0,0 +1 @@
+{ nix-your-shell-enable-shells = ./enable-shells.nix; }
diff --git a/tests/modules/programs/nix-your-shell/enable-shells.nix b/tests/modules/programs/nix-your-shell/enable-shells.nix
new file mode 100644
index 000000000..ab8c6909e
--- /dev/null
+++ b/tests/modules/programs/nix-your-shell/enable-shells.nix
@@ -0,0 +1,48 @@
+{ pkgs, config, ... }:
+
+{
+  programs = {
+    nix-your-shell = {
+      enable = true;
+      enableFishIntegration = true;
+      enableNushellIntegration = true;
+      enableZshIntegration = true;
+    };
+    fish.enable = true;
+    nushell.enable = true;
+    zsh.enable = true;
+  };
+
+  test.stubs = {
+    nix-your-shell = { };
+    nushell = { };
+    zsh = { };
+  };
+
+  nmt.script = let
+    nushellConfigDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
+      "home-files/Library/Application Support/nushell"
+    else
+      "home-files/.config/nushell";
+  in ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      '@nix-your-shell@/bin/nix-your-shell fish | source'
+
+    assertFileExists ${nushellConfigDir}/config.nu
+    assertFileContains \
+      ${nushellConfigDir}/config.nu \
+      'source ${config.xdg.cacheHome}/nix-your-shell/init.nu'
+
+    assertFileExists ${nushellConfigDir}/env.nu
+    assertFileContains \
+      ${nushellConfigDir}/env.nu \
+      '@nix-your-shell@/bin/nix-your-shell nu | save --force ${config.xdg.cacheHome}/nix-your-shell/init.nu'
+
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      '@nix-your-shell@/bin/nix-your-shell zsh | source /dev/stdin'
+  '';
+}

From 863273505016a1e88e4ffaec48d1b767104c5652 Mon Sep 17 00:00:00 2001
From: Igor Rzegocki <igor@rzegocki.pl>
Date: Thu, 3 Oct 2024 15:57:31 +0200
Subject: [PATCH 123/546] kubecolor: add module

---
 modules/misc/news.nix                         | 10 +++
 modules/modules.nix                           |  1 +
 modules/programs/kubecolor.nix                | 87 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/kubecolor/default.nix  |  5 ++
 .../programs/kubecolor/empty-config.nix       | 20 +++++
 .../example-config-default-paths.nix          | 37 ++++++++
 .../kubecolor/example-config-xdg-paths.nix    | 36 ++++++++
 8 files changed, 197 insertions(+)
 create mode 100644 modules/programs/kubecolor.nix
 create mode 100644 tests/modules/programs/kubecolor/default.nix
 create mode 100644 tests/modules/programs/kubecolor/empty-config.nix
 create mode 100644 tests/modules/programs/kubecolor/example-config-default-paths.nix
 create mode 100644 tests/modules/programs/kubecolor/example-config-xdg-paths.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 75990f087..57f57ae83 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1837,6 +1837,16 @@ in {
           the same shell inside the new environment.
         '';
       }
+
+      {
+        time = "2024-12-01T19:34:04+00:00";
+        message = ''
+          A new module is available: 'programs.kubecolor'.
+
+          Kubecolor is a kubectl wrapper used to add colors to your kubectl
+          output.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 7d23c950a..5d40a82fc 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -143,6 +143,7 @@ let
     ./programs/khard.nix
     ./programs/kitty.nix
     ./programs/kodi.nix
+    ./programs/kubecolor.nix
     ./programs/lazygit.nix
     ./programs/ledger.nix
     ./programs/less.nix
diff --git a/modules/programs/kubecolor.nix b/modules/programs/kubecolor.nix
new file mode 100644
index 000000000..d187c34d0
--- /dev/null
+++ b/modules/programs/kubecolor.nix
@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.kubecolor;
+  yamlFormat = pkgs.formats.yaml { };
+  inherit (pkgs.stdenv.hostPlatform) isDarwin;
+
+in {
+  meta.maintainers = with maintainers; [ ajgon ];
+
+  options.programs.kubecolor = {
+    enable = mkEnableOption "kubecolor - Colorize your kubectl output";
+
+    package = mkPackageOption pkgs "kubecolor" { };
+
+    enableAlias = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        When set to true, it will create an alias for kubectl pointing to
+        kubecolor, thus making kubecolor the default kubectl client.
+      '';
+    };
+
+    settings = mkOption {
+      type = yamlFormat.type;
+      default = { };
+      example = literalExpression ''
+        kubectl = lib.getExe pkgs.kubectl
+        preset = "dark";
+        paging = "auto";
+      '';
+      description = ''
+        Configuration written to {file}`~/.kube/color.yaml` (Linux)
+        or {file}`Library/Application Support/kube/color.yaml` (Darwin).
+        See <https://kubecolor.github.io/reference/config/> for supported
+        values.
+      '';
+    };
+  };
+
+  config = let
+    preferXdgDirectories = config.home.preferXdgDirectories
+      && (!isDarwin || config.xdg.enable);
+
+    # https://github.com/kubecolor/kubecolor/pull/145
+    configPathSuffix = if cfg.package.pname == "kubecolor"
+    && lib.strings.toInt (lib.versions.major cfg.package.version) == 0
+    && lib.strings.toInt (lib.versions.minor cfg.package.version) < 4 then
+      "kube/"
+    else
+      "kube/color.yaml";
+
+  in mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    home.sessionVariables = if preferXdgDirectories then {
+      KUBECOLOR_CONFIG = "${config.xdg.configHome}/${configPathSuffix}";
+    } else if isDarwin then {
+      KUBECOLOR_CONFIG =
+        "${config.home.homeDirectory}/Library/Application Support/${configPathSuffix}";
+    } else
+      { };
+
+    xdg.configFile = mkIf preferXdgDirectories {
+      "kube/color.yaml" = mkIf (cfg.settings != { }) {
+        source = yamlFormat.generate "kubecolor-settings" cfg.settings;
+      };
+    };
+
+    home.file = mkIf (!preferXdgDirectories) {
+      "Library/Application Support/kube/color.yaml" =
+        mkIf (isDarwin && cfg.settings != { }) {
+          source = yamlFormat.generate "kubecolor-settings" cfg.settings;
+        };
+      ".kube/color.yaml" = mkIf (!isDarwin && cfg.settings != { }) {
+        source = yamlFormat.generate "kubecolor-settings" cfg.settings;
+      };
+    };
+
+    home.shellAliases =
+      lib.mkIf cfg.enableAlias { kubectl = lib.getExe cfg.package; };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index ec381414c..710b06668 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -98,6 +98,7 @@ in import nmtSrc {
     ./modules/programs/khal
     ./modules/programs/khard
     ./modules/programs/kitty
+    ./modules/programs/kubecolor
     ./modules/programs/ledger
     ./modules/programs/less
     ./modules/programs/lf
diff --git a/tests/modules/programs/kubecolor/default.nix b/tests/modules/programs/kubecolor/default.nix
new file mode 100644
index 000000000..4445de604
--- /dev/null
+++ b/tests/modules/programs/kubecolor/default.nix
@@ -0,0 +1,5 @@
+{
+  kubecolor-empty-config = ./empty-config.nix;
+  kubecolor-example-config-default-paths = ./example-config-default-paths.nix;
+  kubecolor-example-config-xdg-paths = ./example-config-xdg-paths.nix;
+}
diff --git a/tests/modules/programs/kubecolor/empty-config.nix b/tests/modules/programs/kubecolor/empty-config.nix
new file mode 100644
index 000000000..732321c50
--- /dev/null
+++ b/tests/modules/programs/kubecolor/empty-config.nix
@@ -0,0 +1,20 @@
+{ pkgs, config, ... }:
+
+let
+  configDir =
+    if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
+in {
+  programs.kubecolor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage {
+      name = "kubecolor";
+      version = "0.4.0";
+    };
+  };
+
+  test.stubs.kubecolor = { };
+
+  nmt.script = ''
+    assertPathNotExists 'home-files/${configDir}/kube/color.yaml'
+  '';
+}
diff --git a/tests/modules/programs/kubecolor/example-config-default-paths.nix b/tests/modules/programs/kubecolor/example-config-default-paths.nix
new file mode 100644
index 000000000..da3dcf5e1
--- /dev/null
+++ b/tests/modules/programs/kubecolor/example-config-default-paths.nix
@@ -0,0 +1,37 @@
+{ pkgs, config, ... }:
+
+let
+  configDir = if pkgs.stdenv.isDarwin then
+    "Library/Application Support/kube"
+  else
+    ".kube";
+in {
+  programs.kubecolor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage {
+      name = "kubecolor";
+      version = "0.4.0";
+    };
+    settings = {
+      kubectl = "kubectl";
+      preset = "dark";
+      objFreshThreshold = 0;
+      paging = "auto";
+      pager = "less";
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists 'home-files/${configDir}/color.yaml'
+    assertFileContent 'home-files/${configDir}/color.yaml' \
+      ${
+        builtins.toFile "expected.yaml" ''
+          kubectl: kubectl
+          objFreshThreshold: 0
+          pager: less
+          paging: auto
+          preset: dark
+        ''
+      }
+  '';
+}
diff --git a/tests/modules/programs/kubecolor/example-config-xdg-paths.nix b/tests/modules/programs/kubecolor/example-config-xdg-paths.nix
new file mode 100644
index 000000000..9ac9482c2
--- /dev/null
+++ b/tests/modules/programs/kubecolor/example-config-xdg-paths.nix
@@ -0,0 +1,36 @@
+{ config, ... }:
+
+{
+  xdg.enable = true;
+  home.preferXdgDirectories = true;
+
+  programs.kubecolor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage {
+      name = "kubecolor";
+      version = "0.4.0";
+    };
+    settings = {
+      kubectl = "kubectl";
+      preset = "dark";
+      objFreshThreshold = 0;
+      paging = "auto";
+      pager = "less";
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists 'home-files/.config/kube/color.yaml'
+    assertFileContent 'home-files/.config/kube/color.yaml' \
+      ${
+        builtins.toFile "expected.yaml" ''
+          kubectl: kubectl
+          objFreshThreshold: 0
+          pager: less
+          paging: auto
+          preset: dark
+        ''
+      }
+  '';
+}
+

From c1fee8d4a60b89cae12b288ba9dbc608ff298163 Mon Sep 17 00:00:00 2001
From: paumr <53442728+paumr@users.noreply.github.com>
Date: Sun, 1 Dec 2024 21:38:04 +0100
Subject: [PATCH 124/546] alot: make package used by module configurable

---
 modules/programs/alot.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/alot.nix b/modules/programs/alot.nix
index d0f552f92..10dec7c0c 100644
--- a/modules/programs/alot.nix
+++ b/modules/programs/alot.nix
@@ -132,6 +132,8 @@ in {
         '';
       };
 
+      package = mkPackageOption pkgs "alot" { };
+
       hooks = mkOption {
         type = types.lines;
         default = "";
@@ -229,7 +231,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ pkgs.alot ];
+    home.packages = [ cfg.package ];
 
     xdg.configFile."alot/config".text = configFile;
 

From d2e2bda6c050a61d51b8e395ad66b8fa48318e07 Mon Sep 17 00:00:00 2001
From: Fea <53912746+feathecutie@users.noreply.github.com>
Date: Mon, 2 Dec 2024 10:38:18 +0100
Subject: [PATCH 125/546] nix-your-shell: fix creating required directory

This fixes https://github.com/nix-community/home-manager/issues/6161
---
 modules/programs/nix-your-shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell.nix
index 5e19e8801..20b5fd19e 100644
--- a/modules/programs/nix-your-shell.nix
+++ b/modules/programs/nix-your-shell.nix
@@ -39,6 +39,7 @@ in {
 
       nushell = mkIf cfg.enableNushellIntegration {
         extraEnv = ''
+          mkdir ${config.xdg.cacheHome}/nix-your-shell
           ${cfg.package}/bin/nix-your-shell nu | save --force ${config.xdg.cacheHome}/nix-your-shell/init.nu
         '';
 

From 873e39d5f4437d2f3ab06881fea8e63e45e1d011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:05:28 +0100
Subject: [PATCH 126/546] podman-container: fix tests and failing podman 5.3.0
 service

Co-authored-by: Dylan Wilson <dylan@bytepen.com>
---
 modules/services/podman-linux/services.nix                 | 7 +++++++
 .../services/podman-linux/container-expected.service       | 6 +++---
 .../podman-linux/integration-container-expected.service    | 6 +++---
 .../podman-linux/integration-network-expected.service      | 7 +++++--
 .../modules/services/podman-linux/network-expected.service | 7 +++++--
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/modules/services/podman-linux/services.nix b/modules/services/podman-linux/services.nix
index e7191e4cd..87ff83ad8 100644
--- a/modules/services/podman-linux/services.nix
+++ b/modules/services/podman-linux/services.nix
@@ -61,5 +61,12 @@ in {
         Install = { WantedBy = [ "timers.target" ]; };
       };
     })
+    ({
+      xdg.configFile."systemd/user/podman-user-wait-network-online.service.d/50-exec-search-path.conf".text =
+        ''
+          [Service]
+          ExecSearchPath=${pkgs.bashInteractive}/bin:${pkgs.systemd}/bin:/bin
+        '';
+    })
   ]);
 }
diff --git a/tests/modules/services/podman-linux/container-expected.service b/tests/modules/services/podman-linux/container-expected.service
index c9cfe6551..d40e24bec 100644
--- a/tests/modules/services/podman-linux/container-expected.service
+++ b/tests/modules/services/podman-linux/container-expected.service
@@ -38,11 +38,11 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name=my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network=mynet --network-alias test-alias-1 --network-alias test-alias-2 --sdnotify=conmon -d --device=/dev/null:/dev/null --entrypoint=/sleep.sh --read-only-tmpfs -v /tmp:/tmp --label io.containers.autoupdate=registry --publish 8080:80 --env VAL_A=A --env VAL_B=2 --env VAL_C=false --label nix.home-manager.managed=true --security-opt=no-new-privileges docker.io/alpine:latest
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --entrypoint /sleep.sh --network-alias test-alias-1 --network-alias test-alias-2 --read-only-tmpfs --network mynet --sdnotify=conmon -d --device /dev/null:/dev/null -v /tmp:/tmp --label io.containers.autoupdate=registry --publish 8080:80 --env VAL_A=A --env VAL_B=2 --env VAL_C=false --label nix.home-manager.managed=true --security-opt=no-new-privileges docker.io/alpine:latest
 
 [Unit]
-Wants=network-online.target
-After=network-online.target
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
 After=network.target
 Before=fake.target
 Description=home-manager test
diff --git a/tests/modules/services/podman-linux/integration-container-expected.service b/tests/modules/services/podman-linux/integration-container-expected.service
index 32f8e5195..528d9c18e 100644
--- a/tests/modules/services/podman-linux/integration-container-expected.service
+++ b/tests/modules/services/podman-linux/integration-container-expected.service
@@ -28,11 +28,11 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name=my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network=my-net --network=externalnet --sdnotify=conmon -d --label nix.home-manager.managed=true docker.io/alpine:latest
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-net --network externalnet --sdnotify=conmon -d --label nix.home-manager.managed=true docker.io/alpine:latest
 
 [Unit]
-Wants=network-online.target
-After=network-online.target
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
 After=network.target
 After=podman-my-net-network.service
 Description=Service for container my-container
diff --git a/tests/modules/services/podman-linux/integration-network-expected.service b/tests/modules/services/podman-linux/integration-network-expected.service
index 3fd14857d..49acd4b9f 100644
--- a/tests/modules/services/podman-linux/integration-network-expected.service
+++ b/tests/modules/services/podman-linux/integration-network-expected.service
@@ -19,11 +19,14 @@ Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/0000
 ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
 RemainAfterExit=yes
 TimeoutStartSec=15
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet=192.168.123.0/24 --gateway=192.168.123.1 --label nix.home-manager.managed=true my-net
-Type=oneshot
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet 192.168.123.0/24 --gateway 192.168.123.1 --label nix.home-manager.managed=true my-net
 SyslogIdentifier=%N
+Type=oneshot
 
 [Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
 After=network.target
 Description=Service for network my-net
+SourcePath=/nix/store/00000000000000000000000000000000-home-network-podman-my-net/quadlets/podman-my-net.network
 RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/network-expected.service b/tests/modules/services/podman-linux/network-expected.service
index e2287a1f4..1017a17e7 100644
--- a/tests/modules/services/podman-linux/network-expected.service
+++ b/tests/modules/services/podman-linux/network-expected.service
@@ -23,11 +23,14 @@ Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/0000
 ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
 RemainAfterExit=yes
 TimeoutStartSec=15
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet=192.168.1.0/24 --gateway=192.168.1.1 --opt isolate=true --label nix.home-manager.managed=true --ipam-driver dhcp --dns=192.168.55.1 --log-level=debug my-net
-Type=oneshot
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman network create --ignore --subnet 192.168.1.0/24 --gateway 192.168.1.1 --opt isolate=true --label nix.home-manager.managed=true --ipam-driver dhcp --dns=192.168.55.1 --log-level=debug my-net
 SyslogIdentifier=%N
+Type=oneshot
 
 [Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
 After=network.target
 Description=Service for network my-net
+SourcePath=/nix/store/00000000000000000000000000000000-home-network-podman-my-net/quadlets/podman-my-net.network
 RequiresMountsFor=%t/containers

From bf23fe41082aa0289c209169302afd3397092f22 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 28 Nov 2024 12:37:48 +0000
Subject: [PATCH 127/546] tmux: add 'focusEvents'

With `tmux-sensible` being disabled by default, add an easy toggle to
enable this functionality.

Disabled by default, as in upstream `tmux`.
---
 modules/programs/tmux.nix                              | 10 ++++++++++
 tests/modules/programs/tmux/default-shell.conf         |  1 +
 .../programs/tmux/disable-confirmation-prompt.conf     |  1 +
 tests/modules/programs/tmux/emacs-with-plugins.conf    |  1 +
 tests/modules/programs/tmux/mouse-enabled.conf         |  1 +
 tests/modules/programs/tmux/prefix.conf                |  1 +
 .../modules/programs/tmux/shortcut-without-prefix.conf |  1 +
 tests/modules/programs/tmux/vi-all-true.conf           |  1 +
 8 files changed, 17 insertions(+)

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 38a184c94..85052c9fd 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -95,6 +95,7 @@ let
     ''}
 
     set  -g mouse             ${boolToStr cfg.mouse}
+    set  -g focus-events      ${boolToStr cfg.focusEvents}
     setw -g aggressive-resize ${boolToStr cfg.aggressiveResize}
     setw -g clock-mode-style  ${if cfg.clock24 then "24" else "12"}
     set  -s escape-time       ${toString cfg.escapeTime}
@@ -191,6 +192,15 @@ in {
         '';
       };
 
+      focusEvents = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          On supported terminals, request focus events and pass them through to
+          applications running in tmux.
+        '';
+      };
+
       historyLimit = mkOption {
         default = 2000;
         example = 5000;
diff --git a/tests/modules/programs/tmux/default-shell.conf b/tests/modules/programs/tmux/default-shell.conf
index 473ec0d6f..b3c5bbfee 100644
--- a/tests/modules/programs/tmux/default-shell.conf
+++ b/tests/modules/programs/tmux/default-shell.conf
@@ -19,6 +19,7 @@ set -g mode-keys   emacs
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize off
 setw -g clock-mode-style  12
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/tests/modules/programs/tmux/disable-confirmation-prompt.conf
index 0adb521fb..2074cb2ef 100644
--- a/tests/modules/programs/tmux/disable-confirmation-prompt.conf
+++ b/tests/modules/programs/tmux/disable-confirmation-prompt.conf
@@ -19,6 +19,7 @@ bind-key -N "Kill the current pane" x kill-pane
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize off
 setw -g clock-mode-style  12
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.conf b/tests/modules/programs/tmux/emacs-with-plugins.conf
index 556a682df..841914afb 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.conf
+++ b/tests/modules/programs/tmux/emacs-with-plugins.conf
@@ -19,6 +19,7 @@ set -g mode-keys   emacs
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize on
 setw -g clock-mode-style  24
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/mouse-enabled.conf b/tests/modules/programs/tmux/mouse-enabled.conf
index 2fcd9f54a..814ab8740 100644
--- a/tests/modules/programs/tmux/mouse-enabled.conf
+++ b/tests/modules/programs/tmux/mouse-enabled.conf
@@ -17,6 +17,7 @@ set -g mode-keys   emacs
 
 
 set  -g mouse             on
+set  -g focus-events      off
 setw -g aggressive-resize off
 setw -g clock-mode-style  12
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/prefix.conf b/tests/modules/programs/tmux/prefix.conf
index 3bc7c63ac..cf7bfcdf3 100644
--- a/tests/modules/programs/tmux/prefix.conf
+++ b/tests/modules/programs/tmux/prefix.conf
@@ -22,6 +22,7 @@ bind -N "Send the prefix key through to the application" \
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize off
 setw -g clock-mode-style  12
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/shortcut-without-prefix.conf b/tests/modules/programs/tmux/shortcut-without-prefix.conf
index e3c27610a..1058c5e92 100644
--- a/tests/modules/programs/tmux/shortcut-without-prefix.conf
+++ b/tests/modules/programs/tmux/shortcut-without-prefix.conf
@@ -23,6 +23,7 @@ bind C-a last-window
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize off
 setw -g clock-mode-style  12
 set  -s escape-time       500
diff --git a/tests/modules/programs/tmux/vi-all-true.conf b/tests/modules/programs/tmux/vi-all-true.conf
index 3bcc51ddd..14b0509f9 100644
--- a/tests/modules/programs/tmux/vi-all-true.conf
+++ b/tests/modules/programs/tmux/vi-all-true.conf
@@ -19,6 +19,7 @@ set -g mode-keys   vi
 
 
 set  -g mouse             off
+set  -g focus-events      off
 setw -g aggressive-resize on
 setw -g clock-mode-style  24
 set  -s escape-time       500

From 092b81b95615919b36cbb0e690dda8583b31013e Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 8 Oct 2024 12:39:25 -0700
Subject: [PATCH 128/546] atuin: configure daemon using systemd and launchd

This configures the atuin daemon for Linux and Darwin systems using
systemd and launchd, respectively. For systemd, a socket is also
automatically configured to exist at atuin's default socket location.
---
 modules/programs/atuin.nix | 137 +++++++++++++++++++++++++++----------
 1 file changed, 99 insertions(+), 38 deletions(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index a27bcf860..e88dd94f3 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -8,6 +8,7 @@ let
 
   tomlFormat = pkgs.formats.toml { };
 
+  inherit (pkgs.stdenv) isLinux isDarwin;
 in {
   meta.maintainers = [ maintainers.hawkw ];
 
@@ -94,49 +95,109 @@ in {
         Whether to enable Nushell integration.
       '';
     };
+
+    daemon.enable = mkEnableOption "atuin daemon";
   };
 
   config = let flagsStr = escapeShellArgs cfg.flags;
-  in mkIf cfg.enable {
+  in mkIf cfg.enable (mkMerge [
+    {
+      # Always add the configured `atuin` package.
+      home.packages = [ cfg.package ];
 
-    # Always add the configured `atuin` package.
-    home.packages = [ cfg.package ];
+      # If there are user-provided settings, generate the config file.
+      xdg.configFile."atuin/config.toml" = mkIf (cfg.settings != { }) {
+        source = tomlFormat.generate "atuin-config" cfg.settings;
+      };
 
-    # If there are user-provided settings, generate the config file.
-    xdg.configFile."atuin/config.toml" = mkIf (cfg.settings != { }) {
-      source = tomlFormat.generate "atuin-config" cfg.settings;
-    };
-
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-      if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-        source "${pkgs.bash-preexec}/share/bash/bash-preexec.sh"
-        eval "$(${lib.getExe cfg.package} init bash ${flagsStr})"
-      fi
-    '';
-
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
-      if [[ $options[zle] = on ]]; then
-        eval "$(${lib.getExe cfg.package} init zsh ${flagsStr})"
-      fi
-    '';
-
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
-      ${lib.getExe cfg.package} init fish ${flagsStr} | source
-    '';
-
-    programs.nushell = mkIf cfg.enableNushellIntegration {
-      extraEnv = ''
-        let atuin_cache = "${config.xdg.cacheHome}/atuin"
-        if not ($atuin_cache | path exists) {
-          mkdir $atuin_cache
-        }
-        ${
-          lib.getExe cfg.package
-        } init nu ${flagsStr} | save --force ${config.xdg.cacheHome}/atuin/init.nu
+      programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+        if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
+          source "${pkgs.bash-preexec}/share/bash/bash-preexec.sh"
+          eval "$(${lib.getExe cfg.package} init bash ${flagsStr})"
+        fi
       '';
-      extraConfig = ''
-        source ${config.xdg.cacheHome}/atuin/init.nu
+
+      programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+        if [[ $options[zle] = on ]]; then
+          eval "$(${lib.getExe cfg.package} init zsh ${flagsStr})"
+        fi
       '';
-    };
-  };
+
+      programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+        ${lib.getExe cfg.package} init fish ${flagsStr} | source
+      '';
+
+      programs.nushell = mkIf cfg.enableNushellIntegration {
+        extraEnv = ''
+          let atuin_cache = "${config.xdg.cacheHome}/atuin"
+          if not ($atuin_cache | path exists) {
+            mkdir $atuin_cache
+          }
+          ${
+            lib.getExe cfg.package
+          } init nu ${flagsStr} | save --force ${config.xdg.cacheHome}/atuin/init.nu
+        '';
+        extraConfig = ''
+          source ${config.xdg.cacheHome}/atuin/init.nu
+        '';
+      };
+    }
+
+    (mkIf cfg.daemon.enable (mkMerge [
+      {
+        assertions = [{
+          assertion = isLinux || isDarwin;
+          message =
+            "The atuin daemon can only be configured on either Linux or macOS.";
+        }];
+
+        programs.atuin.settings = { daemon = { enabled = true; }; };
+      }
+      (mkIf isLinux {
+        programs.atuin.settings = { daemon = { systemd_socket = true; }; };
+
+        systemd.user.services.atuin-daemon = {
+          Unit = {
+            Description = "atuin daemon";
+            Requires = [ "atuin-daemon.socket" ];
+          };
+          Install = {
+            Also = [ "atuin-daemon.socket" ];
+            WantedBy = [ "default.target" ];
+          };
+          Service = {
+            ExecStart = "${lib.getExe cfg.package} daemon";
+            Environment = [ "ATUIN_LOG=info" ];
+            Restart = "on-failure";
+            RestartSteps = 3;
+            RestartMaxDelaySec = 6;
+          };
+        };
+
+        systemd.user.sockets.atuin-daemon = {
+          Unit = { Description = "atuin daemon socket"; };
+          Install = { WantedBy = [ "sockets.target" ]; };
+          Socket = {
+            ListenStream = "%h/.local/share/atuin/atuin.sock";
+            SocketMode = "0600";
+            RemoveOnStop = true;
+          };
+        };
+      })
+      (mkIf isDarwin {
+        launchd.agents.atuin-daemon = {
+          enable = true;
+          config = {
+            ProgramArguments = [ "${lib.getExe cfg.package}" "daemon" ];
+            EnvironmentVariables = { ATUIN_LOG = "info"; };
+            KeepAlive = {
+              Crashed = true;
+              SuccessfulExit = false;
+            };
+            ProcessType = "Background";
+          };
+        };
+      })
+    ]))
+  ]);
 }

From 33c236f1d5eb3d1a3df202540794d590c2fe0a2f Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 8 Oct 2024 14:34:09 -0700
Subject: [PATCH 129/546] atuin: add water-sucks as maintainer

---
 modules/programs/atuin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index e88dd94f3..b7e7f8808 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -10,7 +10,7 @@ let
 
   inherit (pkgs.stdenv) isLinux isDarwin;
 in {
-  meta.maintainers = [ maintainers.hawkw ];
+  meta.maintainers = [ maintainers.hawkw maintainers.water-sucks ];
 
   options.programs.atuin = {
     enable = mkEnableOption "atuin";

From c56aa0f51d058f41a7ba0c45bd3b6d9d244c0396 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Sat, 19 Oct 2024 16:59:15 -0700
Subject: [PATCH 130/546] atuin: assert version >= 18.2.0 when daemon is
 enabled

---
 modules/programs/atuin.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index b7e7f8808..073994316 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -145,11 +145,19 @@ in {
 
     (mkIf cfg.daemon.enable (mkMerge [
       {
-        assertions = [{
-          assertion = isLinux || isDarwin;
-          message =
-            "The atuin daemon can only be configured on either Linux or macOS.";
-        }];
+        assertions = [
+          {
+            assertion = versionAtLeast cfg.package.version "18.2.0";
+            message = ''
+              The atuin daemon requires at least version 18.2.0 or later.
+            '';
+          }
+          {
+            assertion = isLinux || isDarwin;
+            message =
+              "The atuin daemon can only be configured on either Linux or macOS.";
+          }
+        ];
 
         programs.atuin.settings = { daemon = { enabled = true; }; };
       }

From f8bc330a13f80e13e70967bca0e674f711218ea2 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Sat, 16 Nov 2024 13:12:25 -0800
Subject: [PATCH 131/546] atuin: capitalize mentions of "atuin"

---
 modules/programs/atuin.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 073994316..fe15cd252 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -149,13 +149,13 @@ in {
           {
             assertion = versionAtLeast cfg.package.version "18.2.0";
             message = ''
-              The atuin daemon requires at least version 18.2.0 or later.
+              The Atuin daemon requires at least version 18.2.0 or later.
             '';
           }
           {
             assertion = isLinux || isDarwin;
             message =
-              "The atuin daemon can only be configured on either Linux or macOS.";
+              "The Atuin daemon can only be configured on either Linux or macOS.";
           }
         ];
 
@@ -166,7 +166,7 @@ in {
 
         systemd.user.services.atuin-daemon = {
           Unit = {
-            Description = "atuin daemon";
+            Description = "Atuin daemon";
             Requires = [ "atuin-daemon.socket" ];
           };
           Install = {
@@ -183,7 +183,7 @@ in {
         };
 
         systemd.user.sockets.atuin-daemon = {
-          Unit = { Description = "atuin daemon socket"; };
+          Unit = { Description = "Atuin daemon socket"; };
           Install = { WantedBy = [ "sockets.target" ]; };
           Socket = {
             ListenStream = "%h/.local/share/atuin/atuin.sock";

From dfdf59b2d539941aea5c26666c9ab809c1dc34df Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Sat, 16 Nov 2024 13:20:52 -0800
Subject: [PATCH 132/546] atuin: make daemon log level configurable

---
 modules/programs/atuin.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index fe15cd252..269aa70b5 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -5,6 +5,7 @@ with lib;
 let
 
   cfg = config.programs.atuin;
+  daemonCfg = cfg.daemon;
 
   tomlFormat = pkgs.formats.toml { };
 
@@ -96,7 +97,18 @@ in {
       '';
     };
 
-    daemon.enable = mkEnableOption "atuin daemon";
+    daemon = {
+      enable = mkEnableOption "Atuin daemon";
+
+      logLevel = mkOption {
+        default = null;
+        type =
+          types.nullOr (types.enum [ "trace" "debug" "info" "warn" "error" ]);
+        description = ''
+          Verbosity of Atuin daemon logging.
+        '';
+      };
+    };
   };
 
   config = let flagsStr = escapeShellArgs cfg.flags;
@@ -143,7 +155,7 @@ in {
       };
     }
 
-    (mkIf cfg.daemon.enable (mkMerge [
+    (mkIf daemonCfg.enable (mkMerge [
       {
         assertions = [
           {
@@ -175,7 +187,8 @@ in {
           };
           Service = {
             ExecStart = "${lib.getExe cfg.package} daemon";
-            Environment = [ "ATUIN_LOG=info" ];
+            Environment = lib.optionals (daemonCfg.logLevel != null)
+              [ "ATUIN_LOG=${daemonCfg.logLevel}" ];
             Restart = "on-failure";
             RestartSteps = 3;
             RestartMaxDelaySec = 6;
@@ -197,7 +210,10 @@ in {
           enable = true;
           config = {
             ProgramArguments = [ "${lib.getExe cfg.package}" "daemon" ];
-            EnvironmentVariables = { ATUIN_LOG = "info"; };
+            EnvironmentVariables =
+              lib.optionalAttrs (daemonCfg.logLevel != null) {
+                ATUIN_LOG = daemonCfg.logLevel;
+              };
             KeepAlive = {
               Crashed = true;
               SuccessfulExit = false;

From 256ec2653e79363022a6042285dde3935816cea4 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 4 Dec 2024 08:48:45 +0100
Subject: [PATCH 133/546] 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/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)
  → 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 77ef362c0..9de322090 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {

From 5b5de4338fad32dc709c900b4dcbbcd98b20dc4c Mon Sep 17 00:00:00 2001
From: Philip Wilk <p.wilk@student.reading.ac.uk>
Date: Wed, 4 Dec 2024 07:59:32 +0000
Subject: [PATCH 134/546] kakoune: fix color scheme package XDG file

---
 modules/programs/kakoune.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index e68a8568e..5e40952b9 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -679,7 +679,8 @@ in {
     xdg.configFile = mkMerge [
       { "kak/kakrc".source = configFile; }
       (mkIf (cfg.colorSchemePackage != null) {
-        "kak/colors/${cfg.colorSchemePackage.name}" = cfg.colorSchemePackage;
+        "kak/colors/${cfg.colorSchemePackage.name}".source =
+          cfg.colorSchemePackage;
       })
     ];
   };

From 70803283187c8f775ff561be4117e5b1a11b296e Mon Sep 17 00:00:00 2001
From: Ricky Tigg <ricky.tigg@gmail.com>
Date: Tue, 3 Dec 2024 14:00:26 +0100
Subject: [PATCH 135/546] Translate using Weblate (Finnish)

Currently translated at 75.6% (28 of 37 strings)

Co-authored-by: Ricky Tigg <ricky.tigg@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/fi/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/fi.po | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/home-manager/po/fi.po b/home-manager/po/fi.po
index 2ac20911d..6662d35a2 100644
--- a/home-manager/po/fi.po
+++ b/home-manager/po/fi.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-05-31 17:09+0000\n"
-"Last-Translator: jarre johansson <jarre@johansson.today>\n"
+"PO-Revision-Date: 2024-12-03 13:00+0000\n"
+"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/home-manager/cli/"
 "fi/>\n"
 "Language: fi\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
@@ -26,7 +26,7 @@ msgstr "%s: puuttuva argumentti kohteelle %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
-msgstr "Konfiguraatiotiedostoa ei löytynyt sijainnista %s"
+msgstr "Kokoonpanotiedostoa ei löydy %s:sta"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
@@ -36,10 +36,12 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
+"Home Managerin %s pitäminen %s:ssa on vanhentunut.\n"
+"ole hyvä ja siirrä se %s:een"
 
 #: home-manager/home-manager:92
 msgid "No configuration file found. Please create one at %s"
-msgstr "Konfiguraatiotiedostoa ei löytynyt. Luo sellainen sijaintiin %s"
+msgstr "Kokoonpanotiedostoa ei löytynyt. Luo sellainen %s:lla"
 
 #: home-manager/home-manager:107
 msgid "Home Manager not found at %s."

From 8f4f57f9a67367881b1a36f93856ffef8646d428 Mon Sep 17 00:00:00 2001
From: Louis Opter <louis@opter.org>
Date: Sat, 7 Sep 2024 13:25:40 -0700
Subject: [PATCH 136/546] qt: update tooling for Plasma 6

---
 modules/misc/qt/kconfig.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/misc/qt/kconfig.nix b/modules/misc/qt/kconfig.nix
index f7c35573b..76bf7c686 100644
--- a/modules/misc/qt/kconfig.nix
+++ b/modules/misc/qt/kconfig.nix
@@ -17,13 +17,13 @@ in {
       powermanagementprofilesrc.AC.HandleButtonEvents.lidAction = 32;
     };
     description = ''
-      A set of values to be modified by {command}`kwriteconfig5`.
+      A set of values to be modified by {command}`kwriteconfig6`.
 
       The example value would cause the following command to run in the
       activation script:
 
       ``` shell
-      kwriteconfig5 --file $XDG_CONFIG_HOME/powermanagementprofilesrc \
+      kwriteconfig6 --file $XDG_CONFIG_HOME/powermanagementprofilesrc \
                     --group AC \
                     --group HandleButtonEvents \
                     --group lidAction \
@@ -53,7 +53,7 @@ in {
             lib.mapAttrsToList
             (group: value: toLine file (path ++ [ group ]) value) value
           else
-            "run test -f '${configHome}/${file}' && run ${pkgs.libsForQt5.kconfig}/bin/kwriteconfig5 --file '${configHome}/${file}' ${
+            "run ${pkgs.kdePackages.kconfig}/bin/kwriteconfig6 --file '${configHome}/${file}' ${
               lib.concatMapStringsSep " " (x: "--group ${x}")
               (lib.lists.init path)
             } --key '${lib.lists.last path}' ${toValue value}";
@@ -62,7 +62,7 @@ in {
       in builtins.concatStringsSep "\n" lines}
 
       # TODO: some way to only call the dbus calls needed
-      run ${pkgs.libsForQt5.qttools.bin}/bin/qdbus org.kde.KWin /KWin reconfigure || echo "KWin reconfigure failed"
+      run ${pkgs.kdePackages.qttools}/bin/qdbus org.kde.KWin /KWin reconfigure || echo "KWin reconfigure failed"
       # the actual values are https://github.com/KDE/plasma-workspace/blob/c97dddf20df5702eb429b37a8c10b2c2d8199d4e/kcms/kcms-common_p.h#L13
       for changeType in {0..10}; do
         # even if one of those calls fails the others keep running

From 6c3a7a0b72c19ec994b85c57a1712d177bd809b2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 4 Dec 2024 10:24:09 +0100
Subject: [PATCH 137/546] qt: reduce test closure

---
 tests/modules/misc/qt/qt-basic.nix            | 16 +++---
 .../misc/qt/qt-platform-theme-gnome.nix       | 51 ++++++++++---------
 .../modules/misc/qt/qt-platform-theme-gtk.nix | 41 ++++++++++-----
 .../misc/qt/qt-platform-theme-gtk3.nix        | 26 +++++-----
 4 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/tests/modules/misc/qt/qt-basic.nix b/tests/modules/misc/qt/qt-basic.nix
index a4cadcb73..d0e8a2c3e 100644
--- a/tests/modules/misc/qt/qt-basic.nix
+++ b/tests/modules/misc/qt/qt-basic.nix
@@ -1,12 +1,10 @@
 {
-  config = {
-    qt.enable = true;
+  qt.enable = true;
 
-    nmt.script = ''
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_PLUGIN_PATH'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QML2_IMPORT_PATH'
-    '';
-  };
+  nmt.script = ''
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_PLUGIN_PATH'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QML2_IMPORT_PATH'
+  '';
 }
diff --git a/tests/modules/misc/qt/qt-platform-theme-gnome.nix b/tests/modules/misc/qt/qt-platform-theme-gnome.nix
index ab65f146a..ca5829ee7 100644
--- a/tests/modules/misc/qt/qt-platform-theme-gnome.nix
+++ b/tests/modules/misc/qt/qt-platform-theme-gnome.nix
@@ -1,27 +1,30 @@
 {
-  config = {
-    qt = {
-      enable = true;
-      # Check if still backwards compatible
-      platformTheme = "gnome";
-      style.name = "adwaita";
-    };
-
-    test.stubs.qgnomeplatform = { };
-
-    nmt.script = ''
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_QPA_PLATFORMTHEME="gnome"'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_STYLE_OVERRIDE="adwaita"'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_PLUGIN_PATH'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QML2_IMPORT_PATH'
-    '';
-    test.asserts.warnings.expected = [
-      "The option `qt.platformTheme` has been renamed to `qt.platformTheme.name`."
-      "The value `gnome` for option `qt.platformTheme` is deprecated. Use `adwaita` instead."
-    ];
+  qt = {
+    enable = true;
+    # Check if still backwards compatible
+    platformTheme = "gnome";
+    style.name = "adwaita";
   };
+
+  test.stubs = {
+    qgnomeplatform = { };
+    qgnomeplatform-qt6 = { };
+    adwaita-qt = { };
+    adwaita-qt6 = { };
+  };
+
+  nmt.script = ''
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_QPA_PLATFORMTHEME="gnome"'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_STYLE_OVERRIDE="adwaita"'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_PLUGIN_PATH'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QML2_IMPORT_PATH'
+  '';
+  test.asserts.warnings.expected = [
+    "The option `qt.platformTheme` has been renamed to `qt.platformTheme.name`."
+    "The value `gnome` for option `qt.platformTheme` is deprecated. Use `adwaita` instead."
+  ];
 }
diff --git a/tests/modules/misc/qt/qt-platform-theme-gtk.nix b/tests/modules/misc/qt/qt-platform-theme-gtk.nix
index 76a6512f8..22107016c 100644
--- a/tests/modules/misc/qt/qt-platform-theme-gtk.nix
+++ b/tests/modules/misc/qt/qt-platform-theme-gtk.nix
@@ -1,18 +1,31 @@
 {
-  config = {
-    qt = {
-      enable = true;
-      platformTheme.name = "gtk";
-    };
-    i18n.inputMethod.enabled = "fcitx5";
+  imports = [ ../../i18n/input-method/fcitx5-stubs.nix ];
 
-    nmt.script = ''
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_QPA_PLATFORMTHEME="gtk2"'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_PLUGIN_PATH'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QML2_IMPORT_PATH'
-    '';
+  qt = {
+    enable = true;
+    platformTheme.name = "gtk";
   };
+
+  i18n.inputMethod.enabled = "fcitx5";
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: {
+        qtstyleplugins = prev.mkStubPackage { outPath = null; };
+      });
+
+      qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: {
+        qt6gtk2 = prev.mkStubPackage { outPath = null; };
+      });
+    })
+  ];
+
+  nmt.script = ''
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_QPA_PLATFORMTHEME="gtk2"'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_PLUGIN_PATH'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QML2_IMPORT_PATH'
+  '';
 }
diff --git a/tests/modules/misc/qt/qt-platform-theme-gtk3.nix b/tests/modules/misc/qt/qt-platform-theme-gtk3.nix
index 264088186..e55ad0be6 100644
--- a/tests/modules/misc/qt/qt-platform-theme-gtk3.nix
+++ b/tests/modules/misc/qt/qt-platform-theme-gtk3.nix
@@ -1,17 +1,15 @@
 {
-  config = {
-    qt = {
-      enable = true;
-      platformTheme.name = "gtk3";
-    };
-
-    nmt.script = ''
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_QPA_PLATFORMTHEME="gtk3"'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QT_PLUGIN_PATH'
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-        'QML2_IMPORT_PATH'
-    '';
+  qt = {
+    enable = true;
+    platformTheme.name = "gtk3";
   };
+
+  nmt.script = ''
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_QPA_PLATFORMTHEME="gtk3"'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QT_PLUGIN_PATH'
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+      'QML2_IMPORT_PATH'
+  '';
 }

From 30f66eaa3209e13f32f98df5a150542baf2d72af Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 4 Dec 2024 12:37:15 +0100
Subject: [PATCH 138/546] xresources: use `profileExtra` instead of `initExtra`

The initExtra code is executed after systemd graphical-session.target
starts, which means graphical applications started by
graphical-session.target cannot get these X settings.
---
 modules/xresources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/xresources.nix b/modules/xresources.nix
index e4ba0e47e..cb8dae238 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -99,6 +99,6 @@ in {
         '';
       };
 
-      xsession.initExtra = xrdbMerge;
+      xsession.profileExtra = xrdbMerge;
     };
 }

From b1c19f1dcbc2429c16d5e6259dbff4f12dd8a89d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 4 Dec 2024 12:38:17 +0100
Subject: [PATCH 139/546] home-cursor: use `profileExtra` instead of
 `initExtra`

The initExtra code is executed after systemd graphical-session.target
starts, which means graphical applications started by
graphical-session.target cannot get these X settings.
---
 modules/config/home-cursor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 0a8fb378b..42c259455 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -174,7 +174,7 @@ in {
     }
 
     (mkIf cfg.x11.enable {
-      xsession.initExtra = ''
+      xsession.profileExtra = ''
         ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${
           toString cfg.size
         }

From ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d Mon Sep 17 00:00:00 2001
From: LorenzBischof <1837725+LorenzBischof@users.noreply.github.com>
Date: Sat, 23 Nov 2024 11:56:19 +0100
Subject: [PATCH 140/546] etesync-dav: update default server URL

---
 modules/services/etesync-dav.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/etesync-dav.nix b/modules/services/etesync-dav.nix
index 5fd58d092..fe83e5391 100644
--- a/modules/services/etesync-dav.nix
+++ b/modules/services/etesync-dav.nix
@@ -25,7 +25,7 @@ in {
 
     serverUrl = mkOption {
       type = types.str;
-      default = "https://api.etesync.com/";
+      default = "https://api.etebase.com/partner/etesync/";
       description = "The URL to the etesync server.";
     };
 

From 3a7fc9cd71a844aae9c6b6bb44700cea9539bc13 Mon Sep 17 00:00:00 2001
From: Nova Leary <coder.nova99@mailbox.org>
Date: Wed, 4 Dec 2024 13:54:01 -0600
Subject: [PATCH 141/546] zsh: make autosuggest strategy accept more options

Now accepts an empty list, which turns off the code so the user can
manually set ZSH_AUTOSUGGEST_STRATEGY anywhere they want via any of the
`*Variables` module options.
---
 modules/programs/zsh.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index b6e46392c..50f8055c0 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -427,6 +427,9 @@ in
             - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches
                 the most recently executed command. Note that this strategy won't work as expected with ZSH options that
                 don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
+
+            Setting the option to an empty list `[]` will make ZSH_AUTOSUGGESTION_STRATEGY not be set automatically,
+            allowing the variable to be declared in {option}`programs.zsh.localVariables` or {option}`programs.zsh.sessionVariables`
           '';
         };
       };
@@ -641,7 +644,10 @@ in
 
         (optionalString cfg.autosuggestion.enable ''
           source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-          ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy})
+          ${optionalString (cfg.autosuggestion.strategy != []) ''
+            ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy})
+          ''
+          }
         '')
         (optionalString (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
           ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"

From 1cd17a2f76f7711b06d5d59f1746cef602974498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Wed, 4 Dec 2024 20:56:44 +0100
Subject: [PATCH 142/546] mangohud: fix a non-working example

The example for settingsPerApplication is missing a semicolon.
---
 modules/programs/mangohud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/mangohud.nix b/modules/programs/mangohud.nix
index f0e35a3a3..a62587a2d 100644
--- a/modules/programs/mangohud.nix
+++ b/modules/programs/mangohud.nix
@@ -68,7 +68,7 @@ in {
           {
             mpv = {
               no_display = true;
-            }
+            };
           }
         '';
         description = ''

From 86ee1290d76bcd5f7ee6c80f181288a28ab0dca0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 24 Jul 2024 11:48:42 +0100
Subject: [PATCH 143/546] starship: add `enableInteractive` option for fish

Some fish plugins such as https://github.com/acomagu/fish-async-prompt
require that starship be initialized as non-interactive.

When the `programs.starship.enableInteractive` option is enabled,
starship is initialized at the end of the init script, outside the
interactive block.
---
 modules/misc/news.nix                         | 14 ++++++
 modules/programs/starship.nix                 | 15 ++++++-
 tests/modules/programs/starship/default.nix   |  2 +
 .../starship/fish_with_interactive.nix        | 27 ++++++++++++
 .../starship/fish_without_interactive.nix     | 43 +++++++++++++++++++
 5 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/programs/starship/fish_with_interactive.nix
 create mode 100644 tests/modules/programs/starship/fish_without_interactive.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 57f57ae83..3dbb01723 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1847,6 +1847,20 @@ in {
           output.
         '';
       }
+
+      {
+        time = "2024-12-04T20:00:00+00:00";
+        condition = let
+          sCfg = config.programs.starship;
+          fCfg = config.programs.fish;
+        in sCfg.enable && sCfg.enableFishIntegration && fCfg.enable;
+        message = ''
+          A new option 'programs.starship.enableInteractive' is available for
+          the Fish shell that only enables starship if the shell is interactive.
+
+          Some plugins require this to be set to 'false' to function correctly.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix
index 9ccff7fcf..bbfe96989 100644
--- a/modules/programs/starship.nix
+++ b/modules/programs/starship.nix
@@ -10,6 +10,8 @@ let
 
   starshipCmd = "${config.home.profileDirectory}/bin/starship";
 
+  initFish =
+    if cfg.enableInteractive then "interactiveShellInit" else "shellInitLast";
 in {
   meta.maintainers = [ ];
 
@@ -71,6 +73,17 @@ in {
       default = true;
     };
 
+    enableInteractive = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Only enable starship when the shell is interactive. This option is only
+        valid for the Fish shell.
+
+        Some plugins require this to be set to `false` to function correctly.
+      '';
+    };
+
     enableTransience = mkOption {
       type = types.bool;
       default = false;
@@ -104,7 +117,7 @@ in {
       fi
     '';
 
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+    programs.fish.${initFish} = mkIf cfg.enableFishIntegration ''
       if test "$TERM" != "dumb"
         eval (${starshipCmd} init fish)
         ${lib.optionalString cfg.enableTransience "enable_transience"}
diff --git a/tests/modules/programs/starship/default.nix b/tests/modules/programs/starship/default.nix
index 6fed13039..024dc8218 100644
--- a/tests/modules/programs/starship/default.nix
+++ b/tests/modules/programs/starship/default.nix
@@ -2,4 +2,6 @@
   starship-settings = ./settings.nix;
   starship-fish-with-transience = ./fish_with_transience.nix;
   starship-fish-without-transience = ./fish_without_transience.nix;
+  starship-fish-with-interactive = ./fish_with_interactive.nix;
+  starship-fish-without-interactive = ./fish_without_interactive.nix;
 }
diff --git a/tests/modules/programs/starship/fish_with_interactive.nix b/tests/modules/programs/starship/fish_with_interactive.nix
new file mode 100644
index 000000000..0ffd6fd4b
--- /dev/null
+++ b/tests/modules/programs/starship/fish_with_interactive.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs = {
+      fish.enable = true;
+      starship.enable = true;
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/fish/config.fish
+
+      export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
+      export NOT_EXPECTED="
+      if test \"\$TERM\" != dumb
+          /home/hm-user/.nix-profile/bin/starship init fish | source
+
+      end"
+
+      if [[ "$GOT" == "$NOT_EXPECTED" ]]; then
+        fail "Expected starship init to be inside the 'is-interactive' block but it wasn't."
+      fi
+    '';
+  };
+}
diff --git a/tests/modules/programs/starship/fish_without_interactive.nix b/tests/modules/programs/starship/fish_without_interactive.nix
new file mode 100644
index 000000000..eeafb47e1
--- /dev/null
+++ b/tests/modules/programs/starship/fish_without_interactive.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs = {
+      fish.enable = true;
+
+      starship = {
+        enable = true;
+        enableInteractive = false;
+      };
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/fish/config.fish
+
+      export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
+      export EXPECTED="
+      if test \"\$TERM\" != dumb
+          eval (/home/hm-user/.nix-profile/bin/starship init fish)
+
+      end"
+
+      export MESSAGE="
+      ==========
+       Expected
+      ==========
+      $EXPECTED
+      ==========
+         Got
+      ==========
+      $GOT
+      ==========
+      "
+
+      if [[ "$GOT" != "$EXPECTED" ]]; then
+        fail "$MESSAGE"
+      fi
+    '';
+  };
+}

From 0daaded612b0e6eaed0a63fc9d0778d8f05940fe Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 24 Jul 2024 18:40:22 +0100
Subject: [PATCH 144/546] starship: replace `eval` with `source` for fish

Changed the initialization method from `eval` to `source` as per the
starship installation guide.

See: https://starship.rs/guide/#%F0%9F%9A%80-installation

This is in accordance with the Fish docs which recommends using `source`
if the command does not need access to stdin, which in this case is what
upstream has.

See: https://fishshell.com/docs/current/cmds/eval.html
---
 modules/programs/starship.nix                                | 2 +-
 tests/modules/programs/starship/fish_without_interactive.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix
index bbfe96989..654c43fca 100644
--- a/modules/programs/starship.nix
+++ b/modules/programs/starship.nix
@@ -119,7 +119,7 @@ in {
 
     programs.fish.${initFish} = mkIf cfg.enableFishIntegration ''
       if test "$TERM" != "dumb"
-        eval (${starshipCmd} init fish)
+        ${starshipCmd} init fish | source
         ${lib.optionalString cfg.enableTransience "enable_transience"}
       end
     '';
diff --git a/tests/modules/programs/starship/fish_without_interactive.nix b/tests/modules/programs/starship/fish_without_interactive.nix
index eeafb47e1..0ec8f9646 100644
--- a/tests/modules/programs/starship/fish_without_interactive.nix
+++ b/tests/modules/programs/starship/fish_without_interactive.nix
@@ -19,7 +19,7 @@ with lib;
       export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
       export EXPECTED="
       if test \"\$TERM\" != dumb
-          eval (/home/hm-user/.nix-profile/bin/starship init fish)
+          /home/hm-user/.nix-profile/bin/starship init fish | source
 
       end"
 

From 65912bc6841cf420eb8c0a20e03df7cbbff5963f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 16 Aug 2024 11:34:29 +0200
Subject: [PATCH 145/546] imapnotify: provide an option for setting PATH

Including some useful presetting for notmuch and mbsync.
---
 modules/services/imapnotify.nix               | 21 +++++++++++++++++--
 .../services/imapnotify/imapnotify.service    |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/services/imapnotify.nix b/modules/services/imapnotify.nix
index 63e61e7c7..a52b86e97 100644
--- a/modules/services/imapnotify.nix
+++ b/modules/services/imapnotify.nix
@@ -27,8 +27,8 @@ let
           Restart = "always";
           RestartSec = 30;
           Type = "simple";
-        } // optionalAttrs account.notmuch.enable {
-          Environment =
+          Environment = [ "PATH=${cfg.path}" ]
+            ++ optional account.notmuch.enable
             "NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/default/config";
         };
 
@@ -97,6 +97,17 @@ in {
         example = literalExpression "pkgs.imapnotify";
         description = "The imapnotify package to use";
       };
+
+      path = mkOption {
+        type = types.listOf types.package;
+        apply = lib.makeBinPath;
+        default = [ ];
+        description = ''
+          List of packages to provide in PATH for the imapnotify service.
+
+          Note, this does not apply to the Darwin launchd service.
+        '';
+      };
     };
 
     accounts.email.accounts = mkOption {
@@ -122,6 +133,12 @@ in {
       (checkAccounts (a: a.userName == null) "username")
     ];
 
+    services.imapnotify.path = lib.mkMerge [
+      (lib.mkIf config.programs.notmuch.enable [ pkgs.notmuch ])
+      (lib.mkIf config.programs.mbsync.enable
+        [ config.programs.mbsync.package ])
+    ];
+
     systemd.user.services = listToAttrs (map genAccountUnit imapnotifyAccounts);
 
     launchd.agents = listToAttrs (map genAccountAgent imapnotifyAccounts);
diff --git a/tests/modules/services/imapnotify/imapnotify.service b/tests/modules/services/imapnotify/imapnotify.service
index 3e3bd9ff6..cc1ba77b8 100644
--- a/tests/modules/services/imapnotify/imapnotify.service
+++ b/tests/modules/services/imapnotify/imapnotify.service
@@ -2,6 +2,7 @@
 WantedBy=default.target
 
 [Service]
+Environment=PATH=
 Environment=NOTMUCH_CONFIG=/home/hm-user/.config/notmuch/default/config
 ExecStart=@goimapnotify@/bin/goimapnotify -conf '/nix/store/00000000000000000000000000000000-imapnotify-hm-example.com-config.json'
 Restart=always

From 953521f759fd746190ae2d2d052183296425b27b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Dec 2024 12:08:32 +0100
Subject: [PATCH 146/546] fcitx5: fix package reference in test

---
 tests/modules/i18n/input-method/fcitx5-configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/i18n/input-method/fcitx5-configuration.nix b/tests/modules/i18n/input-method/fcitx5-configuration.nix
index 59738fb01..7ff43a4f2 100644
--- a/tests/modules/i18n/input-method/fcitx5-configuration.nix
+++ b/tests/modules/i18n/input-method/fcitx5-configuration.nix
@@ -5,7 +5,7 @@
 
   i18n.inputMethod = {
     enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [ fcitx5-chinese-addons ];
+    fcitx5.addons = [ pkgs.libsForQt5.fcitx5-chinese-addons ];
   };
 
   nmt.script = ''

From 0b42cc1b1c7a38f32334f217eadbc7b83b3ef44c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Dec 2024 12:19:59 +0100
Subject: [PATCH 147/546] cmus: reduce test closure

---
 tests/modules/programs/cmus/cmus.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/modules/programs/cmus/cmus.nix b/tests/modules/programs/cmus/cmus.nix
index 8d1bbbd3a..303bad767 100644
--- a/tests/modules/programs/cmus/cmus.nix
+++ b/tests/modules/programs/cmus/cmus.nix
@@ -7,6 +7,8 @@
     extraConfig = "test";
   };
 
+  test.stubs.cmus = { };
+
   nmt.script = ''
     assertFileContent \
       home-files/.config/cmus/rc \

From 63eb786e047fbb101041103f86162cd72d105d79 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Dec 2024 12:22:03 +0100
Subject: [PATCH 148/546] xresources: simplify tests

---
 tests/modules/xresources/empty.nix      | 14 +++++-------
 tests/modules/xresources/xresources.nix | 30 +++++++++++--------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/tests/modules/xresources/empty.nix b/tests/modules/xresources/empty.nix
index 9dd80176f..e02e0fbfe 100644
--- a/tests/modules/xresources/empty.nix
+++ b/tests/modules/xresources/empty.nix
@@ -1,13 +1,9 @@
-{ config, lib, ... }:
-
-with lib;
+{ ... }:
 
 {
-  config = {
-    xresources.properties = { };
+  xresources.properties = { };
 
-    nmt.script = ''
-      assertPathNotExists home-files/.Xresources
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.Xresources
+  '';
 }
diff --git a/tests/modules/xresources/xresources.nix b/tests/modules/xresources/xresources.nix
index f73e326f3..36d092e0d 100644
--- a/tests/modules/xresources/xresources.nix
+++ b/tests/modules/xresources/xresources.nix
@@ -1,22 +1,18 @@
-{ config, lib, ... }:
-
-with lib;
+{ ... }:
 
 {
-  config = {
-    xresources = {
-      properties = {
-        "Test*string" = "test-string";
-        "Test*boolean1" = true;
-        "Test*boolean2" = false;
-        "Test*int" = 10;
-        "Test*list" = [ "list-str" true false 10 ];
-      };
+  xresources = {
+    properties = {
+      "Test*string" = "test-string";
+      "Test*boolean1" = true;
+      "Test*boolean2" = false;
+      "Test*int" = 10;
+      "Test*list" = [ "list-str" true false 10 ];
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.Xresources
-      assertFileContent home-files/.Xresources ${./xresources-expected.conf}
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.Xresources
+    assertFileContent home-files/.Xresources ${./xresources-expected.conf}
+  '';
 }

From d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Dec 2024 12:24:37 +0100
Subject: [PATCH 149/546] nix: simplify tests

---
 tests/modules/misc/nix/empty-settings.nix     | 16 +++---
 .../modules/misc/nix/example-channels-xdg.nix | 28 +++++-----
 tests/modules/misc/nix/example-channels.nix   | 24 ++++-----
 tests/modules/misc/nix/example-registry.nix   | 32 +++++-------
 tests/modules/misc/nix/example-settings.nix   | 52 +++++++++----------
 tests/modules/misc/nix/keep-old-nix-path.nix  | 20 ++++---
 6 files changed, 77 insertions(+), 95 deletions(-)

diff --git a/tests/modules/misc/nix/empty-settings.nix b/tests/modules/misc/nix/empty-settings.nix
index 7e5844742..4ca5e4b0b 100644
--- a/tests/modules/misc/nix/empty-settings.nix
+++ b/tests/modules/misc/nix/empty-settings.nix
@@ -1,14 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    nix = { package = config.lib.test.mkStubPackage { }; };
+  nix = { package = config.lib.test.mkStubPackage { }; };
 
-    nmt.script = ''
-      assertPathNotExists home-files/.config/nix
-      assertPathNotExists home-files/.nix-defexpr/50-home-manager
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/nix
+    assertPathNotExists home-files/.nix-defexpr/50-home-manager
+  '';
 }
diff --git a/tests/modules/misc/nix/example-channels-xdg.nix b/tests/modules/misc/nix/example-channels-xdg.nix
index 8ca1569f3..f50d0b461 100644
--- a/tests/modules/misc/nix/example-channels-xdg.nix
+++ b/tests/modules/misc/nix/example-channels-xdg.nix
@@ -9,21 +9,19 @@ let
     }
   '';
 in {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage {
-        version = lib.getVersion pkgs.nixVersions.stable;
-      };
-      channels.example = exampleChannel;
-      settings.use-xdg-base-directories = true;
+  nix = {
+    package = config.lib.test.mkStubPackage {
+      version = lib.getVersion pkgs.nixVersions.stable;
     };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/home/hm-user/.local/state/nix/defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
-      assertFileContent \
-        home-files/.local/state/nix/defexpr/50-home-manager/example/default.nix \
-        ${exampleChannel}/default.nix
-    '';
+    channels.example = exampleChannel;
+    settings.use-xdg-base-directories = true;
   };
+
+  nmt.script = ''
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export NIX_PATH="/home/hm-user/.local/state/nix/defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
+    assertFileContent \
+      home-files/.local/state/nix/defexpr/50-home-manager/example/default.nix \
+      ${exampleChannel}/default.nix
+  '';
 }
diff --git a/tests/modules/misc/nix/example-channels.nix b/tests/modules/misc/nix/example-channels.nix
index 4b98c55d4..189d07094 100644
--- a/tests/modules/misc/nix/example-channels.nix
+++ b/tests/modules/misc/nix/example-channels.nix
@@ -9,18 +9,16 @@ let
     }
   '';
 in {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage { };
-      channels.example = exampleChannel;
-    };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/home/hm-user/.nix-defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
-      assertFileContent \
-        home-files/.nix-defexpr/50-home-manager/example/default.nix \
-        ${exampleChannel}/default.nix
-    '';
+  nix = {
+    package = config.lib.test.mkStubPackage { };
+    channels.example = exampleChannel;
   };
+
+  nmt.script = ''
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export NIX_PATH="/home/hm-user/.nix-defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
+    assertFileContent \
+      home-files/.nix-defexpr/50-home-manager/example/default.nix \
+      ${exampleChannel}/default.nix
+  '';
 }
diff --git a/tests/modules/misc/nix/example-registry.nix b/tests/modules/misc/nix/example-registry.nix
index 1875b34d3..99da470ef 100644
--- a/tests/modules/misc/nix/example-registry.nix
+++ b/tests/modules/misc/nix/example-registry.nix
@@ -1,25 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
-  config = {
-    nix = {
-      registry = {
-        nixpkgs = {
-          to = {
-            type = "github";
-            owner = "my-org";
-            repo = "my-nixpkgs";
-          };
+  nix = {
+    registry = {
+      nixpkgs = {
+        to = {
+          type = "github";
+          owner = "my-org";
+          repo = "my-nixpkgs";
         };
       };
     };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/nix/registry.json \
-        ${./example-registry-expected.json}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/nix/registry.json \
+      ${./example-registry-expected.json}
+  '';
 }
diff --git a/tests/modules/misc/nix/example-settings.nix b/tests/modules/misc/nix/example-settings.nix
index df62fe8d1..c0684fe4a 100644
--- a/tests/modules/misc/nix/example-settings.nix
+++ b/tests/modules/misc/nix/example-settings.nix
@@ -1,38 +1,34 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage {
-        version = lib.getVersion pkgs.nixVersions.stable;
-        buildScript = ''
-          target=$out/bin/nix
-          mkdir -p "$(dirname "$target")"
+  nix = {
+    package = config.lib.test.mkStubPackage {
+      version = lib.getVersion pkgs.nixVersions.stable;
+      buildScript = ''
+        target=$out/bin/nix
+        mkdir -p "$(dirname "$target")"
 
-          echo -n "true" > "$target"
+        echo -n "true" > "$target"
 
-          chmod +x "$target"
-        '';
-      };
-
-      nixPath = [ "/a" "/b/c" ];
-
-      settings = {
-        use-sandbox = true;
-        show-trace = true;
-        system-features = [ "big-parallel" "kvm" "recursive-nix" ];
-      };
+        chmod +x "$target"
+      '';
     };
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/nix/nix.conf \
-        ${./example-settings-expected.conf}
+    nixPath = [ "/a" "/b/c" ];
 
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/a:/b/c''${NIX_PATH:+:$NIX_PATH}"'
-    '';
+    settings = {
+      use-sandbox = true;
+      show-trace = true;
+      system-features = [ "big-parallel" "kvm" "recursive-nix" ];
+    };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/nix/nix.conf \
+      ${./example-settings-expected.conf}
+
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export NIX_PATH="/a:/b/c''${NIX_PATH:+:$NIX_PATH}"'
+  '';
 }
diff --git a/tests/modules/misc/nix/keep-old-nix-path.nix b/tests/modules/misc/nix/keep-old-nix-path.nix
index 72bd9f164..b7dc63a0c 100644
--- a/tests/modules/misc/nix/keep-old-nix-path.nix
+++ b/tests/modules/misc/nix/keep-old-nix-path.nix
@@ -1,16 +1,14 @@
 { config, ... }:
 
 {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage { };
-      nixPath = [ "/a" "/b/c" ];
-      keepOldNixPath = false;
-    };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/a:/b/c"'
-    '';
+  nix = {
+    package = config.lib.test.mkStubPackage { };
+    nixPath = [ "/a" "/b/c" ];
+    keepOldNixPath = false;
   };
+
+  nmt.script = ''
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export NIX_PATH="/a:/b/c"'
+  '';
 }

From f63c15c137f9e446af897c15218c1af9f06d91ad Mon Sep 17 00:00:00 2001
From: Karl H <34152449+KarlJoad@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:32:05 -0600
Subject: [PATCH 150/546] isync/mbsync: update module for 1.5.0 changes (#5918)

* mbsync: Add NEWS entry about isync 1.5.0 changes

* mbsync: Place config file in $XDG_CONFIG_HOME

mbsync 1.5.0 supports placing isync's configuration file in
$XDG_CONFIG_HOME/isyncrc [1].

[1] https://sourceforge.net/projects/isync/files/isync/1.5.0/

* mbsync: Replace SSLType with TLSType

mbsync 1.5.0 replaced the name of the configuration option [1].

Also update SSLVersions to TLSVersions for the same reason. Inform the
user if the option was renamed.

[1] https://sourceforge.net/projects/isync/files/isync/1.5.0/

* mbsync: Replace SSLVersions with TLSVerisons

* mbsync: Update extraConfig.account example with SSL->TLS changes
---
 modules/misc/news.nix                         | 29 +++++++++++++++++++
 modules/programs/mbsync-accounts.nix          |  2 ++
 modules/programs/mbsync.nix                   |  4 +--
 .../programs/mbsync/mbsync-expected.conf      |  6 ++--
 tests/modules/programs/mbsync/mbsync.nix      |  6 ++--
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 3dbb01723..1b6fd3299 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1861,6 +1861,35 @@ in {
           Some plugins require this to be set to 'false' to function correctly.
         '';
       }
+
+      {
+        time = "2024-12-08T17:22:13+00:00";
+        condition = let
+          usingMbsync = any (a: a.mbsync.enable)
+            (attrValues config.accounts.email.accounts);
+        in usingMbsync;
+        message = ''
+          isync/mbsync 1.5.0 has changed several things.
+
+          isync gained support for using $XDG_CONFIG_HOME, and now places
+          its config file in '$XDG_CONFIG_HOME/isyncrc'.
+
+          isync changed the configuration options SSLType and SSLVersion to
+          TLSType and TLSVersion respectively.
+
+          All instances of
+          'accounts.email.accounts.<account-name>.mbsync.extraConfig.account'
+          that use 'SSLType' or 'SSLVersion' should be replaced with 'TLSType'
+          or 'TLSVersion', respectively.
+
+          TLSType options are unchanged.
+
+          TLSVersions has a new syntax, requiring a change to the Nix syntax.
+          Old Syntax: SSLVersions = [ "TLSv1.3" "TLSv1.2" ];
+          New Syntax: TLSVersions = [ "+1.3" "+1.2" "-1.1" ];
+          NOTE: The minus symbol means to NOT use that particular TLS version.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/programs/mbsync-accounts.nix b/modules/programs/mbsync-accounts.nix
index abe5a8ca8..8dc03b122 100644
--- a/modules/programs/mbsync-accounts.nix
+++ b/modules/programs/mbsync-accounts.nix
@@ -225,6 +225,8 @@ in {
       default = { };
       example = literalExpression ''
         {
+          TLSType = "IMAP";
+          TLSVersions = [ "+1.3" "+1.2" "-1.1" ];
           PipelineDepth = 10;
           Timeout = 60;
         };
diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix
index 3437602e9..00371b7f1 100644
--- a/modules/programs/mbsync.nix
+++ b/modules/programs/mbsync.nix
@@ -30,7 +30,7 @@ let
 
   genTlsConfig = tls:
     {
-      SSLType = if !tls.enable then
+      TLSType = if !tls.enable then
         "None"
       else if tls.useStartTls then
         "STARTTLS"
@@ -267,7 +267,7 @@ in {
 
       programs.notmuch.new.ignore = [ ".uidvalidity" ".mbsyncstate" ];
 
-      home.file.".mbsyncrc".text = let
+      xdg.configFile."isyncrc".text = let
         accountsConfig = map genAccountConfig mbsyncAccounts;
         # Only generate this kind of Group configuration if there are ANY accounts
         # that do NOT have a per-account groups/channels option(s) specified.
diff --git a/tests/modules/programs/mbsync/mbsync-expected.conf b/tests/modules/programs/mbsync/mbsync-expected.conf
index 171109782..89074957e 100644
--- a/tests/modules/programs/mbsync/mbsync-expected.conf
+++ b/tests/modules/programs/mbsync/mbsync-expected.conf
@@ -4,7 +4,7 @@ IMAPAccount hm-account
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 Host imap.example.org
 PassCmd "password-command 2"
-SSLType IMAPS
+TLSType IMAPS
 User home.manager.jr
 
 IMAPStore hm-account-remote
@@ -56,8 +56,8 @@ IMAPAccount hm@example.com
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 Host imap.example.com
 PassCmd password-command
-SSLType IMAPS
-SSLVersions TLSv1.3 TLSv1.2
+TLSType IMAPS
+TLSVersions +1.3 +1.2 -1.1
 User home.manager
 
 IMAPStore hm@example.com-remote
diff --git a/tests/modules/programs/mbsync/mbsync.nix b/tests/modules/programs/mbsync/mbsync.nix
index ffc1635e2..3880a313a 100644
--- a/tests/modules/programs/mbsync/mbsync.nix
+++ b/tests/modules/programs/mbsync/mbsync.nix
@@ -21,7 +21,7 @@ with lib;
     accounts.email.accounts = {
       "hm@example.com".mbsync = {
         enable = true;
-        extraConfig.account.SSLVersions = [ "TLSv1.3" "TLSv1.2" ];
+        extraConfig.account.TLSVersions = [ "+1.3" "+1.2" "-1.1" ];
         groups.inboxes = {
           channels = {
             inbox1 = {
@@ -79,8 +79,8 @@ with lib;
     test.stubs.isync = { };
 
     nmt.script = ''
-      assertFileExists home-files/.mbsyncrc
-      assertFileContent home-files/.mbsyncrc ${./mbsync-expected.conf}
+      assertFileExists home-files/.config/isyncrc
+      assertFileContent home-files/.config/isyncrc ${./mbsync-expected.conf}
     '';
   };
 }

From 9ebaa80a227eaca9c87c53ed515ade013bc2bca9 Mon Sep 17 00:00:00 2001
From: alois31 <36605164+alois31@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:34:21 +0100
Subject: [PATCH 151/546] thunderbird: set the correct SMTP server for aliases
 (#6177)

Previously, only the main identity of an account would get the proper SMTP
server assigned. Identities corresponding to aliases would not get an SMTP
server assigned at all, leading to a (Thunderbird-internal) fallback to the
SMTP server associated to the primary account. This is obviously wrong for
non-primary accounts having aliases associated to them. Fix it by specifying
the SMTP server explicitly for all identities.
---
 modules/programs/thunderbird.nix                               | 3 ++-
 .../modules/programs/thunderbird/thunderbird-expected-first.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index b3713f655..86ccdead4 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -71,6 +71,8 @@ let
       "mail.identity.id_${id}.openpgp_key_id" = account.gpg.key;
       "mail.identity.id_${id}.protectSubject" = true;
       "mail.identity.id_${id}.sign_mail" = account.gpg.signByDefault;
+    } // optionalAttrs (account.smtp != null) {
+      "mail.identity.id_${id}.smtpServer" = "smtp_${account.id}";
     } // account.thunderbird.perIdentitySettings id;
 
   toThunderbirdAccount = account: profile:
@@ -103,7 +105,6 @@ let
       "mail.server.server_${id}.type" = "imap";
       "mail.server.server_${id}.userName" = account.userName;
     } // optionalAttrs (account.smtp != null) {
-      "mail.identity.id_${id}.smtpServer" = "smtp_${id}";
       "mail.smtpserver.smtp_${id}.authMethod" = 3;
       "mail.smtpserver.smtp_${id}.hostname" = account.smtp.host;
       "mail.smtpserver.smtp_${id}.port" =
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first.js b/tests/modules/programs/thunderbird/thunderbird-expected-first.js
index a0876893b..8499ef89e 100644
--- a/tests/modules/programs/thunderbird/thunderbird-expected-first.js
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-first.js
@@ -18,6 +18,7 @@ user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ec
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.openpgp_key_id", "ABC");
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.protectSubject", true);
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.sign_mail", false);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.smtpServer", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.useremail", "home-manager@example.com");
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.valid", true);
 user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.autoEncryptDrafts", false);

From 77a792a0418227e69a2ba26728b47f2b8cf3b6ec Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Mon, 9 Dec 2024 12:35:03 -0500
Subject: [PATCH 152/546] atuin: Do not hard code prefix for daemon socket path

Autin looks for the XDG_DATA_HOME which may not be set as
$HOME/.local/share so lets use the systemd specifier for it instead.
---
 modules/programs/atuin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 269aa70b5..32898c7cb 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -199,7 +199,7 @@ in {
           Unit = { Description = "Atuin daemon socket"; };
           Install = { WantedBy = [ "sockets.target" ]; };
           Socket = {
-            ListenStream = "%h/.local/share/atuin/atuin.sock";
+            ListenStream = "%D/atuin/atuin.sock";
             SocketMode = "0600";
             RemoveOnStop = true;
           };

From e952e94955dcc6fa2120c1430789fc41363f5237 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Mon, 9 Dec 2024 13:28:59 -0500
Subject: [PATCH 153/546] atuin: Prepare for daemon socket path in 18.4.0

The path is changing in 18.4.0 to XDG_RUNTIME_DIR over XDG_DATA_DIR so
update the specifier. See https://github.com/atuinsh/atuin/pull/2171.
---
 modules/programs/atuin.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 32898c7cb..b57cc142a 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -195,11 +195,16 @@ in {
           };
         };
 
-        systemd.user.sockets.atuin-daemon = {
+        systemd.user.sockets.atuin-daemon = let
+          socket_dir = if versionAtLeast cfg.package.version "18.4.0" then
+            "%t"
+          else
+            "%D/atuin";
+        in {
           Unit = { Description = "Atuin daemon socket"; };
           Install = { WantedBy = [ "sockets.target" ]; };
           Socket = {
-            ListenStream = "%D/atuin/atuin.sock";
+            ListenStream = "${socket_dir}/atuin.sock";
             SocketMode = "0600";
             RemoveOnStop = true;
           };

From 8772bae58c0a1390727aaf13802debfa29757d67 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 7 Dec 2024 16:23:14 +1300
Subject: [PATCH 154/546] nushell: allow installing plugins

When the version of Nushell or any Nushell plugin changes, the plugin
registry must be regenerated.
---
 modules/misc/news.nix                         |  9 +++++++
 modules/programs/nushell.nix                  | 26 ++++++++++++++++++-
 .../programs/nushell/example-settings.nix     |  6 +++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 1b6fd3299..a0150bf32 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1890,6 +1890,15 @@ in {
           NOTE: The minus symbol means to NOT use that particular TLS version.
         '';
       }
+
+      {
+        time = "2024-12-10T22:20:10+00:00";
+        condition = config.programs.nushell.enable;
+        message = ''
+          The module 'programs.nushell' can now manage the Nushell plugin
+          registry with the option 'programs.nushell.plugins'.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index 6586d1e1a..ec00210af 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -39,7 +39,8 @@ let
       };
     });
 in {
-  meta.maintainers = [ maintainers.Philipp-M maintainers.joaquintrinanes ];
+  meta.maintainers =
+    [ maintainers.Philipp-M maintainers.joaquintrinanes maintainers.aidalgol ];
 
   imports = [
     (mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''
@@ -134,6 +135,15 @@ in {
       '';
     };
 
+    plugins = mkOption {
+      type = types.listOf types.package;
+      default = [ ];
+      example = lib.literalExpression "[ pkgs.nushellPlugins.formats ]";
+      description = ''
+        A list of nushell plugins to write to the plugin registry file.
+      '';
+    };
+
     shellAliases = mkOption {
       type = types.attrsOf types.str;
       default = { };
@@ -203,6 +213,20 @@ in {
           cfg.extraLogin
         ];
       })
+
+      (let
+        msgPackz = pkgs.runCommand "nushellMsgPackz" { } ''
+          mkdir -p "$out"
+          ${lib.getExe cfg.package} \
+            --plugin-config "$out/plugin.msgpackz" \
+            --commands '${
+              concatStringsSep "; "
+              (map (plugin: "plugin add ${lib.getExe plugin}") cfg.plugins)
+            }'
+        '';
+      in mkIf (cfg.plugins != [ ]) {
+        "${configDir}/plugin.msgpackz".source = "${msgPackz}/plugin.msgpackz";
+      })
     ];
   };
 }
diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index 4fc1402a4..e758000bf 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -23,6 +23,8 @@
       }
     '';
 
+    plugins = [ pkgs.nushellPlugins.formats ];
+
     shellAliases = {
       "lsname" = "(ls | get name)";
       "ll" = "ls -a";
@@ -41,8 +43,6 @@
     };
   };
 
-  test.stubs.nushell = { };
-
   nmt.script = let
     configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
       "home-files/Library/Application Support/nushell"
@@ -58,5 +58,7 @@
     assertFileContent \
       "${configDir}/login.nu" \
       ${./login-expected.nu}
+    assertFileExists \
+      "${configDir}/plugin.msgpackz"
   '';
 }

From c6a5fbfd99bccfafbe99a6bb87b351c8fb7de70a Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@fastmail.com>
Date: Tue, 10 Dec 2024 18:16:07 -0500
Subject: [PATCH 155/546] qt: install kio when qt.platformTheme = "kde"

---
 modules/misc/qt.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix
index a36bd5673..3152e0091 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt.nix
@@ -8,7 +8,11 @@ let
     gnome = [ qgnomeplatform qgnomeplatform-qt6 ];
     adwaita = [ qadwaitadecorations qadwaitadecorations-qt6 ];
     gtk = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ];
-    kde = [ libsForQt5.plasma-integration libsForQt5.systemsettings ];
+    kde = [
+      libsForQt5.kio
+      libsForQt5.plasma-integration
+      libsForQt5.systemsettings
+    ];
     lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ];
     qtct = [ libsForQt5.qt5ct qt6Packages.qt6ct ];
   };

From f26aa4b76fb7606127032d33ac73d7d507d82758 Mon Sep 17 00:00:00 2001
From: Axel Karjalainen <axel@axka.fi>
Date: Sun, 8 Dec 2024 20:30:36 +0200
Subject: [PATCH 156/546] gpg-agent: fix GCR DBus package note

D-Bus services are queried from Home Manager packages too. NixOS is
not required.
---
 modules/services/gpg-agent.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 8bfe68aae..6bb19abe8 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -235,15 +235,12 @@ in {
         example = literalExpression "pkgs.pinentry-gnome3";
         default = null;
         description = ''
-          Which pinentry interface to use. If not
-          `null`, it sets
-          {option}`pinentry-program` in
-          {file}`gpg-agent.conf`. Beware that
-          `pinentry-gnome3` may not work on non-Gnome
-          systems. You can fix it by adding the following to your
-          system configuration:
+          Which pinentry interface to use. If not `null`, it sets
+          {option}`pinentry-program` in {file}`gpg-agent.conf`. Beware that
+          `pinentry-gnome3` may not work on non-GNOME systems. You can fix it by
+          adding the following to your configuration:
           ```nix
-          services.dbus.packages = [ pkgs.gcr ];
+          home.packages = [ pkgs.gcr ];
           ```
         '';
       };

From 6e5b2d9e8014b5572e3367937a329e7053458d34 Mon Sep 17 00:00:00 2001
From: DDoSolitary <DDoSolitary@gmail.com>
Date: Thu, 12 Dec 2024 05:13:27 +0800
Subject: [PATCH 157/546] home-manager: support username with special chars
 (#5609)

The home manager script fails when $USER contains special characters.

For example, my work PC is managed by company's LDAP and username is <COMPANY>\<user>). When running home-manager switch I get the following error:
```
error: flake 'path:/home/<COMPANY>/<user>/.config/home-manager' does not provide attribute 'packages.x86_64-linux.homeConfigurations."<COMPANY>\<user>".activationPackage', 'legacyPackages.x86_64-linux.homeConfigurations."<COMPANY>\<user>".activationPackage' or 'homeConfigurations."<COMPANY>\<user>".activationPackage'
       Did you mean <COMPANY><user>?
```
There are two types of strings that need escaping:

    strings in Nix expressions (e.g. home.nix generated by home-manager init)
    they need backslashes before special chars
    flake URI (passed to nix build)
    they need URI's percent encoding, luckily jq supports that
---
 home-manager/home-manager | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/home-manager/home-manager b/home-manager/home-manager
index 712954476..300d44e49 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -52,6 +52,11 @@ function hasFlakeSupport() {
             | grep -q nix-command
 }
 
+# Escape string for use in Nix files.
+function escapeForNix() {
+    printf %s "$1" | sed 's/["$\\]/\\\0/g'
+}
+
 # Attempts to set the HOME_MANAGER_CONFIG global variable.
 #
 # If no configuration file can be found then this function will print
@@ -201,7 +206,7 @@ function setFlakeAttribute() {
                 # Check FQDN, long, and short hostnames; long first to preserve
                 # pre-existing behaviour in case both happen to be defined.
                 for n in "$USER@$(hostname -f)" "$USER@$(hostname)" "$USER@$(hostname -s)"; do
-                    if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$n\"")" == "true" ]]; then
+                    if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$(escapeForNix "$n")\"")" == "true" ]]; then
                         name="$n"
                         if [[ -v VERBOSE ]]; then
                             echo "Using flake homeConfiguration for $name"
@@ -210,7 +215,7 @@ function setFlakeAttribute() {
                 done
                 ;;
         esac
-        export FLAKE_CONFIG_URI="$flake#homeConfigurations.\"$name\""
+        export FLAKE_CONFIG_URI="$flake#homeConfigurations.\"$(printf %s "$name" | jq -sRr @uri)\""
     fi
 }
 
@@ -349,8 +354,8 @@ function doInit() {
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = "$USER";
-  home.homeDirectory = "$HOME";
+  home.username = "$(escapeForNix "$USER")";
+  home.homeDirectory = "$(escapeForNix "$HOME")";
 $xdgVars
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
@@ -439,7 +444,7 @@ EOF
             mkdir -p "$confDir"
             cat > "$flakeFile" <<EOF
 {
-  description = "Home Manager configuration of $USER";
+  description = "Home Manager configuration of $(escapeForNix "$USER")";
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
@@ -455,7 +460,7 @@ EOF
       system = "$nixSystem";
       pkgs = nixpkgs.legacyPackages.\${system};
     in {
-      homeConfigurations."$USER" = home-manager.lib.homeManagerConfiguration {
+      homeConfigurations."$(escapeForNix "$USER")" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 
         # Specify your home configuration modules here, for example,
@@ -855,8 +860,8 @@ function doUninstall() {
             cat > "$HOME_MANAGER_CONFIG" <<EOF
 {
   uninstall = true;
-  home.username = "$USER";
-  home.homeDirectory = "$HOME";
+  home.username = "$(escapeForNix "$USER")";
+  home.homeDirectory = "$(escapeForNix "$HOME")";
   home.stateVersion = "24.11";
 }
 EOF

From 15151bb5e7d6e352247ecaeeeefc34d0f306b287 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Thu, 12 Dec 2024 20:18:22 +0100
Subject: [PATCH 158/546] gpg: fix hash of test (#6200)

would fail on tests
---
 tests/modules/programs/gpg/immutable-keyfiles.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/programs/gpg/immutable-keyfiles.nix b/tests/modules/programs/gpg/immutable-keyfiles.nix
index 37889a11e..b359d71e4 100644
--- a/tests/modules/programs/gpg/immutable-keyfiles.nix
+++ b/tests/modules/programs/gpg/immutable-keyfiles.nix
@@ -12,7 +12,7 @@
         source = pkgs.fetchurl {
           url =
             "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x44CF42371ADF842E12F116EAA9D3F98FCCF5460B";
-          hash = "sha256-u01QTYEFSY1feJWX3JJjXB6thiVO4WOnrqNmzg6vIDs=";
+          hash = "sha256-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM=";
         };
         trust = 1; # "unknown"
       }

From e526fd2b1a40e4ca0b5e07e87b8c960281c67412 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:58:33 +0100
Subject: [PATCH 159/546] gnome-shell: fix extensions' default (#6199)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Else I get a
===

       … while calling the 'throw' builtin
         at /nix/store/afpmddfrmx5df3h16bdh00yy8i7db8w4-source/pkgs/desktops/gnome/default.nix:96:28:
           95|   gnome-shell = throw "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly."; # Added on 2024-08-28.
           96|   gnome-shell-extensions = throw "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly."; # Added on 2024-08-11.
             |                            ^
           97|   gnome-software = throw "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly."; # Added on 2024-08-11.

       error: The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly.
===

on rebuild
---
 modules/programs/gnome-shell.nix                   | 6 +++---
 tests/modules/programs/gnome-shell/gnome-shell.nix | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/programs/gnome-shell.nix b/modules/programs/gnome-shell.nix
index 36a57cea9..a91609bf2 100644
--- a/modules/programs/gnome-shell.nix
+++ b/modules/programs/gnome-shell.nix
@@ -17,7 +17,7 @@ let
 
       package = mkOption {
         type = types.package;
-        example = "pkgs.gnome.gnome-shell-extensions";
+        example = "pkgs.gnome-shell-extensions";
         description = ''
           Package providing a GNOME Shell extension in
           `$out/share/gnome-shell/extensions/''${id}`.
@@ -66,7 +66,7 @@ in {
           { package = pkgs.gnomeExtensions.dash-to-panel; }
           {
             id = "user-theme@gnome-shell-extensions.gcampax.github.com";
-            package = pkgs.gnome.gnome-shell-extensions;
+            package = pkgs.gnome-shell-extensions;
           }
         ]
       '';
@@ -106,7 +106,7 @@ in {
 
       programs.gnome-shell.extensions = [{
         id = "user-theme@gnome-shell-extensions.gcampax.github.com";
-        package = pkgs.gnome.gnome-shell-extensions;
+        package = pkgs.gnome-shell-extensions;
       }];
 
       home.packages = [ cfg.theme.package ];
diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix
index 02f44e0c3..6c3eb6bca 100644
--- a/tests/modules/programs/gnome-shell/gnome-shell.nix
+++ b/tests/modules/programs/gnome-shell/gnome-shell.nix
@@ -36,11 +36,7 @@ let
 
 in {
   nixpkgs.overlays = [
-    (self: super: {
-      gnome = super.gnome.overrideScope (gself: gsuper: {
-        gnome-shell-extensions = dummy-gnome-shell-extensions;
-      });
-    })
+    (final: prev: { gnome-shell-extensions = dummy-gnome-shell-extensions; })
   ];
 
   programs.gnome-shell.enable = true;

From 3066cc58f552421a2c5414e78407fa5603405b1e Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Thu, 12 Dec 2024 23:48:46 +0100
Subject: [PATCH 160/546] kanshi: dont write config in absence of nix settings
 (#6198)

---
 modules/services/kanshi.nix                      | 16 ++++++++--------
 .../services/kanshi/new-configuration.conf       |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix
index 2eda74876..808966282 100644
--- a/modules/services/kanshi.nix
+++ b/modules/services/kanshi.nix
@@ -38,9 +38,7 @@ let
     else
       throw "Unknown tags ${attrNames x}";
 
-  directivesStr = ''
-    ${concatStringsSep "\n" (map tagToStr cfg.settings)}
-  '';
+  directivesStr = concatStringsSep "\n" (map tagToStr cfg.settings);
 
   oldDirectivesStr = ''
     ${concatStringsSep "\n"
@@ -332,11 +330,13 @@ in {
     {
       home.packages = [ cfg.package ];
 
-      xdg.configFile."kanshi/config".text =
-        if cfg.profiles == { } && cfg.extraConfig == "" then
-          directivesStr
-        else
-          oldDirectivesStr;
+      xdg.configFile."kanshi/config" = let
+        generatedConfigStr =
+          if cfg.profiles == { } && cfg.extraConfig == "" then
+            directivesStr
+          else
+            oldDirectivesStr;
+      in mkIf (generatedConfigStr != "") { text = generatedConfigStr; };
 
       systemd.user.services.kanshi = {
         Unit = {
diff --git a/tests/modules/services/kanshi/new-configuration.conf b/tests/modules/services/kanshi/new-configuration.conf
index 817f66329..5a11a5283 100644
--- a/tests/modules/services/kanshi/new-configuration.conf
+++ b/tests/modules/services/kanshi/new-configuration.conf
@@ -16,4 +16,3 @@ profile  {
   output "LVDS-1" enable
   exec echo "7 eight 9"
 }
-

From 66c5d8b62818ec4c1edb3e941f55ef78df8141a8 Mon Sep 17 00:00:00 2001
From: DaRacci <me@racci.dev>
Date: Thu, 12 Dec 2024 02:37:04 +0000
Subject: [PATCH 161/546] zed-editor: fix always generating settings.json

Makes it so settings.json no longer gets made by ensuring it can be
empty as expected when there are no extensions or userSettings
defined.

PR #6201
---
 modules/programs/zed-editor.nix                | 9 +++++----
 tests/modules/programs/zed-editor/settings.nix | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix
index a9baebf90..80039a8ca 100644
--- a/modules/programs/zed-editor.nix
+++ b/modules/programs/zed-editor.nix
@@ -6,10 +6,11 @@ let
   cfg = config.programs.zed-editor;
   jsonFormat = pkgs.formats.json { };
 
-  mergedSettings = cfg.userSettings // {
-    # this part by @cmacrae
-    auto_install_extensions = lib.genAttrs cfg.extensions (_: true);
-  };
+  mergedSettings = cfg.userSettings
+    // (lib.optionalAttrs (builtins.length cfg.extensions > 0) {
+      # this part by @cmacrae
+      auto_install_extensions = lib.genAttrs cfg.extensions (_: true);
+    });
 in {
   meta.maintainers = [ hm.maintainers.libewa ];
 
diff --git a/tests/modules/programs/zed-editor/settings.nix b/tests/modules/programs/zed-editor/settings.nix
index 701caab13..e6f077423 100644
--- a/tests/modules/programs/zed-editor/settings.nix
+++ b/tests/modules/programs/zed-editor/settings.nix
@@ -17,7 +17,6 @@
   nmt.script = let
     expectedContent = builtins.toFile "expected.json" ''
       {
-        "auto_install_extensions": {},
         "buffer_font_size": 16,
         "features": {
           "copilot": false

From 83ecd50915a09dca928971139d3a102377a8d242 Mon Sep 17 00:00:00 2001
From: Simone Ragusa <hi@interrato.dev>
Date: Mon, 16 Dec 2024 11:23:18 +0100
Subject: [PATCH 162/546] docs: fix typo in 24.11 release notes

---
 docs/release-notes/rl-2411.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release-notes/rl-2411.md b/docs/release-notes/rl-2411.md
index c03394c54..b30cf2dc3 100644
--- a/docs/release-notes/rl-2411.md
+++ b/docs/release-notes/rl-2411.md
@@ -1,6 +1,6 @@
 # Release 24.11 {#sec-release-24.11}
 
-The 24.05 release branch became stable in November, 2024.
+The 24.11 release branch became stable in November, 2024.
 
 ## Highlights {#sec-release-24.11-highlights}
 

From 832920a60833533eaabcc93ab729801bf586fa0c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 19 Dec 2024 09:29:18 -0600
Subject: [PATCH 163/546] thunderbird: add profileVersion

Similar to what we did for firefox for darwin support.
---
 modules/programs/thunderbird.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 86ccdead4..250359d80 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -32,7 +32,8 @@ let
   profilesIni = foldl recursiveUpdate {
     General = {
       StartWithLastProfile = 1;
-      Version = 2;
+    } // lib.optionalAttrs (cfg.profileVersion != null) {
+      Version = cfg.profileVersion;
     };
   } (flip map profilesWithId (profile: {
     "Profile${profile.id}" = {
@@ -145,6 +146,13 @@ in {
         description = "The Thunderbird package to use.";
       };
 
+      profileVersion = mkOption {
+        internal = true;
+        type = types.nullOr types.ints.unsigned;
+        default = if isDarwin then null else 2;
+        description = "profile version, set null for nix-darwin";
+      };
+
       profiles = mkOption {
         type = with types;
           attrsOf (submodule ({ config, name, ... }: {
@@ -360,13 +368,6 @@ in {
       this module to manage your accounts and profiles by setting
       'programs.thunderbird.package' to a dummy value, for example using
       'pkgs.runCommand'.
-
-      Note that this module requires you to set the following environment
-      variables when using an installation of Thunderbird that is not provided
-      by Nix:
-
-          export MOZ_LEGACY_PROFILES=1
-          export MOZ_ALLOW_DOWNGRADE=1
     '';
 
     home.packages = [ cfg.package ]

From 1395379a7a36e40f2a76e7b9936cc52950baa1be Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 19 Dec 2024 12:27:52 +0100
Subject: [PATCH 164/546] home-manager: improve path handling when building
 news

Fixes #6217
---
 home-manager/home-manager                     |  4 +-
 tests/integration/default.nix                 |  1 +
 .../standalone/home-with-symbols-init.nix     | 76 ++++++++++++++++++
 .../standalone/home-with-symbols.nix          | 80 +++++++++++++++++++
 4 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 tests/integration/standalone/home-with-symbols-init.nix
 create mode 100644 tests/integration/standalone/home-with-symbols.nix

diff --git a/home-manager/home-manager b/home-manager/home-manager
index 300d44e49..02eeb8450 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -791,8 +791,8 @@ function buildNews() {
     nix-instantiate \
         --no-build-output --strict \
         --eval '<home-manager/home-manager/build-news.nix>' \
-        --arg newsJsonFile "$newsJsonFile" \
-        --arg newsReadIdsFile "$readIdsFile" \
+        --arg newsJsonFile "\"$(escapeForNix "$newsJsonFile")\"" \
+        --arg newsReadIdsFile "\"$(escapeForNix "$readIdsFile")\"" \
         "${extraArgs[@]}" \
         > "$newsNixFile"
 }
diff --git a/tests/integration/default.nix b/tests/integration/default.nix
index 262f28faf..1ddd8bd4d 100644
--- a/tests/integration/default.nix
+++ b/tests/integration/default.nix
@@ -10,6 +10,7 @@ let
     };
 
   tests = {
+    home-with-symbols = runTest ./standalone/home-with-symbols.nix;
     kitty = runTest ./standalone/kitty.nix;
     nixos-basics = runTest ./nixos/basics.nix;
     standalone-flake-basics = runTest ./standalone/flake-basics.nix;
diff --git a/tests/integration/standalone/home-with-symbols-init.nix b/tests/integration/standalone/home-with-symbols-init.nix
new file mode 100644
index 000000000..546bbc335
--- /dev/null
+++ b/tests/integration/standalone/home-with-symbols-init.nix
@@ -0,0 +1,76 @@
+{ config, pkgs, ... }:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "alice";
+  home.homeDirectory = "/home/alice@home\\extra";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. These will be explicitly sourced when using a
+  # shell provided by Home Manager. If you don't want to manage your shell
+  # through Home Manager then you have to manually source 'hm-session-vars.sh'
+  # located at either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/alice/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    # EDITOR = "emacs";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}
diff --git a/tests/integration/standalone/home-with-symbols.nix b/tests/integration/standalone/home-with-symbols.nix
new file mode 100644
index 000000000..087bc6a98
--- /dev/null
+++ b/tests/integration/standalone/home-with-symbols.nix
@@ -0,0 +1,80 @@
+{ pkgs, ... }:
+
+let
+
+  inherit (pkgs.lib) escapeShellArg;
+
+  nixHome = "/home/alice@home\\extra";
+  pyHome = "/home/alice@home\\\\extra";
+
+in {
+  name = "home-with-symbols";
+  meta.maintainers = [ pkgs.lib.maintainers.rycee ];
+
+  nodes.machine = { ... }: {
+    imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    virtualisation.memorySize = 2048;
+    users.users.alice = {
+      isNormalUser = true;
+      description = "Alice Foobar";
+      password = "foobar";
+      uid = 1000;
+      home = nixHome;
+    };
+  };
+
+  testScript = ''
+    import shlex
+
+    start_all()
+    machine.wait_for_unit("network.target")
+    machine.wait_for_unit("multi-user.target")
+
+    home_manager = "${../../..}"
+
+    def login_as_alice():
+      machine.wait_until_tty_matches("1", "login: ")
+      machine.send_chars("alice\n")
+      machine.wait_until_tty_matches("1", "Password: ")
+      machine.send_chars("foobar\n")
+      machine.wait_until_tty_matches("1", "alice\\@machine")
+
+    def logout_alice():
+      machine.send_chars("exit\n")
+
+    def alice_cmd(cmd):
+      cmd = shlex.quote(f"export XDG_RUNTIME_DIR=/run/user/$UID ; {cmd}")
+      print(f"CMD: {cmd}")
+      return f"su -l alice --shell /bin/sh -c {cmd}"
+
+    def succeed_as_alice(cmd):
+      return machine.succeed(alice_cmd(cmd))
+
+    def fail_as_alice(cmd):
+      return machine.fail(alice_cmd(cmd))
+
+    # Create a persistent login so that Alice has a systemd session.
+    login_as_alice()
+
+    # Set up a home-manager channel.
+    succeed_as_alice(" ; ".join([
+      "mkdir -p '${pyHome}/.nix-defexpr/channels'",
+      f"ln -s {home_manager} '${pyHome}/.nix-defexpr/channels/home-manager'"
+    ]))
+
+    with subtest("Home Manager installation"):
+      succeed_as_alice("nix-shell \"<home-manager>\" -A install")
+
+      actual = machine.succeed("ls '${pyHome}/.config/home-manager'")
+      assert actual == "home.nix\n", \
+        f"unexpected content of ${pyHome}/.config/home-manager: {actual}"
+
+      machine.succeed("diff -u ${
+        ./home-with-symbols-init.nix
+      } '${pyHome}/.config/home-manager/home.nix'")
+
+      # The default configuration creates this link on activation.
+      machine.succeed("test -L '${pyHome}/.cache/.keep'")
+    succeed_as_alice("nix-shell \"<home-manager>\" -A install")
+  '';
+}

From 99f54cdfef395bb3de1c7b8dd422412de65b038d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Sat, 21 Dec 2024 18:04:53 +0100
Subject: [PATCH 165/546] yazi: fix example option for settings

---
 modules/programs/yazi.nix                          | 4 ++--
 tests/modules/programs/yazi/settings-expected.toml | 2 +-
 tests/modules/programs/yazi/settings.nix           | 4 ++--
 tests/modules/programs/yazi/theme-expected.toml    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 9c47345f5..314c4c5ed 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -109,7 +109,7 @@ in {
           };
           manager = {
             show_hidden = false;
-            sort_by = "modified";
+            sort_by = "mtime";
             sort_dir_first = true;
             sort_reverse = true;
           };
@@ -134,7 +134,7 @@ in {
               { fg = "#7AD9E5"; mime = "image/*"; }
               { fg = "#F3D398"; mime = "video/*"; }
               { fg = "#F3D398"; mime = "audio/*"; }
-              { fg = "#CD9EFC"; mime = "application/x-bzip"; }
+              { fg = "#CD9EFC"; mime = "application/bzip"; }
             ];
           };
         }
diff --git a/tests/modules/programs/yazi/settings-expected.toml b/tests/modules/programs/yazi/settings-expected.toml
index 678895c58..731f9add7 100644
--- a/tests/modules/programs/yazi/settings-expected.toml
+++ b/tests/modules/programs/yazi/settings-expected.toml
@@ -3,6 +3,6 @@ enabled = false
 
 [manager]
 show_hidden = false
-sort_by = "modified"
+sort_by = "mtime"
 sort_dir_first = true
 sort_reverse = true
diff --git a/tests/modules/programs/yazi/settings.nix b/tests/modules/programs/yazi/settings.nix
index 8c44870af..32b8a9d5f 100644
--- a/tests/modules/programs/yazi/settings.nix
+++ b/tests/modules/programs/yazi/settings.nix
@@ -42,7 +42,7 @@
       log = { enabled = false; };
       manager = {
         show_hidden = false;
-        sort_by = "modified";
+        sort_by = "mtime";
         sort_dir_first = true;
         sort_reverse = true;
       };
@@ -64,7 +64,7 @@
           }
           {
             fg = "#CD9EFC";
-            mime = "application/x-bzip";
+            mime = "application/bzip";
           }
         ];
       };
diff --git a/tests/modules/programs/yazi/theme-expected.toml b/tests/modules/programs/yazi/theme-expected.toml
index cfd1e985c..3bdc53676 100644
--- a/tests/modules/programs/yazi/theme-expected.toml
+++ b/tests/modules/programs/yazi/theme-expected.toml
@@ -12,4 +12,4 @@ mime = "audio/*"
 
 [[filetype.rules]]
 fg = "#CD9EFC"
-mime = "application/x-bzip"
+mime = "application/bzip"

From db9a98e178b57a8aff46b3482dfccb3f4d8d4ce3 Mon Sep 17 00:00:00 2001
From: Nicholas Ciechanowski <nicholasaciechanowski@gmail.com>
Date: Mon, 16 Dec 2024 10:17:54 +0000
Subject: [PATCH 166/546] pay-respects: add module

Add pay-respects module including shell integration support for bash,
zsh, fish and nushell.
---
 modules/lib/maintainers.nix                   |  6 ++
 modules/misc/news.nix                         | 10 +++
 modules/modules.nix                           |  1 +
 modules/programs/pay-respects.nix             | 61 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../modules/programs/pay-respects/default.nix |  4 ++
 .../pay-respects/integration-disabled.nix     | 22 +++++++
 .../pay-respects/integration-enabled.nix      | 33 ++++++++++
 8 files changed, 138 insertions(+)
 create mode 100644 modules/programs/pay-respects.nix
 create mode 100644 tests/modules/programs/pay-respects/default.nix
 create mode 100644 tests/modules/programs/pay-respects/integration-disabled.nix
 create mode 100644 tests/modules/programs/pay-respects/integration-enabled.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 91ecb47be..64afe7615 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -628,4 +628,10 @@
     keys =
       [{ fingerprint = "BC82 4BB5 1656 D144 285E  A0EC D382 C4AF EECE AA90"; }];
   };
+  ALameLlama = {
+    name = "Nicholas Ciechanowski";
+    email = "NicholasACiechanowski@gmail.com";
+    github = "ALameLlama";
+    githubId = 55490546;
+  };
 }
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index a0150bf32..f2f62dd82 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1899,6 +1899,16 @@ in {
           registry with the option 'programs.nushell.plugins'.
         '';
       }
+
+      {
+        time = "2024-12-21T17:07:49+00:00";
+        message = ''
+          A new module is available: 'programs.pay-respects'.
+
+          Pay Respects is a shell command suggestions tool and command-not-found
+          and thefuck replacement written in Rust.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 5d40a82fc..ba85135de 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -191,6 +191,7 @@ let
     ./programs/pandoc.nix
     ./programs/papis.nix
     ./programs/password-store.nix
+    ./programs/pay-respects.nix
     ./programs/pazi.nix
     ./programs/pet.nix
     ./programs/pidgin.nix
diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects.nix
new file mode 100644
index 000000000..ea47bee4c
--- /dev/null
+++ b/modules/programs/pay-respects.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkEnableOption mkPackageOption getExe optionalString mkIf;
+
+  cfg = config.programs.pay-respects;
+  payRespectsCmd = getExe cfg.package;
+in {
+  meta.maintainers = [ lib.hm.maintainers.ALameLlama ];
+
+  options.programs.pay-respects = {
+    enable = mkEnableOption "pay-respects";
+
+    package = mkPackageOption pkgs "pay-respects" { };
+
+    enableBashIntegration = mkEnableOption "Bash integration" // {
+      default = true;
+    };
+
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
+      default = true;
+    };
+
+    enableFishIntegration = mkEnableOption "Fish integration" // {
+      default = true;
+    };
+
+    enableNushellIntegration = mkEnableOption "Nushell integration" // {
+      default = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    programs = {
+      bash.initExtra = ''
+        ${optionalString cfg.enableBashIntegration ''
+          eval "$(${payRespectsCmd} bash --alias)"
+        ''}
+      '';
+
+      zsh.initExtra = ''
+        ${optionalString cfg.enableZshIntegration ''
+          eval "$(${payRespectsCmd} zsh --alias)"
+        ''}
+      '';
+
+      fish.interactiveShellInit = ''
+        ${optionalString cfg.enableFishIntegration ''
+          ${payRespectsCmd} fish --alias | source
+        ''}
+      '';
+
+      nushell.extraConfig = ''
+        ${optionalString cfg.enableNushellIntegration ''
+          ${payRespectsCmd} nushell --alias [<alias>]
+        ''}
+      '';
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 710b06668..1acdc43dd 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -126,6 +126,7 @@ in import nmtSrc {
     ./modules/programs/openstackclient
     ./modules/programs/pandoc
     ./modules/programs/papis
+    ./modules/programs/pay-respects
     ./modules/programs/pet
     ./modules/programs/pistol
     ./modules/programs/pls
diff --git a/tests/modules/programs/pay-respects/default.nix b/tests/modules/programs/pay-respects/default.nix
new file mode 100644
index 000000000..44334d3ac
--- /dev/null
+++ b/tests/modules/programs/pay-respects/default.nix
@@ -0,0 +1,4 @@
+{
+  pay-respects-integration-enabled = ./integration-enabled.nix;
+  pay-respects-integration-disabled = ./integration-disabled.nix;
+}
diff --git a/tests/modules/programs/pay-respects/integration-disabled.nix b/tests/modules/programs/pay-respects/integration-disabled.nix
new file mode 100644
index 000000000..fa0806d3d
--- /dev/null
+++ b/tests/modules/programs/pay-respects/integration-disabled.nix
@@ -0,0 +1,22 @@
+{ ... }: {
+  programs = {
+    pay-respects.enable = true;
+    pay-respects.enableBashIntegration = false;
+    pay-respects.enableFishIntegration = false;
+    pay-respects.enableZshIntegration = false;
+    pay-respects.enableNushellIntegration = false;
+    bash.enable = true;
+    zsh.enable = true;
+    fish.enable = true;
+    nushell.enable = true;
+  };
+
+  test.stubs.pay-respects = { };
+
+  nmt.script = ''
+    assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/dummy'
+    assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/dummy'
+    assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/dummy'
+    assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/dummy'
+  '';
+}
diff --git a/tests/modules/programs/pay-respects/integration-enabled.nix b/tests/modules/programs/pay-respects/integration-enabled.nix
new file mode 100644
index 000000000..d5b3d980c
--- /dev/null
+++ b/tests/modules/programs/pay-respects/integration-enabled.nix
@@ -0,0 +1,33 @@
+{ ... }: {
+  programs = {
+    pay-respects.enable = true;
+    bash.enable = true;
+    zsh.enable = true;
+    fish.enable = true;
+    nushell.enable = true;
+  };
+
+  test.stubs.pay-respects = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileContains \
+      home-files/.bashrc \
+      'eval "$(@pay-respects@/bin/dummy bash --alias)"'
+
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      'eval "$(@pay-respects@/bin/dummy zsh --alias)"'
+
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      '@pay-respects@/bin/dummy fish --alias | source'
+
+    assertFileExists home-files/.config/nushell/config.nu
+    assertFileContains \
+      home-files/.config/nushell/config.nu \
+      '@pay-respects@/bin/dummy nushell --alias [<alias>]'
+  '';
+}

From f342df3ad938f205a913973b832f52c12546aac6 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sat, 21 Dec 2024 20:09:59 +0100
Subject: [PATCH 167/546] 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/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03)
  → 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5?narHash=sha256-AKU6qqskl0yf2%2BJdRdD0cfxX4b9x3KKV5RqA6wijmPM%3D' (2024-12-13)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9de322090..9eabd84eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {

From 51160a097a850839b7eae7ef08d0d3e7e353dfc3 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 2 Nov 2024 13:56:43 -0400
Subject: [PATCH 168/546] thunderbird: implement `extensions` for profiles

Closes: #5654
---
 modules/programs/thunderbird.nix | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 250359d80..84710207c 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -12,6 +12,11 @@ let
       "Thunderbird preference (int, bool, string, and also attrs, list, float as a JSON string)";
   };
 
+  # The extensions path shared by all profiles.
+  extensionPath = "extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
+
+  moduleName = "programs.thunderbird";
+
   enabledAccounts = attrValues
     (filterAttrs (_: a: a.thunderbird.enable) config.accounts.email.accounts);
 
@@ -249,6 +254,27 @@ in {
                 default = { };
                 description = "Declarative search engine configuration.";
               };
+
+              extensions = mkOption {
+                type = types.listOf types.package;
+                default = [ ];
+                example = literalExpression ''
+                  [
+                    pkgs.some-thunderbird-extension
+                  ]
+                '';
+                description = ''
+                  List of ${name} add-on packages to install for this profile.
+
+                  Note that it is necessary to manually enable extensions
+                  inside ${name} after the first installation.
+
+                  To automatically enable extensions add
+                  `"extensions.autoDisableScopes" = 0;`
+                  to
+                  [{option}`${moduleName}.profiles.<profile>.settings`](#opt-${moduleName}.profiles._name_.settings)
+                '';
+              };
             };
           }));
         description = "Attribute set of Thunderbird profiles.";
@@ -417,6 +443,18 @@ in {
           force = profile.search.force;
           source = profile.search.file;
         };
+
+      "${thunderbirdProfilesPath}/${name}/extensions" =
+        mkIf (profile.extensions != [ ]) {
+          source = let
+            extensionsEnvPkg = pkgs.buildEnv {
+              name = "hm-thunderbird-extensions";
+              paths = profile.extensions;
+            };
+          in "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
+          recursive = true;
+          force = true;
+        };
     }));
   };
 }

From c903b1f6fbfc2039963806df896f698331b77aa8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 22 Dec 2024 03:59:25 +0000
Subject: [PATCH 169/546] 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/3566ab7246670a43abd2ffa913cc62dad9cdf7d5?narHash=sha256-AKU6qqskl0yf2%2BJdRdD0cfxX4b9x3KKV5RqA6wijmPM%3D' (2024-12-13)
  → 'github:NixOS/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507?narHash=sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ%3D' (2024-12-19)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9eabd84eb..ad5659522 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1734649271,
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {

From f47b6c153ad31187a519bd569ccbcb20acb16ce0 Mon Sep 17 00:00:00 2001
From: bricked <git@bricked.dev>
Date: Wed, 18 Dec 2024 16:42:28 +0100
Subject: [PATCH 170/546] cavalier: add module

---
 modules/misc/news.nix                         |  10 ++
 modules/modules.nix                           |   1 +
 modules/programs/cavalier.nix                 | 102 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../cavalier-cava-settings-expected.ini       |  21 ++++
 .../cavalier/cavalier-cava-settings.nix       |  35 ++++++
 .../cavalier-general-settings-expected.json   |   1 +
 .../cavalier/cavalier-general-settings.nix    |  59 ++++++++++
 tests/modules/programs/cavalier/default.nix   |   4 +
 9 files changed, 234 insertions(+)
 create mode 100644 modules/programs/cavalier.nix
 create mode 100644 tests/modules/programs/cavalier/cavalier-cava-settings-expected.ini
 create mode 100644 tests/modules/programs/cavalier/cavalier-cava-settings.nix
 create mode 100644 tests/modules/programs/cavalier/cavalier-general-settings-expected.json
 create mode 100644 tests/modules/programs/cavalier/cavalier-general-settings.nix
 create mode 100644 tests/modules/programs/cavalier/default.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index f2f62dd82..d09176e54 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1909,6 +1909,16 @@ in {
           and thefuck replacement written in Rust.
         '';
       }
+
+      {
+        time = "2024-12-22T08:24:29+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'programs.cavalier'.
+
+          Cavalier is a GUI wrapper around the Cava audio visualizer.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index ba85135de..d7f139333 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -77,6 +77,7 @@ let
     ./programs/bun.nix
     ./programs/carapace.nix
     ./programs/cava.nix
+    ./programs/cavalier.nix
     ./programs/chromium.nix
     ./programs/cmus.nix
     ./programs/command-not-found/command-not-found.nix
diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier.nix
new file mode 100644
index 000000000..0b57cf8e2
--- /dev/null
+++ b/modules/programs/cavalier.nix
@@ -0,0 +1,102 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.cavalier;
+
+  iniFmt = pkgs.formats.ini { };
+
+  jsonFmt = pkgs.formats.json { };
+
+in {
+  meta.maintainers = [ hm.maintainers.bricked ];
+
+  options.programs.cavalier = {
+    enable = mkEnableOption "Cava audio visualizer GUI";
+
+    package = mkPackageOption pkgs "cavalier" { };
+
+    settings = {
+      general = mkOption {
+        type = jsonFmt.type;
+        default = { };
+        example = literalExpression ''
+          {
+            ShowControls = true;
+            ColorProfiles = [
+              {
+                Name = "Default";
+                FgColors = [
+                  "#ffed333b"
+                  "#ffffa348"
+                  "#fff8e45c"
+                  "#ff57e389"
+                  "#ff62a0ea"
+                  "#ffc061cb"
+                ];
+                BgColors = [
+                  "#ff1e1e2e"
+                ];
+                Theme = 1;
+              }
+            ];
+            ActiveProfile = 0;
+          }
+        '';
+        description = ''
+          Settings to be written to the Cavalier configuration file. See
+          <https://github.com/NickvisionApps/Cavalier/blob/main/NickvisionCavalier.Shared/Models/Configuration.cs>
+          for all available options.
+        '';
+      };
+
+      cava = mkOption {
+        type = iniFmt.type;
+        default = { };
+        example = literalExpression ''
+          {
+            general.framerate = 60;
+            input.method = "alsa";
+            smoothing.noise_reduction = 88;
+            color = {
+              background = "'#000000'";
+              foreground = "'#FFFFFF'";
+            };
+          }
+        '';
+        description = ''
+          Settings to be written to the underlying Cava configuration file. See
+          <https://github.com/karlstav/cava/blob/master/example_files/config> for
+          all available options.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "programs.cavalier" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile = {
+      "Nickvision Cavalier/config.json" = mkIf (cfg.settings.general != { }) {
+        text = ''
+          ${generators.toJSON { } cfg.settings.general}
+        '';
+      };
+
+      "Nickvision Cavalier/cava_config" = mkIf (cfg.settings.cava != { }) {
+        text = ''
+          ; Generated by Home Manager
+
+          ${generators.toINI { } cfg.settings.cava}
+        '';
+      };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 1acdc43dd..f7a1b283f 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -199,6 +199,7 @@ in import nmtSrc {
     ./modules/programs/beets # One test relies on services.mpd
     ./modules/programs/bemenu
     ./modules/programs/boxxy
+    ./modules/programs/cavalier
     ./modules/programs/firefox/firefox.nix
     ./modules/programs/firefox/floorp.nix
     ./modules/programs/foot
diff --git a/tests/modules/programs/cavalier/cavalier-cava-settings-expected.ini b/tests/modules/programs/cavalier/cavalier-cava-settings-expected.ini
new file mode 100644
index 000000000..609629d6f
--- /dev/null
+++ b/tests/modules/programs/cavalier/cavalier-cava-settings-expected.ini
@@ -0,0 +1,21 @@
+; Generated by Home Manager
+
+[general]
+autosens=1
+bars=12
+framerate=60
+sensitivity=100
+
+[input]
+method=pulse
+
+[output]
+bit_format=16bit
+channels=stereo
+method=raw
+raw_target=/dev/stdout
+
+[smoothing]
+monstercat=1
+noise_reduction=77
+
diff --git a/tests/modules/programs/cavalier/cavalier-cava-settings.nix b/tests/modules/programs/cavalier/cavalier-cava-settings.nix
new file mode 100644
index 000000000..0d64b84a5
--- /dev/null
+++ b/tests/modules/programs/cavalier/cavalier-cava-settings.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, ... }:
+
+{
+  programs.cavalier = {
+    enable = true;
+
+    package = config.lib.test.mkStubPackage { };
+
+    settings.cava = {
+      general = {
+        framerate = 60;
+        bars = 12;
+        autosens = 1;
+        sensitivity = 100;
+      };
+      input = { method = "pulse"; };
+      output = {
+        method = "raw";
+        raw_target = "/dev/stdout";
+        bit_format = "16bit";
+        channels = "stereo";
+      };
+      smoothing = {
+        monstercat = 1;
+        noise_reduction = 77;
+      };
+    };
+  };
+
+  nmt.script = ''
+    configFile="home-files/.config/Nickvision Cavalier/cava_config"
+    assertFileExists "$configFile"
+    assertFileContent "$configFile" ${./cavalier-cava-settings-expected.ini}
+  '';
+}
diff --git a/tests/modules/programs/cavalier/cavalier-general-settings-expected.json b/tests/modules/programs/cavalier/cavalier-general-settings-expected.json
new file mode 100644
index 000000000..c05f3b049
--- /dev/null
+++ b/tests/modules/programs/cavalier/cavalier-general-settings-expected.json
@@ -0,0 +1 @@
+{"ActiveProfile":0,"AreaMargin":0,"AreaOffsetX":0,"AreaOffsetY":0,"AutohideHeader":false,"Autosens":true,"BarPairs":6,"BgImageAlpha":1,"BgImageIndex":-1,"BgImageScale":1,"Borderless":false,"ColorProfiles":[{"BgColors":["#ff242424"],"FgColors":["#ff3584e4"],"Name":"Default","Theme":1}],"Direction":1,"FgImageAlpha":1,"FgImageIndex":-1,"FgImageScale":1,"Filling":true,"Framerate":60,"InnerRadius":0.5,"ItemsOffset":0.1,"ItemsRoundness":0.5,"LinesThickness":5,"Mirror":0,"Mode":0,"Monstercat":true,"NoiseReduction":0.77,"ReverseMirror":false,"ReverseOrder":true,"Rotation":0,"Sensitivity":10,"SharpCorners":false,"ShowControls":false,"Stereo":true,"WindowHeight":521,"WindowMaximized":false,"WindowWidth":1908}
diff --git a/tests/modules/programs/cavalier/cavalier-general-settings.nix b/tests/modules/programs/cavalier/cavalier-general-settings.nix
new file mode 100644
index 000000000..24dcc5dfe
--- /dev/null
+++ b/tests/modules/programs/cavalier/cavalier-general-settings.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, ... }:
+
+{
+  programs.cavalier = {
+    enable = true;
+
+    package = config.lib.test.mkStubPackage { };
+
+    settings.general = {
+      WindowWidth = 1908;
+      WindowHeight = 521;
+      WindowMaximized = false;
+      AreaMargin = 0;
+      AreaOffsetX = 0;
+      AreaOffsetY = 0;
+      Borderless = false;
+      SharpCorners = false;
+      ShowControls = false;
+      AutohideHeader = false;
+      Framerate = 60;
+      BarPairs = 6;
+      Autosens = true;
+      Sensitivity = 10;
+      Stereo = true;
+      Monstercat = true;
+      NoiseReduction = 0.77;
+      ReverseOrder = true;
+      Direction = 1;
+      ItemsOffset = 0.1;
+      ItemsRoundness = 0.5;
+      Filling = true;
+      LinesThickness = 5;
+      Mode = 0;
+      Mirror = 0;
+      ReverseMirror = false;
+      InnerRadius = 0.5;
+      Rotation = 0;
+      ColorProfiles = [{
+        Name = "Default";
+        FgColors = [ "#ff3584e4" ];
+        BgColors = [ "#ff242424" ];
+        Theme = 1;
+      }];
+      ActiveProfile = 0;
+      BgImageIndex = -1;
+      BgImageScale = 1;
+      BgImageAlpha = 1;
+      FgImageIndex = -1;
+      FgImageScale = 1;
+      FgImageAlpha = 1;
+    };
+  };
+
+  nmt.script = ''
+    configFile="home-files/.config/Nickvision Cavalier/config.json"
+    assertFileExists "$configFile"
+    assertFileContent "$configFile" ${./cavalier-general-settings-expected.json}
+  '';
+}
diff --git a/tests/modules/programs/cavalier/default.nix b/tests/modules/programs/cavalier/default.nix
new file mode 100644
index 000000000..6f488f2fc
--- /dev/null
+++ b/tests/modules/programs/cavalier/default.nix
@@ -0,0 +1,4 @@
+{
+  cavalier-general-settings = ./cavalier-general-settings.nix;
+  cavalier-cava-settings = ./cavalier-cava-settings.nix;
+}

From cb27edb5221d2f2920a03155f8becc502cf60e35 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 22 Dec 2024 11:13:25 +0100
Subject: [PATCH 171/546] waybar: add systemd restart triggers

Fixes #3186
---
 modules/programs/waybar.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 72d247323..8150223c1 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (lib)
-    all filterAttrs hasAttr isStorePath literalExpression optionalAttrs types;
+    all filterAttrs hasAttr isStorePath literalExpression optional optionalAttrs
+    types;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
 
@@ -310,6 +311,10 @@ in {
           Documentation = "https://github.com/Alexays/Waybar/wiki";
           PartOf = [ "graphical-session.target" ];
           After = [ "graphical-session-pre.target" ];
+          X-Restart-Triggers = optional (settings != [ ])
+            "${config.xdg.configFile."waybar/config".source}"
+            ++ optional (cfg.style != null)
+            "${config.xdg.configFile."waybar/style.css".source}";
         };
 
         Service = {

From 1f74238a4c8e534a1b6be72cb5153043071ffd17 Mon Sep 17 00:00:00 2001
From: musjj <72612857+musjj@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:55:36 +0700
Subject: [PATCH 172/546] xresources: allow floating point values

---
 modules/xresources.nix                            | 2 +-
 tests/modules/xresources/xresources-expected.conf | 1 +
 tests/modules/xresources/xresources.nix           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/xresources.nix b/modules/xresources.nix
index cb8dae238..a2396e236 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -32,7 +32,7 @@ in {
     xresources.properties = mkOption {
       type = with types;
         let
-          prim = either bool (either int str);
+          prim = oneOf [ bool int float str ];
           entry = either prim (listOf prim);
         in nullOr (attrsOf entry);
       default = null;
diff --git a/tests/modules/xresources/xresources-expected.conf b/tests/modules/xresources/xresources-expected.conf
index 20b47e508..577605d2a 100644
--- a/tests/modules/xresources/xresources-expected.conf
+++ b/tests/modules/xresources/xresources-expected.conf
@@ -1,5 +1,6 @@
 Test*boolean1: true
 Test*boolean2: false
+Test*float: 12.300000
 Test*int: 10
 Test*list: list-str, true, false, 10
 Test*string: test-string
diff --git a/tests/modules/xresources/xresources.nix b/tests/modules/xresources/xresources.nix
index 36d092e0d..3f8a83678 100644
--- a/tests/modules/xresources/xresources.nix
+++ b/tests/modules/xresources/xresources.nix
@@ -7,6 +7,7 @@
       "Test*boolean1" = true;
       "Test*boolean2" = false;
       "Test*int" = 10;
+      "Test*float" = 12.3;
       "Test*list" = [ "list-str" true false 10 ];
     };
   };

From edb8b00e4d17b2116b60eca50f38ac68f12b9ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david0@gmail.com>
Date: Sun, 22 Dec 2024 18:00:34 +0100
Subject: [PATCH 173/546] Translate using Weblate (Czech)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: David Chocholatý <chocholaty.david0@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/cs/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/cs.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/home-manager/po/cs.po b/home-manager/po/cs.po
index 2fe4019b3..773eb11dd 100644
--- a/home-manager/po/cs.po
+++ b/home-manager/po/cs.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-02-16 22:01+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2024-12-22 17:00+0000\n"
+"Last-Translator: David Chocholatý <chocholaty.david0@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/home-manager/cli/"
 "cs/>\n"
 "Language: cs\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.4\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: chybějící argument pro %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@@ -190,7 +190,7 @@ msgstr "Neznáme nastavení \"news.display\" \"%s\"."
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "Nastavte, prosím, proměnnou prostředí $EDITOR nebo $VISUAL"
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"

From 8bea1a2005c64a8c9c430d0dddb6b2e5db5f6f12 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Fri, 1 Nov 2024 23:22:59 -0500
Subject: [PATCH 174/546] nixgl: forward override calls to wrapped package

---
 modules/misc/nixgl.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/misc/nixgl.nix b/modules/misc/nixgl.nix
index 2c7fcaffc..541314723 100644
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@@ -240,7 +240,15 @@ in {
 
             shopt -u nullglob # Revert nullglob back to its normal default state
           '';
-        }));
+        })) // {
+          # When the nixGL-wrapped package is given to a HM module, the module
+          # might want to override the package arguments, but our wrapper
+          # wouldn't know what to do with them. So, we rewrite the override
+          # function to instead forward the arguments to the package's own
+          # override function.
+          override = args:
+            makePackageWrapper vendor environment (pkg.override args);
+        };
 
     wrappers = {
       mesa = makePackageWrapper "Intel" { };

From 7349b01505d18cd60ba0e573e78c234b742056ef Mon Sep 17 00:00:00 2001
From: VojtechStep <vojtechstepancik@outlook.com>
Date: Mon, 18 Nov 2024 17:35:56 +0100
Subject: [PATCH 175/546] mu: reinitialize when personal addresses change

When the user changes which addresses mu should consider 'personal',
mu's store should be reinitialized.

After this change, the activation script parses the previously
configured list of addresses and compares it with the new one. If they
differ, it runs the init command even when the store has already been
initialized.
---
 modules/programs/mu.nix                       | 30 ++++++++++++-------
 .../programs/mu/basic-configuration.nix       |  4 +--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix
index 4d051d4da..935fd100a 100644
--- a/modules/programs/mu.nix
+++ b/modules/programs/mu.nix
@@ -9,17 +9,22 @@ let
   # Used to generate command line arguments that mu can operate with.
   genCmdMaildir = path: "--maildir=" + path;
 
-  # Takes the list of accounts with mu.enable = true, and generates a
-  # command-line flag for initializing the mu database.
-  myAddresses = let
+  # Sorted list of personal email addresses to register
+  sortedAddresses = let
     # Set of email account sets where mu.enable = true.
     muAccounts =
       filter (a: a.mu.enable) (attrValues config.accounts.email.accounts);
     addrs = map (a: a.address) muAccounts;
     # Construct list of lists containing email aliases, and flatten
     aliases = flatten (map (a: a.aliases) muAccounts);
-    # Prefix --my-address= to each account's address AND all defined aliases
-    addMyAddress = map (addr: "--my-address=" + addr) (addrs ++ aliases);
+    # Sort the list
+  in sort lessThan (addrs ++ aliases);
+
+  # Takes the list of accounts with mu.enable = true, and generates a
+  # command-line flag for initializing the mu database.
+  myAddresses = let
+    # Prefix --my-address= to each account's address and all defined aliases
+    addMyAddress = map (addr: "--my-address=" + addr) sortedAddresses;
   in concatStringsSep " " addMyAddress;
 
 in {
@@ -49,14 +54,19 @@ in {
     home.activation.runMuInit = let
       maildirOption = genCmdMaildir config.accounts.email.maildirBasePath;
       dbLocation = config.xdg.cacheHome + "/mu";
+      muExe = getExe cfg.package;
     in hm.dag.entryAfter [ "writeBoundary" ] ''
-      # If the database directory exists, then `mu init` should NOT be run.
+      # If the database directory exists and registered personal addresses remain the same,
+      # then `mu init` should NOT be run.
       # In theory, mu is the only thing that creates that directory, and it is
       # only created during the initial index.
-      if [[ ! -d "${dbLocation}" ]]; then
-        run ${
-          getExe cfg.package
-        } init ${maildirOption} ${myAddresses} $VERBOSE_ARG;
+      MU_SORTED_ADDRS=$((${muExe} info store | ${
+        getExe pkgs.gawk
+      } '/personal-address/{print $4}' | LC_ALL=C sort | paste -sd ' ') || exit 0)
+      if [[ ! -d "${dbLocation}" || ! "$MU_SORTED_ADDRS" = "${
+        concatStringsSep " " sortedAddresses
+      }" ]]; then
+        run ${muExe} init ${maildirOption} ${myAddresses} $VERBOSE_ARG;
       fi
     '';
   };
diff --git a/tests/modules/programs/mu/basic-configuration.nix b/tests/modules/programs/mu/basic-configuration.nix
index 93e870da6..edca63a70 100644
--- a/tests/modules/programs/mu/basic-configuration.nix
+++ b/tests/modules/programs/mu/basic-configuration.nix
@@ -16,9 +16,9 @@
 
   nmt.script = ''
     assertFileContains activate \
-      'if [[ ! -d "/home/hm-user/.cache/mu" ]]; then'
+      'if [[ ! -d "/home/hm-user/.cache/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then'
 
     assertFileContains activate \
-      'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --my-address=hm@example.com --my-address=foo@example.com $VERBOSE_ARG;'
+      'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;'
   '';
 }

From 8264bfe3a064d704c57df91e34b795b6ac7bad9e Mon Sep 17 00:00:00 2001
From: VojtechStep <vojtechstepancik@outlook.com>
Date: Tue, 17 Dec 2024 17:28:24 +0100
Subject: [PATCH 176/546] mu: add integration tests

---
 modules/programs/mu.nix                       |   5 +-
 tests/integration/default.nix                 |   1 +
 .../mu/config-account-without-mu.nix          |   5 +
 .../standalone/mu/config-no-accounts.nix      |   9 ++
 .../standalone/mu/config-one-account.nix      |   9 ++
 .../standalone/mu/config-one-alias.nix        |   5 +
 .../standalone/mu/config-two-accounts.nix     |   8 ++
 tests/integration/standalone/mu/default.nix   | 117 ++++++++++++++++++
 8 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 tests/integration/standalone/mu/config-account-without-mu.nix
 create mode 100644 tests/integration/standalone/mu/config-no-accounts.nix
 create mode 100644 tests/integration/standalone/mu/config-one-account.nix
 create mode 100644 tests/integration/standalone/mu/config-one-alias.nix
 create mode 100644 tests/integration/standalone/mu/config-two-accounts.nix
 create mode 100644 tests/integration/standalone/mu/default.nix

diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix
index 935fd100a..d1543f000 100644
--- a/modules/programs/mu.nix
+++ b/modules/programs/mu.nix
@@ -55,14 +55,13 @@ in {
       maildirOption = genCmdMaildir config.accounts.email.maildirBasePath;
       dbLocation = config.xdg.cacheHome + "/mu";
       muExe = getExe cfg.package;
+      gawkExe = getExe pkgs.gawk;
     in hm.dag.entryAfter [ "writeBoundary" ] ''
       # If the database directory exists and registered personal addresses remain the same,
       # then `mu init` should NOT be run.
       # In theory, mu is the only thing that creates that directory, and it is
       # only created during the initial index.
-      MU_SORTED_ADDRS=$((${muExe} info store | ${
-        getExe pkgs.gawk
-      } '/personal-address/{print $4}' | LC_ALL=C sort | paste -sd ' ') || exit 0)
+      MU_SORTED_ADDRS=$((${muExe} info store | ${gawkExe} '/personal-address/{print $4}' | LC_ALL=C sort | paste -sd ' ') || exit 0)
       if [[ ! -d "${dbLocation}" || ! "$MU_SORTED_ADDRS" = "${
         concatStringsSep " " sortedAddresses
       }" ]]; then
diff --git a/tests/integration/default.nix b/tests/integration/default.nix
index 1ddd8bd4d..697a28432 100644
--- a/tests/integration/default.nix
+++ b/tests/integration/default.nix
@@ -12,6 +12,7 @@ let
   tests = {
     home-with-symbols = runTest ./standalone/home-with-symbols.nix;
     kitty = runTest ./standalone/kitty.nix;
+    mu = runTest ./standalone/mu;
     nixos-basics = runTest ./nixos/basics.nix;
     standalone-flake-basics = runTest ./standalone/flake-basics.nix;
     standalone-standard-basics = runTest ./standalone/standard-basics.nix;
diff --git a/tests/integration/standalone/mu/config-account-without-mu.nix b/tests/integration/standalone/mu/config-account-without-mu.nix
new file mode 100644
index 000000000..024bd7b99
--- /dev/null
+++ b/tests/integration/standalone/mu/config-account-without-mu.nix
@@ -0,0 +1,5 @@
+{ lib, ... }: {
+  imports = [ ./config-two-accounts.nix ];
+
+  accounts.email.accounts.example2.mu.enable = lib.mkForce false;
+}
diff --git a/tests/integration/standalone/mu/config-no-accounts.nix b/tests/integration/standalone/mu/config-no-accounts.nix
new file mode 100644
index 000000000..7f7b092eb
--- /dev/null
+++ b/tests/integration/standalone/mu/config-no-accounts.nix
@@ -0,0 +1,9 @@
+{
+  home.username = "alice";
+  home.homeDirectory = "/home/alice";
+  home.stateVersion = "24.11";
+
+  programs.mu.enable = true;
+
+  programs.home-manager.enable = true;
+}
diff --git a/tests/integration/standalone/mu/config-one-account.nix b/tests/integration/standalone/mu/config-one-account.nix
new file mode 100644
index 000000000..bd8f95025
--- /dev/null
+++ b/tests/integration/standalone/mu/config-one-account.nix
@@ -0,0 +1,9 @@
+{
+  imports = [ ./config-no-accounts.nix ];
+
+  accounts.email.accounts.example = {
+    primary = true;
+    address = "alice@example.com";
+    mu.enable = true;
+  };
+}
diff --git a/tests/integration/standalone/mu/config-one-alias.nix b/tests/integration/standalone/mu/config-one-alias.nix
new file mode 100644
index 000000000..7c46268d9
--- /dev/null
+++ b/tests/integration/standalone/mu/config-one-alias.nix
@@ -0,0 +1,5 @@
+{
+  imports = [ ./config-one-account.nix ];
+
+  accounts.email.accounts.example.aliases = [ "alias@example.com" ];
+}
diff --git a/tests/integration/standalone/mu/config-two-accounts.nix b/tests/integration/standalone/mu/config-two-accounts.nix
new file mode 100644
index 000000000..b4491fc08
--- /dev/null
+++ b/tests/integration/standalone/mu/config-two-accounts.nix
@@ -0,0 +1,8 @@
+{
+  imports = [ ./config-one-account.nix ];
+
+  accounts.email.accounts.example2 = {
+    address = "alice@example2.com";
+    mu.enable = true;
+  };
+}
diff --git a/tests/integration/standalone/mu/default.nix b/tests/integration/standalone/mu/default.nix
new file mode 100644
index 000000000..1a375d0eb
--- /dev/null
+++ b/tests/integration/standalone/mu/default.nix
@@ -0,0 +1,117 @@
+{ pkgs, ... }: {
+  name = "mu-store-init";
+
+  nodes.machine = { ... }: {
+    imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    virtualisation.memorySize = 2048;
+    users.users.alice = {
+      isNormalUser = true;
+      description = "Alice Foobar";
+      password = "foobar";
+      uid = 1000;
+    };
+  };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("network.target")
+    machine.wait_for_unit("multi-user.target")
+
+    home_manager = "${../../../..}"
+    home_config = "/home/alice/.config/home-manager"
+
+    def login_as_alice():
+      machine.wait_until_tty_matches("1", "login: ")
+      machine.send_chars("alice\n")
+      machine.wait_until_tty_matches("1", "Password: ")
+      machine.send_chars("foobar\n")
+      machine.wait_until_tty_matches("1", "alice\\@machine")
+
+    def logout_alice():
+      machine.send_chars("exit\n")
+
+    def alice_cmd(cmd):
+      return f"su -l alice --shell /bin/sh -c $'export XDG_RUNTIME_DIR=/run/user/$UID ; {cmd}'"
+
+    def succeed_as_alice(cmd):
+      return machine.succeed(alice_cmd(cmd))
+
+    def fail_as_alice(cmd):
+      return machine.fail(alice_cmd(cmd))
+
+    def switch_to(config):
+      succeed_as_alice(f"cp {home_config}/{config}.nix {home_config}/home.nix")
+      return succeed_as_alice("home-manager switch")
+      # succeed_as_alice(". /home/alice/.nix-profile/etc/profile.d/hm-session-vars.sh")
+
+    # Create a persistent login so that Alice has a systemd session.
+    login_as_alice()
+
+    # Set up a home-manager channel.
+    succeed_as_alice(" ; ".join([
+      "mkdir -p /home/alice/.nix-defexpr/channels",
+      f"ln -s {home_manager} /home/alice/.nix-defexpr/channels/home-manager"
+    ]))
+
+    succeed_as_alice("nix-shell \"<home-manager>\" -A install")
+
+    succeed_as_alice(f"cp -t {home_config} ${./.}/config-*")
+
+    with subtest("Switch to empty profile"):
+      switch_to("config-no-accounts")
+      actual = succeed_as_alice("mu info store")
+      expected = "/home/alice/Maildir"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+      unexpected = "personal-address"
+      assert not unexpected in actual, \
+        f"expected mu info store not to contain {unexpected}, but got {actual}"
+
+    with subtest("Switch to profile with an account"):
+      switch_to("config-one-account")
+      actual = succeed_as_alice("mu info store")
+      expected = "alice@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+
+    with subtest("Switch to profile with two accounts"):
+      switch_to("config-two-accounts")
+      actual = succeed_as_alice("mu info store")
+      expected = "alice@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+      expected = "alice@example2.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+
+    with subtest("Switch back to profile with one account"):
+      switch_to("config-one-account")
+      actual = succeed_as_alice("mu info store")
+      expected = "alice@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+      unexpected = "alice@example2.com"
+      assert not unexpected in actual, \
+        f"expected mu info store not to contain {unexpected}, but got {actual}"
+
+    with subtest("Switch to profile with an alias"):
+      switch_to("config-one-alias")
+      actual = succeed_as_alice("mu info store")
+      expected = "alice@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+      expected = "alias@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+
+    with subtest("Switch to a profile with mu disabled for one account"):
+      switch_to("config-account-without-mu")
+      actual = succeed_as_alice("mu info store")
+      expected = "alice@example.com"
+      assert expected in actual, \
+        f"expected mu info store to contain {expected}, but got {actual}"
+      unexpected = "alice@example2.com"
+      assert not unexpected in actual, \
+        f"expected mu info store not to contain {unexpected}, but got {actual}"
+  '';
+}

From f1b1786ea77739dcd181b920d430e30fb1608b8a Mon Sep 17 00:00:00 2001
From: "Shahar \"Dawn\" Or" <mightyiampresence@gmail.com>
Date: Tue, 24 Dec 2024 05:21:39 +0700
Subject: [PATCH 177/546] swayr: avoid IFD

---
 modules/programs/swayr.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/programs/swayr.nix b/modules/programs/swayr.nix
index 250a3e01f..c45ed0634 100644
--- a/modules/programs/swayr.nix
+++ b/modules/programs/swayr.nix
@@ -6,8 +6,10 @@ let
   cfg = config.programs.swayr;
   tomlFormat = pkgs.formats.toml { };
   configFile = tomlFormat.generate "config.toml" cfg.settings;
-  finalConfig = pkgs.writeText "swayr.toml"
-    ((builtins.readFile configFile) + cfg.extraConfig);
+  extraConfigFile = pkgs.writeText "extra-config.toml" cfg.extraConfig;
+  finalConfig = pkgs.runCommand "swayr.toml" { } ''
+    cat ${configFile} ${extraConfigFile} > $out
+  '';
 in {
   meta.maintainers = [ lib.hm.maintainers."9p4" ];
 

From aa8c3d7f7d6b61d3273e943d4fb8bddf7a647431 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Dec 2024 09:13:20 +0100
Subject: [PATCH 178/546] tests: remove stray line

---
 tests/integration/standalone/home-with-symbols.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/integration/standalone/home-with-symbols.nix b/tests/integration/standalone/home-with-symbols.nix
index 087bc6a98..ab8843b5d 100644
--- a/tests/integration/standalone/home-with-symbols.nix
+++ b/tests/integration/standalone/home-with-symbols.nix
@@ -75,6 +75,5 @@ in {
 
       # The default configuration creates this link on activation.
       machine.succeed("test -L '${pyHome}/.cache/.keep'")
-    succeed_as_alice("nix-shell \"<home-manager>\" -A install")
   '';
 }

From 64272584091a47e3762d1bfb40638fbe58dd756d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Dec 2024 16:02:29 +0100
Subject: [PATCH 179/546] tests: change to wait for network.target

---
 tests/integration/standalone/flake-basics.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/standalone/flake-basics.nix b/tests/integration/standalone/flake-basics.nix
index d79974b4b..4ce95997c 100644
--- a/tests/integration/standalone/flake-basics.nix
+++ b/tests/integration/standalone/flake-basics.nix
@@ -24,7 +24,7 @@
 
   testScript = ''
     start_all()
-    machine.wait_for_unit("network-online.target")
+    machine.wait_for_unit("network.target")
     machine.wait_for_unit("multi-user.target")
 
     def login_as_alice():

From afbf007bb5e05b7837be5485e221ea50c4fd4f1b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Dec 2024 09:12:59 +0100
Subject: [PATCH 180/546] tests: add integration test for nh

---
 tests/integration/default.nix       |  1 +
 tests/integration/standalone/nh.nix | 89 +++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 tests/integration/standalone/nh.nix

diff --git a/tests/integration/default.nix b/tests/integration/default.nix
index 697a28432..4fbaaf7af 100644
--- a/tests/integration/default.nix
+++ b/tests/integration/default.nix
@@ -13,6 +13,7 @@ let
     home-with-symbols = runTest ./standalone/home-with-symbols.nix;
     kitty = runTest ./standalone/kitty.nix;
     mu = runTest ./standalone/mu;
+    nh = runTest ./standalone/nh.nix;
     nixos-basics = runTest ./nixos/basics.nix;
     standalone-flake-basics = runTest ./standalone/flake-basics.nix;
     standalone-standard-basics = runTest ./standalone/standard-basics.nix;
diff --git a/tests/integration/standalone/nh.nix b/tests/integration/standalone/nh.nix
new file mode 100644
index 000000000..b19b21407
--- /dev/null
+++ b/tests/integration/standalone/nh.nix
@@ -0,0 +1,89 @@
+{ pkgs, ... }:
+
+let
+
+  inherit (pkgs.lib) escapeShellArg;
+
+  home = "/home/alice";
+
+in {
+  name = "works-with-nh-stable";
+  meta.maintainers = [ pkgs.lib.maintainers.rycee ];
+
+  nodes.machine = { ... }: {
+    imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    virtualisation.memorySize = 2048;
+    environment.systemPackages = [ pkgs.nh ];
+    nix = {
+      registry.home-manager.to = {
+        type = "path";
+        path = ../../..;
+      };
+      settings.extra-experimental-features = [ "nix-command" "flakes" ];
+    };
+    users.users.alice = {
+      isNormalUser = true;
+      description = "Alice Foobar";
+      password = "foobar";
+      uid = 1000;
+      inherit home;
+    };
+  };
+
+  testScript = ''
+    import shlex
+
+    start_all()
+    machine.wait_for_unit("network.target")
+    machine.wait_for_unit("multi-user.target")
+
+    home_manager = "${../..}"
+
+    def login_as_alice():
+      machine.wait_until_tty_matches("1", "login: ")
+      machine.send_chars("alice\n")
+      machine.wait_until_tty_matches("1", "Password: ")
+      machine.send_chars("foobar\n")
+      machine.wait_until_tty_matches("1", "alice\\@machine")
+
+    def logout_alice():
+      machine.send_chars("exit\n")
+
+    def alice_cmd(cmd):
+      cmd = shlex.quote(f"export XDG_RUNTIME_DIR=/run/user/$UID ; {cmd}")
+      return f"su -l alice --shell /bin/sh -c {cmd}"
+
+    def succeed_as_alice(cmd):
+      return machine.succeed(alice_cmd(cmd))
+
+    def fail_as_alice(cmd):
+      return machine.fail(alice_cmd(cmd))
+
+    # Create a persistent login so that Alice has a systemd session.
+    login_as_alice()
+
+    # Set up a home-manager channel.
+    succeed_as_alice(" ; ".join([
+      "mkdir -p ${home}/.nix-defexpr/channels",
+      f"ln -s {home_manager} ${home}/.nix-defexpr/channels/home-manager"
+    ]))
+
+    with subtest("Run nh home switch"):
+      # Copy a configuration to activate.
+      succeed_as_alice(" ; ".join([
+        "mkdir -vp ${home}/.config/home-manager",
+        "cp -v ${
+          ./alice-flake-init.nix
+        } ${home}/.config/home-manager/flake.nix",
+        "cp -v ${./alice-home-next.nix} ${home}/.config/home-manager/home.nix"
+      ]))
+
+      actual = succeed_as_alice("nh home switch --no-nom '${home}/.config/home-manager'")
+      expected = "Starting Home Manager activation"
+      assert expected in actual, \
+        f"expected nh home switch to contain {expected}, but got {actual}"
+
+      # The default configuration creates this link on activation.
+      machine.succeed("test -L '${home}/.cache/.keep'")
+  '';
+}

From 35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Dec 2024 16:23:06 +0100
Subject: [PATCH 181/546] treewide: change pacien to euxane

To match a recent change in Nixpkgs.
---
 modules/misc/xdg-mime-apps.nix        | 2 +-
 modules/misc/xdg-user-dirs.nix        | 2 +-
 modules/programs/password-store.nix   | 2 +-
 modules/services/muchsync.nix         | 2 +-
 modules/services/taskwarrior-sync.nix | 2 +-
 modules/services/unison.nix           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/misc/xdg-mime-apps.nix b/modules/misc/xdg-mime-apps.nix
index c9fd3e8be..39eea478e 100644
--- a/modules/misc/xdg-mime-apps.nix
+++ b/modules/misc/xdg-mime-apps.nix
@@ -10,7 +10,7 @@ let
     coercedTo (either (listOf str) str) toList (listOf str);
 
 in {
-  meta.maintainers = with maintainers; [ pacien ];
+  meta.maintainers = with maintainers; [ euxane ];
 
   options.xdg.mimeApps = {
     enable = mkOption {
diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg-user-dirs.nix
index 1198ea039..5281203b9 100644
--- a/modules/misc/xdg-user-dirs.nix
+++ b/modules/misc/xdg-user-dirs.nix
@@ -7,7 +7,7 @@ let
   cfg = config.xdg.userDirs;
 
 in {
-  meta.maintainers = with maintainers; [ pacien ];
+  meta.maintainers = with maintainers; [ euxane ];
 
   imports = [
     (mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [
diff --git a/modules/programs/password-store.nix b/modules/programs/password-store.nix
index 203eaa349..c57b7a857 100644
--- a/modules/programs/password-store.nix
+++ b/modules/programs/password-store.nix
@@ -7,7 +7,7 @@ let
   cfg = config.programs.password-store;
 
 in {
-  meta.maintainers = with maintainers; [ pacien ];
+  meta.maintainers = with maintainers; [ euxane ];
 
   options.programs.password-store = {
     enable = mkEnableOption "Password store";
diff --git a/modules/services/muchsync.nix b/modules/services/muchsync.nix
index d4fcd864f..1357cbcd4 100644
--- a/modules/services/muchsync.nix
+++ b/modules/services/muchsync.nix
@@ -126,7 +126,7 @@ let
   };
 
 in {
-  meta.maintainers = with maintainers; [ pacien ];
+  meta.maintainers = with maintainers; [ euxane ];
 
   options.services.muchsync = {
     remotes = mkOption {
diff --git a/modules/services/taskwarrior-sync.nix b/modules/services/taskwarrior-sync.nix
index 3bad924cf..7a200730d 100644
--- a/modules/services/taskwarrior-sync.nix
+++ b/modules/services/taskwarrior-sync.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.taskwarrior-sync;
 
 in {
-  meta.maintainers = with maintainers; [ minijackson pacien ];
+  meta.maintainers = with maintainers; [ euxane minijackson ];
 
   options.services.taskwarrior-sync = {
     enable = mkEnableOption "Taskwarrior periodic sync";
diff --git a/modules/services/unison.nix b/modules/services/unison.nix
index 452360a64..e45fd3650 100644
--- a/modules/services/unison.nix
+++ b/modules/services/unison.nix
@@ -72,7 +72,7 @@ let
     cfg.pairs;
 
 in {
-  meta.maintainers = with maintainers; [ pacien ];
+  meta.maintainers = with maintainers; [ euxane ];
 
   options.services.unison = {
     enable = mkEnableOption "Unison synchronisation";

From 19398e505a80db1a1c41207ee89e1b1770c5dcf6 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara.grouwstra@gmail.com>
Date: Fri, 27 Dec 2024 18:39:49 +0100
Subject: [PATCH 182/546] lesspipe: allow configuring package

---
 modules/programs/lesspipe.nix                | 12 +++++++++---
 tests/default.nix                            |  1 +
 tests/modules/programs/lesspipe/default.nix  |  1 +
 tests/modules/programs/lesspipe/lesspipe.nix | 10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 tests/modules/programs/lesspipe/default.nix
 create mode 100644 tests/modules/programs/lesspipe/lesspipe.nix

diff --git a/modules/programs/lesspipe.nix b/modules/programs/lesspipe.nix
index a7a51ffe2..a9bca2791 100644
--- a/modules/programs/lesspipe.nix
+++ b/modules/programs/lesspipe.nix
@@ -2,18 +2,24 @@
 
 with lib;
 
-{
+let
+
+  cfg = config.programs.lesspipe;
+
+in {
   meta.maintainers = [ maintainers.rycee ];
 
   options = {
     programs.lesspipe = {
       enable = mkEnableOption "lesspipe preprocessor for less";
+
+      package = mkPackageOption pkgs "lesspipe" { };
     };
   };
 
-  config = mkIf config.programs.lesspipe.enable {
+  config = mkIf cfg.enable {
     home.sessionVariables = {
-      LESSOPEN = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
+      LESSOPEN = "|${cfg.package}/bin/lesspipe.sh %s";
     };
   };
 }
diff --git a/tests/default.nix b/tests/default.nix
index f7a1b283f..177610e52 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -101,6 +101,7 @@ in import nmtSrc {
     ./modules/programs/kubecolor
     ./modules/programs/ledger
     ./modules/programs/less
+    ./modules/programs/lesspipe
     ./modules/programs/lf
     ./modules/programs/lsd
     ./modules/programs/lieer
diff --git a/tests/modules/programs/lesspipe/default.nix b/tests/modules/programs/lesspipe/default.nix
new file mode 100644
index 000000000..e7b9c3836
--- /dev/null
+++ b/tests/modules/programs/lesspipe/default.nix
@@ -0,0 +1 @@
+{ lesspipe = ./lesspipe.nix; }
diff --git a/tests/modules/programs/lesspipe/lesspipe.nix b/tests/modules/programs/lesspipe/lesspipe.nix
new file mode 100644
index 000000000..70dcc954b
--- /dev/null
+++ b/tests/modules/programs/lesspipe/lesspipe.nix
@@ -0,0 +1,10 @@
+{
+  programs.lesspipe.enable = true;
+
+  test.stubs.lesspipe = { };
+
+  nmt.script = ''
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export LESSOPEN="|@lesspipe@/bin/lesspipe.sh %s"'
+  '';
+}

From b7a7cd5dd1a74a9fe86ed4e016f91c78483b527a Mon Sep 17 00:00:00 2001
From: EmmChriss <42001129+EmmChriss@users.noreply.github.com>
Date: Wed, 25 Dec 2024 13:20:03 +0200
Subject: [PATCH 183/546] pqiv: fix condition for writing pqivrc file

Specifically, write the configuration if either settings or
extraConfig are set.
---
 modules/programs/pqiv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/pqiv.nix b/modules/programs/pqiv.nix
index a99b28de8..27594c4f6 100644
--- a/modules/programs/pqiv.nix
+++ b/modules/programs/pqiv.nix
@@ -65,7 +65,7 @@ in {
     home.packages = [ cfg.package ];
 
     xdg.configFile."pqivrc" =
-      mkIf (cfg.settings != { } && cfg.extraConfig != "") {
+      mkIf (cfg.settings != { } || cfg.extraConfig != "") {
         text = lib.concatLines [
           (generators.toINI {
             mkKeyValue = key: value:

From 10e99c43cdf4a0713b4e81d90691d22c6a58bdf2 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 28 Dec 2024 11:16:56 +0100
Subject: [PATCH 184/546] copyq: add option to disable XWayland

---
 modules/services/copyq.nix                      |  9 ++++++++-
 tests/default.nix                               |  1 +
 .../services/copyq/basic-configuration.nix      | 17 +++++++++++++++++
 .../services/copyq/basic-expected.service       | 12 ++++++++++++
 tests/modules/services/copyq/default.nix        |  4 ++++
 .../copyq/dont-force-x-configuration.nix        | 17 +++++++++++++++++
 .../copyq/dont-force-x-expected.service         | 11 +++++++++++
 7 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/services/copyq/basic-configuration.nix
 create mode 100644 tests/modules/services/copyq/basic-expected.service
 create mode 100644 tests/modules/services/copyq/default.nix
 create mode 100644 tests/modules/services/copyq/dont-force-x-configuration.nix
 create mode 100644 tests/modules/services/copyq/dont-force-x-expected.service

diff --git a/modules/services/copyq.nix b/modules/services/copyq.nix
index 32e83978b..6c4122048 100644
--- a/modules/services/copyq.nix
+++ b/modules/services/copyq.nix
@@ -25,6 +25,13 @@ in {
         otherwise the service may never be started.
       '';
     };
+
+    forceXWayland = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = "Force the CopyQ to use the X backend on wayland";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -45,7 +52,7 @@ in {
       Service = {
         ExecStart = "${cfg.package}/bin/copyq";
         Restart = "on-failure";
-        Environment = [ "QT_QPA_PLATFORM=xcb" ];
+        Environment = lib.optional cfg.forceXWayland "QT_QPA_PLATFORM=xcb";
       };
 
       Install = { WantedBy = [ cfg.systemdTarget ]; };
diff --git a/tests/default.nix b/tests/default.nix
index 177610e52..68474f222 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -243,6 +243,7 @@ in import nmtSrc {
     ./modules/services/cliphist
     ./modules/services/clipman
     ./modules/services/comodoro
+    ./modules/services/copyq
     ./modules/services/conky
     ./modules/services/darkman
     ./modules/services/devilspie2
diff --git a/tests/modules/services/copyq/basic-configuration.nix b/tests/modules/services/copyq/basic-configuration.nix
new file mode 100644
index 000000000..f90872815
--- /dev/null
+++ b/tests/modules/services/copyq/basic-configuration.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  config = {
+    services.copyq = {
+      enable = true;
+      systemdTarget = "sway-session.target";
+    };
+
+    test.stubs.copyq = { };
+
+    nmt.script = ''
+      serviceFile=home-files/.config/systemd/user/copyq.service
+      assertFileContent $serviceFile ${./basic-expected.service}
+    '';
+  };
+}
diff --git a/tests/modules/services/copyq/basic-expected.service b/tests/modules/services/copyq/basic-expected.service
new file mode 100644
index 000000000..f20c23bbc
--- /dev/null
+++ b/tests/modules/services/copyq/basic-expected.service
@@ -0,0 +1,12 @@
+[Install]
+WantedBy=sway-session.target
+
+[Service]
+Environment=QT_QPA_PLATFORM=xcb
+ExecStart=@copyq@/bin/copyq
+Restart=on-failure
+
+[Unit]
+After=graphical-session.target
+Description=CopyQ clipboard management daemon
+PartOf=graphical-session.target
diff --git a/tests/modules/services/copyq/default.nix b/tests/modules/services/copyq/default.nix
new file mode 100644
index 000000000..816fa880b
--- /dev/null
+++ b/tests/modules/services/copyq/default.nix
@@ -0,0 +1,4 @@
+{
+  copyq-basic-configuration = ./basic-configuration.nix;
+  copyq-dont-force-x = ./dont-force-x-configuration.nix;
+}
diff --git a/tests/modules/services/copyq/dont-force-x-configuration.nix b/tests/modules/services/copyq/dont-force-x-configuration.nix
new file mode 100644
index 000000000..a233ae264
--- /dev/null
+++ b/tests/modules/services/copyq/dont-force-x-configuration.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  config = {
+    services.copyq = {
+      enable = true;
+      forceXWayland = false;
+    };
+
+    test.stubs.copyq = { };
+
+    nmt.script = ''
+      serviceFile=home-files/.config/systemd/user/copyq.service
+      assertFileContent $serviceFile ${./dont-force-x-expected.service}
+    '';
+  };
+}
diff --git a/tests/modules/services/copyq/dont-force-x-expected.service b/tests/modules/services/copyq/dont-force-x-expected.service
new file mode 100644
index 000000000..7680f1fe5
--- /dev/null
+++ b/tests/modules/services/copyq/dont-force-x-expected.service
@@ -0,0 +1,11 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@copyq@/bin/copyq
+Restart=on-failure
+
+[Unit]
+After=graphical-session.target
+Description=CopyQ clipboard management daemon
+PartOf=graphical-session.target

From 2ac770c007cc5dc26e6fe472956e6a23134dd124 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 1 Jan 2025 10:46:14 +0100
Subject: [PATCH 185/546] 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/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507?narHash=sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ%3D' (2024-12-19)
  → 'github:NixOS/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ad5659522..119d99ff1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {

From 59a4c43e9ba6db24698c112720a58a334117de83 Mon Sep 17 00:00:00 2001
From: Chris Pick <github@chrispick.com>
Date: Wed, 1 Jan 2025 07:51:47 -0500
Subject: [PATCH 186/546] bacon: fix configuration file location on Darwin

bacon reads its preferences from a different directory on Darwin.
Fix the path to read out of:
~/Library/Application\ Support/org.dystroy.bacon/prefs.toml
Linux behavior should be unchanged.
---
 modules/programs/bacon.nix                    | 11 +++++++++--
 tests/modules/programs/bacon/bacon.nix        | 12 +++++++++---
 tests/modules/programs/bacon/default.nix      |  5 ++++-
 tests/modules/programs/bacon/empty-config.nix | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 tests/modules/programs/bacon/empty-config.nix

diff --git a/modules/programs/bacon.nix b/modules/programs/bacon.nix
index a24d9ffe1..ad2e9b5b8 100644
--- a/modules/programs/bacon.nix
+++ b/modules/programs/bacon.nix
@@ -7,6 +7,12 @@ let
   cfg = config.programs.bacon;
 
   settingsFormat = pkgs.formats.toml { };
+
+  configDir = if pkgs.stdenv.isDarwin then
+    "Library/Application Support/org.dystroy.bacon"
+  else
+    "${config.xdg.configHome}/bacon";
+
 in {
   meta.maintainers = [ hm.maintainers.shimunn ];
 
@@ -34,7 +40,8 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    xdg.configFile."bacon/prefs.toml".source =
-      settingsFormat.generate "prefs.toml" cfg.settings;
+    home.file."${configDir}/prefs.toml" = mkIf (cfg.settings != { }) {
+      source = settingsFormat.generate "prefs.toml" cfg.settings;
+    };
   };
 }
diff --git a/tests/modules/programs/bacon/bacon.nix b/tests/modules/programs/bacon/bacon.nix
index 15d98127c..6df88456d 100644
--- a/tests/modules/programs/bacon/bacon.nix
+++ b/tests/modules/programs/bacon/bacon.nix
@@ -1,4 +1,10 @@
-{ ... }: {
+{ pkgs, ... }:
+let
+  configDir = if pkgs.stdenv.isDarwin then
+    "Library/Application Support/org.dystroy.bacon"
+  else
+    ".config/bacon";
+in {
   programs.bacon = {
     enable = true;
     settings = {
@@ -17,7 +23,7 @@
   };
   test.stubs.bacon = { };
   nmt.script = ''
-    assertFileExists home-files/.config/bacon/prefs.toml
-    assertFileContent home-files/.config/bacon/prefs.toml ${./expected.toml}
+    assertFileExists 'home-files/${configDir}/prefs.toml'
+    assertFileContent 'home-files/${configDir}/prefs.toml' ${./expected.toml}
   '';
 }
diff --git a/tests/modules/programs/bacon/default.nix b/tests/modules/programs/bacon/default.nix
index 5859a2dda..191483ee0 100644
--- a/tests/modules/programs/bacon/default.nix
+++ b/tests/modules/programs/bacon/default.nix
@@ -1 +1,4 @@
-{ bacon-program = ./bacon.nix; }
+{
+  bacon-program = ./bacon.nix;
+  bacon-empty-config = ./empty-config.nix;
+}
diff --git a/tests/modules/programs/bacon/empty-config.nix b/tests/modules/programs/bacon/empty-config.nix
new file mode 100644
index 000000000..51ceb94e5
--- /dev/null
+++ b/tests/modules/programs/bacon/empty-config.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+let
+  configDir = if pkgs.stdenv.isDarwin then
+    "Library/Application Support/org.dystroy.bacon"
+  else
+    ".config/bacon";
+in {
+  programs.bacon.enable = true;
+
+  test.stubs.bacon = { };
+
+  nmt.script = ''
+    assertPathNotExists 'home-files/${configDir}/prefs.toml'
+  '';
+}

From 5518f9d43919c255653b235150010da32faa60c0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Jan 2025 15:58:01 +0100
Subject: [PATCH 187/546] home-manager: make show news a bit more robust

---
 home-manager/home-manager | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/home-manager/home-manager b/home-manager/home-manager
index 02eeb8450..c9186a6ec 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -807,23 +807,23 @@ function doShowNews() {
     local readIdsFile
     readIdsFile="$(newsReadIdsFile)"
 
-    local news
+    local newsAttr
 
-    # shellcheck disable=2154,2046
     case $1 in
         --all)
-            news="$(nix-instantiate --quiet --eval --expr "(import ${newsNixFile}).news.all")"
+            newsAttr="all"
             ;;
         --unread)
-            news="$(nix-instantiate --quiet --eval --expr "(import ${newsNixFile}).news.unread")"
+            newsAttr="unread"
             ;;
         *)
             _i 'Unknown argument %s' "$1"
             return 1
     esac
 
-    # Prints the news without surrounding quotes.
-    echo -e "${news:1:-1}" | ${PAGER:-less}
+    nix-instantiate --quiet --eval --json --expr "(import ${newsNixFile}).news.$newsAttr" \
+        | jq -r . \
+        | ${PAGER:-less}
 
     local allIds
     allIds="$(nix-instantiate --quiet --eval --expr "(import ${newsNixFile}).meta.ids")"

From 9a9fef316ad191b3086edda465e850af282de4e0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Oct 2024 07:54:56 +0200
Subject: [PATCH 188/546] systemd: use sd-switch by default

Also remove the legacy Ruby alternative.

Fixes #5452
---
 docs/release-notes/rl-2505.md                 |  10 +-
 modules/misc/news.nix                         |  16 ++
 modules/systemd-activate.rb                   | 216 ------------------
 modules/systemd.nix                           |  58 ++---
 tests/integration/nixos/basics.nix            |   3 -
 .../standalone/alice-home-next.nix            |   4 -
 6 files changed, 46 insertions(+), 261 deletions(-)
 delete mode 100644 modules/systemd-activate.rb

diff --git a/docs/release-notes/rl-2505.md b/docs/release-notes/rl-2505.md
index dec0f2131..5d47f2c69 100644
--- a/docs/release-notes/rl-2505.md
+++ b/docs/release-notes/rl-2505.md
@@ -7,7 +7,15 @@ section is therefore not final.
 
 This release has the following notable changes:
 
-- No changes.
+- The [](#opt-systemd.user.startServices) option now defaults to
+  `true`, meaning that services will automatically be restarted as
+  needed when activating a configuration.
+
+  Further, the `"legacy"` alternative has been removed and will now
+  result in an evaluation error if used.
+
+  The `"suggest"` alternative will remain for a while longer but may
+  also be deprecated for removal in the future.
 
 ## State Version Changes {#sec-release-25.05-state-version-changes}
 
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index d09176e54..4cfa0e641 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1919,6 +1919,22 @@ in {
           Cavalier is a GUI wrapper around the Cava audio visualizer.
         '';
       }
+
+      {
+        time = "2025-01-01T15:31:15+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          The 'systemd.user.startServices' option now defaults to 'true',
+          meaning that services will automatically be restarted as needed when
+          activating a configuration.
+
+          Further, the "legacy" alternative has been removed and will now result
+          in an evaluation error if used.
+
+          The "suggest" alternative will remain for a while longer but may also
+          be deprecated for removal in the future.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/systemd-activate.rb b/modules/systemd-activate.rb
deleted file mode 100644
index 31d06d8fc..000000000
--- a/modules/systemd-activate.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-require 'set'
-require 'open3'
-
-@dry_run = ENV['DRY_RUN']
-@verbose = ENV['VERBOSE']
-
-UnitsDir = 'home-files/.config/systemd/user'
-
-# 1. Stop all services from the old generation that are not present in the new generation.
-# 2. Ensure all services from the new generation that are wanted by active targets are running:
-#    - Start services that are not already running.
-#    - Restart services whose unit config files have changed between generations.
-# 3. If any services were (re)started, wait 'start_timeout_ms' and report services
-#    that failed to start. This helps debugging quickly failing services.
-#
-# Whenever service failures are detected, show the output of
-# 'systemd --user status' for the affected services.
-#
-def setup_services(old_gen_path, new_gen_path, start_timeout_ms_string)
-  start_timeout_ms = start_timeout_ms_string.to_i
-
-  old_units_path = File.join(old_gen_path, UnitsDir) unless old_gen_path.empty?
-  new_units_path = File.join(new_gen_path, UnitsDir)
-
-  old_services = get_services(old_units_path)
-  new_services = get_services(new_units_path)
-
-  exit if old_services.empty? && new_services.empty?
-
-  all_services = get_active_targets_units(new_units_path)
-  maybe_changed = all_services & old_services
-  changed_services = get_changed_services(old_units_path, new_units_path, maybe_changed)
-  unchanged_oneshots = get_oneshot_services(maybe_changed - changed_services)
-
-  # These services should be running when this script is finished
-  services_to_run = all_services - unchanged_oneshots
-
-  # Only stop active services, otherwise we might get a 'service not loaded' error
-  # for inactive services that were removed in the current generation.
-  to_stop = get_active_units(old_services - new_services)
-  to_restart = changed_services
-  to_start = get_inactive_units(services_to_run - to_restart)
-
-  raise "daemon-reload failed" unless run_cmd('systemctl', '--user', 'daemon-reload')
-
-  # Exclude units that shouldn't be (re)started or stopped
-  no_manual_start, no_manual_stop, no_restart = get_restricted_units(to_stop + to_restart + to_start)
-  notify_skipped_units(to_restart & no_restart)
-  to_stop -= no_manual_stop
-  to_restart -= no_manual_stop + no_manual_start + no_restart
-  to_start -= no_manual_start
-
-  if to_stop.empty? && to_start.empty? && to_restart.empty?
-    print_service_msg("All services are already running", services_to_run)
-  else
-    puts "Setting up services" if @verbose
-    systemctl_action('stop', to_stop)
-    systemctl_action('start', to_start)
-    systemctl_action('restart', to_restart)
-    started_services = to_start + to_restart
-    if start_timeout_ms > 0 && !started_services.empty? && !@dry_run
-      failed = wait_and_get_failed_services(started_services, start_timeout_ms)
-      if failed.empty?
-        print_service_msg("All services are running", services_to_run)
-      else
-        puts
-        puts "Error. These services failed to start:", failed
-        show_failed_services_status(failed)
-        exit 1
-      end
-    end
-  end
-end
-
-def get_services(dir)
-  services = get_service_files(dir) if dir && Dir.exists?(dir)
-  Set.new(services)
-end
-
-def get_service_files(dir)
-  Dir.chdir(dir) { Dir['*[^@].{service,socket,timer}'] }
-end
-
-def get_changed_services(dir_a, dir_b, services)
-  services.select do |service|
-    a = File.join(dir_a, service)
-    b = File.join(dir_b, service)
-    (File.size(a) != File.size(b)) || (File.read(a) != File.read(b))
-  end
-end
-
-TargetDirRegexp = /^(.*\.target)\.wants$/
-
-# @return all units wanted by active targets
-def get_active_targets_units(units_dir)
-  return Set.new unless Dir.exists?(units_dir)
-  targets = Dir.entries(units_dir).map { |entry| entry[TargetDirRegexp, 1] }.compact
-  active_targets = get_active_units(targets)
-  active_units = active_targets.map do |target|
-    get_service_files(File.join(units_dir, "#{target}.wants"))
-  end.flatten
-  Set.new(active_units)
-end
-
-# @return true on success
-def run_cmd(*cmd)
-  print_cmd cmd
-  @dry_run || system(*cmd)
-end
-
-def systemctl_action(cmd, services)
-  return if services.empty?
-
-  verb = (cmd == 'stop') ? 'Stopping' : "#{cmd.capitalize}ing"
-  puts "#{verb}: #{services.join(' ')}"
-
-  cmd = ['systemctl', '--user', cmd, *services]
-  if @dry_run
-    puts cmd.join(' ')
-    return
-  end
-
-  output, status = Open3.capture2e(*cmd)
-  print output
-  # Show status for failed services
-  unless status.success?
-    # Due to a bug in systemd, the '--user' argument is not always provided
-    output.scan(/systemctl (?:--user )?(status .*?)['"]/).flatten.each do |status_cmd|
-      puts
-      run_cmd("systemctl --user #{status_cmd}")
-    end
-    exit 1
-  end
-end
-
-def systemctl(*cmd)
-  output, _ = Open3.capture2('systemctl', '--user', *cmd)
-  output
-end
-
-def print_cmd(cmd)
-  puts [*cmd].join(' ') if @verbose || @dry_run
-end
-
-def get_active_units(units)
-  filter_units(units) { |state| state == 'active' }
-end
-
-def get_inactive_units(units)
-  filter_units(units) { |state| state != 'active' }
-end
-
-def get_failed_units(units)
-  filter_units(units) { |state| state == 'failed' }
-end
-
-def filter_units(units)
-  return [] if units.empty?
-  states = systemctl('is-active', *units).split
-  units.select.with_index { |_, i| yield states[i] }
-end
-
-def get_oneshot_services(units)
-  return [] if units.empty?
-  types = systemctl('show', '-p', 'Type', *units).split
-  units.select.with_index do |_, i|
-    types[i] == 'Type=oneshot'
-  end
-end
-
-def get_restricted_units(units)
-  infos = systemctl('show', '-p', 'RefuseManualStart', '-p', 'RefuseManualStop', *units)
-          .split("\n\n")
-  no_manual_start = []
-  no_manual_stop = []
-  infos.zip(units).each do |info, unit|
-    no_start, no_stop = info.split("\n")
-    no_manual_start << unit if no_start.end_with?('yes')
-    no_manual_stop << unit if no_stop.end_with?('yes')
-  end
-  # Get units that should not be restarted even if a change has been detected.
-  no_restart_regexp = /^\s*X-RestartIfChanged\s*=\s*false\b/
-  no_restart = units.select { |unit| systemctl('cat', unit) =~ no_restart_regexp }
-  [no_manual_start, no_manual_stop, no_restart]
-end
-
-def wait_and_get_failed_services(services, start_timeout_ms)
-  puts "Waiting #{start_timeout_ms} ms for services to fail"
-  # Force the previous message to always be visible before sleeping
-  STDOUT.flush
-  sleep(start_timeout_ms / 1000.0)
-  get_failed_units(services)
-end
-
-def show_failed_services_status(services)
-  puts
-  services.each do |service|
-    run_cmd('systemctl', '--user', 'status', service)
-    puts
-  end
-end
-
-def print_service_msg(msg, services)
-  return if services.empty?
-  if @verbose
-    puts "#{msg}:", services.to_a
-  else
-    puts msg
-  end
-end
-
-def notify_skipped_units(no_restart)
-  puts "Not restarting: #{no_restart.join(' ')}" unless no_restart.empty?
-end
-
-setup_services(*ARGV)
diff --git a/modules/systemd.nix b/modules/systemd.nix
index 9d3777c65..3b8e0dbd2 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -180,10 +180,9 @@ in {
       };
 
       startServices = mkOption {
-        default = "suggest";
-        type = with types;
-          either bool (enum [ "suggest" "legacy" "sd-switch" ]);
-        apply = p: if isBool p then if p then "sd-switch" else "suggest" else p;
+        type = with types; either bool (enum [ "suggest" "sd-switch" ]);
+        apply = p: if isBool p then p else p == "sd-switch";
+        default = true;
         description = ''
           Whether new or changed services that are wanted by active targets
           should be started. Additionally, stop obsolete services from the
@@ -196,12 +195,6 @@ in {
             {command}`systemctl` commands to run. You will have to
             manually run those commands after the switch.
 
-          `legacy`
-          : Use a Ruby script to, in a more robust fashion, determine the
-            necessary changes and automatically run the
-            {command}`systemctl` commands. Note, this alternative will soon
-            be removed.
-
           `sd-switch` (or `true`)
           : Use sd-switch, a tool that determines the necessary changes and
             automatically apply them.
@@ -297,12 +290,6 @@ in {
       message = "This module is only available on Linux.";
     }];
 
-    warnings = lib.optional (cfg.startServices == "legacy") ''
-      Having 'systemd.user.startServices = "legacy"' is deprecated and will soon be removed.
-
-      Please change to 'systemd.user.startServices = true' to use the new systemd unit switcher (sd-switch).
-    '';
-
     xdg.configFile = mkMerge [
       (lib.listToAttrs ((buildServices "service" cfg.services)
         ++ (buildServices "slice" cfg.slices)
@@ -323,26 +310,23 @@ in {
     # set and systemd commands will fail. We'll therefore have to
     # set it ourselves in that case.
     home.activation.reloadSystemd = hm.dag.entryAfter [ "linkGeneration" ] (let
-      cmd = {
-        suggest = ''
-          bash ${./systemd-activate.sh} "''${oldGenPath=}" "$newGenPath"
-        '';
-        legacy = ''
-          ${pkgs.ruby}/bin/ruby ${./systemd-activate.rb} \
-            "''${oldGenPath=}" "$newGenPath" "${servicesStartTimeoutMs}"
-        '';
-        sd-switch = let
-          timeoutArg = if cfg.servicesStartTimeoutMs != 0 then
-            "--timeout " + servicesStartTimeoutMs
-          else
-            "";
-        in ''
-          ${lib.getExe pkgs.sd-switch} \
-            ''${DRY_RUN:+--dry-run} $VERBOSE_ARG ${timeoutArg} \
-            ''${oldUnitsDir:+--old-units $oldUnitsDir} \
-            --new-units "$newUnitsDir"
-        '';
-      };
+      suggestCmd = ''
+        bash ${./systemd-activate.sh} "''${oldGenPath=}" "$newGenPath"
+      '';
+
+      sdSwitchCmd = let
+        timeoutArg = if cfg.servicesStartTimeoutMs != 0 then
+          "--timeout " + servicesStartTimeoutMs
+        else
+          "";
+      in ''
+        ${lib.getExe pkgs.sd-switch} \
+          ''${DRY_RUN:+--dry-run} $VERBOSE_ARG ${timeoutArg} \
+          ''${oldUnitsDir:+--old-units $oldUnitsDir} \
+          --new-units "$newUnitsDir"
+      '';
+
+      systemdCmd = if cfg.startServices then sdSwitchCmd else suggestCmd;
 
       # Make sure that we have an environment where we are likely to
       # successfully talk with systemd.
@@ -374,7 +358,7 @@ in {
           newUnitsDir=${pkgs.emptyDirectory}
         fi
 
-        ${ensureSystemd} ${getAttr cfg.startServices cmd}
+        ${ensureSystemd} ${systemdCmd}
 
         unset newUnitsDir oldUnitsDir
       else
diff --git a/tests/integration/nixos/basics.nix b/tests/integration/nixos/basics.nix
index 61c6b3e49..4b7cbcf8d 100644
--- a/tests/integration/nixos/basics.nix
+++ b/tests/integration/nixos/basics.nix
@@ -21,9 +21,6 @@
       home.file.test.text = "testfile";
       # Enable a light-weight systemd service.
       services.pueue.enable = true;
-      # We focus on sd-switch since that hopefully will become the default in
-      # the future.
-      systemd.user.startServices = "sd-switch";
     };
   };
 
diff --git a/tests/integration/standalone/alice-home-next.nix b/tests/integration/standalone/alice-home-next.nix
index 577214a4f..416640eec 100644
--- a/tests/integration/standalone/alice-home-next.nix
+++ b/tests/integration/standalone/alice-home-next.nix
@@ -12,8 +12,4 @@
 
   # Enable a light-weight systemd service.
   services.pueue.enable = true;
-
-  # We focus on sd-switch since that hopefully will become the default in the
-  # future.
-  systemd.user.startServices = "sd-switch";
 }

From 5f6aa268e419d053c3d5025da740e390b12ac936 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Thu, 26 Dec 2024 20:01:54 -0300
Subject: [PATCH 189/546] ghostty: add module

---
 modules/misc/news.nix                         |  12 ++
 modules/modules.nix                           |   1 +
 modules/programs/ghostty.nix                  | 173 ++++++++++++++++++
 tests/default.nix                             |   1 +
 tests/modules/programs/ghostty/default.nix    |   5 +
 .../programs/ghostty/empty-settings.nix       |   7 +
 .../programs/ghostty/example-config-expected  |   2 +
 .../programs/ghostty/example-settings.nix     |  17 ++
 .../programs/ghostty/example-theme-expected   |  21 +++
 .../programs/ghostty/example-theme.nix        |  40 ++++
 10 files changed, 279 insertions(+)
 create mode 100644 modules/programs/ghostty.nix
 create mode 100644 tests/modules/programs/ghostty/default.nix
 create mode 100644 tests/modules/programs/ghostty/empty-settings.nix
 create mode 100644 tests/modules/programs/ghostty/example-config-expected
 create mode 100644 tests/modules/programs/ghostty/example-settings.nix
 create mode 100644 tests/modules/programs/ghostty/example-theme-expected
 create mode 100644 tests/modules/programs/ghostty/example-theme.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 4cfa0e641..699398dee 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1935,6 +1935,18 @@ in {
           be deprecated for removal in the future.
         '';
       }
+
+      {
+        time = "2025-01-01T23:16:35+00:00";
+        message = ''
+          A new module is available: 'programs.ghostty'.
+
+          Ghostty is a terminal emulator that differentiates itself by being
+          fast, feature-rich, and native. While there are many excellent
+          terminal emulators available, they all force you to choose between
+          speed, features, or native UIs. Ghostty provides all three.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index d7f139333..c5a81b425 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -104,6 +104,7 @@ let
     ./programs/getmail.nix
     ./programs/gh.nix
     ./programs/gh-dash.nix
+    ./programs/ghostty.nix
     ./programs/git-cliff.nix
     ./programs/git-credential-oauth.nix
     ./programs/git.nix
diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
new file mode 100644
index 000000000..026f89dcd
--- /dev/null
+++ b/modules/programs/ghostty.nix
@@ -0,0 +1,173 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.programs.ghostty;
+
+  keyValueSettings = {
+    listsAsDuplicateKeys = true;
+    mkKeyValue = lib.generators.mkKeyValueDefault { } " = ";
+  };
+  keyValue = pkgs.formats.keyValue keyValueSettings;
+in {
+  meta.maintainers = [ lib.maintainers.HeitorAugustoLN ];
+
+  options.programs.ghostty = {
+    enable = lib.mkEnableOption "Ghostty";
+
+    package = lib.mkPackageOption pkgs "ghostty" { };
+
+    settings = lib.mkOption {
+      inherit (keyValue) type;
+      default = { };
+      example = lib.literalExpression ''
+        {
+          theme = "catppuccin-mocha";
+          font-size = 10;
+        }
+      '';
+      description = ''
+        Configuration written to {file}`$XDG_CONFIG_HOME/ghostty/config`.
+
+        See <https://ghostty.org/docs/config/reference> for more information.
+      '';
+    };
+
+    themes = lib.mkOption {
+      type = lib.types.attrsOf keyValue.type;
+      default = { };
+      example = {
+        catppuccin-mocha = {
+          palette = [
+            "0=#45475a"
+            "1=#f38ba8"
+            "2=#a6e3a1"
+            "3=#f9e2af"
+            "4=#89b4fa"
+            "5=#f5c2e7"
+            "6=#94e2d5"
+            "7=#bac2de"
+            "8=#585b70"
+            "9=#f38ba8"
+            "10=#a6e3a1"
+            "11=#f9e2af"
+            "12=#89b4fa"
+            "13=#f5c2e7"
+            "14=#94e2d5"
+            "15=#a6adc8"
+          ];
+          background = "1e1e2e";
+          foreground = "cdd6f4";
+          cursor-color = "f5e0dc";
+          selection-background = "353749";
+          selection-foreground = "cdd6f4";
+        };
+      };
+      description = ''
+        Custom themes written to {file}`$XDG_CONFIG_HOME/ghostty/themes`.
+
+        See <https://ghostty.org/docs/features/theme#authoring-a-custom-theme> for more information.
+      '';
+    };
+
+    clearDefaultKeybinds = lib.mkEnableOption "" // {
+      description = "Whether to clear default keybinds.";
+    };
+
+    installVimSyntax =
+      lib.mkEnableOption "installation of Ghostty configuration syntax for Vim";
+
+    installBatSyntax =
+      lib.mkEnableOption "installation of Ghostty configuration syntax for bat"
+      // {
+        default = true;
+      };
+
+    enableBashIntegration = lib.mkEnableOption ''
+      bash shell integration.
+
+      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
+      But it is not needed to have shell integration.
+      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
+    '';
+
+    enableFishIntegration = lib.mkEnableOption ''
+      fish shell integration.
+
+      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
+      But it is not needed to have shell integration.
+      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
+    '';
+
+    enableZshIntegration = lib.mkEnableOption ''
+      zsh shell integration.
+
+      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
+      But it is not needed to have shell integration.
+      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
+    '';
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      home.packages = [ cfg.package ];
+
+      programs.ghostty.settings = lib.mkIf cfg.clearDefaultKeybinds {
+        keybind = lib.mkBefore [ "clear" ];
+      };
+
+      # MacOS also supports XDG configuration directory, so we use it for both
+      # Linux and macOS to reduce complexity
+      xdg.configFile = lib.mkMerge [
+        {
+          "ghostty/config" = lib.mkIf (cfg.settings != { }) {
+            source = keyValue.generate "ghostty-config" cfg.settings;
+          };
+        }
+
+        (lib.mkIf (cfg.themes != { }) (lib.mapAttrs' (name: value: {
+          name = "ghostty/themes/${name}";
+          value.source = keyValue.generate "ghostty-${name}-theme" value;
+        }) cfg.themes))
+      ];
+    }
+
+    (lib.mkIf cfg.installVimSyntax {
+      programs.vim.plugins = [ cfg.package.vim ];
+    })
+
+    (lib.mkIf cfg.installBatSyntax {
+      programs.bat = {
+        syntaxes.ghostty = {
+          src = cfg.package;
+          file = "share/bat/syntaxes/ghostty.sublime-syntax";
+        };
+        config.map-syntax = [ "*/ghostty/config:Ghostty Config" ];
+      };
+    })
+
+    (lib.mkIf cfg.enableBashIntegration {
+      # Make order 101 to be placed exactly after bash completions, as Ghostty
+      # documentation suggests sourcing the script as soon as possible
+      programs.bash.initExtra = lib.mkOrder 101 ''
+        if [[ -n "''${GHOSTTY_RESOURCES_DIR}" ]]; then
+          builtin source "''${GHOSTTY_RESOURCES_DIR}/shell-integration/bash/ghostty.bash"
+        fi
+      '';
+    })
+
+    (lib.mkIf cfg.enableFishIntegration {
+      programs.fish.shellInit = ''
+        if set -q GHOSTTY_RESOURCES_DIR
+          source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
+        end
+      '';
+    })
+
+    (lib.mkIf cfg.enableZshIntegration {
+      programs.zsh.initExtra = ''
+        if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
+          source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
+        fi
+      '';
+    })
+  ]);
+}
diff --git a/tests/default.nix b/tests/default.nix
index 68474f222..3530138da 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -79,6 +79,7 @@ in import nmtSrc {
     ./modules/programs/gallery-dl
     ./modules/programs/gh
     ./modules/programs/gh-dash
+    ./modules/programs/ghostty
     ./modules/programs/git
     ./modules/programs/git-cliff
     ./modules/programs/git-credential-oauth
diff --git a/tests/modules/programs/ghostty/default.nix b/tests/modules/programs/ghostty/default.nix
new file mode 100644
index 000000000..e9db62d51
--- /dev/null
+++ b/tests/modules/programs/ghostty/default.nix
@@ -0,0 +1,5 @@
+{
+  ghostty-example-settings = ./example-settings.nix;
+  ghostty-empty-settings = ./empty-settings.nix;
+  ghostty-example-theme = ./example-theme.nix;
+}
diff --git a/tests/modules/programs/ghostty/empty-settings.nix b/tests/modules/programs/ghostty/empty-settings.nix
new file mode 100644
index 000000000..4e5e83e8d
--- /dev/null
+++ b/tests/modules/programs/ghostty/empty-settings.nix
@@ -0,0 +1,7 @@
+{
+  programs.ghostty.enable = true;
+  test.stubs.ghostty = { };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/ghostty/config
+  '';
+}
diff --git a/tests/modules/programs/ghostty/example-config-expected b/tests/modules/programs/ghostty/example-config-expected
new file mode 100644
index 000000000..8f52b6313
--- /dev/null
+++ b/tests/modules/programs/ghostty/example-config-expected
@@ -0,0 +1,2 @@
+font-size = 10
+theme = catppuccin-mocha
diff --git a/tests/modules/programs/ghostty/example-settings.nix b/tests/modules/programs/ghostty/example-settings.nix
new file mode 100644
index 000000000..ea48122d2
--- /dev/null
+++ b/tests/modules/programs/ghostty/example-settings.nix
@@ -0,0 +1,17 @@
+{ config, ... }: {
+  programs.ghostty = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+
+    settings = {
+      theme = "catppuccin-mocha";
+      font-size = 10;
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/ghostty/config \
+      ${./example-config-expected}
+  '';
+}
diff --git a/tests/modules/programs/ghostty/example-theme-expected b/tests/modules/programs/ghostty/example-theme-expected
new file mode 100644
index 000000000..8644b1323
--- /dev/null
+++ b/tests/modules/programs/ghostty/example-theme-expected
@@ -0,0 +1,21 @@
+background = 1e1e2e
+cursor-color = f5e0dc
+foreground = cdd6f4
+palette = 0=#45475a
+palette = 1=#f38ba8
+palette = 2=#a6e3a1
+palette = 3=#f9e2af
+palette = 4=#89b4fa
+palette = 5=#f5c2e7
+palette = 6=#94e2d5
+palette = 7=#bac2de
+palette = 8=#585b70
+palette = 9=#f38ba8
+palette = 10=#a6e3a1
+palette = 11=#f9e2af
+palette = 12=#89b4fa
+palette = 13=#f5c2e7
+palette = 14=#94e2d5
+palette = 15=#a6adc8
+selection-background = 353749
+selection-foreground = cdd6f4
diff --git a/tests/modules/programs/ghostty/example-theme.nix b/tests/modules/programs/ghostty/example-theme.nix
new file mode 100644
index 000000000..b4d211595
--- /dev/null
+++ b/tests/modules/programs/ghostty/example-theme.nix
@@ -0,0 +1,40 @@
+{ config, ... }: {
+  programs.ghostty = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+
+    themes = {
+      catppuccin-mocha = {
+        palette = [
+          "0=#45475a"
+          "1=#f38ba8"
+          "2=#a6e3a1"
+          "3=#f9e2af"
+          "4=#89b4fa"
+          "5=#f5c2e7"
+          "6=#94e2d5"
+          "7=#bac2de"
+          "8=#585b70"
+          "9=#f38ba8"
+          "10=#a6e3a1"
+          "11=#f9e2af"
+          "12=#89b4fa"
+          "13=#f5c2e7"
+          "14=#94e2d5"
+          "15=#a6adc8"
+        ];
+        background = "1e1e2e";
+        foreground = "cdd6f4";
+        cursor-color = "f5e0dc";
+        selection-background = "353749";
+        selection-foreground = "cdd6f4";
+      };
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/ghostty/themes/catppuccin-mocha \
+      ${./example-theme-expected}
+  '';
+}

From f4f8d09f909b4ef34afd9bad2284042d307bc95f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 3 Jan 2025 10:56:26 +0100
Subject: [PATCH 190/546] home-manager: update copyright year

---
 LICENSE             | 2 +-
 docs/home-manager.1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5a9b130ab..78b5f88cd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2023 Home Manager contributors
+Copyright (c) 2017-2025 Home Manager contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/home-manager.1 b/docs/home-manager.1
index 41406aca0..46ee43033 100644
--- a/docs/home-manager.1
+++ b/docs/home-manager.1
@@ -396,5 +396,5 @@ Author.
 
 .Sh COPYRIGHT
 .br
-Copyright \(co 2017\(en2022 Home Manager contributors
+Copyright \(co 2017\(en2025 Home Manager contributors
 .br

From 1e2a9d2d29216f3512e6a02905b4f88f11bf5d0e Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Fri, 3 Jan 2025 11:22:01 +0100
Subject: [PATCH 191/546] format: ignore system and user git config

This can cause failures if the user has configuration that is
incompatible with the version of git pinned in the format script.

Potentially it could have other undesired effects as well.

Fix #5736
---
 format | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/format b/format
index 4f46c7b9e..2eb16d9af 100755
--- a/format
+++ b/format
@@ -1,6 +1,11 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/6616de389ed55fba6eeba60377fc04732d5a207c.tar.gz -i bash -p git gnugrep gnused findutils nixfmt
 
+# Avoid being affected by system and user git config.
+export GIT_CONFIG_NOSYSTEM=1
+export HOME=
+export XDG_CONFIG_HOME=
+
 nixfmt_args=()
 files=()
 

From 1e68dc759b3b3e0dc56589ecd3e58c3699ff9b27 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 28 Dec 2024 23:46:50 +0100
Subject: [PATCH 192/546] home-manager: move profile management

This commit separates profile management (setting profile and creating
GC root) from file management (removing and adding managed files
within the user's home directory).

This is a step towards deprecating profile management within the
activation script, instead relying on the caller of the activation
script managing the profile.
---
 home-manager/po/home-manager.pot              | 76 +++++++++----------
 modules/files.nix                             | 27 +------
 modules/home-environment.nix                  | 27 ++++++-
 modules/lib-bash/activation-init.sh           | 35 ++-------
 modules/po/hm-modules.pot                     | 54 +++++--------
 tests/integration/standalone/flake-basics.nix |  6 ++
 6 files changed, 92 insertions(+), 133 deletions(-)

diff --git a/home-manager/po/home-manager.pot b/home-manager/po/home-manager.pot
index 2fcdc5a60..6817fd554 100644
--- a/home-manager/po/home-manager.pot
+++ b/home-manager/po/home-manager.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,36 +23,36 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr ""
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -73,42 +73,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr ""
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr ""
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -119,7 +119,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -129,11 +129,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -143,72 +143,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr ""
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr ""
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr ""
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr ""
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/modules/files.nix b/modules/files.nix
index 59e9c2578..8c047bbeb 100644
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -105,10 +105,7 @@ in
     # 1. Remove files from the old generation that are not in the new
     #    generation.
     #
-    # 2. Switch over the Home Manager gcroot and current profile
-    #    links.
-    #
-    # 3. Symlink files from the new generation into $HOME.
+    # 2. Symlink files from the new generation into $HOME.
     #
     # This order is needed to ensure that we always know which links
     # belong to which generation. Specifically, if we're moving from
@@ -215,28 +212,6 @@ in
           }
 
           cleanOldGen
-
-          if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then
-            _i "Creating profile generation %s" $newGenNum
-            if [[ -e "$genProfilePath"/manifest.json ]] ; then
-              # Remove all packages from "$genProfilePath"
-              # `nix profile remove '.*' --profile "$genProfilePath"` was not working, so here is a workaround:
-              nix profile list --profile "$genProfilePath" \
-                | cut -d ' ' -f 4 \
-                | xargs -rt $DRY_RUN_CMD nix profile remove $VERBOSE_ARG --profile "$genProfilePath"
-              run nix profile install $VERBOSE_ARG --profile "$genProfilePath" "$newGenPath"
-            else
-              run nix-env $VERBOSE_ARG --profile "$genProfilePath" --set "$newGenPath"
-            fi
-
-            run --quiet nix-store --realise "$newGenPath" --add-root "$newGenGcPath" --indirect
-            if [[ -e "$legacyGenGcPath" ]]; then
-              run rm $VERBOSE_ARG "$legacyGenGcPath"
-            fi
-          else
-            _i "No change so reusing latest profile generation %s" "$oldGenNum"
-          fi
-
           linkNewGen
         ''
     );
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 2673d1711..fffb3b1cf 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -583,9 +583,17 @@ in
 
     home.packages = [ config.home.sessionVariablesPackage ];
 
-    # A dummy entry acting as a boundary between the activation
-    # script's "check" and the "write" phases.
-    home.activation.writeBoundary = hm.dag.entryAnywhere "";
+    # The entry acting as a boundary between the activation script's "check" and
+    # the "write" phases. This is where we commit to attempting to actually
+    # activate the configuration.
+    home.activation.writeBoundary = hm.dag.entryAnywhere ''
+      if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then
+        _i "Creating new profile generation"
+        run nix-env $VERBOSE_ARG --profile "$genProfilePath" --set "$newGenPath"
+      else
+        _i "No change so reusing latest profile generation"
+      fi
+    '';
 
     # Install packages to the user environment.
     #
@@ -718,7 +726,20 @@ in
             checkHomeDirectory ${escapeShellArg config.home.homeDirectory}
           fi
 
+          # Create a temporary GC root to prevent collection during activation.
+          trap 'run rm -f $VERBOSE_ARG "$newGenGcPath"' EXIT
+          run --silence nix-store --realise "$newGenPath" --add-root "$newGenGcPath"
+
           ${activationCmds}
+
+          ${optionalString (!config.uninstall) ''
+            # Create the "current generation" GC root.
+            run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath"
+
+            if [[ -e "$legacyGenGcPath" ]]; then
+              run rm $VERBOSE_ARG "$legacyGenGcPath"
+            fi
+          ''}
         '';
       in
         pkgs.runCommand
diff --git a/modules/lib-bash/activation-init.sh b/modules/lib-bash/activation-init.sh
index 91111e5d0..b16d8741b 100755
--- a/modules/lib-bash/activation-init.sh
+++ b/modules/lib-bash/activation-init.sh
@@ -59,34 +59,13 @@ function setupVars() {
     declare -gr hmDataPath="${XDG_DATA_HOME:-$HOME/.local/share}/home-manager"
     declare -gr genProfilePath="$profilesDir/home-manager"
     declare -gr newGenPath="@GENERATION_DIR@";
-    declare -gr newGenGcPath="$hmGcrootsDir/current-home"
+    declare -gr newGenGcPath="$hmGcrootsDir/new-home"
+    declare -gr currentGenGcPath="$hmGcrootsDir/current-home"
     declare -gr legacyGenGcPath="$globalGcrootsDir/current-home"
 
-    declare greatestGenNum
-    greatestGenNum=$( \
-        nix-env --list-generations --profile "$genProfilePath" \
-            | tail -1 \
-            | sed -E 's/ *([[:digit:]]+) .*/\1/')
-
-    if [[ -n $greatestGenNum ]] ; then
-        declare -gr oldGenNum=$greatestGenNum
-        declare -gr newGenNum=$((oldGenNum + 1))
-    else
-        declare -gr newGenNum=1
-    fi
-
-    if [[ -e $genProfilePath ]] ; then
+    if [[ -e $currentGenGcPath ]] ; then
         declare -g oldGenPath
-        oldGenPath="$(readlink -e "$genProfilePath")"
-    fi
-
-    _iVerbose "Sanity checking oldGenNum and oldGenPath"
-    if [[ -v oldGenNum && ! -v oldGenPath
-            || ! -v oldGenNum && -v oldGenPath ]]; then
-        _i $'The previous generation number and path are in conflict! These\nmust be either both empty or both set but are now set to\n\n    \'%s\' and \'%s\'\n\nIf you don\'t mind losing previous profile generations then\nthe easiest solution is probably to run\n\n   rm %s/home-manager*\n   rm %s/current-home\n\nand trying home-manager switch again. Good luck!' \
-           "${oldGenNum:-}" "${oldGenPath:-}" \
-           "$profilesDir" "$hmGcrootsDir"
-        exit 1
+        oldGenPath="$(readlink -e "$currentGenGcPath")"
     fi
 }
 
@@ -181,15 +160,13 @@ if [[ -v VERBOSE ]]; then
 fi
 
 _iVerbose "Activation variables:"
-if [[ -v oldGenNum ]] ; then
-    verboseEcho "  oldGenNum=$oldGenNum"
+if [[ -v oldGenPath ]] ; then
     verboseEcho "  oldGenPath=$oldGenPath"
 else
-    verboseEcho "  oldGenNum undefined (first run?)"
     verboseEcho "  oldGenPath undefined (first run?)"
 fi
 verboseEcho "  newGenPath=$newGenPath"
-verboseEcho "  newGenNum=$newGenNum"
 verboseEcho "  genProfilePath=$genProfilePath"
 verboseEcho "  newGenGcPath=$newGenGcPath"
+verboseEcho "  currentGenGcPath=$currentGenGcPath"
 verboseEcho "  legacyGenGcPath=$legacyGenGcPath"
diff --git a/modules/po/hm-modules.pot b/modules/po/hm-modules.pot
index 7a33a805a..174fb3eb7 100644
--- a/modules/po/hm-modules.pot
+++ b/modules/po/hm-modules.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -49,7 +49,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -61,54 +61,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/tests/integration/standalone/flake-basics.nix b/tests/integration/standalone/flake-basics.nix
index 4ce95997c..01f6571c7 100644
--- a/tests/integration/standalone/flake-basics.nix
+++ b/tests/integration/standalone/flake-basics.nix
@@ -49,6 +49,12 @@
     # Create a persistent login so that Alice has a systemd session.
     login_as_alice()
 
+    # Make sure that Alice has a "nix profile" compatible profile.
+    if True:
+      succeed_as_alice("nix profile install nixpkgs#cowsay")
+      result = succeed_as_alice("cowsay Hello")
+      machine.log(f"\n{result}")
+
     with subtest("Home Manager installation"):
       succeed_as_alice("nix run home-manager -- init --home-manager-url home-manager --nixpkgs-url nixpkgs --switch")
 

From a6f37e5785a5057ab43b4f5a64c590dcc709f043 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Fri, 3 Jan 2025 07:26:00 -0300
Subject: [PATCH 193/546] ghostty: fix configuration for bat syntax

---
 modules/programs/ghostty.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 026f89dcd..b2c147cc1 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -140,7 +140,8 @@ in {
           src = cfg.package;
           file = "share/bat/syntaxes/ghostty.sublime-syntax";
         };
-        config.map-syntax = [ "*/ghostty/config:Ghostty Config" ];
+        config.map-syntax =
+          [ "${config.xdg.configHome}/ghostty/config:Ghostty Config" ];
       };
     })
 

From 7f16e9c3cb00ca6df680917ab37ebf00177a19e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=AE=A4=E0=AE=AE=E0=AE=BF=E0=AE=B4=E0=AF=8D=E0=AE=A8?=
 =?UTF-8?q?=E0=AF=87=E0=AE=B0=E0=AE=AE=E0=AF=8D?= <anishprabu.t@gmail.com>
Date: Fri, 3 Jan 2025 11:25:39 +0100
Subject: [PATCH 194/546] Translate using Weblate (Tamil)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (37 of 37 strings)

Add translation using Weblate (Tamil)

Co-authored-by: தமிழ்நேரம் <anishprabu.t@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/ta/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/ta.po | 259 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 259 insertions(+)
 create mode 100644 home-manager/po/ta.po

diff --git a/home-manager/po/ta.po b/home-manager/po/ta.po
new file mode 100644
index 000000000..215641354
--- /dev/null
+++ b/home-manager/po/ta.po
@@ -0,0 +1,259 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"PO-Revision-Date: 2025-01-03 08:16+0000\n"
+"Last-Translator: தமிழ்நேரம் <anishprabu.t@gmail.com>\n"
+"Language-Team: Tamil <https://hosted.weblate.org/projects/home-manager/cli/"
+"ta/>\n"
+"Language: ta\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.10-dev\n"
+
+#. translators: For example: "home-manager: missing argument for --cores"
+#: home-manager/home-manager:16
+msgid "%s: missing argument for %s"
+msgstr "%s: %s காணவில்லை"
+
+#: home-manager/home-manager:64
+msgid "No configuration file found at %s"
+msgstr "%s இல் உள்ளமைவு கோப்பு இல்லை"
+
+#. translators: The first '%s' specifier will be replaced by either
+#. 'home.nix' or 'flake.nix'.
+#: home-manager/home-manager:81 home-manager/home-manager:85
+#: home-manager/home-manager:184
+msgid ""
+"Keeping your Home Manager %s in %s is deprecated,\n"
+"please move it to %s"
+msgstr ""
+"உங்கள் வீட்டு மேலாளரை %s %s இல் வைத்திருப்பது நீக்கப்பட்டது,\n"
+" தயவுசெய்து அதை %s க்கு நகர்த்தவும்"
+
+#: home-manager/home-manager:92
+msgid "No configuration file found. Please create one at %s"
+msgstr ""
+"உள்ளமைவு கோப்பு எதுவும் கிடைக்கவில்லை. தயவுசெய்து ஒன்றை %s இல் உருவாக்கவும்"
+
+#: home-manager/home-manager:107
+msgid "Home Manager not found at %s."
+msgstr "வீட்டு மேலாளர் %s இல் காணப்படவில்லை."
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:115
+msgid ""
+"The fallback Home Manager path %s has been deprecated and a file/directory "
+"was found there."
+msgstr ""
+"குறைவடையும் வீட்டு மேலாளர் பாதை %s நீக்கப்பட்டு, ஒரு கோப்பு/அடைவு அங்கு காணப்பட்டது."
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:118
+msgid ""
+"To remove this warning, do one of the following.\n"
+"\n"
+"1. Explicitly tell Home Manager to use the path, for example by adding\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   to your configuration.\n"
+"\n"
+"   If you import Home Manager directly, you can use the `path` parameter\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   when calling the Home Manager package.\n"
+"\n"
+"2. Remove the deprecated path.\n"
+"\n"
+"     $ rm -r \"%s\""
+msgstr ""
+"இந்த எச்சரிக்கையை அகற்ற, பின்வருவனவற்றில் ஒன்றைச் செய்யுங்கள்.\n"
+"\n"
+" 1. ஓம் மேனேசரை பாதையை பயன்படுத்துமாறு வெளிப்படையாகச் சொல்லுங்கள், எடுத்துக்காட்டாக "
+"சேர்ப்பதன் மூலம்\n"
+"\n"
+" {programs.home-manager.path = \"%s\"; }\n"
+"\n"
+" உங்கள் உள்ளமைவுக்கு.\n"
+"\n"
+" நீங்கள் வீட்டு மேலாளரை நேரடியாக இறக்குமதி செய்தால், நீங்கள் `பாதை` அளவுருவைப் "
+"பயன்படுத்தலாம்\n"
+"\n"
+" pkgs.callpackage/path/to/home-manager- பேக்கேச் {பாதை = \"%s\"; }\n"
+"\n"
+" வீட்டு மேலாளர் தொகுப்பை அழைக்கும் போது.\n"
+"\n"
+" 2. நீக்கப்பட்ட பாதையை அகற்று.\n"
+"\n"
+" $ rm -r \"%s\""
+
+#: home-manager/home-manager:146
+msgid "Sanity checking Nix"
+msgstr "நல்லறிவு சோதனை நிக்ச்"
+
+#: home-manager/home-manager:166
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+"பொருத்தமான சுயவிவர கோப்பகத்தைக் கண்டுபிடிக்க முடியவில்லை, முயற்சித்த %s மற்றும் %s"
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:221
+msgid "Can't inspect options of a flake configuration"
+msgstr "ஒரு ஃப்ளேக் உள்ளமைவின் விருப்பங்களை ஆய்வு செய்ய முடியாது"
+
+#: home-manager/home-manager:296 home-manager/home-manager:319
+#: home-manager/home-manager:1051
+msgid "%s: unknown option '%s'"
+msgstr "%s: அறியப்படாத விருப்பம் '%s'"
+
+#: home-manager/home-manager:301 home-manager/home-manager:1052
+msgid "Run '%s --help' for usage help"
+msgstr "பயன்பாட்டு உதவிக்காக '%s - -help' ஐ இயக்கவும்"
+
+#: home-manager/home-manager:327 home-manager/home-manager:431
+msgid "The file %s already exists, leaving it unchanged..."
+msgstr "%s ஏற்கனவே உள்ளது, அதை மாற்றாமல் விட்டுவிடுகிறது ..."
+
+#: home-manager/home-manager:329 home-manager/home-manager:433
+msgid "Creating %s..."
+msgstr "%s ஐ உருவாக்குதல் ..."
+
+#: home-manager/home-manager:475
+msgid "Creating initial Home Manager generation..."
+msgstr "ஆரம்ப வீட்டு மேலாளர் தலைமுறையை உருவாக்குதல் ..."
+
+#. translators: The "%s" specifier will be replaced by a file path.
+#: home-manager/home-manager:480
+msgid ""
+"All done! The home-manager tool should now be installed and you can edit\n"
+"\n"
+"    %s\n"
+"\n"
+"to configure Home Manager. Run 'man home-configuration.nix' to\n"
+"see all available options."
+msgstr ""
+"எல்லாம் முடிந்தது! வீட்டு மேலாளர் கருவி இப்போது நிறுவப்பட வேண்டும், நீங்கள் திருத்தலாம்\n"
+"\n"
+" %s\n"
+"\n"
+" வீட்டு மேலாளரை உள்ளமைக்க. 'மேன் ஓம்-கான்ஃபிகரேசன்.நிக்ச்' ஐ இயக்கவும்\n"
+" கிடைக்கக்கூடிய அனைத்து விருப்பங்களையும் காண்க."
+
+#. translators: The "%s" specifier will be replaced by a URL.
+#: home-manager/home-manager:485
+msgid ""
+"Uh oh, the installation failed! Please create an issue at\n"
+"\n"
+"    %s\n"
+"\n"
+"if the error seems to be the fault of Home Manager."
+msgstr ""
+"ஓ, நிறுவல் தோல்வியடைந்தது! தயவுசெய்து ஒரு சிக்கலை உருவாக்கவும்\n"
+"\n"
+" %s\n"
+"\n"
+" பிழை வீட்டு மேலாளரின் தவறு என்று தோன்றினால்."
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:496
+msgid "Can't instantiate a flake configuration"
+msgstr "ஒரு ஃப்ளேக் உள்ளமைவை உடனடிப்படுத்த முடியாது"
+
+#: home-manager/home-manager:572
+msgid ""
+"There is %d unread and relevant news item.\n"
+"Read it by running the command \"%s news\"."
+msgid_plural ""
+"There are %d unread and relevant news items.\n"
+"Read them by running the command \"%s news\"."
+msgstr[0] ""
+"%d படிக்காத மற்றும் பொருத்தமான செய்திகள் உள்ளன.\n"
+" \"%s செய்திகள்\" என்ற கட்டளையை இயக்குவதன் மூலம் அதைப் படியுங்கள்."
+msgstr[1] ""
+"%d படிக்காத மற்றும் தொடர்புடைய செய்திகள் உள்ளன.\n"
+" \"%s செய்திகள்\" என்ற கட்டளையை இயக்குவதன் மூலம் அவற்றைப் படியுங்கள்."
+
+#: home-manager/home-manager:586
+msgid "Unknown \"news.display\" setting \"%s\"."
+msgstr "தெரியாத \"News.Display\" அமைப்புகள் \"."
+
+#: home-manager/home-manager:594
+#, sh-format
+msgid "Please set the $EDITOR or $VISUAL environment variable"
+msgstr "$ எடிட்டர் அல்லது $ விசுவல் சூழல் மாறியை அமைக்கவும்"
+
+#: home-manager/home-manager:612
+msgid "Cannot run build in read-only directory"
+msgstr "படிக்க மட்டும் கோப்பகத்தில் கட்டமைக்க முடியாது"
+
+#: home-manager/home-manager:693
+msgid "No generation with ID %s"
+msgstr "ஐடி %s கொண்ட தலைமுறை இல்லை"
+
+#: home-manager/home-manager:695
+msgid "Cannot remove the current generation %s"
+msgstr "தற்போதைய தலைமுறை %s ஐ அகற்ற முடியாது"
+
+#: home-manager/home-manager:697
+msgid "Removing generation %s"
+msgstr "தலைமுறை %s நீக்குதல்"
+
+#: home-manager/home-manager:718
+msgid "No generations to expire"
+msgstr "காலாவதியாகும் தலைமுறைகள் இல்லை"
+
+#: home-manager/home-manager:729
+msgid "No home-manager packages seem to be installed."
+msgstr "வீட்டு மேலாளர் தொகுப்புகள் எதுவும் நிறுவப்படவில்லை."
+
+#: home-manager/home-manager:811
+msgid "Unknown argument %s"
+msgstr "தெரியாத உரையாடல் %s"
+
+#: home-manager/home-manager:835
+msgid "This will remove Home Manager from your system."
+msgstr "இது உங்கள் கணினியிலிருந்து வீட்டு மேலாளரை அகற்றும்."
+
+#: home-manager/home-manager:838
+msgid "This is a dry run, nothing will actually be uninstalled."
+msgstr "இது உலர்ந்த ரன், உண்மையில் எதுவும் நிறுவல் நீக்கப்படாது."
+
+#: home-manager/home-manager:842
+msgid "Really uninstall Home Manager?"
+msgstr "உண்மையில் வீட்டு மேலாளரை நிறுவல் நீக்கவா?"
+
+#: home-manager/home-manager:848
+msgid "Switching to empty Home Manager configuration..."
+msgstr "வெற்று வீட்டு மேலாளர் உள்ளமைவுக்கு மாறுதல் ..."
+
+#: home-manager/home-manager:863
+msgid "Yay!"
+msgstr "ஆம்!"
+
+#: home-manager/home-manager:868
+msgid "Home Manager is uninstalled but your home.nix is left untouched."
+msgstr ""
+"வீட்டு மேலாளர் நிறுவல் நீக்கப்பட்டார், ஆனால் உங்கள் வீடு. நிக்ச் தீண்டப்படாமல் விடப்பட்டுள்ளது."
+
+#: home-manager/home-manager:1091
+msgid "expire-generations expects one argument, got %d."
+msgstr "காலாவதியாகும் ஒரு வாதத்தை எதிர்பார்க்கிறது, %d கிடைத்தது."
+
+#: home-manager/home-manager:1113
+msgid "Unknown command: %s"
+msgstr "தெரியாத கட்டளை: %s"
+
+#: home-manager/install.nix:18
+msgid "This derivation is not buildable, please run it using nix-shell."
+msgstr ""
+"இந்த வழித்தோன்றல் கட்டமைக்கப்படவில்லை, தயவுசெய்து அதை நிக்ச்-செல் பயன்படுத்தி இயக்கவும்."

From 12327fc3d83ee6c3f39b1b8852d9139fa4d2a176 Mon Sep 17 00:00:00 2001
From: Languages add-on <noreply-addon-languages@weblate.org>
Date: Fri, 3 Jan 2025 11:25:39 +0100
Subject: [PATCH 195/546] Add translation using Weblate (Tamil)

Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>
---
 modules/po/ta.po | 113 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 modules/po/ta.po

diff --git a/modules/po/ta.po b/modules/po/ta.po
new file mode 100644
index 000000000..40fcfc40e
--- /dev/null
+++ b/modules/po/ta.po
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager Modules package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager Modules\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ta\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: modules/files.nix:191
+msgid "Creating home file links in %s"
+msgstr ""
+
+#: modules/files.nix:204
+msgid "Cleaning up orphan links from %s"
+msgstr ""
+
+#: modules/files.nix:220
+msgid "Creating profile generation %s"
+msgstr ""
+
+#: modules/files.nix:237
+msgid "No change so reusing latest profile generation %s"
+msgstr ""
+
+#: modules/home-environment.nix:634
+msgid ""
+"Oops, Nix failed to install your new Home Manager profile!\n"
+"\n"
+"Perhaps there is a conflict with a package that was installed using\n"
+"\"%s\"? Try running\n"
+"\n"
+"    %s\n"
+"\n"
+"and if there is a conflicting package you can remove it with\n"
+"\n"
+"    %s\n"
+"\n"
+"Then try activating your Home Manager configuration again."
+msgstr ""
+
+#: modules/home-environment.nix:667
+msgid "Activating %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:22
+msgid "Migrating profile from %s to %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:54
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:83
+msgid "Sanity checking oldGenNum and oldGenPath"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:86
+msgid ""
+"The previous generation number and path are in conflict! These\n"
+"must be either both empty or both set but are now set to\n"
+"\n"
+"    '%s' and '%s'\n"
+"\n"
+"If you don't mind losing previous profile generations then\n"
+"the easiest solution is probably to run\n"
+"\n"
+"   rm %s/home-manager*\n"
+"   rm %s/current-home\n"
+"\n"
+"and trying home-manager switch again. Good luck!"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:127
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:136
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:153
+msgid "Starting Home Manager activation"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:157
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:170
+msgid "This is a dry run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:174
+msgid "This is a live run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:180
+msgid "Using Nix version: %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:183
+msgid "Activation variables:"
+msgstr ""

From 7254063d529d666f10d73ce3fe5756d6c325ddc3 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 3 Jan 2025 11:25:39 +0100
Subject: [PATCH 196/546] Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/
Translation: Home Manager/Home Manager CLI
Translation: Home Manager/Home Manager Modules
---
 home-manager/po/ar.po      |  76 ++++++++++++-------------
 home-manager/po/ca.po      |  76 ++++++++++++-------------
 home-manager/po/cs.po      |  76 ++++++++++++-------------
 home-manager/po/da.po      |  76 ++++++++++++-------------
 home-manager/po/de.po      |  76 ++++++++++++-------------
 home-manager/po/es.po      |  76 ++++++++++++-------------
 home-manager/po/fa.po      |  80 +++++++++++++-------------
 home-manager/po/fi.po      |  76 ++++++++++++-------------
 home-manager/po/fr.po      |  76 ++++++++++++-------------
 home-manager/po/hi.po      |  76 ++++++++++++-------------
 home-manager/po/hu.po      |  76 ++++++++++++-------------
 home-manager/po/id.po      |  76 ++++++++++++-------------
 home-manager/po/is.po      |  76 ++++++++++++-------------
 home-manager/po/it.po      |  76 ++++++++++++-------------
 home-manager/po/ja.po      |  85 +++++++++++++--------------
 home-manager/po/ko.po      |  76 ++++++++++++-------------
 home-manager/po/lt.po      |  84 +++++++++++++--------------
 home-manager/po/nb_NO.po   |  76 ++++++++++++-------------
 home-manager/po/nl.po      |  76 ++++++++++++-------------
 home-manager/po/pl.po      |  76 ++++++++++++-------------
 home-manager/po/pt.po      |  76 ++++++++++++-------------
 home-manager/po/pt_BR.po   |  80 +++++++++++++-------------
 home-manager/po/ro.po      |  76 ++++++++++++-------------
 home-manager/po/ru.po      |  76 ++++++++++++-------------
 home-manager/po/sv.po      |  76 ++++++++++++-------------
 home-manager/po/ta.po      |  79 +++++++++++++------------
 home-manager/po/th.po      |  76 ++++++++++++-------------
 home-manager/po/tr.po      |  76 ++++++++++++-------------
 home-manager/po/uk.po      |  76 ++++++++++++-------------
 home-manager/po/vi.po      |  76 ++++++++++++-------------
 home-manager/po/zh_Hans.po |  76 ++++++++++++-------------
 home-manager/po/zh_Hant.po |  76 ++++++++++++-------------
 modules/po/ar.po           |  54 ++++++------------
 modules/po/ca.po           | 106 +++++++++++++++++-----------------
 modules/po/cs.po           | 106 +++++++++++++++++-----------------
 modules/po/da.po           | 106 +++++++++++++++++-----------------
 modules/po/de.po           | 106 +++++++++++++++++-----------------
 modules/po/es.po           | 109 ++++++++++++++++++-----------------
 modules/po/fa.po           |  54 ++++++------------
 modules/po/fi.po           |  95 +++++++++++++++----------------
 modules/po/fr.po           | 110 ++++++++++++++++++-----------------
 modules/po/hi.po           |  54 ++++++------------
 modules/po/hu.po           |  64 ++++++++-------------
 modules/po/id.po           |  69 ++++++++++------------
 modules/po/is.po           |  54 ++++++------------
 modules/po/it.po           | 109 ++++++++++++++++++-----------------
 modules/po/ja.po           | 106 +++++++++++++++++-----------------
 modules/po/ko.po           | 110 ++++++++++++++++++-----------------
 modules/po/lt.po           |  64 ++++++++-------------
 modules/po/nb_NO.po        | 106 +++++++++++++++++-----------------
 modules/po/nl.po           | 108 ++++++++++++++++++-----------------
 modules/po/pl.po           | 114 +++++++++++++++++++------------------
 modules/po/pt.po           | 107 +++++++++++++++++-----------------
 modules/po/pt_BR.po        | 111 +++++++++++++++++++-----------------
 modules/po/ro.po           | 108 ++++++++++++++++++-----------------
 modules/po/ru.po           | 108 ++++++++++++++++++-----------------
 modules/po/sv.po           | 106 +++++++++++++++++-----------------
 modules/po/ta.po           |  54 ++++++------------
 modules/po/th.po           |  54 ++++++------------
 modules/po/tr.po           | 110 ++++++++++++++++++-----------------
 modules/po/uk.po           | 108 ++++++++++++++++++-----------------
 modules/po/vi.po           |  54 ++++++------------
 modules/po/zh_Hans.po      | 106 +++++++++++++++++-----------------
 modules/po/zh_Hant.po      |  67 +++++++++-------------
 64 files changed, 2624 insertions(+), 2733 deletions(-)

diff --git a/home-manager/po/ar.po b/home-manager/po/ar.po
index ea67fd5ae..87d5f12a1 100644
--- a/home-manager/po/ar.po
+++ b/home-manager/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,36 +23,36 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr ""
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -73,42 +73,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr ""
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr ""
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -119,7 +119,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -129,11 +129,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -143,72 +143,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr ""
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr ""
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr ""
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr ""
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/home-manager/po/ca.po b/home-manager/po/ca.po
index 12992995a..148a42ff9 100644
--- a/home-manager/po/ca.po
+++ b/home-manager/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-08-07 17:09+0000\n"
 "Last-Translator: Tomi Ockier <ockier1@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%: falta un argument per %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "No s'ha trobat cap fitxer de configuració a %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Mantenir el teu Home Manager %s a %s està obsolet,\n"
 "si us plau mou-lo a %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "No s'ha trobat cap fitxer de configuració. Si us plau, creeu un a %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "No s'ha trobat el Home Manager a %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "fitxer/directori allí."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -98,43 +98,43 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Comprovant Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "No s'ha pogut trobar un directori de perfils adequat, s'ha provat %s i %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "No s'han pogut inspeccionar les opcions de configuració de flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%: opció desconeguda '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Executa '%s --help' per veure l'ajuda d'ús"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "El fitxer %s ja existeix, deixant sense modificar..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Creant %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Creant generació inicial de Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -151,7 +151,7 @@ msgstr ""
 "a veure totes les opcions disponibles."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -166,11 +166,11 @@ msgstr ""
 "si l'error sembla culpa de Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "No es pot instanciar una configuració flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -184,73 +184,73 @@ msgstr[1] ""
 "Hi han %d notícies rellevants no llegides.\n"
 "Llegeix-les executant la comanda \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Configuració \"news.display\" no reconeguda \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Si us plau, defineix les variables de entorn $EDITOR o $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Impossible executar la compilació en un directori només lectura"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "No existeix la generació amb ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Impossible eliminar la generació actual %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Eliminant la generació %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "No s'han trobat generacions a expirar"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Cap paquet home-manager sembla estar instal·lat."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argument desconegut %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Home Manager serà esborrat del sistema."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Això és un simulacre, res serà realment desinstal·lat."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Estàs segur que vols desinstal·lar Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Canviant a configuració buida de Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Visca!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager ha estat desinstal·lat però el vostre home.nix es manté intacte."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations espera un argument, obtinguts %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comanda desconeguda: %s"
 
diff --git a/home-manager/po/cs.po b/home-manager/po/cs.po
index 773eb11dd..2dfb31656 100644
--- a/home-manager/po/cs.po
+++ b/home-manager/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-12-22 17:00+0000\n"
 "Last-Translator: David Chocholatý <chocholaty.david0@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: chybějící argument pro %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "V %s nebyl nalezen konfigurační soubor"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Udržovat Home Manager %s v %s je zastaralé,\n"
 "prosím přesuňte jej do %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Konfigurační soubor nenalezen. Prosím vytvořte jej v %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager nebyl nalezen v %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "adresář."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Kontrola správnosti Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nebyl nalezen vhodný adresář profilu, byly zkoušeny %s a %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Nelze ověřit parametry z konfigurace flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: neznámý parametr '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Spusťte '%s --help' pro vypsání nápovědy"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Soubor %s již existuje, ponechán beze změn..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Vytvářím %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Vytvářím první generaci Home Manageru..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -148,7 +148,7 @@ msgstr ""
 "k zobrazení všech dostupných možností."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -162,11 +162,11 @@ msgstr ""
 "    %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Nelze vytvořit instanci flake konfigurace"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,72 +183,72 @@ msgstr[2] ""
 "%d nepřečtených novinek.\n"
 "Přečtěte je pomocí příkazu \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Neznáme nastavení \"news.display\" \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Nastavte, prosím, proměnnou prostředí $EDITOR nebo $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Sestavení nelze provést v adresáři dostupném pouze pro čtení"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Generace s ID %s neexistuje"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Nelze odstranit současnou generaci %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Odstraňuji generaci %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Žádná generace k vypršení platnosti"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Žádný home-manager balíček není nainstalován."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Neznámý parametr %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Toto odstraní Home Manager z vašeho systému."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Toto zkouška na nečisto, nic nebude odinstalováno."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Opravdu odinstalovat Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Přepínám na prázdou konfiguraci Home Manageru..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Hurá!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager se odinstalovává, ale váš home.nix nebyl změněn."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations očekává jeden parametr, přítomno %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Neznámý příkaz: %s"
 
diff --git a/home-manager/po/da.po b/home-manager/po/da.po
index b05d5c231..c93e5875c 100644
--- a/home-manager/po/da.po
+++ b/home-manager/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-25 11:09+0000\n"
 "Last-Translator: DeeKahy <Lennart.Diego.Kahn@gmail.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: manglende argument for %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Ingen konfigurationsfiler fundet ved %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Det er forældet at holde Home Manager %s i %s,\n"
 "ryk den venligst til %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Ingen konfigurationsfiler fundet. Venligst lav en ved %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager blev ikke fundet ved %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "fil/mappe der."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "      $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Tjekker fornuften af Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunne ikke finde en passende profilmappe, forsøgte %s og %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Kan ikke inspicere indstillinger af en flake konfiguration"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: ukendt indstilling '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Kør '%s --help' for brugsvejledning"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Filen %s eksisterer allerede, efterlader den uændret…"
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Opretter %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Laver initial Home Manager generation..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +149,7 @@ msgstr ""
 "se alle de mulige indstillinger."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "hvis fejlen fremstår som forskyldt af Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Kan ikke instantiere en flake konfiguration"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -182,74 +182,74 @@ msgstr[1] ""
 "Der er %d ulæste og relavante nyheder.\n"
 "Læs dem ved at køre \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Ubekændt \"news.display\" indstilling \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Indstil venligst miljøvariablen $EDITOR eller $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Kan ikke bygge i en læs-kun folder"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Ingen generation med ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Kan ikke fjerne den nuværende generation %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Fjern generation %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Ingen generationer som skal udløbes"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 "Det virker ikke som om der er nogle home-manager pakker der er installeret."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Ubekendt argument %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Dette vil fjerne Home Manager fra dit system."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Dette er en tør kørsel, intet vil rent faktisk blive uinstalleret."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Virkelig uinstaller Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Skifter til tom Home Manager konfiguration..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Juhuu!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager bliver uinstalleret, men din home.nix bliver forladt uberørt."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations forventer et argument, fik %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Ubekendt kommando: %s"
 
diff --git a/home-manager/po/de.po b/home-manager/po/de.po
index dddccb375..b1e109758 100644
--- a/home-manager/po/de.po
+++ b/home-manager/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-21 18:02+0000\n"
 "Last-Translator: halbGefressen <chzi@pm.me>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: Fehlendes Argument für %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Keine Konfigurationsdatei unter %s gefunden"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Das Beibehalten Ihres Home Manager %s in %s ist veraltet.\n"
 "Bitte verschieben Sie es nach %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Keine Konfigurationsdatei gefunden. Bitte erstellen Sie eine unter %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager nicht gefunden unter %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "eine Datei/ein Verzeichnis dort gefunden."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -95,44 +95,44 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Überprüfe zur Sicherheit Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Es konnte kein passendes Profilverzeichnis gefunden werden, %s und %s wurden "
 "versucht"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Die Optionen einer Flake-Konfiguration können nicht inspiziert werden"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: unbekannte Option '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Führe '%s --help' aus, um Hilfe zur Verwendung zu erhalten"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Die Datei %s existiert bereits, sie bleibt unverändert..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Erstelle %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Erstelle initiale Home Manager Generation..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -150,7 +150,7 @@ msgstr ""
 "sehen."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +165,11 @@ msgstr ""
 "falls der Fehler auf Home Manager zurückzuführen ist."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Kann eine Flake-Konfiguration nicht instanziieren"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,73 +183,73 @@ msgstr[1] ""
 "Es gibt %d ungelesene und relevante Nachrichten.\n"
 "Lesen Sie sie, indem Sie den Befehl \"%s news\" ausführen."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Unbekannte \"news.display\" Einstellung \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Bitte definieren Sie die $EDITOR oder $VISUAL Umgebungsvariable"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Build kann nicht im schreibgeschützten Ordner ausgeführt werden"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Keine Generation mit ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Die jetzige Generation %s kann nicht entfernt werden"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Entferne Generation %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Keine ablaufenden Generationen"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Es scheint, als ob keine Home Manager Pakete installiert sind."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Unbekannte Argumente %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Dies wird Home Manager von Ihrem System entfernen."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Dies ist ein Probelauf, es wird nichts vom System deinstalliert."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Möchten Sie wirklich Home Manager deinstallieren?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Wechsle zu einer leeren Home Manager Konfiguration..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Juhu!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager ist installiert, aber Ihre home.nix Datei bleibt unberührt."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations erwartet ein Argument, hat aber %d erhalten."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Unbekannter Befehl: %s"
 
diff --git a/home-manager/po/es.po b/home-manager/po/es.po
index cafc9a0a6..b89acfdeb 100644
--- a/home-manager/po/es.po
+++ b/home-manager/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-19 17:07+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: falta argumento para %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Archivo de configuración no encontrado en %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Mantener tu Home Manager %s en %s está obsoleto,\n"
 "por favor muévalo a %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Archivo de configuración no encontrado. Por favor cree uno en %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "No se ha encontrado el Home Manager en %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "archivo/directorio allí."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,44 +96,44 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Chequeando Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "No se ha podido encontrar un directorio de perfiles adecuado, se ha probado "
 "con %s y %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "No se pudo inspeccionar las opciones de la configuración flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opción desconocida '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Ejecute '%s --help' para ver ayuda"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "El fichero %s ya existe, dejándolo sin modificar..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Creando %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Creando generación inicial de Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -150,7 +150,7 @@ msgstr ""
 "ver todas las opciones disponibles."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +165,11 @@ msgstr ""
 "si el error parecer ser culpa de Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "No se pudo instanciar una configuración flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,72 +183,72 @@ msgstr[1] ""
 "Hay %d noticias relevantes no leídas.\n"
 "Léalas ejecutando el comando \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Configuración \"news.display\" no reconocida \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Por favor, defina la variable del entorno $EDITOR o $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "No se puede ejecutar en un directorio de sólo lectura"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "No existe la generación con ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "No se pudo borrar la generación actual %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Borrando generación %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "No se encontraron generaciones para expirar"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "No se encontró ningún paquete home-manager instalado."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argumento desconocido %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Home Manager será borrado del sistema."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Este es un simulacro, nada será realmente desinstalado."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Desinstalar Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Cambiando a configuración vacía de Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Bien!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager desinstalado pero no se ha modificado home.nix."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations espera un argumento pero se dieron %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comando desconocido %s"
 
diff --git a/home-manager/po/fa.po b/home-manager/po/fa.po
index b3aceeb1a..892d372a6 100644
--- a/home-manager/po/fa.po
+++ b/home-manager/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-02 10:58+0000\n"
 "Last-Translator: Keivan <keyvan0082@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: مقدار %s یافت نشد"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "هیچ فایل تنظیماتی در %s یافت نشد"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "نگه داری %s در %s منسوخ شده است.\n"
 "لطفا آنرا به %s انتفال دهید"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "هیچ فایل تنظیماتی پیدا نشد. لطفا یک فایل در %s بسازید"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home manager در %s یافت نشد."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "این مسیر پیدا شد."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -85,8 +85,8 @@ msgstr ""
 "\n"
 "به کانفیگ خود, تعریف کنید\n"
 "\n"
-"اگر Home Manager را به طور مستقیم import کرده اید, میتوانید از پارامتر `path`"
-" استفاده کنید\n"
+"اگر Home Manager را به طور مستقیم import کرده اید, میتوانید از پارامتر "
+"`path` استفاده کنید\n"
 "\n"
 "     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "چک کردن پایداری Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "بعد از امتحان کردن %s و %s , دایرکتوری مناسب برای پروفایل یافت نشد"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "عدم امکان بررسی گزینه‌های تنظیمات Flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: آپشن مورد نظر شما یافت نشد %s"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "%s --help برای دیدن راهنمایی دستور رو به رو را اجرا کنید"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "فایل %s از قبل وجود داشته است، بدون تغییر رها شد..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "درحال ساختن %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "در حال ساخت نسخه اولیه Home Manager."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -148,7 +148,7 @@ msgstr ""
 "دستور 'man home-configuration.nix' را اجرا کنید."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "ایجاد کنید."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "عدم امکان نمونه‌سازی تنظیمات flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -182,72 +182,72 @@ msgstr[1] ""
 "%d خبر خوانده نشده وجود دارد.\n"
 "میتوانید آنها را با اجرای دستور \"%s news\" بخوانید."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "تنظیمات \"news.display\" در \"%s\" شناخته شده نیست."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "لطفا متغیر محلی $EDITOR و یا $VISUAL را تنظیم کنید"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "نمیتوان دستور build را در یک دایکتوری read-only اجرا کرد"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "هیچ نسل ای با شناسه %s یافت نشد"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "نمی‌توان نسل فعلی %s را حذف کرد"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "حذف کردن نسل %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "هیچ نسلی برای منسوخ کردن وجود ندارد"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "بنظر میاید هیچ پکیجی از home-manager نصب نشده است."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "پارامتر %s شناخته نشده است"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "این عمل Home Manager را از سیستم شما حذف میکند."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "این یک عمل آزمایشی است, قرار نیست چیزی واقعا حذف شود."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "واقعا میخواهید Home Manager را حذف کنید؟"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "در حال انتقال به تنظیمات خالی Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "ایول!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager حذف نصب شد اما home.nix شما دست نخورده باقی ماند."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations یک پارامتر نیاز دارد, اما %d پارامتر دریافت کرد"
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "دستور ناشناخته: %s"
 
diff --git a/home-manager/po/fi.po b/home-manager/po/fi.po
index 6662d35a2..fc3da135a 100644
--- a/home-manager/po/fi.po
+++ b/home-manager/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-12-03 13:00+0000\n"
 "Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: puuttuva argumentti kohteelle %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Kokoonpanotiedostoa ei löydy %s:sta"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,23 +39,23 @@ msgstr ""
 "Home Managerin %s pitäminen %s:ssa on vanhentunut.\n"
 "ole hyvä ja siirrä se %s:een"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Kokoonpanotiedostoa ei löytynyt. Luo sellainen %s:lla"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manageria ei löytynyt sijainnista %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -76,42 +76,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nixin eheys tarkistetaan"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Sopivaa profiilihakemistoa ei löytynyt, yritettiin %s ja %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Flake-konfiguraation asetuksia ei voi tarkastella"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: tuntematon vaihtoehto '%s"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Aja '%s --help' saadaksesi käyttöohjeita"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Tiedosto %s on jo olemassa, jätetään se muuttumattomaksi..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Luodaan tiedostoa %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Luodaan alkuperäistä Home Manager -generaatiota..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -122,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -132,11 +132,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Flake-konfiguraatiota ei voi luoda"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -150,73 +150,73 @@ msgstr[1] ""
 "Sinulla on %d lukematonta ja oleellista uutisartikkelia.\n"
 "Lue ne ajamalla komento \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Tuntematon asetus \"news.display\" \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Aseta $EDITOR- tai $VISUAL-ympäristömuuttujaksi"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Nykyistä generaatiota %s ei voi poistaa"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Generaatio %s poistetaan"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Näyttää siltä, ettei yhtään home-manager-pakettia ole asennettu."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Tuntematon argumentti %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Tämä poistaa Home Managerin järjestelmästäsi."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Tämä on kuivaharjoitus, mitään ei oikeasti poisteta."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Haluatko varmasti poistaa Home Managerin?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Vaihdetaan tyhjään Home Manager -konfiguraatioon..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Jes!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager on poistettu, mutta home.nix-tiedostosi jää koskemattomaksi."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
diff --git a/home-manager/po/fr.po b/home-manager/po/fr.po
index de1c061bf..9063df4ef 100644
--- a/home-manager/po/fr.po
+++ b/home-manager/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-29 18:07+0000\n"
 "Last-Translator: Michael Thomas <michaelhthomas@outlook.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s : argument manquant pour %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Aucun fichier de configuration trouvé à l'emplacement %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,18 +39,18 @@ msgstr ""
 "Garder votre Home Manager %s dans %s est obsolète,\n"
 "Veuillez le déplacer à %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 "Aucun fichier de configuration trouvé. Veuillez en créer un à l'emplacement "
 "%s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager indisponible à %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -59,7 +59,7 @@ msgstr ""
 "dossier y a été trouvé."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -95,42 +95,42 @@ msgstr ""
 "\n"
 "\t$ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Vérification de Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Impossible de trouver le dossier de profil approprié, essayé %s et %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Impossible d'inspecter les options de la configuration d'un flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s : option inconnue '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Exécuter « %s --help » pour de l'aide sur l'utilisation"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Le fichier %s existe déjà, il sera laissé inchangé..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Création de %s ..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Création de la génération initiale de Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -148,7 +148,7 @@ msgstr ""
 "essayez 'man home-configuration.nix'."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "si l'erreur semble être liée à Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Impossible d'instancier une configuration flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -182,72 +182,72 @@ msgstr[1] ""
 "Il y a %d nouveaux éléments non lus et pertinents.\n"
 "Vous pouvez les lire en exécutant la commande \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Configuration \"news.display\" inconnue \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Veuillez remplir la variable d'environnement $EDITOR ou VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Impossible de lancer une compilation dans un dossier en écriture seule"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Aucune génération avec l'ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Impossible de supprimer la génération courante %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Suppression de la génération %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Aucune génération expirée"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Aucun package home-manager ne semble être installé."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argument inconnu %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Cela va supprimer Home Manager de votre système."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "C'est un essai, rien ne sera réellement désinstallé."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Voulez-vous vraiment désinstaller Home Manager ?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Changement vers une configuration vierge de Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Yay !"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager est désinstallé mais votre home.nix reste intact."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations attend un argument, a obtenu %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
 
diff --git a/home-manager/po/hi.po b/home-manager/po/hi.po
index 3921eff11..171aebb77 100644
--- a/home-manager/po/hi.po
+++ b/home-manager/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-10-09 14:31+0000\n"
 "Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: ‌%s के लिए कोई आर्ग्यूमेंट नहीं दिया"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "%s में कोई कन्फि़गरेशन फाइल नहीं मिली"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,23 +39,23 @@ msgstr ""
 "अपने Home Manager %s को %s में रखना अप्रचलित है,\n"
 "कृपया इसे %s में स्थानांतरित करें"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "कोई कॉन्फ़िगरेशन फ़ाइल नहीं मिली। कृपया %s पर एक फ़ाइल बनाएं।"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "%s पर Home Manager नहीं मिला।"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -76,42 +76,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr ""
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr ""
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -122,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -132,11 +132,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -146,72 +146,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr ""
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr ""
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr ""
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr ""
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/home-manager/po/hu.po b/home-manager/po/hu.po
index 3cfab2551..450f01dbb 100644
--- a/home-manager/po/hu.po
+++ b/home-manager/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-09-02 17:09+0000\n"
 "Last-Translator: Ferenci Ákos <synthetace@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: hiányzó érték erre: %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nincs konfigurációs fájl itt: %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,17 +39,17 @@ msgstr ""
 "A Home Manager %s %s elérési úton való tárolása elavult. Kérem helyezze át a "
 "%s elérési úthoz"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 "Nem található konfigurációs fájl. Kérem hozza létre a fájlt a %s elérési úton"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager nem található a %s elérési úton."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -58,7 +58,7 @@ msgstr ""
 "itt."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,43 +96,43 @@ msgstr ""
 "\n"
 "      $ rm -r \"$s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nix épségének ellenőrzése"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Nem található megfelelő profil mappa, %s és %s útvonalak lettek kipróbálva."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Nem lehet a flake konfiguráció beállításait megtekinteni."
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: ismeretlen opció '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Futtasa a '%s --help' parancsot a használattal kapcsolatos segítségért"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "A fájl %s már létezik és változatlan marad..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "%s létrehozása..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Kezdeti Home Manager generáció létrehozása..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -150,7 +150,7 @@ msgstr ""
 "áttekintéséhez."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +165,11 @@ msgstr ""
 "helyen amennyiben a hiba a Home Manager miatt lépett fel."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Flake konfiguráció nem példányosítható"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,72 +183,72 @@ msgstr[1] ""
 "%d olvasatlan és releváns hírt kapott.\n"
 "Olvassa el őket a \"%s news\" futattásával."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Ismeretlen \"news.display\" opció \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Kérem állítása be az $EDITOR vagy a $VISUAL környezeti változókat."
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Build futtatása nem lehetséges csak-olvasható könyvtárban"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nem található generáció a következő ID-val: %"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "A jelenlegi generáció %s nem eltávolítható"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "%s generáció eltávolítása"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nincs lejárandó generáció"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Nem található installált Home Manager csomag"
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Ismeretlen argumentum %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Ez a művelet eltávolítja a Home Manager-t a rendszeréről."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Ez egy üres járat, semmi nem lesz valójában eltávolítva."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Biztosan eltávolítja a Home Managert-t?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Átváltás üres Home Manager konfigurációra..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Hurrá!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager eltávolítva, de a home.nix fájl érintetlenül maradt."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Ismeretlen parancs: %s"
 
diff --git a/home-manager/po/id.po b/home-manager/po/id.po
index 2dd2c14d2..72ebbd0b5 100644
--- a/home-manager/po/id.po
+++ b/home-manager/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-02-16 22:01+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/home-manager/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Tidak ada file konfigurasi yang ditemukan di %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Mempertahankan Pengelola Beranda Anda %s di %s tidak digunakan lagi,\n"
 "tolong pindahkan ke %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Tidak ada file konfigurasi yang ditemukan. Silakan buat di %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager tidak ditemukan di %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "ditemukan di sana."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -78,42 +78,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Pemeriksaan sanity Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Tidak dapat menemukan direktori profil yang sesuai, coba %s dan %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Tidak dapat memeriksa opsi konfigurasi flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opsi tidak diketahui '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Jalankan '%s --help' untuk bantuan penggunaan"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "File %s sudah ada, sehingga tidak berubah..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Membuat %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Membuat pembuatan Home Manager awal..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -124,7 +124,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -139,11 +139,11 @@ msgstr ""
 "jika error tersebut tampaknya merupakan kesalahan Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Tidak dapat membuat konfigurasi flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -154,72 +154,72 @@ msgstr[0] ""
 "Ada %d item berita yang belum dibaca dan relevan. \n"
 "Bacalah dengan menjalankan perintah \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Pengaturan \"news.display\" yang tidak diketahui \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Tidak dapat menjalankan build di direktori hanya-baca"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Tidak ada generasi dengan ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Tidak dapat menghapus %s generasi saat ini"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Menghapus generasi %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Tidak ada generasi yang kedaluwarsa"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Yey!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/home-manager/po/is.po b/home-manager/po/is.po
index 8c29d2a24..89fd51ce8 100644
--- a/home-manager/po/is.po
+++ b/home-manager/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-23 17:49+0000\n"
 "Last-Translator: Bjarki Gunnarsson <bjarkihg@gmail.com>\n"
 "Language-Team: Icelandic <https://hosted.weblate.org/projects/home-manager/"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: vantar inntak fyrir %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Engin stillingaskrá fundin í %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -40,16 +40,16 @@ msgstr ""
 "Það er úrelt að geyma Home Manager %s í %s,\n"
 "vinsamlega færðu hann í %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Engin stillingaskrá fundin. Vinsamlegast búðu hana til í %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager ekki fundinn í %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -58,7 +58,7 @@ msgstr ""
 "fundin þar."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -79,42 +79,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr ""
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr ""
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -125,7 +125,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -135,11 +135,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -149,72 +149,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr ""
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr ""
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr ""
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr ""
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/home-manager/po/it.po b/home-manager/po/it.po
index 1637a62dc..744b97d09 100644
--- a/home-manager/po/it.po
+++ b/home-manager/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-11-18 15:00+0000\n"
 "Last-Translator: Lorenzo Bevilacqua <lorenzobevilacqua02@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: argomento mancante per %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nessun file di configurazione trovato in %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Mantere il tuo Home Manger su %s su %s è obsoleto,\n"
 "si raccomanda di spostarlo su %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Nessun file di configurazione trovato. Per favore creane uno in %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager non è stato trovato in %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "directory è stato trovato lì."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -98,43 +98,43 @@ msgstr ""
 "\n"
 "· · · · · $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Controllando Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Impossibile trovare la directory del profilo adatta, si è provato con %s e %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Impossibile ispezionare le opzioni di configurazione flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opzione sconosciuta '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Esegui '%s --help' per le informazioni d'uso"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Il file %s esiste già, non verrà modificato..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Creando %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Creando la generazione iniziale di Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -151,7 +151,7 @@ msgstr ""
 "consultare tutte le opzioni disponibili."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -167,11 +167,11 @@ msgstr ""
 "se l'errore sembra essere causato da Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Impossibile istanziare una configurazione flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -185,72 +185,72 @@ msgstr[1] ""
 "Ci sono %d novità rilevanti non lette.\n"
 "Leggile con il comando \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Opzione \"news.display\" sconosciuta \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Per favore definisci le variabili d'ambiente $EDITOR o $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Impossibile eseguire la build in una cartella in sola lettura"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nessuna generazione con ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Impossibile rimuovere la generazione corrente %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Rimuovo la generazione %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nessuna generazione in scadenza"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Sembrerebbe che nessun pacchetto home-manager sia installato."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argomento sconosciuto: %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Questo rimuoverà Home Manger dal tuo sistema."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Questo è un avvio a secco, nulla verrà realmente disinstallato."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Vuoi davvero disinstallare Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Passaando ad una configurazione Home Manager vuota..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Urrà!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager è disinstallato ma la tua home.nix non è stata toccata."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations si aspetta un solo argomento, invece di %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comando sconosciuto: %s"
 
diff --git a/home-manager/po/ja.po b/home-manager/po/ja.po
index 5a558d365..6f1ad5ed6 100644
--- a/home-manager/po/ja.po
+++ b/home-manager/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-25 11:09+0000\n"
 "Last-Translator: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: %s の引数がありません"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "%s に設定ファイルが見つかりません"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,24 +39,25 @@ msgstr ""
 "Home Managerの %s の %s への保管は非推奨となりました\n"
 "%s へ移動させてください"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "設定ファイルがありません。ファイルを %s に作ってください"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "%s にHome Managerが見つかりません。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
-msgstr "フォールバックの Home Manager のパス %s "
-"は非推奨ですが、そこにファイルまたはディレクトリがあります。"
+msgstr ""
+"フォールバックの Home Manager のパス %s は非推奨ですが、そこにファイルまたは"
+"ディレクトリがあります。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -84,8 +85,8 @@ msgstr ""
 "\n"
 "   を設定に追加します。\n"
 "\n"
-"   もし Home Manager を直接インポートしているのであれば、 Home Manager "
-"パッケージを呼び出すときに `path` パラメーターを使って\n"
+"   もし Home Manager を直接インポートしているのであれば、 Home Manager パッ"
+"ケージを呼び出すときに `path` パラメーターを使って\n"
 "\n"
 "     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
 "\n"
@@ -95,43 +96,43 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nixの健全性検査中です"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "flake設定のオプションを検査できません"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: 不明なオプション '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "'%s --help' でヘルプを参照することができます"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "%s は既に存在します。変更せずに続行しています..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "%s を作成中です..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Home Managerの世代を初期化しています..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +150,7 @@ msgstr ""
 "'man home-configuration.nix' を実行してください。"
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +166,11 @@ msgstr ""
 "というissueを立ててください。"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "flake設定を初期化できません"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -180,75 +181,75 @@ msgstr[0] ""
 "未読のお知らせが%d件あります。\n"
 "\"%s news\"コマンドで確認できます。"
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "\"news.display\"に\"%s\"という設定は存在しません。"
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "環境変数 $EDITOR または $VISUAL を設定してください"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "読み込み専用ディレクトリ内ではbuild（作成）できません"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "ID %s を持つ世代はありません"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "現在使用中の世代 %s は削除できません"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "世代 %s を削除中です"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "期限切れで削除される世代はありません"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "home-managerパッケージがインストールされていないようです。"
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "不明な引数 %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "この操作によってHome Managerはシステムから削除されます。"
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "これはdry run （予行練習）で、実際にはアンインストールは行われません。"
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "本当にHome Managerをアンインストールしますか？"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "空のHome Managerの設定に切り替えています..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "イェイ！"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Managerはアンインストールされましたが、home.nixはそのまま残してありま"
 "す。"
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 "expire-generations は一つしか引数を取らないところ、%d 個が与えられました。"
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "不明なコマンド: %s"
 
diff --git a/home-manager/po/ko.po b/home-manager/po/ko.po
index 96eae0712..9ab91b1f5 100644
--- a/home-manager/po/ko.po
+++ b/home-manager/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-30 06:09+0000\n"
 "Last-Translator: lentil32 <lentil32@icloud.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: %s에 대한 인자 누락"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "%s에서 설정 파일을 찾을 수 없음"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "홈 매니저 %s 을 %s 안에 선언하는 것은 더 이상 사용되지 않습니다.\n"
 "%s로 옮겨주십시오"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "설정 파일을 찾을 수 없음. %s에 설정 파일을 생성하십시오"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "%s에서 홈 매니저가 발견되지 않음."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "곳에서 발견 되었습니다."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nix가 정상인지 확인 중"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "%s와 %s를 시도했지만, 적합한 프로파일 디렉토리를 찾을 수 없습니다"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "flake 설정의 옵션들을 검사할 수 없음"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: 알 수 없는 옵션 '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "도움말을 보려면 '%s --help'를 실행하십시오"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "%s 파일은 이미 존재하므로, 수정하지 않음..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "%s를 생성하는 중..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "최초의 홈 매니저 세대를 생성하는 중..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +149,7 @@ msgstr ""
 "실행해서 가능한 모든 옵션을 살펴보십시오."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "위 사이트에서 이슈를 생성하십시오."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "flake 설정을 인스턴스화 할 수 없음"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -179,74 +179,74 @@ msgstr[0] ""
 "읽지 않은 관련된 뉴스 항목들이 %d 개 있습니다.\n"
 "\"%s news\" 명령어를 실행해 읽어보십시오."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "알 수 없는 \"news.display\"의 설정 \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "$EDITOR 또는 $VISUAL 환경 변수를 설정하십시오"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "읽기전용 폴더에서 빌드를 실행할 수 없습니다"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "ID %s를 갖는 세대가 존재하지 않음"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "현재 세대인 %s를 삭제할 수 없음"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "%s 세대를 삭제하는 중"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "유효 기간이 지난 세대가 없음"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "홈 매니저 패키지들이 설치되지 않은 것으로 보입니다."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "알 수 없는 매개변수 %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "시스템에서 홈 매니저를 삭제할 것입니다."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "모의 실행 중으로, 아무것도 실제로 설치되지 않습니다."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "정말로 홈 매니저를 삭제할까요?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "빈 홈 매니저 설정으로 바꾸는 중..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "야호!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "홈 매니저는 삭제되지만 home.nix 파일은 남겨집니다."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 "expire-generations 명령어는 매개변수가 한 개 필요한데, %d 개가 입력되었습니"
 "다."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "알 수 없는 명령어: %s"
 
diff --git a/home-manager/po/lt.po b/home-manager/po/lt.po
index c635d93a6..b707fbf25 100644
--- a/home-manager/po/lt.po
+++ b/home-manager/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-10-17 00:20+0000\n"
 "Last-Translator: Julius Marozas <marozas.julius@gmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/home-manager/"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && ("
-"n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.8-rc\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: trūksta argumento %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nerastas konfigūracijos failas %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 #, fuzzy
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
@@ -41,16 +41,16 @@ msgstr ""
 "Home Manager saugojimas %s viduje %s yra pasenes,\n"
 "prašome perkelti į %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Nerastas konfigūracijos failas. Sukurkite jį adresu %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Nerastas Home Manager šioje vietoje %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -59,7 +59,7 @@ msgstr ""
 "rastas failas/katalogas."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -87,8 +87,8 @@ msgstr ""
 "\n"
 "   prie jūsų konfigūracijos.\n"
 "\n"
-"   Jei importuojate Home Manager tiesiogiai, galite naudoti parametrą `path`."
-"\n"
+"   Jei importuojate Home Manager tiesiogiai, galite naudoti parametrą "
+"`path`.\n"
 "\n"
 "     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
 "\n"
@@ -98,42 +98,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nix tikrinamas"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nepavyko rasti tinkamo profilio katalogo, bandyta naudoti %s ir %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Negalima patikrinti flake konfigūracijos pasirinkimų"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: nežinomas pasirinkimas „%s“"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Paleiskite „%s --help“, kad gautumėte naudojimosi instrukcijas"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Failas %s jau egzistuoja, jis paliekamas nepakeistas..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Kuriamas %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Kuriama pradinė Home Manager generacija..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -152,7 +152,7 @@ msgstr ""
 "jei norite pamatyti visus pasirinkimus."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -167,11 +167,11 @@ msgstr ""
 "jei atrodo, kad klaida įvyko dėl Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Negalima sukurti pradinės flake konfigūracijos"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -188,72 +188,72 @@ msgstr[2] ""
 "Yra %d neperskaitytų ir aktualių naujienų.\n"
 "Perskaitykite jas paleidus komandą \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Nežinomas \"news.display\" nustatymas \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Nustatykite $EDITOR arba $VISUAL aplinkos kintamuosius"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Negalima vykdyti kompiliavimo read-only kataloge"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nėra generacijos su ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Negalima pašalinti esamos generacijos %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Pašalinama generacija %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nėra generacijų, kurios baigtų galioti"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Nėra instaliuotų home-manager paketų."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Nežinomas argumentas %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Tai pašalins Home Manager iš jūsų sistemos."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Tai bandomasis paleidimas, niekas nebus ištrinta."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Tikrai išdiegti Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Perjungiama į tuščią Home Manager konfigūraciją..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Valio!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager yra išdiegtas, bet jūsų home.nix liko nepaliestas."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations tikisi vieno argumento, gauta %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Nežinoma komanda: %s"
 
diff --git a/home-manager/po/nb_NO.po b/home-manager/po/nb_NO.po
index 41f5035c4..eb810d19f 100644
--- a/home-manager/po/nb_NO.po
+++ b/home-manager/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-02 21:38+0000\n"
 "Last-Translator: LilleAila <olai.solsvik@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/home-"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Fant ingen oppsettsfil i %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 #, fuzzy
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
@@ -40,23 +40,23 @@ msgstr ""
 "Å holde Home Manager %s i %s er avviklet,\n"
 "vennligst flytt det til %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Fant ikke noen oppsettsfil. Opprett en i %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager var ikke funnet på %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -77,43 +77,43 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Kontrollerer at Nix fungerer"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunne ikke finne en passende profilmappe, prøvde %s og %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Kan ikke inspisere alternativer for et flake-oppsett"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: ukjent alternativ «%s»"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Kjør «%s --help» for brukshjelp"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 #, fuzzy
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Filen %s eksisterer fra før, lar den være uendret..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Lager %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Oppretter ny Home Manager-generasjon..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -130,7 +130,7 @@ msgstr ""
 "se alle tilgjengelige innstillinger."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -145,11 +145,11 @@ msgstr ""
 "hvis du tror feilen er forårsaket av Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Kan ikke igangsette flak-oppsett"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -163,72 +163,72 @@ msgstr[1] ""
 "Det er %d uleste og relevante nyhetssaker.\n"
 "Les dem ved å kjøre kommandoen «%s news»."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Ukjent «news.display»-innstilling «%s»."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Kan ikke kjøre bygg i skrivebeskyttet mappe"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Ingen generering med ID-en %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Kan ikke fjerne nåværende generering %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Fjerner generering %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Ingen genereringer til utløp"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Ingen «home-manager»-pakker ser ut til å være installert."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Ukjent parameter %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Dette vil fjerne Home Manager fra systemet ditt."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Dette er en testkjøring. Ingenting vil bli avinstallert."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Vil du avinstallere Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Bytter til tomt Home Manager-oppsett …"
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Hurra!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager er avinstallert, men din home.nix er levnet uforandret."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "«expire-generations» forventet ett argument, mottok %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Ukjent kommando: %s"
 
diff --git a/home-manager/po/nl.po b/home-manager/po/nl.po
index 9f614ab10..84333c1dc 100644
--- a/home-manager/po/nl.po
+++ b/home-manager/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-02-16 22:01+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Geen configuratiebestand gevonden op %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,23 +39,23 @@ msgstr ""
 "Je Home Manager %s bestand opslaan in %s is niet langer ondersteund,\n"
 "gelieve het te verplaatsen naar %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Geen configuratiebestand gevonden, maak er alstublieft een aan op %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -76,42 +76,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nix aan het sanity checken"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kan geen geschikte map vinden voor het profiel, %s en %s geprobeerd"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Kan de opties van een flake configuratie niet inspecteren"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: onbekende keuze '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Voer '%s --help' in om gebruiksinfo te zien"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Het bestand %s bestaat al, het zal niet aangepast worden..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "%s aan het aanmaken..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Initiële Home Manager generatie aan het maken..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -130,7 +130,7 @@ msgstr ""
 "alle opties te zien."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -145,11 +145,11 @@ msgstr ""
 "als de error de schuld van Home Manager lijkt te zijn."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Het is niet gelukt om de flake-configuratie te creëren"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -163,72 +163,72 @@ msgstr[1] ""
 "Er zijn %d ongelezen and relevante nieuws artikelen.\n"
 "Lees ze door het commando \"%s news\" uit te voeren."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Onbekende \"new.display\" instelling \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Het is niet mogelijk om te bouwen in een read-only map"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Geen generatie met de ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Het is niet mogelijk om de huidige generatie %s te verwijderen"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Generatie %s aan het verwijderen"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Geen generatie om te beëindigen"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Er lijkt geen home-manager pakket geïnstalleerd te zijn."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Onbekend argument %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Dit zal Home Manager van jouw systeem verwijderen."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Dit is een oefening, niets wordt werkelijk geïnstalleerd."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Wilt u zeker Home Manager verwijderen?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Naar een lege Home Manager configuratie aan het veranderen..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Joepie!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager is verwijdert maar jouw home.nix is onaangeraakt."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations verwacht één argument, maar kreeg er %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
 
diff --git a/home-manager/po/pl.po b/home-manager/po/pl.po
index 63eeed3f0..b8e593856 100644
--- a/home-manager/po/pl.po
+++ b/home-manager/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-06-17 09:46+0000\n"
 "Last-Translator: Mateusz P <medan1993@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: brakuje wartości dla %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nie znaleziono pliku konfiguracyjnego %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -40,16 +40,16 @@ msgstr ""
 "Przechowywanie %s Home Managera w %s jest przestarzałe,\n"
 "proszę przenieść go do %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Nie znaleziono pliku konfiguracyjnego. Proszę utworzyć plik %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager nie znaleziony w %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -58,7 +58,7 @@ msgstr ""
 "katalog."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -98,42 +98,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Sprawdzanie poprawności Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nie można znaleźć odpowiedniego katalogu profilu, próbowano %s i %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Nie mogę sprawdzić konfiguracji flake'a"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: nieznana opcja „%s”"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Uruchom „%s --help” by otrzymać pomoc"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Plik %s już istnieje, pozostawianie go bez zmian..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Tworzenie %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Tworzenie pierwotnej generacji Home Managera..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -151,7 +151,7 @@ msgstr ""
 "sprawdzić wszystkie możliwe opcje konfiguracyjne."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -166,11 +166,11 @@ msgstr ""
 "jeśli myślisz, że problem spowodowany jest przez błąd Home Managera."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Nie mogę utworzyć instancji konfiguracji flake'a"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -187,73 +187,73 @@ msgstr[2] ""
 "Jest %d nieodczytanych wiadomości.\n"
 "Możesz je odczytać uruchamiając „%s news”."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Nieznane ustawienie „%s” „news.display”."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Proszę ustawić zmienną środowiskową $EDITOR lub $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Nie mogę uruchomić budowania w katalogu tylko-do-odczytu"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Brak generacji z ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Nie mogę usunąć bieżącej generacji %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Usuwanie generacji %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Brak wygasających generacji"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Pakiety home-manager nie wydają się być zainstalowane."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Nieznany argument %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "To usunie Home Managera z twojego systemu."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "To jest próba, faktycznie nic nie będzie usunięte."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Jesteś pewien usunięcia Home Managera?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Przełączanie do pustej konfiguracji Home Managera..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Jej!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager jest usunięty ale twój home.nix jest pozostawiony nietknięty."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations oczekuje jednego argumentu, otrzymano %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Nieznana komenda: %s"
 
diff --git a/home-manager/po/pt.po b/home-manager/po/pt.po
index a5de344bd..331e46dae 100644
--- a/home-manager/po/pt.po
+++ b/home-manager/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-19 17:07+0000\n"
 "Last-Translator: Felipe Silva <hey@felipeqq2.rocks>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/home-manager/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: faltando argumento para %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nenhum ficheiro de configuração encontrado em %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Manter o %s do seu Home Manager em %s já não é suportado,\n"
 "por favor mova-o para %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Ficheiro de configuração não encontrado. Por favor crie um em %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager não foi encontrado em %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "diretório foi encontrado lá."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,44 +96,44 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Não foi possível encontrar uma diretoria de perfil apropriada, foi tentado "
 "%s e %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Não é possivel inspecionar a opção de configuração do flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opção não reconhecida '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Execute '%s --help' para instruções de uso"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "O arquivo %s já existe, deixando do jeito que está..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Criando %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Criando a geração inicial do Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -150,7 +150,7 @@ msgstr ""
 "ver todas as opções disponíveis."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +165,11 @@ msgstr ""
 "se o erro lhe parecer ser um problema do Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Não foi possível instanciar a configuração de flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,72 +183,72 @@ msgstr[1] ""
 "Há %d novos itens relevants não lidos\n"
 "Leia executando o comando \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Valor \"%s\" para configuração \"news.display\" não reconhecido."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Por favor, defina a variável de ambiente $EDITOR ou $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Não é possível fazer o build num diretório somente leitura"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nenhuma geração com ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Não foi possível remover a geração atual %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "A remover a geração %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nenhuma geração a expirar"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Nenhum pacote parece instalado com home-manager."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argumento desconhecido %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Isto irá remover o Home Manager do seu sistema."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Essa é uma execução de teste, nada de fato será desinstalado."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Confirma a desinstalação do Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Trocando para configuração vazia do Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Boa!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager foi desinstalado, mas o seu home.nix foi deixado intacto."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations espera um argumento, recebeu %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comando não reconhecido: %s"
 
diff --git a/home-manager/po/pt_BR.po b/home-manager/po/pt_BR.po
index a3075d41e..897a33ebc 100644
--- a/home-manager/po/pt_BR.po
+++ b/home-manager/po/pt_BR.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-19 17:07+0000\n"
 "Last-Translator: Felipe Silva <hey@felipeqq2.rocks>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"home-manager/cli/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/home-"
+"manager/cli/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: faltando argumento para %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nenhum arquivo de configuração encontrado no %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Manter seu Home Manager %s em %s foi descontinuado,\n"
 "por favor mova-o para %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Arquivo de configuração não encontrado. Por favor crie um em %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager não encontrado em %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "algum arquivo/diretório nele."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -97,43 +97,43 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Não foi possível encontrar um diretório de perfil apropriado, tentou %s e %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Não é possivel inspecionar a opção de configuração do flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opção não reconhecida '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Execute '%s --help' para instruções de uso"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "O arquivo %s já existe, mantendo ele sem modificações..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Criando %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Criando a geração inicial do Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -151,7 +151,7 @@ msgstr ""
 "ver todas as opções disponíveis."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -166,11 +166,11 @@ msgstr ""
 "se o erro lhe parecer ser um problema do Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Não foi possível instanciar a configuração de flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -184,72 +184,72 @@ msgstr[1] ""
 "Há %d novos itens relevants não lidos\n"
 "Leia executando o comando \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Valor \"%s\" para configuração \"news.display\" não reconhecido."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Por favor, defina a variável de ambiente $EDITOR ou $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Não é possível fazer o build em um diretório somente leitura"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nenhuma geração com ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Não foi possível remover a geração atual %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Removendo geração %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nenhuma geração a expirar"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Nenhum pacote parece instalado com home-manager."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argumento desconhecido %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Isso irá remover o Home Manager do seu sistema."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Essa é uma execução de teste, nada de fato será desinstalado."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Confirma a desinstalação do Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Trocando para configuração vazia do Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Boa!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager foi desinstalado, mas o seu home.nix foi deixado intacto."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations espera um argumento, recebeu %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comando não reconhecido: %s"
 
diff --git a/home-manager/po/ro.po b/home-manager/po/ro.po
index b4be27ce4..de20d8a3d 100644
--- a/home-manager/po/ro.po
+++ b/home-manager/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-09-09 10:09+0000\n"
 "Last-Translator: Felix Puscasu <puscasu.felix1@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/home-manager/"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: Argument lipsă pentru %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Nu s-a găsit niciun fișier de configurare la locația %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -40,17 +40,17 @@ msgstr ""
 "Păstrarea Home Managerului %s în $s e depreciat,\n"
 "vă rugăm să îl mutați în %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 "Nu s-a găsit niciun fișier de configurare. Vă rugăm să creați unul la %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager nu a putut fi găsit la locația %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -59,7 +59,7 @@ msgstr ""
 "un fișier/director acolo."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -98,43 +98,43 @@ msgstr ""
 "\n"
 "           $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Se verifică corectitudinea Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Nu s-a putut găsi un director cu un profil potrivit, s-a încercat %s și %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Nu se pot inspecta opțiunile unei configurații flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: opțiune necunoscută '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Rulați '%s --help' pentru ajutor de utilizare"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Fișierul %s există deja, îl lăsăm neschimbat..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Creând %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Se creează generația Home Manager inițială..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -153,7 +153,7 @@ msgstr ""
 "putea vedea toate opțiunile."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -168,11 +168,11 @@ msgstr ""
 "dacă eroarea pare să fie din vina Home manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Nu se poate instanția o configurare flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -189,73 +189,73 @@ msgstr[2] ""
 "Există %d de știri necitite și relevante.\n"
 "Citiți-le folosind comanda \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Opțiunea \"news.display\" este necunoscută \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Rugăm să setați variabila $EDITOR sau $VISUAL în variabilele de mediu"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Nu se poate rula construirea într-un director numai pentru citire"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Nicio generație cu ID-ul %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Nu se poate șterge generația curentă %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Se șterge generația %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Nu există generații care să expire"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Nu există instalat niciun pachet home-manager."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Argument necunoscut %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Aceasta v-a înlătura Home Manager din sistemul dumneavoastră."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Aceasta este o rulare de test, nimic nu v-a fi dezinstalat."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Doriți cu adevărat să dezinstalați Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Se trece la o configurare Home Manager goală..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Ura!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager a fost dezinstalat, dar fișierul home.nix a rămas neatins."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations se așteaptă la un argument, a primit %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Comandă necunoscută: %s"
 
diff --git a/home-manager/po/ru.po b/home-manager/po/ru.po
index c8afd5a2f..904f116ef 100644
--- a/home-manager/po/ru.po
+++ b/home-manager/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-09-12 02:12+0000\n"
 "Last-Translator: NikSne <commits@niksne.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: отсутствует параметр для %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Не найден файл конфигурации в %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -40,16 +40,16 @@ msgstr ""
 "Файл %s вашего Home Manager находится в устаревшем месте %s\n"
 "пожалуйста, переместите его в %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Не найден файл конфигурации. Пожалуйста, создайте его в %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager не был найден в %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -58,7 +58,7 @@ msgstr ""
 "файл или папка."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -97,42 +97,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Проверка работоспособности Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Не найдена подходящая директория профиля, пробовали %s и %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Не могу получить опции для flake-конфигурации"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: неизвестная опция '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Выполните '%s --help', чтобы получить справку"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Файл %s уже существует и не будет изменен..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Создание %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Создаю начальное поколение Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +149,7 @@ msgstr ""
 "Выполните 'man home-configuration.nix', чтобы увидеть доступные опции."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "если считаете, что в ошибке виноват Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Не могу создать экземляр для flake-конфигурации"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -185,72 +185,72 @@ msgstr[2] ""
 "У вас есть %d непрочитанных и релевантных новостей.\n"
 "Прочтите их, выполнив команду \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Неизвестное значение \"news.display\": \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Пожалуйста, установите переменную среды $EDITOR или $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Не могу начать сборку в директории, защищённой от записи"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Поколение под номером %s не существует"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Не могу удалить текущее поколение %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Удаляю поколение %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Нет поколений, которые можно просрочить"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Не обнаружено пакетов, установленных через home-manager."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Неизвестный аргумент %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Это удалит Home Manager из вашей системы."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Это пробный запуск, на самом деле ничего не удаляется."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Действительно хотите удалить Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Переключаюсь на пустую конфигурацию Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Ура!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager удалён, но ваш home.nix остался нетронутым."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations требует один аргумент, но передано %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
diff --git a/home-manager/po/sv.po b/home-manager/po/sv.po
index 15930e49f..1a8da9006 100644
--- a/home-manager/po/sv.po
+++ b/home-manager/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-22 07:07+0000\n"
 "Last-Translator: bittin1ddc447d824349b2 <bittin@reimu.nl>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: saknar argument för %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Det finns ingen konfigurationsfil i %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Att behålla din Home Manager %s i %s är föråldrat,\n"
 "snälla flytta den till %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Hittade ingen konfigurationsfil. Skapa en i %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager hittades inte på %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "där."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Kontrollerar att Nix funkar"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunde inte hitta lämplig profil-katalog, försökte med %s och %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Kan inte granska alternativ i en flake-konfiguration"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: okänt val '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Kör '%s --help' för användarhjälp"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Filen %s finns redan, lämnar den orörd..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Skapar %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Skapar initial Home Manager-generation..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -148,7 +148,7 @@ msgstr ""
 "att se alla tillgängliga alternativ."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -163,11 +163,11 @@ msgstr ""
 "om problemet verkar bero på något Home Manager gör fel."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Kan inte instansera en flake-konfiguration"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -181,72 +181,72 @@ msgstr[1] ""
 "Det finns %d olästa och relevanta nyheter.\n"
 "Läs dem genom att köra kommandot \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Okänt \"news.display\"-värde \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Vänligen ställ in miljövariabeln $EDITOR eller $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Kan inte bygga i katalog med bara läsrättigheter"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Ingen generation med ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Kan inte ta bort nuvarande generation %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Tar bort generation %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Ingen generation att förfalla"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Paketet home-manager verkar inte vara installerat."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Okänt argument %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Detta kommer att ta bort Home Manager från ditt system."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Detta är en testkörning, inget kommer att bli avinstallerat."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Verkligen avinstallera Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Byter till tom Home Manager-konfiguration..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Hurra!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager är avinstallerad men din home.nix är orörd."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expect-generations förväntar sig ett argument, fick %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Okänt kommando: %s"
 
diff --git a/home-manager/po/ta.po b/home-manager/po/ta.po
index 215641354..93b79d3c4 100644
--- a/home-manager/po/ta.po
+++ b/home-manager/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2025-01-03 08:16+0000\n"
 "Last-Translator: தமிழ்நேரம் <anishprabu.t@gmail.com>\n"
 "Language-Team: Tamil <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: %s காணவில்லை"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "%s இல் உள்ளமைவு கோப்பு இல்லை"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,17 +39,16 @@ msgstr ""
 "உங்கள் வீட்டு மேலாளரை %s %s இல் வைத்திருப்பது நீக்கப்பட்டது,\n"
 " தயவுசெய்து அதை %s க்கு நகர்த்தவும்"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
-msgstr ""
-"உள்ளமைவு கோப்பு எதுவும் கிடைக்கவில்லை. தயவுசெய்து ஒன்றை %s இல் உருவாக்கவும்"
+msgstr "உள்ளமைவு கோப்பு எதுவும் கிடைக்கவில்லை. தயவுசெய்து ஒன்றை %s இல் உருவாக்கவும்"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "வீட்டு மேலாளர் %s இல் காணப்படவில்லை."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +56,7 @@ msgstr ""
 "குறைவடையும் வீட்டு மேலாளர் பாதை %s நீக்கப்பட்டு, ஒரு கோப்பு/அடைவு அங்கு காணப்பட்டது."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -97,43 +96,43 @@ msgstr ""
 "\n"
 " $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "நல்லறிவு சோதனை நிக்ச்"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "பொருத்தமான சுயவிவர கோப்பகத்தைக் கண்டுபிடிக்க முடியவில்லை, முயற்சித்த %s மற்றும் %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "ஒரு ஃப்ளேக் உள்ளமைவின் விருப்பங்களை ஆய்வு செய்ய முடியாது"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: அறியப்படாத விருப்பம் '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "பயன்பாட்டு உதவிக்காக '%s - -help' ஐ இயக்கவும்"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "%s ஏற்கனவே உள்ளது, அதை மாற்றாமல் விட்டுவிடுகிறது ..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "%s ஐ உருவாக்குதல் ..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "ஆரம்ப வீட்டு மேலாளர் தலைமுறையை உருவாக்குதல் ..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -150,7 +149,7 @@ msgstr ""
 " கிடைக்கக்கூடிய அனைத்து விருப்பங்களையும் காண்க."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +164,11 @@ msgstr ""
 " பிழை வீட்டு மேலாளரின் தவறு என்று தோன்றினால்."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "ஒரு ஃப்ளேக் உள்ளமைவை உடனடிப்படுத்த முடியாது"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,73 +182,73 @@ msgstr[1] ""
 "%d படிக்காத மற்றும் தொடர்புடைய செய்திகள் உள்ளன.\n"
 " \"%s செய்திகள்\" என்ற கட்டளையை இயக்குவதன் மூலம் அவற்றைப் படியுங்கள்."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "தெரியாத \"News.Display\" அமைப்புகள் \"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "$ எடிட்டர் அல்லது $ விசுவல் சூழல் மாறியை அமைக்கவும்"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "படிக்க மட்டும் கோப்பகத்தில் கட்டமைக்க முடியாது"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "ஐடி %s கொண்ட தலைமுறை இல்லை"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "தற்போதைய தலைமுறை %s ஐ அகற்ற முடியாது"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "தலைமுறை %s நீக்குதல்"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "காலாவதியாகும் தலைமுறைகள் இல்லை"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "வீட்டு மேலாளர் தொகுப்புகள் எதுவும் நிறுவப்படவில்லை."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "தெரியாத உரையாடல் %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "இது உங்கள் கணினியிலிருந்து வீட்டு மேலாளரை அகற்றும்."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "இது உலர்ந்த ரன், உண்மையில் எதுவும் நிறுவல் நீக்கப்படாது."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "உண்மையில் வீட்டு மேலாளரை நிறுவல் நீக்கவா?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "வெற்று வீட்டு மேலாளர் உள்ளமைவுக்கு மாறுதல் ..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "ஆம்!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "வீட்டு மேலாளர் நிறுவல் நீக்கப்பட்டார், ஆனால் உங்கள் வீடு. நிக்ச் தீண்டப்படாமல் விடப்பட்டுள்ளது."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "காலாவதியாகும் ஒரு வாதத்தை எதிர்பார்க்கிறது, %d கிடைத்தது."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "தெரியாத கட்டளை: %s"
 
diff --git a/home-manager/po/th.po b/home-manager/po/th.po
index 174b1c0a8..fa94a460d 100644
--- a/home-manager/po/th.po
+++ b/home-manager/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-09-19 06:27+0000\n"
 "Last-Translator: Kamontat Chantrachirathumrong <uein2@users.noreply.hosted."
 "weblate.org>\n"
@@ -25,36 +25,36 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "ไม่พบการตั้งค่าที่ %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -75,42 +75,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr ""
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr ""
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -121,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -131,11 +131,11 @@ msgid ""
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr ""
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -145,72 +145,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr ""
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr ""
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr ""
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr ""
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr ""
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr ""
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr ""
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr ""
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr ""
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr ""
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr ""
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr ""
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr ""
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr ""
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr ""
 
diff --git a/home-manager/po/tr.po b/home-manager/po/tr.po
index 66c89e608..b728b5882 100644
--- a/home-manager/po/tr.po
+++ b/home-manager/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-19 17:07+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/home-manager/cli/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: %s için argüman eksik"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "%s konumunda yapılandırma dosyası bulunamadı"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,17 +39,17 @@ msgstr ""
 "Home Managerı %s de tutmak artık desteklenmemektedir,\n"
 "lütfen % e taşıyın"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr ""
 "Yapılandırma dosyası bulunamadı. Lütfen %s konumunda bir tane oluşturun"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "%s konumunda Home Manager bulunamadı."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -58,7 +58,7 @@ msgstr ""
 "dizin bulundu."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -97,42 +97,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Nix denetleniyor"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kullanılabilir profil dizini bulunamadı, %s ve %s denendi"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Flake yapılandırmasının ayarları incelenemiyor"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: Bilinmeyen komut '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Yardım için '%s --help'"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "%s dosyası zaten var, değişiklik yapılmıyor..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Oluşturuluyor %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "İlk Home Manager inşası oluşturuluyor..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +149,7 @@ msgstr ""
 "'man home-configuration.nix'."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -165,11 +165,11 @@ msgstr ""
 "adresinden bildirin."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Flake yapılandırması örneklendirilemiyor"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -183,72 +183,72 @@ msgstr[1] ""
 "%d tane okunmamış ilgili haberler bulunmakta.\n"
 "Okumak için \"%s news\" komutunu kullanın."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Bilinmeyen \"news.display\" seçeneği \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Lütfen $EDITOR veya $VISUAL ortam değişkenini ayarlayın"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Sadece okuma izni olan bir dizinde inşa çalıştırılamaz"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "%s ID'sine sahip nesil bulunamadı"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Kullanımda olan %s inşası silinemez"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "İnşa siliniyor %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Süresi dolacak inşa yok"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Galiba home-manager paketi kurulu değil."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Bilinmeyen argüman %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Bu, sisteminizden Home Manager'ı kaldıracak."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Bu sadece bir inşa denemesi, hiçbir şey silinmeyecek."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Home Manager'ı silmek istediğinize emin misiniz?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Boş Home Manager yapılandırmasına geçiliyor..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Güzel!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager kaldırıldı ama home.nix dosyasına dokunulmadı."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations bir argüman istiyor, %d tane girildi."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Bilinmeyen komut: %s"
 
diff --git a/home-manager/po/uk.po b/home-manager/po/uk.po
index 9e6fc3997..91b1c3f82 100644
--- a/home-manager/po/uk.po
+++ b/home-manager/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-11-18 15:00+0000\n"
 "Last-Translator: wadsaek <wadsaek@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/home-manager/"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: відсутній аргумент для %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Файл конфігурації не знайдено в %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -40,16 +40,16 @@ msgstr ""
 "Збереження вашого Home Manager %s у %s є застарілим,\n"
 "будь ласка, перемістіть його до %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Файл конфігурації не знайдено. Будь ласка, створіть його в %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Home Manager не знайдено на %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "Резервний шлях до Home Manager %s застарів, і там було знайдено файл/каталог."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -96,42 +96,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Перевірка адекватності Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Не вдалося знайти відповідний каталог профілю, спробував %s і %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Неможливо перевірити параметри flake-конфігурації"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: невідомий параметр '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Запустіть '%s --help' для отримання довідки про використання"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Файл %s вже існує, залишаючи його незмінним..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Створення %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Створення початкової генерації Home Manager..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -149,7 +149,7 @@ msgstr ""
 "переглянути всі доступні варіанти."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -164,11 +164,11 @@ msgstr ""
 "якщо здається, що помилка сталася через Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Не вдається створити екземпляр flake-конфігурації"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -185,72 +185,72 @@ msgstr[2] ""
 "Є %d непрочитаних і ревалентних новин.\n"
 "Прочитайте їх, виконавши команду \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Невідоме налаштування \"news.display\" \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Будь ласка, встановіть змінну оточення $EDITOR або $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Неможливо запустити збірку в каталозі, доступному лише для читання"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Немає генерації з ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Не вдається видалити поточну генерацію %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Видалення генерації %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Немає генерацій, термін дії яких закінчується"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Здається, не встановлено жодних пакунків home-manager."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Невідомий аргумент %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Це призведе до видалення Home Manager з вашої системи."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Це пробний запуск, насправді нічого не буде видалено."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Дійсно видаліть Home Manager?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Перехід до порожньої конфігурації Home Manager..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Ура!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager буде видалено, але ваш home.nix залишиться недоторканим."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generation очікує один аргумент, отримав %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Невідома команда: %s"
 
diff --git a/home-manager/po/vi.po b/home-manager/po/vi.po
index 749de0218..a21467c37 100644
--- a/home-manager/po/vi.po
+++ b/home-manager/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-08-01 04:09+0000\n"
 "Last-Translator: goatastronaut0212 <goatastronaut0212@proton.me>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/home-manager/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s: bị thiếu đối số cho %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "Không tìm thấy tập tin cấu hình tại %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,16 +39,16 @@ msgstr ""
 "Giữ Home Manager của bạn %s ở %s đã không còn phù hợp,\n"
 "hãy chuyển nó tới %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "Không tìm thấy tệp cấu hình. Vui lòng tạo một cái tại %s"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "Không tìm thấy Home Manager ở %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
@@ -57,7 +57,7 @@ msgstr ""
 "đuợc tìm thấy ở đó."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -95,42 +95,42 @@ msgstr ""
 "\n"
 "     $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "Kiểm tra hợp lệ của Nix"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Không thể tìm thấy thư mục hồ sơ phù hợp, đã thử %s và %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "Không thể kiểm tra tùy chọn của cấu hình flake"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s: tùy chọn không xác định '%s'"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "Chạy '%s --help' để được trợ giúp sử dụng"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "Tệp %s đã tồn tại, để nguyên nó không thay đổi..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "Đang tạo %s..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "Khởi tạo thế hệ Home Manager ban đầu..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -148,7 +148,7 @@ msgstr ""
 "xem toàn bộ tùy chọn có sẵn."
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -163,11 +163,11 @@ msgstr ""
 "nếu như lỗi đó thuộc về Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "Không thể khởi tạo cấu hình flake"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -178,74 +178,74 @@ msgstr[0] ""
 "Có %d tin tức liên quan và chưa được đọc.\n"
 "Để đọc nó hãy chạy lệnh \"%s news\"."
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "Không tồn tại \"news.display\" cấu hình \"%s\"."
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "Vui lòng đặt biến môi trường $EDITOR hoặc $VISUAL"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "Không thể chạy lệnh xây dựng trong thư mục chỉ cho phép đọc"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "Không có thế hệ với ID %s"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "Không thể xóa thể hệ hiện tại %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "Đang xóa thế hệ %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "Không có bất kỳ thế hệ nào hết hạn"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "Không có bất kỳ gói home-manager nào được cài đặt."
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "Không tồn tại đối số %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "Việc này sẽ xóa Home Manager khỏi hệ thống của bạn."
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "Đây là chạy thử nghiệm, sẽ không có bất cư thứ gì được gỡ cài đặt."
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "Bạn có muốn gỡ Home Manager không?"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "Chuyển đổi sang cấu hình Home Manager trống..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "Tuyệt vời!"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
 "Home Manager đã được gỡ cài đặt nhưng home.nix của bạn sẽ được giữ nguyên "
 "vẹn."
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations kỳ vọng 1 đối số, có %d."
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "Không tồn tại câu lệnh: %s"
 
diff --git a/home-manager/po/zh_Hans.po b/home-manager/po/zh_Hans.po
index 6e773fcab..cc28b39ca 100644
--- a/home-manager/po/zh_Hans.po
+++ b/home-manager/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-13 10:00+0000\n"
 "Last-Translator: Zexin Yuan <yuan.zx@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -24,14 +24,14 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr "%s：缺少参数 %s"
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "未在 %s 找到配置文件"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
@@ -39,23 +39,23 @@ msgstr ""
 "需要确保 Home Manager 在 %s 中，%s 已废弃。\n"
 "请手动移动到 %s"
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "未找到配置文件。请在 %s 处创建一份"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr "未在 %s 找到 Home Manager。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr "后备 Home Manager 路径 %s 已被弃用，但在这里找到了一个文件或文件夹。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -92,42 +92,42 @@ msgstr ""
 "\n"
 "    $ rm -r \"%s\""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "正在进行 Nix 完整性检查"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "在 %s 以及 %s 中未能找到合适的档案目录"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "无法检查 flake 配置中的选项"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s：未知选项 ‘%s’"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "运行 ‘%s --help’ 获取用法帮助"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr "文件 %s 已存在，未对其更改 ..."
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr "正在创建 %s ..."
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "正在创建 Home Manager 初始化配置生成 ..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -144,7 +144,7 @@ msgstr ""
 "来查看所有可用选项。"
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -159,11 +159,11 @@ msgstr ""
 "处创建 Issue 告知我们。"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "无法创建 flake 配置实例"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -174,72 +174,72 @@ msgstr[0] ""
 "有 %d 条未读的相关新闻或消息。\n"
 "可运行 “%s news” 命令进行阅读。"
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "未知的 “news.display” 设置项 “%s”。"
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr "请设置 $EDITOR 或 $VISUAL 环境变量"
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "无法在只读目录中运行构建"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "没有 ID 为 %s 的生成结果"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "无法移除当前生成结果 %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "正在移除生成结果 %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "没有即将过期的生成结果"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "似乎没有安装 home-manager 软件包。"
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "未知参数 %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "这将会从系统中移除 Home Manager。"
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "这是试运行结果，没有实际卸载任何软件包。"
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "确定要卸载 Home Manager 吗？"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "正在切换至空的 Home Manager 配置 ..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "好耶！"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager 已卸载，但未改动您的 home.nix 配置文件。"
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations 须要一个参数，但获取到了 %d 个。"
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "未知命令：%s"
 
diff --git a/home-manager/po/zh_Hant.po b/home-manager/po/zh_Hant.po
index c3b9336d7..bf113567a 100644
--- a/home-manager/po/zh_Hant.po
+++ b/home-manager/po/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-02-16 22:01+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -24,36 +24,36 @@ msgstr ""
 msgid "%s: missing argument for %s"
 msgstr ""
 
-#: home-manager/home-manager:64
+#: home-manager/home-manager:69
 msgid "No configuration file found at %s"
 msgstr "未在 %s 處找到配置檔案"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
 msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
 
-#: home-manager/home-manager:92
+#: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
 msgstr "未找到配置檔案。請在 %s 處建立一份"
 
-#: home-manager/home-manager:107
+#: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
+#: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:118
+#: home-manager/home-manager:123
 msgid ""
 "To remove this warning, do one of the following.\n"
 "\n"
@@ -74,42 +74,42 @@ msgid ""
 "     $ rm -r \"%s\""
 msgstr ""
 
-#: home-manager/home-manager:146
+#: home-manager/home-manager:151
 msgid "Sanity checking Nix"
 msgstr "正在進行 Nix 完整性檢查"
 
-#: home-manager/home-manager:166
+#: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:221
+#: home-manager/home-manager:226
 msgid "Can't inspect options of a flake configuration"
 msgstr "無法檢查 flake 配置中的選項"
 
-#: home-manager/home-manager:296 home-manager/home-manager:319
-#: home-manager/home-manager:1051
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
 msgid "%s: unknown option '%s'"
 msgstr "%s：未知選項 ‘%s’"
 
-#: home-manager/home-manager:301 home-manager/home-manager:1052
+#: home-manager/home-manager:306 home-manager/home-manager:1062
 msgid "Run '%s --help' for usage help"
 msgstr "執行 ‘%s --help’ 獲取用法幫助"
 
-#: home-manager/home-manager:327 home-manager/home-manager:431
+#: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
 msgstr ""
 
-#: home-manager/home-manager:329 home-manager/home-manager:433
+#: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
 msgstr ""
 
-#: home-manager/home-manager:475
+#: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
 msgstr "正在建立初始 Home Manager 世代 ..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
+#: home-manager/home-manager:486
 msgid ""
 "All done! The home-manager tool should now be installed and you can edit\n"
 "\n"
@@ -126,7 +126,7 @@ msgstr ""
 "來檢視所有可用選項。"
 
 #. translators: The "%s" specifier will be replaced by a URL.
-#: home-manager/home-manager:485
+#: home-manager/home-manager:491
 msgid ""
 "Uh oh, the installation failed! Please create an issue at\n"
 "\n"
@@ -141,11 +141,11 @@ msgstr ""
 "處建立 Issue 告知我們。"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
-#: home-manager/home-manager:496
+#: home-manager/home-manager:502
 msgid "Can't instantiate a flake configuration"
 msgstr "無法建立 flake 配置例項"
 
-#: home-manager/home-manager:572
+#: home-manager/home-manager:578
 msgid ""
 "There is %d unread and relevant news item.\n"
 "Read it by running the command \"%s news\"."
@@ -156,72 +156,72 @@ msgstr[0] ""
 "有 %d 條未讀的相關新聞或訊息。\n"
 "可執行 “%s news” 命令進行閱讀。"
 
-#: home-manager/home-manager:586
+#: home-manager/home-manager:592
 msgid "Unknown \"news.display\" setting \"%s\"."
 msgstr "未知的 “news.display” 設定項 “%s”。"
 
-#: home-manager/home-manager:594
+#: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
 msgstr ""
 
-#: home-manager/home-manager:612
+#: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
 msgstr "無法在只讀目錄中執行構建"
 
-#: home-manager/home-manager:693
+#: home-manager/home-manager:699
 msgid "No generation with ID %s"
 msgstr "沒有 ID 為 %s 的世代"
 
-#: home-manager/home-manager:695
+#: home-manager/home-manager:701
 msgid "Cannot remove the current generation %s"
 msgstr "無法移除當前世代 %s"
 
-#: home-manager/home-manager:697
+#: home-manager/home-manager:703
 msgid "Removing generation %s"
 msgstr "正在移除世代 %s"
 
-#: home-manager/home-manager:718
+#: home-manager/home-manager:724
 msgid "No generations to expire"
 msgstr "沒有即將過期的世代"
 
-#: home-manager/home-manager:729
+#: home-manager/home-manager:735
 msgid "No home-manager packages seem to be installed."
 msgstr "似乎沒有安裝 home-manager 軟體包。"
 
-#: home-manager/home-manager:811
+#: home-manager/home-manager:820
 msgid "Unknown argument %s"
 msgstr "未知引數 %s"
 
-#: home-manager/home-manager:835
+#: home-manager/home-manager:845
 msgid "This will remove Home Manager from your system."
 msgstr "這將會從系統中移除 Home Manager。"
 
-#: home-manager/home-manager:838
+#: home-manager/home-manager:848
 msgid "This is a dry run, nothing will actually be uninstalled."
 msgstr "這是試執行結果，沒有實際解除安裝任何軟體包。"
 
-#: home-manager/home-manager:842
+#: home-manager/home-manager:852
 msgid "Really uninstall Home Manager?"
 msgstr "確定要解除安裝 Home Manager 嗎？"
 
-#: home-manager/home-manager:848
+#: home-manager/home-manager:858
 msgid "Switching to empty Home Manager configuration..."
 msgstr "正在切換至空的 Home Manager 配置 ..."
 
-#: home-manager/home-manager:863
+#: home-manager/home-manager:873
 msgid "Yay!"
 msgstr "好耶！"
 
-#: home-manager/home-manager:868
+#: home-manager/home-manager:878
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr "Home Manager 已解除安裝，但未改動您的 home.nix 配置檔案。"
 
-#: home-manager/home-manager:1091
+#: home-manager/home-manager:1101
 msgid "expire-generations expects one argument, got %d."
 msgstr "expire-generations 須要一個引數，但獲取到了 %d 個。"
 
-#: home-manager/home-manager:1113
+#: home-manager/home-manager:1123
 msgid "Unknown command: %s"
 msgstr "未知命令：%s"
 
diff --git a/modules/po/ar.po b/modules/po/ar.po
index c2469fa54..4e511ec7b 100644
--- a/modules/po/ar.po
+++ b/modules/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -60,54 +60,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/ca.po b/modules/po/ca.po
index 5f94ebb76..80021463c 100644
--- a/modules/po/ca.po
+++ b/modules/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-10 15:58+0000\n"
 "Last-Translator: Nara Díaz Viñolas <rdvdev2@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Creant enllaços dels fitxers personals a %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Netejant enllaços orfes de %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Creant generació de perfil %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "No hi ha canvis, reutilitzant últim perfil generat %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "i després provar d'activar la teva configuració de Home Manager de nou."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Activant %s"
 
@@ -76,66 +76,70 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "No s'ha pogut trobar un directori de perfils adequat, s'ha provat %s i %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Comprovant oldGenNum i oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Conflicte entre el número de generació prèvia i el camí! Aquests\n"
-"han de ser o bé ambdós buits o definits com a:\n"
-"\n"
-"    '%s' i '%s'\n"
-"\n"
-"Si no t'importa perdre les generacions de perfil prèvies,\n"
-"la solució més fàcil probablement és executar:\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"i provar home-manager switch de nou. Bona Sort!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Error: USER està configurat a \"%s\", però s'esperava \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Error: HOME està configurat a \"%s\", però s'esperava \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Començant activació de Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Comprovant Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Execució de simulacre"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Execució en viu"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Utilitzant versió de Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variables d'activació:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Creant generació de perfil %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "No hi ha canvis, reutilitzant últim perfil generat %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Comprovant oldGenNum i oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Conflicte entre el número de generació prèvia i el camí! Aquests\n"
+#~ "han de ser o bé ambdós buits o definits com a:\n"
+#~ "\n"
+#~ "    '%s' i '%s'\n"
+#~ "\n"
+#~ "Si no t'importa perdre les generacions de perfil prèvies,\n"
+#~ "la solució més fàcil probablement és executar:\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "i provar home-manager switch de nou. Bona Sort!"
diff --git a/modules/po/cs.po b/modules/po/cs.po
index f2da5bcba..c7049413f 100644
--- a/modules/po/cs.po
+++ b/modules/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-08 12:04+0000\n"
 "Last-Translator: David Houdek <sarejnovec@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Vytváření linků na domácí soubory v %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Čištění osiřelých linků z %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Vytvářím profil generace %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Žádná změna, takže bude použita profil poslední generace %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Poté zkuste znova aktivovat vaši Home Manager konfiguraci."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktivuji %s"
 
@@ -75,66 +75,70 @@ msgstr "Migruji profil z %s do %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nebyl nalezen vhodný adresář profilu, byly zkoušeny %s a %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Kontrola správnosti oldGenNum a oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Poslední číslo a cesta generace jsou konfliktní! Ty\n"
-"musí být oboje buď prázdné, nebo nastaveny, ale nyní jsou nastaveny na\n"
-"\n"
-"\t'%s' a '%s'\n"
-"\n"
-"Jestli vám nevadí ztráta předchozích generací profilu, potom\n"
-"to nejjednodušší řešení bude nejspíš spustit\n"
-"\n"
-"\trm %s/home-manager*\n"
-"\trm %s/current-home\n"
-"\n"
-"a zkusit přepínač home‐manager znova. Hodně štěstí!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Chyba: USER je nastaven na \"%s\", ale očekáváme \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Chyba: HOME je nastaven na \"%s\", ale očekáváme \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Zapínám aktivaci Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Kontrola správnosti Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Toto je zkušební běh"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Toto je běh na ostro"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Používám Nix verze: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktivační proměnné:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Vytvářím profil generace %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Žádná změna, takže bude použita profil poslední generace %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Kontrola správnosti oldGenNum a oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Poslední číslo a cesta generace jsou konfliktní! Ty\n"
+#~ "musí být oboje buď prázdné, nebo nastaveny, ale nyní jsou nastaveny na\n"
+#~ "\n"
+#~ "\t'%s' a '%s'\n"
+#~ "\n"
+#~ "Jestli vám nevadí ztráta předchozích generací profilu, potom\n"
+#~ "to nejjednodušší řešení bude nejspíš spustit\n"
+#~ "\n"
+#~ "\trm %s/home-manager*\n"
+#~ "\trm %s/current-home\n"
+#~ "\n"
+#~ "a zkusit přepínač home‐manager znova. Hodně štěstí!"
diff --git a/modules/po/da.po b/modules/po/da.po
index acb466622..5ab26890d 100644
--- a/modules/po/da.po
+++ b/modules/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-09-27 11:02+0000\n"
 "Last-Translator: Emil Heilbo <yuki@yukie.dev>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.1-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Opretter hjemme fil links i %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Oprydder forældreløse links fra %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Opretter profil generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Ingen ændring, dermed genanvendes seneste profil generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Derefter prøv at aktivere din Home Manager konfiguration igen."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktiverer %s"
 
@@ -75,66 +75,70 @@ msgstr "Migrerer profil fra %s til %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunne ikke finde en passende profilmappe, forsøgte %s og %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Tjekker fornuften af oldGenNum og oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Det forrige generationsnummer og sti er i konflikt! Disse skal\n"
-"enten begge være tomme, eller begge være sat, men er nu sat til\n"
-"\n"
-"    '%s' og '%s'\n"
-"\n"
-"Hvis du ikke har noget mod at miste tidligere profil generationer så\n"
-"er den nemmeste løsning nok at køre\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"og forsøge at køre home-manager switch igen. Held og lykke!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Fejl: USER er sat til \"%s\", men vi forventer \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Fejl: HOME er sat til \"%s\", men vi forventer \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Starter Home Manager aktivering"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Tjekker fornuften af Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Dette er en test-kørsel"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Dette er en direkte kørsel"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Bruger Nix version: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktiveringsvariabler:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Opretter profil generation %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Ingen ændring, dermed genanvendes seneste profil generation %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Tjekker fornuften af oldGenNum og oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Det forrige generationsnummer og sti er i konflikt! Disse skal\n"
+#~ "enten begge være tomme, eller begge være sat, men er nu sat til\n"
+#~ "\n"
+#~ "    '%s' og '%s'\n"
+#~ "\n"
+#~ "Hvis du ikke har noget mod at miste tidligere profil generationer så\n"
+#~ "er den nemmeste løsning nok at køre\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "og forsøge at køre home-manager switch igen. Held og lykke!"
diff --git a/modules/po/de.po b/modules/po/de.po
index d9cdbc944..d7aa42ed6 100644
--- a/modules/po/de.po
+++ b/modules/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-10-15 21:37+0000\n"
 "Last-Translator: Viktor Illmer <accounts@viktor.im>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-rc\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Erstelle home Dateiverknpfungen in %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Bereinige verwaiste Links unter %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Erstelle Profilgeneration %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Keine Änderungen. Benutze daher letzte Profilgeneration %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Versuchen Sie dann, Ihre Home Manager Konfiguration erneut zu aktivieren."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktiviere %s"
 
@@ -78,70 +78,74 @@ msgstr ""
 "Es konnte kein passendes Profilverzeichnis gefunden werden, %s und %s wurden "
 "versucht"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Überprüfe zur Sicherheit oldGenNum und oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Die vorherige Generationsnummer und -pfad stehen im Konflikt. Es\n"
-"müssen entweder beide leer sein oder beide haben den Wert\n"
-"\n"
-"    '%s' und '%s'\n"
-"\n"
-"Wenn es Ihnen nichts ausmacht frühere Generationen zu verlieren,\n"
-"dann ist die einfachste Lösung folgendes auszuführen:\n"
-"\n"
-"    rm %s/home-manager*\n"
-"    rm %s/current-home\n"
-"\n"
-"Führen Sie danach 'home-manager switch' aus. Viel Glück!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Fehler: USER ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Fehler: HOME ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Starte Home-Manager-Aktivierung"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Überprüfe zur Sicherheit Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Dies ist ein Probelauf"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Dies ist kein Probelauf"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Nutze Nix Version: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktivierungsvariablen:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Erstelle Profilgeneration %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Keine Änderungen. Benutze daher letzte Profilgeneration %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Überprüfe zur Sicherheit oldGenNum und oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Die vorherige Generationsnummer und -pfad stehen im Konflikt. Es\n"
+#~ "müssen entweder beide leer sein oder beide haben den Wert\n"
+#~ "\n"
+#~ "    '%s' und '%s'\n"
+#~ "\n"
+#~ "Wenn es Ihnen nichts ausmacht frühere Generationen zu verlieren,\n"
+#~ "dann ist die einfachste Lösung folgendes auszuführen:\n"
+#~ "\n"
+#~ "    rm %s/home-manager*\n"
+#~ "    rm %s/current-home\n"
+#~ "\n"
+#~ "Führen Sie danach 'home-manager switch' aus. Viel Glück!"
+
 #~ msgid ""
 #~ "Oops, nix-env failed to install your new Home Manager profile!\n"
 #~ "\n"
diff --git a/modules/po/es.po b/modules/po/es.po
index 0178e6d8b..33eee711c 100644
--- a/modules/po/es.po
+++ b/modules/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-05-27 12:11+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Creando vínculos del directorio de inicio en %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Limpiando vínculos huérfanos de %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Creando generación de perfil %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "No hay cambios, reutilizando la generación más reciente del perfil: %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Y después reintente activar su configuración de Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Activando %s"
 
@@ -77,70 +77,77 @@ msgstr ""
 "No se ha podido encontrar un directorio de perfiles adecuado, se ha probado "
 "con %s y %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Chequeando oldGenNum y oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"¡El número y la ruta de la generación anterior están en conflicto! Estos\n"
-"ambos deben estar vacíos o ambos configurados pero ahora configurados como\n"
-"\n"
-"    '%s' y '%s'\n"
-"\n"
-"Si no le importa perder las generaciones de perfiles anteriores, entonces\n"
-"la solución más fácil es probablemente ejecutar\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"y probando el cambio de administrador de casa nuevamente. ¡Buena suerte!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Error: USER está configurado en \"%s\" pero esperamos \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Error: HOME está configurado en \"%s\" pero esperamos \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Comenzando activación de Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Chequeando Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Ejecución de simulacro"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Ejecución en vivo"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Usando Nix versión %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variables de activación:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Creando generación de perfil %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "No hay cambios, reutilizando la generación más reciente del perfil: %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Chequeando oldGenNum y oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "¡El número y la ruta de la generación anterior están en conflicto! Estos\n"
+#~ "ambos deben estar vacíos o ambos configurados pero ahora configurados "
+#~ "como\n"
+#~ "\n"
+#~ "    '%s' y '%s'\n"
+#~ "\n"
+#~ "Si no le importa perder las generaciones de perfiles anteriores, "
+#~ "entonces\n"
+#~ "la solución más fácil es probablemente ejecutar\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "y probando el cambio de administrador de casa nuevamente. ¡Buena suerte!"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "Migrando perfiles de %s a %s"
 
diff --git a/modules/po/fa.po b/modules/po/fa.po
index d39e27a92..24fd3ef6b 100644
--- a/modules/po/fa.po
+++ b/modules/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-02 10:58+0000\n"
 "Last-Translator: Keivan <keyvan0082@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -51,7 +51,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -63,54 +63,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "بعد از امتحان کردن %s و %s , دایرکتوری مناسب برای پروفایل یافت نشد"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "چک کردن پایداری Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/fi.po b/modules/po/fi.po
index c16c30807..d52afc1cb 100644
--- a/modules/po/fi.po
+++ b/modules/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-05-31 17:09+0000\n"
 "Last-Translator: jarre johansson <jarre@johansson.today>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Luodaan kotitiedostolinkkejä sijaintiin %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Siivotaan orpoja linkkejä sijainnista %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -51,7 +51,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktivoidaan %s"
 
@@ -63,67 +63,62 @@ msgstr "Siirretään profiilia sijainnista %s kohteeseen %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Sopivaa profiilihakemistoa ei löytynyt, yritettiin %s ja %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Edellinen generaation numero ja polku ovat ristiriidassa! Niiden on oltava "
-"joko molemmat tyhjiä tai molemmat määritettyjä, mutta ne ovat nyt asetettu "
-"seuraavasti:\n"
-"\n"
-"'%s' ja '%s'\n"
-"\n"
-"Jos et välitä menettää aiempia profiilin generointeja, niin helpoin ratkaisu "
-"on todennäköisesti suorittaa\n"
-"\n"
-"rm %s/home-manager*\n"
-"rm %s/current-home\n"
-"\n"
-"ja yrittää sitten uudelleen home-manager switch -komentoa. Onnea matkaan!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Home Managerin aktivointi käynnistyy"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nixin eheys tarkistetaan"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Tämä on testiajo"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktivointimuuttujat:"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Edellinen generaation numero ja polku ovat ristiriidassa! Niiden on "
+#~ "oltava joko molemmat tyhjiä tai molemmat määritettyjä, mutta ne ovat nyt "
+#~ "asetettu seuraavasti:\n"
+#~ "\n"
+#~ "'%s' ja '%s'\n"
+#~ "\n"
+#~ "Jos et välitä menettää aiempia profiilin generointeja, niin helpoin "
+#~ "ratkaisu on todennäköisesti suorittaa\n"
+#~ "\n"
+#~ "rm %s/home-manager*\n"
+#~ "rm %s/current-home\n"
+#~ "\n"
+#~ "ja yrittää sitten uudelleen home-manager switch -komentoa. Onnea matkaan!"
diff --git a/modules/po/fr.po b/modules/po/fr.po
index ca50783dc..c95deeb0d 100644
--- a/modules/po/fr.po
+++ b/modules/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-07-15 14:49+0000\n"
 "Last-Translator: swaps <swapgs@users.noreply.hosted.weblate.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.0-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Création des liens de fichiers personnels dans %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Nettoyage des liens orphelins de %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Création de la génération de profil %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Pas de changement, réutilisation du dernier profil génération %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Après, essayez encore d'activer votre configuration de Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Activation de %s"
 
@@ -75,72 +75,76 @@ msgstr "Migration du profil de %s vers %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Impossible de trouver le dossier de profil approprié, essayé %s et %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Vérification de oldGenNum et oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Le numéro et le chemin de la génération précédente sont en conflit ! Ils "
-"doivent\n"
-"être vides ou les deux mis à\n"
-"\n"
-"    '%s' et '%s'\n"
-"\n"
-"Si ça ne vous dérange pas de perdre les générations précédentes, la solution "
-"la plus\n"
-"simple est probablement d'exécuter\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"et de réessayer home-manager switch. Bonne chance !"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Erreur : USER vaut « %s » mais nous attendions « %s »"
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Erreur : HOME vaut « %s » mais nous attendions « %s »"
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Démarrage de l'activation de Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Vérification de Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Ceci est une fausse activation (essai à blanc)"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Ceci est une vraie activation"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Version de Nix : %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variables d'activation :"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Création de la génération de profil %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Pas de changement, réutilisation du dernier profil génération %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Vérification de oldGenNum et oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Le numéro et le chemin de la génération précédente sont en conflit ! Ils "
+#~ "doivent\n"
+#~ "être vides ou les deux mis à\n"
+#~ "\n"
+#~ "    '%s' et '%s'\n"
+#~ "\n"
+#~ "Si ça ne vous dérange pas de perdre les générations précédentes, la "
+#~ "solution la plus\n"
+#~ "simple est probablement d'exécuter\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "et de réessayer home-manager switch. Bonne chance !"
+
 #~ msgid ""
 #~ "Oops, nix-env failed to install your new Home Manager profile!\n"
 #~ "\n"
diff --git a/modules/po/hi.po b/modules/po/hi.po
index 80781aba5..e525c1d39 100644
--- a/modules/po/hi.po
+++ b/modules/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-10-09 14:31+0000\n"
 "Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "%s से ऑर्फे़न लिंक्स मिटाई जा रही है"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -51,7 +51,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -63,54 +63,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/hu.po b/modules/po/hu.po
index 2b013ccc1..bf09e7ad0 100644
--- a/modules/po/hu.po
+++ b/modules/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-09-02 17:09+0000\n"
 "Last-Translator: Ferenci Ákos <synthetace@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Hivatkozások létrehozása itt: %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Árva hivatkozások kitakarítása innen: %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "%s. profil generáció létrehozása"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Nincs változás, legutóbbi %s. generáció lesz használva"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -51,7 +51,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -64,54 +64,40 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Nem található megfelelő profil mappa, %s és %s útvonalak lettek kipróbálva."
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nix épségének ellenőrzése"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "%s. profil generáció létrehozása"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Nincs változás, legutóbbi %s. generáció lesz használva"
diff --git a/modules/po/id.po b/modules/po/id.po
index 78db0232c..84c47f201 100644
--- a/modules/po/id.po
+++ b/modules/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-10-04 06:02+0000\n"
 "Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/home-manager/"
@@ -19,24 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.1-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Membuat tautan file beranda dalam %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Membersihkan link yatim piatu dari %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Membuat profil %s"
-
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
-"Tidak ada perubahan, jadi gunakan kembali pembuatan profil terbaru %s%s"
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +63,7 @@ msgstr ""
 "\n"
 "Kemudian coba aktifkan kembali konfigurasi Home Manager Anda."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Mengaktifkan %s"
 
@@ -76,54 +75,44 @@ msgstr "Memigrasi profil dari %s ke %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Tidak dapat menemukan direktori profil yang sesuai, coba %s dan %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Sanity memeriksa oldGenNum dan oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Error: PENGGUNA diatur ke \"%s\" tetapi kami mengharapkan \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Error: BERANDA diatur ke \"%s\" tetapi kami mengharapkan \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Memulai aktivasi Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Pemeriksaan sanity Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Ini adalah dry run"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Ini adalah live run"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Menggunakan versi Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variabel aktivasi:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Membuat profil %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Tidak ada perubahan, jadi gunakan kembali pembuatan profil terbaru %s%s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Sanity memeriksa oldGenNum dan oldGenPath"
diff --git a/modules/po/is.po b/modules/po/is.po
index 4f7e3bdc1..2f60f74ec 100644
--- a/modules/po/is.po
+++ b/modules/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -60,54 +60,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/it.po b/modules/po/it.po
index c39d34955..0d62b248c 100644
--- a/modules/po/it.po
+++ b/modules/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-02 23:06+0000\n"
 "Last-Translator: Lorenzo Brzek <lorenzoservizi@proton.me>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/home-manager/"
@@ -19,24 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Creo i collegamenti della home in %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Pulisco i collegamenti rimasti orfani da %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Creando profilo di generazione %s"
-
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
-"Nessuna modifica, verrà riutilizzata l'ultimo generazione di profilo %s"
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +64,7 @@ msgstr ""
 "\n"
 "Poi provate a riattivare la configurazione Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Attivando %s"
 
@@ -78,66 +77,72 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Impossibile trovare la directory del profilo adatta, si è provato con %s e %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Controllando oldGenNum e oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"I precedenti numero di generazione e il percorso sono in conflitto!\n"
-"Devono essere entrambi vuoti o entrambi popolati ma ora sono impostati su\n"
-"\n"
-"'%s' e '%s'\n"
-"\n"
-"Se non ti dispiace perdere le generazioni di profili precedenti,\n"
-"allora la soluzione più semplice è probabilmente eseguire i comandi\n"
-"\n"
-"rm %s/home-manager*\n"
-"rm %s/current-home\n"
-"\n"
-"e provare a cambiare home-manager di nuovo. Buona fortuna!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Errore: USER è impostato su \"%s\" ma era previsto \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Errore: HOME è impostata su \"%s\" ma era previsto un valore di \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Iniziando attivazione Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Controllando Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Questo è un avvio secco"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Questa è una esecuzione live"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Versione di Nix in uso: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variabili di attivazione:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Creando profilo di generazione %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Nessuna modifica, verrà riutilizzata l'ultimo generazione di profilo %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Controllando oldGenNum e oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "I precedenti numero di generazione e il percorso sono in conflitto!\n"
+#~ "Devono essere entrambi vuoti o entrambi popolati ma ora sono impostati "
+#~ "su\n"
+#~ "\n"
+#~ "'%s' e '%s'\n"
+#~ "\n"
+#~ "Se non ti dispiace perdere le generazioni di profili precedenti,\n"
+#~ "allora la soluzione più semplice è probabilmente eseguire i comandi\n"
+#~ "\n"
+#~ "rm %s/home-manager*\n"
+#~ "rm %s/current-home\n"
+#~ "\n"
+#~ "e provare a cambiare home-manager di nuovo. Buona fortuna!"
diff --git a/modules/po/ja.po b/modules/po/ja.po
index 4561e9418..6fc287d5a 100644
--- a/modules/po/ja.po
+++ b/modules/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-06-12 10:49+0000\n"
 "Last-Translator: Jeff Ames <jeff@anjefu.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "ホームファイルのリンクを %s に作っています"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "%s から無効なリンクを消去しています"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "世代 %s のプロファイルを生成しています"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "変更されていないので最新の世代 %s のプロファイルを再利用します"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "で競合を解消し、再度Home Managerの設定を試してください。"
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "%s を有効化しています"
 
@@ -76,70 +76,74 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "適切なプロファイル ディレクトリが見つかりませんでした。%s と %s を試しました"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "oldGenNum と oldGenPath の健全性検査をしています"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"先行する世代番号とパスが矛盾しています！\n"
-"それらはどちらも空かどちらもセットされていなければいけません。しかし\n"
-"\n"
-"    '%s' と '%s'\n"
-"\n"
-"となっています。もしプロファイルの以前の世代を失っても構わないなら\n"
-"おそらくもっとも簡単な解決法は\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"を実行して、home-manager switch を再び実行してみることでしょう。幸運を！"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "エラー: USER は \"%s\" に設定されていますが、\"%s\" が期待されています"
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "エラー: HOME は \"%s\" に設定されていますが、\"%s\" が期待されています"
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Home Managerの有効化を開始しました"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nixの健全性検査中です"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "これは予行練習(dry run)です"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "これは実際に実行されます"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Nix バージョン %s を使用しています"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "有効化変数:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "世代 %s のプロファイルを生成しています"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "変更されていないので最新の世代 %s のプロファイルを再利用します"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "oldGenNum と oldGenPath の健全性検査をしています"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "先行する世代番号とパスが矛盾しています！\n"
+#~ "それらはどちらも空かどちらもセットされていなければいけません。しかし\n"
+#~ "\n"
+#~ "    '%s' と '%s'\n"
+#~ "\n"
+#~ "となっています。もしプロファイルの以前の世代を失っても構わないなら\n"
+#~ "おそらくもっとも簡単な解決法は\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "を実行して、home-manager switch を再び実行してみることでしょう。幸運を！"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "%s から %s にプロファイルを移行しています"
 
diff --git a/modules/po/ko.po b/modules/po/ko.po
index 384a731e8..9809c5681 100644
--- a/modules/po/ko.po
+++ b/modules/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-08-03 05:07+0000\n"
 "Last-Translator: 박수원 <bboxone@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/home-manager/"
@@ -19,25 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.0-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "home 파일 링크를 %s에 생성하는 중"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "%s에서 연결이 끊어진 링크 파일들을 지우는 중"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "profile 세대 %s를 생성하는 중"
-
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
-"바뀐 것이 없어서 가장 최근의 profile 세대 %s를 다시 사용하는 것으로 설정하는 "
-"중"
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +63,7 @@ msgstr ""
 "\n"
 "그런 후, 다시 홈 매니저 설정을 활성화 해보세요."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "%s를 활성화 하는 중"
 
@@ -77,70 +75,76 @@ msgstr "%s에서 %s로 프로파일을 옮기는 중"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "%s와 %s를 시도했지만, 적합한 프로파일 디렉토리를 찾을 수 없습니다"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "oldGenNum과 oldGenPath가 정상인지 확인 중"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"이전 세대 번호와 경로가 서로 충돌하고 있습니다! 이들은 둘 다 비어있든지\n"
-"아니면 둘 다 설정돼있어야 하는데 지금 이들은 다음으로 설정되어있습니다.\n"
-"\n"
-"    '%s' 와 '%s'\n"
-"\n"
-"만약 이전 profile 세대들을 잃는 것이 상관없다면\n"
-"가장 쉬운 해결 방법은 아마 다음의 명령어를 실행하는 것일 겁니다.\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"그런 후 'home-manager switch'를 다시 시도해 보십시오. 행운을 빕니다!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "에러: USER가 \"%s\"로 설정되어 있는데, 사실은 \"%s\"를 기대함"
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "에러: HOME가 \"%s\"로 설정되어 있는데, 사실은 \"%s\"를 기대함"
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "홈 매니저 활성화를 시작하는 중"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nix가 정상인지 확인 중"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "모의 실행 중 입니다"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "모의 실행이 아닌 실제 실행 중 입니다"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "사용 중인 Nix 버전: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "활성화 변수들:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "profile 세대 %s를 생성하는 중"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "바뀐 것이 없어서 가장 최근의 profile 세대 %s를 다시 사용하는 것으로 설정하"
+#~ "는 중"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "oldGenNum과 oldGenPath가 정상인지 확인 중"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "이전 세대 번호와 경로가 서로 충돌하고 있습니다! 이들은 둘 다 비어있든지\n"
+#~ "아니면 둘 다 설정돼있어야 하는데 지금 이들은 다음으로 설정되어있습니다.\n"
+#~ "\n"
+#~ "    '%s' 와 '%s'\n"
+#~ "\n"
+#~ "만약 이전 profile 세대들을 잃는 것이 상관없다면\n"
+#~ "가장 쉬운 해결 방법은 아마 다음의 명령어를 실행하는 것일 겁니다.\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "그런 후 'home-manager switch'를 다시 시도해 보십시오. 행운을 빕니다!"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "%s에서 %s으로 profile들을 옮기는 중"
 
diff --git a/modules/po/lt.po b/modules/po/lt.po
index 9bafdcc9a..1b57f277b 100644
--- a/modules/po/lt.po
+++ b/modules/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-02-16 22:01+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/home-manager/"
@@ -20,24 +20,24 @@ msgstr ""
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.4\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Kuriamos home failų nuorodos adresu %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 #, fuzzy
 msgid "Cleaning up orphan links from %s"
 msgstr "Valomos pamestos nuorodos iš %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Kuriama profilio generacija %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Nėra pakeitimų, naudojama paskutinė profilio generacija %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Tada pabandykite aktyvuoti Home Manager konfigūraciją iš naujo."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktyvuojamas %s"
 
@@ -77,54 +77,40 @@ msgstr "Perkeliamas profilis iš %s į %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nepavyko rasti tinkamo profilio katalogo, bandyta naudoti %s ir %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Pradedamas Home Manager aktivavymas"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nix tikrinamas"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Tai yra sausas vykdymas"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Tai yra gyvas vykdymas"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Naudojama Nix versija: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktyvavimo kintamieji:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Kuriama profilio generacija %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Nėra pakeitimų, naudojama paskutinė profilio generacija %s"
diff --git a/modules/po/nb_NO.po b/modules/po/nb_NO.po
index b3754af0f..345770d66 100644
--- a/modules/po/nb_NO.po
+++ b/modules/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-02 21:38+0000\n"
 "Last-Translator: LilleAila <olai.solsvik@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/home-"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Lager hjemmefillenker i %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Fjerner frakoblede lenker fra %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Oppretter profil for generering %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Ingen endring, gjenbruker derfor siste profilgenerering %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "for så å aktivere ditt Home Manager-oppsett igjen."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktiverer %s"
 
@@ -75,70 +75,74 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunne ikke finne en passende profilmappe, prøvde %s og %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Kontrollerer verdiene av oldGenNum og oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Det er en konflikt mellom forrige generasjonstall og stien. Begge\n"
-"må enten være tomme eller satt, men er nå satt til\n"
-"\n"
-"    «%s« og «%s«\n"
-"\n"
-"Hvis du ikke bryr deg om å miste tidligere profilgenereringer\n"
-"er den enkleste løsningen antageligvis å kjøre\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"for så å forsøke `home-manager switch` igjen. Lykke til!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Feil: USER er satt til \"%s\", men vi forventet \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Feil: HOME er satt til \"%s\", men vi forventet \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Starter aktivering av Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Kontrollerer at Nix fungerer"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Dette er en simulert kjøring"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Dette er en virkelig kjøring"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Bruker Nix-versjon: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktiveringsvariabler:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Oppretter profil for generering %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Ingen endring, gjenbruker derfor siste profilgenerering %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Kontrollerer verdiene av oldGenNum og oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Det er en konflikt mellom forrige generasjonstall og stien. Begge\n"
+#~ "må enten være tomme eller satt, men er nå satt til\n"
+#~ "\n"
+#~ "    «%s« og «%s«\n"
+#~ "\n"
+#~ "Hvis du ikke bryr deg om å miste tidligere profilgenereringer\n"
+#~ "er den enkleste løsningen antageligvis å kjøre\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "for så å forsøke `home-manager switch` igjen. Lykke til!"
+
 #~ msgid ""
 #~ "Oops, nix-env failed to install your new Home Manager profile!\n"
 #~ "\n"
diff --git a/modules/po/nl.po b/modules/po/nl.po
index 418594aa1..75f4c73e2 100644
--- a/modules/po/nl.po
+++ b/modules/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-02 23:06+0000\n"
 "Last-Translator: Zurga <jim.lemmers@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/home-manager/"
@@ -19,24 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Home-bestandskoppelingen aan het maken in %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Wees links van %s aan het opkuisen"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Profiel generatie %s aan het maken"
-
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
-"Geen veranderingen dus de laatste profiel generatie %s wordt hergebruikt"
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +64,7 @@ msgstr ""
 "\n"
 "Probeer daarna je Home Manager configuratie opnieuw te activeren."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "%s aan het activeren"
 
@@ -77,69 +76,74 @@ msgstr "Profiel aan het migreren van %s naar %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kan geen geschikte map vinden voor het profiel, %s en %s geprobeerd"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "oldGenNum en oldGenPath aan het sanity checken"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Er is een conflict met de generatie nummer en pad! Deze\n"
-"moeten beide leeg of beide ingevuld zijn, maar zijn nu\n"
-"\n"
-"    '%s' en '%s'\n"
-"\n"
-"Als je het niet erg vindt je vorige profiel generaties te verliezen dan\n"
-"is waarschijnlijk de eenvoudigste oplossing om het volgende te draaien\n"
-"\n"
-"    rm %s/home-manager*\n"
-"    rm %s/current-home\n"
-"\n"
-"en dan opnieuw 'home-manager switch' te proberen. Veel succes!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Fout: USER heeft als waarde \"%s\" maar we verwachten \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Fout: HOME heeft als waarde \"%s\" maar we verwachten \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Home manager activatie aan het starten"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nix aan het sanity checken"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Dit is een oefening"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Dit is voor echt"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Nix versie %s wordt gebruikt"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Activatie variabelen:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Profiel generatie %s aan het maken"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Geen veranderingen dus de laatste profiel generatie %s wordt hergebruikt"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "oldGenNum en oldGenPath aan het sanity checken"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Er is een conflict met de generatie nummer en pad! Deze\n"
+#~ "moeten beide leeg of beide ingevuld zijn, maar zijn nu\n"
+#~ "\n"
+#~ "    '%s' en '%s'\n"
+#~ "\n"
+#~ "Als je het niet erg vindt je vorige profiel generaties te verliezen dan\n"
+#~ "is waarschijnlijk de eenvoudigste oplossing om het volgende te draaien\n"
+#~ "\n"
+#~ "    rm %s/home-manager*\n"
+#~ "    rm %s/current-home\n"
+#~ "\n"
+#~ "en dan opnieuw 'home-manager switch' te proberen. Veel succes!"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "Profielen van %s naar %s aan het migreren"
diff --git a/modules/po/pl.po b/modules/po/pl.po
index 6ce24f50f..e9aaa10de 100644
--- a/modules/po/pl.po
+++ b/modules/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-06-17 09:46+0000\n"
 "Last-Translator: Mateusz P <medan1993@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/"
@@ -20,23 +20,23 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Tworzenie dowiązań plików w %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Czyszczenie osieroconych linków z %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Tworzenie profilu generacji %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Brak zmian więc używam ostatniej generacji profilu %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "Po czym spróbuj aktywować swoją konfigurację Home Manager jeszcze raz."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktywowanie %s"
 
@@ -77,70 +77,74 @@ msgstr "Migracja profilu z %s do %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Nie można znaleźć odpowiedniego katalogu profilu, próbowano %s i %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Sprawdzanie poprawności oldGenNum i oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Istnieje konflikt pomiędzy poprzednią generacją i ścieżką! Powinny\n"
-"być obie puste lub ustawione, a efektywnie są ustawione na:\n"
-"\n"
-"    '%s' i '%s'\n"
-"\n"
-"Jeśli możesz sobie pozwolić na utratę poprzednich generacji,\n"
-"możesz uruchomić\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"i spróbować uruchomić home-manager switch raz jeszcze. Powodzenia!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
-"Błąd: Właściwość USER ma wartość \"%s\" podczas gdy spodziewana wartość to \""
-"%s\""
+"Błąd: Właściwość USER ma wartość \"%s\" podczas gdy spodziewana wartość to "
+"\"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
-"Błąd: Właściwość HOME ma wartość \"%s\" podczas gdy spodziewana wartość to \""
-"%s\""
+"Błąd: Właściwość HOME ma wartość \"%s\" podczas gdy spodziewana wartość to "
+"\"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Rozpoczynam aktywację Home Managera"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Sprawdzanie poprawności Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "To jest wykonanie testowe"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "To jest wykonanie właściwe"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Używając wersji Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Zmienne aktywacyjne:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Tworzenie profilu generacji %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Brak zmian więc używam ostatniej generacji profilu %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Sprawdzanie poprawności oldGenNum i oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Istnieje konflikt pomiędzy poprzednią generacją i ścieżką! Powinny\n"
+#~ "być obie puste lub ustawione, a efektywnie są ustawione na:\n"
+#~ "\n"
+#~ "    '%s' i '%s'\n"
+#~ "\n"
+#~ "Jeśli możesz sobie pozwolić na utratę poprzednich generacji,\n"
+#~ "możesz uruchomić\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "i spróbować uruchomić home-manager switch raz jeszcze. Powodzenia!"
diff --git a/modules/po/pt.po b/modules/po/pt.po
index 9bd5144a8..84ef27231 100644
--- a/modules/po/pt.po
+++ b/modules/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-10-19 04:00+0000\n"
 "Last-Translator: SrGesus <gabriel.fcf04@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.1\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "A criar links simbólicos em %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "A limpar links órfãos do directório %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "A criar geração %s para o perfil"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Nenhuma mudança, portanto a reusar a última geração %s para o perfil"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "E então tente novamente ativar a sua configuração do Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Ativando %s"
 
@@ -77,66 +77,71 @@ msgstr ""
 "Não foi possível encontrar uma diretoria de perfil apropriada, foi tentado "
 "%s e %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Revalidando oldGenNum e oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"O número da geração anterior e o caminho não batem! Ambos\n"
-"precisam estar ou vazios ou definidos, mas estão definidos como\n"
-"\n"
-"    '%s' e '%s'\n"
-"\n"
-"Se não se importa de perder gerações de perfis anteriores, então\n"
-"a solução mais rápida é provavelmente executar\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"e tentar executar \"home-manager switch\" de novo. Boa sorte!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Erro: USER está definido como \"%s\" mas é esperado \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Erro: HOME está definida como \"%s\" mas é esperado \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Iniciando ativação do Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Essa é uma execução de teste"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Essa é uma execução de fato"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Usando versão do Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variáveis durante ativação:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "A criar geração %s para o perfil"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Nenhuma mudança, portanto a reusar a última geração %s para o perfil"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Revalidando oldGenNum e oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "O número da geração anterior e o caminho não batem! Ambos\n"
+#~ "precisam estar ou vazios ou definidos, mas estão definidos como\n"
+#~ "\n"
+#~ "    '%s' e '%s'\n"
+#~ "\n"
+#~ "Se não se importa de perder gerações de perfis anteriores, então\n"
+#~ "a solução mais rápida é provavelmente executar\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "e tentar executar \"home-manager switch\" de novo. Boa sorte!"
diff --git a/modules/po/pt_BR.po b/modules/po/pt_BR.po
index 83d01927c..09b147dae 100644
--- a/modules/po/pt_BR.po
+++ b/modules/po/pt_BR.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-04-19 17:07+0000\n"
 "Last-Translator: Felipe Silva <hey@felipeqq2.rocks>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"home-manager/modules/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/home-"
+"manager/modules/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Criando links simbólicos em %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Limpando links órfãos de %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Criando perfil de geração %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Nenhuma mudança, portanto reusando a última geração %s para o perfil"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "E então tente novamente ativar a sua configuração do Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Ativando %s"
 
@@ -76,66 +76,71 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Não foi possível encontrar um diretório de perfil apropriado, tentou %s e %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Revalidando oldGenNum e oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"O número da geração anterior e o caminho não batem! Ambos\n"
-"precisam estar ou vazios ou definidos, mas estão definidos como\n"
-"\n"
-"    '%s' e '%s'\n"
-"\n"
-"Se você não se importa de perder gerações de perfis anteriores, então\n"
-"a solução mais rápida é provavelmente rodar\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"e tentar rodar \"home-manager switch\" de novo. Boa sorte!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Erro: USER está definido como \"%s\" mas o esperado é \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Erro: HOME está definido como \"%s\" mas o esperado é \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Iniciando ativação do Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Revalidando Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Essa é uma execução de teste"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Essa é uma execução de fato"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Usando versão do Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variáveis durante ativação:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Criando perfil de geração %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Nenhuma mudança, portanto reusando a última geração %s para o perfil"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Revalidando oldGenNum e oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "O número da geração anterior e o caminho não batem! Ambos\n"
+#~ "precisam estar ou vazios ou definidos, mas estão definidos como\n"
+#~ "\n"
+#~ "    '%s' e '%s'\n"
+#~ "\n"
+#~ "Se você não se importa de perder gerações de perfis anteriores, então\n"
+#~ "a solução mais rápida é provavelmente rodar\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "e tentar rodar \"home-manager switch\" de novo. Boa sorte!"
diff --git a/modules/po/ro.po b/modules/po/ro.po
index 71e9243c9..cfdb24b9e 100644
--- a/modules/po/ro.po
+++ b/modules/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-10-13 22:15+0000\n"
 "Last-Translator: AtomicDude <vasilescutoma4@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/home-manager/"
@@ -20,23 +20,23 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Se creează legături ale fișierelor personale în %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Se curăță legăturile orfane din %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Se creează generația %s a profilului"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Nicio schimbare, se reutilizează ultimul profil generat %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Apoi încearcă să activați configurația ta Home Manager din nou."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Se activează %s"
 
@@ -77,67 +77,71 @@ msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 "Nu s-a putut găsi un director cu un profil potrivit, s-a încercat %s și %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Se verifică corectitudinea oldGenNum și oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Numărul generației anterioare și calea sunt în conflict! Acestea\n"
-"trebuie să fie ambele goale sau ambele setate, dar acum sunt setate la\n"
-"\n"
-"        '%s' și '%s'\n"
-"\n"
-"Dacă nu vă deranjează pierderea generațiilor anterioare de profiluri, "
-"atunci\n"
-"cea mai ușoară soluție ar fi să rulezi\n"
-"\n"
-"    rm %s/home-manager*\n"
-"    rm %s/current-home\n"
-"\n"
-"și să încerci să rulezi home-manager switch din nou. Mult noroc!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Eroare: USER este setat la \"%s\", dar noi ne așteptam la \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Eroare: HOME este setat la \"%s\", dar noi ne așteptam la \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Se pornește activarea Home Managerului"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Se verifică corectitudinea Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Aceasta este o rulare simulată"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Aceasta este o rulare directă"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Folosind versiunea Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Variabile de activație:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Se creează generația %s a profilului"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Nicio schimbare, se reutilizează ultimul profil generat %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Se verifică corectitudinea oldGenNum și oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Numărul generației anterioare și calea sunt în conflict! Acestea\n"
+#~ "trebuie să fie ambele goale sau ambele setate, dar acum sunt setate la\n"
+#~ "\n"
+#~ "        '%s' și '%s'\n"
+#~ "\n"
+#~ "Dacă nu vă deranjează pierderea generațiilor anterioare de profiluri, "
+#~ "atunci\n"
+#~ "cea mai ușoară soluție ar fi să rulezi\n"
+#~ "\n"
+#~ "    rm %s/home-manager*\n"
+#~ "    rm %s/current-home\n"
+#~ "\n"
+#~ "și să încerci să rulezi home-manager switch din nou. Mult noroc!"
diff --git a/modules/po/ru.po b/modules/po/ru.po
index 432da018d..d3c20b3fb 100644
--- a/modules/po/ru.po
+++ b/modules/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-11 16:06+0000\n"
 "Last-Translator: Blezz Rot <markus.jenya04@yandex.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/"
@@ -20,23 +20,23 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Создаю ссылки в домашней директории %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Удаляю устаревшие ссылки из %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Создаю профиль в поколении %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Изменений нет, переиспользую профиль в последнем поколении %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "После попробуйте активировать конфигурацию снова."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Активирую %s"
 
@@ -76,71 +76,75 @@ msgstr "Переношу профиль из %s в %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Не найдена подходящая директория профиля, пробовали %s и %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Проверка oldGenNum и oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Обнаружен конфликт между номером и расположением предыдущего поколения!\n"
-"Обе переменные должны иметь значения либо быть пустыми, но следующие "
-"значения:\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"Если вы не возражаете потерять предыдущие поколения профиля,\n"
-"наиболее простым решением будет выполнение\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"и повторный запуск 'home-manager switch'. Удачи!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Ошибка: USER установлена в \"%s\", но ожидается \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Ошибка: HOME установлена в \"%s\", но ожидается \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Начинаю активацию Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Проверка работоспособности Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Это пробный запуск"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Это реальный запуск"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Использую Nix версии: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Переменные для активации:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Создаю профиль в поколении %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Изменений нет, переиспользую профиль в последнем поколении %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Проверка oldGenNum и oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Обнаружен конфликт между номером и расположением предыдущего поколения!\n"
+#~ "Обе переменные должны иметь значения либо быть пустыми, но следующие "
+#~ "значения:\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "Если вы не возражаете потерять предыдущие поколения профиля,\n"
+#~ "наиболее простым решением будет выполнение\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "и повторный запуск 'home-manager switch'. Удачи!"
+
 #~ msgid ""
 #~ "Oops, nix-env failed to install your new Home Manager profile!\n"
 #~ "\n"
diff --git a/modules/po/sv.po b/modules/po/sv.po
index 266a84d8d..13ae0058b 100644
--- a/modules/po/sv.po
+++ b/modules/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-05-27 12:11+0000\n"
 "Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Skapar hemfil-länkar i %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Rensar bort överflödiga länkar från %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Skapar profil för generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Ingen förändring, återanvänder därför profil-generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Prova sedan att aktivera din Home Manager-konfiguration igen."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Aktiverar %s"
 
@@ -75,70 +75,74 @@ msgstr "Migrerar profil från %s till %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kunde inte hitta lämplig profil-katalog, försökte med %s och %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Kontrollerar värdena på oldGenNum och oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Föregående generationsnummer och sökväg motsäger varandra! Dessa måste\n"
-"antingen båda vara tomma eller båda vara satta men de har nu värdena\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"Om du inte har något emot att förlora tidigare profilgenerationer så\n"
-"är den enklaste lösningen antagligen att köra\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"och prova 'home-manager switch' igen. Lycka till!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Fel: USER är satt till \"%s\" men \"%s\" förväntades"
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Fel: HOME är satt till \"%s\" men \"%s\" förväntades"
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Startar Home Manager-aktivering"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Kontrollerar att Nix funkar"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Detta är en simulerad körning"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Detta är en verklig körning"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Använder Nix-version: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Aktiveringsvariabler:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Skapar profil för generation %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Ingen förändring, återanvänder därför profil-generation %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Kontrollerar värdena på oldGenNum och oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Föregående generationsnummer och sökväg motsäger varandra! Dessa måste\n"
+#~ "antingen båda vara tomma eller båda vara satta men de har nu värdena\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "Om du inte har något emot att förlora tidigare profilgenerationer så\n"
+#~ "är den enklaste lösningen antagligen att köra\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "och prova 'home-manager switch' igen. Lycka till!"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "Migrerar profiler från %s till %s"
 
diff --git a/modules/po/ta.po b/modules/po/ta.po
index 40fcfc40e..627f4bea6 100644
--- a/modules/po/ta.po
+++ b/modules/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -60,54 +60,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/th.po b/modules/po/th.po
index 9e6521664..0adfb7b9d 100644
--- a/modules/po/th.po
+++ b/modules/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -48,7 +48,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr ""
 
@@ -60,54 +60,34 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr ""
diff --git a/modules/po/tr.po b/modules/po/tr.po
index f6f3fbc4d..ac39eeef7 100644
--- a/modules/po/tr.po
+++ b/modules/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-11-13 17:06+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/home-manager/"
@@ -19,24 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.2-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "%s konumunda ev dosya bağlantıları oluşturuluyor"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Geçersiz bağlantılar temizleniyor %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "%s profil inşası oluşturuluyor"
-
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
-"Değişiklik yok, bu nedenle en son profil inşası %s yeniden kullanılıyor"
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +63,7 @@ msgstr ""
 "ile kaldırabilirsiniz. Sonra Home Manager yapılandırmanızı yeniden\n"
 "etkinleştirmeyi deneyin."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "%s etkinleştiriliyor"
 
@@ -76,67 +75,72 @@ msgstr "Profil %s, %s e taşınıyor"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Kullanılabilir profil dizini bulunamadı, %s ve %s denendi"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "oldGenNum ve oldGenPath denetleniyor"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Önceki inşa numarası ve yolu çakışıyor! Bunların ikisi de boş olmalı\n"
-"veya ayarlanmalı ama şu anda\n"
-"\n"
-"    '%s' ve '%s'\n"
-"\n"
-"olarak ayarlandı. Önceki profil inşalarını kaybetmeyi önemsemiyorsanız\n"
-"en kolay çözüm muhtemelen\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"komutlarını çalıştırmak ve tekrar home-manager switch denemektir. İyi "
-"şanslar!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Hata: USER \"%s\" olarak ayarlandı ancak biz \"%s\" bekliyoruz"
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Hata: HOME \"%s\" olarak ayarlandı ancak biz \"%s\" bekliyoruz"
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Home Manager etkinleştirmesi başlatılıyor"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Nix denetleniyor"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Bu bir deneme çalıştırmasıdır"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Bu bir gerçek çalıştırmadır"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Kullanılan Nix sürümü: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Etkinleştirme değişkenleri:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "%s profil inşası oluşturuluyor"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr ""
+#~ "Değişiklik yok, bu nedenle en son profil inşası %s yeniden kullanılıyor"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "oldGenNum ve oldGenPath denetleniyor"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Önceki inşa numarası ve yolu çakışıyor! Bunların ikisi de boş olmalı\n"
+#~ "veya ayarlanmalı ama şu anda\n"
+#~ "\n"
+#~ "    '%s' ve '%s'\n"
+#~ "\n"
+#~ "olarak ayarlandı. Önceki profil inşalarını kaybetmeyi önemsemiyorsanız\n"
+#~ "en kolay çözüm muhtemelen\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "komutlarını çalıştırmak ve tekrar home-manager switch denemektir. İyi "
+#~ "şanslar!"
diff --git a/modules/po/uk.po b/modules/po/uk.po
index c8778da49..391814da6 100644
--- a/modules/po/uk.po
+++ b/modules/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-12-31 14:09+0000\n"
 "Last-Translator: Сергій <sergiy.goncharuk.1@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/home-manager/"
@@ -20,23 +20,23 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "Створення посилань на файли в домашньому каталозі в %s"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "Очищення невідомих посилань із %s"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "Створення генерації профілю %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "Без змін, тому повторне використання останньої генерації профілю %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "Потім спробуйте знову активувати конфігурацію Home Manager."
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Активація %s"
 
@@ -76,70 +76,74 @@ msgstr "Перенесення профілю з %s на %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Не вдалося знайти відповідний каталог профілю, спробував %s і %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "Перевірка цілісності oldGenNum та oldGenPath"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"Номер і шлях попередньої генерації конфліктують! Ці\n"
-"мають бути або порожніми, або обидва встановлені, але тепер встановлено "
-"значення\n"
-"\n"
-"    \"%s\" і \"%s\"\n"
-"\n"
-"Якщо ви не проти втратити попередні генерації профілів, тоді\n"
-"найпростішим рішенням є, мабуть, запуск\n"
-"\n"
-"   rm %shome-manager*\n"
-"   rm %current-home\n"
-"\n"
-"і знову намагатися переключитися на home-manager switch. Удачі!"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Помилка: USER встановлено на \"%s\", але очікувалося \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Помилка: HOME встановлено на \"%s\", але очікувалося \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "Початок активації Home Manager"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Перевірка адекватності Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "Це пробний запуск"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "Це справжній запуск"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Використання версії Nix: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Активація змінних:"
 
+#~ msgid "Creating profile generation %s"
+#~ msgstr "Створення генерації профілю %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "Без змін, тому повторне використання останньої генерації профілю %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "Перевірка цілісності oldGenNum та oldGenPath"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "Номер і шлях попередньої генерації конфліктують! Ці\n"
+#~ "мають бути або порожніми, або обидва встановлені, але тепер встановлено "
+#~ "значення\n"
+#~ "\n"
+#~ "    \"%s\" і \"%s\"\n"
+#~ "\n"
+#~ "Якщо ви не проти втратити попередні генерації профілів, тоді\n"
+#~ "найпростішим рішенням є, мабуть, запуск\n"
+#~ "\n"
+#~ "   rm %shome-manager*\n"
+#~ "   rm %current-home\n"
+#~ "\n"
+#~ "і знову намагатися переключитися на home-manager switch. Удачі!"
+
 #~ msgid "Migrating profiles from %s to %s"
 #~ msgstr "Перенесення профілів з %s на %s"
diff --git a/modules/po/vi.po b/modules/po/vi.po
index 827e32066..4d1d67db6 100644
--- a/modules/po/vi.po
+++ b/modules/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2024-08-01 04:09+0000\n"
 "Last-Translator: goatastronaut0212 <goatastronaut0212@proton.me>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/home-manager/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr ""
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr ""
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
 msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
 msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -51,7 +51,7 @@ msgid ""
 "Then try activating your Home Manager configuration again."
 msgstr ""
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "Đang khởi động %s"
 
@@ -63,54 +63,34 @@ msgstr "Chuyển đổi hồ sơ từ %s tới %s"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "Không thể tìm thấy thư mục hồ sơ phù hợp, đã thử %s và %s"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "Lỗi: USER được đặt thành \"%s\" nhưng chúng tôi kỳ vọng \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "Lỗi: HOME được đặt thành \"%s\" nhưng chúng tôi kỳ vọng \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "Kiểm tra hợp lệ của Nix"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "Phiên bản Nix đươc sử dụng: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "Các biến được kích hoạt:"
diff --git a/modules/po/zh_Hans.po b/modules/po/zh_Hans.po
index 970dde4af..625e0e679 100644
--- a/modules/po/zh_Hans.po
+++ b/modules/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-06-12 10:49+0000\n"
 "Last-Translator: Hongtyu Bhe <mfthits@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "正在 %s 中创建 Home 目录文件链接"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "正在从 %s 清理孤立链接"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "正在创建配置文件世代 %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "未发生变化，正在重新使用最近一次的配置文件世代 %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "来移除。然后尝试再次激活您的 Home Manager 配置。"
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "正在激活 %s"
 
@@ -75,66 +75,70 @@ msgstr "将从%s向%s迁移配置档案"
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr "在 %s 以及 %s 中未能找到合适的档案目录"
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "正在进行 oldGenNum 和 oldGenPath 的完整性检查"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-"上一次生成序号和路径存在冲突！\n"
-"两者需要同时为空或者设置，但目前状态是\n"
-"\n"
-"    '%s' 和 '%s'\n"
-"\n"
-"但如果你不介意丢失上次生成结果，\n"
-"最简单的解决方案是运行\n"
-"\n"
-"    rm %s/home-manager*\n"
-"    rm %s/current-home\n"
-"\n"
-"然后再次尝试执行 home-manager switch。祝你一把过！"
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr "错误: USER 被配置为 \"%s\" 但我们预期它是 \"%s\""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr "错误: HOME 目前设置了 \"%s\" 但我们需要它是 \"%s\""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "正在启动 Home Manager 初始化程序"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "正在进行 Nix 完整性检查"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "这是试运行"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "这是在实际运行"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "正在使用的 Nix 版本: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "激活的变量："
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "正在创建配置文件世代 %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "未发生变化，正在重新使用最近一次的配置文件世代 %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "正在进行 oldGenNum 和 oldGenPath 的完整性检查"
+
+#~ msgid ""
+#~ "The previous generation number and path are in conflict! These\n"
+#~ "must be either both empty or both set but are now set to\n"
+#~ "\n"
+#~ "    '%s' and '%s'\n"
+#~ "\n"
+#~ "If you don't mind losing previous profile generations then\n"
+#~ "the easiest solution is probably to run\n"
+#~ "\n"
+#~ "   rm %s/home-manager*\n"
+#~ "   rm %s/current-home\n"
+#~ "\n"
+#~ "and trying home-manager switch again. Good luck!"
+#~ msgstr ""
+#~ "上一次生成序号和路径存在冲突！\n"
+#~ "两者需要同时为空或者设置，但目前状态是\n"
+#~ "\n"
+#~ "    '%s' 和 '%s'\n"
+#~ "\n"
+#~ "但如果你不介意丢失上次生成结果，\n"
+#~ "最简单的解决方案是运行\n"
+#~ "\n"
+#~ "    rm %s/home-manager*\n"
+#~ "    rm %s/current-home\n"
+#~ "\n"
+#~ "然后再次尝试执行 home-manager switch。祝你一把过！"
diff --git a/modules/po/zh_Hant.po b/modules/po/zh_Hant.po
index 65ee89839..7c8e14619 100644
--- a/modules/po/zh_Hant.po
+++ b/modules/po/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
-"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
 "PO-Revision-Date: 2023-01-08 11:50+0000\n"
 "Last-Translator: Eric Ho <eric913@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -19,23 +19,23 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.15.1-dev\n"
 
-#: modules/files.nix:191
+#: modules/files.nix:188
 msgid "Creating home file links in %s"
 msgstr "正在 %s 中建立家目錄檔案連結"
 
-#: modules/files.nix:204
+#: modules/files.nix:201
 msgid "Cleaning up orphan links from %s"
 msgstr "正在從 %s 清理孤立連結"
 
-#: modules/files.nix:220
-msgid "Creating profile generation %s"
-msgstr "正在建立配置檔案世代 %s"
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
 
-#: modules/files.nix:237
-msgid "No change so reusing latest profile generation %s"
-msgstr "未發生變化，正在重新使用最近一次的配置檔案世代 %s"
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
 
-#: modules/home-environment.nix:634
+#: modules/home-environment.nix:643
 msgid ""
 "Oops, Nix failed to install your new Home Manager profile!\n"
 "\n"
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "來移除。然後嘗試再次啟用您的 Home Manager 配置。"
 
-#: modules/home-environment.nix:667
+#: modules/home-environment.nix:676
 msgid "Activating %s"
 msgstr "正在啟用 %s"
 
@@ -75,54 +75,43 @@ msgstr ""
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:83
-msgid "Sanity checking oldGenNum and oldGenPath"
-msgstr "正在進行 oldGenNum 和 oldGenPath 的完整性檢查"
-
-#: modules/lib-bash/activation-init.sh:86
-msgid ""
-"The previous generation number and path are in conflict! These\n"
-"must be either both empty or both set but are now set to\n"
-"\n"
-"    '%s' and '%s'\n"
-"\n"
-"If you don't mind losing previous profile generations then\n"
-"the easiest solution is probably to run\n"
-"\n"
-"   rm %s/home-manager*\n"
-"   rm %s/current-home\n"
-"\n"
-"and trying home-manager switch again. Good luck!"
-msgstr ""
-
-#: modules/lib-bash/activation-init.sh:127
+#: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:136
+#: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
 
-#: modules/lib-bash/activation-init.sh:153
+#: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
 msgstr "正在啟動 Home Manager 初始化程式"
 
-#: modules/lib-bash/activation-init.sh:157
+#: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
 msgstr "正在進行 Nix 完整性檢查"
 
-#: modules/lib-bash/activation-init.sh:170
+#: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
 msgstr "這是試運行"
 
-#: modules/lib-bash/activation-init.sh:174
+#: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
 msgstr "這是在實際運行"
 
-#: modules/lib-bash/activation-init.sh:180
+#: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
 msgstr "正在使用的 Nix 版本: %s"
 
-#: modules/lib-bash/activation-init.sh:183
+#: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
 msgstr "啟用的變數:"
+
+#~ msgid "Creating profile generation %s"
+#~ msgstr "正在建立配置檔案世代 %s"
+
+#~ msgid "No change so reusing latest profile generation %s"
+#~ msgstr "未發生變化，正在重新使用最近一次的配置檔案世代 %s"
+
+#~ msgid "Sanity checking oldGenNum and oldGenPath"
+#~ msgstr "正在進行 oldGenNum 和 oldGenPath 的完整性檢查"

From 1c8d4c8d592e8fab4cff4397db5529ec6f078cf9 Mon Sep 17 00:00:00 2001
From: Drewry Pope <drewrypope@gmail.com>
Date: Fri, 3 Jan 2025 04:33:28 -0600
Subject: [PATCH 197/546] mako: add center-left & center-right

---
 modules/services/mako.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/mako.nix b/modules/services/mako.nix
index 7ca011782..e3298d837 100644
--- a/modules/services/mako.nix
+++ b/modules/services/mako.nix
@@ -75,12 +75,14 @@ in {
           "bottom-right"
           "bottom-center"
           "bottom-left"
+          "center-right"
+          "center-left"
           "center"
         ]);
         description = ''
           Show notifications at the specified position on the output.
           Supported values are top-right, top-center, top-left, bottom-right,
-          bottom-center, bottom-left, and center.
+          bottom-center, bottom-left, center-right, center-left and center.
         '';
       };
 

From 0734cfab07a90a34bb91428e24646e5fe78d9e24 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 09:54:37 +0000
Subject: [PATCH 198/546] wayland: add module

---
 modules/modules.nix |  1 +
 modules/wayland.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 modules/wayland.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index c5a81b425..3c422eb5e 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -417,6 +417,7 @@ let
     ./systemd.nix
     ./targets/darwin
     ./targets/generic-linux.nix
+    ./wayland.nix
     ./xresources.nix
     ./xsession.nix
     ./misc/nix.nix
diff --git a/modules/wayland.nix b/modules/wayland.nix
new file mode 100644
index 000000000..9a485c56c
--- /dev/null
+++ b/modules/wayland.nix
@@ -0,0 +1,24 @@
+{ lib, ... }:
+
+{
+  meta.maintainers = [ lib.maintainers.thiagokokada ];
+
+  options = {
+    wayland = {
+      systemd.target = lib.mkOption {
+        type = lib.types.str;
+        default = "graphical-session.target";
+        example = "sway-session.target";
+        description = ''
+          The systemd target that will automatically start the graphical Wayland services.
+          This option is a generalization of individual `systemd.target` or `systemdTarget`,
+          and affect all Wayland services by default.
+
+          When setting this value to `"sway-session.target"`,
+          make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
+          otherwise the service may never be started.
+        '';
+      };
+    };
+  };
+}

From 89fe48b1c1c51d5616343b71822a45f894b16dcf Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 09:57:06 +0000
Subject: [PATCH 199/546] swayidle: use config.wayland.systemd.target

Also add `Unit.After`.
---
 modules/services/swayidle.nix                           | 6 ++++--
 tests/modules/services/swayidle/basic-configuration.nix | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/services/swayidle.nix b/modules/services/swayidle.nix
index 7f3376a1c..fbb91db5b 100644
--- a/modules/services/swayidle.nix
+++ b/modules/services/swayidle.nix
@@ -88,7 +88,8 @@ in {
 
     systemdTarget = mkOption {
       type = types.str;
-      default = "graphical-session.target";
+      default = config.wayland.systemd.target;
+      defaultText = literalExpression "config.wayland.systemd.target";
       example = "sway-session.target";
       description = ''
         Systemd target to bind to.
@@ -107,7 +108,8 @@ in {
         Description = "Idle manager for Wayland";
         Documentation = "man:swayidle(1)";
         ConditionEnvironment = "WAYLAND_DISPLAY";
-        PartOf = [ "graphical-session.target" ];
+        PartOf = [ cfg.systemdTarget ];
+        After = [ cfg.systemdTarget ];
       };
 
       Service = {
diff --git a/tests/modules/services/swayidle/basic-configuration.nix b/tests/modules/services/swayidle/basic-configuration.nix
index c38f4d67d..c863883bb 100644
--- a/tests/modules/services/swayidle/basic-configuration.nix
+++ b/tests/modules/services/swayidle/basic-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, ... }:
 
 {
   services.swayidle = {
@@ -50,6 +50,7 @@
         Type=simple
 
         [Unit]
+        After=graphical-session.target
         ConditionEnvironment=WAYLAND_DISPLAY
         Description=Idle manager for Wayland
         Documentation=man:swayidle(1)

From 8587c2ff0ea82a93a265dbcbad7df88c80de1b9c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:00:57 +0000
Subject: [PATCH 200/546] waybar: use config.wayland.systemd.target

Also add `ConditionEnvironment`.
---
 modules/programs/waybar.nix                               | 8 +++++---
 .../modules/programs/waybar/deprecated-modules-option.nix | 4 +---
 tests/modules/programs/waybar/settings-complex.nix        | 4 +---
 tests/modules/programs/waybar/settings-with-attrs.nix     | 2 --
 tests/modules/programs/waybar/styling.nix                 | 4 +---
 .../waybar/systemd-with-graphical-session-target.nix      | 4 +---
 .../waybar/systemd-with-graphical-session-target.service  | 5 +++--
 7 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 8150223c1..dbbe89c3d 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -199,7 +199,8 @@ in {
 
     systemd.target = mkOption {
       type = str;
-      default = "graphical-session.target";
+      default = config.wayland.systemd.target;
+      defaultText = literalExpression "config.wayland.systemd.target";
       example = "sway-session.target";
       description = ''
         The systemd target that will automatically start the Waybar service.
@@ -309,8 +310,9 @@ in {
           Description =
             "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
           Documentation = "https://github.com/Alexays/Waybar/wiki";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session-pre.target" ];
+          PartOf = [ cfg.systemd.target ];
+          After = [ cfg.systemd.target ];
+          ConditionEnvironment = "WAYLAND_DISPLAY";
           X-Restart-Triggers = optional (settings != [ ])
             "${config.xdg.configFile."waybar/config".source}"
             ++ optional (cfg.style != null)
diff --git a/tests/modules/programs/waybar/deprecated-modules-option.nix b/tests/modules/programs/waybar/deprecated-modules-option.nix
index 09f163b0f..2c677aac3 100644
--- a/tests/modules/programs/waybar/deprecated-modules-option.nix
+++ b/tests/modules/programs/waybar/deprecated-modules-option.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
   config = {
diff --git a/tests/modules/programs/waybar/settings-complex.nix b/tests/modules/programs/waybar/settings-complex.nix
index 2e205a7df..a54131939 100644
--- a/tests/modules/programs/waybar/settings-complex.nix
+++ b/tests/modules/programs/waybar/settings-complex.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
   config = {
diff --git a/tests/modules/programs/waybar/settings-with-attrs.nix b/tests/modules/programs/waybar/settings-with-attrs.nix
index ac7e20fac..992e42c66 100644
--- a/tests/modules/programs/waybar/settings-with-attrs.nix
+++ b/tests/modules/programs/waybar/settings-with-attrs.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
   config = {
     home.stateVersion = "21.11";
diff --git a/tests/modules/programs/waybar/styling.nix b/tests/modules/programs/waybar/styling.nix
index 1952c4fbb..0025acd5f 100644
--- a/tests/modules/programs/waybar/styling.nix
+++ b/tests/modules/programs/waybar/styling.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
   config = {
diff --git a/tests/modules/programs/waybar/systemd-with-graphical-session-target.nix b/tests/modules/programs/waybar/systemd-with-graphical-session-target.nix
index dc7a620fa..e9694e533 100644
--- a/tests/modules/programs/waybar/systemd-with-graphical-session-target.nix
+++ b/tests/modules/programs/waybar/systemd-with-graphical-session-target.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
   config = {
diff --git a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
index c99c8c13a..f3e3b24a3 100644
--- a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
+++ b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
@@ -8,7 +8,8 @@ KillMode=mixed
 Restart=on-failure
 
 [Unit]
-After=graphical-session-pre.target
+After=sway-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
 Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
 Documentation=https://github.com/Alexays/Waybar/wiki
-PartOf=graphical-session.target
+PartOf=sway-session.target

From d3c500a8f8f88587c0867ba13ae6dba6e3c58cec Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:01:57 +0000
Subject: [PATCH 201/546] kanshi: use config.wayland.systemd.target

Also add `ConditionEnvironment`.
---
 modules/services/kanshi.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix
index 808966282..453944982 100644
--- a/modules/services/kanshi.nix
+++ b/modules/services/kanshi.nix
@@ -286,7 +286,8 @@ in {
 
     systemdTarget = mkOption {
       type = types.str;
-      default = "sway-session.target";
+      default = config.wayland.systemd.target;
+      defaultText = literalExpression "config.wayland.systemd.target";
       description = ''
         Systemd target to bind to.
       '';
@@ -342,6 +343,7 @@ in {
         Unit = {
           Description = "Dynamic output configuration";
           Documentation = "man:kanshi(1)";
+          ConditionEnvironment = "WAYLAND_DISPLAY";
           PartOf = cfg.systemdTarget;
           Requires = cfg.systemdTarget;
           After = cfg.systemdTarget;

From 4cbc8a58ab94e5eea5fe3185837d6489579a7f68 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:04:04 +0000
Subject: [PATCH 202/546] swaync: use config.wayland.systemd.target

---
 modules/services/swaync.nix              | 6 +++---
 tests/modules/services/swaync/swaync.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix
index 5f813af30..b8bb912ba 100644
--- a/modules/services/swaync.nix
+++ b/modules/services/swaync.nix
@@ -95,8 +95,8 @@ in {
       Unit = {
         Description = "Swaync notification daemon";
         Documentation = "https://github.com/ErikReider/SwayNotificationCenter";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session-pre.target" ];
+        PartOf = [ config.wayland.systemd.target ];
+        After = [ config.wayland.systemd.target ];
         ConditionEnvironment = "WAYLAND_DISPLAY";
       };
 
@@ -107,7 +107,7 @@ in {
         Restart = "on-failure";
       };
 
-      Install.WantedBy = [ "graphical-session.target" ];
+      Install.WantedBy = [ config.wayland.systemd.target ];
     };
   };
 }
diff --git a/tests/modules/services/swaync/swaync.nix b/tests/modules/services/swaync/swaync.nix
index ceb3bf065..550e5fed4 100644
--- a/tests/modules/services/swaync/swaync.nix
+++ b/tests/modules/services/swaync/swaync.nix
@@ -24,7 +24,7 @@
           Type=dbus
 
           [Unit]
-          After=graphical-session-pre.target
+          After=graphical-session.target
           ConditionEnvironment=WAYLAND_DISPLAY
           Description=Swaync notification daemon
           Documentation=https://github.com/ErikReider/SwayNotificationCenter

From 51ba4aacec867a1ecc2b92bf5ecdc66dbf9eb6c2 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:04:57 +0000
Subject: [PATCH 203/546] swayosd: use config.wayland.systemd.target

---
 modules/services/swayosd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/swayosd.nix b/modules/services/swayosd.nix
index 869b48729..f0eb1cf29 100644
--- a/modules/services/swayosd.nix
+++ b/modules/services/swayosd.nix
@@ -56,8 +56,8 @@ in {
       services.swayosd = {
         Unit = {
           Description = "Volume/backlight OSD indicator";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
+          PartOf = [ config.wayland.systemd.target ];
+          After = [ config.wayland.systemd.target ];
           ConditionEnvironment = "WAYLAND_DISPLAY";
           Documentation = "man:swayosd(1)";
           StartLimitBurst = 5;
@@ -76,7 +76,7 @@ in {
           RestartSec = "2s";
         };
 
-        Install = { WantedBy = [ "graphical-session.target" ]; };
+        Install = { WantedBy = [ config.wayland.systemd.target ]; };
       };
     };
   };

From adcf0b6281f4d8c00ea263c49f52a71130ee875f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:11:34 +0000
Subject: [PATCH 204/546] wob: use config.wayland.systemd.target

---
 modules/services/dunst.nix | 4 ++--
 modules/services/wob.nix   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 6b2727b3f..696783c15 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -180,8 +180,8 @@ in {
       systemd.user.services.dunst = {
         Unit = {
           Description = "Dunst notification daemon";
-          After = [ "graphical-session-pre.target" ];
-          PartOf = [ "graphical-session.target" ];
+          After = [ config.wayland.systemd.target ];
+          PartOf = [ config.wayland.systemd.target ];
         };
 
         Service = {
diff --git a/modules/services/wob.nix b/modules/services/wob.nix
index 8ca1befa8..d36565a00 100644
--- a/modules/services/wob.nix
+++ b/modules/services/wob.nix
@@ -50,8 +50,8 @@ in {
           Description =
             "A lightweight overlay volume/backlight/progress/anything bar for Wayland";
           Documentation = "man:wob(1)";
-          PartOf = "graphical-session.target";
-          After = "graphical-session.target";
+          PartOf = [ config.wayland.systemd.target ];
+          After = [ config.wayland.systemd.target ];
           ConditionEnvironment = "WAYLAND_DISPLAY";
         };
         Service = {
@@ -59,7 +59,7 @@ in {
           ExecStart = builtins.concatStringsSep " " ([ (getExe cfg.package) ]
             ++ optional (cfg.settings != { }) "--config ${configFile}");
         };
-        Install.WantedBy = [ "graphical-session.target" ];
+        Install.WantedBy = [ config.wayland.systemd.target ];
       };
 
       sockets.wob = {

From 8f48fea0f8a8392f4b81da07333342824fdb35c9 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:12:21 +0000
Subject: [PATCH 205/546] avizo: use config.wayland.systemd.target

---
 modules/services/avizo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/avizo.nix b/modules/services/avizo.nix
index 1bf1c1e68..4efefaa10 100644
--- a/modules/services/avizo.nix
+++ b/modules/services/avizo.nix
@@ -57,8 +57,8 @@ in {
       services.avizo = {
         Unit = {
           Description = "Volume/backlight OSD indicator";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
+          PartOf = [ config.wayland.systemd.target ];
+          After = [ config.wayland.systemd.target ];
           ConditionEnvironment = "WAYLAND_DISPLAY";
           Documentation = "man:avizo(1)";
         };
@@ -69,7 +69,7 @@ in {
           Restart = "always";
         };
 
-        Install = { WantedBy = [ "graphical-session.target" ]; };
+        Install = { WantedBy = [ config.wayland.systemd.target ]; };
       };
     };
   };

From da12f0b143558490efc52b7f550e19d9fcf27909 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:13:24 +0000
Subject: [PATCH 206/546] hyprpaper: use config.wayland.systemd.target

---
 modules/services/hyprpaper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix
index 6c9ddb2cf..39ff9a056 100644
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -68,13 +68,13 @@ in {
     };
 
     systemd.user.services.hyprpaper = {
-      Install = { WantedBy = [ "graphical-session.target" ]; };
+      Install = { WantedBy = [ config.wayland.systemd.target ]; };
 
       Unit = {
         ConditionEnvironment = "WAYLAND_DISPLAY";
         Description = "hyprpaper";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
+        After = [ config.wayland.systemd.target ];
+        PartOf = [ config.wayland.systemd.target ];
         X-Restart-Triggers = mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hyprpaper.conf".source}" ];
       };

From a6db8c8f6c201df0cfb5482241368ac02a5b17f3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:14:30 +0000
Subject: [PATCH 207/546] hypridle: use config.wayland.systemd.target

---
 modules/services/hypridle.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix
index 0d8a337b4..c2165e5b5 100644
--- a/modules/services/hypridle.nix
+++ b/modules/services/hypridle.nix
@@ -74,13 +74,13 @@ in {
     };
 
     systemd.user.services.hypridle = {
-      Install = { WantedBy = [ "graphical-session.target" ]; };
+      Install = { WantedBy = [ config.wayland.systemd.target ]; };
 
       Unit = {
         ConditionEnvironment = "WAYLAND_DISPLAY";
         Description = "hypridle";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
+        After = [ config.wayland.systemd.target ];
+        PartOf = [ config.wayland.systemd.target ];
         X-Restart-Triggers = mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hypridle.conf".source}" ];
       };

From 656ae5aba2d48adfe5bb3aa8d433b9a50cfb2a11 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:16:58 +0000
Subject: [PATCH 208/546] clipman: use config.wayland.systemd.target

Also add `ConditionEnvironment`.
---
 modules/services/clipman.nix                              | 8 +++++---
 .../services/clipman/clipman-sway-session-target.service  | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/services/clipman.nix b/modules/services/clipman.nix
index 4616c2984..3a93773f0 100644
--- a/modules/services/clipman.nix
+++ b/modules/services/clipman.nix
@@ -11,7 +11,8 @@ in {
 
     systemdTarget = mkOption {
       type = types.str;
-      default = "graphical-session.target";
+      default = config.wayland.systemd.target;
+      defaultText = literalExpression "config.wayland.systemd.target";
       example = "sway-session.target";
       description = ''
         The systemd target that will automatically start the clipman service.
@@ -34,8 +35,9 @@ in {
     systemd.user.services.clipman = {
       Unit = {
         Description = "Clipboard management daemon";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
+        PartOf = [ cfg.systemdTarget ];
+        After = [ cfg.systemdTarget ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
       };
 
       Service = {
diff --git a/tests/modules/services/clipman/clipman-sway-session-target.service b/tests/modules/services/clipman/clipman-sway-session-target.service
index 0d0478cc7..49de2ee3a 100644
--- a/tests/modules/services/clipman/clipman-sway-session-target.service
+++ b/tests/modules/services/clipman/clipman-sway-session-target.service
@@ -8,6 +8,7 @@ KillMode=mixed
 Restart=on-failure
 
 [Unit]
-After=graphical-session.target
+After=sway-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
 Description=Clipboard management daemon
-PartOf=graphical-session.target
+PartOf=sway-session.target

From 14cb0c8cfaa28d62a0e0cb4829e921635cd2b296 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 31 Dec 2024 10:27:09 +0000
Subject: [PATCH 209/546] fnott: use config.wayland.systemd.target

Also add missing `ConditionEnvironment`.
---
 modules/services/fnott.nix                                   | 5 +++--
 .../services/fnott/systemd-user-service-expected.service     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/fnott.nix b/modules/services/fnott.nix
index ecbd0fd15..e63cb571d 100644
--- a/modules/services/fnott.nix
+++ b/modules/services/fnott.nix
@@ -88,8 +88,9 @@ in {
       Unit = {
         Description = "Fnott notification daemon";
         Documentation = "man:fnott(1)";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
+        After = [ config.wayland.systemd.target ];
+        PartOf = [ config.wayland.systemd.target ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
       };
 
       Service = {
diff --git a/tests/modules/services/fnott/systemd-user-service-expected.service b/tests/modules/services/fnott/systemd-user-service-expected.service
index c39a7b19b..f6546df46 100644
--- a/tests/modules/services/fnott/systemd-user-service-expected.service
+++ b/tests/modules/services/fnott/systemd-user-service-expected.service
@@ -4,7 +4,8 @@ ExecStart=@fnott@/bin/fnott -c /home/hm-user/.config/fnott/fnott.ini
 Type=dbus
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
 Description=Fnott notification daemon
 Documentation=man:fnott(1)
 PartOf=graphical-session.target

From a9987622b7b93c82e147f198574e8e6ffbf5e327 Mon Sep 17 00:00:00 2001
From: midirhee12 <38054771+midirhee12@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:37:20 -0600
Subject: [PATCH 210/546] maintainers: updated username to midirhee12

- removed cvoges12 entry
- using respective maintainer entry in nixpkgs
- changed all hm modules' `meta.maintainers` to reflect new username /
  email
---
 modules/lib/maintainers.nix                 | 6 ------
 modules/services/network-manager-applet.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 64afe7615..7ee9e1df9 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -79,12 +79,6 @@
     github = "considerate";
     githubId = 217918;
   };
-  cvoges12 = {
-    name = "Clayton Voges";
-    email = "38054771+cvoges12@users.noreply.github.com";
-    github = "cvoges12";
-    githubId = 38054771;
-  };
   danjujan = {
     name = "Jan Schmitz";
     email = "44864658+danjujan@users.noreply.github.com";
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index 524921b71..343f57280 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.network-manager-applet;
 
 in {
-  meta.maintainers = [ maintainers.rycee hm.maintainers.cvoges12 ];
+  meta.maintainers = [ maintainers.rycee maintainers.midirhee12 ];
 
   options = {
     services.network-manager-applet = {

From 11ab08541e61ac3bbf2ab27229f68622629401df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Estrella?=
 <2049686+sestrella@users.noreply.github.com>
Date: Sat, 4 Jan 2025 03:24:51 -0500
Subject: [PATCH 211/546] ghostty: validate configuration on change

Runs `ghostty +validate-config` when the configuration file changes.

Co-authored-by: Heitor Augusto <IAm.HeitorALN@proton.me>
---
 modules/programs/ghostty.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index b2c147cc1..9ebaa7b30 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -120,6 +120,7 @@ in {
         {
           "ghostty/config" = lib.mkIf (cfg.settings != { }) {
             source = keyValue.generate "ghostty-config" cfg.settings;
+            onChange = "${lib.getExe cfg.package} +validate-config";
           };
         }
 

From 0d7908bd09165db6699908b7e3970f137327cbf0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 4 Jan 2025 18:56:03 +0100
Subject: [PATCH 212/546] neomutt: Document how to bind Ctrl keys (#6254)

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 modules/programs/neomutt.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index 588b801e4..15cda6302 100644
--- a/modules/programs/neomutt.nix
+++ b/modules/programs/neomutt.nix
@@ -130,7 +130,11 @@ let
       key = mkOption {
         type = types.str;
         example = "<left>";
-        description = "The key to bind.";
+        description = ''
+          The key to bind.
+
+          If you want to bind '\Cp' for example, which would be Ctrl + 'p', you need to escape twice: '\\Cp'!
+        '';
       };
 
       action = mkOption {

From 5ad12b6ea06b84e48f6b677957c74f32d47bdee0 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 5 Jan 2025 09:41:24 +0100
Subject: [PATCH 213/546] 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/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29)
  → 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 119d99ff1..7672c2194 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1735834308,
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {

From 4795ebe6cc6e5f60a3e66e3627b4f182ac4771b5 Mon Sep 17 00:00:00 2001
From: Dorian Burgun <docdoomduck@protonmail.com>
Date: Sun, 5 Jan 2025 16:00:50 +0100
Subject: [PATCH 214/546] Translate using Weblate (French)

Currently translated at 100.0% (16 of 16 strings)

Translate using Weblate (French)

Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: Dorian Burgun <docdoomduck@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/fr/
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/fr/
Translation: Home Manager/Home Manager CLI
Translation: Home Manager/Home Manager Modules
---
 home-manager/po/fr.po |  8 ++++----
 modules/po/fr.po      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/home-manager/po/fr.po b/home-manager/po/fr.po
index 9063df4ef..af18581d5 100644
--- a/home-manager/po/fr.po
+++ b/home-manager/po/fr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2024-04-29 18:07+0000\n"
-"Last-Translator: Michael Thomas <michaelhthomas@outlook.com>\n"
+"PO-Revision-Date: 2025-01-05 15:00+0000\n"
+"Last-Translator: Dorian Burgun <docdoomduck@protonmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/cli/"
 "fr/>\n"
 "Language: fr\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.5.2\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s : argument manquant pour %s"
+msgstr "%s: argument manquant pour %s"
 
 #: home-manager/home-manager:69
 msgid "No configuration file found at %s"
diff --git a/modules/po/fr.po b/modules/po/fr.po
index c95deeb0d..f50a211f4 100644
--- a/modules/po/fr.po
+++ b/modules/po/fr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-07-15 14:49+0000\n"
-"Last-Translator: swaps <swapgs@users.noreply.hosted.weblate.org>\n"
+"PO-Revision-Date: 2025-01-05 15:00+0000\n"
+"Last-Translator: Dorian Burgun <docdoomduck@protonmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/home-manager/"
 "modules/fr/>\n"
 "Language: fr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Nettoyage des liens orphelins de %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Création d'une nouvelle génération de profil"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Aucun changement, donc réutilisation du dernier profil généré"
 
 #: modules/home-environment.nix:643
 msgid ""

From 172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196 Mon Sep 17 00:00:00 2001
From: programmerlexi <lexi@reyer.name>
Date: Sun, 5 Jan 2025 16:00:50 +0100
Subject: [PATCH 215/546] Translate using Weblate (German)

Currently translated at 100.0% (16 of 16 strings)

Co-authored-by: programmerlexi <lexi@reyer.name>
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/de/
Translation: Home Manager/Home Manager Modules
---
 modules/po/de.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/po/de.po b/modules/po/de.po
index d7aa42ed6..18089f237 100644
--- a/modules/po/de.po
+++ b/modules/po/de.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2024-10-15 21:37+0000\n"
-"Last-Translator: Viktor Illmer <accounts@viktor.im>\n"
+"PO-Revision-Date: 2025-01-05 15:00+0000\n"
+"Last-Translator: programmerlexi <lexi@reyer.name>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/"
 "modules/de/>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Bereinige verwaiste Links unter %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Erstelle neue Profilgeneration"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Keine Änderung, verwende letzte Profilgeneration"
 
 #: modules/home-environment.nix:643
 msgid ""
@@ -80,11 +80,11 @@ msgstr ""
 
 #: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
-msgstr "Fehler: USER ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""
+msgstr "Fehler: USER ist auf \"%s\" gesetzt, aber es wird \"%s\" erwartet"
 
 #: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
-msgstr "Fehler: HOME ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""
+msgstr "Fehler: HOME ist auf \"%s\" gesetzt, aber es wird \"%s\" erwartet"
 
 #: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"

From 20665c6efa83d71020c8730f26706258ba5c6b2a Mon Sep 17 00:00:00 2001
From: Carl Dong <accounts@carldong.me>
Date: Mon, 6 Jan 2025 18:01:32 -0500
Subject: [PATCH 216/546] home-manager: remove path: URI type for flake default

This reverts commit 536b3fb883ddb6aa75756755f61b76806fe71009.
---
 home-manager/home-manager | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/home-manager b/home-manager/home-manager
index c9186a6ec..e64bb884d 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -191,7 +191,7 @@ function setFlakeAttribute() {
         fi
 
         if [[ -v configFlake ]]; then
-            FLAKE_ARG="path:$(dirname "$(readlink -f "$configFlake")")"
+            FLAKE_ARG="$(dirname "$(readlink -f "$configFlake")")"
         fi
     fi
 

From 5c4302313d9207f7ec0886d68f8ff4a3c71209a1 Mon Sep 17 00:00:00 2001
From: Batuhan Baserdem <19315586+bbaserdem@users.noreply.github.com>
Date: Tue, 7 Jan 2025 14:16:55 -0500
Subject: [PATCH 217/546] neomutt: added missing sort options (#6283)

* neovim: add valid sort options

Neomutt added a new prefix for sort options in 2022.
Added the new possible prefixes to the neomutt module.
---
 modules/programs/neomutt.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index 15cda6302..b513939df 100644
--- a/modules/programs/neomutt.nix
+++ b/modules/programs/neomutt.nix
@@ -372,7 +372,12 @@ in {
       sort = mkOption {
         # allow users to choose any option from sortOptions, or any option prefixed with "reverse-"
         type = types.enum
-          (sortOptions ++ (map (option: "reverse-" + option) sortOptions));
+          (builtins.concatMap (_pre: map (_opt: _pre + _opt) sortOptions) [
+            ""
+            "reverse-"
+            "last-"
+            "reverse-last-"
+          ]);
         default = "threads";
         description = "Sorting method on messages.";
       };

From 45bcdbc910dc5131943bb6f7edb156617898fd1a Mon Sep 17 00:00:00 2001
From: DDoSolitary <DDoSolitary@gmail.com>
Date: Wed, 8 Jan 2025 19:37:59 +0800
Subject: [PATCH 218/546] gpg-agent: fix compatibility with sh when
 enableSshSupport (#6287)

Co-authored-by: sunqiancheng <sunqiancheng@sensetime.com>
---
 modules/services/gpg-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 6bb19abe8..edb87a9d1 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -282,7 +282,7 @@ in {
           ++ [ cfg.extraConfig ]);
 
       home.sessionVariablesExtra = optionalString cfg.enableSshSupport ''
-        if [[ -z "$SSH_AUTH_SOCK" ]]; then
+        if [ -z "$SSH_AUTH_SOCK" ]; then
           export SSH_AUTH_SOCK="$(${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket)"
         fi
       '';

From 456e599f9101ed153dde268b4401c5d294ba6c8c Mon Sep 17 00:00:00 2001
From: 1444 <54070204+0x5a4@users.noreply.github.com>
Date: Wed, 8 Jan 2025 16:18:57 +0100
Subject: [PATCH 219/546] wayfire: add module (#6066)

Adds a Module for the Wayfire Compositor. Also allows managing the wf-shell configuration.
---
 modules/misc/news.nix                         |  15 +-
 modules/modules.nix                           |   1 +
 modules/services/window-managers/wayfire.nix  | 200 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../window-managers/wayfire/configuration.ini |  10 +
 .../window-managers/wayfire/configuration.nix |  22 ++
 .../window-managers/wayfire/default.nix       |   4 +
 .../window-managers/wayfire/wf-shell.ini      |   3 +
 .../window-managers/wayfire/wf-shell.nix      |  25 +++
 9 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/window-managers/wayfire.nix
 create mode 100644 tests/modules/services/window-managers/wayfire/configuration.ini
 create mode 100644 tests/modules/services/window-managers/wayfire/configuration.nix
 create mode 100644 tests/modules/services/window-managers/wayfire/default.nix
 create mode 100644 tests/modules/services/window-managers/wayfire/wf-shell.ini
 create mode 100644 tests/modules/services/window-managers/wayfire/wf-shell.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 699398dee..7a3604be9 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1861,7 +1861,6 @@ in {
           Some plugins require this to be set to 'false' to function correctly.
         '';
       }
-
       {
         time = "2024-12-08T17:22:13+00:00";
         condition = let
@@ -1947,6 +1946,20 @@ in {
           speed, features, or native UIs. Ghostty provides all three.
         '';
       }
+      {
+        time = "2025-01-04T15:00:00+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'wayland.windowManager.wayfire'.
+
+          Wayfire is a 3D Wayland compositor, inspired by Compiz and based on
+          wlroots. It aims to create a customizable, extendable and lightweight
+          environment without sacrificing its appearance.
+
+          This Home Manager module allows you to configure both wayfire itself,
+          as well as wf-shell.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 3c422eb5e..2aae09eb1 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -405,6 +405,7 @@ let
     ./services/window-managers/i3-sway/swaynag.nix
     ./services/window-managers/river.nix
     ./services/window-managers/spectrwm.nix
+    ./services/window-managers/wayfire.nix
     ./services/window-managers/xmonad.nix
     ./services/wlsunset.nix
     ./services/wob.nix
diff --git a/modules/services/window-managers/wayfire.nix b/modules/services/window-managers/wayfire.nix
new file mode 100644
index 000000000..c551eb05f
--- /dev/null
+++ b/modules/services/window-managers/wayfire.nix
@@ -0,0 +1,200 @@
+{ lib, pkgs, config, ... }: {
+  meta.maintainers = [ lib.maintainers._0x5a4 ];
+
+  options.wayland.windowManager.wayfire = let
+    types = lib.types;
+
+    configIniType = with types;
+      let
+        primitiveType = either str (either bool number);
+        sectionType = attrsOf primitiveType;
+      in attrsOf sectionType;
+  in {
+    enable =
+      lib.mkEnableOption "Wayfire, a wayland compositor based on wlroots";
+
+    package = lib.mkPackageOption pkgs "wayfire" {
+      nullable = true;
+      extraDescription = ''
+        Set to `null` to not add any wayfire package to your path.
+        This should be done if you want to use the NixOS wayfire module to install wayfire.
+      '';
+    };
+
+    plugins = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default = with pkgs.wayfirePlugins; [ wf-shell ];
+      defaultText =
+        lib.literalExpression "with pkgs.wayfirePlugins; [ wf-shell ]";
+      example = lib.literalExpression ''
+        with pkgs.wayfirePlugins; [
+          wcm
+          wf-shell
+          wayfire-plugins-extra
+        ];
+      '';
+      description = ''
+        Additional plugins to use with wayfire
+      '';
+    };
+
+    xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; };
+
+    settings = lib.mkOption {
+      type = types.submodule {
+        freeformType = configIniType;
+
+        options.core.plugins = lib.mkOption {
+          type = types.separatedString " ";
+          description = "Load the specified plugins";
+        };
+      };
+      default = { };
+      description = ''
+        Wayfire configuration written in Nix.
+
+        See <https://github.com/WayfireWM/wayfire/wiki/Configuration>
+      '';
+      example = lib.literalExpression ''
+        {
+          core.plugins = "command expo cube";
+          command = {
+            binding_terminal = "alacritty";
+            command_terminal = "alacritty";
+          };
+        }
+      '';
+    };
+
+    wf-shell = {
+      enable = lib.mkEnableOption "Manage wf-shell Configuration";
+
+      package = lib.mkPackageOption pkgs.wayfirePlugins "wf-shell" { };
+
+      settings = lib.mkOption {
+        type = configIniType;
+        default = { };
+        description = ''
+          Wf-shell configuration written in Nix.
+
+          See <https://github.com/WayfireWM/wf-shell/blob/master/wf-shell.ini.example>
+        '';
+        example = lib.literalExpression ''
+          {
+            panel = {
+              widgets_left = "menu spacing4 launchers window-list";
+              autohide = true;
+            };
+          }
+        '';
+      };
+    };
+
+    systemd = {
+      enable = lib.mkEnableOption null // {
+        default = true;
+        description = ''
+          Whether to enable {file}`wayfire-session.target` on
+          wayfire startup. This links to {file}`graphical-session.target`}.
+          Some important environment variables will be imported to systemd
+          and D-Bus user environment before reaching the target, including
+          - `DISPLAY`
+          - `WAYLAND_DISPLAY`
+          - `XDG_CURRENT_DESKTOP`
+          - `NIXOS_OZONE_WL`
+          - `XCURSOR_THEME`
+          - `XCURSOR_SIZE`
+        '';
+      };
+
+      variables = lib.mkOption {
+        type = types.listOf types.str;
+        default = [
+          "DISPLAY"
+          "WAYLAND_DISPLAY"
+          "XDG_CURRENT_DESKTOP"
+          "NIXOS_OZONE_WL"
+          "XCURSOR_THEME"
+          "XCURSOR_SIZE"
+        ];
+        example = [ "-all" ];
+        description = ''
+          Environment variables to be imported in the systemd & D-Bus user
+          environment.
+        '';
+      };
+
+      extraCommands = lib.mkOption {
+        type = types.listOf types.str;
+        default = [
+          "systemctl --user stop wayfire-session.target"
+          "systemctl --user start wayfire-session.target"
+        ];
+        description = "Extra commands to be run after D-Bus activation.";
+      };
+    };
+  };
+
+  config = let
+    cfg = config.wayland.windowManager.wayfire;
+
+    variables = builtins.concatStringsSep " " cfg.systemd.variables;
+    extraCommands = builtins.concatStringsSep " "
+      (map (f: "&& ${f}") cfg.systemd.extraCommands);
+    systemdActivation =
+      "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables} ${extraCommands}";
+
+    finalPackage = pkgs.wayfire-with-plugins.override {
+      wayfire = cfg.package;
+      plugins = cfg.plugins;
+    };
+  in lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "wayland.windowManager.wayfire" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = lib.mkIf (cfg.package != null) (lib.concatLists [
+      (lib.singleton finalPackage)
+      (lib.optional (cfg.xwayland.enable) pkgs.xwayland)
+    ]);
+
+    wayland.windowManager.wayfire = {
+      settings = {
+        autostart = lib.mkIf cfg.systemd.enable { inherit systemdActivation; };
+        core = {
+          plugins = lib.concatStringsSep " " (lib.concatLists [
+            (lib.optional (cfg.systemd.enable) "autostart")
+            (lib.optional (cfg.wf-shell.enable) "wayfire-shell")
+          ]);
+          xwayland = cfg.xwayland.enable;
+        };
+      };
+
+      plugins = lib.optional cfg.wf-shell.enable cfg.wf-shell.package;
+    };
+
+    xdg.configFile."wayfire.ini".text = lib.generators.toINI { } cfg.settings;
+
+    xdg.configFile."wf-shell.ini" = lib.mkIf cfg.wf-shell.enable {
+      text = lib.generators.toINI { } cfg.wf-shell.settings;
+    };
+
+    systemd.user.targets.wayfire-session = lib.mkIf cfg.systemd.enable {
+      Unit = {
+        Description = "wayfire compositor session";
+        Documentation = [ "man:systemd.special(7)" ];
+        BindsTo = [ "graphical-session.target" ];
+        Wants = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session-pre.target" ];
+      };
+    };
+
+    systemd.user.targets.tray = {
+      Unit = {
+        Description = "Home Manager System Tray";
+        Requires = [ "graphical-session-pre.target" ];
+      };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 3530138da..b95cd16a1 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -302,6 +302,7 @@ in import nmtSrc {
     ./modules/services/window-managers/river
     ./modules/services/window-managers/spectrwm
     ./modules/services/window-managers/sway
+    ./modules/services/window-managers/wayfire
     ./modules/services/wlsunset
     ./modules/services/wob
     ./modules/services/xsettingsd
diff --git a/tests/modules/services/window-managers/wayfire/configuration.ini b/tests/modules/services/window-managers/wayfire/configuration.ini
new file mode 100644
index 000000000..a40480412
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/configuration.ini
@@ -0,0 +1,10 @@
+[autostart]
+systemdActivation=/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop wayfire-session.target && systemctl --user start wayfire-session.target
+
+[command]
+binding_terminal=alacritty
+command_terminal=alacritty
+
+[core]
+plugins=command expo cube autostart
+xwayland=true
diff --git a/tests/modules/services/window-managers/wayfire/configuration.nix b/tests/modules/services/window-managers/wayfire/configuration.nix
new file mode 100644
index 000000000..07042329e
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/configuration.nix
@@ -0,0 +1,22 @@
+{ ... }: {
+  wayland.windowManager.wayfire = {
+    enable = true;
+    package = null;
+    settings = {
+      core.plugins = "command expo cube";
+      command = {
+        binding_terminal = "alacritty";
+        command_terminal = "alacritty";
+      };
+    };
+  };
+
+  nmt.script = ''
+    wayfireConfig=home-files/.config/wayfire.ini
+
+    assertFileExists "$wayfireConfig"
+
+    normalizedConfig=$(normalizeStorePaths "$wayfireConfig")
+    assertFileContent "$normalizedConfig" "${./configuration.ini}"
+  '';
+}
diff --git a/tests/modules/services/window-managers/wayfire/default.nix b/tests/modules/services/window-managers/wayfire/default.nix
new file mode 100644
index 000000000..0e252bb19
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/default.nix
@@ -0,0 +1,4 @@
+{
+  wayfire-configuration = ./configuration.nix;
+  wayfire-wf-shell = ./wf-shell.nix;
+}
diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.ini b/tests/modules/services/window-managers/wayfire/wf-shell.ini
new file mode 100644
index 000000000..02472a68a
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/wf-shell.ini
@@ -0,0 +1,3 @@
+[panel]
+autohide=true
+widgets_left=menu spacing4 launchers window-list
diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.nix b/tests/modules/services/window-managers/wayfire/wf-shell.nix
new file mode 100644
index 000000000..2c8221d80
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/wf-shell.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }: {
+  wayland.windowManager.wayfire = {
+    enable = true;
+    package = null;
+    wf-shell = {
+      enable = true;
+      package = pkgs.mkStubPackage { };
+      settings = {
+        panel = {
+          widgets_left = "menu spacing4 launchers window-list";
+          autohide = true;
+        };
+      };
+    };
+  };
+
+  nmt.script = ''
+    wfShellConfig=home-files/.config/wf-shell.ini
+
+    assertFileExists "$wfShellConfig"
+
+    normalizedConfig=$(normalizeStorePaths "$wfShellConfig")
+    assertFileContent "$normalizedConfig" "${./wf-shell.ini}"
+  '';
+}

From fcc4259cdbcb76138b48ed36b4f41c521910db0d Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 8 Jan 2025 15:24:04 +0000
Subject: [PATCH 220/546] treewide: stub tests (#6275)

* ranger: stub tests

* alacritty: stub tests

* broot: stub tests

* zsh: stub tests

* vim-vint: stub tests
---
 modules/programs/ranger.nix                   |  2 +-
 tests/modules/programs/alacritty/default.nix  |  2 +-
 .../programs/alacritty/example-settings.nix   |  2 ++
 .../programs/alacritty/settings-merging.nix   |  2 ++
 .../{toml_config.nix => toml-config.nix}      |  2 ++
 tests/modules/programs/broot/broot.nix        |  5 +++++
 .../modules/programs/ranger/configuration.nix |  2 ++
 .../programs/vim-vint/basic-configuration.nix |  4 +++-
 .../programs/zsh/history-ignore-pattern.nix   |  7 ++----
 .../programs/zsh/history-path-new-custom.nix  |  8 +++----
 .../programs/zsh/history-path-new-default.nix |  8 +++----
 .../programs/zsh/history-path-old-custom.nix  |  8 +++----
 .../programs/zsh/history-path-old-default.nix |  8 +++----
 .../programs/zsh/history-substring-search.nix |  8 +++----
 tests/modules/programs/zsh/prezto.nix         | 17 +++-----------
 .../programs/zsh/session-variables.nix        |  8 +++----
 .../programs/zsh/syntax-highlighting.nix      |  8 +++----
 tests/modules/programs/zsh/zsh-abbr.nix       |  4 ++--
 tests/modules/programs/zsh/zsh-stubs.nix      | 22 +++++++++++++++++++
 19 files changed, 68 insertions(+), 59 deletions(-)
 rename tests/modules/programs/alacritty/{toml_config.nix => toml-config.nix} (94%)
 create mode 100644 tests/modules/programs/zsh/zsh-stubs.nix

diff --git a/modules/programs/ranger.nix b/modules/programs/ranger.nix
index 63d33fad3..378db5f3b 100644
--- a/modules/programs/ranger.nix
+++ b/modules/programs/ranger.nix
@@ -142,7 +142,7 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       programs.ranger.finalPackage = cfg.package.overrideAttrs (oldAttrs: {
-        propagatedBuildInputs = oldAttrs.propagatedBuildInputs
+        propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or [ ])
           ++ cfg.extraPackages;
       });
 
diff --git a/tests/modules/programs/alacritty/default.nix b/tests/modules/programs/alacritty/default.nix
index e5445439d..7f70628b2 100644
--- a/tests/modules/programs/alacritty/default.nix
+++ b/tests/modules/programs/alacritty/default.nix
@@ -2,5 +2,5 @@
   alacritty-example-settings = ./example-settings.nix;
   alacritty-empty-settings = ./empty-settings.nix;
   alacritty-merging-settings = ./settings-merging.nix;
-  alacritty-toml-config = ./toml_config.nix;
+  alacritty-toml-config = ./toml-config.nix;
 }
diff --git a/tests/modules/programs/alacritty/example-settings.nix b/tests/modules/programs/alacritty/example-settings.nix
index c8ecb206c..ccda3b2c5 100644
--- a/tests/modules/programs/alacritty/example-settings.nix
+++ b/tests/modules/programs/alacritty/example-settings.nix
@@ -20,6 +20,8 @@
       };
     };
 
+    test.stubs = { alacritty = { }; };
+
     nmt.script = ''
       assertFileContent \
         home-files/.config/alacritty/alacritty.toml \
diff --git a/tests/modules/programs/alacritty/settings-merging.nix b/tests/modules/programs/alacritty/settings-merging.nix
index e08c96ebc..1d47b77a6 100644
--- a/tests/modules/programs/alacritty/settings-merging.nix
+++ b/tests/modules/programs/alacritty/settings-merging.nix
@@ -28,6 +28,8 @@
       };
     };
 
+    test.stubs = { alacritty = { }; };
+
     nmt.script = ''
       assertFileContent \
         home-files/.config/alacritty/alacritty.toml \
diff --git a/tests/modules/programs/alacritty/toml_config.nix b/tests/modules/programs/alacritty/toml-config.nix
similarity index 94%
rename from tests/modules/programs/alacritty/toml_config.nix
rename to tests/modules/programs/alacritty/toml-config.nix
index 7094f9a9d..8235d44c2 100644
--- a/tests/modules/programs/alacritty/toml_config.nix
+++ b/tests/modules/programs/alacritty/toml-config.nix
@@ -25,6 +25,8 @@
       };
     };
 
+    test.stubs = { alacritty = { }; };
+
     nmt.script = ''
       assertFileContent \
         home-files/.config/alacritty/alacritty.toml \
diff --git a/tests/modules/programs/broot/broot.nix b/tests/modules/programs/broot/broot.nix
index 17577f6f7..8bb7c02c4 100644
--- a/tests/modules/programs/broot/broot.nix
+++ b/tests/modules/programs/broot/broot.nix
@@ -6,6 +6,11 @@
     settings.modal = true;
   };
 
+  tests.stubs = {
+    broot = { };
+    hjson = { };
+  };
+
   nmt.script = ''
     assertFileExists home-files/.config/broot/conf.toml
     assertFileContains home-files/.config/broot/conf.toml 'modal = true'
diff --git a/tests/modules/programs/ranger/configuration.nix b/tests/modules/programs/ranger/configuration.nix
index 5d534e49c..90541ac32 100644
--- a/tests/modules/programs/ranger/configuration.nix
+++ b/tests/modules/programs/ranger/configuration.nix
@@ -31,6 +31,8 @@
     ];
   };
 
+  test.stubs = { ranger = { }; };
+
   nmt.script = ''
     assertFileExists home-files/.config/ranger/rc.conf
     assertFileContent home-files/.config/ranger/rc.conf \
diff --git a/tests/modules/programs/vim-vint/basic-configuration.nix b/tests/modules/programs/vim-vint/basic-configuration.nix
index 59bfafa5a..2e538f37f 100644
--- a/tests/modules/programs/vim-vint/basic-configuration.nix
+++ b/tests/modules/programs/vim-vint/basic-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, xdg, ... }:
+{ ... }:
 
 {
   programs.vim-vint = {
@@ -19,6 +19,8 @@
     };
   };
 
+  test.stubs = { vim-vint = { }; };
+
   nmt.script = ''
     assertFileContent home-files/.config/.vintrc.yaml ${
       ./basic-configuration.yaml
diff --git a/tests/modules/programs/zsh/history-ignore-pattern.nix b/tests/modules/programs/zsh/history-ignore-pattern.nix
index 68be58fe8..49865e846 100644
--- a/tests/modules/programs/zsh/history-ignore-pattern.nix
+++ b/tests/modules/programs/zsh/history-ignore-pattern.nix
@@ -1,9 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
   imports = [
+    ./zsh-stubs.nix
     ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "echo *" ]; })
     ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "rm *" ]; })
   ];
@@ -11,8 +10,6 @@ with lib;
   config = {
     programs.zsh.enable = true;
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'"
     '';
diff --git a/tests/modules/programs/zsh/history-path-new-custom.nix b/tests/modules/programs/zsh/history-path-new-custom.nix
index 1a691f1ca..ee6deb883 100644
--- a/tests/modules/programs/zsh/history-path-new-custom.nix
+++ b/tests/modules/programs/zsh/history-path-new-custom.nix
@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     home.stateVersion = "20.03";
     programs.zsh = {
@@ -10,8 +10,6 @@ with lib;
       history.path = "$HOME/some/directory/zsh_history";
     };
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
     '';
diff --git a/tests/modules/programs/zsh/history-path-new-default.nix b/tests/modules/programs/zsh/history-path-new-default.nix
index 06fe88d06..3ead97597 100644
--- a/tests/modules/programs/zsh/history-path-new-default.nix
+++ b/tests/modules/programs/zsh/history-path-new-default.nix
@@ -1,14 +1,12 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     home.stateVersion = "20.03";
     programs.zsh.enable = true;
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
     '';
diff --git a/tests/modules/programs/zsh/history-path-old-custom.nix b/tests/modules/programs/zsh/history-path-old-custom.nix
index 42a85d004..25a2babf5 100644
--- a/tests/modules/programs/zsh/history-path-old-custom.nix
+++ b/tests/modules/programs/zsh/history-path-old-custom.nix
@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     home.stateVersion = "19.09";
     programs.zsh = {
@@ -10,8 +10,6 @@ with lib;
       history.path = "some/directory/zsh_history";
     };
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
     '';
diff --git a/tests/modules/programs/zsh/history-path-old-default.nix b/tests/modules/programs/zsh/history-path-old-default.nix
index 490a2715d..b988ddb62 100644
--- a/tests/modules/programs/zsh/history-path-old-default.nix
+++ b/tests/modules/programs/zsh/history-path-old-default.nix
@@ -1,14 +1,12 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     home.stateVersion = "19.03";
     programs.zsh.enable = true;
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
     '';
diff --git a/tests/modules/programs/zsh/history-substring-search.nix b/tests/modules/programs/zsh/history-substring-search.nix
index 10560b9fa..a5f28b724 100644
--- a/tests/modules/programs/zsh/history-substring-search.nix
+++ b/tests/modules/programs/zsh/history-substring-search.nix
@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     programs.zsh = {
       enable = true;
@@ -13,8 +13,6 @@ with lib;
       };
     };
 
-    test.stubs.zsh = { };
-
     # Written with regex to ensure we don't end up missing newlines in the future
     nmt.script = ''
       assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[B\" history-substring-search-down$"
diff --git a/tests/modules/programs/zsh/prezto.nix b/tests/modules/programs/zsh/prezto.nix
index 922112ef9..7ce609063 100644
--- a/tests/modules/programs/zsh/prezto.nix
+++ b/tests/modules/programs/zsh/prezto.nix
@@ -1,20 +1,9 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
-  programs.zsh.prezto.enable = true;
+  imports = [ ./zsh-stubs.nix ];
 
-  test.stubs.zsh-prezto = {
-    outPath = null;
-    buildScript = ''
-      mkdir -p $out/share/zsh-prezto/runcoms
-      echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile
-      echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin
-      echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout
-      echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv
-    '';
-  };
+  programs.zsh.prezto.enable = true;
 
   nmt.script = ''
     assertFileExists home-files/.zpreztorc
diff --git a/tests/modules/programs/zsh/session-variables.nix b/tests/modules/programs/zsh/session-variables.nix
index f6f795f79..45c63d236 100644
--- a/tests/modules/programs/zsh/session-variables.nix
+++ b/tests/modules/programs/zsh/session-variables.nix
@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     programs.zsh = {
       enable = true;
@@ -13,8 +13,6 @@ with lib;
       };
     };
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileExists home-files/.zshenv
       assertFileRegex home-files/.zshenv 'export V1="v1"'
diff --git a/tests/modules/programs/zsh/syntax-highlighting.nix b/tests/modules/programs/zsh/syntax-highlighting.nix
index 052b228bd..2bd581473 100644
--- a/tests/modules/programs/zsh/syntax-highlighting.nix
+++ b/tests/modules/programs/zsh/syntax-highlighting.nix
@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   config = {
     programs.zsh = {
       enable = true;
@@ -15,8 +15,6 @@ with lib;
       };
     };
 
-    test.stubs.zsh = { };
-
     nmt.script = ''
       assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
       assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)"
diff --git a/tests/modules/programs/zsh/zsh-abbr.nix b/tests/modules/programs/zsh/zsh-abbr.nix
index 7e8370d00..f08345e05 100644
--- a/tests/modules/programs/zsh/zsh-abbr.nix
+++ b/tests/modules/programs/zsh/zsh-abbr.nix
@@ -1,13 +1,13 @@
 { ... }:
 
 {
+  imports = [ ./zsh-stubs.nix ];
+
   programs.zsh.zsh-abbr = {
     enable = true;
     abbreviations = { ga = "git add"; };
   };
 
-  test.stubs.zsh-abbr = { };
-
   nmt.script = ''
     abbreviations=home-files/.config/zsh-abbr/user-abbreviations
 
diff --git a/tests/modules/programs/zsh/zsh-stubs.nix b/tests/modules/programs/zsh/zsh-stubs.nix
new file mode 100644
index 000000000..d9e275aab
--- /dev/null
+++ b/tests/modules/programs/zsh/zsh-stubs.nix
@@ -0,0 +1,22 @@
+{ ... }:
+
+{
+  test.stubs = {
+    hello = { };
+    nix-zsh-completions = { };
+    zsh = { };
+    zsh-abbr = { };
+    zsh-history-substring-search = { };
+    zsh-prezto = {
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/share/zsh-prezto/runcoms
+        echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile
+        echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin
+        echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout
+        echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv
+      '';
+    };
+    zsh-syntax-highlighting = { };
+  };
+}

From 54b330ac067e74314f8ca6b38af6fcfbd17f3e9e Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Sat, 26 Oct 2024 00:00:00 +0700
Subject: [PATCH 221/546] go: add telemetry options

---
 modules/programs/go.nix                    | 39 ++++++++++++++++++++++
 tests/default.nix                          |  1 +
 tests/modules/programs/go/default.nix      |  1 +
 tests/modules/programs/go/go-telemetry.nix | 25 ++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 tests/modules/programs/go/default.nix
 create mode 100644 tests/modules/programs/go/go-telemetry.nix

diff --git a/modules/programs/go.nix b/modules/programs/go.nix
index 5d150036b..19b63eae3 100644
--- a/modules/programs/go.nix
+++ b/modules/programs/go.nix
@@ -6,6 +6,8 @@ let
 
   cfg = config.programs.go;
 
+  modeFileContent = "${cfg.telemetry.mode} ${cfg.telemetry.date}";
+
 in {
   meta.maintainers = [ maintainers.rvolosatovs ];
 
@@ -71,6 +73,31 @@ in {
           or checksum database.
         '';
       };
+
+      telemetry = mkOption {
+        type = types.submodule {
+          options = {
+            mode = mkOption {
+              type = with types; nullOr (enum [ "off" "local" "on" ]);
+              default = null;
+              description = "Go telemetry mode to be set.";
+            };
+
+            date = mkOption {
+              type = types.str;
+              default = "1970-01-01";
+              description = ''
+                The date indicating the date at which the modefile
+                was updated, in YYYY-MM-DD format. It's used to
+                reset the timeout before the next telemetry report
+                is uploaded when telemetry mode is set to "on".
+              '';
+            };
+          };
+        };
+        default = { };
+        description = "Options to configure Go telemetry mode.";
+      };
     };
   };
 
@@ -98,5 +125,17 @@ in {
     (mkIf (cfg.goPrivate != [ ]) {
       home.sessionVariables.GOPRIVATE = concatStringsSep "," cfg.goPrivate;
     })
+
+    (mkIf (cfg.telemetry.mode != null) {
+      home.file."Library/Application Support/go/telemetry/mode" = {
+        enable = pkgs.stdenv.hostPlatform.isDarwin;
+        text = modeFileContent;
+      };
+
+      xdg.configFile."go/telemetry/mode" = {
+        enable = !pkgs.stdenv.hostPlatform.isDarwin;
+        text = modeFileContent;
+      };
+    })
   ]);
 }
diff --git a/tests/default.nix b/tests/default.nix
index b95cd16a1..638845752 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -83,6 +83,7 @@ in import nmtSrc {
     ./modules/programs/git
     ./modules/programs/git-cliff
     ./modules/programs/git-credential-oauth
+    ./modules/programs/go
     ./modules/programs/gpg
     ./modules/programs/gradle
     ./modules/programs/granted
diff --git a/tests/modules/programs/go/default.nix b/tests/modules/programs/go/default.nix
new file mode 100644
index 000000000..cbf58092d
--- /dev/null
+++ b/tests/modules/programs/go/default.nix
@@ -0,0 +1 @@
+{ go-telemetry = ./go-telemetry.nix; }
diff --git a/tests/modules/programs/go/go-telemetry.nix b/tests/modules/programs/go/go-telemetry.nix
new file mode 100644
index 000000000..c0afd674a
--- /dev/null
+++ b/tests/modules/programs/go/go-telemetry.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  programs.go = {
+    enable = true;
+    telemetry = {
+      mode = "on";
+      date = "2006-01-02";
+    };
+  };
+
+  test.stubs.go = { };
+
+  nm.script = let
+    modeFileDir = if !pkgs.stdenv.isDarwin then
+      ".config/go/telemetry"
+    else
+      "Library/Application Support/go/telemetry";
+  in ''
+    assertFileExists "home-files/${modeFileDir}/mode"
+    assertFileContent \
+      "home-files/${modeFileDir}/mode" \
+      "on 2006-01-02"
+  '';
+}

From 7e00856596891850ba5ad4c5ecd2ed74468c08c5 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:01:05 +0100
Subject: [PATCH 222/546] 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/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)
  → 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7672c2194..8fb5d40f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {

From 01f40d52d65318463d71aa485fe9ad6f26357b45 Mon Sep 17 00:00:00 2001
From: "Shay Eclipse K. Stage" <ShayKStage@protonmail.com>
Date: Thu, 9 Jan 2025 12:04:34 +0100
Subject: [PATCH 223/546] zsh/prezto: add `package` option (#5938)

Allow setting a custom package for `programs.zsh.prezto`.
---
 modules/programs/zsh.nix        |  2 +-
 modules/programs/zsh/prezto.nix | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 50f8055c0..3e13404c5 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -671,7 +671,7 @@ in
 
         ''
         ${optionalString cfg.prezto.enable
-            (builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshrc")}
+            (builtins.readFile "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")}
 
         ${concatStrings (map (plugin: ''
           if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
diff --git a/modules/programs/zsh/prezto.nix b/modules/programs/zsh/prezto.nix
index 9a94f2385..5fdc8da23 100644
--- a/modules/programs/zsh/prezto.nix
+++ b/modules/programs/zsh/prezto.nix
@@ -14,6 +14,8 @@ let
     options = {
       enable = mkEnableOption "prezto";
 
+      package = mkPackageOption pkgs "prezto" { default = "zsh-prezto"; };
+
       caseSensitive = mkOption {
         type = types.nullOr types.bool;
         # See <https://github.com/nix-community/home-manager/issues/2255>.
@@ -379,15 +381,15 @@ in {
   };
   config = mkIf cfg.enable (mkMerge [{
     home.file."${relToDotDir ".zprofile"}".text =
-      builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zprofile";
+      builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zprofile";
     home.file."${relToDotDir ".zlogin"}".text =
-      builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zlogin";
+      builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zlogin";
     home.file."${relToDotDir ".zlogout"}".text =
-      builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zlogout";
-    home.packages = with pkgs; [ zsh-prezto ];
+      builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zlogout";
+    home.packages = [ cfg.package ];
 
     home.file."${relToDotDir ".zshenv"}".text =
-      builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshenv";
+      builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zshenv";
     home.file."${relToDotDir ".zpreztorc"}".text = ''
       # Generated by Nix
       ${optionalString (cfg.caseSensitive != null) ''

From d4aebb947a301b8da8654a804979a738c5c5da50 Mon Sep 17 00:00:00 2001
From: Kilian Mio <86004375+Mikilio@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:25:50 +0100
Subject: [PATCH 224/546] todoman: add todoman module (#5252)

* todoman: add todoman module

Adds Mikilio as maintainer for new module for todoman a standards-based
task manager based on iCalendar

Apply suggestions from code review

Co-authored-by: Robert Helgesson <robert@rycee.net>

Update modules/programs/todoman.nix

Co-authored-by: Robert Helgesson <robert@rycee.net>

* fix: correct config name

* chore: add test

---------

Co-authored-by: Robert Helgesson <robert@rycee.net>
---
 modules/lib/maintainers.nix                   |  6 ++
 modules/modules.nix                           |  1 +
 modules/programs/todoman.nix                  | 62 +++++++++++++++++++
 tests/modules/programs/todoman/config.nix     | 21 +++++++
 tests/modules/programs/todoman/default.nix    |  1 +
 .../programs/todoman/todoman-config-expected  |  3 +
 6 files changed, 94 insertions(+)
 create mode 100644 modules/programs/todoman.nix
 create mode 100644 tests/modules/programs/todoman/config.nix
 create mode 100644 tests/modules/programs/todoman/default.nix
 create mode 100644 tests/modules/programs/todoman/todoman-config-expected

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 7ee9e1df9..932d1196d 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -478,6 +478,12 @@
     github = "mainrs";
     githubId = 5113257;
   };
+  mikilio = {
+    name = "mikilio";
+    email = "official.mikilio+dev@gmail.com";
+    github = "mikilio";
+    githubId = 86004375;
+  };
   kmaasrud = {
     name = "Knut Magnus Aasrud";
     email = "km@aasrud.com";
diff --git a/modules/modules.nix b/modules/modules.nix
index 2aae09eb1..342ed06e2 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -246,6 +246,7 @@ let
     ./programs/tmate.nix
     ./programs/tmux.nix
     ./programs/tofi.nix
+    ./programs/todoman.nix
     ./programs/topgrade.nix
     ./programs/translate-shell.nix
     ./programs/urxvt.nix
diff --git a/modules/programs/todoman.nix b/modules/programs/todoman.nix
new file mode 100644
index 000000000..2e7ebf6a2
--- /dev/null
+++ b/modules/programs/todoman.nix
@@ -0,0 +1,62 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.todoman;
+
+  format = pkgs.formats.keyValue { };
+
+in {
+
+  meta.maintainers = [ hm.maintainers.mikilio ];
+
+  options.programs.todoman = {
+    enable = lib.mkEnableOption "todoman";
+
+    glob = mkOption {
+      type = types.str;
+      default = "*";
+      description = ''
+        The glob expansion which matches all directories relevant.
+      '';
+      example = "*/*";
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Text for configuration of todoman.
+        The syntax is Python.
+
+        See [docs](`https://todoman.readthedocs.io/en/stable/man.html#id5`).
+        for the full list of options.
+      '';
+      example = ''
+        date_format = "%Y-%m-%d";
+        time_format = "%H:%M";
+        default_list = "Personal";
+        default_due = 48;
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [{
+      assertion = config.accounts.calendar ? basePath;
+      message = ''
+        A base directory for calendars must be specified via
+        `accounts.calendar.basePath` to generate config for todoman
+      '';
+    }];
+
+    home.packages = [ pkgs.todoman ];
+
+    xdg.configFile."todoman/config.py".text = lib.concatLines [
+      ''path = "${config.accounts.calendar.basePath}/${cfg.glob}"''
+      cfg.extraConfig
+    ];
+  };
+}
diff --git a/tests/modules/programs/todoman/config.nix b/tests/modules/programs/todoman/config.nix
new file mode 100644
index 000000000..7323b7a43
--- /dev/null
+++ b/tests/modules/programs/todoman/config.nix
@@ -0,0 +1,21 @@
+{
+  programs.todoman = {
+    enable = true;
+    glob = "*/*";
+    extraConfig = ''
+      date_format = "%d.%m.%Y"
+      default_list = "test"
+    '';
+  };
+
+  accounts.calendar.basePath = "base/path/calendar";
+
+  test.stubs = { todoman = { }; };
+
+  nmt.script = ''
+    configFile=home-files/.config/todoman/config.py
+    assertFileExists $configFile
+    assertFileContent $configFile ${./todoman-config-expected}
+  '';
+}
+
diff --git a/tests/modules/programs/todoman/default.nix b/tests/modules/programs/todoman/default.nix
new file mode 100644
index 000000000..d429f9230
--- /dev/null
+++ b/tests/modules/programs/todoman/default.nix
@@ -0,0 +1 @@
+{ todoman-config = ./config.nix; }
diff --git a/tests/modules/programs/todoman/todoman-config-expected b/tests/modules/programs/todoman/todoman-config-expected
new file mode 100644
index 000000000..00da13e1a
--- /dev/null
+++ b/tests/modules/programs/todoman/todoman-config-expected
@@ -0,0 +1,3 @@
+path = "/home/hm-user/base/path/calendar/*/*"
+date_format = "%d.%m.%Y"
+default_list = "test"

From 2532b500c3ed2b8940e831039dcec5a5ea093afc Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Fri, 10 Jan 2025 12:31:03 +0100
Subject: [PATCH 225/546] ollama: add module (#5735)

---
 modules/modules.nix                           |  1 +
 modules/services/ollama.nix                   | 97 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/services/ollama/basic.nix       | 13 +++
 tests/modules/services/ollama/default.nix     |  4 +
 .../ollama/set-environment-variables.nix      | 22 +++++
 6 files changed, 138 insertions(+)
 create mode 100644 modules/services/ollama.nix
 create mode 100644 tests/modules/services/ollama/basic.nix
 create mode 100644 tests/modules/services/ollama/default.nix
 create mode 100644 tests/modules/services/ollama/set-environment-variables.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 342ed06e2..d20300d1a 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -346,6 +346,7 @@ let
     ./services/nextcloud-client.nix
     ./services/nix-gc.nix
     ./services/notify-osd.nix
+    ./services/ollama.nix
     ./services/opensnitch-ui.nix
     ./services/osmscout-server.nix
     ./services/owncloud-client.nix
diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix
new file mode 100644
index 000000000..66e1e8377
--- /dev/null
+++ b/modules/services/ollama.nix
@@ -0,0 +1,97 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.ollama;
+
+  ollamaPackage = if cfg.acceleration == null then
+    cfg.package
+  else
+    cfg.package.override { inherit (cfg) acceleration; };
+
+in {
+  meta.maintainers = [ maintainers.terlar ];
+
+  options = {
+    services.ollama = {
+      enable = mkEnableOption "ollama server for local large language models";
+
+      package = mkPackageOption pkgs "ollama" { };
+
+      host = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        example = "[::]";
+        description = ''
+          The host address which the ollama server HTTP interface listens to.
+        '';
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = 11434;
+        example = 11111;
+        description = ''
+          Which port the ollama server listens to.
+        '';
+      };
+
+      acceleration = mkOption {
+        type = types.nullOr (types.enum [ false "rocm" "cuda" ]);
+        default = null;
+        example = "rocm";
+        description = ''
+          What interface to use for hardware acceleration.
+
+          - `null`: default behavior
+            - if `nixpkgs.config.rocmSupport` is enabled, uses `"rocm"`
+            - if `nixpkgs.config.cudaSupport` is enabled, uses `"cuda"`
+            - otherwise defaults to `false`
+          - `false`: disable GPU, only use CPU
+          - `"rocm"`: supported by most modern AMD GPUs
+            - may require overriding gpu type with `services.ollama.rocmOverrideGfx`
+              if rocm doesn't detect your AMD gpu
+          - `"cuda"`: supported by most modern NVIDIA GPUs
+        '';
+      };
+
+      environmentVariables = mkOption {
+        type = types.attrsOf types.str;
+        default = { };
+        example = {
+          OLLAMA_LLM_LIBRARY = "cpu";
+          HIP_VISIBLE_DEVICES = "0,1";
+        };
+        description = ''
+          Set arbitrary environment variables for the ollama service.
+
+          Be aware that these are only seen by the ollama server (systemd service),
+          not normal invocations like `ollama run`.
+          Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.ollama = {
+      Unit = {
+        Description = "Server for local large language models";
+        After = [ "network.target" ];
+      };
+
+      Service = {
+        ExecStart = "${getExe ollamaPackage} serve";
+        Environment =
+          (mapAttrsToList (n: v: "${n}=${v}") cfg.environmentVariables)
+          ++ [ "OLLAMA_HOST=${cfg.host}:${toString cfg.port}" ];
+      };
+
+      Install = { WantedBy = [ "default.target" ]; };
+    };
+
+    home.packages = [ ollamaPackage ];
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 638845752..1f34bbcc8 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -270,6 +270,7 @@ in import nmtSrc {
     ./modules/services/mpd-mpris
     ./modules/services/mpdris2
     ./modules/services/nix-gc
+    ./modules/services/ollama
     ./modules/services/osmscout-server
     ./modules/services/pantalaimon
     ./modules/services/parcellite
diff --git a/tests/modules/services/ollama/basic.nix b/tests/modules/services/ollama/basic.nix
new file mode 100644
index 000000000..fecee950f
--- /dev/null
+++ b/tests/modules/services/ollama/basic.nix
@@ -0,0 +1,13 @@
+{
+  config = {
+    services.ollama.enable = true;
+
+    test.stubs.ollama = { };
+
+    nmt.script = ''
+      serviceFile="home-files/.config/systemd/user/ollama.service"
+      assertFileRegex "$serviceFile" 'After=network\.target'
+      assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=127.0.0.1:11434'
+    '';
+  };
+}
diff --git a/tests/modules/services/ollama/default.nix b/tests/modules/services/ollama/default.nix
new file mode 100644
index 000000000..84ad2c99e
--- /dev/null
+++ b/tests/modules/services/ollama/default.nix
@@ -0,0 +1,4 @@
+{
+  ollama-basic = ./basic.nix;
+  ollama-set-environment-variables = ./set-environment-variables.nix;
+}
diff --git a/tests/modules/services/ollama/set-environment-variables.nix b/tests/modules/services/ollama/set-environment-variables.nix
new file mode 100644
index 000000000..b9ad280c9
--- /dev/null
+++ b/tests/modules/services/ollama/set-environment-variables.nix
@@ -0,0 +1,22 @@
+{
+  config = {
+    services.ollama = {
+      enable = true;
+      host = "localhost";
+      port = 11111;
+      environmentVariables = {
+        OLLAMA_LLM_LIBRARY = "cpu";
+        HIP_VISIBLE_DEVICES = "0,1";
+      };
+    };
+
+    test.stubs.ollama = { };
+
+    nmt.script = ''
+      serviceFile="home-files/.config/systemd/user/ollama.service"
+      assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=localhost:11111'
+      assertFileRegex "$serviceFile" 'Environment=OLLAMA_LLM_LIBRARY=cpu'
+      assertFileRegex "$serviceFile" 'Environment=HIP_VISIBLE_DEVICES=0,1'
+    '';
+  };
+}

From 9616d81f98032d1ee9bec68ab4b6a8c833add88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?=
 <sebaszv@proton.me>
Date: Mon, 13 Jan 2025 10:20:04 -0500
Subject: [PATCH 226/546] mangohud: make `false` values actually disable
 (#6299)

Currently the following, will produce `some_opt=false` in the
rendered config:

```nix
programs.mangohud.settings = {
  some_opt = false;
};
```

With the intention being to disable the option, this would be
incorrect, as per the following stated at:
<https://github.com/flightlessmango/MangoHud/blob/0575c8eb1f61692a2e5ca152c4f8ed70bef55ee2/data/MangoHud.conf#L3C5-L4C1>

> Use some_parameter=0 to disable a parameter (only works with on/off
> parameters)

As such, I changed the rendering to follow this.
This will be output instead: `some_opt=0`
---
 modules/programs/mangohud.nix                            | 2 +-
 tests/modules/programs/mangohud/basic-configuration.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/mangohud.nix b/modules/programs/mangohud.nix
index a62587a2d..035a4744b 100644
--- a/modules/programs/mangohud.nix
+++ b/modules/programs/mangohud.nix
@@ -13,7 +13,7 @@ let
       int = toString option;
       float = int;
       path = int;
-      bool = "false";
+      bool = "0"; # "on/off" opts are disabled with `=0`
       string = option;
       list = concatStringsSep "," (lists.forEach option (x: toString x));
     }.${builtins.typeOf option};
diff --git a/tests/modules/programs/mangohud/basic-configuration.conf b/tests/modules/programs/mangohud/basic-configuration.conf
index 8ded2dbc0..87ecec5d6 100644
--- a/tests/modules/programs/mangohud/basic-configuration.conf
+++ b/tests/modules/programs/mangohud/basic-configuration.conf
@@ -6,7 +6,7 @@ cpu_stats
 cpu_temp
 cpu_text=CPU
 fps_limit=30,60
-legacy_layout=false
+legacy_layout=0
 media_player_name=spotify
 media_player_order=title,artist,album
 output_folder=/home/user/Documents/mangohud

From 0da8b6bae9b3179af68c72827541ef88cad413fc Mon Sep 17 00:00:00 2001
From: greenpsi <123899120+greenpsi@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:26:51 +0100
Subject: [PATCH 227/546] sway: allow sway specific hideEdgeBorders options
 (#6304)

* add `smart_no_gaps` option
* allow using `--i3` for hideEdgeBorders:

See e.g. https://man.archlinux.org/man/sway.5#Config_or_runtime_commands:

The --i3 option enables i3-compatible behavior to hide the title bar on tabbed and stacked containers with one child.
Co-authored-by: greenpsi <git@psinet.dev>
---
 modules/services/window-managers/i3-sway/lib/options.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix
index 2869c2bf8..6a3fcf1c1 100644
--- a/modules/services/window-managers/i3-sway/lib/options.nix
+++ b/modules/services/window-managers/i3-sway/lib/options.nix
@@ -421,7 +421,13 @@ in {
         };
 
         hideEdgeBorders = mkOption {
-          type = types.enum [ "none" "vertical" "horizontal" "both" "smart" ];
+          type = let
+            i3Options = [ "none" "vertical" "horizontal" "both" "smart" ];
+            swayOptions = i3Options ++ [ "smart_no_gaps" ];
+          in if isI3 then
+            types.enum i3Options
+          else
+            types.enum (swayOptions ++ (map (e: "--i3 ${e}") swayOptions));
           default = "none";
           description = "Hide window borders adjacent to the screen edges.";
         };

From fc52a210b60f2f52c74eac41a8647c1573d2071d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 13 Jan 2025 17:27:56 +0100
Subject: [PATCH 228/546] network-manager-applet: changed nm-applet description
 (#6311)

This makes it a bit easier to find.
---
 modules/services/network-manager-applet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index 343f57280..8d15aa293 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -11,7 +11,7 @@ in {
 
   options = {
     services.network-manager-applet = {
-      enable = mkEnableOption "the Network Manager applet";
+      enable = mkEnableOption "the Network Manager applet (nm-applet)";
     };
   };
 

From a1f180af1710c2b4a2b9e1a8f6d8871840497393 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 14 Jan 2025 13:37:43 -0600
Subject: [PATCH 229/546] hyprlock: add bezier to importantPrefixes

Since hyprwm/hyprlock@00d2cbf hyprlock supports the animation and bezier
keywords from Hyprland. But, bezier needs to be defined before an
animation can use it.
---
 modules/programs/hyprlock.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock.nix
index 25d871889..4933efaaa 100644
--- a/modules/programs/hyprlock.nix
+++ b/modules/programs/hyprlock.nix
@@ -102,9 +102,9 @@ in {
 
     importantPrefixes = lib.mkOption {
       type = with lib.types; listOf str;
-      default = [ "$" "monitor" "size" ]
+      default = [ "$" "bezier" "monitor" "size" ]
         ++ lib.optionals cfg.sourceFirst [ "source" ];
-      example = [ "$" "monitor" "size" ];
+      example = [ "$" "bezier" "monitor" "size" ];
       description = ''
         List of prefix of attributes to source at the top of the config.
       '';

From 0dfec9deb275854a56c97c356c40ef72e3a2e632 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 14 Jan 2025 13:39:00 -0600
Subject: [PATCH 230/546] hyprlock: remove with lib;

---
 modules/programs/hyprlock.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock.nix
index 4933efaaa..fe1014554 100644
--- a/modules/programs/hyprlock.nix
+++ b/modules/programs/hyprlock.nix
@@ -1,16 +1,14 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let
 
   cfg = config.programs.hyprlock;
 
 in {
-  meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ];
+  meta.maintainers = with lib.maintainers; [ khaneliman fufexan ];
 
   options.programs.hyprlock = {
-    enable = mkEnableOption "" // {
+    enable = lib.mkEnableOption "" // {
       description = ''
         Whether to enable Hyprlock, Hyprland's GPU-accelerated lock screen
         utility.
@@ -27,7 +25,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "hyprlock" { };
+    package = lib.mkPackageOption pkgs "hyprlock" { };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -111,12 +109,12 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
     xdg.configFile."hypr/hyprlock.conf" =
       let shouldGenerate = cfg.extraConfig != "" || cfg.settings != { };
-      in mkIf shouldGenerate {
+      in lib.mkIf shouldGenerate {
         text = lib.optionalString (cfg.settings != { })
           (lib.hm.generators.toHyprconf {
             attrs = cfg.settings;

From 12851ae7467bad8ef422b20806ab4d6d81e12d29 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 16 Jan 2025 19:54:26 -0500
Subject: [PATCH 231/546] thunderbird: Enable tests for Darwin (#6324)

---
 tests/default.nix                             |  2 +-
 .../thunderbird-expected-first-darwin.js      | 79 +++++++++++++++++++
 ...js => thunderbird-expected-first-linux.js} |  0
 .../thunderbird-expected-profiles-darwin.ini  | 14 ++++
 ...> thunderbird-expected-profiles-linux.ini} |  0
 .../thunderbird-expected-second-darwin.js     | 34 ++++++++
 ...s => thunderbird-expected-second-linux.js} |  0
 .../programs/thunderbird/thunderbird.nix      | 38 +++++----
 8 files changed, 151 insertions(+), 16 deletions(-)
 create mode 100644 tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
 rename tests/modules/programs/thunderbird/{thunderbird-expected-first.js => thunderbird-expected-first-linux.js} (100%)
 create mode 100644 tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini
 rename tests/modules/programs/thunderbird/{thunderbird-expected-profiles.ini => thunderbird-expected-profiles-linux.ini} (100%)
 create mode 100644 tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js
 rename tests/modules/programs/thunderbird/{thunderbird-expected-second.js => thunderbird-expected-second-linux.js} (100%)

diff --git a/tests/default.nix b/tests/default.nix
index 1f34bbcc8..b77c354c5 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -159,6 +159,7 @@ in import nmtSrc {
     ./modules/programs/tealdeer
     ./modules/programs/texlive
     ./modules/programs/thefuck
+    ./modules/programs/thunderbird
     ./modules/programs/tmate
     ./modules/programs/tmux
     ./modules/programs/topgrade
@@ -227,7 +228,6 @@ in import nmtSrc {
     ./modules/programs/swaylock
     ./modules/programs/swayr
     ./modules/programs/terminator
-    ./modules/programs/thunderbird
     ./modules/programs/tofi
     ./modules/programs/waybar
     ./modules/programs/wlogout
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
new file mode 100644
index 000000000..34f7f4eff
--- /dev/null
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
@@ -0,0 +1,79 @@
+// Generated by Home Manager.
+
+user_pref("general.useragent.override", "");
+user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.identities", "id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562");
+user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.server", "server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.accountmanager.defaultaccount", "account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.attachPgpKey", false);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.autoEncryptDrafts", true);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.e2etechpref", 0);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.encryptionpolicy", 0);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.fullName", "H. M. Test");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.htmlSigText", "signature");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.is_gnupg_key_id", true);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.last_entered_external_gnupg_key_id", "ABC");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.openpgp_key_id", "ABC");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.protectSubject", true);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.sign_mail", false);
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.smtpServer", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.useremail", "home-manager@example.com");
+user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.valid", true);
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.autoEncryptDrafts", false);
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.fullName", "H. M. Test Jr.");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.htmlSigText", "");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.protectSubject", false);
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.smtpServer", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.useremail", "hm@example.org");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.valid", true);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.attachPgpKey", false);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.autoEncryptDrafts", true);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.e2etechpref", 0);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.encryptionpolicy", 0);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.fullName", "H. M. Test");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.htmlSigText", "signature");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.is_gnupg_key_id", true);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.last_entered_external_gnupg_key_id", "ABC");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.openpgp_key_id", "ABC");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.protectSubject", true);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.sign_mail", false);
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.smtpServer", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.useremail", "hm@example.com");
+user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.valid", true);
+user_pref("mail.openpgp.allow_external_gnupg", true);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory", "Library/Thunderbird/Profiles/first/ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory-rel", "[ProfD]ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "imap.example.org");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.login_at_startup", true);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.name", "hm-account");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 143);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory", "Library/Thunderbird/Profiles/first/ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory-rel", "[ProfD]ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "imap.example.com");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.login_at_startup", true);
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.name", "hm@example.com");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.port", 123);
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.socketType", 3);
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.type", "imap");
+user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.userName", "home.manager");
+user_pref("mail.smtp.defaultserver", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.authMethod", 3);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "smtp.example.org");
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 587);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.try_ssl", 2);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.username", "home.manager.jr");
+user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.authMethod", 3);
+user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "smtp.example.com");
+user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.port", 456);
+user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.try_ssl", 3);
+user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.username", "home.manager");
+user_pref("mail.smtpservers", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("privacy.donottrackheader.enabled", true);
+
+user_pref("mail.html_compose", false);
+
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js
similarity index 100%
rename from tests/modules/programs/thunderbird/thunderbird-expected-first.js
rename to tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini
new file mode 100644
index 000000000..030551a91
--- /dev/null
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini
@@ -0,0 +1,14 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Default=1
+IsRelative=1
+Name=first
+Path=Profiles/first
+
+[Profile1]
+Default=0
+IsRelative=1
+Name=second
+Path=Profiles/second
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-profiles.ini b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-linux.ini
similarity index 100%
rename from tests/modules/programs/thunderbird/thunderbird-expected-profiles.ini
rename to tests/modules/programs/thunderbird/thunderbird-expected-profiles-linux.ini
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js b/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js
new file mode 100644
index 000000000..d634568c8
--- /dev/null
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js
@@ -0,0 +1,34 @@
+// Generated by Home Manager.
+
+user_pref("general.useragent.override", "");
+user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.autoEncryptDrafts", false);
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.fullName", "H. M. Test Jr.");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.htmlSigText", "");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.protectSubject", false);
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.smtpServer", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.useremail", "hm@example.org");
+user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.valid", true);
+user_pref("mail.openpgp.allow_external_gnupg", false);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory", "Library/Thunderbird/Profiles/second/ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory-rel", "[ProfD]ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "imap.example.org");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.login_at_startup", true);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.name", "hm-account");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 143);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3);
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap");
+user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr");
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.authMethod", 3);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "smtp.example.org");
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 587);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.try_ssl", 2);
+user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.username", "home.manager.jr");
+user_pref("mail.smtpservers", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("privacy.donottrackheader.enabled", true);
+user_pref("second", {"nested":{"evenFurtherNested":[1,2,3]}});
+user_pref("second.setting", "some-test-setting");
+
+
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-second.js b/tests/modules/programs/thunderbird/thunderbird-expected-second-linux.js
similarity index 100%
rename from tests/modules/programs/thunderbird/thunderbird-expected-second.js
rename to tests/modules/programs/thunderbird/thunderbird-expected-second-linux.js
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 127083977..366f8b045 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -1,4 +1,4 @@
-{
+{ pkgs, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   accounts.email.accounts = {
@@ -38,6 +38,9 @@
   programs.thunderbird = {
     enable = true;
 
+    # Disable warning so that platforms' behavior is the same
+    darwinSetupWarning = false;
+
     profiles = {
       first = {
         isDefault = true;
@@ -67,25 +70,30 @@
 
   test.stubs.thunderbird = { };
 
-  nmt.script = ''
-    assertFileExists home-files/.thunderbird/profiles.ini
-    assertFileContent home-files/.thunderbird/profiles.ini \
-      ${./thunderbird-expected-profiles.ini}
+  nmt.script = let
+    isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+    configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
+    profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}";
+    platform = if isDarwin then "darwin" else "linux";
+  in ''
+    assertFileExists home-files/${configDir}/profiles.ini
+    assertFileContent home-files/${configDir}/profiles.ini \
+      ${./thunderbird-expected-profiles-${platform}.ini}
 
-    assertFileExists home-files/.thunderbird/first/user.js
-    assertFileContent home-files/.thunderbird/first/user.js \
-      ${./thunderbird-expected-first.js}
+    assertFileExists home-files/${profilesDir}/first/user.js
+    assertFileContent home-files/${profilesDir}/first/user.js \
+      ${./thunderbird-expected-first-${platform}.js}
 
-    assertFileExists home-files/.thunderbird/second/user.js
-    assertFileContent home-files/.thunderbird/second/user.js \
-      ${./thunderbird-expected-second.js}
+    assertFileExists home-files/${profilesDir}/second/user.js
+    assertFileContent home-files/${profilesDir}/second/user.js \
+      ${./thunderbird-expected-second-${platform}.js}
 
-    assertFileExists home-files/.thunderbird/first/chrome/userChrome.css
-    assertFileContent home-files/.thunderbird/first/chrome/userChrome.css \
+    assertFileExists home-files/${profilesDir}/first/chrome/userChrome.css
+    assertFileContent home-files/${profilesDir}/first/chrome/userChrome.css \
       <(echo "* { color: blue !important; }")
 
-    assertFileExists home-files/.thunderbird/first/chrome/userContent.css
-    assertFileContent home-files/.thunderbird/first/chrome/userContent.css \
+    assertFileExists home-files/${profilesDir}/first/chrome/userContent.css
+    assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \
       <(echo "* { color: red !important; }")
   '';
 }

From a0046af169ce7b1da503974e1b22c48ef4d71887 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Fri, 17 Jan 2025 14:30:39 +0100
Subject: [PATCH 232/546] Translations update from Hosted Weblate

* Add translation using Weblate (Toki Pona)

Co-authored-by: Kylie McClain <kylie@somas.is>

* Add translation using Weblate (Toki Pona)

Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>

---------

Co-authored-by: Kylie McClain <kylie@somas.is>
Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>
---
 home-manager/po/tok.po | 216 +++++++++++++++++++++++++++++++++++++++++
 modules/po/tok.po      |  93 ++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 home-manager/po/tok.po
 create mode 100644 modules/po/tok.po

diff --git a/home-manager/po/tok.po b/home-manager/po/tok.po
new file mode 100644
index 000000000..3def9a8e6
--- /dev/null
+++ b/home-manager/po/tok.po
@@ -0,0 +1,216 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: tok\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. translators: For example: "home-manager: missing argument for --cores"
+#: home-manager/home-manager:16
+msgid "%s: missing argument for %s"
+msgstr ""
+
+#: home-manager/home-manager:69
+msgid "No configuration file found at %s"
+msgstr ""
+
+#. translators: The first '%s' specifier will be replaced by either
+#. 'home.nix' or 'flake.nix'.
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
+msgid ""
+"Keeping your Home Manager %s in %s is deprecated,\n"
+"please move it to %s"
+msgstr ""
+
+#: home-manager/home-manager:97
+msgid "No configuration file found. Please create one at %s"
+msgstr ""
+
+#: home-manager/home-manager:112
+msgid "Home Manager not found at %s."
+msgstr ""
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:120
+msgid ""
+"The fallback Home Manager path %s has been deprecated and a file/directory "
+"was found there."
+msgstr ""
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:123
+msgid ""
+"To remove this warning, do one of the following.\n"
+"\n"
+"1. Explicitly tell Home Manager to use the path, for example by adding\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   to your configuration.\n"
+"\n"
+"   If you import Home Manager directly, you can use the `path` parameter\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   when calling the Home Manager package.\n"
+"\n"
+"2. Remove the deprecated path.\n"
+"\n"
+"     $ rm -r \"%s\""
+msgstr ""
+
+#: home-manager/home-manager:151
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: home-manager/home-manager:171
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:226
+msgid "Can't inspect options of a flake configuration"
+msgstr ""
+
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
+msgid "%s: unknown option '%s'"
+msgstr ""
+
+#: home-manager/home-manager:306 home-manager/home-manager:1062
+msgid "Run '%s --help' for usage help"
+msgstr ""
+
+#: home-manager/home-manager:332 home-manager/home-manager:437
+msgid "The file %s already exists, leaving it unchanged..."
+msgstr ""
+
+#: home-manager/home-manager:334 home-manager/home-manager:439
+msgid "Creating %s..."
+msgstr ""
+
+#: home-manager/home-manager:481
+msgid "Creating initial Home Manager generation..."
+msgstr ""
+
+#. translators: The "%s" specifier will be replaced by a file path.
+#: home-manager/home-manager:486
+msgid ""
+"All done! The home-manager tool should now be installed and you can edit\n"
+"\n"
+"    %s\n"
+"\n"
+"to configure Home Manager. Run 'man home-configuration.nix' to\n"
+"see all available options."
+msgstr ""
+
+#. translators: The "%s" specifier will be replaced by a URL.
+#: home-manager/home-manager:491
+msgid ""
+"Uh oh, the installation failed! Please create an issue at\n"
+"\n"
+"    %s\n"
+"\n"
+"if the error seems to be the fault of Home Manager."
+msgstr ""
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:502
+msgid "Can't instantiate a flake configuration"
+msgstr ""
+
+#: home-manager/home-manager:578
+msgid ""
+"There is %d unread and relevant news item.\n"
+"Read it by running the command \"%s news\"."
+msgid_plural ""
+"There are %d unread and relevant news items.\n"
+"Read them by running the command \"%s news\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: home-manager/home-manager:592
+msgid "Unknown \"news.display\" setting \"%s\"."
+msgstr ""
+
+#: home-manager/home-manager:600
+#, sh-format
+msgid "Please set the $EDITOR or $VISUAL environment variable"
+msgstr ""
+
+#: home-manager/home-manager:618
+msgid "Cannot run build in read-only directory"
+msgstr ""
+
+#: home-manager/home-manager:699
+msgid "No generation with ID %s"
+msgstr ""
+
+#: home-manager/home-manager:701
+msgid "Cannot remove the current generation %s"
+msgstr ""
+
+#: home-manager/home-manager:703
+msgid "Removing generation %s"
+msgstr ""
+
+#: home-manager/home-manager:724
+msgid "No generations to expire"
+msgstr ""
+
+#: home-manager/home-manager:735
+msgid "No home-manager packages seem to be installed."
+msgstr ""
+
+#: home-manager/home-manager:820
+msgid "Unknown argument %s"
+msgstr ""
+
+#: home-manager/home-manager:845
+msgid "This will remove Home Manager from your system."
+msgstr ""
+
+#: home-manager/home-manager:848
+msgid "This is a dry run, nothing will actually be uninstalled."
+msgstr ""
+
+#: home-manager/home-manager:852
+msgid "Really uninstall Home Manager?"
+msgstr ""
+
+#: home-manager/home-manager:858
+msgid "Switching to empty Home Manager configuration..."
+msgstr ""
+
+#: home-manager/home-manager:873
+msgid "Yay!"
+msgstr ""
+
+#: home-manager/home-manager:878
+msgid "Home Manager is uninstalled but your home.nix is left untouched."
+msgstr ""
+
+#: home-manager/home-manager:1101
+msgid "expire-generations expects one argument, got %d."
+msgstr ""
+
+#: home-manager/home-manager:1123
+msgid "Unknown command: %s"
+msgstr ""
+
+#: home-manager/install.nix:18
+msgid "This derivation is not buildable, please run it using nix-shell."
+msgstr ""
diff --git a/modules/po/tok.po b/modules/po/tok.po
new file mode 100644
index 000000000..d20bb2b51
--- /dev/null
+++ b/modules/po/tok.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager Modules package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager Modules\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: tok\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: modules/files.nix:188
+msgid "Creating home file links in %s"
+msgstr ""
+
+#: modules/files.nix:201
+msgid "Cleaning up orphan links from %s"
+msgstr ""
+
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
+msgid ""
+"Oops, Nix failed to install your new Home Manager profile!\n"
+"\n"
+"Perhaps there is a conflict with a package that was installed using\n"
+"\"%s\"? Try running\n"
+"\n"
+"    %s\n"
+"\n"
+"and if there is a conflicting package you can remove it with\n"
+"\n"
+"    %s\n"
+"\n"
+"Then try activating your Home Manager configuration again."
+msgstr ""
+
+#: modules/home-environment.nix:676
+msgid "Activating %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:22
+msgid "Migrating profile from %s to %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:54
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:106
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:115
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:132
+msgid "Starting Home Manager activation"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:136
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:149
+msgid "This is a dry run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:153
+msgid "This is a live run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:159
+msgid "Using Nix version: %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:162
+msgid "Activation variables:"
+msgstr ""

From 495de1e197e7e113ad8877dad4c29a66482a093c Mon Sep 17 00:00:00 2001
From: Rasmus Enevoldsen <rasmus@enev.dk>
Date: Fri, 17 Jan 2025 13:17:00 +0000
Subject: [PATCH 233/546] Translate using Weblate (Danish)

Currently translated at 100.0% (16 of 16 strings)

Translation: Home Manager/Home Manager Modules
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/da/
---
 modules/po/da.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/po/da.po b/modules/po/da.po
index 5ab26890d..c8ec04871 100644
--- a/modules/po/da.po
+++ b/modules/po/da.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-09-27 11:02+0000\n"
-"Last-Translator: Emil Heilbo <yuki@yukie.dev>\n"
+"PO-Revision-Date: 2025-01-18 01:23+0000\n"
+"Last-Translator: Rasmus Enevoldsen <rasmus@enev.dk>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/"
 "modules/da/>\n"
 "Language: da\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.1-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Oprydder forældreløse links fra %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Laver ny profil generation"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Ingen ændring, så genbruger den tidligste profil generation"
 
 #: modules/home-environment.nix:643
 msgid ""

From 1e36429705f9af2d00a517ba46a4f21ef8a8194f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prudent?= <jprudent@gmail.com>
Date: Sat, 18 Jan 2025 09:22:15 +0100
Subject: [PATCH 234/546] sbt: allow irregular plugins to be configured

Sometimes plugins doesn't follow the form

```
addSbtPlugin("${plugin.org}" % "${plugin.artifact}" % "${plugin.version}")
```

for instance

```
addDependencyTreePlugin
```

This commit allow free form plugin dependency.
---
 modules/programs/sbt.nix               | 19 +++++++++++++++++--
 tests/modules/programs/sbt/plugins.nix |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/programs/sbt.nix b/modules/programs/sbt.nix
index de14bc6f3..622768298 100644
--- a/modules/programs/sbt.nix
+++ b/modules/programs/sbt.nix
@@ -130,6 +130,20 @@ in {
       '';
     };
 
+    pluginsExtra = mkOption {
+      type = types.listOf (types.str);
+      default = [ ];
+      example = literalExpression ''
+        [
+          "addDependencyTreePlugin"
+        ]
+      '';
+      description = ''
+        A list of extra commands to put in plugins conf file.
+        Use it in last resort when you can't use the `plugins` option.
+      '';
+    };
+
     credentials = mkOption {
       type = types.listOf (sbtTypes.credential);
       default = [ ];
@@ -183,9 +197,10 @@ in {
   config = mkIf cfg.enable (mkMerge [
     { home.packages = [ cfg.package ]; }
 
-    (mkIf (cfg.plugins != [ ]) {
+    (mkIf (cfg.plugins != [ ] || cfg.pluginsExtra != [ ]) {
       home.file."${cfg.baseUserConfigPath}/1.0/plugins/plugins.sbt".text =
-        concatStrings (map renderPlugin cfg.plugins);
+        concatStrings (map renderPlugin cfg.plugins)
+        + concatStringsSep "\n" cfg.pluginsExtra + "\n";
     })
 
     (mkIf (cfg.credentials != [ ]) {
diff --git a/tests/modules/programs/sbt/plugins.nix b/tests/modules/programs/sbt/plugins.nix
index b413de80e..c898ad465 100644
--- a/tests/modules/programs/sbt/plugins.nix
+++ b/tests/modules/programs/sbt/plugins.nix
@@ -15,12 +15,14 @@ let
   };
 
   plugins = [ dependencyGraph projectGraph ];
+  pluginsExtra = [ "addDependencyTreePlugin" ];
 
   pluginsSbtPath = ".sbt/1.0/plugins/plugins.sbt";
 
   expectedPluginsSbt = pkgs.writeText "plugins.sbt" ''
     addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
     addSbtPlugin("com.dwijnand" % "sbt-project-graph" % "0.4.0")
+    addDependencyTreePlugin
   '';
 
 in {
@@ -28,6 +30,7 @@ in {
     programs.sbt = {
       enable = true;
       plugins = plugins;
+      pluginsExtra = pluginsExtra;
       package = pkgs.writeScriptBin "sbt" "";
     };
 

From 1c75a4c151dfe417c73ae3f87a6eba0b009c438c Mon Sep 17 00:00:00 2001
From: Jdogzz <2792697+Jdogzz@users.noreply.github.com>
Date: Sat, 18 Jan 2025 09:35:27 -0800
Subject: [PATCH 235/546] syncthing: have tray wait for bar to load (#6290)

Add --wait flag to tray to avoid loading before bar.
---
 modules/services/syncthing.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 165ff1455..f609b3b65 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -726,7 +726,8 @@ in {
           };
 
           Service = {
-            ExecStart = "${pkgs.syncthingtray-minimal}/bin/syncthingtray";
+            ExecStart =
+              "${pkgs.syncthingtray-minimal}/bin/syncthingtray --wait";
           };
 
           Install = { WantedBy = [ "graphical-session.target" ]; };

From 97d7946b5e107dd03cc82f21165251d4e0159655 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 18 Jan 2025 11:35:49 -0600
Subject: [PATCH 236/546] {hypridle, hyrpaper}: remove with lib; (#6318)

* hypridle: remove with lib;

* hyprpaper: remove with lib;
---
 modules/services/hypridle.nix  | 19 ++++++++-----------
 modules/services/hyprpaper.nix | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix
index c2165e5b5..155f4ac36 100644
--- a/modules/services/hypridle.nix
+++ b/modules/services/hypridle.nix
@@ -1,15 +1,12 @@
 { config, lib, pkgs, ... }:
-with lib;
-let
-
-  cfg = config.services.hypridle;
+let cfg = config.services.hypridle;
 in {
-  meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ];
+  meta.maintainers = with lib.maintainers; [ khaneliman fufexan ];
 
   options.services.hypridle = {
-    enable = mkEnableOption "Hypridle, Hyprland's idle daemon";
+    enable = lib.mkEnableOption "Hypridle, Hyprland's idle daemon";
 
-    package = mkPackageOption pkgs "hypridle" { };
+    package = lib.mkPackageOption pkgs "hypridle" { };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -65,8 +62,8 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
-    xdg.configFile."hypr/hypridle.conf" = mkIf (cfg.settings != { }) {
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."hypr/hypridle.conf" = lib.mkIf (cfg.settings != { }) {
       text = lib.hm.generators.toHyprconf {
         attrs = cfg.settings;
         inherit (cfg) importantPrefixes;
@@ -81,12 +78,12 @@ in {
         Description = "hypridle";
         After = [ config.wayland.systemd.target ];
         PartOf = [ config.wayland.systemd.target ];
-        X-Restart-Triggers = mkIf (cfg.settings != { })
+        X-Restart-Triggers = lib.mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hypridle.conf".source}" ];
       };
 
       Service = {
-        ExecStart = "${getExe cfg.package}";
+        ExecStart = "${lib.getExe cfg.package}";
         Restart = "always";
         RestartSec = "10";
       };
diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix
index 39ff9a056..03eabf94c 100644
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -1,15 +1,12 @@
 { config, lib, pkgs, ... }:
-with lib;
-let
-
-  cfg = config.services.hyprpaper;
+let cfg = config.services.hyprpaper;
 in {
-  meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ];
+  meta.maintainers = with lib.maintainers; [ khaneliman fufexan ];
 
   options.services.hyprpaper = {
-    enable = mkEnableOption "Hyprpaper, Hyprland's wallpaper daemon";
+    enable = lib.mkEnableOption "Hyprpaper, Hyprland's wallpaper daemon";
 
-    package = mkPackageOption pkgs "hyprpaper" { };
+    package = lib.mkPackageOption pkgs "hyprpaper" { };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -59,8 +56,8 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
-    xdg.configFile."hypr/hyprpaper.conf" = mkIf (cfg.settings != { }) {
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."hypr/hyprpaper.conf" = lib.mkIf (cfg.settings != { }) {
       text = lib.hm.generators.toHyprconf {
         attrs = cfg.settings;
         inherit (cfg) importantPrefixes;
@@ -75,12 +72,12 @@ in {
         Description = "hyprpaper";
         After = [ config.wayland.systemd.target ];
         PartOf = [ config.wayland.systemd.target ];
-        X-Restart-Triggers = mkIf (cfg.settings != { })
+        X-Restart-Triggers = lib.mkIf (cfg.settings != { })
           [ "${config.xdg.configFile."hypr/hyprpaper.conf".source}" ];
       };
 
       Service = {
-        ExecStart = "${getExe cfg.package}";
+        ExecStart = "${lib.getExe cfg.package}";
         Restart = "always";
         RestartSec = "10";
       };

From f8ef4541bb8a54a8b52f19b52912119e689529b3 Mon Sep 17 00:00:00 2001
From: cupiditas <Ligert123@hotmail.com>
Date: Mon, 20 Jan 2025 01:08:57 +1000
Subject: [PATCH 237/546] nixpkgs: lib.isFunction replaces builtins.isFunction
 in check for overlayType (#6338)

Replaces the check attribute on overlayType with lib.isFunction so it matches the nixpkgs overlayType.
This lets functions that were made by lib.setFunctionArgs to be used as overlays just like the nixpkgs overlayType.
---
 modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index efbbba96c..971491af4 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -36,7 +36,7 @@ let
   overlayType = mkOptionType {
     name = "nixpkgs-overlay";
     description = "nixpkgs overlay";
-    check = builtins.isFunction;
+    check = lib.isFunction;
     merge = lib.mergeOneOption;
   };
 

From 9786661d57c476021c8a0c3e53bf9fa2b4f3328b Mon Sep 17 00:00:00 2001
From: wrvsrx <42770726+wrvsrx@users.noreply.github.com>
Date: Tue, 21 Jan 2025 01:42:53 +0800
Subject: [PATCH 238/546] fcitx5: allow to set fcitx5-with-addons (#5770)

Now there's `libsForQt5.fcitx5` and `kdePackages.fcitx5` in nixpkgs, we
should allow user to choose which one to use.
---
 modules/i18n/input-method/fcitx5.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 3c2d1c191..a02f8ed20 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -5,11 +5,18 @@ with lib;
 let
   im = config.i18n.inputMethod;
   cfg = im.fcitx5;
-  fcitx5Package =
-    pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
+  fcitx5Package = cfg.fcitx5-with-addons.override { inherit (cfg) addons; };
 in {
   options = {
     i18n.inputMethod.fcitx5 = {
+      fcitx5-with-addons = mkOption {
+        type = types.package;
+        default = pkgs.libsForQt5.fcitx5-with-addons;
+        example = literalExpression "pkgs.kdePackages.fcitx5-with-addons";
+        description = ''
+          The fcitx5 package to use.
+        '';
+      };
       addons = mkOption {
         type = with types; listOf package;
         default = [ ];

From 0b8df9eeb66941ef32e5761ecf4cddff91e5c020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?=
 <robertomartinezp@gmail.com>
Date: Tue, 21 Jan 2025 13:12:40 +0100
Subject: [PATCH 239/546] lsd: add support for icons.yaml

This update introduces support for icons.yaml in the lsd module,
enhancing the customization options for file icons.

Co-authored-by: pancho horrillo <pancho@pancho.name>
---
 modules/programs/lsd.nix                      | 28 +++++++++++++++++++
 .../programs/lsd/example-icons-expected.yaml  |  9 ++++++
 .../modules/programs/lsd/example-settings.nix | 18 ++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 tests/modules/programs/lsd/example-icons-expected.yaml

diff --git a/modules/programs/lsd.nix b/modules/programs/lsd.nix
index 0053a494f..beefef8c2 100644
--- a/modules/programs/lsd.nix
+++ b/modules/programs/lsd.nix
@@ -65,6 +65,30 @@ in {
         automatically set to `"custom"`.
       '';
     };
+
+    icons = mkOption {
+      type = yamlFormat.type;
+      default = { };
+      example = {
+        name = {
+          ".trash" = "";
+          ".cargo" = "";
+        };
+        extension = {
+          "go" = "";
+          "hs" = "";
+        };
+        filetype = {
+          "dir" = "📂";
+          "file" = "📄";
+        };
+      };
+      description = ''
+        Configuration written to {file}`$XDG_CONFIG_HOME/lsd/icons.yaml`. See
+        <https://github.com/lsd-rs/lsd?tab=readme-ov-file#icon-theme-file-content> for
+        details.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -91,6 +115,10 @@ in {
       source = yamlFormat.generate "lsd-colors" cfg.colors;
     };
 
+    xdg.configFile."lsd/icons.yaml" = mkIf (cfg.icons != { }) {
+      source = yamlFormat.generate "lsd-icons" cfg.icons;
+    };
+
     xdg.configFile."lsd/config.yaml" = mkIf (cfg.settings != { }) {
       source = yamlFormat.generate "lsd-config" cfg.settings;
     };
diff --git a/tests/modules/programs/lsd/example-icons-expected.yaml b/tests/modules/programs/lsd/example-icons-expected.yaml
new file mode 100644
index 000000000..a640b3bc7
--- /dev/null
+++ b/tests/modules/programs/lsd/example-icons-expected.yaml
@@ -0,0 +1,9 @@
+extension:
+  go: 
+  hs: 
+filetype:
+  dir: 📂
+  file: 📄
+name:
+  .cargo: 
+  .trash: 
diff --git a/tests/modules/programs/lsd/example-settings.nix b/tests/modules/programs/lsd/example-settings.nix
index f9217a098..01c143a60 100644
--- a/tests/modules/programs/lsd/example-settings.nix
+++ b/tests/modules/programs/lsd/example-settings.nix
@@ -26,6 +26,20 @@ with lib;
           large = "dark_yellow";
         };
       };
+      icons = {
+        name = {
+          ".trash" = "";
+          ".cargo" = "";
+        };
+        extension = {
+          "go" = "";
+          "hs" = "";
+        };
+        filetype = {
+          "dir" = "📂";
+          "file" = "📄";
+        };
+      };
     };
 
     test.stubs.lsd = { };
@@ -33,12 +47,16 @@ with lib;
     nmt.script = ''
       assertFileExists home-files/.config/lsd/config.yaml
       assertFileExists home-files/.config/lsd/colors.yaml
+      assertFileExists home-files/.config/lsd/icons.yaml
       assertFileContent \
         home-files/.config/lsd/config.yaml \
         ${./example-settings-expected.yaml}
       assertFileContent \
         home-files/.config/lsd/colors.yaml \
         ${./example-colors-expected.yaml}
+      assertFileContent \
+        home-files/.config/lsd/icons.yaml \
+        ${./example-icons-expected.yaml}
     '';
   };
 }

From bb14224f51ae4caed12a7b26f245d042c8cf8553 Mon Sep 17 00:00:00 2001
From: Nova Leary <coder.nova99@mailbox.org>
Date: Tue, 21 Jan 2025 06:14:48 -0600
Subject: [PATCH 240/546] mu: allow option to set muhome

Allows for the database path for mu to be configured. Useful for keeping
the maildir and mu xapian cache together without having to modify
XDG_CACHE_HOME. Add test to check for custom home setting.

Fixes #5534
---
 modules/programs/mu.nix                       | 19 +++++++++++---
 .../programs/mu/basic-configuration.nix       |  2 +-
 .../programs/mu/custom-configuration.nix      | 25 +++++++++++++++++++
 tests/modules/programs/mu/default.nix         |  5 +++-
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 tests/modules/programs/mu/custom-configuration.nix

diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix
index d1543f000..f5ef51b0a 100644
--- a/modules/programs/mu.nix
+++ b/modules/programs/mu.nix
@@ -36,6 +36,16 @@ in {
 
       package = mkPackageOption pkgs "mu" { };
 
+      home = mkOption {
+        type = types.path;
+        default = config.xdg.cacheHome + "/mu";
+        defaultText = literalExpression ''config.xdg.cacheHome + "/mu"'';
+        example = "\${config.home.homeDirectory}/Maildir/.mu";
+        description = ''
+          Directory to store Mu's database.
+        '';
+      };
+
       # No options/config file present for mu, and program author will not be
       # adding one soon. See https://github.com/djcb/mu/issues/882 for more
       # information about this.
@@ -51,9 +61,10 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
+    home.sessionVariables.MUHOME = cfg.home;
+
     home.activation.runMuInit = let
       maildirOption = genCmdMaildir config.accounts.email.maildirBasePath;
-      dbLocation = config.xdg.cacheHome + "/mu";
       muExe = getExe cfg.package;
       gawkExe = getExe pkgs.gawk;
     in hm.dag.entryAfter [ "writeBoundary" ] ''
@@ -62,10 +73,12 @@ in {
       # In theory, mu is the only thing that creates that directory, and it is
       # only created during the initial index.
       MU_SORTED_ADDRS=$((${muExe} info store | ${gawkExe} '/personal-address/{print $4}' | LC_ALL=C sort | paste -sd ' ') || exit 0)
-      if [[ ! -d "${dbLocation}" || ! "$MU_SORTED_ADDRS" = "${
+      if [[ ! -d "${cfg.home}" || ! "$MU_SORTED_ADDRS" = "${
         concatStringsSep " " sortedAddresses
       }" ]]; then
-        run ${muExe} init ${maildirOption} ${myAddresses} $VERBOSE_ARG;
+        run ${muExe} init ${maildirOption} --muhome "${
+          escapeShellArg cfg.home
+        }" ${myAddresses} $VERBOSE_ARG;
       fi
     '';
   };
diff --git a/tests/modules/programs/mu/basic-configuration.nix b/tests/modules/programs/mu/basic-configuration.nix
index edca63a70..60c14697a 100644
--- a/tests/modules/programs/mu/basic-configuration.nix
+++ b/tests/modules/programs/mu/basic-configuration.nix
@@ -19,6 +19,6 @@
       'if [[ ! -d "/home/hm-user/.cache/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then'
 
     assertFileContains activate \
-      'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;'
+      'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --muhome "/home/hm-user/.cache/mu" --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;'
   '';
 }
diff --git a/tests/modules/programs/mu/custom-configuration.nix b/tests/modules/programs/mu/custom-configuration.nix
new file mode 100644
index 000000000..41f9b84ce
--- /dev/null
+++ b/tests/modules/programs/mu/custom-configuration.nix
@@ -0,0 +1,25 @@
+{ config, ... }: {
+  imports = [ ../../accounts/email-test-accounts.nix ];
+
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      mu.enable = true;
+      aliases = [ "foo@example.com" ];
+    };
+  };
+
+  programs.mu = {
+    enable = true;
+    home = config.xdg.dataHome + "/mu";
+  };
+
+  test.stubs.mu = { name = "mu"; };
+
+  nmt.script = ''
+    assertFileContains activate \
+      'if [[ ! -d "/home/hm-user/.local/share/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then'
+
+    assertFileContains activate \
+      'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --muhome "/home/hm-user/.local/share/mu" --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;'
+  '';
+}
diff --git a/tests/modules/programs/mu/default.nix b/tests/modules/programs/mu/default.nix
index bdd8b1560..8d150aef3 100644
--- a/tests/modules/programs/mu/default.nix
+++ b/tests/modules/programs/mu/default.nix
@@ -1 +1,4 @@
-{ mu-basic-configuration = ./basic-configuration.nix; }
+{
+  mu-basic-configuration = ./basic-configuration.nix;
+  mu-custom-configuration = ./custom-configuration.nix;
+}

From 96dee79b178d295b716052feca3ee46abc085abe Mon Sep 17 00:00:00 2001
From: pancho horrillo <pancho@pancho.name>
Date: Tue, 21 Jan 2025 17:53:23 +0100
Subject: [PATCH 241/546] lsd: remove with lib;

---
 modules/programs/lsd.nix | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/programs/lsd.nix b/modules/programs/lsd.nix
index beefef8c2..fecff3c6e 100644
--- a/modules/programs/lsd.nix
+++ b/modules/programs/lsd.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.programs.lsd;
@@ -21,17 +19,17 @@ in {
   meta.maintainers = [ ];
 
   options.programs.lsd = {
-    enable = mkEnableOption "lsd";
+    enable = lib.mkEnableOption "lsd";
 
-    enableAliases = mkOption {
+    enableAliases = lib.mkOption {
       default = false;
-      type = types.bool;
+      type = lib.types.bool;
       description = ''
         Whether to enable recommended lsd aliases.
       '';
     };
 
-    settings = mkOption {
+    settings = lib.mkOption {
       type = yamlFormat.type;
       default = { };
       example = {
@@ -46,7 +44,7 @@ in {
       '';
     };
 
-    colors = mkOption {
+    colors = lib.mkOption {
       type = yamlFormat.type;
       default = { };
       example = {
@@ -66,7 +64,7 @@ in {
       '';
     };
 
-    icons = mkOption {
+    icons = lib.mkOption {
       type = yamlFormat.type;
       default = { };
       example = {
@@ -91,35 +89,35 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ pkgs.lsd ];
 
-    programs.bash.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.bash.shellAliases = lib.mkIf cfg.enableAliases aliases;
 
-    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.zsh.shellAliases = lib.mkIf cfg.enableAliases aliases;
 
-    programs.fish = mkMerge [
-      (mkIf (!config.programs.fish.preferAbbrs) {
-        shellAliases = mkIf cfg.enableAliases aliases;
+    programs.fish = lib.mkMerge [
+      (lib.mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = lib.mkIf cfg.enableAliases aliases;
       })
 
-      (mkIf config.programs.fish.preferAbbrs {
-        shellAbbrs = mkIf cfg.enableAliases aliases;
+      (lib.mkIf config.programs.fish.preferAbbrs {
+        shellAbbrs = lib.mkIf cfg.enableAliases aliases;
       })
     ];
 
     programs.lsd =
-      mkIf (cfg.colors != { }) { settings.color.theme = "custom"; };
+      lib.mkIf (cfg.colors != { }) { settings.color.theme = "custom"; };
 
-    xdg.configFile."lsd/colors.yaml" = mkIf (cfg.colors != { }) {
+    xdg.configFile."lsd/colors.yaml" = lib.mkIf (cfg.colors != { }) {
       source = yamlFormat.generate "lsd-colors" cfg.colors;
     };
 
-    xdg.configFile."lsd/icons.yaml" = mkIf (cfg.icons != { }) {
+    xdg.configFile."lsd/icons.yaml" = lib.mkIf (cfg.icons != { }) {
       source = yamlFormat.generate "lsd-icons" cfg.icons;
     };
 
-    xdg.configFile."lsd/config.yaml" = mkIf (cfg.settings != { }) {
+    xdg.configFile."lsd/config.yaml" = lib.mkIf (cfg.settings != { }) {
       source = yamlFormat.generate "lsd-config" cfg.settings;
     };
   };

From 4481a16d1ac5bff4a77c608cefe08c9b9efe840d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=AFl=20Senhaji?=
 <134528+iSma@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:52:56 +0100
Subject: [PATCH 242/546] yazi: improve fish integration

Calls yazi as `command yazi`, allowing to use "yazi" as
`shellWrapperName`. Also defines the wrapper with
`programs.fish.functions` instead of `interactiveShellInit`.
---
 modules/misc/news.nix                         | 13 +++++++++++++
 modules/programs/yazi.nix                     | 14 ++++++--------
 .../yazi/fish-integration-enabled.nix         | 19 +++++--------------
 .../yazi/fish-integration-expected.fish       |  8 ++++++++
 4 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 tests/modules/programs/yazi/fish-integration-expected.fish

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 7a3604be9..c578d2378 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1960,6 +1960,19 @@ in {
           as well as wf-shell.
         '';
       }
+
+      {
+        time = "2025-01-21T17:28:13+00:00";
+        condition = with config.programs.yazi; enable && enableFishIntegration;
+        message = ''
+          Yazi's fish shell integration wrapper now calls the 'yazi' executable
+          directly, ignoring any shell aliases with the same name.
+
+          Your configuration may break if you rely on the wrapper calling a
+          'yazi' alias.
+        '';
+      }
     ];
   };
 }
+
diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 314c4c5ed..a17f2952e 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -18,14 +18,12 @@ let
   '';
 
   fishIntegration = ''
-    function ${cfg.shellWrapperName}
-      set tmp (mktemp -t "yazi-cwd.XXXXX")
-      yazi $argv --cwd-file="$tmp"
-      if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-        builtin cd -- "$cwd"
-      end
-      rm -f -- "$tmp"
+    set -l tmp (mktemp -t "yazi-cwd.XXXXX")
+    command yazi $argv --cwd-file="$tmp"
+    if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+      builtin cd -- "$cwd"
     end
+    rm -f -- "$tmp"
   '';
 
   nushellIntegration = ''
@@ -202,7 +200,7 @@ in {
 
     programs.zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration;
 
-    programs.fish.interactiveShellInit =
+    programs.fish.functions.${cfg.shellWrapperName} =
       mkIf cfg.enableFishIntegration fishIntegration;
 
     programs.nushell.extraConfig =
diff --git a/tests/modules/programs/yazi/fish-integration-enabled.nix b/tests/modules/programs/yazi/fish-integration-enabled.nix
index 2231035b9..8e54e5e7a 100644
--- a/tests/modules/programs/yazi/fish-integration-enabled.nix
+++ b/tests/modules/programs/yazi/fish-integration-enabled.nix
@@ -1,27 +1,18 @@
-{ ... }:
+{ config, ... }:
 
-let
-  shellIntegration = ''
-    function yy
-      set tmp (mktemp -t "yazi-cwd.XXXXX")
-      yazi $argv --cwd-file="$tmp"
-      if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-        builtin cd -- "$cwd"
-      end
-      rm -f -- "$tmp"
-    end
-  '';
-in {
+{
   programs.fish.enable = true;
 
   programs.yazi = {
     enable = true;
+    shellWrapperName = "yy";
     enableFishIntegration = true;
   };
 
   test.stubs.yazi = { };
 
   nmt.script = ''
-    assertFileContains home-files/.config/fish/config.fish '${shellIntegration}'
+    assertFileContent home-files/.config/fish/functions/${config.programs.yazi.shellWrapperName}.fish \
+      ${./fish-integration-expected.fish}
   '';
 }
diff --git a/tests/modules/programs/yazi/fish-integration-expected.fish b/tests/modules/programs/yazi/fish-integration-expected.fish
new file mode 100644
index 000000000..d8f11f284
--- /dev/null
+++ b/tests/modules/programs/yazi/fish-integration-expected.fish
@@ -0,0 +1,8 @@
+function yy
+    set -l tmp (mktemp -t "yazi-cwd.XXXXX")
+    command yazi $argv --cwd-file="$tmp"
+    if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+        builtin cd -- "$cwd"
+    end
+    rm -f -- "$tmp"
+end

From cefb1889b96ddd1dac3dd4734e894f4cadab7802 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Wed, 22 Jan 2025 20:51:32 +0100
Subject: [PATCH 243/546] Translate using Weblate (Czech)

Currently translated at 93.7% (15 of 16 strings)

Translation: Home Manager/Home Manager Modules
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/cs/

Co-authored-by: Dark Templar <dark.templar0007@gmail.com>
---
 modules/po/cs.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/po/cs.po b/modules/po/cs.po
index c7049413f..485425172 100644
--- a/modules/po/cs.po
+++ b/modules/po/cs.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-12-08 12:04+0000\n"
-"Last-Translator: David Houdek <sarejnovec@gmail.com>\n"
+"PO-Revision-Date: 2025-01-22 01:25+0000\n"
+"Last-Translator: Dark Templar <dark.templar0007@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/home-manager/"
 "modules/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,7 +29,7 @@ msgstr "Čištění osiřelých linků z %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Vytváření nových generací profilu"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"

From 1757aca1640bebd7495f2784844f21a8dd712f8d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 23 Jan 2025 09:37:37 +0100
Subject: [PATCH 244/546] go: stub systemd dependency in test

---
 tests/modules/programs/go/go-telemetry.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/modules/programs/go/go-telemetry.nix b/tests/modules/programs/go/go-telemetry.nix
index c0afd674a..4ea06cbc8 100644
--- a/tests/modules/programs/go/go-telemetry.nix
+++ b/tests/modules/programs/go/go-telemetry.nix
@@ -9,7 +9,10 @@
     };
   };
 
-  test.stubs.go = { };
+  test.stubs = {
+    go = { };
+    systemd = { };
+  };
 
   nm.script = let
     modeFileDir = if !pkgs.stdenv.isDarwin then

From 4806e9c021e8f1d78b0bb7bc4ecc75d27a31a4bb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Jan 2025 08:05:26 +0100
Subject: [PATCH 245/546] flake.lock: Update

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8fb5d40f6..2cb35833e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736012469,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "lastModified": 1737469691,
+        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
         "type": "github"
       },
       "original": {

From b17008a795066bd3b4da86d7614a3be0efb0092e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 23 Jan 2025 11:37:30 +0100
Subject: [PATCH 246/546] swayr: update expected test result

---
 .../programs/swayr/basic-configuration.toml   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/tests/modules/programs/swayr/basic-configuration.toml b/tests/modules/programs/swayr/basic-configuration.toml
index 3252a632a..a7a6e68a5 100644
--- a/tests/modules/programs/swayr/basic-configuration.toml
+++ b/tests/modules/programs/swayr/basic-configuration.toml
@@ -13,10 +13,35 @@ workspace_format = "{indent}<b>Workspace {name} [{layout}]</b> on output {output
 
 [layout]
 auto_tile = false
-auto_tile_min_window_width_per_output_width = [[800, 400], [1024, 500], [1280, 600], [1400, 680], [1440, 700], [1600, 780], [1680, 780], [1920, 920], [2048, 980], [2560, 1000], [3440, 1200], [3840, 1280], [4096, 1400], [4480, 1600], [7680, 2400]]
+auto_tile_min_window_width_per_output_width = [
+    [800, 400],
+    [1024, 500],
+    [1280, 600],
+    [1400, 680],
+    [1440, 700],
+    [1600, 780],
+    [1680, 780],
+    [1920, 920],
+    [2048, 980],
+    [2560, 1000],
+    [3440, 1200],
+    [3840, 1280],
+    [4096, 1400],
+    [4480, 1600],
+    [7680, 2400],
+]
 
 [menu]
-args = ["--show=dmenu", "--allow-markup", "--allow-images", "--insensitive", "--cache-file=/dev/null", "--parse-search", "--height=40%", "--prompt={prompt}"]
+args = [
+    "--show=dmenu",
+    "--allow-markup",
+    "--allow-images",
+    "--insensitive",
+    "--cache-file=/dev/null",
+    "--parse-search",
+    "--height=40%",
+    "--prompt={prompt}",
+]
 executable = "wofi"
 
 [misc]

From 01d0172933845daaf3392f6b8c3953995e912f6e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 23 Jan 2025 11:42:15 +0100
Subject: [PATCH 247/546] wezterm: update expected test result

---
 .../programs/wezterm/example-setting.nix      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/modules/programs/wezterm/example-setting.nix b/tests/modules/programs/wezterm/example-setting.nix
index 2ed566a7e..264953dee 100644
--- a/tests/modules/programs/wezterm/example-setting.nix
+++ b/tests/modules/programs/wezterm/example-setting.nix
@@ -69,9 +69,27 @@
     '';
     expectedColorScheme = builtins.toFile "test.toml" ''
       [colors]
-      ansi = ["#222222", "#D14949", "#48874F", "#AFA75A", "#599797", "#8F6089", "#5C9FA8", "#8C8C8C"]
+      ansi = [
+          "#222222",
+          "#D14949",
+          "#48874F",
+          "#AFA75A",
+          "#599797",
+          "#8F6089",
+          "#5C9FA8",
+          "#8C8C8C",
+      ]
       background = "#1B1B1B"
-      brights = ["#444444", "#FF6D6D", "#89FF95", "#FFF484", "#97DDFF", "#FDAAF2", "#85F5DA", "#E9E9E9"]
+      brights = [
+          "#444444",
+          "#FF6D6D",
+          "#89FF95",
+          "#FFF484",
+          "#97DDFF",
+          "#FDAAF2",
+          "#85F5DA",
+          "#E9E9E9",
+      ]
       cursor_bg = "#BEAF8A"
       cursor_border = "#BEAF8A"
       cursor_fg = "#1B1B1B"

From 0db5c8bfcce78583ebbde0b2abbc95ad93445f7c Mon Sep 17 00:00:00 2001
From: quasigod <quasigod-io@proton.me>
Date: Thu, 23 Jan 2025 06:04:39 -0500
Subject: [PATCH 248/546] ghostty: add keybinds to settings example

---
 modules/programs/ghostty.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 9ebaa7b30..06b138c61 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -22,6 +22,10 @@ in {
         {
           theme = "catppuccin-mocha";
           font-size = 10;
+          keybind = [
+            "ctrl+h=goto_split:left"
+            "ctrl+l=goto_split:right"
+          ];
         }
       '';
       description = ''

From 7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9 Mon Sep 17 00:00:00 2001
From: leoTlr <ltlr@posteo.de>
Date: Thu, 23 Jan 2025 22:59:39 +0100
Subject: [PATCH 249/546] tealdeer: update docs link

Repo is now at https://github.com/tealdeer-rs/tealdeer.
---
 modules/programs/tealdeer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer.nix
index d9318d102..6cf1160ec 100644
--- a/modules/programs/tealdeer.nix
+++ b/modules/programs/tealdeer.nix
@@ -77,7 +77,7 @@ in {
         Configuration written to
         {file}`$XDG_CONFIG_HOME/tealdeer/config.toml` on Linux or
         {file}`$HOME/Library/Application Support/tealdeer/config.toml` on Darwin.
-        See <https://dbrgn.github.io/tealdeer/config.html> for more information.
+        See <https://tealdeer-rs.github.io/tealdeer/config.html> for more information.
       '';
     };
   };

From a2362a64964c406ba3b289a474fbde573f4b7fc9 Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Wed, 22 Jan 2025 17:40:23 +0100
Subject: [PATCH 250/546] nh: check osConfig for null before accessing

---
 modules/programs/nh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
index a5e8dcfaf..cf6c06e54 100644
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@@ -52,8 +52,8 @@ in {
   };
 
   config = {
-    warnings = lib.optionals (!(cfg.clean.enable -> !osConfig.nix.gc.automatic))
-      [
+    warnings = lib.optionals
+      (osConfig != null && !(cfg.clean.enable -> !osConfig.nix.gc.automatic)) [
         "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict."
       ];
 

From a0428685572b134f6594e7d7f5db5e1febbab2d7 Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Wed, 22 Jan 2025 17:59:49 +0100
Subject: [PATCH 251/546] nh: remove PATH assignment in nh-clean systemd unit

Runs without additions to path.

also:

- can't use $PATH in Environment=
- should add bin directory to path not the exe
---
 modules/programs/nh.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
index cf6c06e54..23d1d67d7 100644
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@@ -74,8 +74,7 @@ in {
         Service = {
           Type = "oneshot";
           ExecStart =
-            "exec ${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}";
-          Environment = "PATH=$PATH:${config.nix.package}";
+            "${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}";
         };
       };
 

From 44ee9bc826770df1ab83c7e93f77fdaddd37523a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Fri, 19 Apr 2024 11:38:48 +0200
Subject: [PATCH 252/546] himalaya: improve service

---
 modules/programs/himalaya.nix | 53 +++++++++++++----------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 2d216c3dc..04a277019 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -130,16 +130,6 @@ in {
           Extra environment variables to be exported in the service.
         '';
       };
-
-      settings.account = lib.mkOption {
-        type = with lib.types; nullOr str;
-        default = null;
-        example = "personal";
-        description = ''
-          Name of the account the watcher should be started for.
-          If no account is given, the default one is used.
-        '';
-      };
     };
 
     accounts.email.accounts = lib.mkOption {
@@ -171,31 +161,26 @@ in {
       globalConfig = compactAttrs himalaya.settings;
       allConfig = globalConfig // { accounts = accountsConfig; };
     in tomlFormat.generate "himalaya-config.toml" allConfig;
-    systemd.user.services = let
-      inherit (config.services.himalaya-watch) enable environment settings;
-      optionalArg = key:
-        if (key ? settings && !isNull settings."${key}") then
-          [ "--${key} ${settings."${key}"}" ]
-        else
-          [ ];
-    in {
-      himalaya-watch = lib.mkIf enable {
-        Unit = {
-          Description = "Email client Himalaya CLI envelopes watcher service";
-          After = [ "network.target" ];
-        };
-        Install = { WantedBy = [ "default.target" ]; };
-        Service = {
-          ExecStart = lib.concatStringsSep " "
-            ([ "${himalaya.package}/bin/himalaya" "envelopes" "watch" ]
-              ++ optionalArg "account");
-          ExecSearchPath = "/bin";
-          Environment =
-            lib.mapAttrsToList (key: val: "${key}=${val}") environment;
-          Restart = "always";
-          RestartSec = 10;
+
+    systemd.user.services =
+      let inherit (config.services.himalaya-watch) enable environment;
+      in {
+        "himalaya-watch@" = lib.mkIf enable {
+          Unit = {
+            Description = "Email client Himalaya CLI envelopes watcher service";
+            After = [ "network.target" ];
+          };
+          Install = { WantedBy = [ "default.target" ]; };
+          Service = {
+            ExecStart =
+              "${himalaya.package}/bin/himalaya envelopes watch --account %I";
+            ExecSearchPath = "/bin";
+            Environment =
+              lib.mapAttrsToList (key: val: "${key}=${val}") environment;
+            Restart = "always";
+            RestartSec = 10;
+          };
         };
       };
-    };
   };
 }

From 5f5a9d5cd23e6ff7f877ec66b498bb02585a72b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Fri, 19 Apr 2024 11:56:54 +0200
Subject: [PATCH 253/546] himalaya: make use of lib.getExe

---
 modules/programs/himalaya.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 04a277019..563de0a53 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -82,7 +82,7 @@ let
       sendmailConfig =
         lib.optionalAttrs (isNull account.smtp && !isNull account.msmtp) {
           sender = "sendmail";
-          sendmail.cmd = "${pkgs.msmtp}/bin/msmtp";
+          sendmail.cmd = lib.getExe pkgs.msmtp;
         };
 
       config = lib.attrsets.mergeAttrsList [
@@ -173,7 +173,7 @@ in {
           Install = { WantedBy = [ "default.target" ]; };
           Service = {
             ExecStart =
-              "${himalaya.package}/bin/himalaya envelopes watch --account %I";
+              "${lib.getExe himalaya.package} envelopes watch --account %I";
             ExecSearchPath = "/bin";
             Environment =
               lib.mapAttrsToList (key: val: "${key}=${val}") environment;

From 2ae3dd460f60822434959a92e8e19c9f9b7efce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Sat, 20 Apr 2024 09:49:20 +0200
Subject: [PATCH 254/546] himalaya: add xdg desktop entry

---
 modules/programs/himalaya.nix | 60 +++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 563de0a53..54e82972f 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -154,32 +154,44 @@ in {
   config = lib.mkIf himalaya.enable {
     home.packages = [ himalaya.package ];
 
-    xdg.configFile."himalaya/config.toml".source = let
-      enabledAccounts = lib.filterAttrs (_: account: account.himalaya.enable)
-        config.accounts.email.accounts;
-      accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts;
-      globalConfig = compactAttrs himalaya.settings;
-      allConfig = globalConfig // { accounts = accountsConfig; };
-    in tomlFormat.generate "himalaya-config.toml" allConfig;
+    xdg = {
+      configFile."himalaya/config.toml".source = let
+        enabledAccounts = lib.filterAttrs (_: account: account.himalaya.enable)
+          config.accounts.email.accounts;
+        accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts;
+        globalConfig = compactAttrs himalaya.settings;
+        allConfig = globalConfig // { accounts = accountsConfig; };
+      in tomlFormat.generate "himalaya-config.toml" allConfig;
 
-    systemd.user.services =
+      desktopEntries.himalaya = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
+        type = "Application";
+        name = "himalaya";
+        genericName = "Email Client";
+        comment = "CLI to manage emails";
+        terminal = true;
+        exec = "himalaya %u";
+        categories = [ "Network" ];
+        mimeType = [ "x-scheme-handler/mailto" "message/rfc822" ];
+        settings = { Keywords = "email"; };
+      };
+    };
+
+    systemd.user.services."himalaya-watch@" =
       let inherit (config.services.himalaya-watch) enable environment;
-      in {
-        "himalaya-watch@" = lib.mkIf enable {
-          Unit = {
-            Description = "Email client Himalaya CLI envelopes watcher service";
-            After = [ "network.target" ];
-          };
-          Install = { WantedBy = [ "default.target" ]; };
-          Service = {
-            ExecStart =
-              "${lib.getExe himalaya.package} envelopes watch --account %I";
-            ExecSearchPath = "/bin";
-            Environment =
-              lib.mapAttrsToList (key: val: "${key}=${val}") environment;
-            Restart = "always";
-            RestartSec = 10;
-          };
+      in lib.mkIf enable {
+        Unit = {
+          Description = "Email client Himalaya CLI envelopes watcher service";
+          After = [ "network.target" ];
+        };
+        Install = { WantedBy = [ "default.target" ]; };
+        Service = {
+          ExecStart =
+            "${lib.getExe himalaya.package} envelopes watch --account %I";
+          ExecSearchPath = "/bin";
+          Environment =
+            lib.mapAttrsToList (key: val: "${key}=${val}") environment;
+          Restart = "always";
+          RestartSec = 10;
         };
       };
   };

From e9068facd7bcfb99405d0e5e3b938f5e5ddc38e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Thu, 2 Jan 2025 08:25:14 +0100
Subject: [PATCH 255/546] himalaya: adjust package for released v1.0.0

---
 modules/programs/himalaya.nix | 100 ++++++++++++++--------------------
 1 file changed, 40 insertions(+), 60 deletions(-)

diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 54e82972f..dd1926d6b 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -35,7 +35,7 @@ let
         email = account.address;
         display-name = account.realName;
         default = account.primary;
-        folder.alias = {
+        folder.aliases = {
           inbox = account.folders.inbox;
           sent = account.folders.sent;
           drafts = account.folders.drafts;
@@ -46,43 +46,48 @@ let
       signatureConfig =
         lib.optionalAttrs (account.signature.showSignature == "append") {
           # TODO: signature cannot be attached yet
-          # https://todo.sr.ht/~soywod/pimalaya/27
+          # https://github.com/pimalaya/himalaya/issues/534
           signature = account.signature.text;
           signature-delim = account.signature.delimiter;
         };
 
       imapConfig = lib.optionalAttrs imapEnabled (compactAttrs {
-        backend = "imap";
-        imap.host = account.imap.host;
-        imap.port = account.imap.port;
-        imap.encryption = mkEncryptionConfig account.imap.tls;
-        imap.login = account.userName;
-        imap.passwd.cmd = builtins.concatStringsSep " " account.passwordCommand;
+        backend.type = "imap";
+        backend.host = account.imap.host;
+        backend.port = account.imap.port;
+        backend.encryption.type = mkEncryptionConfig account.imap.tls;
+        backend.login = account.userName;
+        backend.auth.type = "password";
+        backend.auth.cmd =
+          builtins.concatStringsSep " " account.passwordCommand;
       });
 
       maildirConfig = lib.optionalAttrs maildirEnabled (compactAttrs {
-        backend = "maildir";
-        maildir.root-dir = account.maildir.absPath;
+        backend.type = "maildir";
+        backend.root-dir = account.maildir.absPath;
       });
 
       notmuchConfig = lib.optionalAttrs notmuchEnabled (compactAttrs {
-        backend = "notmuch";
-        notmuch.database-path = maildirBasePath;
+        backend.type = "notmuch";
+        backend.db-path = maildirBasePath;
       });
 
       smtpConfig = lib.optionalAttrs (!isNull account.smtp) (compactAttrs {
-        message.send.backend = "smtp";
-        smtp.host = account.smtp.host;
-        smtp.port = account.smtp.port;
-        smtp.encryption = mkEncryptionConfig account.smtp.tls;
-        smtp.login = account.userName;
-        smtp.passwd.cmd = builtins.concatStringsSep " " account.passwordCommand;
+        message.send.backend.type = "smtp";
+        message.send.backend.host = account.smtp.host;
+        message.send.backend.port = account.smtp.port;
+        message.send.backend.encryption.type =
+          mkEncryptionConfig account.smtp.tls;
+        message.send.backend.login = account.userName;
+        message.send.backend.auth.type = "password";
+        message.send.backend.auth.cmd =
+          builtins.concatStringsSep " " account.passwordCommand;
       });
 
       sendmailConfig =
         lib.optionalAttrs (isNull account.smtp && !isNull account.msmtp) {
-          sender = "sendmail";
-          sendmail.cmd = lib.getExe pkgs.msmtp;
+          message.send.backend.type = "sendmail";
+          message.send.backend.cmd = lib.getExe pkgs.msmtp;
         };
 
       config = lib.attrsets.mergeAttrsList [
@@ -100,6 +105,18 @@ let
 in {
   meta.maintainers = with lib.hm.maintainers; [ soywod toastal ];
 
+  imports = [
+    (mkRemovedOptionModule [ "services" "himalaya-watch" "enable" ] ''
+      services.himalaya-watch has been removed.
+
+      The watch feature moved away from Himalaya scope, and resides
+      now in its own project called Mirador. Once the v1 released, the
+      service will land back in nixpkgs and home-manager.
+
+      See <https://github.com/pimalaya/mirador>.
+    '')
+  ];
+
   options = {
     programs.himalaya = {
       enable = lib.mkEnableOption "the email client Himalaya CLI";
@@ -109,25 +126,7 @@ in {
         default = { };
         description = ''
           Himalaya CLI global configuration.
-          See <https://pimalaya.org/himalaya/cli/latest/configuration/index.html#global-configuration> for supported values.
-        '';
-      };
-    };
-
-    services.himalaya-watch = {
-      enable = lib.mkEnableOption
-        "the email client Himalaya CLI envelopes watcher service";
-
-      environment = lib.mkOption {
-        type = with lib.types; attrsOf str;
-        default = { };
-        example = lib.literalExpression ''
-          {
-            "PASSWORD_STORE_DIR" = "~/.password-store";
-          }
-        '';
-        description = ''
-          Extra environment variables to be exported in the service.
+          See <https://github.com/pimalaya/himalaya/blob/master/config.sample.toml> for supported values.
         '';
       };
     };
@@ -143,7 +142,7 @@ in {
             default = { };
             description = ''
               Himalaya CLI configuration for this email account.
-              See <https://pimalaya.org/himalaya/cli/latest/configuration/index.html#account-configuration> for supported values.
+              See <https://github.com/pimalaya/himalaya/blob/master/config.sample.toml> for supported values.
             '';
           };
         };
@@ -161,7 +160,7 @@ in {
         accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts;
         globalConfig = compactAttrs himalaya.settings;
         allConfig = globalConfig // { accounts = accountsConfig; };
-      in tomlFormat.generate "himalaya-config.toml" allConfig;
+      in tomlFormat.generate "himalaya.config.toml" allConfig;
 
       desktopEntries.himalaya = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
         type = "Application";
@@ -175,24 +174,5 @@ in {
         settings = { Keywords = "email"; };
       };
     };
-
-    systemd.user.services."himalaya-watch@" =
-      let inherit (config.services.himalaya-watch) enable environment;
-      in lib.mkIf enable {
-        Unit = {
-          Description = "Email client Himalaya CLI envelopes watcher service";
-          After = [ "network.target" ];
-        };
-        Install = { WantedBy = [ "default.target" ]; };
-        Service = {
-          ExecStart =
-            "${lib.getExe himalaya.package} envelopes watch --account %I";
-          ExecSearchPath = "/bin";
-          Environment =
-            lib.mapAttrsToList (key: val: "${key}=${val}") environment;
-          Restart = "always";
-          RestartSec = 10;
-        };
-      };
   };
 }

From 15f7f9bc4e7aedcdd26e2f20fc4b46220ead584d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Fri, 24 Jan 2025 06:17:50 +0100
Subject: [PATCH 256/546] himalaya: fix tests

---
 modules/programs/himalaya.nix                 | 50 ++++++++++---------
 .../programs/himalaya/basic-expected.toml     | 37 +++++++-------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index dd1926d6b..2348e0f93 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -1,12 +1,14 @@
 { config, lib, pkgs, ... }:
 
+with lib;
+
 let
   # aliases
   inherit (config.programs) himalaya;
   tomlFormat = pkgs.formats.toml { };
 
   # attrs util that removes entries containing a null value
-  compactAttrs = lib.filterAttrs (_: val: !isNull val);
+  compactAttrs = filterAttrs (_: val: !isNull val);
 
   # needed for notmuch config, because the DB is here, and not in each
   # account's dir
@@ -44,14 +46,14 @@ let
       };
 
       signatureConfig =
-        lib.optionalAttrs (account.signature.showSignature == "append") {
+        optionalAttrs (account.signature.showSignature == "append") {
           # TODO: signature cannot be attached yet
           # https://github.com/pimalaya/himalaya/issues/534
           signature = account.signature.text;
           signature-delim = account.signature.delimiter;
         };
 
-      imapConfig = lib.optionalAttrs imapEnabled (compactAttrs {
+      imapConfig = optionalAttrs imapEnabled (compactAttrs {
         backend.type = "imap";
         backend.host = account.imap.host;
         backend.port = account.imap.port;
@@ -62,17 +64,17 @@ let
           builtins.concatStringsSep " " account.passwordCommand;
       });
 
-      maildirConfig = lib.optionalAttrs maildirEnabled (compactAttrs {
+      maildirConfig = optionalAttrs maildirEnabled (compactAttrs {
         backend.type = "maildir";
         backend.root-dir = account.maildir.absPath;
       });
 
-      notmuchConfig = lib.optionalAttrs notmuchEnabled (compactAttrs {
+      notmuchConfig = optionalAttrs notmuchEnabled (compactAttrs {
         backend.type = "notmuch";
         backend.db-path = maildirBasePath;
       });
 
-      smtpConfig = lib.optionalAttrs (!isNull account.smtp) (compactAttrs {
+      smtpConfig = optionalAttrs (!isNull account.smtp) (compactAttrs {
         message.send.backend.type = "smtp";
         message.send.backend.host = account.smtp.host;
         message.send.backend.port = account.smtp.port;
@@ -85,12 +87,12 @@ let
       });
 
       sendmailConfig =
-        lib.optionalAttrs (isNull account.smtp && !isNull account.msmtp) {
+        optionalAttrs (isNull account.smtp && !isNull account.msmtp) {
           message.send.backend.type = "sendmail";
-          message.send.backend.cmd = lib.getExe pkgs.msmtp;
+          message.send.backend.cmd = getExe pkgs.msmtp;
         };
 
-      config = lib.attrsets.mergeAttrsList [
+      config = attrsets.mergeAttrsList [
         globalConfig
         signatureConfig
         imapConfig
@@ -100,10 +102,10 @@ let
         sendmailConfig
       ];
 
-    in lib.recursiveUpdate config account.himalaya.settings;
+    in recursiveUpdate config account.himalaya.settings;
 
 in {
-  meta.maintainers = with lib.hm.maintainers; [ soywod toastal ];
+  meta.maintainers = with hm.maintainers; [ soywod toastal ];
 
   imports = [
     (mkRemovedOptionModule [ "services" "himalaya-watch" "enable" ] ''
@@ -119,10 +121,10 @@ in {
 
   options = {
     programs.himalaya = {
-      enable = lib.mkEnableOption "the email client Himalaya CLI";
-      package = lib.mkPackageOption pkgs "himalaya" { };
-      settings = lib.mkOption {
-        type = lib.types.submodule { freeformType = tomlFormat.type; };
+      enable = mkEnableOption "the email client Himalaya CLI";
+      package = mkPackageOption pkgs "himalaya" { };
+      settings = mkOption {
+        type = types.submodule { freeformType = tomlFormat.type; };
         default = { };
         description = ''
           Himalaya CLI global configuration.
@@ -131,14 +133,14 @@ in {
       };
     };
 
-    accounts.email.accounts = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule {
+    accounts.email.accounts = mkOption {
+      type = types.attrsOf (types.submodule {
         options.himalaya = {
-          enable = lib.mkEnableOption
+          enable = mkEnableOption
             "the email client Himalaya CLI for this email account";
 
-          settings = lib.mkOption {
-            type = lib.types.submodule { freeformType = tomlFormat.type; };
+          settings = mkOption {
+            type = types.submodule { freeformType = tomlFormat.type; };
             default = { };
             description = ''
               Himalaya CLI configuration for this email account.
@@ -150,19 +152,19 @@ in {
     };
   };
 
-  config = lib.mkIf himalaya.enable {
+  config = mkIf himalaya.enable {
     home.packages = [ himalaya.package ];
 
     xdg = {
       configFile."himalaya/config.toml".source = let
-        enabledAccounts = lib.filterAttrs (_: account: account.himalaya.enable)
+        enabledAccounts = filterAttrs (_: account: account.himalaya.enable)
           config.accounts.email.accounts;
-        accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts;
+        accountsConfig = mapAttrs mkAccountConfig enabledAccounts;
         globalConfig = compactAttrs himalaya.settings;
         allConfig = globalConfig // { accounts = accountsConfig; };
       in tomlFormat.generate "himalaya.config.toml" allConfig;
 
-      desktopEntries.himalaya = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
+      desktopEntries.himalaya = mkIf pkgs.stdenv.hostPlatform.isLinux {
         type = "Application";
         name = "himalaya";
         genericName = "Email Client";
diff --git a/tests/modules/programs/himalaya/basic-expected.toml b/tests/modules/programs/himalaya/basic-expected.toml
index 16c70c868..15e2e65bf 100644
--- a/tests/modules/programs/himalaya/basic-expected.toml
+++ b/tests/modules/programs/himalaya/basic-expected.toml
@@ -1,32 +1,33 @@
 [accounts."hm@example.com"]
-backend = "imap"
 default = true
 display-name = "H. M. Test"
 email = "hm@example.com"
+[accounts."hm@example.com".backend]
+host = "imap.example.com"
+login = "home.manager"
+port = 993
+type = "imap"
+[accounts."hm@example.com".backend.auth]
+cmd = "password-command"
+type = "password"
 
-[accounts."hm@example.com".folder.alias]
+[accounts."hm@example.com".backend.encryption]
+type = "tls"
+
+[accounts."hm@example.com".folder.aliases]
 drafts = "Drafts"
 inbox = "Inbox"
 sent = "Sent"
 trash = "Trash"
 
-[accounts."hm@example.com".imap]
-encryption = "tls"
-host = "imap.example.com"
-login = "home.manager"
-port = 993
-
-[accounts."hm@example.com".imap.passwd]
-cmd = "password-command"
-
-[accounts."hm@example.com".message.send]
-backend = "smtp"
-
-[accounts."hm@example.com".smtp]
-encryption = "tls"
+[accounts."hm@example.com".message.send.backend]
 host = "smtp.example.com"
 login = "home.manager"
 port = 465
-
-[accounts."hm@example.com".smtp.passwd]
+type = "smtp"
+[accounts."hm@example.com".message.send.backend.auth]
 cmd = "password-command"
+type = "password"
+
+[accounts."hm@example.com".message.send.backend.encryption]
+type = "tls"

From b93e17c73cca670460d0604c00ba0571eb5d4cad Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 24 Jan 2025 22:30:50 +0100
Subject: [PATCH 257/546] neovim: fix flaky test

Seems the nvim command sometimes fails with error code 1.
---
 tests/modules/programs/neovim/plugin-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix
index e4921aae6..b12613588 100644
--- a/tests/modules/programs/neovim/plugin-config.nix
+++ b/tests/modules/programs/neovim/plugin-config.nix
@@ -25,7 +25,7 @@ with lib;
       vimout=$(mktemp)
       echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \
         | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \
-        > "$vimout"
+        > "$vimout" || true
       assertFileContains "$vimout" "HM_EXTRA_CONFIG"
       assertFileContains "$vimout" "HM_PLUGINS_CONFIG"
     '';

From 1b9fe46e9fc3575eeb63ef42d73144e397593904 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 24 Jan 2025 19:59:46 +0100
Subject: [PATCH 258/546] home-manager: move tests into new test flake

Having the tests available in the main Nix Flake introduces
unnecessary evaluation for non-developer users and, worse, a
dependency on the nmt library.

Fixes #6354
---
 .github/PULL_REQUEST_TEMPLATE.md  |  3 ++-
 docs/manual/contributing/tests.md | 12 ++++++---
 docs/release-notes/rl-2505.md     |  5 ++++
 flake.nix                         | 19 +------------
 tests/flake.nix                   | 45 +++++++++++++++++++++++++++++++
 5 files changed, 62 insertions(+), 22 deletions(-)
 create mode 100644 tests/flake.nix

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 11b8324c1..cd468e16a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,7 +23,8 @@ Also make sure to read the guidelines found at
 
 - [ ] Code formatted with `./format`.
 
-- [ ] Code tested through `nix-shell --pure tests -A run.all` or `nix develop --ignore-environment .#all` using Flakes.
+- [ ] Code tested through `nix-shell --pure tests -A run.all`
+    or `nix build --reference-lock-file flake.lock ./tests#test-all` using Flakes.
 
 - [ ] Test cases updated/added. See [example](https://github.com/nix-community/home-manager/commit/f3fbb50b68df20da47f9b0def5607857fcc0d021#diff-b61a6d542f9036550ba9c401c80f00ef).
 
diff --git a/docs/manual/contributing/tests.md b/docs/manual/contributing/tests.md
index bc3956ae3..41eec3447 100644
--- a/docs/manual/contributing/tests.md
+++ b/docs/manual/contributing/tests.md
@@ -29,10 +29,16 @@ through
 $ nix-shell --pure tests -A run.alacritty-empty-settings
 ```
 
-However, those invocations will impurely source the system's nixpkgs,
-and may cause failures. To run against the nixpkgs from the flake.lock,
+However, those invocations will impurely source the system's Nixpkgs,
+and may cause failures. To run against the Nixpkgs from the `flake.lock` file,
 use instead e.g.
 
 ``` shell
-$ nix develop --ignore-environment .#all
+$ nix build --reference-lock-file flake.lock ./tests#test-all
+```
+
+or
+
+``` shell
+$ nix build --reference-lock-file flake.lock ./tests#test-alacritty-empty-settings
 ```
diff --git a/docs/release-notes/rl-2505.md b/docs/release-notes/rl-2505.md
index 5d47f2c69..588ce5b47 100644
--- a/docs/release-notes/rl-2505.md
+++ b/docs/release-notes/rl-2505.md
@@ -17,6 +17,11 @@ This release has the following notable changes:
   The `"suggest"` alternative will remain for a while longer but may
   also be deprecated for removal in the future.
 
+- The Home Manager test suite has been removed from the main Nix Flake
+  since it caused unnecessary evaluations and downloads. Instead the
+  tests are available through a Nix Flake file inside the `tests`
+  directory. See [](#sec-tests) for example commands.
+
 ## State Version Changes {#sec-release-25.05-state-version-changes}
 
 The state version in this release includes the changes below. These
diff --git a/flake.nix b/flake.nix
index 3a90f89c0..f4546e1a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,12 +89,6 @@
     } // (let
       forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
     in {
-      devShells = forAllSystems (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          tests = import ./tests { inherit pkgs; };
-        in tests.run);
-
       formatter = forAllSystems (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in pkgs.linkFarm "format" [{
@@ -105,23 +99,12 @@
       packages = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          lib = pkgs.lib;
           releaseInfo = nixpkgs.lib.importJSON ./release.json;
           docs = import ./docs {
             inherit pkgs;
             inherit (releaseInfo) release isReleaseBranch;
           };
           hmPkg = pkgs.callPackage ./home-manager { path = "${./.}"; };
-
-          testPackages = let
-            tests = import ./tests { inherit pkgs; };
-            renameTestPkg = n: lib.nameValuePair "test-${n}";
-          in lib.mapAttrs' renameTestPkg tests.build;
-
-          integrationTestPackages = let
-            tests = import ./tests/integration { inherit pkgs; };
-            renameTestPkg = n: lib.nameValuePair "integration-test-${n}";
-          in lib.mapAttrs' renameTestPkg tests;
         in {
           default = hmPkg;
           home-manager = hmPkg;
@@ -129,7 +112,7 @@
           docs-html = docs.manual.html;
           docs-json = docs.options.json;
           docs-manpages = docs.manPages;
-        } // testPackages // integrationTestPackages);
+        });
 
       defaultPackage = forAllSystems (system: self.packages.${system}.default);
     });
diff --git a/tests/flake.nix b/tests/flake.nix
new file mode 100644
index 000000000..0db07add2
--- /dev/null
+++ b/tests/flake.nix
@@ -0,0 +1,45 @@
+# This is an internal Nix Flake intended for use when running tests.
+#
+# You can build all tests or specific tests by running
+#
+#   nix build --reference-lock-file flake.lock ./tests#test-all
+#   nix build --reference-lock-file flake.lock ./tests#test-alacritty-empty-settings
+#
+# in the Home Manager project root directory.
+#
+# Similarly for integration tests
+#
+#   nix build --reference-lock-file flake.lock ./tests#integration-test-all
+#   nix build --reference-lock-file flake.lock ./tests#integration-test-standalone-standard-basics
+
+{
+  description = "Tests of Home Manager for Nix";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  outputs = { self, nixpkgs, ... }:
+    let forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+    in {
+      devShells = forAllSystems (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          tests = import ./. { inherit pkgs; };
+        in tests.run);
+
+      packages = forAllSystems (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          lib = pkgs.lib;
+
+          testPackages = let
+            tests = import ./. { inherit pkgs; };
+            renameTestPkg = n: lib.nameValuePair "test-${n}";
+          in lib.mapAttrs' renameTestPkg tests.build;
+
+          integrationTestPackages = let
+            tests = import ./integration { inherit pkgs; };
+            renameTestPkg = n: lib.nameValuePair "integration-test-${n}";
+          in lib.mapAttrs' renameTestPkg tests;
+        in testPackages // integrationTestPackages);
+    };
+}

From daf04c5950b676f47a794300657f1d3d14c1a120 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Sat, 25 Jan 2025 01:54:49 +0200
Subject: [PATCH 259/546] ollama: add darwin support

---
 modules/services/ollama.nix                   | 17 +++++++++-
 tests/default.nix                             |  3 +-
 .../modules/services/ollama/darwin/basic.nix  | 24 ++++++++++++++
 .../services/ollama/darwin/default.nix        |  1 +
 .../ollama/darwin/expected-agent.plist        | 31 +++++++++++++++++++
 .../services/ollama/{ => linux}/basic.nix     |  0
 .../services/ollama/{ => linux}/default.nix   |  2 +-
 .../{ => linux}/set-environment-variables.nix |  0
 8 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 tests/modules/services/ollama/darwin/basic.nix
 create mode 100644 tests/modules/services/ollama/darwin/default.nix
 create mode 100644 tests/modules/services/ollama/darwin/expected-agent.plist
 rename tests/modules/services/ollama/{ => linux}/basic.nix (100%)
 rename tests/modules/services/ollama/{ => linux}/default.nix (71%)
 rename tests/modules/services/ollama/{ => linux}/set-environment-variables.nix (100%)

diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix
index 66e1e8377..0cb1b2eee 100644
--- a/modules/services/ollama.nix
+++ b/modules/services/ollama.nix
@@ -76,7 +76,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.user.services.ollama = {
+    systemd.user.services.ollama = mkIf pkgs.stdenv.isLinux {
       Unit = {
         Description = "Server for local large language models";
         After = [ "network.target" ];
@@ -92,6 +92,21 @@ in {
       Install = { WantedBy = [ "default.target" ]; };
     };
 
+    launchd.agents.ollama = mkIf pkgs.stdenv.isDarwin {
+      enable = true;
+      config = {
+        ProgramArguments = [ "${getExe ollamaPackage}" "serve" ];
+        EnvironmentVariables = cfg.environmentVariables // {
+          OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";
+        };
+        KeepAlive = {
+          Crashed = true;
+          SuccessfulExit = false;
+        };
+        ProcessType = "Background";
+      };
+    };
+
     home.packages = [ ollamaPackage ];
   };
 }
diff --git a/tests/default.nix b/tests/default.nix
index b77c354c5..f7778e445 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -185,6 +185,7 @@ in import nmtSrc {
     ./modules/services/git-sync-darwin
     ./modules/services/imapnotify-darwin
     ./modules/services/nix-gc-darwin
+    ./modules/services/ollama/darwin
     ./modules/targets-darwin
   ] ++ lib.optionals isLinux [
     ./modules/config/i18n
@@ -270,7 +271,7 @@ in import nmtSrc {
     ./modules/services/mpd-mpris
     ./modules/services/mpdris2
     ./modules/services/nix-gc
-    ./modules/services/ollama
+    ./modules/services/ollama/linux
     ./modules/services/osmscout-server
     ./modules/services/pantalaimon
     ./modules/services/parcellite
diff --git a/tests/modules/services/ollama/darwin/basic.nix b/tests/modules/services/ollama/darwin/basic.nix
new file mode 100644
index 000000000..b9203cc7e
--- /dev/null
+++ b/tests/modules/services/ollama/darwin/basic.nix
@@ -0,0 +1,24 @@
+{ lib, pkgs, ... }:
+
+lib.mkMerge [
+  {
+    services.ollama = {
+      enable = true;
+      host = "localhost";
+      port = 11111;
+      environmentVariables = {
+        OLLAMA_LLM_LIBRARY = "cpu";
+        HIP_VISIBLE_DEVICES = "0,1";
+      };
+    };
+
+    test.stubs.ollama = { };
+  }
+  (lib.mkIf pkgs.stdenv.isDarwin {
+    nmt.script = ''
+      serviceFile=LaunchAgents/org.nix-community.home.ollama.plist
+      assertFileExists "$serviceFile"
+      assertFileContent "$serviceFile" ${./expected-agent.plist}
+    '';
+  })
+]
diff --git a/tests/modules/services/ollama/darwin/default.nix b/tests/modules/services/ollama/darwin/default.nix
new file mode 100644
index 000000000..418446cd6
--- /dev/null
+++ b/tests/modules/services/ollama/darwin/default.nix
@@ -0,0 +1 @@
+{ ollama-darwin = ./basic.nix; }
diff --git a/tests/modules/services/ollama/darwin/expected-agent.plist b/tests/modules/services/ollama/darwin/expected-agent.plist
new file mode 100644
index 000000000..a159fd980
--- /dev/null
+++ b/tests/modules/services/ollama/darwin/expected-agent.plist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>EnvironmentVariables</key>
+	<dict>
+		<key>HIP_VISIBLE_DEVICES</key>
+		<string>0,1</string>
+		<key>OLLAMA_HOST</key>
+		<string>localhost:11111</string>
+		<key>OLLAMA_LLM_LIBRARY</key>
+		<string>cpu</string>
+	</dict>
+	<key>KeepAlive</key>
+	<dict>
+		<key>Crashed</key>
+		<true/>
+		<key>SuccessfulExit</key>
+		<false/>
+	</dict>
+	<key>Label</key>
+	<string>org.nix-community.home.ollama</string>
+	<key>ProcessType</key>
+	<string>Background</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>@ollama@/bin/ollama</string>
+		<string>serve</string>
+	</array>
+</dict>
+</plist>
diff --git a/tests/modules/services/ollama/basic.nix b/tests/modules/services/ollama/linux/basic.nix
similarity index 100%
rename from tests/modules/services/ollama/basic.nix
rename to tests/modules/services/ollama/linux/basic.nix
diff --git a/tests/modules/services/ollama/default.nix b/tests/modules/services/ollama/linux/default.nix
similarity index 71%
rename from tests/modules/services/ollama/default.nix
rename to tests/modules/services/ollama/linux/default.nix
index 84ad2c99e..a0c82ae86 100644
--- a/tests/modules/services/ollama/default.nix
+++ b/tests/modules/services/ollama/linux/default.nix
@@ -1,4 +1,4 @@
 {
-  ollama-basic = ./basic.nix;
+  ollama-linux = ./basic.nix;
   ollama-set-environment-variables = ./set-environment-variables.nix;
 }
diff --git a/tests/modules/services/ollama/set-environment-variables.nix b/tests/modules/services/ollama/linux/set-environment-variables.nix
similarity index 100%
rename from tests/modules/services/ollama/set-environment-variables.nix
rename to tests/modules/services/ollama/linux/set-environment-variables.nix

From e1ae908bcc30af792b0bb0a52e53b03d2577255e Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Mon, 27 Jan 2025 10:06:02 +0100
Subject: [PATCH 260/546] 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/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21)
  → 'github:NixOS/nixpkgs/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2cb35833e..fbb56cc71 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1737746512,
+        "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
         "type": "github"
       },
       "original": {

From 0a64a209aa3c0e5ae528b9f25c3c5e9bb735dbb3 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:06:49 +0100
Subject: [PATCH 261/546] 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/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)
  → 'github:NixOS/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8?narHash=sha256-Zf0hSrtzaM1DEz8//%2BXs51k/wdSajticVrATqDrfQjg%3D' (2025-01-26)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index fbb56cc71..1bb2222c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737746512,
-        "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
+        "lastModified": 1737885589,
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
         "type": "github"
       },
       "original": {

From 1b4f2a48168b3d90e11365552d1e7e601a4be6b6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 17 Jan 2025 16:40:11 +0100
Subject: [PATCH 262/546] zed-editor: add installRemoteServer option

---
 modules/programs/zed-editor.nix               | 24 +++++++++++++++++++
 tests/modules/programs/zed-editor/default.nix |  1 +
 .../zed-editor/install-remote-server.nix      | 20 ++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 tests/modules/programs/zed-editor/install-remote-server.nix

diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix
index 80039a8ca..cfc55c073 100644
--- a/modules/programs/zed-editor.nix
+++ b/modules/programs/zed-editor.nix
@@ -80,6 +80,21 @@ in {
           Use the name of a repository in the [extension list](https://github.com/zed-industries/extensions/tree/main/extensions).
         '';
       };
+
+      installRemoteServer = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Whether to symlink the Zed's remote server binary to the expected
+          location. This allows remotely connecting to this system from a
+          distant Zed client.
+
+          For more information, consult the
+          ["Remote Server" section](https://wiki.nixos.org/wiki/Zed#Remote_Server)
+          in the wiki.
+        '';
+      };
     };
   };
 
@@ -101,6 +116,15 @@ in {
     else
       [ cfg.package ];
 
+    home.file = mkIf (cfg.installRemoteServer && (cfg.package ? remote_server))
+      (let
+        inherit (cfg.package) version remote_server;
+        binaryName = "zed-remote-server-stable-${version}";
+      in {
+        ".zed_server/${binaryName}".source =
+          lib.getExe' remote_server binaryName;
+      });
+
     xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) {
       source = jsonFormat.generate "zed-user-settings" mergedSettings;
     });
diff --git a/tests/modules/programs/zed-editor/default.nix b/tests/modules/programs/zed-editor/default.nix
index 3c5c894fe..2fcd8da2c 100644
--- a/tests/modules/programs/zed-editor/default.nix
+++ b/tests/modules/programs/zed-editor/default.nix
@@ -1,5 +1,6 @@
 {
   zed-extensions = ./extensions.nix;
+  zed-install-remote-server = ./install-remote-server.nix;
   zed-keymap = ./keymap.nix;
   zed-settings = ./settings.nix;
 }
diff --git a/tests/modules/programs/zed-editor/install-remote-server.nix b/tests/modules/programs/zed-editor/install-remote-server.nix
new file mode 100644
index 000000000..fdfbc095f
--- /dev/null
+++ b/tests/modules/programs/zed-editor/install-remote-server.nix
@@ -0,0 +1,20 @@
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { version = "57"; } // {
+      remote_server = config.lib.test.mkStubPackage {
+        buildScript = ''
+          mkdir -p $out/bin
+          touch $out/bin/zed-remote-server-stable-57
+        '';
+      };
+    };
+    installRemoteServer = true;
+  };
+
+  nmt.script = ''
+    assertFileExists "home-files/.zed_server/zed-remote-server-stable-57"
+  '';
+}

From a1df6c4c76a839661207105daa519e3de3b5fe15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sun, 8 Dec 2024 00:56:22 +0100
Subject: [PATCH 263/546] nushell: slight refactor

- Remove 'with lib'
- More idiomatic lib calls
- Update config file examples with current best practices
---
 modules/programs/nushell.nix                  | 99 +++++++++----------
 .../programs/nushell/config-expected.nu       |  2 +-
 2 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index ec00210af..34f76d2dc 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -1,9 +1,7 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
+  inherit (lib) types;
+  inherit (lib.hm.nushell) toNushell;
   cfg = config.programs.nushell;
 
   configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
@@ -14,13 +12,13 @@ let
   linesOrSource = name:
     types.submodule ({ config, ... }: {
       options = {
-        text = mkOption {
+        text = lib.mkOption {
           type = types.lines;
           default = if config.source != null then
             builtins.readFile config.source
           else
             "";
-          defaultText = literalExpression
+          defaultText = lib.literalExpression
             "if source is defined, the content of source, otherwise empty";
           description = ''
             Text of the nushell {file}`${name}` file.
@@ -28,7 +26,7 @@ let
           '';
         };
 
-        source = mkOption {
+        source = lib.mkOption {
           type = types.nullOr types.path;
           default = null;
           description = ''
@@ -39,11 +37,14 @@ let
       };
     });
 in {
-  meta.maintainers =
-    [ maintainers.Philipp-M maintainers.joaquintrinanes maintainers.aidalgol ];
+  meta.maintainers = with lib.maintainers; [
+    Philipp-M
+    joaquintrinanes
+    aidalgol
+  ];
 
   imports = [
-    (mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''
+    (lib.mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''
       Please use
 
         'programs.nushell.configFile' and 'programs.nushell.envFile'
@@ -53,25 +54,22 @@ in {
   ];
 
   options.programs.nushell = {
-    enable = mkEnableOption "nushell";
+    enable = lib.mkEnableOption "nushell";
 
-    package = mkOption {
-      type = types.package;
-      default = pkgs.nushell;
-      defaultText = literalExpression "pkgs.nushell";
-      description = "The package to use for nushell.";
-    };
+    package = lib.mkPackageOption pkgs "nushell" { };
 
-    configFile = mkOption {
+    configFile = lib.mkOption {
       type = types.nullOr (linesOrSource "config.nu");
       default = null;
-      example = literalExpression ''
-        { text = '''
-            let $config = {
-              filesize_metric: false
-              table_mode: rounded
-              use_ls_colors: true
+      example = lib.literalExpression ''
+        {
+          text = '''
+            const NU_LIB_DIRS = $NU_LIB_DIRS ++ ''${
+              lib.hm.nushell.toNushell (lib.concatStringsSep ":" [ ./scripts ])
             }
+            $env.config.filesize_metric = false
+            $env.config.table_mode = 'rounded'
+            $env.config.use_ls_colors = true
           ''';
         }
       '';
@@ -82,7 +80,7 @@ in {
       '';
     };
 
-    envFile = mkOption {
+    envFile = lib.mkOption {
       type = types.nullOr (linesOrSource "env.nu");
       default = null;
       example = ''
@@ -95,7 +93,7 @@ in {
       '';
     };
 
-    loginFile = mkOption {
+    loginFile = lib.mkOption {
       type = types.nullOr (linesOrSource "login.nu");
       default = null;
       example = ''
@@ -111,7 +109,7 @@ in {
       '';
     };
 
-    extraConfig = mkOption {
+    extraConfig = lib.mkOption {
       type = types.lines;
       default = "";
       description = ''
@@ -119,7 +117,7 @@ in {
       '';
     };
 
-    extraEnv = mkOption {
+    extraEnv = lib.mkOption {
       type = types.lines;
       default = "";
       description = ''
@@ -127,7 +125,7 @@ in {
       '';
     };
 
-    extraLogin = mkOption {
+    extraLogin = lib.mkOption {
       type = types.lines;
       default = "";
       description = ''
@@ -135,7 +133,7 @@ in {
       '';
     };
 
-    plugins = mkOption {
+    plugins = lib.mkOption {
       type = types.listOf types.package;
       default = [ ];
       example = lib.literalExpression "[ pkgs.nushellPlugins.formats ]";
@@ -144,7 +142,7 @@ in {
       '';
     };
 
-    shellAliases = mkOption {
+    shellAliases = lib.mkOption {
       type = types.attrsOf types.str;
       default = { };
       example = { ll = "ls -l"; };
@@ -154,14 +152,13 @@ in {
       '';
     };
 
-    environmentVariables = mkOption {
-      type = types.attrsOf hm.types.nushellValue;
+    environmentVariables = lib.mkOption {
+      type = types.attrsOf lib.hm.types.nushellValue;
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           FOO = "BAR";
           LIST_VALUE = [ "foo" "bar" ];
-          NU_LIB_DIRS = lib.concatStringsSep ":" [ ./scripts ];
           PROMPT_COMMAND = lib.hm.nushell.mkNushellInline '''{|| "> "}''';
           ENV_CONVERSIONS.PATH = {
             from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
@@ -177,19 +174,19 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    home.file = mkMerge [
+    home.file = lib.mkMerge [
       (let
         writeConfig = cfg.configFile != null || cfg.extraConfig != ""
           || aliasesStr != "";
 
-        aliasesStr = concatStringsSep "\n"
-          (mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases);
-      in mkIf writeConfig {
-        "${configDir}/config.nu".text = mkMerge [
-          (mkIf (cfg.configFile != null) cfg.configFile.text)
+        aliasesStr = lib.concatLines
+          (lib.mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases);
+      in lib.mkIf writeConfig {
+        "${configDir}/config.nu".text = lib.mkMerge [
+          (lib.mkIf (cfg.configFile != null) cfg.configFile.text)
           cfg.extraConfig
           aliasesStr
         ];
@@ -198,18 +195,18 @@ in {
       (let
         hasEnvVars = cfg.environmentVariables != { };
         envVarsStr = ''
-          load-env ${hm.nushell.toNushell { } cfg.environmentVariables}
+          load-env ${toNushell { } cfg.environmentVariables}
         '';
-      in mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
-        "${configDir}/env.nu".text = mkMerge [
-          (mkIf (cfg.envFile != null) cfg.envFile.text)
+      in lib.mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
+        "${configDir}/env.nu".text = lib.mkMerge [
+          (lib.mkIf (cfg.envFile != null) cfg.envFile.text)
           cfg.extraEnv
           envVarsStr
         ];
       })
-      (mkIf (cfg.loginFile != null || cfg.extraLogin != "") {
-        "${configDir}/login.nu".text = mkMerge [
-          (mkIf (cfg.loginFile != null) cfg.loginFile.text)
+      (lib.mkIf (cfg.loginFile != null || cfg.extraLogin != "") {
+        "${configDir}/login.nu".text = lib.mkMerge [
+          (lib.mkIf (cfg.loginFile != null) cfg.loginFile.text)
           cfg.extraLogin
         ];
       })
@@ -220,11 +217,11 @@ in {
           ${lib.getExe cfg.package} \
             --plugin-config "$out/plugin.msgpackz" \
             --commands '${
-              concatStringsSep "; "
+              lib.concatStringsSep "; "
               (map (plugin: "plugin add ${lib.getExe plugin}") cfg.plugins)
             }'
         '';
-      in mkIf (cfg.plugins != [ ]) {
+      in lib.mkIf (cfg.plugins != [ ]) {
         "${configDir}/plugin.msgpackz".source = "${msgPackz}/plugin.msgpackz";
       })
     ];
diff --git a/tests/modules/programs/nushell/config-expected.nu b/tests/modules/programs/nushell/config-expected.nu
index a306fabd8..3ab5d2de1 100644
--- a/tests/modules/programs/nushell/config-expected.nu
+++ b/tests/modules/programs/nushell/config-expected.nu
@@ -6,4 +6,4 @@ let $config = {
 
 
 alias ll = ls -a
-alias lsname = (ls | get name)
\ No newline at end of file
+alias lsname = (ls | get name)

From 46c83c07b9a97a8f7633dd162dd9a3bbe511195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sun, 8 Dec 2024 01:00:45 +0100
Subject: [PATCH 264/546] nushell: add settings option

---
 modules/lib/nushell.nix                       |  5 +-
 modules/programs/nushell.nix                  | 59 +++++++++++++++----
 .../programs/nushell/config-expected.nu       |  8 ++-
 .../programs/nushell/example-settings.nix     |  9 ++-
 4 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/modules/lib/nushell.nix b/modules/lib/nushell.nix
index e831380cd..5ef5ad36d 100644
--- a/modules/lib/nushell.nix
+++ b/modules/lib/nushell.nix
@@ -1,7 +1,9 @@
 { lib }: rec {
   mkNushellInline = expr: lib.setType "nushell-inline" { inherit expr; };
 
-  toNushell = { indent ? "", multiline ? true, asBindings ? false }@args:
+  isNushellInline = lib.isType "nushell-inline";
+
+  toNushell = { indent ? "", multiline ? true, asBindings ? false, }@args:
     v:
     let
       innerIndent = "${indent}    ";
@@ -18,7 +20,6 @@
         asBindings = false;
       };
       concatItems = lib.concatStringsSep introSpace;
-      isNushellInline = lib.isType "nushell-inline";
 
       generatedBindings = assert lib.assertMsg (badVarNames == [ ])
         "Bad Nushell variable names: ${
diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index 34f76d2dc..b1f906580 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   inherit (lib) types;
-  inherit (lib.hm.nushell) toNushell;
+  inherit (lib.hm.nushell) isNushellInline toNushell;
   cfg = config.programs.nushell;
 
   configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
@@ -43,16 +43,6 @@ in {
     aidalgol
   ];
 
-  imports = [
-    (lib.mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''
-      Please use
-
-        'programs.nushell.configFile' and 'programs.nushell.envFile'
-
-      instead.
-    '')
-  ];
-
   options.programs.nushell = {
     enable = lib.mkEnableOption "nushell";
 
@@ -142,6 +132,35 @@ in {
       '';
     };
 
+    settings = lib.mkOption {
+      type = types.attrsOf lib.hm.types.nushellValue;
+      default = { };
+      example = {
+        show_banner = false;
+        history.format = "sqlite";
+      };
+      description = ''
+        Nushell settings. These will be flattened and assigned one by one to `$env.config` to avoid overwriting the default or existing options.
+
+        For example:
+        ```nix
+        {
+          show_banner = false;
+          completions.external = {
+            enable = true;
+            max_results = 200;
+          };
+        }
+        ```
+        becomes:
+        ```nushell
+        $env.config.completions.external.enable = true
+        $env.config.completions.external.max_results = 200
+        $env.config.show_banner = false
+        ```
+      '';
+    };
+
     shellAliases = lib.mkOption {
       type = types.attrsOf types.str;
       default = { };
@@ -180,12 +199,28 @@ in {
     home.file = lib.mkMerge [
       (let
         writeConfig = cfg.configFile != null || cfg.extraConfig != ""
-          || aliasesStr != "";
+          || aliasesStr != "" || cfg.settings != { };
 
         aliasesStr = lib.concatLines
           (lib.mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases);
       in lib.mkIf writeConfig {
         "${configDir}/config.nu".text = lib.mkMerge [
+          (let
+            flattenSettings = let
+              joinDot = a: b: "${if a == "" then "" else "${a}."}${b}";
+              unravel = prefix: value:
+                if lib.isAttrs value && !isNushellInline value then
+                  lib.concatMap (key: unravel (joinDot prefix key) value.${key})
+                  (builtins.attrNames value)
+                else
+                  [ (lib.nameValuePair prefix value) ];
+            in unravel "";
+            mkLine = { name, value }: ''
+              $env.config.${name} = ${toNushell { } value}
+            '';
+            settingsLines =
+              lib.concatMapStrings mkLine (flattenSettings cfg.settings);
+          in lib.mkIf (cfg.settings != { }) settingsLines)
           (lib.mkIf (cfg.configFile != null) cfg.configFile.text)
           cfg.extraConfig
           aliasesStr
diff --git a/tests/modules/programs/nushell/config-expected.nu b/tests/modules/programs/nushell/config-expected.nu
index 3ab5d2de1..6d5b09b26 100644
--- a/tests/modules/programs/nushell/config-expected.nu
+++ b/tests/modules/programs/nushell/config-expected.nu
@@ -1,4 +1,10 @@
-let $config = {
+$env.config.display_errors.exit_code = false
+$env.config.hooks.pre_execution = [
+    ({|| "pre_execution hook"})
+]
+$env.config.show_banner = false
+
+let config = {
   filesize_metric: false
   table_mode: rounded
   use_ls_colors: true
diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index e758000bf..598a7bd85 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -5,7 +5,7 @@
     enable = true;
 
     configFile.text = ''
-      let $config = {
+      let config = {
         filesize_metric: false
         table_mode: rounded
         use_ls_colors: true
@@ -30,6 +30,13 @@
       "ll" = "ls -a";
     };
 
+    settings = {
+      show_banner = false;
+      display_errors.exit_code = false;
+      hooks.pre_execution =
+        [ (lib.hm.nushell.mkNushellInline ''{|| "pre_execution hook"}'') ];
+    };
+
     environmentVariables = {
       FOO = "BAR";
       LIST_VALUE = [ "foo" "bar" ];

From 709aaab1a5c35a8d1f1e7546efa226e09f3316fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sat, 28 Dec 2024 20:52:56 +0100
Subject: [PATCH 265/546] nushell: set env in config.nu file

---
 modules/programs/nushell.nix                      | 15 ++++++++-------
 tests/modules/programs/nushell/config-expected.nu | 15 +++++++++++++++
 tests/modules/programs/nushell/env-expected.nu    | 15 ---------------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index b1f906580..92a8f4e9d 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -205,6 +205,12 @@ in {
           (lib.mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases);
       in lib.mkIf writeConfig {
         "${configDir}/config.nu".text = lib.mkMerge [
+          (let
+            hasEnvVars = cfg.environmentVariables != { };
+            envVarsStr = ''
+              load-env ${toNushell { } cfg.environmentVariables}
+            '';
+          in lib.mkIf hasEnvVars envVarsStr)
           (let
             flattenSettings = let
               joinDot = a: b: "${if a == "" then "" else "${a}."}${b}";
@@ -220,6 +226,7 @@ in {
             '';
             settingsLines =
               lib.concatMapStrings mkLine (flattenSettings cfg.settings);
+
           in lib.mkIf (cfg.settings != { }) settingsLines)
           (lib.mkIf (cfg.configFile != null) cfg.configFile.text)
           cfg.extraConfig
@@ -227,16 +234,10 @@ in {
         ];
       })
 
-      (let
-        hasEnvVars = cfg.environmentVariables != { };
-        envVarsStr = ''
-          load-env ${toNushell { } cfg.environmentVariables}
-        '';
-      in lib.mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
+      (lib.mkIf (cfg.envFile != null || cfg.extraEnv != "") {
         "${configDir}/env.nu".text = lib.mkMerge [
           (lib.mkIf (cfg.envFile != null) cfg.envFile.text)
           cfg.extraEnv
-          envVarsStr
         ];
       })
       (lib.mkIf (cfg.loginFile != null || cfg.extraLogin != "") {
diff --git a/tests/modules/programs/nushell/config-expected.nu b/tests/modules/programs/nushell/config-expected.nu
index 6d5b09b26..4578f9531 100644
--- a/tests/modules/programs/nushell/config-expected.nu
+++ b/tests/modules/programs/nushell/config-expected.nu
@@ -1,3 +1,18 @@
+load-env {
+    "ENV_CONVERSIONS": {
+        "PATH": {
+            "from_string": ({|s| $s | split row (char esep) })
+            "to_string": ({|v| $v | str join (char esep) })
+        }
+    }
+    "FOO": "BAR"
+    "LIST_VALUE": [
+        "foo"
+        "bar"
+    ]
+    "PROMPT_COMMAND": ({|| "> "})
+}
+
 $env.config.display_errors.exit_code = false
 $env.config.hooks.pre_execution = [
     ({|| "pre_execution hook"})
diff --git a/tests/modules/programs/nushell/env-expected.nu b/tests/modules/programs/nushell/env-expected.nu
index 50f6f767b..aacc37925 100644
--- a/tests/modules/programs/nushell/env-expected.nu
+++ b/tests/modules/programs/nushell/env-expected.nu
@@ -1,17 +1,2 @@
 $env.FOO = 'BAR'
 
-
-load-env {
-    "ENV_CONVERSIONS": {
-        "PATH": {
-            "from_string": ({|s| $s | split row (char esep) })
-            "to_string": ({|v| $v | str join (char esep) })
-        }
-    }
-    "FOO": "BAR"
-    "LIST_VALUE": [
-        "foo"
-        "bar"
-    ]
-    "PROMPT_COMMAND": ({|| "> "})
-}

From 82455a84e32af01c66e326e5a188795f324975a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Sun, 5 Jan 2025 13:39:08 +0100
Subject: [PATCH 266/546] nushell: allow multi-word aliases

Also fix invalid alias in test
---
 modules/programs/nushell.nix                        | 8 ++++++--
 tests/modules/programs/nushell/config-expected.nu   | 5 +++--
 tests/modules/programs/nushell/example-settings.nix | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index 92a8f4e9d..a4e767c8a 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -164,7 +164,10 @@ in {
     shellAliases = lib.mkOption {
       type = types.attrsOf types.str;
       default = { };
-      example = { ll = "ls -l"; };
+      example = {
+        ll = "ls -l";
+        g = "git";
+      };
       description = ''
         An attribute set that maps aliases (the top level attribute names in
         this option) to command strings or directly to build outputs.
@@ -202,7 +205,8 @@ in {
           || aliasesStr != "" || cfg.settings != { };
 
         aliasesStr = lib.concatLines
-          (lib.mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases);
+          (lib.mapAttrsToList (k: v: "alias ${toNushell { } k} = ${v}")
+            cfg.shellAliases);
       in lib.mkIf writeConfig {
         "${configDir}/config.nu".text = lib.mkMerge [
           (let
diff --git a/tests/modules/programs/nushell/config-expected.nu b/tests/modules/programs/nushell/config-expected.nu
index 4578f9531..57bc16ee8 100644
--- a/tests/modules/programs/nushell/config-expected.nu
+++ b/tests/modules/programs/nushell/config-expected.nu
@@ -26,5 +26,6 @@ let config = {
 }
 
 
-alias ll = ls -a
-alias lsname = (ls | get name)
+alias "ll" = ls -a
+alias "multi word alias" = cd -
+alias "z" = __zoxide_z
diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index 598a7bd85..9f0108a30 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -26,8 +26,9 @@
     plugins = [ pkgs.nushellPlugins.formats ];
 
     shellAliases = {
-      "lsname" = "(ls | get name)";
       "ll" = "ls -a";
+      "multi word alias" = "cd -";
+      "z" = "__zoxide_z";
     };
 
     settings = {

From bd530df4e284310fee0fada3562de908009e1236 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Wed, 29 Jan 2025 12:29:44 -0500
Subject: [PATCH 267/546] firefox: avoid unnecessarily overriding package

When `cfg.package` is already wrapped, and wrapped without the
`ExtensionSettings` key set, this would always add that key, even if its
value was blank. This would result in `cfg.finalPackage` being a
functionally-identical, but differently-input-addressed package. This is
generally undesirable as it may result in multiple derivations being
built, and also if the value of `cfg.package` is expected to be
unchanged by the user (e.g. because they want it to be consistent
between NixOS and HM configuration).

Add a test to ensure this does not regress in the default case. Only
test on newish stateVersion since the logic for `isWrapped` differs on
older versions.
---
 modules/programs/firefox/mkFirefoxModule.nix  | 13 +++++-----
 tests/modules/programs/firefox/common.nix     |  1 +
 .../programs/firefox/final-package.nix        | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 tests/modules/programs/firefox/final-package.nix

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 1bb2253f1..2a0c521fb 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -803,12 +803,13 @@ in {
     finalPackage = wrapPackage cfg.package;
 
     policies = {
-      ExtensionSettings = listToAttrs (map (lang:
-        nameValuePair "langpack-${lang}@firefox.mozilla.org" {
-          installation_mode = "normal_installed";
-          install_url =
-            "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi";
-        }) cfg.languagePacks);
+      ExtensionSettings = lib.mkIf (cfg.languagePacks != [ ]) (listToAttrs (map
+        (lang:
+          nameValuePair "langpack-${lang}@firefox.mozilla.org" {
+            installation_mode = "normal_installed";
+            install_url =
+              "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi";
+          }) cfg.languagePacks));
     };
   });
 }
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index a3af6d4ab..b0aef1931 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -1,6 +1,7 @@
 name:
 builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
+  "${name}-final-package" = ./final-package.nix;
   "${name}-policies" = ./policies.nix;
   "${name}-profiles-bookmarks" = ./profiles/bookmarks;
   "${name}-profiles-containers" = ./profiles/containers;
diff --git a/tests/modules/programs/firefox/final-package.nix b/tests/modules/programs/firefox/final-package.nix
new file mode 100644
index 000000000..ec310ee33
--- /dev/null
+++ b/tests/modules/programs/firefox/final-package.nix
@@ -0,0 +1,25 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+let
+
+  cfg = lib.getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = lib.mkIf config.test.enableBig
+    (lib.setAttrByPath modulePath { enable = true; } // {
+      home.stateVersion = "19.09";
+
+      nmt.script = ''
+        package=${cfg.package}
+        finalPackage=${cfg.finalPackage}
+        if [[ $package != $finalPackage ]]; then
+          fail "Expected finalPackage ($finalPackage) to equal package ($package)"
+        fi
+      '';
+    });
+}

From 0ee8bfdd04de611a93cf57dda01686b613cc587d Mon Sep 17 00:00:00 2001
From: Danil Suetin <suetin085@protonmail.com>
Date: Thu, 11 Jul 2024 14:27:27 +0200
Subject: [PATCH 268/546] firefox: add preConfig

Add `preConfig`, which acts like `extraConfig`, but placed before
`settings`. This will allow to overwrite settings in `preConfig`,
using `settings` option.
---
 modules/misc/news.nix                         | 13 ++++++
 modules/programs/firefox/mkFirefoxModule.nix  | 27 +++++++++---
 tests/modules/programs/firefox/common.nix     |  1 +
 .../bookmarks/expected-bookmarks-user.js      |  2 +
 .../firefox/profiles/overwrite/default.nix    | 43 +++++++++++++++++++
 .../profiles/overwrite/expected-user.js       | 10 +++++
 .../profiles/settings/expected-user.js        |  2 +
 7 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 tests/modules/programs/firefox/profiles/overwrite/default.nix
 create mode 100644 tests/modules/programs/firefox/profiles/overwrite/expected-user.js

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index c578d2378..bff39c119 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1972,6 +1972,19 @@ in {
           'yazi' alias.
         '';
       }
+
+      {
+        time = "2025-01-29T17:34:53+00:00";
+        condition = config.programs.firefox.enable;
+        message = ''
+          The Firefox module now provides a
+          'programs.firefox.profiles.<name>.preConfig' option.
+
+          It allows extra preferences to be added to 'user.js' before the
+          options specified in 'programs.firefox.profiles.<name>.settings', so
+          that they can be overwritten.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 2a0c521fb..66f1729b2 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -75,7 +75,7 @@ let
     else
       builtins.toJSON pref);
 
-  mkUserJs = prefs: extraPrefs: bookmarks:
+  mkUserJs = prePrefs: prefs: extraPrefs: bookmarks:
     let
       prefs' = lib.optionalAttrs ([ ] != bookmarks) {
         "browser.bookmarks.file" = toString (browserBookmarksFile bookmarks);
@@ -84,6 +84,8 @@ let
     in ''
       // Generated by Home Manager.
 
+      ${prePrefs}
+
       ${concatStrings (mapAttrsToList (name: value: ''
         user_pref("${name}", ${userPrefValue value});
       '') prefs')}
@@ -369,6 +371,20 @@ in {
             '';
           };
 
+          preConfig = mkOption {
+            type = types.lines;
+            default = "";
+            description = ''
+              Extra preferences to add to {file}`user.js`, before
+              [](#opt-programs.firefox.profiles._name_.settings).
+
+              Use [](#opt-programs.firefox.profiles._name_.extraConfig), unless
+              you want to overwrite in
+              [](#opt-programs.firefox.profiles._name_.settings), then use this
+              option.
+            '';
+          };
+
           settings = mkOption {
             type = types.attrsOf (jsonFormat.type // {
               description =
@@ -768,10 +784,11 @@ in {
       "${profilesPath}/${profile.path}/chrome/userContent.css" =
         mkIf (profile.userContent != "") { text = profile.userContent; };
 
-      "${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { }
-        || profile.extraConfig != "" || profile.bookmarks != [ ]) {
-          text =
-            mkUserJs profile.settings profile.extraConfig profile.bookmarks;
+      "${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig != ""
+        || profile.settings != { } || profile.extraConfig != ""
+        || profile.bookmarks != [ ]) {
+          text = mkUserJs profile.preConfig profile.settings profile.extraConfig
+            profile.bookmarks;
         };
 
       "${profilesPath}/${profile.path}/containers.json" =
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index b0aef1931..c92db1e4c 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -10,6 +10,7 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-profiles-containers-id-out-of-range" =
     ./profiles/containers/id-out-of-range.nix;
   "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profiles-overwrite" = ./profiles/overwrite;
   "${name}-profiles-search" = ./profiles/search;
   "${name}-profiles-settings" = ./profiles/settings;
   "${name}-state-version-19_09" = ./state-version-19_09.nix;
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
index 47448a6e4..d36dccfdf 100644
--- a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
+++ b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js
@@ -1,5 +1,7 @@
 // Generated by Home Manager.
 
+
+
 user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-@name@-bookmarks.html");
 user_pref("browser.places.importBookmarksHTML", true);
 user_pref("general.smoothScroll", false);
diff --git a/tests/modules/programs/firefox/profiles/overwrite/default.nix b/tests/modules/programs/firefox/profiles/overwrite/default.nix
new file mode 100644
index 000000000..a0881032a
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/overwrite/default.nix
@@ -0,0 +1,43 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles = {
+      basic.isDefault = true;
+      test = {
+        id = 6;
+        preConfig = ''
+          user_pref("browser.search.suggest.enabled", false);
+        '';
+        settings = { "browser.search.suggest.enabled" = true; };
+        extraConfig = ''
+          user_pref("findbar.highlightAll", true);
+        '';
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileRegex \
+        home-path/bin/${cfg.wrappedPackageName} \
+        MOZ_APP_LAUNCHER
+
+      assertDirectoryExists home-files/${cfg.configPath}/basic
+
+      assertFileContent \
+        home-files/${cfg.configPath}/test/user.js \
+        ${./expected-user.js}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profiles/overwrite/expected-user.js b/tests/modules/programs/firefox/profiles/overwrite/expected-user.js
new file mode 100644
index 000000000..cbcc5f262
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/overwrite/expected-user.js
@@ -0,0 +1,10 @@
+// Generated by Home Manager.
+
+user_pref("browser.search.suggest.enabled", false);
+
+
+user_pref("browser.search.suggest.enabled", true);
+
+
+user_pref("findbar.highlightAll", true);
+
diff --git a/tests/modules/programs/firefox/profiles/settings/expected-user.js b/tests/modules/programs/firefox/profiles/settings/expected-user.js
index d929df2b3..8118d73bf 100644
--- a/tests/modules/programs/firefox/profiles/settings/expected-user.js
+++ b/tests/modules/programs/firefox/profiles/settings/expected-user.js
@@ -1,5 +1,7 @@
 // Generated by Home Manager.
 
+
+
 user_pref("browser.newtabpage.pinned", "[{\"title\":\"NixOS\",\"url\":\"https://nixos.org\"}]");
 user_pref("general.smoothScroll", false);
 

From 5dc1c2e40410f7dabef3ba8bf4fdb3145eae3ceb Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Wed, 29 Jan 2025 20:19:53 +0200
Subject: [PATCH 269/546] hyprland: add xdg.portal configuration (#5707)

Add integration with `xdg.portal`, and the `portalPackage` option for
`xdg-desktop-portal-hyprland`.
---
 modules/services/window-managers/hyprland.nix | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix
index 73602ec61..8e81c11f7 100644
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -58,6 +58,8 @@ in {
 
     package = lib.mkPackageOption pkgs "hyprland" { };
 
+    portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
+
     finalPackage = lib.mkOption {
       type = lib.types.package;
       readOnly = true;
@@ -69,6 +71,18 @@ in {
       '';
     };
 
+    finalPortalPackage = lib.mkOption {
+      type = lib.types.package;
+      readOnly = true;
+      default = cfg.portalPackage.override { hyprland = cfg.finalPackage; };
+      defaultText = lib.literalMD ''
+        `wayland.windowManager.hyprland.portalPackage` with
+                `wayland.windowManager.hyprland.finalPackage` override'';
+      description = ''
+        The xdg-desktop-portal-hyprland package after overriding its hyprland input.
+      '';
+    };
+
     plugins = lib.mkOption {
       type = with lib.types; listOf (either package path);
       default = [ ];
@@ -264,6 +278,12 @@ in {
       '';
     };
 
+    xdg.portal = {
+      enable = true;
+      extraPortals = [ cfg.finalPortalPackage ];
+      configPackages = lib.mkDefault [ cfg.finalPackage ];
+    };
+
     systemd.user.targets.hyprland-session = lib.mkIf cfg.systemd.enable {
       Unit = {
         Description = "Hyprland compositor session";

From c4650fb9c0c4c8f7e1a43e6d72378246a4b50f3b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 29 Jan 2025 12:26:13 -0600
Subject: [PATCH 270/546] cliphist: support multiple systemdTargets properly
 (#5669)

Using a space separated list of targets as a single string element in
the list doesn't work properly. Change property to support list of
targets and backwards compatibility with warning for single string.
---
 modules/services/cliphist.nix                 | 24 +++++++++++++------
 .../cliphist-multiple-session-targets.nix     | 20 ++++++++++++++++
 .../cliphist/cliphist-sway-session-target.nix | 10 +++++++-
 tests/modules/services/cliphist/default.nix   |  1 +
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 tests/modules/services/cliphist/cliphist-multiple-session-targets.nix

diff --git a/modules/services/cliphist.nix b/modules/services/cliphist.nix
index 1877a6de0..eb676be47 100644
--- a/modules/services/cliphist.nix
+++ b/modules/services/cliphist.nix
@@ -3,6 +3,14 @@ let cfg = config.services.cliphist;
 in {
   meta.maintainers = [ lib.hm.maintainers.janik ];
 
+  imports = [
+    (lib.mkRenamedOptionModule [ "services" "cliphist" "systemdTarget" ] [
+      "services"
+      "cliphist"
+      "systemdTargets"
+    ])
+  ];
+
   options.services.cliphist = {
     enable =
       lib.mkEnableOption "cliphist, a clipboard history “manager” for wayland";
@@ -25,16 +33,18 @@ in {
       '';
     };
 
-    systemdTarget = lib.mkOption {
-      type = lib.types.str;
-      default = "graphical-session.target";
+    systemdTargets = lib.mkOption {
+      type = with lib.types; either (listOf str) str;
+      default = [ "graphical-session.target" ];
       example = "sway-session.target";
       description = ''
-        The systemd target that will automatically start the cliphist service.
+        The systemd targets that will automatically start the cliphist service.
 
-        When setting this value to `"sway-session.target"`,
+        When setting this value to `["sway-session.target"]`,
         make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
         otherwise the service may never be started.
+
+        Note: A single string value is deprecated, please use a list.
       '';
     };
   };
@@ -61,7 +71,7 @@ in {
         Restart = "on-failure";
       };
 
-      Install = { WantedBy = [ cfg.systemdTarget ]; };
+      Install = { WantedBy = lib.toList cfg.systemdTargets; };
     };
 
     systemd.user.services.cliphist-images = lib.mkIf cfg.allowImages {
@@ -77,7 +87,7 @@ in {
         Restart = "on-failure";
       };
 
-      Install = { WantedBy = [ cfg.systemdTarget ]; };
+      Install = { WantedBy = lib.toList cfg.systemdTargets; };
     };
   };
 }
diff --git a/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix
new file mode 100644
index 000000000..e4c0e828c
--- /dev/null
+++ b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix
@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  services.cliphist = {
+    enable = true;
+
+    systemdTargets = [ "sway-session.target" "hyprland-session.target" ];
+  };
+
+  test.stubs = {
+    cliphist = { };
+    wl-clipboard = { };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/systemd/user/cliphist.service
+    assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service
+    assertFileExists home-files/.config/systemd/user/hyprland-session.target.wants/cliphist.service
+  '';
+}
diff --git a/tests/modules/services/cliphist/cliphist-sway-session-target.nix b/tests/modules/services/cliphist/cliphist-sway-session-target.nix
index 25da0f137..71171be78 100644
--- a/tests/modules/services/cliphist/cliphist-sway-session-target.nix
+++ b/tests/modules/services/cliphist/cliphist-sway-session-target.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, options, ... }:
 
 {
   services.cliphist = {
@@ -13,5 +13,13 @@
 
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/cliphist.service
+    assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service
   '';
+
+  test.asserts.warnings.expected = [
+    "The option `services.cliphist.systemdTarget' defined in ${
+      lib.showFiles options.services.cliphist.systemdTarget.files
+    } has been renamed to `services.cliphist.systemdTargets'."
+  ];
+
 }
diff --git a/tests/modules/services/cliphist/default.nix b/tests/modules/services/cliphist/default.nix
index d74a469b1..de05e0d00 100644
--- a/tests/modules/services/cliphist/default.nix
+++ b/tests/modules/services/cliphist/default.nix
@@ -1,4 +1,5 @@
 {
   cliphist-sway-session-target = ./cliphist-sway-session-target.nix;
   cliphist-extra-options = ./cliphist-extra-options.nix;
+  cliphist-multiple-session-targets = ./cliphist-multiple-session-targets.nix;
 }

From d71828a7dd0dc53cf3994e8737c84b4180cc6dfa Mon Sep 17 00:00:00 2001
From: anund <anundm@gmail.com>
Date: Wed, 29 Jan 2025 18:47:05 +0000
Subject: [PATCH 271/546] ghostty: allow darwin users to manager their config
 (#6300)

* ghostty: allow darwin users to manager their config

Currently nixpkgs does not contain a package defintion for ghostty
compatible with Darwin. Darwin users may still want to use this module
to manage their config or share config between systems. This carries
over behaviour from the beta period where this same technique was used.

see: https://github.com/clo4/ghostty-hm-module/blob/887e13a6e7acf5ffaab0119d96e476d84db90904/module.nix#L167-L173

Also improves validation to cover theme files.

* ghostty: guard all package access with isLinux

ghostty is currently marked as broken in nixpkgs. Darwin users still
want to manage ghostty config via home-manager. Avoiding installing the
package and any extra files that depend on the package outside Linux
allows this.

* ghostty: allow nullable
---
 modules/programs/ghostty.nix | 41 +++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 06b138c61..5f820da75 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -13,7 +13,11 @@ in {
   options.programs.ghostty = {
     enable = lib.mkEnableOption "Ghostty";
 
-    package = lib.mkPackageOption pkgs "ghostty" { };
+    package = lib.mkPackageOption pkgs "ghostty" {
+      nullable = true;
+      extraDescription =
+        "Set programs.ghostty.package to null on platfroms where ghostty is not available or marked broken";
+    };
 
     settings = lib.mkOption {
       inherit (keyValue) type;
@@ -82,7 +86,9 @@ in {
     installBatSyntax =
       lib.mkEnableOption "installation of Ghostty configuration syntax for bat"
       // {
-        default = true;
+        default = cfg.package != null;
+        defaultText =
+          lib.literalMD "`true` if programs.ghostty.package is not null";
       };
 
     enableBashIntegration = lib.mkEnableOption ''
@@ -112,7 +118,7 @@ in {
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
-      home.packages = [ cfg.package ];
+      home.packages = lib.optionals (cfg.package != null) [ cfg.package ];
 
       programs.ghostty.settings = lib.mkIf cfg.clearDefaultKeybinds {
         keybind = lib.mkBefore [ "clear" ];
@@ -120,27 +126,46 @@ in {
 
       # MacOS also supports XDG configuration directory, so we use it for both
       # Linux and macOS to reduce complexity
-      xdg.configFile = lib.mkMerge [
+      xdg.configFile = let
+        validate = file:
+          lib.mkIf (cfg.package != null) "${
+            lib.getExe cfg.package
+          } +validate-config --config-file=${config.xdg.configHome}/ghostty/${file}";
+      in lib.mkMerge [
         {
           "ghostty/config" = lib.mkIf (cfg.settings != { }) {
             source = keyValue.generate "ghostty-config" cfg.settings;
-            onChange = "${lib.getExe cfg.package} +validate-config";
+            onChange = validate "config";
           };
         }
 
         (lib.mkIf (cfg.themes != { }) (lib.mapAttrs' (name: value: {
           name = "ghostty/themes/${name}";
-          value.source = keyValue.generate "ghostty-${name}-theme" value;
+          value = {
+            source = keyValue.generate "ghostty-${name}-theme" value;
+            onChange = validate "themes/${name}";
+          };
         }) cfg.themes))
       ];
     }
 
     (lib.mkIf cfg.installVimSyntax {
-      programs.vim.plugins = [ cfg.package.vim ];
+      assertions = [{
+        assertion = cfg.installVimSyntax -> cfg.package != null;
+        message =
+          "programs.ghostty.installVimSyntax cannot be enabled when programs.ghostty.package is null";
+      }];
+      programs.vim.plugins =
+        lib.optionals (cfg.package != null) [ cfg.package.vim ];
     })
 
     (lib.mkIf cfg.installBatSyntax {
-      programs.bat = {
+      assertions = [{
+        assertion = cfg.installBatSyntax -> cfg.package != null;
+        message =
+          "programs.ghostty.installBatSyntax cannot be enabled when programs.ghostty.package is null";
+      }];
+      programs.bat = lib.mkIf (cfg.package != null) {
         syntaxes.ghostty = {
           src = cfg.package;
           file = "share/bat/syntaxes/ghostty.sublime-syntax";

From d5e5c0d051d8d4f293d8c7550c167597427e058b Mon Sep 17 00:00:00 2001
From: DamiDoug <75175586+damidoug@users.noreply.github.com>
Date: Wed, 29 Jan 2025 23:04:24 +0100
Subject: [PATCH 272/546] aerospace: add module (#6279)

Co-authored-by: damidoug <contact@damidoug.dev>
---
 modules/lib/maintainers.nix                   |   6 +
 modules/misc/news.nix                         |  12 +
 modules/modules.nix                           |   1 +
 modules/programs/aerospace.nix                | 231 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../modules/programs/aerospace/aerospace.nix  |  27 ++
 tests/modules/programs/aerospace/default.nix  |   1 +
 .../programs/aerospace/settings-expected.toml |  29 +++
 8 files changed, 308 insertions(+)
 create mode 100644 modules/programs/aerospace.nix
 create mode 100644 tests/modules/programs/aerospace/aerospace.nix
 create mode 100644 tests/modules/programs/aerospace/default.nix
 create mode 100644 tests/modules/programs/aerospace/settings-expected.toml

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 932d1196d..cfac1c22f 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -79,6 +79,12 @@
     github = "considerate";
     githubId = 217918;
   };
+  damidoug = {
+    email = "contact@damidoug.dev";
+    github = "damidoug";
+    githubId = 75175586;
+    name = "Douglas Damiano";
+  };
   danjujan = {
     name = "Jan Schmitz";
     email = "44864658+danjujan@users.noreply.github.com";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index bff39c119..2dea7a6c6 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1946,6 +1946,7 @@ in {
           speed, features, or native UIs. Ghostty provides all three.
         '';
       }
+
       {
         time = "2025-01-04T15:00:00+00:00";
         condition = hostPlatform.isLinux;
@@ -1985,6 +1986,17 @@ in {
           that they can be overwritten.
         '';
       }
+
+      {
+        time = "2025-01-29T19:11:20+00:00";
+        condition = hostPlatform.isDarwin;
+        message = ''
+          A new module is available: 'programs.aerospace'.
+
+          AeroSpace is an i3-like tiling window manager for macOS.
+          See https://github.com/nikitabobko/AeroSpace for more.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index d20300d1a..db866bec4 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -52,6 +52,7 @@ let
     ./misc/xfconf.nix
     ./programs/abook.nix
     ./programs/aerc.nix
+    ./programs/aerospace.nix
     ./programs/afew.nix
     ./programs/alacritty.nix
     ./programs/alot.nix
diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
new file mode 100644
index 000000000..b0dc9b72a
--- /dev/null
+++ b/modules/programs/aerospace.nix
@@ -0,0 +1,231 @@
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkOption types;
+  cfg = config.programs.aerospace;
+
+  tomlFormat = pkgs.formats.toml { };
+
+  filterAttrsRecursive = pred: set:
+    lib.listToAttrs (lib.concatMap (name:
+      let v = set.${name};
+      in if pred v then
+        [
+          (lib.nameValuePair name (if lib.isAttrs v then
+            filterAttrsRecursive pred v
+          else if lib.isList v then
+            (map (i: if lib.isAttrs i then filterAttrsRecursive pred i else i)
+              (lib.filter pred v))
+          else
+            v))
+        ]
+      else
+        [ ]) (lib.attrNames set));
+  filterNulls = filterAttrsRecursive (v: v != null);
+in {
+  meta.maintainers = with lib.hm.maintainers; [ damidoug ];
+
+  options.programs.aerospace = {
+    enable = lib.mkEnableOption "Whether to enable AeroSpace window manager.";
+
+    package = lib.mkPackageOption pkgs "aerospace" { };
+
+    userSettings = mkOption {
+      type = types.submodule {
+        freeformType = tomlFormat.type;
+        options = {
+          start-at-login = lib.mkOption {
+            type = types.bool;
+            default = false;
+            description = "Start AeroSpace at login.";
+          };
+          after-login-command = mkOption {
+            type = with types; listOf str;
+            default = [ ];
+            description = ''
+              You can use it to add commands that run after login to macOS user session.
+              'start-at-login' needs to be 'true' for 'after-login-command' to work.
+            '';
+          };
+          after-startup-command = mkOption {
+            type = with types; listOf str;
+            default = [ ];
+            description = ''
+              You can use it to add commands that run after AeroSpace startup.
+              'after-startup-command' is run after 'after-login-command'
+            '';
+            example = [ "layout tiles" ];
+          };
+          enable-normalization-flatten-containers = mkOption {
+            type = types.bool;
+            default = true;
+            description =
+              ''Containers that have only one child are "flattened".'';
+          };
+          enable-normalization-opposite-orientation-for-nested-containers =
+            mkOption {
+              type = types.bool;
+              default = true;
+              description =
+                "Containers that nest into each other must have opposite orientations.";
+            };
+          accordion-padding = mkOption {
+            type = types.int;
+            default = 30;
+            description = "Padding between windows in an accordion container.";
+          };
+          default-root-container-layout = mkOption {
+            type = types.enum [ "tiles" "accordion" ];
+            default = "tiles";
+            description = "Default layout for the root container.";
+          };
+          default-root-container-orientation = mkOption {
+            type = types.enum [ "horizontal" "vertical" "auto" ];
+            default = "auto";
+            description = "Default orientation for the root container.";
+          };
+          on-window-detected = mkOption {
+            type = types.listOf (types.submodule {
+              options = {
+                "if" = mkOption {
+                  type = types.submodule {
+                    options = {
+                      app-id = mkOption {
+                        type = with types; nullOr str;
+                        default = null;
+                        description = "The application ID to match (optional).";
+                      };
+                      workspace = mkOption {
+                        type = with types; nullOr str;
+                        default = null;
+                        description = "The workspace name to match (optional).";
+                      };
+                      window-title-regex-substring = mkOption {
+                        type = with types; nullOr str;
+                        default = null;
+                        description =
+                          "Substring to match in the window title (optional).";
+                      };
+                      app-name-regex-substring = mkOption {
+                        type = with types; nullOr str;
+                        default = null;
+                        description =
+                          "Regex substring to match the app name (optional).";
+                      };
+                      during-aerospace-startup = mkOption {
+                        type = with types; nullOr bool;
+                        default = null;
+                        description =
+                          "Whether to match during aerospace startup (optional).";
+                      };
+                    };
+                  };
+                  default = { };
+                  description = "Conditions for detecting a window.";
+                };
+                check-further-callbacks = mkOption {
+                  type = with types; nullOr bool;
+                  default = null;
+                  description =
+                    "Whether to check further callbacks after this rule (optional).";
+                };
+                run = mkOption {
+                  type = with types; oneOf [ str (listOf str) ];
+                  example = [ "move-node-to-workspace m" "resize-node" ];
+                  description =
+                    "Commands to execute when the conditions match (required).";
+                };
+              };
+            });
+            default = [ ];
+            example = [{
+              "if" = {
+                app-id = "Another.Cool.App";
+                workspace = "cool-workspace";
+                window-title-regex-substring = "Title";
+                app-name-regex-substring = "CoolApp";
+                during-aerospace-startup = false;
+              };
+              check-further-callbacks = false;
+              run = [ "move-node-to-workspace m" "resize-node" ];
+            }];
+            description =
+              "Commands to run every time a new window is detected with optional conditions.";
+          };
+          workspace-to-monitor-force-assignment = mkOption {
+            type = with types; attrsOf (oneOf [ int str (listOf str) ]);
+            default = { };
+            description = ''
+              Map workspaces to specific monitors.
+              Left-hand side is the workspace name, and right-hand side is the monitor pattern.
+            '';
+            example = {
+              "1" = 1; # First monitor from left to right.
+              "2" = "main"; # Main monitor.
+              "3" = "secondary"; # Secondary monitor (non-main).
+              "4" = "built-in"; # Built-in display.
+              "5" =
+                "^built-in retina display$"; # Regex for the built-in retina display.
+              "6" = [ "secondary" "dell" ]; # Match first pattern in the list.
+            };
+          };
+          on-focus-changed = mkOption {
+            type = with types; listOf str;
+            default = [ ];
+            example = [ "move-mouse monitor-lazy-center" ];
+            description =
+              "Commands to run every time focused window or workspace changes.";
+          };
+          on-focused-monitor-changed = mkOption {
+            type = with types; listOf str;
+            default = [ "move-mouse monitor-lazy-center" ];
+            description = "Commands to run every time focused monitor changes.";
+          };
+          exec-on-workspace-change = mkOption {
+            type = with types; listOf str;
+            default = [ ];
+            example = [
+              "/bin/bash"
+              "-c"
+              "sketchybar --trigger aerospace_workspace_change FOCUSED=$AEROSPACE_FOCUSED_WORKSPACE"
+            ];
+            description = "Commands to run every time workspace changes.";
+          };
+          key-mapping.preset = mkOption {
+            type = types.enum [ "qwerty" "dvorak" ];
+            default = "qwerty";
+            description = "Keymapping preset.";
+          };
+        };
+      };
+      default = { };
+      example = lib.literalExpression ''
+        {
+          gaps = {
+            outer.left = 8;
+            outer.bottom = 8;
+            outer.top = 8;
+            outer.right = 8;
+          };
+          mode.main.binding = {
+            alt-h = "focus left";
+            alt-j = "focus down";
+            alt-k = "focus up";
+            alt-l = "focus right";
+          };
+        }
+      '';
+      description = ''
+        AeroSpace configuration, see
+        <link xlink:href="https://nikitabobko.github.io/AeroSpace/guide#configuring-aerospace"/>
+        for supported values.
+      '';
+    };
+  };
+
+  config.home = lib.mkIf cfg.enable {
+    packages = [ cfg.package ];
+    file.".config/aerospace/aerospace.toml".source =
+      tomlFormat.generate "aerospace" (filterNulls cfg.userSettings);
+  };
+
+}
diff --git a/tests/default.nix b/tests/default.nix
index f7778e445..f4fa8a59e 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -180,6 +180,7 @@ in import nmtSrc {
     ./modules/xresources
   ] ++ lib.optionals isDarwin [
     ./modules/launchd
+    ./modules/programs/aerospace
     ./modules/services/emacs-darwin
     ./modules/services/espanso-darwin
     ./modules/services/git-sync-darwin
diff --git a/tests/modules/programs/aerospace/aerospace.nix b/tests/modules/programs/aerospace/aerospace.nix
new file mode 100644
index 000000000..db32c531b
--- /dev/null
+++ b/tests/modules/programs/aerospace/aerospace.nix
@@ -0,0 +1,27 @@
+{
+  programs.aerospace = {
+    enable = true;
+    userSettings = {
+      gaps = {
+        outer.left = 8;
+        outer.bottom = 8;
+        outer.top = 8;
+        outer.right = 8;
+      };
+      mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
+      };
+    };
+  };
+
+  test.stubs.aerospace = { };
+
+  nmt.script = ''
+    assertFileContent home-files/.config/aerospace/aerospace.toml ${
+      ./settings-expected.toml
+    }
+  '';
+}
diff --git a/tests/modules/programs/aerospace/default.nix b/tests/modules/programs/aerospace/default.nix
new file mode 100644
index 000000000..d77a32af6
--- /dev/null
+++ b/tests/modules/programs/aerospace/default.nix
@@ -0,0 +1 @@
+{ aerospace = ./aerospace.nix; }
diff --git a/tests/modules/programs/aerospace/settings-expected.toml b/tests/modules/programs/aerospace/settings-expected.toml
new file mode 100644
index 000000000..d38cba45e
--- /dev/null
+++ b/tests/modules/programs/aerospace/settings-expected.toml
@@ -0,0 +1,29 @@
+accordion-padding = 30
+after-login-command = []
+after-startup-command = []
+default-root-container-layout = "tiles"
+default-root-container-orientation = "auto"
+enable-normalization-flatten-containers = true
+enable-normalization-opposite-orientation-for-nested-containers = true
+exec-on-workspace-change = []
+on-focus-changed = []
+on-focused-monitor-changed = ["move-mouse monitor-lazy-center"]
+on-window-detected = []
+start-at-login = false
+
+[gaps.outer]
+bottom = 8
+left = 8
+right = 8
+top = 8
+
+[key-mapping]
+preset = "qwerty"
+
+[mode.main.binding]
+alt-h = "focus left"
+alt-j = "focus down"
+alt-k = "focus up"
+alt-l = "focus right"
+
+[workspace-to-monitor-force-assignment]

From 608b26d16ee69384580b1b14ac947d81d0240beb Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 29 Jan 2025 17:07:28 -0500
Subject: [PATCH 273/546] thunderbird: add native host support (#6292)

Note: the test case uses a firefox native host but it shouldn't matter
since they are packaged the same way for both TB and Firefox.
---
 modules/programs/thunderbird.nix              | 49 ++++++++++++++++++-
 .../programs/thunderbird/thunderbird.nix      | 22 ++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 84710207c..339bcb599 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -136,6 +136,24 @@ let
     '') prefs)}
     ${extraPrefs}
   '';
+
+  nativeMessagingHostsPath = if isDarwin then
+    "${cfg.vendorPath}/NativeMessagingHosts"
+  else
+    "${cfg.vendorPath}/native-messaging-hosts";
+
+  nativeMessagingHostsJoined = pkgs.symlinkJoin {
+    name = "th_native-messaging-hosts";
+    paths = [
+      # Link a .keep file to keep the directory around
+      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
+      # Link package configured native messaging hosts (entire mail app actually)
+      cfg.package
+    ]
+    # Link user configured native messaging hosts
+      ++ cfg.nativeMessagingHosts;
+  };
+
 in {
   meta.maintainers = with hm.maintainers; [ d-dervishi jkarlson ];
 
@@ -158,6 +176,29 @@ in {
         description = "profile version, set null for nix-darwin";
       };
 
+      vendorPath = mkOption {
+        internal = true;
+        type = with types; nullOr str;
+        # Thunderbird doesn't look in `Application Support` on macOS for user
+        # config (in contrast to global settings that are the same for Firefox
+        # and Thunderbird):
+        # https://developer.thunderbird.net/add-ons/mailextensions/supported-webextension-api
+        default = if isDarwin then "Library/Mozilla" else ".mozilla";
+        example = ".mozilla";
+        description =
+          "Directory containing the native messaging hosts directory.";
+      };
+
+      nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
+        visible = true;
+        type = types.listOf types.package;
+        default = [ ];
+        description = ''
+          Additional packages containing native messaging hosts that should be
+          made available to Thunderbird extensions.
+        '';
+      });
+
       profiles = mkOption {
         type = with types;
           attrsOf (submodule ({ config, name, ... }: {
@@ -403,7 +444,13 @@ in {
     home.file = mkMerge ([{
       "${thunderbirdConfigPath}/profiles.ini" =
         mkIf (cfg.profiles != { }) { text = generators.toINI { } profilesIni; };
-    }] ++ flip mapAttrsToList cfg.profiles (name: profile: {
+    }] ++ optional (cfg.vendorPath != null) {
+      "${nativeMessagingHostsPath}" = {
+        source =
+          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+        recursive = true;
+      };
+    } ++ flip mapAttrsToList cfg.profiles (name: profile: {
       "${thunderbirdProfilesPath}/${name}/chrome/userChrome.css" =
         mkIf (profile.userChrome != "") { text = profile.userChrome; };
 
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 366f8b045..952e48de9 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -41,6 +41,9 @@
     # Disable warning so that platforms' behavior is the same
     darwinSetupWarning = false;
 
+    # Darwin doesn't support wrapped Thunderbird, using unwrapped instead
+    package = pkgs.thunderbird-unwrapped;
+
     profiles = {
       first = {
         isDefault = true;
@@ -62,18 +65,31 @@
       };
     };
 
+    nativeMessagingHosts = with pkgs;
+      [
+        # NOTE: this is not a real Thunderbird native host module but Firefox; no
+        # native hosts are currently packaged for nixpkgs or elsewhere, so we
+        # have to improvise. Packaging wise, Firefox and Thunderbird native hosts
+        # are identical though. Good news is that the test will still pass as
+        # long as we don't attempt to run the mail client itself with the host.
+        # (Which we don't.)
+        browserpass
+      ];
+
     settings = {
       "general.useragent.override" = "";
       "privacy.donottrackheader.enabled" = true;
     };
   };
 
-  test.stubs.thunderbird = { };
-
   nmt.script = let
     isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
     configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
     profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}";
+    nativeHostsDir = if isDarwin then
+      "Library/Mozilla/NativeMessagingHosts"
+    else
+      ".mozilla/native-messaging-hosts";
     platform = if isDarwin then "darwin" else "linux";
   in ''
     assertFileExists home-files/${configDir}/profiles.ini
@@ -95,5 +111,7 @@
     assertFileExists home-files/${profilesDir}/first/chrome/userContent.css
     assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \
       <(echo "* { color: red !important; }")
+
+    assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json
   '';
 }

From 6aa38ffdf77fb4250f5d832fd5a09eb99226fba7 Mon Sep 17 00:00:00 2001
From: Utkarsh Gupta <5155100+utkarshgupta137@users.noreply.github.com>
Date: Wed, 29 Jan 2025 22:09:34 +0000
Subject: [PATCH 274/546] atuin: set socket path for darwin (#6248)

The daemon doesn't know about XDG_RUNTIME_DIR, so set the socket_path
manually for consistency between daemon & client
---
 modules/programs/atuin.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index b57cc142a..9160edd3f 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -211,6 +211,13 @@ in {
         };
       })
       (mkIf isDarwin {
+        programs.atuin.settings = {
+          daemon = {
+            socket_path =
+              lib.mkDefault "${config.xdg.dataHome}/atuin/daemon.sock";
+          };
+        };
+
         launchd.agents.atuin-daemon = {
           enable = true;
           config = {

From 79eff1f6b95c059ed0f9dfae9fd16689c1dda5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20F=C3=BCsslin?= <mfuesslin+github@gmail.com>
Date: Wed, 29 Jan 2025 23:31:45 +0100
Subject: [PATCH 275/546] zsh: added HIST_SAVE_NO_DUPS and HIST_FIND_NO_DUPS
 options to zsh for history configuration. (#6227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Maximilian Füsslin <mfuesslin@gmail.com>
---
 modules/programs/zsh.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 3e13404c5..25adab2d2 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -104,6 +104,23 @@ let
         '';
       };
 
+      saveNoDups = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Do not write duplicate entries into the history file.
+        '';
+      };
+
+      findNoDups = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Do not display a line previously found in the history
+          file.
+        '';
+      };
+
       ignoreSpace = mkOption {
         type = types.bool;
         default = true;
@@ -693,6 +710,8 @@ in
         ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY
         ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
         ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS
+        ${if cfg.history.saveNoDups then "setopt" else "unsetopt"} HIST_SAVE_NO_DUPS
+        ${if cfg.history.findNoDups then "setopt" else "unsetopt"} HIST_FIND_NO_DUPS
         ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE
         ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST
         ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY

From 6fbbfb92409bf999fd80b78c7f7bc145d2d36f39 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 29 Jan 2025 17:11:30 -0600
Subject: [PATCH 276/546] Revert "thunderbird: add native host support (#6292)"
 (#6371)

---
 modules/programs/thunderbird.nix              | 49 +------------------
 .../programs/thunderbird/thunderbird.nix      | 22 +--------
 2 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 339bcb599..84710207c 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -136,24 +136,6 @@ let
     '') prefs)}
     ${extraPrefs}
   '';
-
-  nativeMessagingHostsPath = if isDarwin then
-    "${cfg.vendorPath}/NativeMessagingHosts"
-  else
-    "${cfg.vendorPath}/native-messaging-hosts";
-
-  nativeMessagingHostsJoined = pkgs.symlinkJoin {
-    name = "th_native-messaging-hosts";
-    paths = [
-      # Link a .keep file to keep the directory around
-      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
-      # Link package configured native messaging hosts (entire mail app actually)
-      cfg.package
-    ]
-    # Link user configured native messaging hosts
-      ++ cfg.nativeMessagingHosts;
-  };
-
 in {
   meta.maintainers = with hm.maintainers; [ d-dervishi jkarlson ];
 
@@ -176,29 +158,6 @@ in {
         description = "profile version, set null for nix-darwin";
       };
 
-      vendorPath = mkOption {
-        internal = true;
-        type = with types; nullOr str;
-        # Thunderbird doesn't look in `Application Support` on macOS for user
-        # config (in contrast to global settings that are the same for Firefox
-        # and Thunderbird):
-        # https://developer.thunderbird.net/add-ons/mailextensions/supported-webextension-api
-        default = if isDarwin then "Library/Mozilla" else ".mozilla";
-        example = ".mozilla";
-        description =
-          "Directory containing the native messaging hosts directory.";
-      };
-
-      nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
-        visible = true;
-        type = types.listOf types.package;
-        default = [ ];
-        description = ''
-          Additional packages containing native messaging hosts that should be
-          made available to Thunderbird extensions.
-        '';
-      });
-
       profiles = mkOption {
         type = with types;
           attrsOf (submodule ({ config, name, ... }: {
@@ -444,13 +403,7 @@ in {
     home.file = mkMerge ([{
       "${thunderbirdConfigPath}/profiles.ini" =
         mkIf (cfg.profiles != { }) { text = generators.toINI { } profilesIni; };
-    }] ++ optional (cfg.vendorPath != null) {
-      "${nativeMessagingHostsPath}" = {
-        source =
-          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
-        recursive = true;
-      };
-    } ++ flip mapAttrsToList cfg.profiles (name: profile: {
+    }] ++ flip mapAttrsToList cfg.profiles (name: profile: {
       "${thunderbirdProfilesPath}/${name}/chrome/userChrome.css" =
         mkIf (profile.userChrome != "") { text = profile.userChrome; };
 
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 952e48de9..366f8b045 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -41,9 +41,6 @@
     # Disable warning so that platforms' behavior is the same
     darwinSetupWarning = false;
 
-    # Darwin doesn't support wrapped Thunderbird, using unwrapped instead
-    package = pkgs.thunderbird-unwrapped;
-
     profiles = {
       first = {
         isDefault = true;
@@ -65,31 +62,18 @@
       };
     };
 
-    nativeMessagingHosts = with pkgs;
-      [
-        # NOTE: this is not a real Thunderbird native host module but Firefox; no
-        # native hosts are currently packaged for nixpkgs or elsewhere, so we
-        # have to improvise. Packaging wise, Firefox and Thunderbird native hosts
-        # are identical though. Good news is that the test will still pass as
-        # long as we don't attempt to run the mail client itself with the host.
-        # (Which we don't.)
-        browserpass
-      ];
-
     settings = {
       "general.useragent.override" = "";
       "privacy.donottrackheader.enabled" = true;
     };
   };
 
+  test.stubs.thunderbird = { };
+
   nmt.script = let
     isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
     configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
     profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}";
-    nativeHostsDir = if isDarwin then
-      "Library/Mozilla/NativeMessagingHosts"
-    else
-      ".mozilla/native-messaging-hosts";
     platform = if isDarwin then "darwin" else "linux";
   in ''
     assertFileExists home-files/${configDir}/profiles.ini
@@ -111,7 +95,5 @@
     assertFileExists home-files/${profilesDir}/first/chrome/userContent.css
     assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \
       <(echo "* { color: red !important; }")
-
-    assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json
   '';
 }

From 697ba1319fdc58c94dc94cd7908df554dc48d970 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 30 Jan 2025 01:16:15 +0200
Subject: [PATCH 277/546] waybar: allow setting systemd.target to null (#6241)

This allows making the systemd user unit appear without it autostarting,
which is useful if you want to start it manually from a specific display
manager config only.
---
 modules/programs/waybar.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index dbbe89c3d..2239fe5ef 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -198,7 +198,7 @@ in {
     systemd.enable = mkEnableOption "Waybar systemd integration";
 
     systemd.target = mkOption {
-      type = str;
+      type = nullOr str;
       default = config.wayland.systemd.target;
       defaultText = literalExpression "config.wayland.systemd.target";
       example = "sway-session.target";
@@ -326,7 +326,8 @@ in {
           KillMode = "mixed";
         };
 
-        Install = { WantedBy = [ cfg.systemd.target ]; };
+        Install.WantedBy =
+          lib.optional (cfg.systemd.target != null) cfg.systemd.target;
       };
     })
   ]);

From ba3338ab990e4348a4e57fc4fdac758524cf7029 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Thu, 30 Jan 2025 07:39:21 +0700
Subject: [PATCH 278/546] waybar: allow setting layer to overlay (#5729)

---
 modules/programs/waybar.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 2239fe5ef..486b29171 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -25,7 +25,7 @@ let
 
       options = {
         layer = mkOption {
-          type = nullOr (enum [ "top" "bottom" ]);
+          type = nullOr (enum [ "top" "bottom" "overlay" ]);
           default = null;
           description = ''
             Decide if the bar is displayed in front (`"top"`)

From 7636b248675e00d887ec0e6932c316d87f36dbf3 Mon Sep 17 00:00:00 2001
From: diniamo <55629891+diniamo@users.noreply.github.com>
Date: Thu, 30 Jan 2025 01:40:05 +0100
Subject: [PATCH 279/546] hyprland: make package nullable (#5742)

---
 modules/services/window-managers/hyprland.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix
index 8e81c11f7..44df85b06 100644
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -56,7 +56,11 @@ in {
       '';
     };
 
-    package = lib.mkPackageOption pkgs "hyprland" { };
+    package = lib.mkPackageOption pkgs "hyprland" {
+      nullable = true;
+      extraDescription =
+        "Set this to null if you use the NixOS module to install Hyprland.";
+    };
 
     portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
 
@@ -234,10 +238,8 @@ in {
         "You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake.";
     in lib.optional inconsistent warning;
 
-    home.packages = lib.concatLists [
-      (lib.optional (cfg.package != null) cfg.finalPackage)
-      (lib.optional (cfg.xwayland.enable) pkgs.xwayland)
-    ];
+    home.packages = lib.mkIf (cfg.package != null)
+      ([ cfg.finalPackage ] ++ lib.optional cfg.xwayland.enable pkgs.xwayland);
 
     xdg.configFile."hypr/hyprland.conf" = let
       shouldGenerate = cfg.systemd.enable || cfg.extraConfig != ""

From 9ce5d0b888a054945121394297ad34173d135547 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 30 Jan 2025 01:45:54 +0100
Subject: [PATCH 280/546] xdg-autostart: add module (#5251)

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 modules/misc/xdg-autostart.nix       | 40 ++++++++++++++++++++++++++++
 modules/modules.nix                  |  1 +
 tests/modules/misc/xdg/autostart.nix | 20 ++++++++++++++
 tests/modules/misc/xdg/default.nix   |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 modules/misc/xdg-autostart.nix
 create mode 100644 tests/modules/misc/xdg/autostart.nix

diff --git a/modules/misc/xdg-autostart.nix b/modules/misc/xdg-autostart.nix
new file mode 100644
index 000000000..f6b8b7e24
--- /dev/null
+++ b/modules/misc/xdg-autostart.nix
@@ -0,0 +1,40 @@
+{ config, lib, ... }:
+let
+  inherit (builtins) baseNameOf listToAttrs map unsafeDiscardStringContext;
+  inherit (lib) literalExpression mkEnableOption mkIf mkOption types;
+
+  cfg = config.xdg.autostart;
+
+  /* "/nix/store/x-foo/application.desktop" -> {
+       name = "autostart/application.desktop";
+       value = { source = "/nix/store/x-foo/application.desktop"; };
+     }
+  */
+  mapDesktopEntry = entry: {
+    name = "autostart/${unsafeDiscardStringContext (baseNameOf entry)}";
+    value.source = entry;
+  };
+in {
+  meta.maintainers = with lib.maintainers; [ Scrumplex ];
+
+  options.xdg.autostart = {
+    enable = mkEnableOption "creation of XDG autostart entries";
+
+    entries = mkOption {
+      type = with types; listOf path;
+      description = ''
+        Paths to desktop files that should be linked to `XDG_CONFIG_HOME/autostart`
+      '';
+      default = [ ];
+      example = literalExpression ''
+        [
+          "''${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop"
+        ]
+      '';
+    };
+  };
+
+  config = mkIf (cfg.enable && cfg.entries != [ ]) {
+    xdg.configFile = listToAttrs (map mapDesktopEntry cfg.entries);
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index db866bec4..6ea6e98c2 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -42,6 +42,7 @@ let
     ./misc/uninstall.nix
     ./misc/version.nix
     ./misc/vte.nix
+    ./misc/xdg-autostart.nix
     ./misc/xdg-desktop-entries.nix
     ./misc/xdg-mime-apps.nix
     ./misc/xdg-mime.nix
diff --git a/tests/modules/misc/xdg/autostart.nix b/tests/modules/misc/xdg/autostart.nix
new file mode 100644
index 000000000..b93580414
--- /dev/null
+++ b/tests/modules/misc/xdg/autostart.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }: {
+  config = {
+    xdg.autostart = {
+      enable = true;
+      entries = [
+        "${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop"
+        "${pkgs.tdesktop}/share/applications/org.telegram.desktop.desktop"
+      ];
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/autostart/org.gnome.Evolution.desktop
+      assertFileContent home-files/.config/autostart/org.gnome.Evolution.desktop \
+        ${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop
+      assertFileExists home-files/.config/autostart/org.telegram.desktop.desktop
+      assertFileContent home-files/.config/autostart/org.telegram.desktop.desktop \
+        ${pkgs.tdesktop}/share/applications/org.telegram.desktop.desktop
+    '';
+  };
+}
diff --git a/tests/modules/misc/xdg/default.nix b/tests/modules/misc/xdg/default.nix
index 87f74e22f..dde36f97e 100644
--- a/tests/modules/misc/xdg/default.nix
+++ b/tests/modules/misc/xdg/default.nix
@@ -9,4 +9,5 @@
   xdg-mime = ./mime.nix;
   xdg-mime-disabled = ./mime-disabled.nix;
   xdg-mime-package = ./mime-packages.nix;
+  xdg-autostart = ./autostart.nix;
 }

From 86a0d627cae02e8cc5d29eeb03de97f8c652a4bb Mon Sep 17 00:00:00 2001
From: Norbert Melzer <timmelzer@gmail.com>
Date: Thu, 30 Jan 2025 02:20:30 +0100
Subject: [PATCH 281/546] home-manger: fix runtime closure (#5174)

Without this fix a `nix-buid . -A home-manager` would successfully
create a `home-manager`. And one could use the included binary until
the next garbage collection, after that it would fail with an
error that it can not find the `home-manager` sources.

Similarily a `nix-copy-closure`d `home-manager` would fail with the
same error on the copies target machine.

This problem existed on both, the flake as well as the non-flake build
of `home-manager`.
---
 default.nix | 12 +++++++++---
 flake.nix   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 541a5a388..7df2dbd43 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,12 @@
 { pkgs ? import <nixpkgs> { } }:
 
-rec {
+let
+  path = builtins.path {
+    path = ./.;
+    name = "home-manager-source";
+  };
+
+in rec {
   docs = let releaseInfo = pkgs.lib.importJSON ./release.json;
   in with import ./docs {
     inherit pkgs;
@@ -12,12 +18,12 @@ rec {
     jsonModuleMaintainers = jsonModuleMaintainers; # Unstable, mainly for CI.
   };
 
-  home-manager = pkgs.callPackage ./home-manager { path = toString ./.; };
+  home-manager = pkgs.callPackage ./home-manager { inherit path; };
 
   install =
     pkgs.callPackage ./home-manager/install.nix { inherit home-manager; };
 
   nixos = import ./nixos;
 
-  path = ./.;
+  inherit path;
 }
diff --git a/flake.nix b/flake.nix
index f4546e1a0..2ad8080e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,7 +104,7 @@
             inherit pkgs;
             inherit (releaseInfo) release isReleaseBranch;
           };
-          hmPkg = pkgs.callPackage ./home-manager { path = "${./.}"; };
+          hmPkg = pkgs.callPackage ./home-manager { path = "${self}"; };
         in {
           default = hmPkg;
           home-manager = hmPkg;

From 41f3dbd795fd89017232c1a6a90dc9d760334ef8 Mon Sep 17 00:00:00 2001
From: ckgxrg <ckgxrg@ckgxrg.io>
Date: Sat, 25 Jan 2025 11:14:48 +0800
Subject: [PATCH 282/546] linux-wallpaperengine: add ckgxrg as maintainer

---
 modules/lib/maintainers.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index cfac1c22f..991d0b470 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -640,4 +640,10 @@
     github = "ALameLlama";
     githubId = 55490546;
   };
+  ckgxrg = {
+    name = "ckgxrg";
+    email = "ckgxrg@ckgxrg.io";
+    github = "ckgxrg-salt";
+    githubId = 165614491;
+  };
 }

From d963ed335b890a70ed53eecf14cdb21528eda9b8 Mon Sep 17 00:00:00 2001
From: ckgxrg <ckgxrg@ckgxrg.io>
Date: Sat, 25 Jan 2025 11:15:27 +0800
Subject: [PATCH 283/546] linux-wallpaperengine: add module

linux-wallpaperengine is an implementation of Wallpaper Engine on
Linux, this module allows it to be declaractively configured.
---
 modules/misc/news.nix                         |  11 ++
 modules/modules.nix                           |   1 +
 modules/services/linux-wallpaperengine.nix    | 121 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../basic-configuration-expected.service      |  11 ++
 .../basic-configuration.nix                   |  35 +++++
 .../linux-wallpaperengine/default.nix         |   1 +
 7 files changed, 181 insertions(+)
 create mode 100644 modules/services/linux-wallpaperengine.nix
 create mode 100644 tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
 create mode 100644 tests/modules/services/linux-wallpaperengine/basic-configuration.nix
 create mode 100644 tests/modules/services/linux-wallpaperengine/default.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 2dea7a6c6..f6c71e025 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1997,6 +1997,17 @@ in {
           See https://github.com/nikitabobko/AeroSpace for more.
         '';
       }
+
+      {
+        time = "2025-01-30T09:18:55+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.linux-wallpaperengine'.
+
+          Reproduce the background functionality of Wallpaper Engine on Linux
+          systems.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 6ea6e98c2..92731156c 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -332,6 +332,7 @@ let
     ./services/keybase.nix
     ./services/keynav.nix
     ./services/lieer.nix
+    ./services/linux-wallpaperengine.nix
     ./services/listenbrainz-mpd.nix
     ./services/lorri.nix
     ./services/mako.nix
diff --git a/modules/services/linux-wallpaperengine.nix b/modules/services/linux-wallpaperengine.nix
new file mode 100644
index 000000000..f2d971b8f
--- /dev/null
+++ b/modules/services/linux-wallpaperengine.nix
@@ -0,0 +1,121 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.linux-wallpaperengine;
+
+in {
+  meta.maintainers = [ hm.maintainers.ckgxrg ];
+
+  options.services.linux-wallpaperengine = {
+    enable = mkEnableOption
+      "linux-wallpaperengine, an implementation of Wallpaper Engine functionality";
+
+    package = mkPackageOption pkgs "linux-wallpaperengine" { };
+
+    assetsPath = mkOption {
+      type = types.path;
+      description = "Path to the assets directory.";
+    };
+
+    clamping = mkOption {
+      type = types.nullOr (types.enum [ "clamp" "border" "repeat" ]);
+      default = null;
+      description = "Clamping mode for all wallpapers.";
+    };
+
+    wallpapers = mkOption {
+      type = types.listOf (types.submodule {
+        options = {
+          monitor = mkOption {
+            type = types.str;
+            description = "Which monitor to display the wallpaper.";
+          };
+
+          wallpaperId = mkOption {
+            type = types.str;
+            description = "Wallpaper ID to be used.";
+          };
+
+          extraOptions = mkOption {
+            type = types.listOf types.str;
+            default = [ ];
+            description =
+              "Extra arguments to pass to the linux-wallpaperengine command for this wallpaper.";
+          };
+
+          scaling = mkOption {
+            type =
+              types.nullOr (types.enum [ "stretch" "fit" "fill" "default" ]);
+            default = null;
+            description = "Scaling mode for this wallpaper.";
+          };
+
+          fps = mkOption {
+            type = types.nullOr types.int;
+            default = null;
+            description = "Limits the FPS to a given number.";
+          };
+
+          audio = {
+            silent = mkOption {
+              type = types.bool;
+              default = false;
+              description = "Mutes all sound of the wallpaper.";
+            };
+
+            automute = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Automute when another app is playing sound.";
+            };
+
+            processing = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Enables audio processing for background.";
+            };
+          };
+        };
+      });
+      default = [ ];
+      description = "Define wallpapers.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.linux-wallpaperengine" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    systemd.user.services."linux-wallpaperengine" = let
+      args = lists.forEach cfg.wallpapers (each:
+        concatStringsSep " " (cli.toGNUCommandLine { } {
+          screen-root = each.monitor;
+          inherit (each) scaling fps;
+          silent = each.audio.silent;
+          noautomute = !each.audio.automute;
+          no-audio-processing = !each.audio.processing;
+        } ++ each.extraOptions)
+        # This has to be the last argument in each group
+        + " --bg ${each.wallpaperId}");
+    in {
+      Unit = {
+        Description = "Implementation of Wallpaper Engine on Linux";
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = getExe cfg.package + " --assets-dir ${cfg.assetsPath} "
+          + "--clamping ${cfg.clamping} " + (strings.concatStringsSep " " args);
+        Restart = "on-failure";
+      };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index f4fa8a59e..2dbf97b34 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -267,6 +267,7 @@ in import nmtSrc {
     ./modules/services/imapnotify
     ./modules/services/kanshi
     ./modules/services/lieer
+    ./modules/services/linux-wallpaperengine
     ./modules/services/mopidy
     ./modules/services/mpd
     ./modules/services/mpd-mpris
diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
new file mode 100644
index 000000000..8aefc0582
--- /dev/null
+++ b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
@@ -0,0 +1,11 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@linux-wallpaperengine@/bin/dummy --assets-dir /some/path/to/assets --clamping border --fps 6 --scaling fit --screen-root HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root DP-1 --silent --scaling fill --fps 12 --bg 87654321
+Restart=on-failure
+
+[Unit]
+After=graphical-session.target
+Description=Implementation of Wallpaper Engine on Linux
+PartOf=graphical-session.target
diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration.nix b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix
new file mode 100644
index 000000000..2f51bf5b3
--- /dev/null
+++ b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, ... }:
+
+{
+  services.linux-wallpaperengine = {
+    enable = true;
+    assetsPath = "/some/path/to/assets";
+    clamping = "border";
+    wallpapers = [
+      {
+        monitor = "HDMI-1";
+        wallpaperId = "12345678";
+        scaling = "fit";
+        fps = 6;
+      }
+      {
+        monitor = "DP-1";
+        wallpaperId = "87654321";
+        extraOptions = [ "--scaling fill" "--fps 12" ];
+        audio = {
+          silent = true;
+          automute = false;
+          processing = false;
+        };
+      }
+    ];
+  };
+
+  test.stubs.linux-wallpaperengine = { };
+
+  nmt.script = ''
+    assertFileContent \
+        home-files/.config/systemd/user/linux-wallpaperengine.service \
+        ${./basic-configuration-expected.service}
+  '';
+}
diff --git a/tests/modules/services/linux-wallpaperengine/default.nix b/tests/modules/services/linux-wallpaperengine/default.nix
new file mode 100644
index 000000000..430aa129d
--- /dev/null
+++ b/tests/modules/services/linux-wallpaperengine/default.nix
@@ -0,0 +1 @@
+{ linux-wallpaperengine-basic-configuration = ./basic-configuration.nix; }

From c621c26c4c1ea6e0a9a01c3ca33ef62da5ee155d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 10:22:03 -0600
Subject: [PATCH 284/546] aerospace: cleanup

---
 modules/programs/aerospace.nix | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
index b0dc9b72a..3a8df9586 100644
--- a/modules/programs/aerospace.nix
+++ b/modules/programs/aerospace.nix
@@ -5,27 +5,29 @@ let
 
   tomlFormat = pkgs.formats.toml { };
 
-  filterAttrsRecursive = pred: set:
+  # filterAttrsRecursive supporting lists, as well.
+  filterListAndAttrsRecursive = pred: set:
     lib.listToAttrs (lib.concatMap (name:
       let v = set.${name};
       in if pred v then
         [
           (lib.nameValuePair name (if lib.isAttrs v then
-            filterAttrsRecursive pred v
+            filterListAndAttrsRecursive pred v
           else if lib.isList v then
-            (map (i: if lib.isAttrs i then filterAttrsRecursive pred i else i)
+            (map (i:
+              if lib.isAttrs i then filterListAndAttrsRecursive pred i else i)
               (lib.filter pred v))
           else
             v))
         ]
       else
         [ ]) (lib.attrNames set));
-  filterNulls = filterAttrsRecursive (v: v != null);
+  filterNulls = filterListAndAttrsRecursive (v: v != null);
 in {
   meta.maintainers = with lib.hm.maintainers; [ damidoug ];
 
   options.programs.aerospace = {
-    enable = lib.mkEnableOption "Whether to enable AeroSpace window manager.";
+    enable = lib.mkEnableOption "enable AeroSpace window manager";
 
     package = lib.mkPackageOption pkgs "aerospace" { };
 
@@ -216,16 +218,22 @@ in {
       '';
       description = ''
         AeroSpace configuration, see
-        <link xlink:href="https://nikitabobko.github.io/AeroSpace/guide#configuring-aerospace"/>
+        <https://nikitabobko.github.io/AeroSpace/guide#configuring-aerospace>
         for supported values.
       '';
     };
   };
 
-  config.home = lib.mkIf cfg.enable {
-    packages = [ cfg.package ];
-    file.".config/aerospace/aerospace.toml".source =
-      tomlFormat.generate "aerospace" (filterNulls cfg.userSettings);
-  };
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "programs.aerospace" pkgs
+        lib.platforms.darwin)
+    ];
 
+    home = {
+      packages = [ cfg.package ];
+      file.".config/aerospace/aerospace.toml".source =
+        tomlFormat.generate "aerospace" (filterNulls cfg.userSettings);
+    };
+  };
 }

From 7a457746847c9cb3a1e46e5bc86b205fbadf5da8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 11:25:49 -0600
Subject: [PATCH 285/546] aerospace: enable option desc fix (#6375)

---
 modules/programs/aerospace.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
index 3a8df9586..10bb75e3d 100644
--- a/modules/programs/aerospace.nix
+++ b/modules/programs/aerospace.nix
@@ -27,7 +27,7 @@ in {
   meta.maintainers = with lib.hm.maintainers; [ damidoug ];
 
   options.programs.aerospace = {
-    enable = lib.mkEnableOption "enable AeroSpace window manager";
+    enable = lib.mkEnableOption "AeroSpace window manager";
 
     package = lib.mkPackageOption pkgs "aerospace" { };
 

From a5e196d61f6e564f7fdeeb4a92cef92e1785d3f5 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 30 Jan 2025 18:17:53 +0000
Subject: [PATCH 286/546] flake-module: add flake-parts module (#5229)

Add a flake-parts module, output as flakeModules.home-manager and flakeModules.default.

The module defines options for flake.homeModules and flake.homeConfigurations, based on the respective nixos equivalents; flake.nixosModules and flake.nixosConfigurations.
---
 docs/manual/nix-flakes.md             |  1 +
 docs/manual/nix-flakes/flake-parts.md | 40 +++++++++++++++++++++++++++
 flake-module.nix                      | 32 +++++++++++++++++++++
 flake.nix                             |  5 ++++
 4 files changed, 78 insertions(+)
 create mode 100644 docs/manual/nix-flakes/flake-parts.md
 create mode 100644 flake-module.nix

diff --git a/docs/manual/nix-flakes.md b/docs/manual/nix-flakes.md
index 93f71feb8..bd33120c6 100644
--- a/docs/manual/nix-flakes.md
+++ b/docs/manual/nix-flakes.md
@@ -30,6 +30,7 @@ nix-flakes/prerequisites.md
 nix-flakes/standalone.md
 nix-flakes/nixos.md
 nix-flakes/nix-darwin.md
+nix-flakes/flake-parts.md
 ```
 
 
diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md
new file mode 100644
index 000000000..1c6d60d33
--- /dev/null
+++ b/docs/manual/nix-flakes/flake-parts.md
@@ -0,0 +1,40 @@
+# flake-parts module {#sec-flakes-flake-parts-module}
+
+When using [flake-parts](https://flake.parts)
+you may wish to import home-manager's flake module,
+`flakeModules.home-manager`.
+
+``` nix
+{
+  description = "flake-parts configuration";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+  };
+
+  outputs = inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      imports = [
+        # Import home-manager's flake module
+        inputs.home-manager.flakeModules.home-manager
+      ];
+      flake = {
+        # Define `homeModules`, `homeConfigurations`,
+        # `nixosConfigurations`, etc here
+      };
+      # See flake.parts for more features, such as `perSystem`
+    };
+}
+```
+
+The flake module defines the `flake.homeModules` and `flake.homeConfigurations`
+options, allowing them to be properly merged if they are defined in multiple
+modules.
+
+If you are only defining `homeModules` and/or `homeConfigurations` once in a
+single module, flake-parts should work fine without importing
+`flakeModules.home-manager`.
+
diff --git a/flake-module.nix b/flake-module.nix
new file mode 100644
index 000000000..466698c4b
--- /dev/null
+++ b/flake-module.nix
@@ -0,0 +1,32 @@
+{ lib, flake-parts-lib, moduleLocation, ... }:
+let inherit (lib) toString mapAttrs mkOption types;
+in {
+  options = {
+    flake = flake-parts-lib.mkSubmoduleOptions {
+      homeConfigurations = mkOption {
+        type = types.lazyAttrsOf types.raw;
+        default = { };
+        description = ''
+          Instantiated Home-Manager configurations.
+
+          `homeConfigurations` is for specific installations. If you want to expose
+          reusable configurations, add them to `homeModules` in the form of modules, so
+          that you can reference them in this or another flake's `homeConfigurations`.
+        '';
+      };
+      homeModules = mkOption {
+        type = types.lazyAttrsOf types.unspecified;
+        default = { };
+        apply = mapAttrs (k: v: {
+          _file = "${toString moduleLocation}#homeModules.${k}";
+          imports = [ v ];
+        });
+        description = ''
+          Home-Manager modules.
+
+          You may use this for reusable pieces of configuration, service modules, etc.
+        '';
+      };
+    };
+  };
+}
diff --git a/flake.nix b/flake.nix
index 2ad8080e8..5f9df5825 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,11 @@
       # unofficial; deprecated in Nix 2.8
       darwinModule = self.darwinModules.default;
 
+      flakeModules = rec {
+        home-manager = import ./flake-module.nix;
+        default = home-manager;
+      };
+
       templates = {
         standalone = {
           path = ./templates/standalone;

From 9ee99be0c03f30cf3351917402216d256181c4c1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:19:52 -0600
Subject: [PATCH 287/546] cliphist: add khaneliman maintainer

---
 modules/services/cliphist.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/cliphist.nix b/modules/services/cliphist.nix
index eb676be47..e7dc8e998 100644
--- a/modules/services/cliphist.nix
+++ b/modules/services/cliphist.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let cfg = config.services.cliphist;
 in {
-  meta.maintainers = [ lib.hm.maintainers.janik ];
+  meta.maintainers = [ lib.hm.maintainers.janik lib.maintainers.khaneliman ];
 
   imports = [
     (lib.mkRenamedOptionModule [ "services" "cliphist" "systemdTarget" ] [

From 9a97ac435e3da2a2abf465a0ddd22ce022418495 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:20:54 -0600
Subject: [PATCH 288/546] swaync: add khaneliman maintainer

---
 modules/services/swaync.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix
index b8bb912ba..c637a3338 100644
--- a/modules/services/swaync.nix
+++ b/modules/services/swaync.nix
@@ -7,7 +7,8 @@ let
   jsonFormat = pkgs.formats.json { };
 
 in {
-  meta.maintainers = [ lib.hm.maintainers.abayomi185 ];
+  meta.maintainers =
+    [ lib.hm.maintainers.abayomi185 lib.maintainers.khaneliman ];
 
   options.services.swaync = {
     enable = lib.mkEnableOption "Swaync notification daemon";

From c3031a0e8c988fdf2880c98ce5fbab7ee637e8ad Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:23:04 -0600
Subject: [PATCH 289/546] waybar: add khaneliman maintainer

---
 modules/programs/waybar.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 486b29171..48a7fa5f7 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -143,7 +143,7 @@ let
       };
     };
 in {
-  meta.maintainers = with lib.maintainers; [ berbiche ];
+  meta.maintainers = with lib.maintainers; [ berbiche khaneliman ];
 
   options.programs.waybar = with lib.types; {
     enable = mkEnableOption "Waybar";

From 06bc354189e5a7d94b691779f9cb3ac00bab8bce Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:25:14 -0600
Subject: [PATCH 290/546] neovim: add khaneliman maintainer

---
 modules/programs/neovim.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index e8be25f92..2ee568c28 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -95,6 +95,8 @@ in {
     '')
   ];
 
+  meta.maintainers = with lib.maintainers; [ khaneliman ];
+
   options = {
     programs.neovim = {
       enable = mkEnableOption "Neovim";

From ebdbb381034f4af008aed45cd3bdf873b1443792 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:27:23 -0600
Subject: [PATCH 291/546] wezterm: add khaneliman maintainer

---
 modules/programs/wezterm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix
index bd3be4686..e0a55cc7a 100644
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -12,7 +12,7 @@ let
   '';
 
 in {
-  meta.maintainers = [ hm.maintainers.blmhemu ];
+  meta.maintainers = [ lib.hm.maintainers.blmhemu lib.maintainers.khaneliman ];
 
   options.programs.wezterm = {
     enable = mkEnableOption "wezterm";

From 178f8265cbbe72415dcc3759debebf15f308f0bc Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:27:29 -0600
Subject: [PATCH 292/546] kitty: add khaneliman maintainer

---
 modules/programs/kitty.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 9854fe69c..b54fd4b74 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -76,6 +76,8 @@ in {
         null))
   ];
 
+  meta.maintainers = with lib.maintainers; [ khaneliman ];
+
   options.programs.kitty = {
     enable = mkEnableOption "Kitty terminal emulator";
 

From 05c64fa76b2dfbf4a3f5fbca916bcc7f434739d7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:27:35 -0600
Subject: [PATCH 293/546] ghostty: add khaneliman maintainer

---
 modules/programs/ghostty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 5f820da75..3c2f88f86 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -8,7 +8,7 @@ let
   };
   keyValue = pkgs.formats.keyValue keyValueSettings;
 in {
-  meta.maintainers = [ lib.maintainers.HeitorAugustoLN ];
+  meta.maintainers = with lib.maintainers; [ HeitorAugustoLN khaneliman ];
 
   options.programs.ghostty = {
     enable = lib.mkEnableOption "Ghostty";

From 34e28fc6ddeab63f4c9aa1262b24e8bd1197d613 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:28:13 -0600
Subject: [PATCH 294/546] bat: add khaneliman maintainer

---
 modules/programs/bat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bat.nix b/modules/programs/bat.nix
index 5d09145af..3935e54ae 100644
--- a/modules/programs/bat.nix
+++ b/modules/programs/bat.nix
@@ -22,7 +22,7 @@ let
     in keyValuePairs + switches;
 
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = with lib.maintainers; [ khaneliman ];
 
   options.programs.bat = {
     enable = mkEnableOption "bat, a cat clone with wings";

From c72b699ec6d16f449a34b980d6d4898f231ada6b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:28:56 -0600
Subject: [PATCH 295/546] btop: add khaneliman maintainer

---
 modules/programs/btop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix
index e30a9f43e..1f2f48072 100644
--- a/modules/programs/btop.nix
+++ b/modules/programs/btop.nix
@@ -25,7 +25,7 @@ let
   '';
 
 in {
-  meta.maintainers = [ hm.maintainers.GaetanLepage ];
+  meta.maintainers = with lib.maintainers; [ GaetanLepage khaneliman ];
 
   options.programs.btop = {
     enable = mkEnableOption "btop";

From 6a988979464c3ca13d146ab16bb6996ad86d9b37 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:29:36 -0600
Subject: [PATCH 296/546] nix-index: add khaneliman maintainer

---
 modules/programs/nix-index.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix
index cdf3151c6..746909d5a 100644
--- a/modules/programs/nix-index.nix
+++ b/modules/programs/nix-index.nix
@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 let cfg = config.programs.nix-index;
 in {
-  meta.maintainers = with lib.hm.maintainers; [ ambroisie ];
+  meta.maintainers =
+    [ lib.hm.maintainers.ambroisie lib.maintainers.khaneliman ];
 
   options.programs.nix-index = with lib; {
     enable = mkEnableOption "nix-index, a file database for nixpkgs";

From 5a3f7c6d078557ada97938a41adb05c27f52325e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:30:18 -0600
Subject: [PATCH 297/546] direnv: add khaneliman maintainer

---
 modules/programs/direnv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index 37899c4a2..b0b3baee4 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -19,7 +19,7 @@ in {
       "Flake support is now always enabled.")
   ];
 
-  meta.maintainers = [ lib.maintainers.rycee lib.maintainers.shikanime ];
+  meta.maintainers = with lib.maintainers; [ khaneliman rycee shikanime ];
 
   options.programs.direnv = {
     enable = mkEnableOption "direnv, the environment switcher";

From a77b2c186a0ab3d50abc547a18842340d8a84d10 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:31:13 -0600
Subject: [PATCH 298/546] fastfetch: add khaneliman maintainer

---
 modules/programs/fastfetch.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/fastfetch.nix b/modules/programs/fastfetch.nix
index 55a932f9a..246e200f4 100644
--- a/modules/programs/fastfetch.nix
+++ b/modules/programs/fastfetch.nix
@@ -7,7 +7,8 @@ let
 
   jsonFormat = pkgs.formats.json { };
 in {
-  meta.maintainers = with lib.hm.maintainers; [ afresquet ];
+  meta.maintainers =
+    [ lib.hm.maintainers.afresquet lib.maintainers.khaneliman ];
 
   options.programs.fastfetch = {
     enable = mkEnableOption "Fastfetch";

From 90b7acd9880ff1809807f5c78af869d4dd5969b5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:31:44 -0600
Subject: [PATCH 299/546] fzf: add khaneliman maintainer

---
 modules/programs/fzf.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix
index 31df95de6..85ada14d6 100644
--- a/modules/programs/fzf.nix
+++ b/modules/programs/fzf.nix
@@ -45,6 +45,8 @@ in {
       "This option is no longer supported by fzf.")
   ];
 
+  meta.maintainers = with lib.maintainers; [ khaneliman ];
+
   options.programs.fzf = {
     enable = mkEnableOption "fzf - a command-line fuzzy finder";
 

From cb985acc3ca1cc7d44de0f165b89098f9752f737 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:32:28 -0600
Subject: [PATCH 300/546] git: add khaneliman maintainer

---
 modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index e76085192..aedb24b00 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -97,7 +97,7 @@ let
   });
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = with lib.maintainers; [ khaneliman rycee ];
 
   options = {
     programs.git = {

From 9cb98f3140c02e59d70262a0d0b8e8275ff3b6be Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:33:10 -0600
Subject: [PATCH 301/546] lazygit: add khaneliman maintainer

---
 modules/programs/lazygit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix
index 0102a22cc..b7761b557 100644
--- a/modules/programs/lazygit.nix
+++ b/modules/programs/lazygit.nix
@@ -11,7 +11,7 @@ let
   inherit (pkgs.stdenv.hostPlatform) isDarwin;
 
 in {
-  meta.maintainers = [ hm.maintainers.kalhauge ];
+  meta.maintainers = [ lib.hm.maintainers.kalhauge lib.maintainers.khaneliman ];
 
   options.programs.lazygit = {
     enable = mkEnableOption "lazygit, a simple terminal UI for git commands";

From d62027e44d8ff7adc3306482d3c3b195f21f0004 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:33:42 -0600
Subject: [PATCH 302/546] ripgrep: add khaneliman maintainer

---
 modules/programs/ripgrep.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep.nix
index cbd73bd15..58faa520a 100644
--- a/modules/programs/ripgrep.nix
+++ b/modules/programs/ripgrep.nix
@@ -6,7 +6,8 @@ let
   cfg = config.programs.ripgrep;
   configPath = "${config.xdg.configHome}/ripgrep/ripgreprc";
 in {
-  meta.maintainers = [ hm.maintainers.pedorich-n ];
+  meta.maintainers =
+    [ lib.maintainers.khaneliman lib.hm.maintainers.pedorich-n ];
 
   options = {
     programs.ripgrep = {

From bf2a029bcde2e223db10a0a3fb9a94dc9e833d75 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:34:27 -0600
Subject: [PATCH 303/546] yazi: add khaneliman maintainer

---
 modules/programs/yazi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index a17f2952e..f7970ef4b 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -38,7 +38,7 @@ let
     }
   '';
 in {
-  meta.maintainers = with maintainers; [ xyenon eljamm ];
+  meta.maintainers = with lib.maintainers; [ eljamm khaneliman xyenon ];
 
   options.programs.yazi = {
     enable = mkEnableOption "yazi";

From 20fd9686b85dc64657a176466e23d0f3a5e1f760 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 12:51:21 -0600
Subject: [PATCH 304/546] btop: remove with lib;

---
 modules/programs/btop.nix | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix
index 1f2f48072..b05e78995 100644
--- a/modules/programs/btop.nix
+++ b/modules/programs/btop.nix
@@ -1,14 +1,10 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
   cfg = config.programs.btop;
 
   finalConfig = let
-    toKeyValue = generators.toKeyValue {
-      mkKeyValue = generators.mkKeyValueDefault {
+    toKeyValue = lib.generators.toKeyValue {
+      mkKeyValue = lib.generators.mkKeyValueDefault {
         mkValueString = v:
           with builtins;
           if isBool v then
@@ -21,19 +17,18 @@ let
     };
   in ''
     ${toKeyValue cfg.settings}
-    ${optionalString (cfg.extraConfig != "") cfg.extraConfig}
+    ${lib.optionalString (cfg.extraConfig != "") cfg.extraConfig}
   '';
-
 in {
   meta.maintainers = with lib.maintainers; [ GaetanLepage khaneliman ];
 
   options.programs.btop = {
-    enable = mkEnableOption "btop";
+    enable = lib.mkEnableOption "btop";
 
-    package = mkPackageOption pkgs "btop" { };
+    package = lib.mkPackageOption pkgs "btop" { };
 
-    settings = mkOption {
-      type = with types; attrsOf (oneOf [ bool float int str ]);
+    settings = lib.mkOption {
+      type = with lib.types; attrsOf (oneOf [ bool float int str ]);
       default = { };
       example = {
         color_theme = "Default";
@@ -46,8 +41,8 @@ in {
       '';
     };
 
-    extraConfig = mkOption {
-      type = types.lines;
+    extraConfig = lib.mkOption {
+      type = lib.types.lines;
       default = "";
       description = ''
         Extra lines added to the {file}`btop.conf` file.
@@ -55,10 +50,10 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
     xdg.configFile."btop/btop.conf" =
-      mkIf (cfg.settings != { }) { text = finalConfig; };
+      lib.mkIf (cfg.settings != { }) { text = finalConfig; };
   };
 }

From 2d731a33b193209cb88b874e508ea912765f7d99 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 13:48:08 -0600
Subject: [PATCH 305/546] wezterm: remove with lib

---
 modules/programs/wezterm.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix
index e0a55cc7a..f5c4c3392 100644
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -1,16 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) literalExpression mkIf mkEnableOption mkOption types;
 
   cfg = config.programs.wezterm;
+
   tomlFormat = pkgs.formats.toml { };
 
   shellIntegrationStr = ''
     source "${cfg.package}/etc/profile.d/wezterm.sh"
   '';
-
 in {
   meta.maintainers = [ lib.hm.maintainers.blmhemu lib.maintainers.khaneliman ];
 
@@ -104,8 +103,8 @@ in {
 
         ${cfg.extraConfig}
       '';
-    } // mapAttrs' (name: value:
-      nameValuePair "wezterm/colors/${name}.toml" {
+    } // lib.mapAttrs' (name: value:
+      lib.nameValuePair "wezterm/colors/${name}.toml" {
         source = tomlFormat.generate "${name}.toml" { colors = value; };
       }) cfg.colorSchemes;
 

From c90cd85b04ff3348978b05ba73ffc8e1b74b9fce Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 13:51:20 -0600
Subject: [PATCH 306/546] kitty: remove with lib

---
 modules/programs/kitty.nix | 51 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index b54fd4b74..53f7c9fc1 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -1,29 +1,30 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib)
+    literalExpression mkEnableOption mkIf mkOption optionalString types;
+
   cfg = config.programs.kitty;
 
   settingsValueType = with types; oneOf [ str bool int float ];
 
   optionalPackage = opt:
-    optional (opt != null && opt.package != null) opt.package;
+    lib.optional (opt != null && opt.package != null) opt.package;
 
-  toKittyConfig = generators.toKeyValue {
+  toKittyConfig = lib.generators.toKeyValue {
     mkKeyValue = key: value:
       let
         value' =
-          (if isBool value then lib.hm.booleans.yesNo else toString) value;
+          (if lib.isBool value then lib.hm.booleans.yesNo else toString) value;
       in "${key} ${value'}";
   };
 
-  toKittyKeybindings = generators.toKeyValue {
+  toKittyKeybindings = lib.generators.toKeyValue {
     mkKeyValue = key: command: "map ${key} ${command}";
   };
 
-  toKittyEnv =
-    generators.toKeyValue { mkKeyValue = name: value: "env ${name}=${value}"; };
+  toKittyEnv = lib.generators.toKeyValue {
+    mkKeyValue = name: value: "env ${name}=${value}";
+  };
 
   shellIntegrationInit = {
     bash = ''
@@ -50,28 +51,29 @@ let
   };
 
   shellIntegrationDefaultOpt = {
-    default = !(elem "disabled" (splitString " " cfg.shellIntegration.mode));
+    default =
+      !(lib.elem "disabled" (lib.splitString " " cfg.shellIntegration.mode));
     defaultText = literalExpression ''
       !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode))
     '';
   };
 in {
   imports = [
-    (mkChangedOptionModule [ "programs" "kitty" "theme" ] [
+    (lib.mkChangedOptionModule [ "programs" "kitty" "theme" ] [
       "programs"
       "kitty"
       "themeFile"
     ] (config:
-      let value = getAttrFromPath [ "programs" "kitty" "theme" ] config;
+      let value = lib.getAttrFromPath [ "programs" "kitty" "theme" ] config;
       in if value != null then
         (let
-          matching = filter (x: x.name == value) (builtins.fromJSON
+          matching = lib.filter (x: x.name == value) (builtins.fromJSON
             (builtins.readFile
               "${pkgs.kitty-themes}/share/kitty-themes/themes.json"));
-        in throwIf (length matching == 0)
+        in lib.throwIf (lib.length matching == 0)
         "kitty-themes does not contain a theme named ${value}"
-        strings.removeSuffix ".conf"
-        (strings.removePrefix "themes/" (head matching).file))
+        lib.strings.removeSuffix ".conf"
+        (lib.strings.removePrefix "themes/" (lib.head matching).file))
       else
         null))
   ];
@@ -134,7 +136,7 @@ in {
     };
 
     font = mkOption {
-      type = types.nullOr hm.types.fontType;
+      type = types.nullOr lib.hm.types.fontType;
       default = null;
       description = "The font to use.";
     };
@@ -169,9 +171,10 @@ in {
         example = "no-cursor";
         apply = o:
           let
-            modes = splitString " " o;
-            filtered = filter (m: m != "no-rc") modes;
-          in concatStringsSep " " (concatLists [ [ "no-rc" ] filtered ]);
+            modes = lib.splitString " " o;
+            filtered = lib.filter (m: m != "no-rc") modes;
+          in lib.concatStringsSep " "
+          (lib.concatLists [ [ "no-rc" ] filtered ]);
         description = ''
           Set the mode of the shell integration. This accepts the same options
           as the `shell_integration` option of Kitty. Note that
@@ -205,7 +208,7 @@ in {
       text = ''
         # Generated by Home Manager.
         # See https://sw.kovidgoyal.net/kitty/conf.html
-      '' + concatStringsSep "\n" [
+      '' + lib.concatStringsSep "\n" [
         (optionalString (cfg.font != null) ''
           font_family ${cfg.font.name}
           ${optionalString (cfg.font.size != null)
@@ -224,7 +227,7 @@ in {
         (toKittyEnv cfg.environment)
         cfg.extraConfig
       ];
-    } // optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
+    } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
       onChange = ''
         ${pkgs.procps}/bin/pkill -USR1 -u $USER kitty || true
       '';
@@ -233,7 +236,7 @@ in {
     home.activation.checkKittyTheme = mkIf (cfg.themeFile != null) (let
       themePath =
         "${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf";
-    in hm.dag.entryBefore [ "writeBoundary" ] ''
+    in lib.hm.dag.entryBefore [ "writeBoundary" ] ''
       if [[ ! -f "${themePath}" ]]; then
         errorEcho "kitty-themes does not contain the theme file ${themePath}!"
         exit 1
@@ -242,7 +245,7 @@ in {
 
     xdg.configFile."kitty/macos-launch-services-cmdline" = mkIf
       (cfg.darwinLaunchOptions != null && pkgs.stdenv.hostPlatform.isDarwin) {
-        text = concatStringsSep " " cfg.darwinLaunchOptions;
+        text = lib.concatStringsSep " " cfg.darwinLaunchOptions;
       };
 
     programs.bash.initExtra =

From e3baf274f47678df6289c7482353cb6d38b7be5d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 13:55:54 -0600
Subject: [PATCH 307/546] bat: remove with lib

---
 modules/programs/bat.nix | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/modules/programs/bat.nix b/modules/programs/bat.nix
index 3935e54ae..fce1f5e63 100644
--- a/modules/programs/bat.nix
+++ b/modules/programs/bat.nix
@@ -1,26 +1,23 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib) literalExpression mkEnableOption mkOption mkIf types;
 
   cfg = config.programs.bat;
 
   toConfigFile = attrs:
     let
       inherit (builtins) isBool attrNames;
-      nonBoolFlags = filterAttrs (_: v: !(isBool v)) attrs;
-      enabledBoolFlags = filterAttrs (_: v: isBool v && v) attrs;
+      nonBoolFlags = lib.filterAttrs (_: v: !(isBool v)) attrs;
+      enabledBoolFlags = lib.filterAttrs (_: v: isBool v && v) attrs;
 
-      keyValuePairs = generators.toKeyValue {
+      keyValuePairs = lib.generators.toKeyValue {
         mkKeyValue = k: v: "--${k}=${lib.escapeShellArg v}";
         listsAsDuplicateKeys = true;
       } nonBoolFlags;
-      switches = concatMapStrings (k: ''
+      switches = lib.concatMapStrings (k: ''
         --${k}
       '') (attrNames enabledBoolFlags);
     in keyValuePairs + switches;
-
 in {
   meta.maintainers = with lib.maintainers; [ khaneliman ];
 
@@ -50,7 +47,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "bat" { };
+    package = lib.mkPackageOption pkgs "bat" { };
 
     themes = mkOption {
       type = types.attrsOf (types.either types.lines (types.submodule {
@@ -122,15 +119,15 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf (any isString (attrValues cfg.themes)) {
+  config = mkIf cfg.enable (lib.mkMerge [
+    (mkIf (lib.any lib.isString (lib.attrValues cfg.themes)) {
       warnings = [''
         Using programs.bat.themes as a string option is deprecated and will be
         removed in the future. Please change to using it as an attribute set
         instead.
       ''];
     })
-    (mkIf (any isString (attrValues cfg.syntaxes)) {
+    (mkIf (lib.any lib.isString (lib.attrValues cfg.syntaxes)) {
       warnings = [''
         Using programs.bat.syntaxes as a string option is deprecated and will be
         removed in the future. Please change to using it as an attribute set
@@ -140,18 +137,18 @@ in {
     {
       home.packages = [ cfg.package ] ++ cfg.extraPackages;
 
-      xdg.configFile = mkMerge ([({
+      xdg.configFile = lib.mkMerge ([{
         "bat/config" =
           mkIf (cfg.config != { }) { text = toConfigFile cfg.config; };
-      })] ++ (flip mapAttrsToList cfg.themes (name: val: {
-        "bat/themes/${name}.tmTheme" = if isString val then {
+      }] ++ (lib.flip lib.mapAttrsToList cfg.themes (name: val: {
+        "bat/themes/${name}.tmTheme" = if lib.isString val then {
           text = val;
         } else {
           source =
             if isNull val.file then "${val.src}" else "${val.src}/${val.file}";
         };
-      })) ++ (flip mapAttrsToList cfg.syntaxes (name: val: {
-        "bat/syntaxes/${name}.sublime-syntax" = if isString val then {
+      })) ++ (lib.flip lib.mapAttrsToList cfg.syntaxes (name: val: {
+        "bat/syntaxes/${name}.sublime-syntax" = if lib.isString val then {
           text = val;
         } else {
           source =
@@ -162,9 +159,9 @@ in {
       # NOTE: run `bat cache --build` in an empty directory to work
       # around failure when ~/cache exists
       # https://github.com/sharkdp/bat/issues/1726
-      home.activation.batCache = hm.dag.entryAfter [ "linkGeneration" ] ''
+      home.activation.batCache = lib.hm.dag.entryAfter [ "linkGeneration" ] ''
         (
-          export XDG_CACHE_HOME=${escapeShellArg config.xdg.cacheHome}
+          export XDG_CACHE_HOME=${lib.escapeShellArg config.xdg.cacheHome}
           verboseEcho "Rebuilding bat theme cache"
           cd "${pkgs.emptyDirectory}"
           run ${lib.getExe cfg.package} cache --build

From fee01c9351638a67ec8605a43f2e535c1c66266f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 14:01:20 -0600
Subject: [PATCH 308/546] hyprland: fix null package conditions

---
 modules/services/window-managers/hyprland.nix | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix
index 44df85b06..ec73f99f6 100644
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -62,12 +62,17 @@ in {
         "Set this to null if you use the NixOS module to install Hyprland.";
     };
 
-    portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
+    portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" {
+      nullable = true;
+    };
 
     finalPackage = lib.mkOption {
-      type = lib.types.package;
+      type = with lib.types; nullOr package;
       readOnly = true;
-      default = cfg.package.override { enableXWayland = cfg.xwayland.enable; };
+      default = if cfg.package != null then
+        cfg.package.override { enableXWayland = cfg.xwayland.enable; }
+      else
+        null;
       defaultText = lib.literalMD
         "`wayland.windowManager.hyprland.package` with applied configuration";
       description = ''
@@ -76,9 +81,15 @@ in {
     };
 
     finalPortalPackage = lib.mkOption {
-      type = lib.types.package;
+      type = with lib.types; nullOr package;
       readOnly = true;
-      default = cfg.portalPackage.override { hyprland = cfg.finalPackage; };
+      default = if (cfg.portalPackage != null) then
+        if cfg.finalPackage != null then
+          cfg.portalPackage.override { hyprland = cfg.finalPackage; }
+        else
+          cfg.portalPackage
+      else
+        null;
       defaultText = lib.literalMD ''
         `wayland.windowManager.hyprland.portalPackage` with
                 `wayland.windowManager.hyprland.finalPackage` override'';
@@ -281,9 +292,11 @@ in {
     };
 
     xdg.portal = {
-      enable = true;
-      extraPortals = [ cfg.finalPortalPackage ];
-      configPackages = lib.mkDefault [ cfg.finalPackage ];
+      enable = cfg.finalPortalPackage != null;
+      extraPortals =
+        lib.mkIf (cfg.finalPortalPackage != null) [ cfg.finalPortalPackage ];
+      configPackages = lib.mkIf (cfg.finalPackage != null)
+        (lib.mkDefault [ cfg.finalPackage ]);
     };
 
     systemd.user.targets.hyprland-session = lib.mkIf cfg.systemd.enable {

From 86b0f3049c3a5f3e8ec13a54a323ed3e2587ed93 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 14:15:07 -0600
Subject: [PATCH 309/546] hyprland: add null package tests

---
 .../window-managers/hyprland/default.nix      |  3 ++
 .../hyprland/null-all-packages-config.nix     | 19 ++++++++++++
 .../hyprland/null-package-config.nix          | 31 +++++++++++++++++++
 .../hyprland/null-portal-package-config.nix   | 18 +++++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
 create mode 100644 tests/modules/services/window-managers/hyprland/null-package-config.nix
 create mode 100644 tests/modules/services/window-managers/hyprland/null-portal-package-config.nix

diff --git a/tests/modules/services/window-managers/hyprland/default.nix b/tests/modules/services/window-managers/hyprland/default.nix
index ae431939c..4d6ba1f1a 100644
--- a/tests/modules/services/window-managers/hyprland/default.nix
+++ b/tests/modules/services/window-managers/hyprland/default.nix
@@ -1,6 +1,9 @@
 {
   hyprland-simple-config = ./simple-config.nix;
   hyprland-multiple-devices-config = ./multiple-devices-config.nix;
+  hyprland-null-all-packages-config = ./null-all-packages-config.nix;
+  hyprland-null-package-config = ./null-package-config.nix;
+  hyprland-null-portal-package-config = ./null-portal-package-config.nix;
   hyprland-sourceFirst-false-config = ./sourceFirst-false-config.nix;
   hyprland-inconsistent-config = ./inconsistent-config.nix;
 }
diff --git a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
new file mode 100644
index 000000000..1aeb4c398
--- /dev/null
+++ b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
@@ -0,0 +1,19 @@
+{ ... }: {
+  wayland.windowManager.hyprland = {
+    enable = true;
+    package = null;
+    portalPackage = null;
+
+    settings = {
+      cursor = {
+        enable_hyprcursor = true;
+        sync_gsettings_theme = true;
+      };
+    };
+  };
+
+  nmt.script = ''
+    config=home-files/.config/hypr/hyprland.conf
+    assertFileExists "$config"
+  '';
+}
diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.nix b/tests/modules/services/window-managers/hyprland/null-package-config.nix
new file mode 100644
index 000000000..5c0dda448
--- /dev/null
+++ b/tests/modules/services/window-managers/hyprland/null-package-config.nix
@@ -0,0 +1,31 @@
+{ ... }: {
+  wayland.windowManager.hyprland = {
+    enable = true;
+    package = null;
+    settings = {
+      cursor = {
+        enable_hyprcursor = true;
+        sync_gsettings_theme = true;
+      };
+    };
+  };
+
+  test.asserts.warnings.expected = [''
+    xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you
+    should either set `xdg.portal.config` or `xdg.portal.configPackages`
+    to specify which portal backend to use for the requested interface.
+
+    https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in
+
+    If you simply want to keep the behaviour in < 1.17, which uses the first
+    portal implementation found in lexicographical order, use the following:
+
+    xdg.portal.config.common.default = "*";
+  ''];
+  test.asserts.warnings.enable = true;
+
+  nmt.script = ''
+    config=home-files/.config/hypr/hyprland.conf
+    assertFileExists "$config"
+  '';
+}
diff --git a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
new file mode 100644
index 000000000..3b2b2a945
--- /dev/null
+++ b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
@@ -0,0 +1,18 @@
+{ ... }: {
+  wayland.windowManager.hyprland = {
+    enable = true;
+    portalPackage = null;
+
+    settings = {
+      cursor = {
+        enable_hyprcursor = true;
+        sync_gsettings_theme = true;
+      };
+    };
+  };
+
+  nmt.script = ''
+    config=home-files/.config/hypr/hyprland.conf
+    assertFileExists "$config"
+  '';
+}

From 234613d77c939ff2e2c0f2c476a56d80930e5b8b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 13:46:03 -0600
Subject: [PATCH 310/546] neovim: remove with lib

---
 modules/programs/neovim.nix | 77 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 2ee568c28..af7a1a1f0 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib)
+    literalExpression mkEnableOption mkIf mkOption mkRemovedOptionModule types;
 
   cfg = config.programs.neovim;
 
@@ -55,7 +55,7 @@ let
     };
   };
 
-  allPlugins = cfg.plugins ++ optional cfg.coc.enable {
+  allPlugins = cfg.plugins ++ lib.optional cfg.coc.enable {
     type = "viml";
     plugin = cfg.coc.package;
     config = cfg.coc.pluginConfig;
@@ -155,15 +155,14 @@ in {
         # In case we get a plain list, we need to turn it into a function,
         # as expected by the function in nixpkgs.
         # The only way to do so is to call `const`, which will ignore its input.
-        type = with types;
-          let fromType = listOf package;
-          in coercedTo fromType (flip warn const ''
-            Assigning a plain list to extraPython3Packages is deprecated.
-                   Please assign a function taking a package set as argument, so
-                     extraPython3Packages = [ pkgs.python3Packages.xxx ];
-                   should become
-                     extraPython3Packages = ps: [ ps.xxx ];
-          '') (functionTo fromType);
+        type = let fromType = types.listOf types.package;
+        in types.coercedTo fromType (lib.flip lib.warn lib.const ''
+          Assigning a plain list to extraPython3Packages is deprecated.
+                 Please assign a function taking a package set as argument, so
+                   extraPython3Packages = [ pkgs.python3Packages.xxx ];
+                 should become
+                   extraPython3Packages = ps: [ ps.xxx ];
+        '') (types.functionTo fromType);
         default = _: [ ];
         defaultText = literalExpression "ps: [ ]";
         example =
@@ -180,15 +179,14 @@ in {
       # Lua packageset to evaluate the function that this option was set to.
       # This ensures that we always use the same Lua version as the Neovim package.
       extraLuaPackages = mkOption {
-        type = with types;
-          let fromType = listOf package;
-          in coercedTo fromType (flip warn const ''
-            Assigning a plain list to extraLuaPackages is deprecated.
-                   Please assign a function taking a package set as argument, so
-                     extraLuaPackages = [ pkgs.lua51Packages.xxx ];
-                   should become
-                     extraLuaPackages = ps: [ ps.xxx ];
-          '') (functionTo fromType);
+        type = let fromType = types.listOf types.package;
+        in types.coercedTo fromType (lib.flip lib.warn lib.const ''
+          Assigning a plain list to extraLuaPackages is deprecated.
+                 Please assign a function taking a package set as argument, so
+                   extraLuaPackages = [ pkgs.lua51Packages.xxx ];
+                 should become
+                   extraLuaPackages = ps: [ ps.xxx ];
+        '') (types.functionTo fromType);
         default = _: [ ];
         defaultText = literalExpression "ps: [ ]";
         example = literalExpression "luaPkgs: with luaPkgs; [ luautf8 ]";
@@ -416,7 +414,7 @@ in {
       concatConfigs = lib.concatMapStrings (p: p.config);
       configsOnly = lib.foldl
         (acc: p: if p.config != null then acc ++ [ p.config ] else acc) [ ];
-    in mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals))
+    in lib.mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals))
     grouped;
 
     home.packages = [ cfg.finalPackage ];
@@ -425,25 +423,24 @@ in {
 
     home.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
 
-    xdg.configFile =
-      let hasLuaConfig = hasAttr "lua" config.programs.neovim.generatedConfigs;
-      in mkMerge (
-        # writes runtime
-        (map (x: x.runtime) pluginsNormalized) ++ [{
-          "nvim/init.lua" = let
-            luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "")
-              "vim.cmd [[source ${
-                pkgs.writeText "nvim-init-home-manager.vim"
-                wrappedNeovim'.initRc
-              }]]" + config.programs.neovim.extraLuaConfig
-              + lib.optionalString hasLuaConfig
-              config.programs.neovim.generatedConfigs.lua;
-          in mkIf (luaRcContent != "") { text = luaRcContent; };
+    xdg.configFile = let
+      hasLuaConfig = lib.hasAttr "lua" config.programs.neovim.generatedConfigs;
+    in lib.mkMerge (
+      # writes runtime
+      (map (x: x.runtime) pluginsNormalized) ++ [{
+        "nvim/init.lua" = let
+          luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "")
+            "vim.cmd [[source ${
+              pkgs.writeText "nvim-init-home-manager.vim" wrappedNeovim'.initRc
+            }]]" + config.programs.neovim.extraLuaConfig
+            + lib.optionalString hasLuaConfig
+            config.programs.neovim.generatedConfigs.lua;
+        in mkIf (luaRcContent != "") { text = luaRcContent; };
 
-          "nvim/coc-settings.json" = mkIf cfg.coc.enable {
-            source = jsonFormat.generate "coc-settings.json" cfg.coc.settings;
-          };
-        }]);
+        "nvim/coc-settings.json" = mkIf cfg.coc.enable {
+          source = jsonFormat.generate "coc-settings.json" cfg.coc.settings;
+        };
+      }]);
 
     programs.neovim.finalPackage = wrappedNeovim';
   };

From a8159195bfaef3c64df75d3b1e6a68d49d392be9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 30 Jan 2025 23:22:29 +0100
Subject: [PATCH 311/546] flake-module: fix naming

---
 docs/manual/nix-flakes/flake-parts.md | 3 +--
 flake-module.nix                      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md
index 1c6d60d33..b314bef3c 100644
--- a/docs/manual/nix-flakes/flake-parts.md
+++ b/docs/manual/nix-flakes/flake-parts.md
@@ -1,7 +1,7 @@
 # flake-parts module {#sec-flakes-flake-parts-module}
 
 When using [flake-parts](https://flake.parts)
-you may wish to import home-manager's flake module,
+you may wish to import Home Manager's flake module,
 `flakeModules.home-manager`.
 
 ``` nix
@@ -37,4 +37,3 @@ modules.
 If you are only defining `homeModules` and/or `homeConfigurations` once in a
 single module, flake-parts should work fine without importing
 `flakeModules.home-manager`.
-
diff --git a/flake-module.nix b/flake-module.nix
index 466698c4b..cf421f9b1 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -7,7 +7,7 @@ in {
         type = types.lazyAttrsOf types.raw;
         default = { };
         description = ''
-          Instantiated Home-Manager configurations.
+          Instantiated Home Manager configurations.
 
           `homeConfigurations` is for specific installations. If you want to expose
           reusable configurations, add them to `homeModules` in the form of modules, so
@@ -22,7 +22,7 @@ in {
           imports = [ v ];
         });
         description = ''
-          Home-Manager modules.
+          Home Manager modules.
 
           You may use this for reusable pieces of configuration, service modules, etc.
         '';

From 644552519e74bde9c21ea7ec473d5eee67915d25 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:30:49 -0600
Subject: [PATCH 312/546] sway-stubs: add more stubs

Reducing closure from 500MB to 357MB
---
 .../services/window-managers/sway/sway-stubs.nix      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/modules/services/window-managers/sway/sway-stubs.nix b/tests/modules/services/window-managers/sway/sway-stubs.nix
index f946dfa78..ddf11730b 100644
--- a/tests/modules/services/window-managers/sway/sway-stubs.nix
+++ b/tests/modules/services/window-managers/sway/sway-stubs.nix
@@ -1,4 +1,4 @@
-{
+{ config, lib, ... }: {
   # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
   # not containing hashes, version numbers etc.
   test.stubs = {
@@ -10,4 +10,13 @@
     swaybg = { };
     xwayland = { };
   };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      procps = config.lib.test.mkStubPackage { name = "procps"; };
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
 }

From e0a2df319302e975a6c8f7fc940315f425b337e8 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:38:43 -0600
Subject: [PATCH 313/546] i3-stubs: add more stubs

Reducing closure from 500MB to 357MB
---
 tests/modules/services/window-managers/i3/i3-stubs.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/modules/services/window-managers/i3/i3-stubs.nix b/tests/modules/services/window-managers/i3/i3-stubs.nix
index cfb892ace..a104eace0 100644
--- a/tests/modules/services/window-managers/i3/i3-stubs.nix
+++ b/tests/modules/services/window-managers/i3/i3-stubs.nix
@@ -1,4 +1,4 @@
-{
+{ config, lib, ... }: {
   # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
   # not containing hashes, version numbers etc.
   test.stubs = {
@@ -16,4 +16,12 @@
 
     i3status = { };
   };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
 }

From 02dc2e827f7c677cad1a4cbfcb7ad01728424351 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:46:33 -0600
Subject: [PATCH 314/546] river-stubs: add stubs for river tests

Reducing closure from 500MB to 357MB
---
 .../window-managers/river/configuration.nix         |  2 ++
 .../services/window-managers/river/river-stubs.nix  | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/modules/services/window-managers/river/river-stubs.nix

diff --git a/tests/modules/services/window-managers/river/configuration.nix b/tests/modules/services/window-managers/river/configuration.nix
index 9532006fc..a180683b1 100644
--- a/tests/modules/services/window-managers/river/configuration.nix
+++ b/tests/modules/services/window-managers/river/configuration.nix
@@ -1,6 +1,8 @@
 { ... }:
 
 {
+  imports = [ ./river-stubs.nix ];
+
   wayland.windowManager.river = {
     enable = true;
     xwayland.enable = true;
diff --git a/tests/modules/services/window-managers/river/river-stubs.nix b/tests/modules/services/window-managers/river/river-stubs.nix
new file mode 100644
index 000000000..21826ac29
--- /dev/null
+++ b/tests/modules/services/window-managers/river/river-stubs.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = { river = { }; };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}

From c4f4b1e2fa335844aaa98d65066a5a434fa9ce22 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:50:50 -0600
Subject: [PATCH 315/546] bspwm-stubs: add stubs for bspwm tests

Reducing closure from 500MB to 357MB
---
 .../services/window-managers/bspwm/bspwm-stubs.nix  | 13 +++++++++++++
 .../window-managers/bspwm/configuration.nix         |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/modules/services/window-managers/bspwm/bspwm-stubs.nix

diff --git a/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix b/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix
new file mode 100644
index 000000000..7e9fd5efd
--- /dev/null
+++ b/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = { bspwm = { }; };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}
diff --git a/tests/modules/services/window-managers/bspwm/configuration.nix b/tests/modules/services/window-managers/bspwm/configuration.nix
index cd2bfa2e3..5a4dec12e 100644
--- a/tests/modules/services/window-managers/bspwm/configuration.nix
+++ b/tests/modules/services/window-managers/bspwm/configuration.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./bspwm-stubs.nix ];
+
   xsession.windowManager.bspwm = {
     enable = true;
     monitors.focused = [ "desktop 1" "d'esk top" ]; # pathological desktop names

From e17bdf3191ad5f94c4037117f5635c8b1138c730 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:54:39 -0600
Subject: [PATCH 316/546] herbstluftwm-stubs: add stubs for herbstluftwm tests

Reducing closure from 500MB to 357MB
---
 .../herbstluftwm/herbstluftwm-no-tags.nix           |  2 ++
 .../herbstluftwm/herbstluftwm-simple-config.nix     |  2 ++
 .../herbstluftwm/herbstluftwm-stubs.nix             | 13 +++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix

diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
index bd7fb4881..207421652 100644
--- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
+++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
@@ -1,6 +1,8 @@
 { lib, pkgs, ... }:
 
 {
+  imports = [ ./herbstluftwm-stubs.nix ];
+
   xsession.windowManager.herbstluftwm = { enable = true; };
 
   test.stubs.herbstluftwm = { };
diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
index e351e78f9..9a93358cf 100644
--- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
+++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
@@ -1,6 +1,8 @@
 { lib, pkgs, ... }:
 
 {
+  imports = [ ./herbstluftwm-stubs.nix ];
+
   xsession.windowManager.herbstluftwm = {
     enable = true;
     settings = {
diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix
new file mode 100644
index 000000000..7c24083a2
--- /dev/null
+++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = { herbstluftwm = { }; };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}

From c4f28f282f54fc15a60a3b258ecce77a44327958 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:56:42 -0600
Subject: [PATCH 317/546] spectrwm-stubs: add stubs for spectrwm tests

Reducing closure from 500MB to 357MB
---
 .../spectrwm/spectrwm-simple-config.nix             |  2 ++
 .../window-managers/spectrwm/spectrwm-stubs.nix     | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix

diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
index 3ba13b4d3..8c7fd00cf 100644
--- a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
+++ b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
@@ -1,6 +1,8 @@
 { ... }:
 
 {
+  imports = [ ./spectrwm-stubs.nix ];
+
   xsession.windowManager.spectrwm = {
     enable = true;
     settings = {
diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix b/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix
new file mode 100644
index 000000000..7f64ae083
--- /dev/null
+++ b/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = { spectrwm = { }; };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}

From 9afd02201332756d4bbad273202ecc96049c53b2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:59:05 -0600
Subject: [PATCH 318/546] wayfire-stubs: add stubs for wayfire tests

Reducing closure from 500MB to 357MB
---
 .../window-managers/wayfire/configuration.nix       |  2 ++
 .../window-managers/wayfire/wayfire-stubs.nix       | 13 +++++++++++++
 .../services/window-managers/wayfire/wf-shell.nix   |  2 ++
 3 files changed, 17 insertions(+)
 create mode 100644 tests/modules/services/window-managers/wayfire/wayfire-stubs.nix

diff --git a/tests/modules/services/window-managers/wayfire/configuration.nix b/tests/modules/services/window-managers/wayfire/configuration.nix
index 07042329e..d199e9202 100644
--- a/tests/modules/services/window-managers/wayfire/configuration.nix
+++ b/tests/modules/services/window-managers/wayfire/configuration.nix
@@ -1,4 +1,6 @@
 { ... }: {
+  imports = [ ./wayfire-stubs.nix ];
+
   wayland.windowManager.wayfire = {
     enable = true;
     package = null;
diff --git a/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix b/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix
new file mode 100644
index 000000000..0fd2bf850
--- /dev/null
+++ b/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = { wayfire = { }; };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}
diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.nix b/tests/modules/services/window-managers/wayfire/wf-shell.nix
index 2c8221d80..f88761db1 100644
--- a/tests/modules/services/window-managers/wayfire/wf-shell.nix
+++ b/tests/modules/services/window-managers/wayfire/wf-shell.nix
@@ -1,4 +1,6 @@
 { pkgs, ... }: {
+  imports = [ ./wayfire-stubs.nix ];
+
   wayland.windowManager.wayfire = {
     enable = true;
     package = null;

From 801ddd8693481866c2cfb1efd44ddbae778ea572 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Jan 2025 18:03:51 -0600
Subject: [PATCH 319/546] hyprland: use package stubs

Reducing closure size for tests.
---
 .../hyprland/hyprland-stubs.nix               | 21 +++++++++++++++++++
 .../hyprland/inconsistent-config.nix          |  6 +-----
 .../hyprland/multiple-devices-config.nix      |  6 ++----
 .../hyprland/null-all-packages-config.nix     |  2 ++
 .../hyprland/null-package-config.nix          |  4 +++-
 .../hyprland/null-portal-package-config.nix   |  5 ++++-
 .../hyprland/simple-config.nix                |  6 ++----
 .../hyprland/sourceFirst-false-config.nix     |  6 ++----
 8 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 tests/modules/services/window-managers/hyprland/hyprland-stubs.nix

diff --git a/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix b/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix
new file mode 100644
index 000000000..02d1885bb
--- /dev/null
+++ b/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix
@@ -0,0 +1,21 @@
+{ config, lib, ... }: {
+  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
+  # not containing hashes, version numbers etc.
+  test.stubs = {
+    xdg-desktop-portal = { };
+    xwayland = { };
+  };
+
+  nixpkgs.overlays = [
+    (_final: _prev: {
+      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
+      hyprland = lib.makeOverridable
+        (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
+      xdg-desktop-portal-hyprland = lib.makeOverridable (_:
+        config.lib.test.mkStubPackage { name = "xdg-desktop-portal-hyprland"; })
+        { };
+      systemd =
+        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
+    })
+  ];
+}
diff --git a/tests/modules/services/window-managers/hyprland/inconsistent-config.nix b/tests/modules/services/window-managers/hyprland/inconsistent-config.nix
index 0f9a18e5b..c475d9c86 100644
--- a/tests/modules/services/window-managers/hyprland/inconsistent-config.nix
+++ b/tests/modules/services/window-managers/hyprland/inconsistent-config.nix
@@ -1,10 +1,6 @@
-{ config, lib, ... }:
-
-{
+{ config, ... }: {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.makeOverridable
-      (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
     plugins =
       [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ];
   };
diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
index 86d60c632..40f92a911 100644
--- a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
+++ b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
@@ -1,10 +1,8 @@
-{ config, lib, ... }:
+{ config, ... }: {
+  imports = [ ./hyprland-stubs.nix ];
 
-{
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.makeOverridable
-      (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
     plugins =
       [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ];
     settings = {
diff --git a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
index 1aeb4c398..c27bff010 100644
--- a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
@@ -1,4 +1,6 @@
 { ... }: {
+  imports = [ ./hyprland-stubs.nix ];
+
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;
diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.nix b/tests/modules/services/window-managers/hyprland/null-package-config.nix
index 5c0dda448..463cbd538 100644
--- a/tests/modules/services/window-managers/hyprland/null-package-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-package-config.nix
@@ -1,4 +1,6 @@
-{ ... }: {
+{
+  imports = [ ./hyprland-stubs.nix ];
+
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;
diff --git a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
index 3b2b2a945..c118e23e2 100644
--- a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
@@ -1,6 +1,9 @@
-{ ... }: {
+{
+  imports = [ ./hyprland-stubs.nix ];
+
   wayland.windowManager.hyprland = {
     enable = true;
+
     portalPackage = null;
 
     settings = {
diff --git a/tests/modules/services/window-managers/hyprland/simple-config.nix b/tests/modules/services/window-managers/hyprland/simple-config.nix
index e7b11ffe1..5feaffe0d 100644
--- a/tests/modules/services/window-managers/hyprland/simple-config.nix
+++ b/tests/modules/services/window-managers/hyprland/simple-config.nix
@@ -1,10 +1,8 @@
-{ config, lib, ... }:
+{ config, ... }: {
+  imports = [ ./hyprland-stubs.nix ];
 
-{
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.makeOverridable
-      (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
     plugins =
       [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ];
     settings = {
diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
index 4161cd751..005c7bc41 100644
--- a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
+++ b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
@@ -1,10 +1,8 @@
-{ config, lib, ... }:
-
 {
+  imports = [ ./hyprland-stubs.nix ];
+
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.makeOverridable
-      (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
     settings = {
       source = [ "sourced.conf" ];
 

From 055c67056d87577a39af4144ad5eadb093cfb97d Mon Sep 17 00:00:00 2001
From: utzuro <utzuro@pm.me>
Date: Sat, 1 Feb 2025 19:54:11 +0900
Subject: [PATCH 320/546] fcitx5: add waylandFrontend option to not set env
 vars (#5431)

---
 modules/i18n/input-method/fcitx5.nix               | 14 ++++++++++++--
 .../i18n/input-method/fcitx5-configuration.nix     |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index a02f8ed20..3e4e2f26d 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -25,6 +25,15 @@ in {
           Enabled Fcitx5 addons.
         '';
       };
+
+      waylandFrontend = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Use the Wayland input method frontend.
+          See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland).
+        '';
+      };
     };
   };
 
@@ -33,11 +42,12 @@ in {
 
     home.sessionVariables = {
       GLFW_IM_MODULE = "ibus"; # IME support in kitty
-      GTK_IM_MODULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
       XMODIFIERS = "@im=fcitx";
       QT_PLUGIN_PATH =
         "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}";
+    } // lib.optionalAttrs (!cfg.waylandFrontend) {
+      GTK_IM_MODULE = "fcitx";
+      QT_IM_MODULE = "fcitx";
     };
 
     systemd.user.services.fcitx5-daemon = {
diff --git a/tests/modules/i18n/input-method/fcitx5-configuration.nix b/tests/modules/i18n/input-method/fcitx5-configuration.nix
index 7ff43a4f2..1e37a8bdf 100644
--- a/tests/modules/i18n/input-method/fcitx5-configuration.nix
+++ b/tests/modules/i18n/input-method/fcitx5-configuration.nix
@@ -5,10 +5,12 @@
 
   i18n.inputMethod = {
     enabled = "fcitx5";
-    fcitx5.addons = [ pkgs.libsForQt5.fcitx5-chinese-addons ];
+    fcitx5.waylandFrontend = true;
   };
 
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/fcitx5-daemon.service
+    assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GTK_IM_MODULE'
+    assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'QT_IM_MODULE'
   '';
 }

From 8544cd092047a7e92d0dce011108a563de7fc0f2 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Sat, 1 Feb 2025 14:03:26 +0100
Subject: [PATCH 321/546] lapce: add module (#5752)

Adds the 'programs.lapce' module for configuring lapce text editor.
Options for settings, plugins and keymaps are available.
---
 modules/lib/maintainers.nix                   |   7 +
 modules/misc/news.nix                         |  10 +
 modules/modules.nix                           |   1 +
 modules/programs/lapce.nix                    | 187 ++++++++++++++++++
 tests/default.nix                             |   1 +
 tests/modules/programs/lapce/default.nix      |   4 +
 .../lapce/example-keymaps-expected.toml       |   3 +
 .../programs/lapce/example-keymaps.nix        |  18 ++
 .../lapce/example-settings-expected.toml      |  17 ++
 .../programs/lapce/example-settings.nix       |  34 ++++
 10 files changed, 282 insertions(+)
 create mode 100644 modules/programs/lapce.nix
 create mode 100644 tests/modules/programs/lapce/default.nix
 create mode 100644 tests/modules/programs/lapce/example-keymaps-expected.toml
 create mode 100644 tests/modules/programs/lapce/example-keymaps.nix
 create mode 100644 tests/modules/programs/lapce/example-settings-expected.toml
 create mode 100644 tests/modules/programs/lapce/example-settings.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 991d0b470..ede933ff6 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -562,6 +562,13 @@
     githubId = 1545895;
     name = "Nicola Squartini";
   };
+  timon-schelling = {
+    name = "Timon Schelling";
+    email = "me@timon.zip";
+    github = "timon-schelling";
+    githubId = 36821505;
+    matrix = "@timon:beeper.com";
+  };
   toastal = {
     email = "toastal+nix@posteo.net";
     matrix = "@toastal:matrix.org";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index f6c71e025..1eca33626 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1700,6 +1700,16 @@ in {
         '';
       }
 
+      {
+        time = "2024-08-18T11:42:08+00:00";
+        message = ''
+          A new module is available: 'programs.lapce'.
+
+          Lightning-fast and Powerful Code Editor written in Rust.
+          See https://lapce.dev/ for more.
+        '';
+      }
+
       {
         time = "2024-09-13T08:58:17+00:00";
         condition = hostPlatform.isLinux;
diff --git a/modules/modules.nix b/modules/modules.nix
index 92731156c..074e719d2 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -148,6 +148,7 @@ let
     ./programs/kitty.nix
     ./programs/kodi.nix
     ./programs/kubecolor.nix
+    ./programs/lapce.nix
     ./programs/lazygit.nix
     ./programs/ledger.nix
     ./programs/less.nix
diff --git a/modules/programs/lapce.nix b/modules/programs/lapce.nix
new file mode 100644
index 000000000..f3fd24f28
--- /dev/null
+++ b/modules/programs/lapce.nix
@@ -0,0 +1,187 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.lapce;
+
+  options = {
+    enable = mkEnableOption "lapce";
+    package = mkPackageOption pkgs "lapce" { };
+    channel = mkOption {
+      type = types.enum [ "stable" "nightly" ];
+      default = "stable";
+      description = ''
+        Lapce channel to configure.
+        Should correspond to the package channel.
+        This is used to determine the correct configuration and data directories.
+      '';
+    };
+    settings = mkOption {
+      type = settingsFormat.type;
+      default = { };
+      description = ''
+        Configuration written to {file}`$XDG_CONFIG_HOME/lapce/settings.toml`.
+        See <https://github.com/lapce/lapce/blob/master/extra/schemas/settings.json> for schema.
+      '';
+      example = literalExpression ''
+        {
+          core = {
+            custom-titlebar = false;
+            color-theme = "Custom";
+            icon-theme = "Material Icons";
+          };
+          editor = {
+            font-family = "FiraCode Nerd Bold Font, monospace";
+            font-size = 22;
+            tab-width = 2;
+            cursor-surrounding-lines = 4;
+            render-whitespace = "all";
+            bracket-pair-colorization = true;
+            highlight-matching-brackets = true;
+          };
+          ui = {
+            font-size = 20;
+            open-editors-visible = false;
+          };
+          lapce-nix.lsp-path = "$\{pkgs.nil\}/bin/nil";
+        }
+      '';
+    };
+    plugins = mkOption {
+      type = types.listOf (types.submodule {
+        options = {
+          author = mkOption {
+            type = types.str;
+            description = ''
+              Author of the plugin.
+            '';
+          };
+          name = mkOption {
+            type = types.str;
+            description = ''
+              Name of the plugin.
+            '';
+          };
+          version = mkOption {
+            type = types.str;
+            description = ''
+              Version of the plugin.
+            '';
+          };
+          hash = mkOption {
+            type = types.str;
+            description = ''
+              Hash of the plugin tarball.
+              To find the hash leave this empty, rebuild and copy the hash from the error message.
+            '';
+            default = "";
+          };
+        };
+      });
+      default = [ ];
+      description = ''
+        Plugins to install.
+      '';
+      example = literalExpression ''
+        [
+          {
+            author = "MrFoxPro";
+            name = "lapce-nix";
+            version = "0.0.1";
+            hash = "sha256-...";
+          }
+          {
+            author = "dzhou121";
+            name = "lapce-rust";
+            version = "0.3.1932";
+            hash = "sha256-...";
+          }
+        ]
+      '';
+    };
+    keymaps = mkOption {
+      type = settingsFormat.type;
+      default = [ ];
+      description = ''
+        Keymaps written to {file}`$XDG_CONFIG_HOME/lapce/keymaps.toml`.
+        See <https://github.com/lapce/lapce/blob/master/defaults/keymaps-common.toml> for examples.
+      '';
+      example = literalExpression ''
+        [
+          {
+            command = "open_log_file";
+            key = "Ctrl+Shift+L";
+          }
+        ]
+      '';
+    };
+  };
+
+  settingsFormat = pkgs.formats.toml { };
+
+  fetchPluginTarballFromRegistry = { author, name, version, hash }:
+    pkgs.stdenvNoCC.mkDerivation (let
+      url =
+        "https://plugins.lapce.dev/api/v1/plugins/${author}/${name}/${version}/download";
+      file = "lapce-plugin-${author}-${name}-${version}.tar.zstd";
+    in {
+      name = file;
+      nativeBuildInputs = [ pkgs.curl pkgs.cacert ];
+      dontUnpack = true;
+      dontBuild = true;
+      installPhase = ''
+        runHook preInstall
+
+        url="$(curl ${url})"
+        curl -L "$url" -o "$out"
+
+        runHook postInstall
+      '';
+      outputHashAlgo = "sha256";
+      outputHashMode = "flat";
+      outputHash = hash;
+      inherit meta;
+    });
+  pluginFromRegistry = { author, name, version, hash }@args:
+    pkgs.stdenvNoCC.mkDerivation {
+      pname = "lapce-plugin-${author}-${name}";
+      inherit version;
+      src = fetchPluginTarballFromRegistry args;
+      nativeBuildInputs = [ pkgs.zstd ];
+      phases = [ "installPhase" ];
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out
+        tar -C $out -xvf $src
+
+        runHook postInstall
+      '';
+    };
+  pluginsFromRegistry = plugins:
+    pkgs.linkFarm "lapce-plugins" (builtins.listToAttrs (builtins.map
+      ({ author, name, version, ... }@plugin: {
+        name = "${author}-${name}-${version}";
+        value = pluginFromRegistry plugin;
+      }) plugins));
+in {
+  meta.maintainers = [ hm.maintainers.timon-schelling ];
+
+  options.programs.lapce = options;
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg = let dir = "lapce-${cfg.channel}";
+    in {
+      configFile = {
+        "${dir}/settings.toml".source =
+          settingsFormat.generate "settings.toml" cfg.settings;
+        "${dir}/keymaps.toml".source =
+          settingsFormat.generate "keymaps.toml" { keymaps = cfg.keymaps; };
+      };
+      dataFile."${dir}/plugins".source = pluginsFromRegistry cfg.plugins;
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 2dbf97b34..ae8a91eff 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -101,6 +101,7 @@ in import nmtSrc {
     ./modules/programs/khard
     ./modules/programs/kitty
     ./modules/programs/kubecolor
+    ./modules/programs/lapce
     ./modules/programs/ledger
     ./modules/programs/less
     ./modules/programs/lesspipe
diff --git a/tests/modules/programs/lapce/default.nix b/tests/modules/programs/lapce/default.nix
new file mode 100644
index 000000000..21726024d
--- /dev/null
+++ b/tests/modules/programs/lapce/default.nix
@@ -0,0 +1,4 @@
+{
+  lapce-example-keymaps = ./example-keymaps.nix;
+  lapce-example-settings = ./example-settings.nix;
+}
diff --git a/tests/modules/programs/lapce/example-keymaps-expected.toml b/tests/modules/programs/lapce/example-keymaps-expected.toml
new file mode 100644
index 000000000..26d4403c4
--- /dev/null
+++ b/tests/modules/programs/lapce/example-keymaps-expected.toml
@@ -0,0 +1,3 @@
+[[keymaps]]
+command = "open_log_file"
+key = "Ctrl+Shift+L"
diff --git a/tests/modules/programs/lapce/example-keymaps.nix b/tests/modules/programs/lapce/example-keymaps.nix
new file mode 100644
index 000000000..bf6f0a76e
--- /dev/null
+++ b/tests/modules/programs/lapce/example-keymaps.nix
@@ -0,0 +1,18 @@
+{ config, ... }:
+
+{
+  programs.lapce = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    keymaps = [{
+      command = "open_log_file";
+      key = "Ctrl+Shift+L";
+    }];
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/lapce-stable/keymaps.toml \
+      ${./example-keymaps-expected.toml}
+  '';
+}
diff --git a/tests/modules/programs/lapce/example-settings-expected.toml b/tests/modules/programs/lapce/example-settings-expected.toml
new file mode 100644
index 000000000..e279a54a6
--- /dev/null
+++ b/tests/modules/programs/lapce/example-settings-expected.toml
@@ -0,0 +1,17 @@
+[core]
+color-theme = "Custom"
+custom-titlebar = false
+icon-theme = "Material Icons"
+
+[editor]
+bracket-pair-colorization = true
+cursor-surrounding-lines = 4
+font-family = "FiraCode Nerd Bold Font, monospace"
+font-size = 22
+highlight-matching-brackets = true
+render-whitespace = "all"
+tab-width = 2
+
+[ui]
+font-size = 20
+open-editors-visible = false
diff --git a/tests/modules/programs/lapce/example-settings.nix b/tests/modules/programs/lapce/example-settings.nix
new file mode 100644
index 000000000..4851ef391
--- /dev/null
+++ b/tests/modules/programs/lapce/example-settings.nix
@@ -0,0 +1,34 @@
+{ config, ... }:
+
+{
+  programs.lapce = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    settings = {
+      core = {
+        custom-titlebar = false;
+        color-theme = "Custom";
+        icon-theme = "Material Icons";
+      };
+      editor = {
+        font-family = "FiraCode Nerd Bold Font, monospace";
+        font-size = 22;
+        tab-width = 2;
+        cursor-surrounding-lines = 4;
+        render-whitespace = "all";
+        bracket-pair-colorization = true;
+        highlight-matching-brackets = true;
+      };
+      ui = {
+        font-size = 20;
+        open-editors-visible = false;
+      };
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/lapce-stable/settings.toml \
+      ${./example-settings-expected.toml}
+  '';
+}

From dae6d3460c8bab3ac9f38a86affe45b32818e764 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Sat, 1 Feb 2025 16:52:06 +0000
Subject: [PATCH 322/546] git: add default value null to
 programs.git.signing.key (#6032)

---
 modules/programs/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index aedb24b00..a8b1c5942 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -18,6 +18,7 @@ let
     options = {
       key = mkOption {
         type = types.nullOr types.str;
+        default = null;
         description = ''
           The default GPG signing key fingerprint.
 

From 18fa9f323d8adbb0b7b8b98a8488db308210ed93 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 1 Feb 2025 16:19:26 -0600
Subject: [PATCH 323/546] yazi: add main.lua support to plugins (#6394)

Yazi is deprecating init.lua for main.lua usages. This adds support for
main.lua in plugins.
---
 modules/programs/yazi.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index f7970ef4b..27737f86a 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -263,8 +263,12 @@ in {
                 toString missingFiles
               }";
             singularOpt = removeSuffix "s" opt;
+            isPluginValid = opt == "plugins"
+              && (any (file: pathExists "${value}/${file}") requiredFiles);
+            isValid =
+              if opt == "plugins" then isPluginValid else missingFiles == [ ];
           in {
-            assertion = isDir && missingFiles == [ ];
+            assertion = isDir && isValid;
             message = ''
               Value at `programs.yazi.${opt}.${name}` is not a valid yazi ${singularOpt}.
               ${msgNotDir}
@@ -279,6 +283,6 @@ in {
       "preview.png"
       "LICENSE"
       "LICENSE-tmtheme"
-    ]) ++ (mkAsserts "plugins" [ "init.lua" ]);
+    ]) ++ (mkAsserts "plugins" [ "init.lua" "main.lua" ]);
   };
 }

From 066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Mon, 3 Feb 2025 16:19:46 -0300
Subject: [PATCH 324/546] flake-module: rename `homeModules` to
 `homeManagerModules` (#6392)

---
 docs/manual/nix-flakes/flake-parts.md | 6 +++---
 flake-module.nix                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md
index b314bef3c..6b05c77f2 100644
--- a/docs/manual/nix-flakes/flake-parts.md
+++ b/docs/manual/nix-flakes/flake-parts.md
@@ -22,7 +22,7 @@ you may wish to import Home Manager's flake module,
         inputs.home-manager.flakeModules.home-manager
       ];
       flake = {
-        # Define `homeModules`, `homeConfigurations`,
+        # Define `homeManagerModules`, `homeConfigurations`,
         # `nixosConfigurations`, etc here
       };
       # See flake.parts for more features, such as `perSystem`
@@ -30,10 +30,10 @@ you may wish to import Home Manager's flake module,
 }
 ```
 
-The flake module defines the `flake.homeModules` and `flake.homeConfigurations`
+The flake module defines the `flake.homeManagerModules` and `flake.homeConfigurations`
 options, allowing them to be properly merged if they are defined in multiple
 modules.
 
-If you are only defining `homeModules` and/or `homeConfigurations` once in a
+If you are only defining `homeManagerModules` and/or `homeConfigurations` once in a
 single module, flake-parts should work fine without importing
 `flakeModules.home-manager`.
diff --git a/flake-module.nix b/flake-module.nix
index cf421f9b1..c1b07ad0c 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -14,11 +14,11 @@ in {
           that you can reference them in this or another flake's `homeConfigurations`.
         '';
       };
-      homeModules = mkOption {
+      homeManagerModules = mkOption {
         type = types.lazyAttrsOf types.unspecified;
         default = { };
         apply = mapAttrs (k: v: {
-          _file = "${toString moduleLocation}#homeModules.${k}";
+          _file = "${toString moduleLocation}#homeManagerModules.${k}";
           imports = [ v ];
         });
         description = ''

From 7abcf59a365430b36f84eaa452a466b11e469e33 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Tue, 4 Feb 2025 12:07:35 +0100
Subject: [PATCH 325/546] mpv: support includes directives (#6391)

to allow mixing imperative and declarative config
the includes are at the end of the config
---
 modules/programs/mpv.nix                      | 21 +++++++++++++++++++
 .../mpv/mpv-example-settings-expected-config  |  2 ++
 .../programs/mpv/mpv-example-settings.nix     |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix
index f2664e71a..e8bcc1446 100644
--- a/modules/programs/mpv.nix
+++ b/modules/programs/mpv.nix
@@ -130,6 +130,19 @@ in {
         '';
       };
 
+      includes = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = literalExpression ''
+          [
+            "~/path/to/config.inc";
+            "~/path/to/conditional.inc";
+          ]
+        '';
+        description =
+          "List of configuration files to include at the end of mpv.conf.";
+      };
+
       profiles = mkOption {
         description = ''
           Sub-configuration options for specific profiles written to
@@ -207,6 +220,14 @@ in {
       home.packages = [ mpvPackage ];
       programs.mpv.finalPackage = mpvPackage;
     }
+
+    (mkIf (cfg.includes != [ ]) {
+      xdg.configFile."mpv/mpv.conf" = {
+        text = lib.mkAfter
+          (concatMapStringsSep "\n" (x: "include=${x}") cfg.includes);
+      };
+    })
+
     (mkIf (cfg.config != { } || cfg.profiles != { }) {
       xdg.configFile."mpv/mpv.conf".text = ''
         ${optionalString (cfg.defaultProfiles != [ ])
diff --git a/tests/modules/programs/mpv/mpv-example-settings-expected-config b/tests/modules/programs/mpv/mpv-example-settings-expected-config
index e44239096..4f4c3cd2d 100644
--- a/tests/modules/programs/mpv/mpv-example-settings-expected-config
+++ b/tests/modules/programs/mpv/mpv-example-settings-expected-config
@@ -11,3 +11,5 @@ vo=%5%vdpau
 alang=%2%en
 profile-desc=%26%profile for dvd:// streams
 
+
+include=manual.conf
\ No newline at end of file
diff --git a/tests/modules/programs/mpv/mpv-example-settings.nix b/tests/modules/programs/mpv/mpv-example-settings.nix
index 002e071c1..2fc5ca5de 100644
--- a/tests/modules/programs/mpv/mpv-example-settings.nix
+++ b/tests/modules/programs/mpv/mpv-example-settings.nix
@@ -16,6 +16,8 @@
       #           script-binding uosc/video                   #! Video tracks
     '';
 
+    includes = [ "manual.conf" ];
+
     config = {
       force-window = true;
       ytdl-format = "bestvideo+bestaudio";

From 78576b817fdd88a75c6adf512e9ba20551662cef Mon Sep 17 00:00:00 2001
From: Janik <80165193+Janik-Haag@users.noreply.github.com>
Date: Tue, 4 Feb 2025 22:29:41 +0100
Subject: [PATCH 326/546] home-manager: add lib support for non-flake users
 (#5429)

---
 default.nix     |  1 +
 flake.nix       | 51 +------------------------------------------------
 lib/default.nix | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 lib/default.nix

diff --git a/default.nix b/default.nix
index 7df2dbd43..abf4e678b 100644
--- a/default.nix
+++ b/default.nix
@@ -24,6 +24,7 @@ in rec {
     pkgs.callPackage ./home-manager/install.nix { inherit home-manager; };
 
   nixos = import ./nixos;
+  lib = import ./lib { inherit (pkgs) lib; };
 
   inherit path;
 }
diff --git a/flake.nix b/flake.nix
index 5f9df5825..4b797355e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,56 +41,7 @@
 
       defaultTemplate = self.templates.standalone;
 
-      lib = {
-        hm = (import ./modules/lib/stdlib-extended.nix nixpkgs.lib).hm;
-        homeManagerConfiguration = { modules ? [ ], pkgs, lib ? pkgs.lib
-          , extraSpecialArgs ? { }, check ? true
-            # Deprecated:
-          , configuration ? null, extraModules ? null, stateVersion ? null
-          , username ? null, homeDirectory ? null, system ? null }@args:
-          let
-            msgForRemovedArg = ''
-              The 'homeManagerConfiguration' arguments
-
-                - 'configuration',
-                - 'username',
-                - 'homeDirectory'
-                - 'stateVersion',
-                - 'extraModules', and
-                - 'system'
-
-              have been removed. Instead use the arguments 'pkgs' and
-              'modules'. See the 22.11 release notes for more: https://nix-community.github.io/home-manager/release-notes.xhtml#sec-release-22.11-highlights
-            '';
-
-            throwForRemovedArgs = v:
-              let
-                used = builtins.filter (n: (args.${n} or null) != null) [
-                  "configuration"
-                  "username"
-                  "homeDirectory"
-                  "stateVersion"
-                  "extraModules"
-                  "system"
-                ];
-                msg = msgForRemovedArg + ''
-
-
-                  Deprecated args passed: ''
-                  + builtins.concatStringsSep " " used;
-              in lib.throwIf (used != [ ]) msg v;
-
-          in throwForRemovedArgs (import ./modules {
-            inherit pkgs lib check extraSpecialArgs;
-            configuration = { ... }: {
-              imports = modules ++ [{ programs.home-manager.path = "${./.}"; }];
-              nixpkgs = {
-                config = nixpkgs.lib.mkDefault pkgs.config;
-                inherit (pkgs) overlays;
-              };
-            };
-          });
-      };
+      lib = import ./lib { inherit (nixpkgs) lib; };
     } // (let
       forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
     in {
diff --git a/lib/default.nix b/lib/default.nix
new file mode 100644
index 000000000..5d0eb5f41
--- /dev/null
+++ b/lib/default.nix
@@ -0,0 +1,49 @@
+{ lib }: {
+  hm = (import ../modules/lib/stdlib-extended.nix lib).hm;
+  homeManagerConfiguration = { modules ? [ ], pkgs, lib ? pkgs.lib
+    , extraSpecialArgs ? { }, check ? true
+      # Deprecated:
+    , configuration ? null, extraModules ? null, stateVersion ? null
+    , username ? null, homeDirectory ? null, system ? null }@args:
+    let
+      msgForRemovedArg = ''
+        The 'homeManagerConfiguration' arguments
+
+          - 'configuration',
+          - 'username',
+          - 'homeDirectory'
+          - 'stateVersion',
+          - 'extraModules', and
+          - 'system'
+
+        have been removed. Instead use the arguments 'pkgs' and
+        'modules'. See the 22.11 release notes for more: https://nix-community.github.io/home-manager/release-notes.xhtml#sec-release-22.11-highlights
+      '';
+
+      throwForRemovedArgs = v:
+        let
+          used = builtins.filter (n: (args.${n} or null) != null) [
+            "configuration"
+            "username"
+            "homeDirectory"
+            "stateVersion"
+            "extraModules"
+            "system"
+          ];
+          msg = msgForRemovedArg + ''
+
+
+            Deprecated args passed: '' + builtins.concatStringsSep " " used;
+        in lib.throwIf (used != [ ]) msg v;
+
+    in throwForRemovedArgs (import ../modules {
+      inherit pkgs lib check extraSpecialArgs;
+      configuration = { ... }: {
+        imports = modules ++ [{ programs.home-manager.path = "${../.}"; }];
+        nixpkgs = {
+          config = lib.mkDefault pkgs.config;
+          inherit (pkgs) overlays;
+        };
+      };
+    });
+}

From 1e47f7101fedd857e561782d00d4cb1f6b69e7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <ces@fem.gg>
Date: Tue, 4 Feb 2025 22:31:42 +0100
Subject: [PATCH 327/546] gpg-agent: no-allow-external-cache option (#6387)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a pretty common configuration option, and one that many people
will find useful to discover, specially if they're not using a window
manager.

I thought I would add it. It is also useful to have for
pass-secret-service in the future, since you'd likely want to avoid DE
keyrings.

Signed-off-by: Christina Sørensen <ces@fem.gg>
---
 modules/services/gpg-agent.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index edb87a9d1..786a9f2e9 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -218,6 +218,21 @@ in {
         '';
       };
 
+      noAllowExternalCache = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Tell Pinentry not to enable features which use an external cache for
+          passphrases.
+
+          Some desktop environments prefer to unlock all credentials with one
+          master password and may have installed a Pinentry which employs an
+          additional external cache to implement such a policy. By using this
+          option the Pinentry is advised not to make use of such a cache and
+          instead always ask the user for the requested passphrase.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -269,6 +284,7 @@ in {
         (optional (cfg.enableSshSupport) "enable-ssh-support"
           ++ optional cfg.grabKeyboardAndMouse "grab"
           ++ optional (!cfg.enableScDaemon) "disable-scdaemon"
+          ++ optional (cfg.noAllowExternalCache) "no-allow-external-cache"
           ++ optional (cfg.defaultCacheTtl != null)
           "default-cache-ttl ${toString cfg.defaultCacheTtl}"
           ++ optional (cfg.defaultCacheTtlSsh != null)

From 24bb01ea170a6705c6700be3fa7438b394523ea4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 4 Feb 2025 00:39:34 +0100
Subject: [PATCH 328/546] tests: avoid unnecessary test script interpolation

---
 tests/asserts.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/asserts.nix b/tests/asserts.nix
index c1fe177ee..1909f90b7 100644
--- a/tests/asserts.nix
+++ b/tests/asserts.nix
@@ -44,17 +44,16 @@ with lib;
 
           --
         '' config.warnings;
+        "asserts/warnings.expected".text = concatStringsSep ''
+
+          --
+        '' config.test.asserts.warnings.expected;
       };
 
       nmt.script = ''
         assertFileContent \
           home-files/asserts/warnings.actual \
-          ${
-            pkgs.writeText "warnings.expected" (concatStringsSep ''
-
-              --
-            '' config.test.asserts.warnings.expected)
-          }
+          "$TESTED/home-files/asserts/warnings.expected"
       '';
     })
 
@@ -64,17 +63,16 @@ with lib;
 
           --
         '' (map (x: x.message) (filter (x: !x.assertion) config.assertions));
+        "asserts/assertions.expected".text = concatStringsSep ''
+
+          --
+        '' config.test.asserts.assertions.expected;
       };
 
       nmt.script = ''
         assertFileContent \
           home-files/asserts/assertions.actual \
-          ${
-            pkgs.writeText "assertions.expected" (concatStringsSep ''
-
-              --
-            '' config.test.asserts.assertions.expected)
-          }
+          "$TESTED/home-files/asserts/assertions.expected"
       '';
     })
   ];

From c5c2cbc866fecc75175259bcda02c4c0e00c00ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 4 Feb 2025 23:07:15 +0100
Subject: [PATCH 329/546] ci: tweak test command slightly

Specifically, increase initial GC heap size and allow parallel build
jobs.
---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ff67b6760..db71dca7b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,6 +24,8 @@ jobs:
     - run: ./format -c
     - run: nix-shell --show-trace . -A install
     - run: yes | home-manager -I home-manager=. uninstall
-    - run: nix-shell --show-trace --arg enableBig false --pure tests -A run.all
+    - run: nix-shell -j auto --show-trace --arg enableBig false --pure tests -A run.all
       # Somebody please help us fix the macos tests.
       if: matrix.os != 'macos-latest'
+      env:
+        GC_INITIAL_HEAP_SIZE: 4294967296

From 7a3f0b3b8df1b913890f5fad04d34f2af91da858 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 31 Jan 2025 21:24:47 +0100
Subject: [PATCH 330/546] tests: rework derivation stubbing

Instead of having to manually stub packages that should not be
downloaded we instead automatically stub all packages (except a small
list of whitelisted ones). Tests can re-introduce the real package by
using the `realPkgs` module argument.
---
 tests/default.nix                             | 110 ++++++--
 tests/modules/config/i18n/default.nix         |  19 +-
 .../input-method/fcitx5-configuration.nix     |   8 +-
 .../i18n/input-method/fcitx5-stubs.nix        |  57 ----
 .../i18n/input-method/kime-configuration.nix  |   2 -
 tests/modules/misc/debug/default.nix          |   4 +-
 .../misc/fontconfig/no-font-package.nix       |  20 +-
 .../misc/fontconfig/single-font-package.nix   |  18 +-
 tests/modules/misc/gtk/gtk2-basic-config.nix  |  36 +--
 .../misc/gtk/gtk2-config-file-location.nix    |  22 +-
 .../modules/misc/gtk/gtk3-basic-settings.nix  |  32 +--
 tests/modules/misc/manual/manual.nix          |  36 +--
 tests/modules/misc/numlock/numlock.nix        |  18 +-
 .../misc/qt/qt-platform-theme-gnome.nix       |   7 -
 .../modules/misc/qt/qt-platform-theme-gtk.nix |   8 +-
 tests/modules/misc/xdg/autostart.nix          |  52 ++--
 tests/modules/misc/xdg/portal.nix             |  14 +-
 tests/modules/programs/abook/no-settings.nix  |   2 -
 .../modules/programs/abook/with-settings.nix  |   2 -
 tests/modules/programs/aerc/assertion.nix     |   2 -
 tests/modules/programs/aerc/noSettings.nix    |   2 -
 tests/modules/programs/aerc/settings.nix      |   2 -
 .../modules/programs/aerospace/aerospace.nix  |   2 -
 .../programs/alacritty/empty-settings.nix     |  12 +-
 .../programs/alacritty/example-settings.nix   |  44 ++-
 .../programs/alacritty/settings-merging.nix   |  56 ++--
 .../programs/alacritty/toml-config.nix        |  50 ++--
 tests/modules/programs/alot/alot.nix          |  44 ++-
 tests/modules/programs/antidote/antidote.nix  |   7 -
 tests/modules/programs/aria2/settings.nix     |  58 ++--
 tests/modules/programs/atuin/bash.nix         |   7 -
 .../modules/programs/atuin/empty-settings.nix |   7 -
 .../programs/atuin/example-settings.nix       |   5 -
 tests/modules/programs/atuin/fish.nix         |   5 -
 tests/modules/programs/atuin/no-shell.nix     |   5 -
 tests/modules/programs/atuin/set-flags.nix    |   5 -
 tests/modules/programs/atuin/zsh.nix          |   7 -
 .../programs/autojump/default-settings.nix    |  22 +-
 .../autorandr/basic-configuration.nix         | 112 ++++----
 tests/modules/programs/autorandr/scale.nix    |  48 ++--
 tests/modules/programs/awscli/awscli.nix      |   4 -
 tests/modules/programs/bacon/bacon.nix        |   2 +-
 tests/modules/programs/bacon/empty-config.nix |   2 -
 tests/modules/programs/bash/completion.nix    |   6 -
 tests/modules/programs/bash/logout.nix        |  38 ++-
 .../programs/bash/session-variables.nix       |  50 ++--
 tests/modules/programs/bat/bat.nix            |  90 +++---
 .../programs/bat/deprecated-options.nix       | 110 ++++----
 tests/modules/programs/beets/mpdstats.nix     |   7 -
 tests/modules/programs/beets/mpdupdate.nix    |   3 -
 .../programs/bemenu/basic-configuration.nix   |   2 -
 .../programs/bemenu/empty-configuration.nix   |   4 +-
 .../borgmatic/basic-configuration.nix         |   6 +-
 .../both-sourcedirectories-and-patterns.nix   |  10 +-
 .../exclude-hm-symlinks-nothing-else.nix      |  13 +-
 .../borgmatic/exclude-hm-symlinks.nix         |   7 +-
 .../borgmatic/include-hm-symlinks.nix         |   7 +-
 ...neither-sourcedirectories-nor-patterns.nix |  10 +-
 .../borgmatic/patterns-configuration.nix      |   7 +-
 .../modules/programs/boxxy/empty-settings.nix |   2 -
 .../programs/boxxy/example-settings.nix       |   2 -
 tests/modules/programs/broot/broot.nix        |   7 +-
 .../programs/browserpass/browserpass.nix      |  59 ++--
 .../modules/programs/btop/empty-settings.nix  |   4 -
 tests/modules/programs/carapace/bash.nix      |   4 +-
 tests/modules/programs/carapace/fish.nix      |   6 +-
 tests/modules/programs/carapace/zsh.nix       |   4 +-
 tests/modules/programs/cmus/cmus.nix          |   4 -
 tests/modules/programs/comodoro/comodoro.nix  |   4 -
 tests/modules/programs/direnv/bash.nix        |  22 +-
 tests/modules/programs/direnv/nix-direnv.nix  |  22 +-
 tests/modules/programs/direnv/nushell.nix     |   4 +-
 .../programs/direnv/stdlib-and-nix-direnv.nix |  30 +-
 tests/modules/programs/direnv/stdlib.nix      |  26 +-
 .../fastfetch/basic-configuration.nix         |   2 -
 .../fastfetch/default-configuration.nix       |   2 -
 tests/modules/programs/feh/feh-bindings.nix   |  50 ++--
 .../programs/feh/feh-empty-settings.nix       |  18 +-
 tests/modules/programs/feh/feh-themes.nix     |  50 ++--
 .../programs/firefox/final-package.nix        |  30 +-
 .../firefox/setup-firefox-mock-overlay.nix    |  50 ++--
 .../modules/programs/foot/empty-settings.nix  |  16 +-
 .../programs/foot/example-settings.nix        |  38 ++-
 .../programs/foot/systemd-user-service.nix    |  27 +-
 .../programs/freetube/basic-configuration.nix |   4 -
 .../programs/fuzzel/empty-settings.nix        |   4 -
 .../programs/gallery-dl/gallery-dl.nix        |   2 -
 tests/modules/programs/gh-dash/config.nix     |   4 -
 tests/modules/programs/gh/config-file.nix     |  40 ++-
 .../modules/programs/gh/credential-helper.nix |   4 -
 tests/modules/programs/gh/extensions.nix      |   3 +-
 tests/modules/programs/gh/warnings.nix        |  60 ++--
 .../programs/ghostty/empty-settings.nix       |   2 +-
 .../programs/ghostty/example-theme.nix        |   3 +-
 .../programs/git-cliff/example-settings.nix   |   6 -
 .../programs/git-credential-oauth/basic.nix   |   4 +-
 .../git-credential-oauth/extra-flags.nix      |   4 +-
 tests/modules/programs/git/git-with-email.nix |  62 ++---
 tests/modules/programs/git/git-with-hooks.nix |   4 +-
 tests/modules/programs/git/git-with-msmtp.nix |  65 ++---
 .../programs/git/git-with-signing-key-id.nix  |  34 ++-
 .../git/git-with-str-extra-config.nix         |  43 ++-
 .../git/git-without-signing-key-id.nix        |  34 ++-
 tests/modules/programs/git/git.nix            | 141 +++++-----
 .../programs/gnome-shell/gnome-shell.nix      |   2 -
 .../gnome-terminal/bad-profile-name.nix       |   7 -
 .../gnome-terminal/gnome-terminal-1.nix       | 100 +++----
 tests/modules/programs/go/go-telemetry.nix    |   5 -
 .../programs/gpg/immutable-keyfiles.nix       |   9 +-
 .../modules/programs/gpg/mutable-keyfiles.nix |   5 -
 .../gradle/alternate-home-settings.nix        |  38 ++-
 .../programs/gradle/empty-settings.nix        |  18 +-
 .../programs/gradle/example-settings.nix      |  68 +++--
 .../programs/gradle/init-scripts-settings.nix |  56 ++--
 .../programs/granted/integration-disabled.nix |   4 -
 .../programs/granted/integration-enabled.nix  |   4 -
 .../programs/helix/example-settings.nix       | 262 +++++++++---------
 .../programs/hexchat/basic-configuration.nix  |  99 +++----
 tests/modules/programs/himalaya/basic.nix     |   6 -
 .../modules/programs/htop/empty-settings.nix  |  16 +-
 .../programs/htop/example-settings.nix        |   6 +-
 tests/modules/programs/htop/header_layout.nix |   6 +-
 .../programs/htop/settings-without-fields.nix |   6 +-
 .../programs/hyfetch/empty-settings.nix       |  16 +-
 tests/modules/programs/hyfetch/settings.nix   |   4 -
 .../programs/hyprlock/basic-configuration.nix |   4 -
 .../hyprlock/complex-configuration.nix        |   4 -
 .../programs/i3blocks/with-ordered-blocks.nix |  18 +-
 .../i3status-rust/with-version-0311.nix       |  14 +-
 .../modules/programs/i3status/with-custom.nix | 112 ++++----
 .../programs/i3status/with-default.nix        | 128 ++++-----
 .../programs/irssi/example-settings.nix       |  44 ++-
 .../joplin-desktop/basic-configuration.nix    |   2 -
 .../modules/programs/jujutsu/empty-config.nix |   2 -
 .../programs/k9s/deprecated-options.nix       |   6 +-
 tests/modules/programs/k9s/empty-settings.nix |   5 +-
 .../programs/k9s/partial-skin-settings.nix    |   4 -
 tests/modules/programs/kakoune/no-plugins.nix |   4 -
 tests/modules/programs/kakoune/stubs.nix      |  28 +-
 .../modules/programs/kakoune/use-plugins.nix  |   6 +-
 .../whitespace-highlighter-corner-cases.nix   |   4 -
 .../kakoune/whitespace-highlighter.nix        |   4 +-
 tests/modules/programs/khal/config.nix        |   6 +-
 tests/modules/programs/khard/basic_config.nix |   2 -
 tests/modules/programs/khard/dirty_path.nix   |   2 -
 tests/modules/programs/khard/empty_config.nix |   2 -
 .../programs/khard/multiple_accounts.nix      |   2 -
 .../programs/kitty/example-settings.nix       |   2 -
 .../programs/kitty/theme-to-themeFile.nix     |  42 +--
 .../programs/kodi/example-addon-settings.nix  |   2 +
 .../programs/kodi/example-settings.nix        |   6 +-
 .../modules/programs/kodi/example-sources.nix |   7 +-
 tests/modules/programs/kodi/kodi-stubs.nix    |  10 +
 .../programs/kubecolor/empty-config.nix       |   2 -
 tests/modules/programs/ledger/ledger.nix      |   4 -
 .../programs/less/less-with-custom-keys.nix   |   6 -
 tests/modules/programs/lesspipe/lesspipe.nix  |   2 -
 tests/modules/programs/lf/all-options.nix     |  86 +++---
 tests/modules/programs/lf/minimal-options.nix |  17 +-
 tests/modules/programs/lf/no-pv-keybind.nix   |  30 +-
 .../modules/programs/lsd/example-settings.nix | 104 ++++---
 .../mbsync/mbsync-master-slave-change.nix     |  95 -------
 tests/modules/programs/mbsync/mbsync.nix      | 146 +++++-----
 tests/modules/programs/micro/micro.nix        |   4 -
 .../programs/mpv/mpv-example-settings.nix     |   2 -
 .../programs/mpv/mpv-invalid-settings.nix     |   8 +-
 tests/modules/programs/mpv/mpv-stubs.nix      |  29 --
 .../programs/mu/basic-configuration.nix       |   4 -
 .../programs/mu/custom-configuration.nix      |   2 -
 .../ncmpcpp-linux/ncmpcpp-issue-3560.nix      |  31 +--
 .../ncmpcpp-linux/ncmpcpp-use-mpd-config.nix  |  27 +-
 .../ncmpcpp/ncmpcpp-empty-settings.nix        |  16 +-
 .../ncmpcpp/ncmpcpp-example-settings.nix      | 100 ++++---
 tests/modules/programs/ne/defprefs.nix        |  36 +--
 tests/modules/programs/ne/passthroughs.nix    |  44 ++-
 .../neomutt/neomutt-no-folder-change.nix      |  38 +--
 .../programs/neomutt/neomutt-not-primary.nix  |  32 +--
 .../programs/neomutt/neomutt-unmailboxes.nix  |  38 +--
 .../neomutt-with-binds-invalid-settings.nix   |  40 ++-
 .../neomutt-with-binds-with-warning.nix       | 106 ++++---
 .../programs/neomutt/neomutt-with-binds.nix   | 110 ++++----
 .../programs/neomutt/neomutt-with-gpg.nix     |  47 ++--
 .../neomutt-with-imap-type-mailboxes.nix      |  92 +++---
 .../programs/neomutt/neomutt-with-imap.nix    |  66 ++---
 .../programs/neomutt/neomutt-with-msmtp.nix   |  52 ++--
 .../neomutt/neomutt-with-named-mailboxes.nix  |  76 +++--
 .../neomutt-with-signature-command.nix        |  68 +++--
 .../neomutt/neomutt-with-signature.nix        |  74 +++--
 .../neomutt/neomutt-with-starttls.nix         |  60 ++--
 tests/modules/programs/neomutt/neomutt.nix    |  58 ++--
 tests/modules/programs/neovide/neovide.nix    |   4 -
 tests/modules/programs/neovim/coc-config.nix  |  36 ++-
 .../programs/neovim/extra-lua-init.nix        |  33 +--
 tests/modules/programs/neovim/no-init.nix     |  42 ++-
 .../modules/programs/neovim/plugin-config.nix |  56 ++--
 tests/modules/programs/neovim/runtime.nix     |  96 ++++---
 tests/modules/programs/neovim/stubs.nix       |  35 +++
 .../newsboat/newsboat-basics-2003.nix         |  44 ++-
 .../newsboat/newsboat-basics-2105.nix         |  46 ++-
 .../programs/newsboat/newsboat-basics.nix     |  42 ++-
 .../programs/nheko/nheko-empty-settings.nix   |   2 -
 .../programs/nheko/nheko-example-settings.nix |   2 -
 .../nix-index/assert-on-command-not-found.nix |  44 ++-
 .../programs/nix-index/integrations.nix       |  52 ++--
 .../programs/nix-your-shell/enable-shells.nix |   6 -
 .../programs/nushell/example-settings.nix     |   5 +-
 tests/modules/programs/oh-my-posh/bash.nix    |   4 -
 tests/modules/programs/oh-my-posh/fish.nix    |   2 -
 tests/modules/programs/oh-my-posh/nushell.nix |   5 -
 tests/modules/programs/oh-my-posh/zsh.nix     |   7 -
 .../openstackclient/openstackclient.nix       |   4 -
 tests/modules/programs/pandoc/csl.nix         |   2 -
 tests/modules/programs/pandoc/defaults.nix    |  44 +--
 tests/modules/programs/pandoc/templates.nix   |   2 -
 tests/modules/programs/papis/papis.nix        |   4 -
 .../pay-respects/integration-disabled.nix     |  12 +-
 .../pay-respects/integration-enabled.nix      |  12 +-
 tests/modules/programs/pet/settings_21_05.nix |   7 -
 tests/modules/programs/pet/settings_21_11.nix |   7 -
 tests/modules/programs/pet/snippets.nix       |  37 +--
 .../modules/programs/pistol/associations.nix  |   2 -
 tests/modules/programs/pistol/config.nix      |   2 -
 .../programs/pistol/double-association.nix    |   2 -
 .../programs/pistol/missing-association.nix   |   2 -
 tests/modules/programs/pls/bash.nix           |  39 +--
 tests/modules/programs/pls/fish.nix           |  48 ++--
 tests/modules/programs/pls/zsh.nix            |  43 ++-
 .../programs/poetry/custom-settings.nix       |   2 -
 .../programs/poetry/default-settings.nix      |   2 -
 tests/modules/programs/powerline-go/bash.nix  |  46 ++-
 .../powerline-go/bashmodulesright.nix         |  48 ++--
 tests/modules/programs/powerline-go/fish.nix  |  48 ++--
 tests/modules/programs/powerline-go/zsh.nix   |  49 ++--
 .../programs/powerline-go/zshmodulesright.nix |  51 ++--
 .../programs/pubs/pubs-example-settings.nix   |   4 -
 tests/modules/programs/pyenv/bash.nix         |   4 -
 tests/modules/programs/pyenv/fish.nix         |   4 -
 tests/modules/programs/pyenv/zsh.nix          |   4 -
 tests/modules/programs/qcal/http-calendar.nix |   4 -
 tests/modules/programs/qcal/mixed.nix         |   4 -
 .../modules/programs/qcal/webdav-calendar.nix |   4 -
 .../programs/qutebrowser/greasemonkey.nix     |   6 +-
 .../programs/qutebrowser/keybindings.nix      |   4 +-
 .../programs/qutebrowser/quickmarks.nix       |   4 +-
 .../modules/programs/qutebrowser/settings.nix |   4 +-
 .../modules/programs/ranger/configuration.nix |   4 -
 tests/modules/programs/rbw/empty-settings.nix |   2 -
 tests/modules/programs/rbw/rbw-stubs.nix      |  12 -
 tests/modules/programs/rbw/settings.nix       |   6 +-
 .../modules/programs/rbw/simple-settings.nix  |   4 +-
 tests/modules/programs/rio/empty-settings.nix |   4 -
 .../modules/programs/rio/example-settings.nix |   4 +-
 .../programs/rofi-pass/rofi-pass-config.nix   |  49 ++--
 .../programs/rofi-pass/rofi-pass-root.nix     |  41 +--
 .../rofi/config-with-deprecated-options.nix   |   3 -
 tests/modules/programs/rofi/custom-theme.nix  |  60 ++--
 tests/modules/programs/rofi/valid-config.nix  |  48 ++--
 tests/modules/programs/ruff/ruff.nix          |   4 -
 tests/modules/programs/sagemath/sagemath.nix  |   2 -
 .../programs/sapling/sapling-basic.nix        |   2 -
 .../modules/programs/sapling/sapling-most.nix |   2 -
 tests/modules/programs/sbt/credentials.nix    |   4 +-
 .../programs/sbt/deprecated-options.nix       |   4 -
 tests/modules/programs/sbt/plugins.nix        |   4 +-
 .../modules/programs/sbt/user-config-path.nix |   4 +-
 tests/modules/programs/scmpuff/bash.nix       |   4 -
 tests/modules/programs/scmpuff/fish.nix       |   2 -
 tests/modules/programs/scmpuff/no-aliases.nix |   2 -
 tests/modules/programs/scmpuff/no-bash.nix    |   4 -
 tests/modules/programs/scmpuff/no-fish.nix    |   2 -
 tests/modules/programs/scmpuff/no-shell.nix   |   7 -
 tests/modules/programs/scmpuff/no-zsh.nix     |   7 -
 tests/modules/programs/scmpuff/zsh.nix        |   7 -
 .../programs/sftpman/assert-on-no-sshkey.nix  |  26 +-
 .../programs/sftpman/example-settings.nix     |  72 +++--
 .../sioyek/sioyek-basic-configuration.nix     |   4 -
 tests/modules/programs/sm64ex/settings.nix    | 142 +++++-----
 .../programs/spotify-player/settings.nix      |   2 -
 .../starship/fish_with_interactive.nix        |  42 ++-
 .../starship/fish_with_transience.nix         |  26 +-
 .../starship/fish_without_interactive.nix     |  70 +++--
 .../starship/fish_without_transience.nix      |  22 +-
 tests/modules/programs/starship/settings.nix  |  88 +++---
 .../programs/taskwarrior/taskwarrior.nix      |  63 ++---
 .../programs/terminator/config-file.nix       |   6 +-
 .../programs/thefuck/integration-disabled.nix |   4 -
 .../thefuck/integration-enabled-instant.nix   |   4 -
 .../programs/thefuck/integration-enabled.nix  |   4 -
 .../programs/thunderbird/thunderbird.nix      |   2 -
 tests/modules/programs/tmate/tmate.nix        |   4 -
 tests/modules/programs/todoman/config.nix     |   2 -
 .../programs/tofi/basic-configuration.nix     |  45 ++-
 tests/modules/programs/topgrade/settings.nix  |   2 -
 .../translate-shell/translate-shell.nix       |   4 -
 .../modules/programs/vifm/empty-settings.nix  |   4 -
 .../programs/vim-vint/basic-configuration.nix |   4 -
 .../wezterm/bash-integration-default.nix      |   4 -
 .../wezterm/bash-integration-disabled.nix     |   4 -
 .../wezterm/bash-integration-enabled.nix      |   4 -
 .../programs/wezterm/empty-setting.nix        |   4 -
 .../programs/wezterm/example-setting.nix      |   4 -
 .../wezterm/zsh-integration-default.nix       |   5 -
 .../wezterm/zsh-integration-disabled.nix      |   5 -
 .../wezterm/zsh-integration-enabled.nix       |   5 -
 .../wpaperd/wpaperd-example-settings.nix      |  36 +--
 .../programs/yambar/empty-settings.nix        |   4 -
 .../programs/yambar/example-settings.nix      |   4 -
 .../yazi/bash-integration-enabled.nix         |   4 -
 .../yazi/fish-integration-enabled.nix         |   2 -
 .../modules/programs/yazi/init-lua-string.nix |   4 +-
 .../yazi/nushell-integration-enabled.nix      |   2 -
 tests/modules/programs/yazi/settings.nix      |   4 -
 .../programs/yazi/zsh-integration-enabled.nix |   4 -
 .../programs/yt-dlp/yt-dlp-extraConfig.nix    |   4 -
 .../programs/yt-dlp/yt-dlp-simple-config.nix  |   4 -
 .../modules/programs/zellij/enable-shells.nix |  11 +-
 tests/modules/programs/zk/zk.nix              |   4 -
 tests/modules/programs/zplug/modules.nix      |   5 -
 .../programs/zsh/history-ignore-pattern.nix   |  13 +-
 .../programs/zsh/history-path-new-custom.nix  |  22 +-
 .../programs/zsh/history-path-new-default.nix |  16 +-
 .../programs/zsh/history-path-old-custom.nix  |  22 +-
 .../programs/zsh/history-path-old-default.nix |  16 +-
 .../programs/zsh/history-substring-search.nix |  30 +-
 tests/modules/programs/zsh/prezto.nix         |  17 +-
 .../programs/zsh/session-variables.nix        |  26 +-
 .../programs/zsh/syntax-highlighting.nix      |  30 +-
 tests/modules/programs/zsh/zsh-abbr.nix       |   4 -
 tests/modules/programs/zsh/zsh-stubs.nix      |  22 --
 .../services/activitywatch/basic-setup.nix    |   1 -
 .../activitywatch/empty-server-settings.nix   |   2 -
 .../modules/services/avizo/with-settings.nix  |   4 -
 .../services/avizo/without-settings.nix       |   4 -
 .../services/barrier/basic-configuration.nix  |   4 -
 .../services/blanket/basic-configuration.nix  |   6 +-
 .../borgmatic/basic-configuration.nix         |  32 +--
 .../borgmatic/basic-configuration.service     |   2 +-
 .../services/cachix-agent/basic-setup.nix     |   7 +-
 .../cliphist/cliphist-extra-options.nix       |   7 +-
 .../cliphist-multiple-session-targets.nix     |   7 -
 .../cliphist/cliphist-sway-session-target.nix |   5 -
 .../clipman/clipman-sway-session-target.nix   |   7 -
 tests/modules/services/comodoro/comodoro.nix  |   4 -
 .../services/conky/basic-configuration.nix    |   4 -
 .../services/copyq/basic-configuration.nix    |  22 +-
 .../services/copyq/basic-expected.service     |   2 +-
 .../copyq/dont-force-x-configuration.nix      |  22 +-
 .../copyq/dont-force-x-expected.service       |   2 +-
 .../services/darkman/basic-configuration.nix  |   2 -
 .../services/darkman/no-configuration.nix     |   7 +-
 .../services/devilspie2/configuration.nix     |   4 -
 .../services/dropbox/basic-configuration.nix  |   3 -
 .../espanso-darwin/basic-configuration.nix    |   4 +-
 .../services/espanso/basic-configuration.nix  |   4 -
 .../services/flameshot/empty-settings.nix     |   6 +-
 .../services/flameshot/example-settings.nix   |   4 -
 tests/modules/services/fluidsynth/service.nix |   2 -
 .../modules/services/fusuma/fusuma-stubs.nix  |  11 +
 tests/modules/services/fusuma/service.nix     |   3 +-
 tests/modules/services/fusuma/settings.nix    |   6 +-
 tests/modules/services/git-sync/basic.nix     |   5 +-
 .../modules/services/git-sync/whitespace.nix  |   8 +-
 .../services/glance/default-settings.nix      |   4 -
 .../services/glance/example-settings.nix      |   4 -
 tests/modules/services/glance/glance.service  |   2 +-
 .../services/gpg-agent/default-homedir.nix    |  38 +--
 .../services/gpg-agent/override-homedir.nix   |  47 ++--
 .../services/hypridle/basic-configuration.nix |   5 -
 .../services/hypridle/no-configuration.nix    |   4 -
 .../hyprpaper/basic-configuration.nix         |   4 -
 .../services/hyprpaper/no-configuration.nix   |   4 -
 .../services/imapnotify-darwin/launchd.nix    |   6 +-
 .../services/imapnotify/imapnotify.nix        |   6 +-
 .../modules/services/lieer/lieer-service.nix  |   4 -
 .../basic-configuration-expected.service      |   2 +-
 .../basic-configuration.nix                   |   4 -
 .../services/mopidy/basic-configuration.nix   |   2 -
 tests/modules/services/mopidy/mopidy-scan.nix |   4 +-
 .../mpd-mpris/configuration-basic.nix         |   4 -
 .../configuration-with-local-mpd.nix          |   4 -
 .../mpd-mpris/configuration-with-password.nix |   4 -
 .../services/mpd/basic-configuration.nix      |   6 -
 .../services/mpd/basic-configuration.service  |   2 +-
 .../mpd/before-state-version-22_11.nix        |   6 -
 .../services/mpd/start-when-needed.nix        |   6 -
 .../services/mpd/start-when-needed.service    |   2 +-
 tests/modules/services/mpd/xdg-music-dir.nix  |   6 -
 .../services/mpdris2/basic-configuration.nix  |   4 -
 .../mpdris2/basic-configuration.service       |   2 +-
 .../services/mpdris2/with-password.nix        |   4 -
 .../modules/services/nix-gc-darwin/basic.nix  |   4 -
 tests/modules/services/nix-gc/basic.nix       |   4 -
 .../modules/services/ollama/darwin/basic.nix  |   2 -
 tests/modules/services/ollama/linux/basic.nix |  16 +-
 .../linux/set-environment-variables.nix       |  32 +--
 tests/modules/services/pasystray/service.nix  |   8 -
 tests/modules/services/pbgopy/service.nix     |  20 +-
 ...picom-basic-configuration-expected.service |   2 +-
 .../picom/picom-basic-configuration.nix       |   4 -
 .../services/podman-linux/configuration.nix   |   2 -
 .../services/podman-linux/container.nix       |   4 +-
 .../integration-network-expected.service      |   2 +-
 .../services/podman-linux/integration.nix     |   4 +-
 .../services/podman-linux/manifest.nix        |   4 +-
 .../podman-linux/network-expected.service     |   2 +-
 .../modules/services/podman-linux/network.nix |   4 +-
 .../services/podman-linux/podman-stubs.nix    |   5 +
 .../gammastep-basic-configuration.nix         |  44 ++-
 .../redshift-basic-configuration.nix          |  44 ++-
 .../screen-locker/basic-configuration.nix     |  43 ++-
 .../services/screen-locker/moved-options.nix  |  56 ++--
 .../services/screen-locker/no-xautolock.nix   |  39 ++-
 .../signaturepdf/basic-configuration.nix      |   7 +-
 .../snixembed/basic-configuration.nix         |   4 -
 .../snixembed/basic-configuration.service     |   2 +-
 .../services/swayidle/basic-configuration.nix |   2 +-
 .../syncthing/common/extra-options.nix        |   4 +-
 .../linux/tray-as-bool-triggers-warning.nix   |  22 +-
 .../modules/services/syncthing/linux/tray.nix |  22 +-
 .../services/trayscale/hide-window.nix        |   4 +-
 .../services/trayscale/show-window.nix        |   4 +-
 .../services/twmn/basic-configuration.nix     |  88 +++---
 tests/modules/services/udiskie/basic.nix      |  20 +-
 tests/modules/services/udiskie/no-tray.nix    |  26 +-
 .../services/volnoti/package-option.nix       |   2 -
 .../window-managers/bspwm/bspwm-stubs.nix     |  13 -
 .../window-managers/bspwm/configuration.nix   |   4 -
 .../herbstluftwm/herbstluftwm-no-tags.nix     |   6 -
 .../herbstluftwm-simple-config.nix            |   6 -
 .../herbstluftwm/herbstluftwm-stubs.nix       |  13 -
 .../hyprland/hyprland-stubs.nix               |  21 --
 .../hyprland/multiple-devices-config.conf     |   2 +-
 .../hyprland/multiple-devices-config.nix      |   4 +-
 .../hyprland/null-all-packages-config.nix     |   4 +-
 .../hyprland/null-package-config.nix          |   2 -
 .../hyprland/null-portal-package-config.nix   |   2 -
 .../hyprland/simple-config.conf               |   2 +-
 .../hyprland/simple-config.nix                |   4 +-
 .../hyprland/sourceFirst-false-config.conf    |   2 +-
 .../hyprland/sourceFirst-false-config.nix     |   2 -
 .../services/window-managers/i3/i3-stubs.nix  |  16 +-
 .../window-managers/river/configuration.nix   |   9 -
 .../services/window-managers/river/init       |   2 +-
 .../window-managers/river/river-stubs.nix     |  13 -
 .../spectrwm/spectrwm-simple-config.nix       |   6 -
 .../spectrwm/spectrwm-stubs.nix               |  13 -
 .../sway/sway-bar-focused-colors.conf         |   2 +-
 .../sway/sway-bar-focused-colors.nix          |   6 +-
 ...way-bindkeys-to-code-and-extra-config.conf |   2 +-
 ...sway-bindkeys-to-code-and-extra-config.nix |   6 +-
 .../sway/sway-check-config.nix                |   4 +-
 .../window-managers/sway/sway-default.conf    |   2 +-
 .../window-managers/sway/sway-default.nix     |   4 +-
 .../sway/sway-followmouse-expected.conf       |   2 +-
 .../sway-followmouse-legacy-expected.conf     |   2 +-
 .../sway/sway-followmouse-legacy.nix          |   2 -
 .../window-managers/sway/sway-followmouse.nix |   2 -
 .../window-managers/sway/sway-modules.conf    |   2 +-
 .../window-managers/sway/sway-modules.nix     |   2 -
 .../window-managers/sway/sway-no-xwayland.nix |   6 +-
 .../window-managers/sway/sway-null-config.nix |   8 +-
 .../sway/sway-null-package.conf               |   2 +-
 .../sway/sway-null-package.nix                |   2 -
 .../window-managers/sway/sway-post-2003.conf  |   2 +-
 .../window-managers/sway/sway-post-2003.nix   |   4 +-
 .../window-managers/sway/sway-stubs.nix       |  22 --
 .../sway/sway-systemd-autostart.nix           |   4 +-
 .../sway/sway-systemd-variables.conf          |   2 +-
 .../sway/sway-systemd-variables.nix           |   4 +-
 .../sway/sway-workspace-default-expected.conf |   2 +-
 .../sway/sway-workspace-default.nix           |   4 +-
 .../sway/sway-workspace-output-expected.conf  |   2 +-
 .../sway/sway-workspace-output.nix            |   4 +-
 .../sway/swaynag-empty-settings.nix           |   2 -
 .../sway/swaynag-example-settings.nix         |  42 ++-
 .../window-managers/wayfire/configuration.ini |   2 +-
 .../window-managers/wayfire/configuration.nix |   8 +-
 .../window-managers/wayfire/wayfire-stubs.nix |  13 -
 .../window-managers/wayfire/wf-shell.nix      |   9 +-
 tests/stubs.nix                               |  62 +++--
 480 files changed, 3557 insertions(+), 5511 deletions(-)
 delete mode 100644 tests/modules/i18n/input-method/fcitx5-stubs.nix
 create mode 100644 tests/modules/programs/kodi/kodi-stubs.nix
 delete mode 100644 tests/modules/programs/mbsync/mbsync-master-slave-change.nix
 delete mode 100644 tests/modules/programs/mpv/mpv-stubs.nix
 create mode 100644 tests/modules/programs/neovim/stubs.nix
 delete mode 100644 tests/modules/programs/rbw/rbw-stubs.nix
 delete mode 100644 tests/modules/programs/zsh/zsh-stubs.nix
 create mode 100644 tests/modules/services/fusuma/fusuma-stubs.nix
 create mode 100644 tests/modules/services/podman-linux/podman-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/bspwm/bspwm-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/hyprland/hyprland-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/river/river-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/sway/sway-stubs.nix
 delete mode 100644 tests/modules/services/window-managers/wayfire/wayfire-stubs.nix

diff --git a/tests/default.nix b/tests/default.nix
index ae8a91eff..98531f856 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -9,31 +9,105 @@ let
     sha256 = "0qhn7nnwdwzh910ss78ga2d00v42b0lspfd7ybl61mpfgz3lmdcj";
   };
 
+  # Recursively replace each derivation in the given attribute set with the same
+  # derivation but with the `outPath` attribute set to the string
+  # `"@package-name@"`. This allows the tests to refer to derivations through
+  # their values without establishing an actual dependency on the derivation
+  # output.
+  scrubDerivations = attrs:
+    let
+      scrubDerivation = name: value:
+        let
+          scrubbedValue = scrubDerivations value;
+
+          newDrvAttrs = {
+            buildScript = abort "no build allowed";
+
+            outPath = builtins.traceVerbose ("${name} - got out path")
+              "@${lib.getName value}@";
+
+            # Prevent getOutput from descending into outputs
+            outputSpecified = true;
+
+            # Allow the original package to be used in derivation inputs
+            __spliced = {
+              buildHost = value;
+              hostTarget = value;
+            };
+          };
+        in if lib.isAttrs value then
+          if lib.isDerivation value then
+            scrubbedValue // newDrvAttrs
+          else
+            scrubbedValue
+        else
+          value;
+    in lib.mapAttrs scrubDerivation attrs;
+
+  # Globally unscrub a few selected packages that are used by a wide selection of tests.
+  whitelist = let
+    inner = self: super: {
+      inherit (pkgs)
+        coreutils jq desktop-file-utils diffutils findutils glibcLocales gettext
+        gnugrep gnused shared-mime-info emptyDirectory
+        # Needed by pretty much all tests that have anything to do with fish.
+        babelfish fish;
+
+      xorg =
+        super.xorg.overrideScope (self: super: { inherit (pkgs.xorg) lndir; });
+    };
+
+    outer = self: super:
+      inner self super // {
+        buildPackages = super.buildPackages.extend inner;
+      };
+  in outer;
+
+  scrubbedPkgs =
+    let rawScrubbedPkgs = lib.makeExtensible (final: scrubDerivations pkgs);
+    in builtins.traceVerbose "eval scrubbed nixpkgs"
+    (rawScrubbedPkgs.extend whitelist);
+
   modules = import ../modules/modules.nix {
     inherit lib pkgs;
     check = false;
-  } ++ [{
-    # Bypass <nixpkgs> reference inside modules/modules.nix to make the test
-    # suite more pure.
-    _module.args.pkgsPath = pkgs.path;
+  } ++ [
+    ({ config, ... }: {
+      _module.args = {
+        # Prevent the nixpkgs module from working. We want to minimize the number
+        # of evaluations of Nixpkgs.
+        pkgsPath = abort "pkgs path is unavailable in tests";
+        realPkgs = pkgs;
+        pkgs = let
+          overlays = config.test.stubOverlays ++ lib.optionals
+            (config.nixpkgs.overlays != null && config.nixpkgs.overlays != [ ])
+            config.nixpkgs.overlays;
+          stubbedPkgs = if overlays == [ ] then
+            scrubbedPkgs
+          else
+            builtins.traceVerbose "eval overlayed nixpkgs"
+            (lib.foldr (o: p: p.extend o) scrubbedPkgs overlays);
+        in lib.mkImageMediaOverride stubbedPkgs;
+      };
 
-    # Fix impurities. Without these some of the user's environment
-    # will leak into the tests through `builtins.getEnv`.
-    xdg.enable = true;
-    home = {
-      username = "hm-user";
-      homeDirectory = "/home/hm-user";
-      stateVersion = lib.mkDefault "18.09";
-    };
+      # Fix impurities. Without these some of the user's environment
+      # will leak into the tests through `builtins.getEnv`.
+      xdg.enable = true;
+      home = {
+        username = "hm-user";
+        homeDirectory = "/home/hm-user";
+        stateVersion = lib.mkDefault "18.09";
+      };
 
-    # Avoid including documentation since this will cause
-    # unnecessary rebuilds of the tests.
-    manual.manpages.enable = lib.mkDefault false;
+      # Avoid including documentation since this will cause
+      # unnecessary rebuilds of the tests.
+      manual.manpages.enable = lib.mkDefault false;
 
-    imports = [ ./asserts.nix ./big-test.nix ./stubs.nix ];
+      imports = [ ./asserts.nix ./big-test.nix ./stubs.nix ];
 
-    test.enableBig = enableBig;
-  }];
+      test.enableBig = enableBig;
+    })
+  ];
 
   isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
   isLinux = pkgs.stdenv.hostPlatform.isLinux;
diff --git a/tests/modules/config/i18n/default.nix b/tests/modules/config/i18n/default.nix
index 667b3b1d9..b3a7c7cc2 100644
--- a/tests/modules/config/i18n/default.nix
+++ b/tests/modules/config/i18n/default.nix
@@ -15,24 +15,23 @@
     };
   };
 
-  i18n-custom-locales = { pkgs, ... }: {
-    config = let stub = pkgs.glibcLocalesCustom;
-    in {
-      test.stubs.glibcLocalesCustom = {
-        inherit (pkgs.glibcLocales) version;
-        outPath = null; # we need a real path for this stub
+  i18n-custom-locales = { config, pkgs, ... }: {
+    config = let
+      customGlibcLocales = pkgs.glibcLocales.override {
+        allLocales = false;
+        locales = [ "en_US.UTF-8/UTF-8" ];
       };
-
-      i18n.glibcLocales = stub;
+    in {
+      i18n.glibcLocales = customGlibcLocales;
 
       nmt.script = ''
         hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
         assertFileExists $hmEnvFile
-        assertFileRegex $hmEnvFile 'LOCALE_ARCHIVE_.*${stub}'
+        assertFileRegex $hmEnvFile 'LOCALE_ARCHIVE_.*${customGlibcLocales}'
 
         envFile=home-files/.config/environment.d/10-home-manager.conf
         assertFileExists $envFile
-        assertFileRegex $envFile 'LOCALE_ARCHIVE_.*${stub}'
+        assertFileRegex $envFile 'LOCALE_ARCHIVE_.*${customGlibcLocales}'
       '';
     };
   };
diff --git a/tests/modules/i18n/input-method/fcitx5-configuration.nix b/tests/modules/i18n/input-method/fcitx5-configuration.nix
index 1e37a8bdf..8990e49dd 100644
--- a/tests/modules/i18n/input-method/fcitx5-configuration.nix
+++ b/tests/modules/i18n/input-method/fcitx5-configuration.nix
@@ -1,13 +1,13 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ ./fcitx5-stubs.nix ];
+{ config, lib, realPkgs, ... }:
 
+lib.mkIf config.test.enableBig {
   i18n.inputMethod = {
     enabled = "fcitx5";
     fcitx5.waylandFrontend = true;
   };
 
+  _module.args.pkgs = lib.mkForce realPkgs;
+
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/fcitx5-daemon.service
     assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GTK_IM_MODULE'
diff --git a/tests/modules/i18n/input-method/fcitx5-stubs.nix b/tests/modules/i18n/input-method/fcitx5-stubs.nix
deleted file mode 100644
index 9712a7518..000000000
--- a/tests/modules/i18n/input-method/fcitx5-stubs.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  test.stubs = {
-    fcitx5 = {
-      version = "0";
-      outPath = null;
-      buildScript = ''
-        mkdir -p $out/bin $out/share/applications $out/share/dbus-1/services $out/etc/xdg/autostart
-        touch $out/bin/fcitx5 \
-              $out/bin/fcitx5-config-qt \
-              $out/share/applications/org.fcitx.Fcitx5.desktop \
-              $out/share/dbus-1/services/org.fcitx.Fcitx5.service \
-              $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop
-        # The grep usage of fcitx5-with-addons expects one of the files to match with the fcitx5.out
-        # https://github.com/NixOS/nixpkgs/blob/d2eb4be48705289791428c07aca8ff654c1422ba/pkgs/tools/inputmethods/fcitx5/with-addons.nix#L40-L44
-        echo $out >> $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop
-        chmod +x $out/bin/fcitx5 \
-                 $out/bin/fcitx5-config-qt
-      '';
-    };
-    fcitx5-lua = { outPath = null; };
-    fcitx5-gtk = { outPath = null; };
-
-    gtk2 = {
-      buildScript = ''
-        mkdir -p $out/bin
-        echo '#/usr/bin/env bash' > $out/bin/gtk-query-immodules-2.0
-        chmod +x $out/bin/*
-      '';
-    };
-    gtk3 = {
-      buildScript = ''
-        mkdir -p $out/bin
-        echo '#/usr/bin/env bash' > $out/bin/gtk-query-immodules-3.0
-        chmod +x $out/bin/*
-      '';
-    };
-  };
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: {
-        fcitx5-chinese-addons = prev.mkStubPackage { outPath = null; };
-        fcitx5-configtool = prev.mkStubPackage { outPath = null; };
-        fcitx5-qt = prev.mkStubPackage { outPath = null; };
-
-        fcitx5-with-addons = qt5prev.fcitx5-with-addons.override {
-          inherit (final) libsForQt5 qt6Packages;
-        };
-      });
-
-      qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: {
-        fcitx5-qt = prev.mkStubPackage { outPath = null; };
-      });
-
-    })
-  ];
-}
diff --git a/tests/modules/i18n/input-method/kime-configuration.nix b/tests/modules/i18n/input-method/kime-configuration.nix
index b79694608..52ec07cf9 100644
--- a/tests/modules/i18n/input-method/kime-configuration.nix
+++ b/tests/modules/i18n/input-method/kime-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 let
 
   kimeConfig = ''
diff --git a/tests/modules/misc/debug/default.nix b/tests/modules/misc/debug/default.nix
index 7eb286666..e7cde48a6 100644
--- a/tests/modules/misc/debug/default.nix
+++ b/tests/modules/misc/debug/default.nix
@@ -1,8 +1,8 @@
 {
-  debug = { pkgs, config, lib, ... }:
+  debug = { realPkgs, config, lib, ... }:
     lib.mkIf config.test.enableBig {
       home.enableDebugInfo = true;
-      home.packages = with pkgs; [ curl gdb ];
+      home.packages = with realPkgs; [ curl gdb ];
 
       nmt.script = ''
         [ -L $TESTED/home-path/lib/debug/curl ] \
diff --git a/tests/modules/misc/fontconfig/no-font-package.nix b/tests/modules/misc/fontconfig/no-font-package.nix
index c4c687a13..52b2a74d6 100644
--- a/tests/modules/misc/fontconfig/no-font-package.nix
+++ b/tests/modules/misc/fontconfig/no-font-package.nix
@@ -1,17 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    home.packages = [
-      # Look, no font!
-    ];
+  home.packages = [
+    # Look, no font!
+  ];
 
-    fonts.fontconfig.enable = true;
+  fonts.fontconfig.enable = true;
 
-    nmt.script = ''
-      assertPathNotExists home-path/lib/fontconfig/cache
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-path/lib/fontconfig/cache
+  '';
 }
diff --git a/tests/modules/misc/fontconfig/single-font-package.nix b/tests/modules/misc/fontconfig/single-font-package.nix
index b70bdf8a9..dcf62238b 100644
--- a/tests/modules/misc/fontconfig/single-font-package.nix
+++ b/tests/modules/misc/fontconfig/single-font-package.nix
@@ -1,15 +1,13 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, realPkgs, ... }:
 
-with lib;
+lib.mkIf config.test.enableBig {
+  home.packages = [ pkgs.comic-relief ];
 
-{
-  config = {
-    home.packages = [ pkgs.comic-relief ];
+  fonts.fontconfig.enable = true;
 
-    fonts.fontconfig.enable = true;
+  _module.args.pkgs = lib.mkForce realPkgs;
 
-    nmt.script = ''
-      assertDirectoryNotEmpty home-path/lib/fontconfig/cache
-    '';
-  };
+  nmt.script = ''
+    assertDirectoryNotEmpty home-path/lib/fontconfig/cache
+  '';
 }
diff --git a/tests/modules/misc/gtk/gtk2-basic-config.nix b/tests/modules/misc/gtk/gtk2-basic-config.nix
index 5671ac93e..684e852fb 100644
--- a/tests/modules/misc/gtk/gtk2-basic-config.nix
+++ b/tests/modules/misc/gtk/gtk2-basic-config.nix
@@ -1,25 +1,17 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    gtk = {
-      enable = true;
-      theme.name = "Adwaita";
-      gtk2.extraConfig = "gtk-can-change-accels = 1";
-    };
-
-    test.stubs.dconf = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.gtkrc-2.0
-
-      assertFileContent home-files/.gtkrc-2.0 \
-        ${./gtk2-basic-config-expected.conf}
-
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-          'GTK2_RC_FILES=.*/.gtkrc-2.0'
-    '';
+  gtk = {
+    enable = true;
+    theme.name = "Adwaita";
+    gtk2.extraConfig = "gtk-can-change-accels = 1";
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.gtkrc-2.0
+
+    assertFileContent home-files/.gtkrc-2.0 \
+      ${./gtk2-basic-config-expected.conf}
+
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+        'GTK2_RC_FILES=.*/.gtkrc-2.0'
+  '';
 }
diff --git a/tests/modules/misc/gtk/gtk2-config-file-location.nix b/tests/modules/misc/gtk/gtk2-config-file-location.nix
index a08998384..514ac7571 100644
--- a/tests/modules/misc/gtk/gtk2-config-file-location.nix
+++ b/tests/modules/misc/gtk/gtk2-config-file-location.nix
@@ -1,18 +1,12 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    gtk.enable = true;
-    gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+  gtk.enable = true;
+  gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 
-    test.stubs.dconf = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/gtk-2.0/gtkrc
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
-          'GTK2_RC_FILES=.*/\.config/gtk-2.0/gtkrc'
-    '';
-  };
+  nmt.script = ''
+    assertFileExists home-files/.config/gtk-2.0/gtkrc
+    assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
+        'GTK2_RC_FILES=.*/\.config/gtk-2.0/gtkrc'
+  '';
 }
diff --git a/tests/modules/misc/gtk/gtk3-basic-settings.nix b/tests/modules/misc/gtk/gtk3-basic-settings.nix
index 058dd85b2..d09c1e2ab 100644
--- a/tests/modules/misc/gtk/gtk3-basic-settings.nix
+++ b/tests/modules/misc/gtk/gtk3-basic-settings.nix
@@ -1,24 +1,16 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    gtk = {
-      enable = true;
-      gtk3.extraConfig = {
-        gtk-cursor-blink = false;
-        gtk-recent-files-limit = 20;
-      };
+  gtk = {
+    enable = true;
+    gtk3.extraConfig = {
+      gtk-cursor-blink = false;
+      gtk-recent-files-limit = 20;
     };
-
-    test.stubs.dconf = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/gtk-3.0/settings.ini
-
-      assertFileContent home-files/.config/gtk-3.0/settings.ini \
-        ${./gtk3-basic-settings-expected.ini}
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/gtk-3.0/settings.ini
+
+    assertFileContent home-files/.config/gtk-3.0/settings.ini \
+      ${./gtk3-basic-settings-expected.ini}
+  '';
 }
diff --git a/tests/modules/misc/manual/manual.nix b/tests/modules/misc/manual/manual.nix
index 1e79cdb7a..6ac6c0b53 100644
--- a/tests/modules/misc/manual/manual.nix
+++ b/tests/modules/misc/manual/manual.nix
@@ -1,22 +1,22 @@
-{ ... }:
+{ lib, realPkgs, ... }:
 
 {
-  config = {
-    manual = {
-      html.enable = true;
-      manpages.enable = true;
-      json.enable = true;
-    };
-
-    nmt.script = ''
-      assertFileExists home-path/share/doc/home-manager/index.xhtml
-      assertFileExists home-path/share/doc/home-manager/options.json
-      assertFileExists home-path/share/doc/home-manager/options.xhtml
-      assertFileExists home-path/share/doc/home-manager/nixos-options.xhtml
-      assertFileExists home-path/share/doc/home-manager/nix-darwin-options.xhtml
-      assertFileExists home-path/share/doc/home-manager/release-notes.xhtml
-      assertFileExists home-path/share/man/man1/home-manager.1
-      assertFileExists home-path/share/man/man5/home-configuration.nix.5
-    '';
+  manual = {
+    html.enable = true;
+    manpages.enable = true;
+    json.enable = true;
   };
+
+  _module.args.pkgs = lib.mkForce realPkgs;
+
+  nmt.script = ''
+    assertFileExists home-path/share/doc/home-manager/index.xhtml
+    assertFileExists home-path/share/doc/home-manager/options.json
+    assertFileExists home-path/share/doc/home-manager/options.xhtml
+    assertFileExists home-path/share/doc/home-manager/nixos-options.xhtml
+    assertFileExists home-path/share/doc/home-manager/nix-darwin-options.xhtml
+    assertFileExists home-path/share/doc/home-manager/release-notes.xhtml
+    assertFileExists home-path/share/man/man1/home-manager.1
+    assertFileExists home-path/share/man/man5/home-configuration.nix.5
+  '';
 }
diff --git a/tests/modules/misc/numlock/numlock.nix b/tests/modules/misc/numlock/numlock.nix
index 5616de1c5..a46a52f94 100644
--- a/tests/modules/misc/numlock/numlock.nix
+++ b/tests/modules/misc/numlock/numlock.nix
@@ -1,16 +1,8 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    xsession.numlock.enable = true;
+  xsession.numlock.enable = true;
 
-    test.stubs.numlockx = { };
-
-    nmt.script = ''
-      serviceFile=home-files/.config/systemd/user/numlockx.service
-      assertFileExists $serviceFile
-    '';
-  };
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/numlockx.service
+    assertFileExists $serviceFile
+  '';
 }
diff --git a/tests/modules/misc/qt/qt-platform-theme-gnome.nix b/tests/modules/misc/qt/qt-platform-theme-gnome.nix
index ca5829ee7..9feeee640 100644
--- a/tests/modules/misc/qt/qt-platform-theme-gnome.nix
+++ b/tests/modules/misc/qt/qt-platform-theme-gnome.nix
@@ -6,13 +6,6 @@
     style.name = "adwaita";
   };
 
-  test.stubs = {
-    qgnomeplatform = { };
-    qgnomeplatform-qt6 = { };
-    adwaita-qt = { };
-    adwaita-qt6 = { };
-  };
-
   nmt.script = ''
     assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
       'QT_QPA_PLATFORMTHEME="gnome"'
diff --git a/tests/modules/misc/qt/qt-platform-theme-gtk.nix b/tests/modules/misc/qt/qt-platform-theme-gtk.nix
index 22107016c..7b179c287 100644
--- a/tests/modules/misc/qt/qt-platform-theme-gtk.nix
+++ b/tests/modules/misc/qt/qt-platform-theme-gtk.nix
@@ -1,6 +1,6 @@
-{
-  imports = [ ../../i18n/input-method/fcitx5-stubs.nix ];
+{ config, ... }:
 
+{
   qt = {
     enable = true;
     platformTheme.name = "gtk";
@@ -11,11 +11,11 @@
   nixpkgs.overlays = [
     (final: prev: {
       libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: {
-        qtstyleplugins = prev.mkStubPackage { outPath = null; };
+        qtstyleplugins = config.lib.test.mkStubPackage { outPath = null; };
       });
 
       qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: {
-        qt6gtk2 = prev.mkStubPackage { outPath = null; };
+        qt6gtk2 = config.lib.test.mkStubPackage { outPath = null; };
       });
     })
   ];
diff --git a/tests/modules/misc/xdg/autostart.nix b/tests/modules/misc/xdg/autostart.nix
index b93580414..754d11396 100644
--- a/tests/modules/misc/xdg/autostart.nix
+++ b/tests/modules/misc/xdg/autostart.nix
@@ -1,20 +1,38 @@
-{ pkgs, ... }: {
-  config = {
-    xdg.autostart = {
-      enable = true;
-      entries = [
-        "${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop"
-        "${pkgs.tdesktop}/share/applications/org.telegram.desktop.desktop"
-      ];
-    };
+{ pkgs, ... }:
 
-    nmt.script = ''
-      assertFileExists home-files/.config/autostart/org.gnome.Evolution.desktop
-      assertFileContent home-files/.config/autostart/org.gnome.Evolution.desktop \
-        ${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop
-      assertFileExists home-files/.config/autostart/org.telegram.desktop.desktop
-      assertFileContent home-files/.config/autostart/org.telegram.desktop.desktop \
-        ${pkgs.tdesktop}/share/applications/org.telegram.desktop.desktop
-    '';
+{
+  xdg.autostart = {
+    enable = true;
+    entries = [
+      "${pkgs.test1}/share/applications/test1.desktop"
+      "${pkgs.test2}/share/applications/test2.desktop"
+    ];
   };
+
+  test.stubs = {
+    test1 = {
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/share/applications
+        echo test1 > $out/share/applications/test1.desktop
+      '';
+    };
+    test2 = {
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/share/applications
+        echo test2 > $out/share/applications/test2.desktop
+      '';
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/autostart/test1.desktop
+    assertFileContent home-files/.config/autostart/test1.desktop \
+      ${pkgs.test1}/share/applications/test1.desktop
+
+    assertFileExists home-files/.config/autostart/test2.desktop
+    assertFileContent home-files/.config/autostart/test2.desktop \
+      ${pkgs.test2}/share/applications/test2.desktop
+  '';
 }
diff --git a/tests/modules/misc/xdg/portal.nix b/tests/modules/misc/xdg/portal.nix
index e9ac8e381..48527b129 100644
--- a/tests/modules/misc/xdg/portal.nix
+++ b/tests/modules/misc/xdg/portal.nix
@@ -1,26 +1,28 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, realPkgs, ... }:
 
 lib.mkIf config.test.enableBig {
   xdg.portal = {
     enable = true;
     extraPortals =
-      [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-wlr ];
-    configPackages = [ pkgs.hyprland ];
+      [ realPkgs.xdg-desktop-portal-hyprland realPkgs.xdg-desktop-portal-wlr ];
+    configPackages = [ realPkgs.hyprland ];
     config = { sway.default = [ "wlr" "gtk" ]; };
   };
 
+  test.unstubs = [ (self: super: { inherit (realPkgs) xdg-desktop-portal; }) ];
+
   nmt.script = ''
     assertFileExists home-path/share/systemd/user/xdg-desktop-portal.service
     assertFileExists home-path/share/systemd/user/xdg-desktop-portal-wlr.service
     assertFileExists home-path/share/systemd/user/xdg-desktop-portal-hyprland.service
 
     assertFileContent home-path/share/xdg-desktop-portal/portals/hyprland.portal \
-      ${pkgs.xdg-desktop-portal-hyprland}/share/xdg-desktop-portal/portals/hyprland.portal
+      ${realPkgs.xdg-desktop-portal-hyprland}/share/xdg-desktop-portal/portals/hyprland.portal
     assertFileContent home-path/share/xdg-desktop-portal/portals/wlr.portal \
-      ${pkgs.xdg-desktop-portal-wlr}/share/xdg-desktop-portal/portals/wlr.portal
+      ${realPkgs.xdg-desktop-portal-wlr}/share/xdg-desktop-portal/portals/wlr.portal
 
     assertFileContent home-path/share/xdg-desktop-portal/hyprland-portals.conf \
-      ${pkgs.hyprland}/share/xdg-desktop-portal/hyprland-portals.conf
+      ${realPkgs.hyprland}/share/xdg-desktop-portal/hyprland-portals.conf
     assertFileContent home-files/.config/xdg-desktop-portal/sway-portals.conf \
       ${./sway-portals-expected.conf}
   '';
diff --git a/tests/modules/programs/abook/no-settings.nix b/tests/modules/programs/abook/no-settings.nix
index f8b096fb1..a8e5de78c 100644
--- a/tests/modules/programs/abook/no-settings.nix
+++ b/tests/modules/programs/abook/no-settings.nix
@@ -6,8 +6,6 @@ with lib;
   config = {
     programs.abook.enable = true;
 
-    test.stubs.abook = { };
-
     nmt.script = ''
       assertPathNotExists home-files/.config/abook/abookrc
     '';
diff --git a/tests/modules/programs/abook/with-settings.nix b/tests/modules/programs/abook/with-settings.nix
index e89ad7dad..22703a172 100644
--- a/tests/modules/programs/abook/with-settings.nix
+++ b/tests/modules/programs/abook/with-settings.nix
@@ -28,8 +28,6 @@ with lib;
       '';
     };
 
-    test.stubs.abook = { };
-
     nmt.script = ''
       assertFileExists home-files/.config/abook/abookrc
       assertFileContent home-files/.config/abook/abookrc ${./with-settings.cfg}
diff --git a/tests/modules/programs/aerc/assertion.nix b/tests/modules/programs/aerc/assertion.nix
index 9b37f0824..dfdbe3f7d 100644
--- a/tests/modules/programs/aerc/assertion.nix
+++ b/tests/modules/programs/aerc/assertion.nix
@@ -19,8 +19,6 @@ with lib;
       This option is safe; if `passwordCommand` is properly set, no credentials will be written to the nix store.
     ''];
 
-    test.stubs.aerc = { };
-
     programs.aerc = {
       enable = true;
       extraAccounts = {
diff --git a/tests/modules/programs/aerc/noSettings.nix b/tests/modules/programs/aerc/noSettings.nix
index c941c19b7..fc4cb2dbb 100644
--- a/tests/modules/programs/aerc/noSettings.nix
+++ b/tests/modules/programs/aerc/noSettings.nix
@@ -12,7 +12,5 @@ with lib;
       assertPathNotExists ${dir}/stylesets
     '';
     programs.aerc.enable = true;
-
-    test.stubs.aerc = { };
   };
 }
diff --git a/tests/modules/programs/aerc/settings.nix b/tests/modules/programs/aerc/settings.nix
index af4d16f70..8d59f1e6c 100644
--- a/tests/modules/programs/aerc/settings.nix
+++ b/tests/modules/programs/aerc/settings.nix
@@ -19,8 +19,6 @@ with lib;
       assertFileContent   ${dir}/stylesets/asLines ${./stylesets.expected}
     '';
 
-    test.stubs.aerc = { };
-
     programs.aerc = {
       enable = true;
 
diff --git a/tests/modules/programs/aerospace/aerospace.nix b/tests/modules/programs/aerospace/aerospace.nix
index db32c531b..9e06ad8f0 100644
--- a/tests/modules/programs/aerospace/aerospace.nix
+++ b/tests/modules/programs/aerospace/aerospace.nix
@@ -17,8 +17,6 @@
     };
   };
 
-  test.stubs.aerospace = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/aerospace/aerospace.toml ${
       ./settings-expected.toml
diff --git a/tests/modules/programs/alacritty/empty-settings.nix b/tests/modules/programs/alacritty/empty-settings.nix
index c587018e5..4aa010672 100644
--- a/tests/modules/programs/alacritty/empty-settings.nix
+++ b/tests/modules/programs/alacritty/empty-settings.nix
@@ -1,11 +1,7 @@
 {
-  config = {
-    programs.alacritty.enable = true;
+  programs.alacritty.enable = true;
 
-    test.stubs.alacritty = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/alacritty
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/alacritty
+  '';
 }
diff --git a/tests/modules/programs/alacritty/example-settings.nix b/tests/modules/programs/alacritty/example-settings.nix
index ccda3b2c5..fca3bf68d 100644
--- a/tests/modules/programs/alacritty/example-settings.nix
+++ b/tests/modules/programs/alacritty/example-settings.nix
@@ -1,31 +1,23 @@
-{ config, ... }:
-
 {
-  config = {
-    programs.alacritty = {
-      enable = true;
-      package = config.lib.test.mkStubPackage { };
-
-      settings = {
-        window.dimensions = {
-          lines = 3;
-          columns = 200;
-        };
-
-        keyboard.bindings = [{
-          key = "K";
-          mods = "Control";
-          chars = "\\u000c";
-        }];
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window.dimensions = {
+        lines = 3;
+        columns = 200;
       };
+
+      keyboard.bindings = [{
+        key = "K";
+        mods = "Control";
+        chars = "\\u000c";
+      }];
     };
-
-    test.stubs = { alacritty = { }; };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/alacritty/alacritty.toml \
-        ${./example-settings-expected.toml}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/alacritty/alacritty.toml \
+      ${./example-settings-expected.toml}
+  '';
 }
diff --git a/tests/modules/programs/alacritty/settings-merging.nix b/tests/modules/programs/alacritty/settings-merging.nix
index 1d47b77a6..e86bf5e42 100644
--- a/tests/modules/programs/alacritty/settings-merging.nix
+++ b/tests/modules/programs/alacritty/settings-merging.nix
@@ -1,39 +1,33 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
-  config = {
-    programs.alacritty = {
-      enable = true;
-      package = config.lib.test.mkStubPackage { };
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window.dimensions = {
+        lines = 3;
+        columns = 200;
+      };
 
-      settings = {
-        window.dimensions = {
-          lines = 3;
-          columns = 200;
-        };
+      keyboard.bindings = [{
+        key = "K";
+        mods = "Control";
+        chars = "\\u000c";
+      }];
 
-        keyboard.bindings = [{
-          key = "K";
-          mods = "Control";
-          chars = "\\u000c";
-        }];
-
-        font = let
-          defaultFont =
-            lib.mkMerge [ (lib.mkIf true "SFMono") (lib.mkIf false "Iosevka") ];
-        in {
-          normal.family = defaultFont;
-          bold.family = defaultFont;
-        };
+      font = let
+        defaultFont =
+          lib.mkMerge [ (lib.mkIf true "SFMono") (lib.mkIf false "Iosevka") ];
+      in {
+        normal.family = defaultFont;
+        bold.family = defaultFont;
       };
     };
-
-    test.stubs = { alacritty = { }; };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/alacritty/alacritty.toml \
-        ${./settings-toml-expected.toml}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/alacritty/alacritty.toml \
+      ${./settings-toml-expected.toml}
+  '';
 }
diff --git a/tests/modules/programs/alacritty/toml-config.nix b/tests/modules/programs/alacritty/toml-config.nix
index 8235d44c2..b065fa302 100644
--- a/tests/modules/programs/alacritty/toml-config.nix
+++ b/tests/modules/programs/alacritty/toml-config.nix
@@ -1,36 +1,28 @@
-{ config, ... }:
-
 {
-  config = {
-    programs.alacritty = {
-      enable = true;
-      package = config.lib.test.mkStubPackage { };
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window.dimensions = {
+        lines = 3;
+        columns = 200;
+      };
 
-      settings = {
-        window.dimensions = {
-          lines = 3;
-          columns = 200;
-        };
+      keyboard.bindings = [{
+        key = "K";
+        mods = "Control";
+        chars = "\\u000c";
+      }];
 
-        keyboard.bindings = [{
-          key = "K";
-          mods = "Control";
-          chars = "\\u000c";
-        }];
-
-        font = {
-          normal.family = "SFMono";
-          bold.family = "SFMono";
-        };
+      font = {
+        normal.family = "SFMono";
+        bold.family = "SFMono";
       };
     };
-
-    test.stubs = { alacritty = { }; };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/alacritty/alacritty.toml \
-        ${./settings-toml-expected.toml}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/alacritty/alacritty.toml \
+      ${./settings-toml-expected.toml}
+  '';
 }
diff --git a/tests/modules/programs/alot/alot.nix b/tests/modules/programs/alot/alot.nix
index 6316fbd76..279b99144 100644
--- a/tests/modules/programs/alot/alot.nix
+++ b/tests/modules/programs/alot/alot.nix
@@ -1,34 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        alot = {
-          contactCompletion = { };
-          extraConfig = ''
-            auto_remove_unread = True
-            ask_subject = False
-            handle_mouse = True
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      alot = {
+        contactCompletion = { };
+        extraConfig = ''
+          auto_remove_unread = True
+          ask_subject = False
+          handle_mouse = True
+        '';
       };
+      imap.port = 993;
     };
-
-    programs.alot = { enable = true; };
-
-    test.stubs.alot = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/alot/config
-      assertFileContent home-files/.config/alot/config ${./alot-expected.conf}
-    '';
   };
+
+  programs.alot = { enable = true; };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/alot/config
+    assertFileContent home-files/.config/alot/config ${./alot-expected.conf}
+  '';
 }
 
diff --git a/tests/modules/programs/antidote/antidote.nix b/tests/modules/programs/antidote/antidote.nix
index 3d8fff6a9..ec697e02c 100644
--- a/tests/modules/programs/antidote/antidote.nix
+++ b/tests/modules/programs/antidote/antidote.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 let relToDotDirCustom = ".zshplugins";
 in {
   programs.zsh = {
@@ -12,11 +10,6 @@ in {
     };
   };
 
-  test.stubs = {
-    antidote = { };
-    zsh = { };
-  };
-
   nmt.script = ''
     assertFileContains home-files/${relToDotDirCustom}/.zshrc \
       'source @antidote@/share/antidote/antidote.zsh'
diff --git a/tests/modules/programs/aria2/settings.nix b/tests/modules/programs/aria2/settings.nix
index 346de9679..a0ba02a3f 100644
--- a/tests/modules/programs/aria2/settings.nix
+++ b/tests/modules/programs/aria2/settings.nix
@@ -1,40 +1,32 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.aria2 = {
-      enable = true;
+  programs.aria2 = {
+    enable = true;
 
-      settings = {
-        listen-port = 60000;
-        dht-listen-port = 60000;
-        seed-ratio = 1.0;
-        max-upload-limit = "50K";
-        ftp-pasv = true;
-      };
-
-      extraConfig = ''
-        # Extra aria2 configuration.
-      '';
+    settings = {
+      listen-port = 60000;
+      dht-listen-port = 60000;
+      seed-ratio = 1.0;
+      max-upload-limit = "50K";
+      ftp-pasv = true;
     };
 
-    test.stubs.aria2 = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/aria2/aria2.conf \
-        ${
-          pkgs.writeText "aria2-expected-config.conf" ''
-            dht-listen-port=60000
-            ftp-pasv=true
-            listen-port=60000
-            max-upload-limit=50K
-            seed-ratio=1.000000
-            # Extra aria2 configuration.
-          ''
-        }
+    extraConfig = ''
+      # Extra aria2 configuration.
     '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/aria2/aria2.conf \
+      ${
+        builtins.toFile "aria2-expected-config.conf" ''
+          dht-listen-port=60000
+          ftp-pasv=true
+          listen-port=60000
+          max-upload-limit=50K
+          seed-ratio=1.000000
+          # Extra aria2 configuration.
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/atuin/bash.nix b/tests/modules/programs/atuin/bash.nix
index 21d306b2f..5176a79ba 100644
--- a/tests/modules/programs/atuin/bash.nix
+++ b/tests/modules/programs/atuin/bash.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     atuin.enable = true;
@@ -9,11 +7,6 @@
     };
   };
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/atuin/empty-settings.nix b/tests/modules/programs/atuin/empty-settings.nix
index be6b55986..b10fa4891 100644
--- a/tests/modules/programs/atuin/empty-settings.nix
+++ b/tests/modules/programs/atuin/empty-settings.nix
@@ -1,13 +1,6 @@
-{ ... }:
-
 {
   programs.atuin.enable = true;
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/atuin/config.toml
   '';
diff --git a/tests/modules/programs/atuin/example-settings.nix b/tests/modules/programs/atuin/example-settings.nix
index 98aca707d..dab1b9e3a 100644
--- a/tests/modules/programs/atuin/example-settings.nix
+++ b/tests/modules/programs/atuin/example-settings.nix
@@ -12,11 +12,6 @@
     };
   };
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/atuin/config.toml \
diff --git a/tests/modules/programs/atuin/fish.nix b/tests/modules/programs/atuin/fish.nix
index 49d9a2821..f67c9cfa1 100644
--- a/tests/modules/programs/atuin/fish.nix
+++ b/tests/modules/programs/atuin/fish.nix
@@ -10,11 +10,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
diff --git a/tests/modules/programs/atuin/no-shell.nix b/tests/modules/programs/atuin/no-shell.nix
index c6481e427..6cab60e27 100644
--- a/tests/modules/programs/atuin/no-shell.nix
+++ b/tests/modules/programs/atuin/no-shell.nix
@@ -17,11 +17,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileNotRegex home-files/.zshrc 'atuin init zsh'
     assertFileNotRegex home-files/.bashrc 'atuin init bash'
diff --git a/tests/modules/programs/atuin/set-flags.nix b/tests/modules/programs/atuin/set-flags.nix
index ebc68a5d1..14c719708 100644
--- a/tests/modules/programs/atuin/set-flags.nix
+++ b/tests/modules/programs/atuin/set-flags.nix
@@ -16,11 +16,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/atuin/zsh.nix b/tests/modules/programs/atuin/zsh.nix
index 2cb4fefef..b83f9258c 100644
--- a/tests/modules/programs/atuin/zsh.nix
+++ b/tests/modules/programs/atuin/zsh.nix
@@ -1,16 +1,9 @@
-{ ... }:
-
 {
   programs = {
     atuin.enable = true;
     zsh.enable = true;
   };
 
-  test.stubs = {
-    atuin = { name = "atuin"; };
-    bash-preexec = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileContains \
diff --git a/tests/modules/programs/autojump/default-settings.nix b/tests/modules/programs/autojump/default-settings.nix
index e7d40bb37..a886a029c 100644
--- a/tests/modules/programs/autojump/default-settings.nix
+++ b/tests/modules/programs/autojump/default-settings.nix
@@ -1,18 +1,12 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.autojump.enable = true;
+  programs.autojump.enable = true;
 
-    test.stubs.autojump = {
-      buildScript = "mkdir -p $out/bin; touch $out/bin/autojump";
-      outPath = null;
-    };
-
-    nmt.script = ''
-      assertFileExists home-path/bin/autojump
-    '';
+  test.stubs.autojump = {
+    buildScript = "mkdir -p $out/bin; touch $out/bin/autojump";
+    outPath = null;
   };
+
+  nmt.script = ''
+    assertFileExists home-path/bin/autojump
+  '';
 }
diff --git a/tests/modules/programs/autorandr/basic-configuration.nix b/tests/modules/programs/autorandr/basic-configuration.nix
index d0f14ec86..3a2e74202 100644
--- a/tests/modules/programs/autorandr/basic-configuration.nix
+++ b/tests/modules/programs/autorandr/basic-configuration.nix
@@ -1,66 +1,60 @@
-{ config, pkgs, ... }:
-
 {
-  config = {
-    programs.autorandr = {
-      enable = true;
-      profiles = {
-        default = {
-          fingerprint = {
-            DP1 = "XXX";
-            DP2 = "YYY";
-          };
-          config = {
-            DP1.enable = false;
-            DP2 = {
-              crtc = 0;
-              primary = true;
-              position = "0x0";
-              mode = "1920x1080";
-              filter = "nearest";
-              transform = [
-                [ 0.6 0.0 0.0 ] # a b c
-                [ 0.0 0.6 0.0 ] # d e f
-                [ 0.0 0.0 1.0 ] # g h i
-              ];
-              extraConfig = ''
-                key1 value1
-                key2 value2
-              '';
-            };
+  programs.autorandr = {
+    enable = true;
+    profiles = {
+      default = {
+        fingerprint = {
+          DP1 = "XXX";
+          DP2 = "YYY";
+        };
+        config = {
+          DP1.enable = false;
+          DP2 = {
+            crtc = 0;
+            primary = true;
+            position = "0x0";
+            mode = "1920x1080";
+            filter = "nearest";
+            transform = [
+              [ 0.6 0.0 0.0 ] # a b c
+              [ 0.0 0.6 0.0 ] # d e f
+              [ 0.0 0.0 1.0 ] # g h i
+            ];
+            extraConfig = ''
+              key1 value1
+              key2 value2
+            '';
           };
         };
       };
     };
-
-    test.stubs.autorandr = { };
-
-    nmt.script = ''
-      config=home-files/.config/autorandr/default/config
-      setup=home-files/.config/autorandr/default/setup
-
-      assertFileExists $setup
-      assertFileRegex $setup 'DP1 XXX'
-      assertFileRegex $setup 'DP2 YYY'
-
-      assertFileExists $config
-      assertFileContent $config \
-          ${
-            pkgs.writeText "basic-configuration.conf" ''
-              output DP1
-              off
-
-              output DP2
-              pos 0x0
-              crtc 0
-              primary
-              mode 1920x1080
-              filter nearest
-              transform 0.600000,0.000000,0.000000,0.000000,0.600000,0.000000,0.000000,0.000000,1.000000
-              key1 value1
-              key2 value2
-            ''
-          }
-    '';
   };
+
+  nmt.script = ''
+    config=home-files/.config/autorandr/default/config
+    setup=home-files/.config/autorandr/default/setup
+
+    assertFileExists $setup
+    assertFileRegex $setup 'DP1 XXX'
+    assertFileRegex $setup 'DP2 YYY'
+
+    assertFileExists $config
+    assertFileContent $config \
+        ${
+          builtins.toFile "basic-configuration.conf" ''
+            output DP1
+            off
+
+            output DP2
+            pos 0x0
+            crtc 0
+            primary
+            mode 1920x1080
+            filter nearest
+            transform 0.600000,0.000000,0.000000,0.000000,0.600000,0.000000,0.000000,0.000000,1.000000
+            key1 value1
+            key2 value2
+          ''
+        }
+  '';
 }
diff --git a/tests/modules/programs/autorandr/scale.nix b/tests/modules/programs/autorandr/scale.nix
index 095778a43..0fd55ae76 100644
--- a/tests/modules/programs/autorandr/scale.nix
+++ b/tests/modules/programs/autorandr/scale.nix
@@ -1,34 +1,28 @@
-{ config, pkgs, ... }:
-
 {
-  config = {
-    programs.autorandr = {
-      enable = true;
-      profiles = {
-        default = {
-          fingerprint.DP1 = "XXX";
-          config.DP1 = {
-            scale = {
-              x = 2;
-              y = 4;
-            };
+  programs.autorandr = {
+    enable = true;
+    profiles = {
+      default = {
+        fingerprint.DP1 = "XXX";
+        config.DP1 = {
+          scale = {
+            x = 2;
+            y = 4;
           };
         };
       };
     };
-
-    test.stubs.autorandr = { };
-
-    nmt.script = ''
-      config=home-files/.config/autorandr/default/config
-
-      assertFileExists $config
-      assertFileContent $config \
-          ${
-            pkgs.writeText "scale-expected.conf" ''
-              output DP1
-              scale 2x4''
-          }
-    '';
   };
+
+  nmt.script = ''
+    config=home-files/.config/autorandr/default/config
+
+    assertFileExists $config
+    assertFileContent $config \
+        ${
+          builtins.toFile "scale-expected.conf" ''
+            output DP1
+            scale 2x4''
+        }
+  '';
 }
diff --git a/tests/modules/programs/awscli/awscli.nix b/tests/modules/programs/awscli/awscli.nix
index 0a96990ad..abcfc8a25 100644
--- a/tests/modules/programs/awscli/awscli.nix
+++ b/tests/modules/programs/awscli/awscli.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     awscli = {
@@ -14,8 +12,6 @@
     };
   };
 
-  test.stubs.awscli2 = { };
-
   nmt.script = ''
     assertFileExists home-files/.aws/config
     assertFileContent home-files/.aws/config \
diff --git a/tests/modules/programs/bacon/bacon.nix b/tests/modules/programs/bacon/bacon.nix
index 6df88456d..712c6da3b 100644
--- a/tests/modules/programs/bacon/bacon.nix
+++ b/tests/modules/programs/bacon/bacon.nix
@@ -21,7 +21,7 @@ in {
       };
     };
   };
-  test.stubs.bacon = { };
+
   nmt.script = ''
     assertFileExists 'home-files/${configDir}/prefs.toml'
     assertFileContent 'home-files/${configDir}/prefs.toml' ${./expected.toml}
diff --git a/tests/modules/programs/bacon/empty-config.nix b/tests/modules/programs/bacon/empty-config.nix
index 51ceb94e5..def614d39 100644
--- a/tests/modules/programs/bacon/empty-config.nix
+++ b/tests/modules/programs/bacon/empty-config.nix
@@ -7,8 +7,6 @@ let
 in {
   programs.bacon.enable = true;
 
-  test.stubs.bacon = { };
-
   nmt.script = ''
     assertPathNotExists 'home-files/${configDir}/prefs.toml'
   '';
diff --git a/tests/modules/programs/bash/completion.nix b/tests/modules/programs/bash/completion.nix
index 2e5e69dd1..744da3d7a 100644
--- a/tests/modules/programs/bash/completion.nix
+++ b/tests/modules/programs/bash/completion.nix
@@ -1,12 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   programs.bash.enable = true;
 
-  test.stubs.bash-completion = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
 
diff --git a/tests/modules/programs/bash/logout.nix b/tests/modules/programs/bash/logout.nix
index c366c520e..5fb78a94f 100644
--- a/tests/modules/programs/bash/logout.nix
+++ b/tests/modules/programs/bash/logout.nix
@@ -1,27 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.bash = {
-      enable = true;
-      enableCompletion = false;
+  programs.bash = {
+    enable = true;
+    enableCompletion = false;
 
-      logoutExtra = ''
-        clear-console
-      '';
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.bash_logout
-      assertFileContent \
-        home-files/.bash_logout \
-        ${
-          builtins.toFile "logout-expected" ''
-            clear-console
-          ''
-        }
+    logoutExtra = ''
+      clear-console
     '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.bash_logout
+    assertFileContent \
+      home-files/.bash_logout \
+      ${
+        builtins.toFile "logout-expected" ''
+          clear-console
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/bash/session-variables.nix b/tests/modules/programs/bash/session-variables.nix
index bbf2b71ab..01d204b77 100644
--- a/tests/modules/programs/bash/session-variables.nix
+++ b/tests/modules/programs/bash/session-variables.nix
@@ -1,33 +1,29 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.bash = {
-      enable = true;
-      enableCompletion = false;
+  programs.bash = {
+    enable = true;
+    enableCompletion = false;
 
-      sessionVariables = {
-        V1 = "v1";
-        V2 = "v2-${config.programs.bash.sessionVariables.V1}";
-      };
+    sessionVariables = {
+      V1 = "v1";
+      V2 = "v2-${config.programs.bash.sessionVariables.V1}";
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.profile
-      assertFileContent \
-        home-files/.profile \
-        ${
-          builtins.toFile "session-variables-expected" ''
-            . "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh"
-
-            export V1="v1"
-            export V2="v2-v1"
-
-
-          ''
-        }
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.profile
+    assertFileContent \
+      home-files/.profile \
+      ${
+        builtins.toFile "session-variables-expected" ''
+          . "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh"
+
+          export V1="v1"
+          export V2="v2-v1"
+
+
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/bat/bat.nix b/tests/modules/programs/bat/bat.nix
index 578310486..bc07489ca 100644
--- a/tests/modules/programs/bat/bat.nix
+++ b/tests/modules/programs/bat/bat.nix
@@ -1,58 +1,50 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.bat = {
-      enable = true;
+  programs.bat = {
+    enable = true;
 
-      config = {
-        theme = "TwoDark";
-        pager = "less -FR";
-        map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
-        show-all = true;
+    config = {
+      theme = "TwoDark";
+      pager = "less -FR";
+      map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
+      show-all = true;
 
-        # False boolean options should not appear in the config
-        lessopen = false;
-      };
-
-      themes.testtheme.src = pkgs.writeText "testtheme.tmTheme" ''
-        This is a test theme.
-      '';
-
-      syntaxes.testsyntax.src = pkgs.writeText "testsyntax.sublime-syntax" ''
-        This is a test syntax.
-      '';
+      # False boolean options should not appear in the config
+      lessopen = false;
     };
 
-    test.stubs.bat = { };
+    themes.testtheme.src = builtins.toFile "testtheme.tmTheme" ''
+      This is a test theme.
+    '';
 
-    nmt.script = ''
-      assertFileExists home-files/.config/bat/config
-      assertFileContent home-files/.config/bat/config ${
-        pkgs.writeText "bat.expected" ''
-          --map-syntax='*.jenkinsfile:Groovy'
-          --map-syntax='*.props:Java Properties'
-          --pager='less -FR'
-          --theme=TwoDark
-          --show-all
-        ''
-      }
-
-      assertFileExists home-files/.config/bat/themes/testtheme.tmTheme
-      assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${
-        pkgs.writeText "bat.expected" ''
-          This is a test theme.
-        ''
-      }
-
-      assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax
-      assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${
-        pkgs.writeText "bat.expected" ''
-          This is a test syntax.
-        ''
-      }
+    syntaxes.testsyntax.src = builtins.toFile "testsyntax.sublime-syntax" ''
+      This is a test syntax.
     '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/bat/config
+    assertFileContent home-files/.config/bat/config ${
+      builtins.toFile "bat.expected" ''
+        --map-syntax='*.jenkinsfile:Groovy'
+        --map-syntax='*.props:Java Properties'
+        --pager='less -FR'
+        --theme=TwoDark
+        --show-all
+      ''
+    }
+
+    assertFileExists home-files/.config/bat/themes/testtheme.tmTheme
+    assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${
+      builtins.toFile "bat.expected" ''
+        This is a test theme.
+      ''
+    }
+
+    assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax
+    assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${
+      builtins.toFile "bat.expected" ''
+        This is a test syntax.
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/bat/deprecated-options.nix b/tests/modules/programs/bat/deprecated-options.nix
index 096815cbe..b00333d82 100644
--- a/tests/modules/programs/bat/deprecated-options.nix
+++ b/tests/modules/programs/bat/deprecated-options.nix
@@ -1,67 +1,59 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.bat = {
-      enable = true;
+  programs.bat = {
+    enable = true;
 
-      config = {
-        theme = "TwoDark";
-        pager = "less -FR";
-        map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
-      };
-
-      themes.testtheme = ''
-        This is a test theme.
-      '';
-
-      syntaxes.testsyntax = ''
-        This is a test syntax.
-      '';
+    config = {
+      theme = "TwoDark";
+      pager = "less -FR";
+      map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
     };
 
-    test.stubs.bat = { };
+    themes.testtheme = ''
+      This is a test theme.
+    '';
 
-    test.asserts.warnings.enable = true;
-    test.asserts.warnings.expected = [
-      ''
-        Using programs.bat.themes as a string option is deprecated and will be
-        removed in the future. Please change to using it as an attribute set
-        instead.
-      ''
-      ''
-        Using programs.bat.syntaxes as a string option is deprecated and will be
-        removed in the future. Please change to using it as an attribute set
-        instead.
-      ''
-    ];
-
-    nmt.script = ''
-      assertFileExists home-files/.config/bat/config
-      assertFileContent home-files/.config/bat/config ${
-        pkgs.writeText "bat.expected" ''
-          --map-syntax='*.jenkinsfile:Groovy'
-          --map-syntax='*.props:Java Properties'
-          --pager='less -FR'
-          --theme=TwoDark
-        ''
-      }
-
-      assertFileExists home-files/.config/bat/themes/testtheme.tmTheme
-      assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${
-        pkgs.writeText "bat.expected" ''
-          This is a test theme.
-        ''
-      }
-
-      assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax
-      assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${
-        pkgs.writeText "bat.expected" ''
-          This is a test syntax.
-        ''
-      }
+    syntaxes.testsyntax = ''
+      This is a test syntax.
     '';
   };
+
+  test.asserts.warnings.enable = true;
+  test.asserts.warnings.expected = [
+    ''
+      Using programs.bat.themes as a string option is deprecated and will be
+      removed in the future. Please change to using it as an attribute set
+      instead.
+    ''
+    ''
+      Using programs.bat.syntaxes as a string option is deprecated and will be
+      removed in the future. Please change to using it as an attribute set
+      instead.
+    ''
+  ];
+
+  nmt.script = ''
+    assertFileExists home-files/.config/bat/config
+    assertFileContent home-files/.config/bat/config ${
+      builtins.toFile "bat.expected" ''
+        --map-syntax='*.jenkinsfile:Groovy'
+        --map-syntax='*.props:Java Properties'
+        --pager='less -FR'
+        --theme=TwoDark
+      ''
+    }
+
+    assertFileExists home-files/.config/bat/themes/testtheme.tmTheme
+    assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${
+      builtins.toFile "bat.expected" ''
+        This is a test theme.
+      ''
+    }
+
+    assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax
+    assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${
+      builtins.toFile "bat.expected" ''
+        This is a test syntax.
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/beets/mpdstats.nix b/tests/modules/programs/beets/mpdstats.nix
index d825f85bd..e3291a174 100644
--- a/tests/modules/programs/beets/mpdstats.nix
+++ b/tests/modules/programs/beets/mpdstats.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   home.stateVersion = "23.05";
 
@@ -14,11 +12,6 @@
     mpdIntegration.enableStats = true;
   };
 
-  test.stubs = {
-    beets = { };
-    mpd = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.config/beets/config.yaml
     assertFileContent \
diff --git a/tests/modules/programs/beets/mpdupdate.nix b/tests/modules/programs/beets/mpdupdate.nix
index b73da81e8..eba8800c0 100644
--- a/tests/modules/programs/beets/mpdupdate.nix
+++ b/tests/modules/programs/beets/mpdupdate.nix
@@ -1,11 +1,8 @@
-{ config, ... }:
-
 {
   home.stateVersion = "23.05";
 
   programs.beets = {
     enable = true;
-    package = config.lib.test.mkStubPackage { outPath = "@beets@"; };
     mpdIntegration.enableUpdate = true;
   };
 
diff --git a/tests/modules/programs/bemenu/basic-configuration.nix b/tests/modules/programs/bemenu/basic-configuration.nix
index 01708d202..cf556ef6a 100644
--- a/tests/modules/programs/bemenu/basic-configuration.nix
+++ b/tests/modules/programs/bemenu/basic-configuration.nix
@@ -19,8 +19,6 @@
     };
   };
 
-  test.stubs.bemenu = { };
-
   nmt.script = ''
     assertFileExists home-path/etc/profile.d/hm-session-vars.sh
     assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
diff --git a/tests/modules/programs/bemenu/empty-configuration.nix b/tests/modules/programs/bemenu/empty-configuration.nix
index d9e729696..a07dfc436 100644
--- a/tests/modules/programs/bemenu/empty-configuration.nix
+++ b/tests/modules/programs/bemenu/empty-configuration.nix
@@ -1,7 +1,5 @@
 {
-  programs.bemenu = { enable = true; };
-
-  test.stubs.bemenu = { };
+  programs.bemenu.enable = true;
 
   nmt.script = ''
     assertFileExists home-path/etc/profile.d/hm-session-vars.sh
diff --git a/tests/modules/programs/borgmatic/basic-configuration.nix b/tests/modules/programs/borgmatic/basic-configuration.nix
index 15a57ca78..21333baf4 100644
--- a/tests/modules/programs/borgmatic/basic-configuration.nix
+++ b/tests/modules/programs/borgmatic/basic-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, realPkgs, ... }:
 
 let
 
@@ -61,8 +61,6 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   nmt.script = ''
     config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml
     assertFileExists $config_file
@@ -120,7 +118,7 @@ in {
       builtins.elemAt backups.main.hooks.extraConfig.before_actions 0
     }"
 
-    yq=${pkgs.yq-go}/bin/yq
+    yq=${realPkgs.yq-go}/bin/yq
 
     for filter in "''${!expectations[@]}"; do
       expected_value="''${expectations[$filter]}"
diff --git a/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix b/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix
index 106a0c18c..9d9ee3232 100644
--- a/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix
+++ b/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix
@@ -1,10 +1,4 @@
-{ config, pkgs, ... }:
-
-let
-
-  backups = config.programs.borgmatic.backups;
-
-in {
+{
   programs.borgmatic = {
     enable = true;
     backups = {
@@ -18,8 +12,6 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   test.asserts.assertions.expected = [''
     Borgmatic backup configuration "main" cannot specify both 'location.sourceDirectories' and 'location.patterns'.
   ''];
diff --git a/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix b/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix
index cadd7fd23..e04d05157 100644
--- a/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix
+++ b/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix
@@ -1,11 +1,6 @@
-{ config, pkgs, ... }:
+{ realPkgs, ... }:
 
-let
-
-  backups = config.programs.borgmatic.backups;
-  excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar";
-
-in {
+{
   programs.borgmatic = {
     enable = true;
     backups = {
@@ -19,13 +14,11 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   nmt.script = ''
     config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml
     assertFileExists $config_file
 
-    yq=${pkgs.yq-go}/bin/yq
+    yq=${realPkgs.yq-go}/bin/yq
 
     hmExclusionsFile=$($yq '.exclude_from[0]' $config_file)
     expected_content='/home/hm-user/.config/borgmatic.d/main.yaml'
diff --git a/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix b/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix
index bc0e50129..056b1443f 100644
--- a/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix
+++ b/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix
@@ -1,8 +1,7 @@
-{ config, pkgs, ... }:
+{ realPkgs, ... }:
 
 let
 
-  backups = config.programs.borgmatic.backups;
   excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar";
 
 in {
@@ -20,8 +19,6 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   nmt.script = ''
     config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml
     assertFileExists $config_file
@@ -30,7 +27,7 @@ in {
 
     expectations[exclude_from[0]]="${excludeFile}"
 
-    yq=${pkgs.yq-go}/bin/yq
+    yq=${realPkgs.yq-go}/bin/yq
 
     for filter in "''${!expectations[@]}"; do
       expected_value="''${expectations[$filter]}"
diff --git a/tests/modules/programs/borgmatic/include-hm-symlinks.nix b/tests/modules/programs/borgmatic/include-hm-symlinks.nix
index dd9908b56..b89f7e2b9 100644
--- a/tests/modules/programs/borgmatic/include-hm-symlinks.nix
+++ b/tests/modules/programs/borgmatic/include-hm-symlinks.nix
@@ -1,8 +1,7 @@
-{ config, pkgs, ... }:
+{ realPkgs, ... }:
 
 let
 
-  backups = config.programs.borgmatic.backups;
   excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar";
 
 in {
@@ -20,8 +19,6 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   nmt.script = ''
     config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml
     assertFileExists $config_file
@@ -30,7 +27,7 @@ in {
 
     expectations[exclude_from[0]]="${excludeFile}"
 
-    yq=${pkgs.yq-go}/bin/yq
+    yq=${realPkgs.yq-go}/bin/yq
 
     for filter in "''${!expectations[@]}"; do
       expected_value="''${expectations[$filter]}"
diff --git a/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix b/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix
index 596fdf1cd..bf0653329 100644
--- a/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix
+++ b/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix
@@ -1,17 +1,9 @@
-{ config, pkgs, ... }:
-
-let
-
-  backups = config.programs.borgmatic.backups;
-
-in {
+{
   programs.borgmatic = {
     enable = true;
     backups = { main = { location = { repositories = [ "/mnt/disk1" ]; }; }; };
   };
 
-  test.stubs.borgmatic = { };
-
   test.asserts.assertions.expected = [''
     Borgmatic backup configuration "main" must specify one of 'location.sourceDirectories' or 'location.patterns'.
   ''];
diff --git a/tests/modules/programs/borgmatic/patterns-configuration.nix b/tests/modules/programs/borgmatic/patterns-configuration.nix
index 098708cad..d92237d43 100644
--- a/tests/modules/programs/borgmatic/patterns-configuration.nix
+++ b/tests/modules/programs/borgmatic/patterns-configuration.nix
@@ -1,8 +1,7 @@
-{ config, pkgs, ... }:
+{ config, realPkgs, ... }:
 
 let
 
-  boolToString = bool: if bool then "true" else "false";
   backups = config.programs.borgmatic.backups;
 
 in {
@@ -23,8 +22,6 @@ in {
     };
   };
 
-  test.stubs.borgmatic = { };
-
   nmt.script = ''
     config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml
     assertFileExists $config_file
@@ -44,7 +41,7 @@ in {
       builtins.elemAt backups.main.location.patterns 3
     }"
 
-    yq=${pkgs.yq-go}/bin/yq
+    yq=${realPkgs.yq-go}/bin/yq
 
     for filter in "''${!expectations[@]}"; do
       expected_value="''${expectations[$filter]}"
diff --git a/tests/modules/programs/boxxy/empty-settings.nix b/tests/modules/programs/boxxy/empty-settings.nix
index 3a34cd5cd..133d670f5 100644
--- a/tests/modules/programs/boxxy/empty-settings.nix
+++ b/tests/modules/programs/boxxy/empty-settings.nix
@@ -6,8 +6,6 @@ with lib;
   config = {
     programs.boxxy.enable = true;
 
-    test.stubs.boxxy = { };
-
     nmt.script = ''
       assertPathNotExists home-files/.config/boxxy
     '';
diff --git a/tests/modules/programs/boxxy/example-settings.nix b/tests/modules/programs/boxxy/example-settings.nix
index 7ecec4167..6f10a56c3 100644
--- a/tests/modules/programs/boxxy/example-settings.nix
+++ b/tests/modules/programs/boxxy/example-settings.nix
@@ -15,8 +15,6 @@ with lib;
       context = [ "/home/test_user/your_project_repo" ];
     }];
 
-    test.stubs.boxxy = { };
-
     nmt.script = ''
       boxxyyaml=home-files/.config/boxxy/boxxy.yaml
       assertFileExists $boxxyyaml
diff --git a/tests/modules/programs/broot/broot.nix b/tests/modules/programs/broot/broot.nix
index 8bb7c02c4..f4061b692 100644
--- a/tests/modules/programs/broot/broot.nix
+++ b/tests/modules/programs/broot/broot.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ realPkgs, ... }:
 
 {
   programs.broot = {
@@ -6,10 +6,7 @@
     settings.modal = true;
   };
 
-  tests.stubs = {
-    broot = { };
-    hjson = { };
-  };
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson; }) ];
 
   nmt.script = ''
     assertFileExists home-files/.config/broot/conf.toml
diff --git a/tests/modules/programs/browserpass/browserpass.nix b/tests/modules/programs/browserpass/browserpass.nix
index 7211c0ed8..14d50af06 100644
--- a/tests/modules/programs/browserpass/browserpass.nix
+++ b/tests/modules/programs/browserpass/browserpass.nix
@@ -1,35 +1,32 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ realPkgs, ... }:
 
 {
-  config = {
-    programs.browserpass = {
-      enable = true;
-      browsers =
-        [ "brave" "chrome" "chromium" "firefox" "librewolf" "vivaldi" ];
-    };
-
-    nmt.script = if pkgs.stdenv.hostPlatform.isDarwin then ''
-      for dir in "BraveSoftware/Brave-Browser" "Google/Chrome" "Chromium" "Mozilla" "LibreWolf" "Vivaldi"; do
-        assertFileExists "home-files/Library/Application Support/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
-      done
-
-      for dir in "Google/Chrome" "Chromium" "Vivaldi"; do
-        assertFileExists "home-files/Library/Application Support/$dir/policies/managed/com.github.browserpass.native.json"
-      done
-    '' else ''
-      for dir in "BraveSoftware/Brave-Browser" "google-chrome" "chromium" "vivaldi"; do
-        assertFileExists "home-files/.config/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
-      done
-
-      for dir in "google-chrome" "chromium" "vivaldi"; do
-        assertFileExists "home-files/.config/$dir/policies/managed/com.github.browserpass.native.json"
-      done
-
-      for dir in ".mozilla" ".librewolf"; do
-        assertFileExists "home-files/$dir/native-messaging-hosts/com.github.browserpass.native.json"
-      done
-    '';
+  programs.browserpass = {
+    enable = true;
+    browsers = [ "brave" "chrome" "chromium" "firefox" "librewolf" "vivaldi" ];
   };
+
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) browserpass; }) ];
+
+  nmt.script = if realPkgs.stdenv.hostPlatform.isDarwin then ''
+    for dir in "BraveSoftware/Brave-Browser" "Google/Chrome" "Chromium" "Mozilla" "LibreWolf" "Vivaldi"; do
+      assertFileExists "home-files/Library/Application Support/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
+    done
+
+    for dir in "Google/Chrome" "Chromium" "Vivaldi"; do
+      assertFileExists "home-files/Library/Application Support/$dir/policies/managed/com.github.browserpass.native.json"
+    done
+  '' else ''
+    for dir in "BraveSoftware/Brave-Browser" "google-chrome" "chromium" "vivaldi"; do
+      assertFileExists "home-files/.config/$dir/NativeMessagingHosts/com.github.browserpass.native.json"
+    done
+
+    for dir in "google-chrome" "chromium" "vivaldi"; do
+      assertFileExists "home-files/.config/$dir/policies/managed/com.github.browserpass.native.json"
+    done
+
+    for dir in ".mozilla" ".librewolf"; do
+      assertFileExists "home-files/$dir/native-messaging-hosts/com.github.browserpass.native.json"
+    done
+  '';
 }
diff --git a/tests/modules/programs/btop/empty-settings.nix b/tests/modules/programs/btop/empty-settings.nix
index 21aad857d..1fcab6339 100644
--- a/tests/modules/programs/btop/empty-settings.nix
+++ b/tests/modules/programs/btop/empty-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   programs.btop.enable = true;
 
-  test.stubs.btop = { };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/btop
   '';
diff --git a/tests/modules/programs/carapace/bash.nix b/tests/modules/programs/carapace/bash.nix
index 7377df3c3..bfcd9a2f0 100644
--- a/tests/modules/programs/carapace/bash.nix
+++ b/tests/modules/programs/carapace/bash.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     carapace.enable = true;
@@ -9,6 +7,6 @@
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileRegex home-files/.bashrc \
-      'source <(/nix/store/.*carapace.*/bin/carapace _carapace bash)'
+      'source <(@carapace@/bin/carapace _carapace bash)'
   '';
 }
diff --git a/tests/modules/programs/carapace/fish.nix b/tests/modules/programs/carapace/fish.nix
index 6b71cef5a..f0a281d38 100644
--- a/tests/modules/programs/carapace/fish.nix
+++ b/tests/modules/programs/carapace/fish.nix
@@ -1,11 +1,13 @@
-{ ... }:
+{ config, lib, realPkgs, ... }:
 
-{
+lib.mkIf config.test.enableBig {
   programs = {
     carapace.enable = true;
     fish.enable = true;
   };
 
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) carapace; }) ];
+
   nmt.script = ''
     assertFileExists home-files/.config/fish/config.fish
     assertFileRegex home-files/.config/fish/config.fish \
diff --git a/tests/modules/programs/carapace/zsh.nix b/tests/modules/programs/carapace/zsh.nix
index 5ab4fe8a1..a10fd2533 100644
--- a/tests/modules/programs/carapace/zsh.nix
+++ b/tests/modules/programs/carapace/zsh.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     carapace.enable = true;
@@ -9,6 +7,6 @@
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileRegex home-files/.zshrc \
-      'source <(/nix/store/.*carapace.*/bin/carapace _carapace zsh)'
+      'source <(@carapace@/bin/carapace _carapace zsh)'
   '';
 }
diff --git a/tests/modules/programs/cmus/cmus.nix b/tests/modules/programs/cmus/cmus.nix
index 303bad767..8feb087cb 100644
--- a/tests/modules/programs/cmus/cmus.nix
+++ b/tests/modules/programs/cmus/cmus.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.cmus = {
     enable = true;
@@ -7,8 +5,6 @@
     extraConfig = "test";
   };
 
-  test.stubs.cmus = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/cmus/rc \
diff --git a/tests/modules/programs/comodoro/comodoro.nix b/tests/modules/programs/comodoro/comodoro.nix
index 37f43b448..bd7d924dd 100644
--- a/tests/modules/programs/comodoro/comodoro.nix
+++ b/tests/modules/programs/comodoro/comodoro.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.comodoro = {
     enable = true;
@@ -26,8 +24,6 @@
     };
   };
 
-  test.stubs.comodoro = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/comodoro/config.toml
     assertFileContent home-files/.config/comodoro/config.toml ${./expected.toml}
diff --git a/tests/modules/programs/direnv/bash.nix b/tests/modules/programs/direnv/bash.nix
index db0d6b391..7feb65cc1 100644
--- a/tests/modules/programs/direnv/bash.nix
+++ b/tests/modules/programs/direnv/bash.nix
@@ -1,17 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.bash.enable = true;
-    programs.direnv.enable = true;
+  programs.bash.enable = true;
+  programs.direnv.enable = true;
 
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileRegex \
-        home-files/.bashrc \
-        'eval "\$(/nix/store/.*direnv.*/bin/direnv hook bash)"'
-    '';
-  };
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileRegex \
+      home-files/.bashrc \
+      'eval "\$(@direnv@/bin/direnv hook bash)"'
+  '';
 }
diff --git a/tests/modules/programs/direnv/nix-direnv.nix b/tests/modules/programs/direnv/nix-direnv.nix
index 588cd6ed6..5b83647fd 100644
--- a/tests/modules/programs/direnv/nix-direnv.nix
+++ b/tests/modules/programs/direnv/nix-direnv.nix
@@ -1,16 +1,14 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ realPkgs, ... }:
 
 {
-  config = {
-    programs.bash.enable = true;
-    programs.direnv.enable = true;
-    programs.direnv.nix-direnv.enable = true;
+  programs.bash.enable = true;
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
 
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh
-    '';
-  };
+  nixpkgs.overlays = [ (_: _: { inherit (realPkgs) nix-direnv; }) ];
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh
+  '';
 }
diff --git a/tests/modules/programs/direnv/nushell.nix b/tests/modules/programs/direnv/nushell.nix
index 502b325d5..6bc2fba7d 100644
--- a/tests/modules/programs/direnv/nushell.nix
+++ b/tests/modules/programs/direnv/nushell.nix
@@ -4,8 +4,6 @@
   programs.nushell.enable = true;
   programs.direnv.enable = true;
 
-  test.stubs.nushell = { };
-
   nmt.script = let
     configFile = if pkgs.stdenv.isDarwin && !config.xdg.enable then
       "home-files/Library/Application Support/nushell/config.nu"
@@ -13,6 +11,6 @@
       "home-files/.config/nushell/config.nu";
   in ''
     assertFileExists "${configFile}"
-    assertFileRegex "${configFile}" '/nix/store/.*direnv.*/bin/direnv export json'
+    assertFileRegex "${configFile}" '@direnv@/bin/direnv export json'
   '';
 }
diff --git a/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix b/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix
index 3bfd768c4..a712704f6 100644
--- a/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix
+++ b/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix
@@ -1,21 +1,19 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ realPkgs, ... }:
 
 let expectedContent = "something important";
 in {
-  config = {
-    programs.bash.enable = true;
-    programs.direnv.enable = true;
-    programs.direnv.nix-direnv.enable = true;
-    programs.direnv.stdlib = expectedContent;
+  programs.bash.enable = true;
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
+  programs.direnv.stdlib = expectedContent;
 
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh
-      assertFileRegex \
-        home-files/.config/direnv/direnvrc \
-        '${expectedContent}'
-    '';
-  };
+  nixpkgs.overlays = [ (_: _: { inherit (realPkgs) nix-direnv; }) ];
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh
+    assertFileRegex \
+      home-files/.config/direnv/direnvrc \
+      '${expectedContent}'
+  '';
 }
diff --git a/tests/modules/programs/direnv/stdlib.nix b/tests/modules/programs/direnv/stdlib.nix
index 2a859132f..3f7a55e03 100644
--- a/tests/modules/programs/direnv/stdlib.nix
+++ b/tests/modules/programs/direnv/stdlib.nix
@@ -1,20 +1,14 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 let expectedContent = "something important";
 in {
-  config = {
-    programs.bash.enable = true;
-    programs.direnv.enable = true;
-    programs.direnv.stdlib = expectedContent;
+  programs.bash.enable = true;
+  programs.direnv.enable = true;
+  programs.direnv.stdlib = expectedContent;
 
-    nmt.script = ''
-      assertPathNotExists home-files/.config/direnv/lib/hm-nix-direnv.sh
-      assertFileExists home-files/.bashrc
-      assertFileRegex \
-        home-files/.config/direnv/direnvrc \
-        '${expectedContent}'
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/direnv/lib/hm-nix-direnv.sh
+    assertFileExists home-files/.bashrc
+    assertFileRegex \
+      home-files/.config/direnv/direnvrc \
+      '${expectedContent}'
+  '';
 }
diff --git a/tests/modules/programs/fastfetch/basic-configuration.nix b/tests/modules/programs/fastfetch/basic-configuration.nix
index a0b6783a8..3e333b3f0 100644
--- a/tests/modules/programs/fastfetch/basic-configuration.nix
+++ b/tests/modules/programs/fastfetch/basic-configuration.nix
@@ -29,8 +29,6 @@
     };
   };
 
-  test.stubs.fastfetch = { };
-
   nmt.script = let configFile = "home-files/.config/fastfetch/config.jsonc";
   in ''
     assertFileExists "${configFile}"
diff --git a/tests/modules/programs/fastfetch/default-configuration.nix b/tests/modules/programs/fastfetch/default-configuration.nix
index 428081d4d..0fa35d7e7 100644
--- a/tests/modules/programs/fastfetch/default-configuration.nix
+++ b/tests/modules/programs/fastfetch/default-configuration.nix
@@ -1,8 +1,6 @@
 {
   programs.fastfetch.enable = true;
 
-  test.stubs.fastfetch = { };
-
   nmt.script = ''
     assertPathNotExists "home-files/.config/fastfetch/config.jsonc"
   '';
diff --git a/tests/modules/programs/feh/feh-bindings.nix b/tests/modules/programs/feh/feh-bindings.nix
index 787b02d7c..fc13d0e21 100644
--- a/tests/modules/programs/feh/feh-bindings.nix
+++ b/tests/modules/programs/feh/feh-bindings.nix
@@ -1,32 +1,26 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.feh.enable = true;
+  programs.feh.enable = true;
 
-    programs.feh.buttons = {
-      zoom_in = null;
-      zoom_out = 4;
-      next_img = "C-4";
-      prev_img = [ 3 "C-3" ];
-    };
-
-    programs.feh.keybindings = {
-      zoom_in = null;
-      zoom_out = "minus";
-      prev_img = [ "h" "Left" ];
-    };
-
-    test.stubs.feh = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/feh/buttons \
-        ${./feh-bindings-expected-buttons}
-
-      assertFileContent \
-        home-files/.config/feh/keys \
-        ${./feh-bindings-expected-keys}
-    '';
+  programs.feh.buttons = {
+    zoom_in = null;
+    zoom_out = 4;
+    next_img = "C-4";
+    prev_img = [ 3 "C-3" ];
   };
+
+  programs.feh.keybindings = {
+    zoom_in = null;
+    zoom_out = "minus";
+    prev_img = [ "h" "Left" ];
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/feh/buttons \
+      ${./feh-bindings-expected-buttons}
+
+    assertFileContent \
+      home-files/.config/feh/keys \
+      ${./feh-bindings-expected-keys}
+  '';
 }
diff --git a/tests/modules/programs/feh/feh-empty-settings.nix b/tests/modules/programs/feh/feh-empty-settings.nix
index 9a50e20bf..0c50e9ffb 100644
--- a/tests/modules/programs/feh/feh-empty-settings.nix
+++ b/tests/modules/programs/feh/feh-empty-settings.nix
@@ -1,15 +1,9 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.feh.enable = true;
+  programs.feh.enable = true;
 
-    test.stubs.feh = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/feh/buttons
-      assertPathNotExists home-files/.config/feh/keys
-      assertPathNotExists home-files/.config/feh/themes
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/feh/buttons
+    assertPathNotExists home-files/.config/feh/keys
+    assertPathNotExists home-files/.config/feh/themes
+  '';
 }
diff --git a/tests/modules/programs/feh/feh-themes.nix b/tests/modules/programs/feh/feh-themes.nix
index f06ea0716..398277d6d 100644
--- a/tests/modules/programs/feh/feh-themes.nix
+++ b/tests/modules/programs/feh/feh-themes.nix
@@ -1,32 +1,26 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.feh.enable = true;
+  programs.feh.enable = true;
 
-    programs.feh.themes = {
-      feh = [ "--image-bg" "black" ];
-      webcam = [ "--multiwindow" "--reload" "20" ];
-      present = [ "--full-screen" "--sort" "name" "--hide-pointer" ];
-      booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ];
-      imagemap = [
-        "-rVq"
-        "--thumb-width"
-        "40"
-        "--thumb-height"
-        "30"
-        "--index-info"
-        "%n\\n%wx%h"
-      ];
-      example = [ "--info" "foo bar" ];
-    };
-
-    test.stubs.feh = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/feh/themes \
-        ${./feh-themes-expected}
-    '';
+  programs.feh.themes = {
+    feh = [ "--image-bg" "black" ];
+    webcam = [ "--multiwindow" "--reload" "20" ];
+    present = [ "--full-screen" "--sort" "name" "--hide-pointer" ];
+    booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ];
+    imagemap = [
+      "-rVq"
+      "--thumb-width"
+      "40"
+      "--thumb-height"
+      "30"
+      "--index-info"
+      "%n\\n%wx%h"
+    ];
+    example = [ "--info" "foo bar" ];
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/feh/themes \
+      ${./feh-themes-expected}
+  '';
 }
diff --git a/tests/modules/programs/firefox/final-package.nix b/tests/modules/programs/firefox/final-package.nix
index ec310ee33..277b3e105 100644
--- a/tests/modules/programs/firefox/final-package.nix
+++ b/tests/modules/programs/firefox/final-package.nix
@@ -1,25 +1,21 @@
 modulePath:
-{ config, lib, pkgs, ... }:
+{ config, lib, realPkgs, ... }:
 
 let
 
   cfg = lib.getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+in lib.mkIf config.test.enableBig
+(lib.setAttrByPath modulePath { enable = true; } // {
+  home.stateVersion = "19.09";
 
-in {
-  imports = [ firefoxMockOverlay ];
+  _module.args.pkgs = lib.mkForce realPkgs;
 
-  config = lib.mkIf config.test.enableBig
-    (lib.setAttrByPath modulePath { enable = true; } // {
-      home.stateVersion = "19.09";
-
-      nmt.script = ''
-        package=${cfg.package}
-        finalPackage=${cfg.finalPackage}
-        if [[ $package != $finalPackage ]]; then
-          fail "Expected finalPackage ($finalPackage) to equal package ($package)"
-        fi
-      '';
-    });
-}
+  nmt.script = ''
+    package=${cfg.package}
+    finalPackage=${cfg.finalPackage}
+    if [[ $package != $finalPackage ]]; then
+      fail "Expected finalPackage ($finalPackage) to equal package ($package)"
+    fi
+  '';
+})
diff --git a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix
index ecbd492fa..736eff7ca 100644
--- a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix
+++ b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix
@@ -1,30 +1,36 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, realPkgs, ... }:
 
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
 in {
-  nixpkgs.overlays = [
-    (self: super: {
-      "${cfg.wrappedPackageName}-unwrapped" =
-        pkgs.runCommandLocal "${cfg.wrappedPackageName}-0" {
-          meta.description = "I pretend to be ${cfg.name}";
-          passthru.gtk3 = null;
-        } ''
-          mkdir -p "$out"/{bin,lib}
-          touch "$out/bin/${cfg.wrappedPackageName}"
-          chmod 755 "$out/bin/${cfg.wrappedPackageName}"
-        '';
+  test.stubs = let unwrappedName = "${cfg.wrappedPackageName}-unwrapped";
+  in {
+    "${unwrappedName}" = {
+      name = unwrappedName;
+      extraAttrs = {
+        binaryName = cfg.wrappedPackageName;
+        gtk3 = null;
+        meta.description = "I pretend to be ${cfg.name}";
+      };
+      outPath = null;
+      buildScript = ''
+        echo BUILD
+        mkdir -p "$out"/{bin,lib}
+        touch "$out/bin/${cfg.wrappedPackageName}"
+        chmod 755 "$out/bin/${cfg.wrappedPackageName}"
+      '';
+    };
 
-      chrome-gnome-shell =
-        pkgs.runCommandLocal "dummy-chrome-gnome-shell" { } ''
-          mkdir -p $out/lib/mozilla/native-messaging-hosts
-          touch $out/lib/mozilla/native-messaging-hosts/dummy
-        '';
-    })
-  ];
+    chrome-gnome-shell = {
+      buildScript = ''
+        mkdir -p $out/lib/mozilla/native-messaging-hosts
+        touch $out/lib/mozilla/native-messaging-hosts/dummy
+      '';
+    };
+  };
+
+  nixpkgs.overlays = [ (_: _: { inherit (realPkgs) mozlz4a; }) ];
 }
diff --git a/tests/modules/programs/foot/empty-settings.nix b/tests/modules/programs/foot/empty-settings.nix
index 26b82e7fb..f156dae2e 100644
--- a/tests/modules/programs/foot/empty-settings.nix
+++ b/tests/modules/programs/foot/empty-settings.nix
@@ -1,15 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.foot.enable = true;
+  programs.foot.enable = true;
 
-    test.stubs.foot = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/foot
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/foot
+  '';
 }
diff --git a/tests/modules/programs/foot/example-settings.nix b/tests/modules/programs/foot/example-settings.nix
index 8390305ea..392b916e6 100644
--- a/tests/modules/programs/foot/example-settings.nix
+++ b/tests/modules/programs/foot/example-settings.nix
@@ -1,29 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.foot = {
-      enable = true;
-      package = config.lib.test.mkStubPackage { };
+  programs.foot = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
 
-      settings = {
-        main = {
-          term = "xterm-256color";
+    settings = {
+      main = {
+        term = "xterm-256color";
 
-          font = "Fira Code:size=11";
-          dpi-aware = "yes";
-        };
-
-        mouse = { hide-when-typing = "yes"; };
+        font = "Fira Code:size=11";
+        dpi-aware = "yes";
       };
-    };
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/foot/foot.ini \
-        ${./example-settings-expected.ini}
-    '';
+      mouse = { hide-when-typing = "yes"; };
+    };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/foot/foot.ini \
+      ${./example-settings-expected.ini}
+  '';
 }
diff --git a/tests/modules/programs/foot/systemd-user-service.nix b/tests/modules/programs/foot/systemd-user-service.nix
index 5ebd90675..c313c0f20 100644
--- a/tests/modules/programs/foot/systemd-user-service.nix
+++ b/tests/modules/programs/foot/systemd-user-service.nix
@@ -1,19 +1,14 @@
-{ config, lib, pkgs, ... }:
-
 {
-  config = {
-    programs.foot = {
-      package = config.lib.test.mkStubPackage { outPath = "@foot@"; };
-      enable = true;
-      server.enable = true;
-    };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/foot/foot.ini
-
-      assertFileContent \
-        home-files/.config/systemd/user/foot.service \
-        ${./systemd-user-service-expected.service}
-    '';
+  programs.foot = {
+    enable = true;
+    server.enable = true;
   };
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/foot/foot.ini
+
+    assertFileContent \
+      home-files/.config/systemd/user/foot.service \
+      ${./systemd-user-service-expected.service}
+  '';
 }
diff --git a/tests/modules/programs/freetube/basic-configuration.nix b/tests/modules/programs/freetube/basic-configuration.nix
index a30d3bed4..dd3cdaf13 100644
--- a/tests/modules/programs/freetube/basic-configuration.nix
+++ b/tests/modules/programs/freetube/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.freetube = {
     enable = true;
@@ -17,8 +15,6 @@
     };
   };
 
-  test.stubs.freetube = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/FreeTube/hm_settings.db
     assertFileContent home-files/.config/FreeTube/hm_settings.db \
diff --git a/tests/modules/programs/fuzzel/empty-settings.nix b/tests/modules/programs/fuzzel/empty-settings.nix
index e14aad4f5..74e275ff3 100644
--- a/tests/modules/programs/fuzzel/empty-settings.nix
+++ b/tests/modules/programs/fuzzel/empty-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   programs.fuzzel.enable = true;
 
-  test.stubs.fuzzel = { };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/fuzzel
   '';
diff --git a/tests/modules/programs/gallery-dl/gallery-dl.nix b/tests/modules/programs/gallery-dl/gallery-dl.nix
index 2cc94e1e0..fdfa3395a 100644
--- a/tests/modules/programs/gallery-dl/gallery-dl.nix
+++ b/tests/modules/programs/gallery-dl/gallery-dl.nix
@@ -12,8 +12,6 @@
     };
   };
 
-  test.stubs.gallery-dl = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/gallery-dl/config.json \
     ${builtins.toFile "gallery-dl-expected-settings.json" ''
diff --git a/tests/modules/programs/gh-dash/config.nix b/tests/modules/programs/gh-dash/config.nix
index 9972d6738..cb07d13aa 100644
--- a/tests/modules/programs/gh-dash/config.nix
+++ b/tests/modules/programs/gh-dash/config.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.gh-dash = {
     enable = true;
@@ -11,8 +9,6 @@
     };
   };
 
-  test.stubs.gh = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/gh-dash/config.yml
     assertFileContent home-files/.config/gh-dash/config.yml ${
diff --git a/tests/modules/programs/gh/config-file.nix b/tests/modules/programs/gh/config-file.nix
index e7c17d5d9..b23c92d62 100644
--- a/tests/modules/programs/gh/config-file.nix
+++ b/tests/modules/programs/gh/config-file.nix
@@ -1,26 +1,20 @@
-{ config, lib, pkgs, ... }:
-
 {
-  config = {
-    programs.gh = {
-      enable = true;
-      settings.aliases = { co = "pr checkout"; };
-      settings.editor = "vim";
-    };
-
-    test.stubs.gh = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/gh/config.yml
-      assertFileContent home-files/.config/gh/config.yml ${
-        builtins.toFile "config-file.yml" ''
-          aliases:
-            co: pr checkout
-          editor: vim
-          git_protocol: https
-          version: '1'
-        ''
-      }
-    '';
+  programs.gh = {
+    enable = true;
+    settings.aliases = { co = "pr checkout"; };
+    settings.editor = "vim";
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/gh/config.yml
+    assertFileContent home-files/.config/gh/config.yml ${
+      builtins.toFile "config-file.yml" ''
+        aliases:
+          co: pr checkout
+        editor: vim
+        git_protocol: https
+        version: '1'
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/gh/credential-helper.nix b/tests/modules/programs/gh/credential-helper.nix
index 771572318..547ad446a 100644
--- a/tests/modules/programs/gh/credential-helper.nix
+++ b/tests/modules/programs/gh/credential-helper.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   programs.gh = {
     enable = true;
@@ -11,8 +9,6 @@
 
   programs.git.enable = true;
 
-  test.stubs.gh = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/git/config
     assertFileContent home-files/.config/git/config \
diff --git a/tests/modules/programs/gh/extensions.nix b/tests/modules/programs/gh/extensions.nix
index c8824ed09..4426e2a9b 100644
--- a/tests/modules/programs/gh/extensions.nix
+++ b/tests/modules/programs/gh/extensions.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   programs.gh = {
@@ -7,7 +7,6 @@
   };
 
   test.stubs = {
-    gh = { };
     gh-eco = {
       name = "gh-eco";
       buildScript = ''
diff --git a/tests/modules/programs/gh/warnings.nix b/tests/modules/programs/gh/warnings.nix
index bf7e5df8e..6a4a9361c 100644
--- a/tests/modules/programs/gh/warnings.nix
+++ b/tests/modules/programs/gh/warnings.nix
@@ -1,36 +1,32 @@
-{ config, options, lib, pkgs, ... }:
+{ options, lib, ... }:
 
 {
-  config = {
-    programs.gh = {
-      enable = true;
-      aliases = { co = "pr checkout"; };
-      editor = "vim";
-    };
-
-    test.stubs.gh = { };
-
-    test.asserts.warnings.expected = [
-      "The option `programs.gh.editor' defined in ${
-        lib.showFiles options.programs.gh.editor.files
-      } has been renamed to `programs.gh.settings.editor'."
-      "The option `programs.gh.aliases' defined in ${
-        lib.showFiles options.programs.gh.aliases.files
-      } has been renamed to `programs.gh.settings.aliases'."
-    ];
-    test.asserts.warnings.enable = true;
-
-    nmt.script = ''
-      assertFileExists home-files/.config/gh/config.yml
-      assertFileContent home-files/.config/gh/config.yml ${
-        builtins.toFile "config-file.yml" ''
-          aliases:
-            co: pr checkout
-          editor: vim
-          git_protocol: https
-          version: '1'
-        ''
-      }
-    '';
+  programs.gh = {
+    enable = true;
+    aliases = { co = "pr checkout"; };
+    editor = "vim";
   };
+
+  test.asserts.warnings.expected = [
+    "The option `programs.gh.editor' defined in ${
+      lib.showFiles options.programs.gh.editor.files
+    } has been renamed to `programs.gh.settings.editor'."
+    "The option `programs.gh.aliases' defined in ${
+      lib.showFiles options.programs.gh.aliases.files
+    } has been renamed to `programs.gh.settings.aliases'."
+  ];
+  test.asserts.warnings.enable = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/gh/config.yml
+    assertFileContent home-files/.config/gh/config.yml ${
+      builtins.toFile "config-file.yml" ''
+        aliases:
+          co: pr checkout
+        editor: vim
+        git_protocol: https
+        version: '1'
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/ghostty/empty-settings.nix b/tests/modules/programs/ghostty/empty-settings.nix
index 4e5e83e8d..1ea025eb5 100644
--- a/tests/modules/programs/ghostty/empty-settings.nix
+++ b/tests/modules/programs/ghostty/empty-settings.nix
@@ -1,6 +1,6 @@
 {
   programs.ghostty.enable = true;
-  test.stubs.ghostty = { };
+
   nmt.script = ''
     assertPathNotExists home-files/.config/ghostty/config
   '';
diff --git a/tests/modules/programs/ghostty/example-theme.nix b/tests/modules/programs/ghostty/example-theme.nix
index b4d211595..29f40a897 100644
--- a/tests/modules/programs/ghostty/example-theme.nix
+++ b/tests/modules/programs/ghostty/example-theme.nix
@@ -1,7 +1,6 @@
-{ config, ... }: {
+{
   programs.ghostty = {
     enable = true;
-    package = config.lib.test.mkStubPackage { };
 
     themes = {
       catppuccin-mocha = {
diff --git a/tests/modules/programs/git-cliff/example-settings.nix b/tests/modules/programs/git-cliff/example-settings.nix
index 5c865d48e..c0330b3da 100644
--- a/tests/modules/programs/git-cliff/example-settings.nix
+++ b/tests/modules/programs/git-cliff/example-settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   programs.git-cliff = {
     enable = true;
@@ -13,8 +9,6 @@ with lib;
     };
   };
 
-  test.stubs.git-cliff = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/git-cliff/cliff.toml \
diff --git a/tests/modules/programs/git-credential-oauth/basic.nix b/tests/modules/programs/git-credential-oauth/basic.nix
index 741adfbfb..2e82c8303 100644
--- a/tests/modules/programs/git-credential-oauth/basic.nix
+++ b/tests/modules/programs/git-credential-oauth/basic.nix
@@ -1,12 +1,10 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   programs.git-credential-oauth = { enable = true; };
 
   programs.git = { enable = true; };
 
-  test.stubs.git-credential-oauth = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/git/config
     assertFileContains \
diff --git a/tests/modules/programs/git-credential-oauth/extra-flags.nix b/tests/modules/programs/git-credential-oauth/extra-flags.nix
index 7a586ede6..e258512a7 100644
--- a/tests/modules/programs/git-credential-oauth/extra-flags.nix
+++ b/tests/modules/programs/git-credential-oauth/extra-flags.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   programs.git-credential-oauth = {
@@ -8,8 +8,6 @@
 
   programs.git = { enable = true; };
 
-  test.stubs.git-credential-oauth = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/git/config
     assertFileContains \
diff --git a/tests/modules/programs/git/git-with-email.nix b/tests/modules/programs/git/git-with-email.nix
index 0999eaa87..db6053a53 100644
--- a/tests/modules/programs/git/git-with-email.nix
+++ b/tests/modules/programs/git/git-with-email.nix
@@ -1,40 +1,36 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ realPkgs, ... }:
 
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts.hm-account.smtp.tls.certificatesFile =
-      "/etc/test/certificates.crt";
-    programs.git = {
-      enable = true;
-      package = pkgs.gitMinimal;
-      userEmail = "hm@example.com";
-      userName = "H. M. Test";
-    };
+  accounts.email.accounts.hm-account.smtp.tls.certificatesFile =
+    "/etc/test/certificates.crt";
 
-    home.stateVersion = "20.09";
-
-    nmt.script = ''
-      function assertGitConfig() {
-        local value
-        value=$(${pkgs.gitMinimal}/bin/git config \
-          --file $TESTED/home-files/.config/git/config \
-          --get $1)
-        if [[ $value != $2 ]]; then
-          fail "Expected option '$1' to have value '$2' but it was '$value'"
-        fi
-      }
-
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config ${
-        ./git-with-email-expected.conf
-      }
-
-      assertGitConfig "sendemail.hm@example.com.from" "H. M. Test <hm@example.com>"
-      assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. <hm@example.org>"
-    '';
+  programs.git = {
+    enable = true;
+    userEmail = "hm@example.com";
+    userName = "H. M. Test";
   };
+
+  home.stateVersion = "20.09";
+
+  nmt.script = ''
+    function assertGitConfig() {
+      local value
+      value=$(${realPkgs.gitMinimal}/bin/git config \
+        --file $TESTED/home-files/.config/git/config \
+        --get $1)
+      if [[ $value != $2 ]]; then
+        fail "Expected option '$1' to have value '$2' but it was '$value'"
+      fi
+    }
+
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config ${
+      ./git-with-email-expected.conf
+    }
+
+    assertGitConfig "sendemail.hm@example.com.from" "H. M. Test <hm@example.com>"
+    assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. <hm@example.org>"
+  '';
 }
diff --git a/tests/modules/programs/git/git-with-hooks.nix b/tests/modules/programs/git/git-with-hooks.nix
index 83f1059bc..6dcf15e21 100644
--- a/tests/modules/programs/git/git-with-hooks.nix
+++ b/tests/modules/programs/git/git-with-hooks.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ realPkgs, ... }:
 
 {
   programs.git = {
@@ -8,7 +8,7 @@
 
   nmt.script = ''
     function getGitConfig() {
-      ${pkgs.gitMinimal}/bin/git config \
+      ${realPkgs.gitMinimal}/bin/git config \
         --file $TESTED/home-files/.config/git/config \
         --get $1
     }
diff --git a/tests/modules/programs/git/git-with-msmtp.nix b/tests/modules/programs/git/git-with-msmtp.nix
index 80e082c97..917955130 100644
--- a/tests/modules/programs/git/git-with-msmtp.nix
+++ b/tests/modules/programs/git/git-with-msmtp.nix
@@ -1,43 +1,36 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, realPkgs, ... }:
 
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts."hm@example.com".msmtp.enable = true;
+  accounts.email.accounts."hm@example.com".msmtp.enable = true;
 
-    programs.git = {
-      enable = true;
-      package = pkgs.gitMinimal;
-      userEmail = "hm@example.com";
-      userName = "H. M. Test";
-    };
-
-    home.stateVersion = "20.09";
-
-    test.stubs.msmtp = { };
-
-    nmt.script = ''
-      function assertGitConfig() {
-        local value
-        value=$(${pkgs.gitMinimal}/bin/git config \
-          --file $TESTED/home-files/.config/git/config \
-          --get $1)
-        if [[ $value != $2 ]]; then
-          fail "Expected option '$1' to have value '$2' but it was '$value'"
-        fi
-      }
-
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config \
-        ${./git-with-msmtp-expected.conf}
-
-      assertGitConfig "sendemail.hm@example.com.from" "H. M. Test <hm@example.com>"
-      assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. <hm@example.org>"
-      assertGitConfig "sendemail.hm@example.com.smtpServer" "${pkgs.msmtp}/bin/msmtp"
-      assertGitConfig "sendemail.hm@example.com.envelopeSender" "auto"
-    '';
+  programs.git = {
+    enable = true;
+    userEmail = "hm@example.com";
+    userName = "H. M. Test";
   };
+
+  home.stateVersion = "20.09";
+
+  nmt.script = ''
+    function assertGitConfig() {
+      local value
+      value=$(${realPkgs.gitMinimal}/bin/git config \
+        --file $TESTED/home-files/.config/git/config \
+        --get $1)
+      if [[ $value != $2 ]]; then
+        fail "Expected option '$1' to have value '$2' but it was '$value'"
+      fi
+    }
+
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config \
+      ${./git-with-msmtp-expected.conf}
+
+    assertGitConfig "sendemail.hm@example.com.from" "H. M. Test <hm@example.com>"
+    assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. <hm@example.org>"
+    assertGitConfig "sendemail.hm@example.com.smtpServer" "${pkgs.msmtp}/bin/msmtp"
+    assertGitConfig "sendemail.hm@example.com.envelopeSender" "auto"
+  '';
 }
diff --git a/tests/modules/programs/git/git-with-signing-key-id.nix b/tests/modules/programs/git/git-with-signing-key-id.nix
index 8d182505f..a6386e347 100644
--- a/tests/modules/programs/git/git-with-signing-key-id.nix
+++ b/tests/modules/programs/git/git-with-signing-key-id.nix
@@ -1,22 +1,20 @@
-{ pkgs, ... }: {
-  config = {
-    programs.git = {
-      enable = true;
-      userName = "John Doe";
-      userEmail = "user@example.org";
+{
+  programs.git = {
+    enable = true;
+    userName = "John Doe";
+    userEmail = "user@example.org";
 
-      signing = {
-        gpgPath = "path-to-gpg";
-        key = "00112233445566778899AABBCCDDEEFF";
-        signByDefault = true;
-      };
+    signing = {
+      gpgPath = "path-to-gpg";
+      key = "00112233445566778899AABBCCDDEEFF";
+      signByDefault = true;
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config ${
-        ./git-with-signing-key-id-expected.conf
-      }
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config ${
+      ./git-with-signing-key-id-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/git/git-with-str-extra-config.nix b/tests/modules/programs/git/git-with-str-extra-config.nix
index b2294c65b..d9bd7e572 100644
--- a/tests/modules/programs/git/git-with-str-extra-config.nix
+++ b/tests/modules/programs/git/git-with-str-extra-config.nix
@@ -1,29 +1,22 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.git = {
-      enable = true;
-      package = pkgs.gitMinimal;
-      extraConfig = ''
-        This can be anything.
-      '';
-      userEmail = "user@example.org";
-      userName = "John Doe";
-    };
-
-    test.asserts.warnings.expected = [''
-      Using programs.git.extraConfig as a string option is
-      deprecated and will be removed in the future. Please
-      change to using it as an attribute set instead.
-    ''];
-
-    nmt.script = ''
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config \
-        ${./git-with-str-extra-config-expected.conf}
+  programs.git = {
+    enable = true;
+    extraConfig = ''
+      This can be anything.
     '';
+    userEmail = "user@example.org";
+    userName = "John Doe";
   };
+
+  test.asserts.warnings.expected = [''
+    Using programs.git.extraConfig as a string option is
+    deprecated and will be removed in the future. Please
+    change to using it as an attribute set instead.
+  ''];
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config \
+      ${./git-with-str-extra-config-expected.conf}
+  '';
 }
diff --git a/tests/modules/programs/git/git-without-signing-key-id.nix b/tests/modules/programs/git/git-without-signing-key-id.nix
index 3428c40d7..a06cb692e 100644
--- a/tests/modules/programs/git/git-without-signing-key-id.nix
+++ b/tests/modules/programs/git/git-without-signing-key-id.nix
@@ -1,22 +1,20 @@
-{ pkgs, ... }: {
-  config = {
-    programs.git = {
-      enable = true;
-      userName = "John Doe";
-      userEmail = "user@example.org";
+{
+  programs.git = {
+    enable = true;
+    userName = "John Doe";
+    userEmail = "user@example.org";
 
-      signing = {
-        gpgPath = "path-to-gpg";
-        key = null;
-        signByDefault = true;
-      };
+    signing = {
+      gpgPath = "path-to-gpg";
+      key = null;
+      signByDefault = true;
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config ${
-        ./git-without-signing-key-id-expected.conf
-      }
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config ${
+      ./git-without-signing-key-id-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/git/git.nix b/tests/modules/programs/git/git.nix
index fb949be00..51ed97180 100644
--- a/tests/modules/programs/git/git.nix
+++ b/tests/modules/programs/git/git.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ lib, pkgs, ... }:
 
 let
 
@@ -21,81 +19,74 @@ let
     };
 
 in {
-  config = {
-    programs.git = mkMerge [
-      {
+  programs.git = lib.mkMerge [
+    {
+      enable = true;
+      package = pkgs.gitMinimal;
+      aliases = {
+        a1 = "foo";
+        a2 = "bar";
+        escapes = ''"\n	'';
+      };
+      extraConfig = {
+        extra = {
+          name = "value";
+          multiple = [ 1 ];
+        };
+      };
+      ignores = [ "*~" "*.swp" ];
+      includes = [
+        { path = "~/path/to/config.inc"; }
+        {
+          path = "~/path/to/conditional.inc";
+          condition = "gitdir:~/src/dir";
+        }
+        {
+          condition = "gitdir:~/src/dir";
+          contents = gitInclude;
+        }
+        {
+          condition = "gitdir:~/src/otherproject";
+          contents = gitInclude;
+          contentSuffix = "gitconfig-work";
+        }
+      ];
+      signing = {
+        gpgPath = "path-to-gpg";
+        key = "00112233445566778899AABBCCDDEEFF";
+        signByDefault = true;
+      };
+      userEmail = "user@example.org";
+      userName = "John Doe";
+      lfs.enable = true;
+      delta = {
         enable = true;
-        package = pkgs.gitMinimal;
-        aliases = {
-          a1 = "foo";
-          a2 = "bar";
-          escapes = ''"\n	'';
-        };
-        extraConfig = {
-          extra = {
-            name = "value";
-            multiple = [ 1 ];
+        options = {
+          features = "decorations";
+          whitespace-error-style = "22 reverse";
+          decorations = {
+            commit-decoration-style = "bold yellow box ul";
+            file-style = "bold yellow ul";
+            file-decoration-style = "none";
           };
         };
-        ignores = [ "*~" "*.swp" ];
-        includes = [
-          { path = "~/path/to/config.inc"; }
-          {
-            path = "~/path/to/conditional.inc";
-            condition = "gitdir:~/src/dir";
-          }
-          {
-            condition = "gitdir:~/src/dir";
-            contents = gitInclude;
-          }
-          {
-            condition = "gitdir:~/src/otherproject";
-            contents = gitInclude;
-            contentSuffix = "gitconfig-work";
-          }
-        ];
-        signing = {
-          gpgPath = "path-to-gpg";
-          key = "00112233445566778899AABBCCDDEEFF";
-          signByDefault = true;
-        };
-        userEmail = "user@example.org";
-        userName = "John Doe";
-        lfs.enable = true;
-        delta = {
-          enable = true;
-          options = {
-            features = "decorations";
-            whitespace-error-style = "22 reverse";
-            decorations = {
-              commit-decoration-style = "bold yellow box ul";
-              file-style = "bold yellow ul";
-              file-decoration-style = "none";
-            };
-          };
-        };
-      }
+      };
+    }
 
-      {
-        aliases.a2 = mkForce "baz";
-        extraConfig."extra \"backcompat.with.dots\"".previously = "worked";
-        extraConfig.extra.boolean = true;
-        extraConfig.extra.integer = 38;
-        extraConfig.extra.multiple = [ 2 ];
-        extraConfig.extra.subsection.value = "test";
-      }
-    ];
+    {
+      aliases.a2 = lib.mkForce "baz";
+      extraConfig."extra \"backcompat.with.dots\"".previously = "worked";
+      extraConfig.extra.boolean = true;
+      extraConfig.extra.integer = 38;
+      extraConfig.extra.multiple = [ 2 ];
+      extraConfig.extra.subsection.value = "test";
+    }
+  ];
 
-    test.stubs = {
-      git-lfs = { };
-      delta = { };
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/git/config
-      assertFileContent home-files/.config/git/config ${
-        substituteExpected ./git-expected.conf
-      }
-    '';
-  };
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config ${
+      substituteExpected ./git-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix
index 6c3eb6bca..b9cc327d9 100644
--- a/tests/modules/programs/gnome-shell/gnome-shell.nix
+++ b/tests/modules/programs/gnome-shell/gnome-shell.nix
@@ -79,8 +79,6 @@ in {
     }
   ];
 
-  test.stubs.dconf = { };
-
   nmt.script = ''
     assertFileExists home-path/share/gnome-shell/extensions/dummy-package/test
     assertFileExists home-path/share/gnome-shell/extensions/test-extension/test
diff --git a/tests/modules/programs/gnome-terminal/bad-profile-name.nix b/tests/modules/programs/gnome-terminal/bad-profile-name.nix
index 308b9306e..91554909f 100644
--- a/tests/modules/programs/gnome-terminal/bad-profile-name.nix
+++ b/tests/modules/programs/gnome-terminal/bad-profile-name.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   programs.gnome-terminal = {
     enable = true;
@@ -13,11 +11,6 @@
     };
   };
 
-  nixpkgs.overlays =
-    [ (self: super: { gnome-terminal = config.lib.test.mkStubPackage { }; }) ];
-
-  test.stubs.dconf = { };
-
   test.asserts.assertions.expected = [''
     The attribute name of a Gnome Terminal profile must be a UUID.
     Incorrect profile names: another-bad-name, bad-name''];
diff --git a/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix b/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix
index 6dab6a2b4..3c0a786ab 100644
--- a/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix
+++ b/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix
@@ -1,62 +1,50 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.gnome-terminal = {
-      enable = true;
-      profile = {
-        "e0b782ed-6aca-44eb-8c75-62b3706b6220" = {
-          allowBold = true;
-          audibleBell = true;
-          backspaceBinding = "ascii-delete";
-          boldIsBright = true;
-          colors = {
-            backgroundColor = "#2E3436";
-            foregroundColor = "#D3D7C1";
-            palette = [
-              "#000000"
-              "#AA0000"
-              "#00AA00"
-              "#AA5500"
-              "#0000AA"
-              "#AA00AA"
-              "#00AAAA"
-              "#AAAAAA"
-              "#555555"
-              "#FF5555"
-              "#55FF55"
-              "#FFFF55"
-              "#5555FF"
-              "#FF55FF"
-              "#55FFFF"
-              "#FFFFFF"
-            ];
-          };
-          cursorBlinkMode = "off";
-          cursorShape = "underline";
-          default = true;
-          deleteBinding = "delete-sequence";
-          scrollbackLines = 1000000;
-          scrollOnOutput = false;
-          showScrollbar = false;
-          transparencyPercent = 5;
-          visibleName = "kamadorueda";
+  programs.gnome-terminal = {
+    enable = true;
+    profile = {
+      "e0b782ed-6aca-44eb-8c75-62b3706b6220" = {
+        allowBold = true;
+        audibleBell = true;
+        backspaceBinding = "ascii-delete";
+        boldIsBright = true;
+        colors = {
+          backgroundColor = "#2E3436";
+          foregroundColor = "#D3D7C1";
+          palette = [
+            "#000000"
+            "#AA0000"
+            "#00AA00"
+            "#AA5500"
+            "#0000AA"
+            "#AA00AA"
+            "#00AAAA"
+            "#AAAAAA"
+            "#555555"
+            "#FF5555"
+            "#55FF55"
+            "#FFFF55"
+            "#5555FF"
+            "#FF55FF"
+            "#55FFFF"
+            "#FFFFFF"
+          ];
         };
+        cursorBlinkMode = "off";
+        cursorShape = "underline";
+        default = true;
+        deleteBinding = "delete-sequence";
+        scrollbackLines = 1000000;
+        scrollOnOutput = false;
+        showScrollbar = false;
+        transparencyPercent = 5;
+        visibleName = "kamadorueda";
       };
-      showMenubar = false;
     };
-
-    nixpkgs.overlays = [
-      (self: super: { gnome-terminal = config.lib.test.mkStubPackage { }; })
-    ];
-
-    test.stubs.dconf = { };
-
-    nmt.script = ''
-      dconfIni=$(grep -oPm 1 '/nix/store/[a-z0-9]*?-hm-dconf.ini' $TESTED/activate)
-      assertFileContent $dconfIni ${./gnome-terminal-1.conf}
-    '';
+    showMenubar = false;
   };
+
+  nmt.script = ''
+    dconfIni=$(grep -oPm 1 '/nix/store/[a-z0-9]*?-hm-dconf.ini' $TESTED/activate)
+    assertFileContent $dconfIni ${./gnome-terminal-1.conf}
+  '';
 }
diff --git a/tests/modules/programs/go/go-telemetry.nix b/tests/modules/programs/go/go-telemetry.nix
index 4ea06cbc8..b5fda3d3a 100644
--- a/tests/modules/programs/go/go-telemetry.nix
+++ b/tests/modules/programs/go/go-telemetry.nix
@@ -9,11 +9,6 @@
     };
   };
 
-  test.stubs = {
-    go = { };
-    systemd = { };
-  };
-
   nm.script = let
     modeFileDir = if !pkgs.stdenv.isDarwin then
       ".config/go/telemetry"
diff --git a/tests/modules/programs/gpg/immutable-keyfiles.nix b/tests/modules/programs/gpg/immutable-keyfiles.nix
index b359d71e4..34ef9f0fe 100644
--- a/tests/modules/programs/gpg/immutable-keyfiles.nix
+++ b/tests/modules/programs/gpg/immutable-keyfiles.nix
@@ -1,15 +1,16 @@
-{ config, lib, pkgs, ... }:
+{ realPkgs, ... }:
 
 {
   programs.gpg = {
     enable = true;
+    package = realPkgs.gnupg;
 
     mutableKeys = false;
     mutableTrust = false;
 
     publicKeys = [
       {
-        source = pkgs.fetchurl {
+        source = realPkgs.fetchurl {
           url =
             "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x44CF42371ADF842E12F116EAA9D3F98FCCF5460B";
           hash = "sha256-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM=";
@@ -17,7 +18,7 @@
         trust = 1; # "unknown"
       }
       {
-        source = pkgs.fetchurl {
+        source = realPkgs.fetchurl {
           url = "https://www.rsync.net/resources/pubkey.txt";
           sha256 = "16nzqfb1kvsxjkq919hxsawx6ydvip3md3qyhdmw54qx6drnxckl";
         };
@@ -40,7 +41,7 @@
 
     # Export Trust
     export WORKDIR=$(mktemp -d)
-    ${pkgs.gnupg}/bin/gpg -q --export-ownertrust > $WORKDIR/gpgtrust.txt
+    ${realPkgs.gnupg}/bin/gpg -q --export-ownertrust > $WORKDIR/gpgtrust.txt
 
     # Check Trust
     assertFileRegex $WORKDIR/gpgtrust.txt \
diff --git a/tests/modules/programs/gpg/mutable-keyfiles.nix b/tests/modules/programs/gpg/mutable-keyfiles.nix
index 6ffcb7053..1c03c96bf 100644
--- a/tests/modules/programs/gpg/mutable-keyfiles.nix
+++ b/tests/modules/programs/gpg/mutable-keyfiles.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   programs.gpg = {
     enable = true;
@@ -13,9 +11,6 @@
     ];
   };
 
-  test.stubs.gnupg = { };
-  test.stubs.systemd = { }; # depends on gnupg.override
-
   nmt.script = ''
     assertFileContains activate "export GNUPGHOME=/home/hm-user/.gnupg"
 
diff --git a/tests/modules/programs/gradle/alternate-home-settings.nix b/tests/modules/programs/gradle/alternate-home-settings.nix
index dc885ab19..c278302ba 100644
--- a/tests/modules/programs/gradle/alternate-home-settings.nix
+++ b/tests/modules/programs/gradle/alternate-home-settings.nix
@@ -1,26 +1,20 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
-  config = {
-    programs.gradle = {
-      enable = true;
-      home = ".gbt";
-      settings = { "org.gradle.caching" = true; };
-      initScripts = { "some-script.gradle".text = "println 'hello world'"; };
-    };
-
-    programs.java.package =
-      pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
-
-    test.stubs.gradle = { };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export GRADLE_USER_HOME="/home/hm-user/.gbt"'
-      assertFileExists home-files/.gbt/gradle.properties
-      assertFileExists home-files/.gbt/init.d/some-script.gradle
-    '';
+  programs.gradle = {
+    enable = true;
+    home = ".gbt";
+    settings = { "org.gradle.caching" = true; };
+    initScripts = { "some-script.gradle".text = "println 'hello world'"; };
   };
+
+  programs.java.package =
+    pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
+
+  nmt.script = ''
+    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
+      'export GRADLE_USER_HOME="/home/hm-user/.gbt"'
+    assertFileExists home-files/.gbt/gradle.properties
+    assertFileExists home-files/.gbt/init.d/some-script.gradle
+  '';
 }
diff --git a/tests/modules/programs/gradle/empty-settings.nix b/tests/modules/programs/gradle/empty-settings.nix
index 8ed465751..6b9970843 100644
--- a/tests/modules/programs/gradle/empty-settings.nix
+++ b/tests/modules/programs/gradle/empty-settings.nix
@@ -1,17 +1,13 @@
 { pkgs, ... }:
 
 {
-  config = {
-    programs.gradle.enable = true;
+  programs.gradle.enable = true;
 
-    programs.java.package =
-      pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
+  programs.java.package =
+    pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
 
-    test.stubs.gradle = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.gradle
-      assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GRADLE_USER_HOME'
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.gradle
+    assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GRADLE_USER_HOME'
+  '';
 }
diff --git a/tests/modules/programs/gradle/example-settings.nix b/tests/modules/programs/gradle/example-settings.nix
index 19b8c070a..5944d66c4 100644
--- a/tests/modules/programs/gradle/example-settings.nix
+++ b/tests/modules/programs/gradle/example-settings.nix
@@ -1,42 +1,36 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
-  config = {
-    programs.gradle = {
-      enable = true;
-      settings = {
-        "org.gradle.caching" = true;
-        "org.gradle.parallel" = true;
-        "org.gradle.java.home" = pkgs.jdk17;
-        "org.gradle.java.installations.paths" = "${pkgs.jdk8},${pkgs.jdk11}";
-      };
+  programs.gradle = {
+    enable = true;
+    settings = {
+      "org.gradle.caching" = true;
+      "org.gradle.parallel" = true;
+      "org.gradle.java.home" = pkgs.jdk17;
+      "org.gradle.java.installations.paths" = "${pkgs.jdk8},${pkgs.jdk11}";
     };
-
-    programs.java.package =
-      pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
-
-    test.stubs = {
-      gradle = { };
-      jdk = { };
-      jdk8 = { };
-      jdk11 = { };
-      jdk17 = { };
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.gradle/gradle.properties
-      assertFileContent home-files/.gradle/gradle.properties ${
-        builtins.toFile "gradle.expected" ''
-          # Generated with Nix
-
-          org.gradle.caching = true
-          org.gradle.java.home = @jdk17@
-          org.gradle.java.installations.paths = @jdk8@,@jdk11@
-          org.gradle.parallel = true
-        ''
-      }
-    '';
   };
+
+  programs.java.package =
+    pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
+
+  test.stubs = {
+    jdk8 = { };
+    jdk11 = { };
+    jdk17 = { };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.gradle/gradle.properties
+    assertFileContent home-files/.gradle/gradle.properties ${
+      builtins.toFile "gradle.expected" ''
+        # Generated with Nix
+
+        org.gradle.caching = true
+        org.gradle.java.home = @jdk17@
+        org.gradle.java.installations.paths = @jdk8@,@jdk11@
+        org.gradle.parallel = true
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/gradle/init-scripts-settings.nix b/tests/modules/programs/gradle/init-scripts-settings.nix
index 49d9a8dce..680368366 100644
--- a/tests/modules/programs/gradle/init-scripts-settings.nix
+++ b/tests/modules/programs/gradle/init-scripts-settings.nix
@@ -1,37 +1,31 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
-  config = {
-    programs.gradle = {
-      enable = true;
+  programs.gradle = {
+    enable = true;
 
-      initScripts = {
-        "inline-init-script.gradle".text = ''
-          println 'inline-init-script'
-        '';
-        "external-init-script.gradle".source = ./external-init-script.gradle;
-      };
+    initScripts = {
+      "inline-init-script.gradle".text = ''
+        println 'inline-init-script'
+      '';
+      "external-init-script.gradle".source = ./external-init-script.gradle;
     };
-
-    programs.java.package =
-      pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
-
-    test.stubs.gradle = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.gradle/init.d/inline-init-script.gradle
-      assertFileContent home-files/.gradle/init.d/inline-init-script.gradle ${
-        pkgs.writeText "gradle.expected" ''
-          println 'inline-init-script'
-        ''
-      }
-
-      assertFileExists home-files/.gradle/init.d/external-init-script.gradle
-      assertFileContent home-files/.gradle/init.d/external-init-script.gradle ${
-        ./external-init-script.gradle
-      }
-    '';
   };
+
+  programs.java.package =
+    pkgs.runCommandLocal "java" { home = ""; } "mkdir $out";
+
+  nmt.script = ''
+    assertFileExists home-files/.gradle/init.d/inline-init-script.gradle
+    assertFileContent home-files/.gradle/init.d/inline-init-script.gradle ${
+      pkgs.writeText "gradle.expected" ''
+        println 'inline-init-script'
+      ''
+    }
+
+    assertFileExists home-files/.gradle/init.d/external-init-script.gradle
+    assertFileContent home-files/.gradle/init.d/external-init-script.gradle ${
+      ./external-init-script.gradle
+    }
+  '';
 }
diff --git a/tests/modules/programs/granted/integration-disabled.nix b/tests/modules/programs/granted/integration-disabled.nix
index 90f8d494a..2b3141cc7 100644
--- a/tests/modules/programs/granted/integration-disabled.nix
+++ b/tests/modules/programs/granted/integration-disabled.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   programs = {
     granted.enable = true;
@@ -7,8 +5,6 @@
     zsh.enable = true;
   };
 
-  test.stubs.granted = { };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileNotRegex \
diff --git a/tests/modules/programs/granted/integration-enabled.nix b/tests/modules/programs/granted/integration-enabled.nix
index 5bb903aae..25e70c8e9 100644
--- a/tests/modules/programs/granted/integration-enabled.nix
+++ b/tests/modules/programs/granted/integration-enabled.nix
@@ -1,13 +1,9 @@
-{ pkgs, ... }:
-
 {
   programs = {
     granted.enable = true;
     zsh.enable = true;
   };
 
-  test.stubs.granted = { };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileContains \
diff --git a/tests/modules/programs/helix/example-settings.nix b/tests/modules/programs/helix/example-settings.nix
index c60883a12..69a5ef557 100644
--- a/tests/modules/programs/helix/example-settings.nix
+++ b/tests/modules/programs/helix/example-settings.nix
@@ -1,144 +1,138 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.helix = {
-      enable = true;
+  programs.helix = {
+    enable = true;
 
-      settings = {
-        theme = "base16";
-        editor = {
-          line-number = "relative";
-          lsp.display-messages = true;
-        };
-        keys.normal = {
-          space.space = "file_picker";
-          space.w = ":w";
-          space.q = ":q";
-          esc = [ "collapse_selection" "keep_primary_selection" ];
-        };
+    settings = {
+      theme = "base16";
+      editor = {
+        line-number = "relative";
+        lsp.display-messages = true;
       };
-
-      languages = {
-        language-server.typescript-language-server = let
-          typescript-language-server = config.lib.test.mkStubPackage {
-            outPath = "@typescript-language-server@";
-          };
-          typescript =
-            config.lib.test.mkStubPackage { outPath = "@typescript@"; };
-        in {
-          command =
-            "${typescript-language-server}/bin/typescript-language-server";
-          args = [
-            "--stdio"
-            "--tsserver-path=${typescript}/lib/node_modules/typescript/lib"
-          ];
-        };
-
-        language = [{
-          name = "rust";
-          auto-format = false;
-        }];
-      };
-
-      ignores = [ ".build/" "!.gitignore" ];
-
-      themes = {
-        base16 = let
-          transparent = "none";
-          gray = "#665c54";
-          dark-gray = "#3c3836";
-          white = "#fbf1c7";
-          black = "#282828";
-          red = "#fb4934";
-          green = "#b8bb26";
-          yellow = "#fabd2f";
-          orange = "#fe8019";
-          blue = "#83a598";
-          magenta = "#d3869b";
-          cyan = "#8ec07c";
-        in {
-          "ui.menu" = transparent;
-          "ui.menu.selected" = { modifiers = [ "reversed" ]; };
-          "ui.linenr" = {
-            fg = gray;
-            bg = dark-gray;
-          };
-          "ui.popup" = { modifiers = [ "reversed" ]; };
-          "ui.linenr.selected" = {
-            fg = white;
-            bg = black;
-            modifiers = [ "bold" ];
-          };
-          "ui.selection" = {
-            fg = black;
-            bg = blue;
-          };
-          "ui.selection.primary" = { modifiers = [ "reversed" ]; };
-          "comment" = { fg = gray; };
-          "ui.statusline" = {
-            fg = white;
-            bg = dark-gray;
-          };
-          "ui.statusline.inactive" = {
-            fg = dark-gray;
-            bg = white;
-          };
-          "ui.help" = {
-            fg = dark-gray;
-            bg = white;
-          };
-          "ui.cursor" = { modifiers = [ "reversed" ]; };
-          "variable" = red;
-          "variable.builtin" = orange;
-          "constant.numeric" = orange;
-          "constant" = orange;
-          "attributes" = yellow;
-          "type" = yellow;
-          "ui.cursor.match" = {
-            fg = yellow;
-            modifiers = [ "underlined" ];
-          };
-          "string" = green;
-          "variable.other.member" = red;
-          "constant.character.escape" = cyan;
-          "function" = blue;
-          "constructor" = blue;
-          "special" = blue;
-          "keyword" = magenta;
-          "label" = magenta;
-          "namespace" = blue;
-          "diff.plus" = green;
-          "diff.delta" = yellow;
-          "diff.minus" = red;
-          "diagnostic" = { modifiers = [ "underlined" ]; };
-          "ui.gutter" = { bg = black; };
-          "info" = blue;
-          "hint" = dark-gray;
-          "debug" = dark-gray;
-          "warning" = yellow;
-          "error" = red;
-        };
+      keys.normal = {
+        space.space = "file_picker";
+        space.w = ":w";
+        space.q = ":q";
+        esc = [ "collapse_selection" "keep_primary_selection" ];
       };
     };
 
-    test.stubs.helix = { };
+    languages = {
+      language-server.typescript-language-server = let
+        typescript-language-server = config.lib.test.mkStubPackage {
+          outPath = "@typescript-language-server@";
+        };
+        typescript =
+          config.lib.test.mkStubPackage { outPath = "@typescript@"; };
+      in {
+        command =
+          "${typescript-language-server}/bin/typescript-language-server";
+        args = [
+          "--stdio"
+          "--tsserver-path=${typescript}/lib/node_modules/typescript/lib"
+        ];
+      };
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/helix/config.toml \
-        ${./settings-expected.toml}
-      assertFileContent \
-        home-files/.config/helix/languages.toml \
-        ${./languages-expected.toml}
-      assertFileContent \
-        home-files/.config/helix/ignore \
-        ${./ignore-expected}
-      assertFileContent \
-        home-files/.config/helix/themes/base16.toml \
-        ${./theme-base16-expected.toml}
-    '';
+      language = [{
+        name = "rust";
+        auto-format = false;
+      }];
+    };
+
+    ignores = [ ".build/" "!.gitignore" ];
+
+    themes = {
+      base16 = let
+        transparent = "none";
+        gray = "#665c54";
+        dark-gray = "#3c3836";
+        white = "#fbf1c7";
+        black = "#282828";
+        red = "#fb4934";
+        green = "#b8bb26";
+        yellow = "#fabd2f";
+        orange = "#fe8019";
+        blue = "#83a598";
+        magenta = "#d3869b";
+        cyan = "#8ec07c";
+      in {
+        "ui.menu" = transparent;
+        "ui.menu.selected" = { modifiers = [ "reversed" ]; };
+        "ui.linenr" = {
+          fg = gray;
+          bg = dark-gray;
+        };
+        "ui.popup" = { modifiers = [ "reversed" ]; };
+        "ui.linenr.selected" = {
+          fg = white;
+          bg = black;
+          modifiers = [ "bold" ];
+        };
+        "ui.selection" = {
+          fg = black;
+          bg = blue;
+        };
+        "ui.selection.primary" = { modifiers = [ "reversed" ]; };
+        "comment" = { fg = gray; };
+        "ui.statusline" = {
+          fg = white;
+          bg = dark-gray;
+        };
+        "ui.statusline.inactive" = {
+          fg = dark-gray;
+          bg = white;
+        };
+        "ui.help" = {
+          fg = dark-gray;
+          bg = white;
+        };
+        "ui.cursor" = { modifiers = [ "reversed" ]; };
+        "variable" = red;
+        "variable.builtin" = orange;
+        "constant.numeric" = orange;
+        "constant" = orange;
+        "attributes" = yellow;
+        "type" = yellow;
+        "ui.cursor.match" = {
+          fg = yellow;
+          modifiers = [ "underlined" ];
+        };
+        "string" = green;
+        "variable.other.member" = red;
+        "constant.character.escape" = cyan;
+        "function" = blue;
+        "constructor" = blue;
+        "special" = blue;
+        "keyword" = magenta;
+        "label" = magenta;
+        "namespace" = blue;
+        "diff.plus" = green;
+        "diff.delta" = yellow;
+        "diff.minus" = red;
+        "diagnostic" = { modifiers = [ "underlined" ]; };
+        "ui.gutter" = { bg = black; };
+        "info" = blue;
+        "hint" = dark-gray;
+        "debug" = dark-gray;
+        "warning" = yellow;
+        "error" = red;
+      };
+    };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/helix/config.toml \
+      ${./settings-expected.toml}
+    assertFileContent \
+      home-files/.config/helix/languages.toml \
+      ${./languages-expected.toml}
+    assertFileContent \
+      home-files/.config/helix/ignore \
+      ${./ignore-expected}
+    assertFileContent \
+      home-files/.config/helix/themes/base16.toml \
+      ${./theme-base16-expected.toml}
+  '';
 }
diff --git a/tests/modules/programs/hexchat/basic-configuration.nix b/tests/modules/programs/hexchat/basic-configuration.nix
index 6371a0e0b..7fba91da7 100644
--- a/tests/modules/programs/hexchat/basic-configuration.nix
+++ b/tests/modules/programs/hexchat/basic-configuration.nix
@@ -1,61 +1,54 @@
-{ config, lib, pkgs, ... }:
-
 {
-  config = {
-    programs.hexchat = {
-      enable = true;
-      overwriteConfigFiles = true;
-      channels = {
-        oftc = {
-          charset = "UTF-8 (Unicode)";
-          userName = "user";
-          password = "password";
-          loginMethod = "sasl";
-          nickname = "user";
-          nickname2 = "user_";
-          realName = "real_user";
-          options = {
-            autoconnect = true;
-            forceSSL = true;
-          };
-          servers = [ "irc.oftc.net" ];
-          autojoin = [ "#home-manager" ];
-        };
-        efnet = {
-          options = { forceSSL = true; };
-          servers = [
-            "irc.choopa.net"
-            "irc.colosolutions.net"
-            "irc.mzima.net"
-            "irc.prison.net"
-          ];
-          autojoin = [ "#computers" ];
+  programs.hexchat = {
+    enable = true;
+    overwriteConfigFiles = true;
+    channels = {
+      oftc = {
+        charset = "UTF-8 (Unicode)";
+        userName = "user";
+        password = "password";
+        loginMethod = "sasl";
+        nickname = "user";
+        nickname2 = "user_";
+        realName = "real_user";
+        options = {
+          autoconnect = true;
+          forceSSL = true;
         };
+        servers = [ "irc.oftc.net" ];
+        autojoin = [ "#home-manager" ];
       };
-      settings = {
-        dcc_dir = "/home/user/Downloads";
-        irc_nick1 = "user";
-        irc_nick2 = "user_";
-        irc_nick3 = "user__";
-        irc_user_name = "user";
-        irc_real_name = "real user";
-        text_font = "Monospace 14";
-        text_font_main = "Monospace 14";
-        gui_slist_skip = "1"; # Skip network list on start-up
-        gui_quit_dialog = "0";
+      efnet = {
+        options = { forceSSL = true; };
+        servers = [
+          "irc.choopa.net"
+          "irc.colosolutions.net"
+          "irc.mzima.net"
+          "irc.prison.net"
+        ];
+        autojoin = [ "#computers" ];
       };
     };
-
-    test.stubs.hexchat = { };
-
-    nmt.script = ''
-      assertFileContent \
-         home-files/.config/hexchat/hexchat.conf \
-         ${./basic-configuration-expected-main-config}
-      assertFileContent \
-         home-files/.config/hexchat/servlist.conf \
-         ${./basic-configuration-expected-serverlist-config}
-    '';
+    settings = {
+      dcc_dir = "/home/user/Downloads";
+      irc_nick1 = "user";
+      irc_nick2 = "user_";
+      irc_nick3 = "user__";
+      irc_user_name = "user";
+      irc_real_name = "real user";
+      text_font = "Monospace 14";
+      text_font_main = "Monospace 14";
+      gui_slist_skip = "1"; # Skip network list on start-up
+      gui_quit_dialog = "0";
+    };
   };
 
+  nmt.script = ''
+    assertFileContent \
+       home-files/.config/hexchat/hexchat.conf \
+       ${./basic-configuration-expected-main-config}
+    assertFileContent \
+       home-files/.config/hexchat/servlist.conf \
+       ${./basic-configuration-expected-serverlist-config}
+  '';
 }
diff --git a/tests/modules/programs/himalaya/basic.nix b/tests/modules/programs/himalaya/basic.nix
index f31a8464c..05fdef3f6 100644
--- a/tests/modules/programs/himalaya/basic.nix
+++ b/tests/modules/programs/himalaya/basic.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
@@ -15,8 +11,6 @@ with lib;
 
   programs.himalaya = { enable = true; };
 
-  test.stubs.himalaya = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/himalaya/config.toml
     assertFileContent home-files/.config/himalaya/config.toml ${
diff --git a/tests/modules/programs/htop/empty-settings.nix b/tests/modules/programs/htop/empty-settings.nix
index b8e43600f..d5b740397 100644
--- a/tests/modules/programs/htop/empty-settings.nix
+++ b/tests/modules/programs/htop/empty-settings.nix
@@ -1,15 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.htop.enable = true;
+  programs.htop.enable = true;
 
-    test.stubs.htop = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/htop
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/htop
+  '';
 }
diff --git a/tests/modules/programs/htop/example-settings.nix b/tests/modules/programs/htop/example-settings.nix
index 71685434a..04c72f434 100644
--- a/tests/modules/programs/htop/example-settings.nix
+++ b/tests/modules/programs/htop/example-settings.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
   config = {
@@ -36,8 +34,6 @@ with lib;
           (text "Systemd")
         ]);
 
-    test.stubs.htop = { };
-
     nmt.script = ''
       htoprc=home-files/.config/htop/htoprc
       assertFileExists $htoprc
diff --git a/tests/modules/programs/htop/header_layout.nix b/tests/modules/programs/htop/header_layout.nix
index aaf628522..e9de2bec9 100644
--- a/tests/modules/programs/htop/header_layout.nix
+++ b/tests/modules/programs/htop/header_layout.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, pkgs, ... }:
 
 {
   config = with config.lib.htop; {
@@ -13,8 +11,6 @@ with lib;
       column_meters_modes_1 = [ modes.Text modes.Text modes.Text modes.Text ];
     };
 
-    test.stubs.htop = { };
-
     # Test that the 'fields' key is written in addition to the customized
     # settings or htop won't read the options.
     nmt.script = let
diff --git a/tests/modules/programs/htop/settings-without-fields.nix b/tests/modules/programs/htop/settings-without-fields.nix
index f1efac2d4..e538a0756 100644
--- a/tests/modules/programs/htop/settings-without-fields.nix
+++ b/tests/modules/programs/htop/settings-without-fields.nix
@@ -1,14 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
   config = {
     programs.htop.enable = true;
     programs.htop.settings = { color_scheme = 6; };
 
-    test.stubs.htop = { };
-
     # Test that the 'fields' key is written in addition to the customized
     # settings or htop won't read the options.
     nmt.script = let
diff --git a/tests/modules/programs/hyfetch/empty-settings.nix b/tests/modules/programs/hyfetch/empty-settings.nix
index badb5220f..e02f72842 100644
--- a/tests/modules/programs/hyfetch/empty-settings.nix
+++ b/tests/modules/programs/hyfetch/empty-settings.nix
@@ -1,15 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.hyfetch.enable = true;
+  programs.hyfetch.enable = true;
 
-    test.stubs.hyfetch = { };
-
-    nmt.script = ''
-      assertPathNotExists home-files/.config/hyfetch.json
-    '';
-  };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/hyfetch.json
+  '';
 }
diff --git a/tests/modules/programs/hyfetch/settings.nix b/tests/modules/programs/hyfetch/settings.nix
index 1cd98dc26..0210b65ed 100644
--- a/tests/modules/programs/hyfetch/settings.nix
+++ b/tests/modules/programs/hyfetch/settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.hyfetch = {
     enable = true;
@@ -17,8 +15,6 @@
     };
   };
 
-  test.stubs.hyfetch = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/hyfetch.json ${./hyfetch.json}
   '';
diff --git a/tests/modules/programs/hyprlock/basic-configuration.nix b/tests/modules/programs/hyprlock/basic-configuration.nix
index c4f6821e6..606c1f75a 100644
--- a/tests/modules/programs/hyprlock/basic-configuration.nix
+++ b/tests/modules/programs/hyprlock/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.hyprlock = {
     enable = true;
@@ -35,8 +33,6 @@
     };
   };
 
-  test.stubs.hyprlock = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/hypr/hyprlock.conf \
diff --git a/tests/modules/programs/hyprlock/complex-configuration.nix b/tests/modules/programs/hyprlock/complex-configuration.nix
index 8544a8c52..b8a9f9817 100644
--- a/tests/modules/programs/hyprlock/complex-configuration.nix
+++ b/tests/modules/programs/hyprlock/complex-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.hyprlock = {
     enable = true;
@@ -173,8 +171,6 @@
     };
   };
 
-  test.stubs.hyprlock = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/hypr/hyprlock.conf \
diff --git a/tests/modules/programs/i3blocks/with-ordered-blocks.nix b/tests/modules/programs/i3blocks/with-ordered-blocks.nix
index c2c9e6477..f7a81b9c3 100644
--- a/tests/modules/programs/i3blocks/with-ordered-blocks.nix
+++ b/tests/modules/programs/i3blocks/with-ordered-blocks.nix
@@ -1,9 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
-  expectedConfig = pkgs.writeText "i3blocks-expected-config" ''
+  expectedConfig = builtins.toFile "i3blocks-expected-config" ''
     [block1first]
     command=echo first
     interval=1
@@ -21,17 +19,17 @@ in {
     programs.i3blocks = {
       enable = true;
       package = config.lib.test.mkStubPackage { };
-      bars = with lib; {
+      bars = {
         bar1 = {
           block1first = {
             command = "echo first";
             interval = 1;
           };
-          block2third = hm.dag.entryAfter [ "block3second" ] {
+          block2third = lib.hm.dag.entryAfter [ "block3second" ] {
             command = "echo third";
             interval = 3;
           };
-          block3second = hm.dag.entryAfter [ "block1first" ] {
+          block3second = lib.hm.dag.entryAfter [ "block1first" ] {
             command = "echo second";
             interval = 2;
           };
@@ -41,11 +39,11 @@ in {
             command = "echo first";
             interval = 1;
           };
-          block2third = hm.dag.entryAfter [ "block3second" ] {
+          block2third = lib.hm.dag.entryAfter [ "block3second" ] {
             command = "echo third";
             interval = 3;
           };
-          block3second = hm.dag.entryAfter [ "block1first" ] {
+          block3second = lib.hm.dag.entryAfter [ "block1first" ] {
             command = "echo second";
             interval = 2;
           };
@@ -53,8 +51,6 @@ in {
       };
     };
 
-    test.stubs.i3blocks = { };
-
     nmt.script = ''
       assertFileExists home-files/.config/i3blocks/bar1
       assertFileExists home-files/.config/i3blocks/bar2
diff --git a/tests/modules/programs/i3status-rust/with-version-0311.nix b/tests/modules/programs/i3status-rust/with-version-0311.nix
index d84cdd7cc..3f928c07b 100644
--- a/tests/modules/programs/i3status-rust/with-version-0311.nix
+++ b/tests/modules/programs/i3status-rust/with-version-0311.nix
@@ -1,13 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
-  config = {
-    programs.i3status-rust = { enable = true; };
+  programs.i3status-rust = { enable = true; };
 
-    test.stubs.i3status-rust = { version = "0.31.1"; };
+  test.stubs.i3status-rust = { version = "0.31.1"; };
 
-    test.asserts.assertions.expected = [
-      "Only i3status-rust <0.31.0 or ≥0.31.2 is supported due to a config format incompatibility."
-    ];
-  };
+  test.asserts.assertions.expected = [
+    "Only i3status-rust <0.31.0 or ≥0.31.2 is supported due to a config format incompatibility."
+  ];
 }
diff --git a/tests/modules/programs/i3status/with-custom.nix b/tests/modules/programs/i3status/with-custom.nix
index 8b673b8ad..fcaa0c632 100644
--- a/tests/modules/programs/i3status/with-custom.nix
+++ b/tests/modules/programs/i3status/with-custom.nix
@@ -1,67 +1,61 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.i3status = {
-      enable = true;
-      enableDefault = false;
+  programs.i3status = {
+    enable = true;
+    enableDefault = false;
 
-      general = {
-        colors = true;
-        color_good = "#e0e0e0";
-        color_degraded = "#d7ae00";
-        color_bad = "#f69d6a";
-        interval = 1;
-      };
-
-      package = config.lib.test.mkStubPackage { };
-
-      modules = {
-        "volume master" = {
-          position = 1;
-          settings = {
-            format = "♪ %volume";
-            format_muted = "♪ muted (%volume)";
-            device = "pulse:1";
-          };
-        };
-        "disk /" = {
-          position = 2;
-          settings = { format = "/ %avail"; };
-        };
-      };
+    general = {
+      colors = true;
+      color_good = "#e0e0e0";
+      color_degraded = "#d7ae00";
+      color_bad = "#f69d6a";
+      interval = 1;
     };
 
-    test.stubs.i3status = { };
+    package = config.lib.test.mkStubPackage { };
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/i3status/config \
-        ${
-          pkgs.writeText "i3status-expected-config" ''
-            general {
-              color_bad = "#f69d6a"
-              color_degraded = "#d7ae00"
-              color_good = "#e0e0e0"
-              colors = true
-              interval = 1
-            }
-
-            order += "volume master"
-            order += "disk /"
-            disk / {
-              format = "/ %avail"
-            }
-
-            volume master {
-              device = "pulse:1"
-              format = "♪ %volume"
-              format_muted = "♪ muted (%volume)"
-            }
-          ''
-        }
-    '';
+    modules = {
+      "volume master" = {
+        position = 1;
+        settings = {
+          format = "♪ %volume";
+          format_muted = "♪ muted (%volume)";
+          device = "pulse:1";
+        };
+      };
+      "disk /" = {
+        position = 2;
+        settings = { format = "/ %avail"; };
+      };
+    };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/i3status/config \
+      ${
+        builtins.toFile "i3status-expected-config" ''
+          general {
+            color_bad = "#f69d6a"
+            color_degraded = "#d7ae00"
+            color_good = "#e0e0e0"
+            colors = true
+            interval = 1
+          }
+
+          order += "volume master"
+          order += "disk /"
+          disk / {
+            format = "/ %avail"
+          }
+
+          volume master {
+            device = "pulse:1"
+            format = "♪ %volume"
+            format_muted = "♪ muted (%volume)"
+          }
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/i3status/with-default.nix b/tests/modules/programs/i3status/with-default.nix
index d56ecc205..735dad1f0 100644
--- a/tests/modules/programs/i3status/with-default.nix
+++ b/tests/modules/programs/i3status/with-default.nix
@@ -1,71 +1,63 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.i3status = {
-      enable = true;
-      enableDefault = true;
-    };
-
-    test.stubs.i3status = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/i3status/config \
-        ${
-          pkgs.writeText "i3status-expected-config" ''
-            general {
-              colors = true
-              interval = 5
-            }
-
-            order += "ipv6"
-            order += "wireless _first_"
-            order += "ethernet _first_"
-            order += "battery all"
-            order += "disk /"
-            order += "load"
-            order += "memory"
-            order += "tztime local"
-            battery all {
-              format = "%status %percentage %remaining"
-            }
-
-            disk / {
-              format = "%avail"
-            }
-
-            ethernet _first_ {
-              format_down = "E: down"
-              format_up = "E: %ip (%speed)"
-            }
-
-            ipv6 {
-              
-            }
-
-            load {
-              format = "%1min"
-            }
-
-            memory {
-              format = "%used | %available"
-              format_degraded = "MEMORY < %available"
-              threshold_degraded = "1G"
-            }
-
-            tztime local {
-              format = "%Y-%m-%d %H:%M:%S"
-            }
-
-            wireless _first_ {
-              format_down = "W: down"
-              format_up = "W: (%quality at %essid) %ip"
-            }
-          ''
-        }
-    '';
+  programs.i3status = {
+    enable = true;
+    enableDefault = true;
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/i3status/config \
+      ${
+        builtins.toFile "i3status-expected-config" ''
+          general {
+            colors = true
+            interval = 5
+          }
+
+          order += "ipv6"
+          order += "wireless _first_"
+          order += "ethernet _first_"
+          order += "battery all"
+          order += "disk /"
+          order += "load"
+          order += "memory"
+          order += "tztime local"
+          battery all {
+            format = "%status %percentage %remaining"
+          }
+
+          disk / {
+            format = "%avail"
+          }
+
+          ethernet _first_ {
+            format_down = "E: down"
+            format_up = "E: %ip (%speed)"
+          }
+
+          ipv6 {
+            
+          }
+
+          load {
+            format = "%1min"
+          }
+
+          memory {
+            format = "%used | %available"
+            format_degraded = "MEMORY < %available"
+            threshold_degraded = "1G"
+          }
+
+          tztime local {
+            format = "%Y-%m-%d %H:%M:%S"
+          }
+
+          wireless _first_ {
+            format_down = "W: down"
+            format_up = "W: (%quality at %essid) %ip"
+          }
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/irssi/example-settings.nix b/tests/modules/programs/irssi/example-settings.nix
index f279b03c8..bec6699a9 100644
--- a/tests/modules/programs/irssi/example-settings.nix
+++ b/tests/modules/programs/irssi/example-settings.nix
@@ -1,31 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.irssi = {
-      enable = true;
-      networks.oftc = {
-        nick = "nick";
-        saslExternal = true;
-        server = {
-          address = "irc.oftc.net";
-          port = 6697;
-          autoConnect = true;
-          ssl.certificateFile =
-            "${config.home.homeDirectory}/.irssi/certs/nick.pem";
-        };
-        channels.home-manager.autoJoin = true;
+  programs.irssi = {
+    enable = true;
+    networks.oftc = {
+      nick = "nick";
+      saslExternal = true;
+      server = {
+        address = "irc.oftc.net";
+        port = 6697;
+        autoConnect = true;
+        ssl.certificateFile =
+          "${config.home.homeDirectory}/.irssi/certs/nick.pem";
       };
+      channels.home-manager.autoJoin = true;
     };
-
-    test.stubs.irssi = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.irssi/config \
-        ${./example-settings-expected.config}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.irssi/config \
+      ${./example-settings-expected.config}
+  '';
 }
diff --git a/tests/modules/programs/joplin-desktop/basic-configuration.nix b/tests/modules/programs/joplin-desktop/basic-configuration.nix
index 9f986798f..361e6f5d9 100644
--- a/tests/modules/programs/joplin-desktop/basic-configuration.nix
+++ b/tests/modules/programs/joplin-desktop/basic-configuration.nix
@@ -11,8 +11,6 @@
     };
   };
 
-  test.stubs.joplin-desktop = { };
-
   nmt.script = ''
     assertFileContains activate \
       '/home/hm-user/.config/joplin-desktop/settings.json'
diff --git a/tests/modules/programs/jujutsu/empty-config.nix b/tests/modules/programs/jujutsu/empty-config.nix
index 55b5d87e8..27a1c393e 100644
--- a/tests/modules/programs/jujutsu/empty-config.nix
+++ b/tests/modules/programs/jujutsu/empty-config.nix
@@ -6,8 +6,6 @@ let
 in {
   programs.jujutsu.enable = true;
 
-  test.stubs.jujutsu = { };
-
   nmt.script = ''
     assertPathNotExists 'home-files/${configDir}/jj/config.toml'
   '';
diff --git a/tests/modules/programs/k9s/deprecated-options.nix b/tests/modules/programs/k9s/deprecated-options.nix
index a2bf4685a..97f779c3d 100644
--- a/tests/modules/programs/k9s/deprecated-options.nix
+++ b/tests/modules/programs/k9s/deprecated-options.nix
@@ -1,4 +1,6 @@
-{ config, lib, options, ... }: {
+{ lib, options, ... }:
+
+{
   programs.k9s = {
     enable = true;
     skin = {
@@ -16,8 +18,6 @@
     };
   };
 
-  test.stubs.k9s = { };
-
   test.asserts.warnings.enable = true;
   test.asserts.warnings.expected = [
     "The option `programs.k9s.skin' defined in ${
diff --git a/tests/modules/programs/k9s/empty-settings.nix b/tests/modules/programs/k9s/empty-settings.nix
index 355340054..6ff4276f7 100644
--- a/tests/modules/programs/k9s/empty-settings.nix
+++ b/tests/modules/programs/k9s/empty-settings.nix
@@ -1,11 +1,10 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, ... }:
 
+{
   programs.k9s.enable = true;
 
   xdg.enable = lib.mkIf pkgs.stdenv.isDarwin (lib.mkForce false);
 
-  test.stubs.k9s = { };
-
   nmt.script = let
     configDir = if !pkgs.stdenv.isDarwin then
       ".config/k9s"
diff --git a/tests/modules/programs/k9s/partial-skin-settings.nix b/tests/modules/programs/k9s/partial-skin-settings.nix
index ba2a61ce5..84fee27ec 100644
--- a/tests/modules/programs/k9s/partial-skin-settings.nix
+++ b/tests/modules/programs/k9s/partial-skin-settings.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 # When not specified in `programs.k9s.settings.ui.skin`,
 # test that the first skin name (alphabetically) is used in the config file
 
@@ -44,8 +42,6 @@
     };
   };
 
-  test.stubs.k9s = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/k9s/config.yaml
     assertFileContent \
diff --git a/tests/modules/programs/kakoune/no-plugins.nix b/tests/modules/programs/kakoune/no-plugins.nix
index d1505751b..372491b1b 100644
--- a/tests/modules/programs/kakoune/no-plugins.nix
+++ b/tests/modules/programs/kakoune/no-plugins.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ./stubs.nix ];
 
diff --git a/tests/modules/programs/kakoune/stubs.nix b/tests/modules/programs/kakoune/stubs.nix
index 28a816418..bcfed4053 100644
--- a/tests/modules/programs/kakoune/stubs.nix
+++ b/tests/modules/programs/kakoune/stubs.nix
@@ -1,12 +1,22 @@
 {
-  test.stubs.kakoune-unwrapped = {
-    name = "dummy-kakoune";
-    version = "1";
-    outPath = null;
-    buildScript = ''
-      mkdir -p $out/bin $out/share/kak/doc
-      touch $out/bin/kak
-      chmod +x $out/bin/kak
-    '';
+  test.stubs = {
+    kakoune-test-plugin = {
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/share/kak/autoload/plugins
+        touch $out/share/kak/autoload/plugins/kakoune-test-plugin
+      '';
+    };
+
+    kakoune-unwrapped = {
+      name = "dummy-kakoune";
+      version = "1";
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/bin $out/share/kak/doc
+        touch $out/bin/kak
+        chmod +x $out/bin/kak
+      '';
+    };
   };
 }
diff --git a/tests/modules/programs/kakoune/use-plugins.nix b/tests/modules/programs/kakoune/use-plugins.nix
index de7b3a123..12719d55c 100644
--- a/tests/modules/programs/kakoune/use-plugins.nix
+++ b/tests/modules/programs/kakoune/use-plugins.nix
@@ -1,13 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
   imports = [ ./stubs.nix ];
 
   programs.kakoune = {
     enable = true;
-    plugins = [ pkgs.kakounePlugins.prelude-kak ];
+    plugins = [ pkgs.kakoune-test-plugin ];
   };
 
   nmt.script = ''
diff --git a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix
index 4beb4b9e5..4e7d9aa31 100644
--- a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix
+++ b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ./stubs.nix ];
 
diff --git a/tests/modules/programs/kakoune/whitespace-highlighter.nix b/tests/modules/programs/kakoune/whitespace-highlighter.nix
index 1c80fe5f2..7923906bd 100644
--- a/tests/modules/programs/kakoune/whitespace-highlighter.nix
+++ b/tests/modules/programs/kakoune/whitespace-highlighter.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ lib, ... }:
 
 {
   imports = [ ./stubs.nix ];
diff --git a/tests/modules/programs/khal/config.nix b/tests/modules/programs/khal/config.nix
index c4a359458..2493e6fc2 100644
--- a/tests/modules/programs/khal/config.nix
+++ b/tests/modules/programs/khal/config.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.khal = {
     enable = true;
@@ -8,8 +6,8 @@
       view.agenda_event_format =
         "{calendar-color}{cancelled}{start-end-time-style} {title}{repeat-symbol}{reset}";
     };
-
   };
+
   accounts.calendar = {
     basePath = "$XDG_CONFIG_HOME/cal";
     accounts = {
@@ -91,8 +89,6 @@
     };
   };
 
-  test.stubs = { khal = { }; };
-
   nmt.script = ''
     configFile=home-files/.config/khal/config
     assertFileExists $configFile
diff --git a/tests/modules/programs/khard/basic_config.nix b/tests/modules/programs/khard/basic_config.nix
index f6f0838c7..41a65dbe9 100644
--- a/tests/modules/programs/khard/basic_config.nix
+++ b/tests/modules/programs/khard/basic_config.nix
@@ -24,8 +24,6 @@
     };
   };
 
-  test.stubs.khard = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/khard/khard.conf \
diff --git a/tests/modules/programs/khard/dirty_path.nix b/tests/modules/programs/khard/dirty_path.nix
index 07396a144..8256a73cf 100644
--- a/tests/modules/programs/khard/dirty_path.nix
+++ b/tests/modules/programs/khard/dirty_path.nix
@@ -12,8 +12,6 @@
 
   programs.khard.enable = true;
 
-  test.stubs.khard = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/khard/khard.conf \
diff --git a/tests/modules/programs/khard/empty_config.nix b/tests/modules/programs/khard/empty_config.nix
index 9d19d11c9..dc4247d76 100644
--- a/tests/modules/programs/khard/empty_config.nix
+++ b/tests/modules/programs/khard/empty_config.nix
@@ -9,8 +9,6 @@
 
   programs.khard.enable = true;
 
-  test.stubs.khard = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/khard/khard.conf \
diff --git a/tests/modules/programs/khard/multiple_accounts.nix b/tests/modules/programs/khard/multiple_accounts.nix
index 393510bf8..56ed82ab1 100644
--- a/tests/modules/programs/khard/multiple_accounts.nix
+++ b/tests/modules/programs/khard/multiple_accounts.nix
@@ -13,8 +13,6 @@
 
   programs.khard.enable = true;
 
-  test.stubs.khard = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/khard/khard.conf \
diff --git a/tests/modules/programs/kitty/example-settings.nix b/tests/modules/programs/kitty/example-settings.nix
index 8f2e0b894..d02c04c55 100644
--- a/tests/modules/programs/kitty/example-settings.nix
+++ b/tests/modules/programs/kitty/example-settings.nix
@@ -31,8 +31,6 @@ with lib;
       environment = { LS_COLORS = "1"; };
     };
 
-    test.stubs.kitty = { };
-
     nmt.script = ''
       assertFileExists home-files/.config/kitty/kitty.conf
       assertFileContent \
diff --git a/tests/modules/programs/kitty/theme-to-themeFile.nix b/tests/modules/programs/kitty/theme-to-themeFile.nix
index 84596bba9..988076670 100644
--- a/tests/modules/programs/kitty/theme-to-themeFile.nix
+++ b/tests/modules/programs/kitty/theme-to-themeFile.nix
@@ -1,24 +1,24 @@
-{ config, lib, pkgs, options, ... }: {
-  config = {
-    programs.kitty = {
-      enable = true;
-      theme = "Space Gray Eighties";
-    };
+{ lib, options, realPkgs, ... }:
 
-    test.stubs.kitty = { };
-
-    test.asserts.warnings.enable = true;
-    test.asserts.warnings.expected = [
-      ("The option `programs.kitty.theme' defined in ${
-          lib.showFiles options.programs.kitty.theme.files
-        } has been changed to `programs.kitty.themeFile' that has a different"
-        + " type. Please read `programs.kitty.themeFile' documentation and"
-        + " update your configuration accordingly.")
-    ];
-
-    nmt.script = ''
-      assertFileExists home-files/.config/kitty/kitty.conf
-      assertFileRegex home-files/.config/kitty/kitty.conf "^include .*themes/SpaceGray_Eighties\.conf$"
-    '';
+{
+  programs.kitty = {
+    enable = true;
+    theme = "Space Gray Eighties";
   };
+
+  test.asserts.warnings.enable = true;
+  test.asserts.warnings.expected = [
+    ("The option `programs.kitty.theme' defined in ${
+        lib.showFiles options.programs.kitty.theme.files
+      } has been changed to `programs.kitty.themeFile' that has a different"
+      + " type. Please read `programs.kitty.themeFile' documentation and"
+      + " update your configuration accordingly.")
+  ];
+
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) kitty-themes; }) ];
+
+  nmt.script = ''
+    assertFileExists home-files/.config/kitty/kitty.conf
+    assertFileRegex home-files/.config/kitty/kitty.conf "^include .*themes/SpaceGray_Eighties\.conf$"
+  '';
 }
diff --git a/tests/modules/programs/kodi/example-addon-settings.nix b/tests/modules/programs/kodi/example-addon-settings.nix
index c591d1ae3..da16965d0 100644
--- a/tests/modules/programs/kodi/example-addon-settings.nix
+++ b/tests/modules/programs/kodi/example-addon-settings.nix
@@ -1,6 +1,8 @@
 { config, ... }:
 
 {
+  imports = [ ./kodi-stubs.nix ];
+
   programs.kodi = {
     enable = true;
     package = config.lib.test.mkStubPackage { };
diff --git a/tests/modules/programs/kodi/example-settings.nix b/tests/modules/programs/kodi/example-settings.nix
index bdb48268a..74dd4a830 100644
--- a/tests/modules/programs/kodi/example-settings.nix
+++ b/tests/modules/programs/kodi/example-settings.nix
@@ -1,10 +1,8 @@
-{ config, ... }:
-
 {
+  imports = [ ./kodi-stubs.nix ];
+
   programs.kodi = {
     enable = true;
-    package = config.lib.test.mkStubPackage { };
-
     settings = { videolibrary.showemptytvshows = "true"; };
   };
 
diff --git a/tests/modules/programs/kodi/example-sources.nix b/tests/modules/programs/kodi/example-sources.nix
index f49b50001..b06c92767 100644
--- a/tests/modules/programs/kodi/example-sources.nix
+++ b/tests/modules/programs/kodi/example-sources.nix
@@ -1,10 +1,8 @@
-{ config, ... }:
-
 {
+  imports = [ ./kodi-stubs.nix ];
+
   programs.kodi = {
     enable = true;
-    package = config.lib.test.mkStubPackage { };
-
     sources = {
       video = {
         default = "movies";
@@ -22,7 +20,6 @@
         ];
       };
     };
-
   };
 
   nmt.script = ''
diff --git a/tests/modules/programs/kodi/kodi-stubs.nix b/tests/modules/programs/kodi/kodi-stubs.nix
new file mode 100644
index 000000000..b45a6e50b
--- /dev/null
+++ b/tests/modules/programs/kodi/kodi-stubs.nix
@@ -0,0 +1,10 @@
+{ realPkgs, ... }:
+
+{
+  nixpkgs.overlays = [
+    (_: super: {
+      buildPackages =
+        super.buildPackages.extend (_: _: { inherit (realPkgs) libxslt; });
+    })
+  ];
+}
diff --git a/tests/modules/programs/kubecolor/empty-config.nix b/tests/modules/programs/kubecolor/empty-config.nix
index 732321c50..f88d334b0 100644
--- a/tests/modules/programs/kubecolor/empty-config.nix
+++ b/tests/modules/programs/kubecolor/empty-config.nix
@@ -12,8 +12,6 @@ in {
     };
   };
 
-  test.stubs.kubecolor = { };
-
   nmt.script = ''
     assertPathNotExists 'home-files/${configDir}/kube/color.yaml'
   '';
diff --git a/tests/modules/programs/ledger/ledger.nix b/tests/modules/programs/ledger/ledger.nix
index f120a654d..7a1f9e415 100644
--- a/tests/modules/programs/ledger/ledger.nix
+++ b/tests/modules/programs/ledger/ledger.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.ledger = {
     enable = true;
@@ -17,8 +15,6 @@
     };
   };
 
-  test.stubs.ledger = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/ledger/ledgerrc \
     ${builtins.toFile "ledger-expected-settings" ''
diff --git a/tests/modules/programs/less/less-with-custom-keys.nix b/tests/modules/programs/less/less-with-custom-keys.nix
index 23d447189..4e9b4197d 100644
--- a/tests/modules/programs/less/less-with-custom-keys.nix
+++ b/tests/modules/programs/less/less-with-custom-keys.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   programs.less = {
     enable = true;
@@ -12,8 +8,6 @@ with lib;
     '';
   };
 
-  test.stubs.less = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/lesskey
     assertFileContent home-files/.config/lesskey ${
diff --git a/tests/modules/programs/lesspipe/lesspipe.nix b/tests/modules/programs/lesspipe/lesspipe.nix
index 70dcc954b..44f642466 100644
--- a/tests/modules/programs/lesspipe/lesspipe.nix
+++ b/tests/modules/programs/lesspipe/lesspipe.nix
@@ -1,8 +1,6 @@
 {
   programs.lesspipe.enable = true;
 
-  test.stubs.lesspipe = { };
-
   nmt.script = ''
     assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
       'export LESSOPEN="|@lesspipe@/bin/lesspipe.sh %s"'
diff --git a/tests/modules/programs/lf/all-options.nix b/tests/modules/programs/lf/all-options.nix
index 9632e7cf6..644959b3f 100644
--- a/tests/modules/programs/lf/all-options.nix
+++ b/tests/modules/programs/lf/all-options.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 let
   pvScript = builtins.toFile "pv.sh" "cat $1";
   expected = builtins.toFile "settings-expected" ''
@@ -33,53 +29,49 @@ let
 
   '';
 in {
-  config = {
-    programs.lf = {
-      enable = true;
+  programs.lf = {
+    enable = true;
 
-      cmdKeybindings = {
-        "<c-a>" = "should-be-added";
-        "<c-b>" = null;
-      };
-
-      commands = {
-        added = '':echo "foo"'';
-        removed = null;
-        multiline = ''
-          :{{
-            push gg
-            echo "bar"
-            push i
-          }}'';
-      };
-
-      extraConfig = ''
-        # More config...
-      '';
-
-      keybindings = {
-        aa = "should-be-added";
-        ab = null;
-      };
-
-      previewer = {
-        keybinding = "i";
-        source = pvScript;
-      };
-
-      settings = {
-        ignorecase = false;
-        icons = true;
-        tabstop = 4;
-        ratios = [ 2 2 3 ];
-      };
+    cmdKeybindings = {
+      "<c-a>" = "should-be-added";
+      "<c-b>" = null;
     };
 
-    test.stubs.lf = { };
+    commands = {
+      added = '':echo "foo"'';
+      removed = null;
+      multiline = ''
+        :{{
+          push gg
+          echo "bar"
+          push i
+        }}'';
+    };
 
-    nmt.script = ''
-      assertFileExists home-files/.config/lf/lfrc
-      assertFileContent home-files/.config/lf/lfrc ${expected}
+    extraConfig = ''
+      # More config...
     '';
+
+    keybindings = {
+      aa = "should-be-added";
+      ab = null;
+    };
+
+    previewer = {
+      keybinding = "i";
+      source = pvScript;
+    };
+
+    settings = {
+      ignorecase = false;
+      icons = true;
+      tabstop = 4;
+      ratios = [ 2 2 3 ];
+    };
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/lf/lfrc
+    assertFileContent home-files/.config/lf/lfrc ${expected}
+  '';
 }
diff --git a/tests/modules/programs/lf/minimal-options.nix b/tests/modules/programs/lf/minimal-options.nix
index 078c776e7..c90382862 100644
--- a/tests/modules/programs/lf/minimal-options.nix
+++ b/tests/modules/programs/lf/minimal-options.nix
@@ -1,17 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
+  programs.lf = { enable = true; };
 
-with lib;
-
-let expected = builtins.toFile "settings-expected" "\n\n\n\n\n\n\n\n\n\n\n";
-in {
-  config = {
-    programs.lf = { enable = true; };
-
-    test.stubs.lf = { };
-
-    nmt.script = ''
+  nmt.script =
+    let expected = builtins.toFile "settings-expected" "\n\n\n\n\n\n\n\n\n\n\n";
+    in ''
       assertFileExists home-files/.config/lf/lfrc
       assertFileContent home-files/.config/lf/lfrc ${expected}
     '';
-  };
 }
diff --git a/tests/modules/programs/lf/no-pv-keybind.nix b/tests/modules/programs/lf/no-pv-keybind.nix
index c948cf0b5..c290f3e6d 100644
--- a/tests/modules/programs/lf/no-pv-keybind.nix
+++ b/tests/modules/programs/lf/no-pv-keybind.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 let
   pvScript = builtins.toFile "pv.sh" "cat $1";
   expected = builtins.toFile "settings-expected" ''
@@ -21,22 +17,18 @@ let
 
   '';
 in {
-  config = {
-    programs.lf = {
-      enable = true;
+  programs.lf = {
+    enable = true;
 
-      extraConfig = ''
-        # More config...
-      '';
-
-      previewer = { source = pvScript; };
-    };
-
-    test.stubs.lf = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/lf/lfrc
-      assertFileContent home-files/.config/lf/lfrc ${expected}
+    extraConfig = ''
+      # More config...
     '';
+
+    previewer = { source = pvScript; };
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/lf/lfrc
+    assertFileContent home-files/.config/lf/lfrc ${expected}
+  '';
 }
diff --git a/tests/modules/programs/lsd/example-settings.nix b/tests/modules/programs/lsd/example-settings.nix
index 01c143a60..f911e22f8 100644
--- a/tests/modules/programs/lsd/example-settings.nix
+++ b/tests/modules/programs/lsd/example-settings.nix
@@ -1,62 +1,54 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.lsd = {
-      enable = true;
-      enableAliases = false;
-      settings = {
-        date = "relative";
-        blocks = [ "date" "size" "name" ];
-        layout = "oneline";
-        sorting.dir-grouping = "first";
-        ignore-globs = [ ".git" ".hg" ".bsp" ];
+  programs.lsd = {
+    enable = true;
+    enableAliases = false;
+    settings = {
+      date = "relative";
+      blocks = [ "date" "size" "name" ];
+      layout = "oneline";
+      sorting.dir-grouping = "first";
+      ignore-globs = [ ".git" ".hg" ".bsp" ];
+    };
+    colors = {
+      date = {
+        day-old = "green";
+        older = "dark_green";
       };
-      colors = {
-        date = {
-          day-old = "green";
-          older = "dark_green";
-        };
-        size = {
-          none = "grey";
-          small = "grey";
-          medium = "yellow";
-          large = "dark_yellow";
-        };
-      };
-      icons = {
-        name = {
-          ".trash" = "";
-          ".cargo" = "";
-        };
-        extension = {
-          "go" = "";
-          "hs" = "";
-        };
-        filetype = {
-          "dir" = "📂";
-          "file" = "📄";
-        };
+      size = {
+        none = "grey";
+        small = "grey";
+        medium = "yellow";
+        large = "dark_yellow";
+      };
+    };
+    icons = {
+      name = {
+        ".trash" = "";
+        ".cargo" = "";
+      };
+      extension = {
+        "go" = "";
+        "hs" = "";
+      };
+      filetype = {
+        "dir" = "📂";
+        "file" = "📄";
       };
     };
-
-    test.stubs.lsd = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/lsd/config.yaml
-      assertFileExists home-files/.config/lsd/colors.yaml
-      assertFileExists home-files/.config/lsd/icons.yaml
-      assertFileContent \
-        home-files/.config/lsd/config.yaml \
-        ${./example-settings-expected.yaml}
-      assertFileContent \
-        home-files/.config/lsd/colors.yaml \
-        ${./example-colors-expected.yaml}
-      assertFileContent \
-        home-files/.config/lsd/icons.yaml \
-        ${./example-icons-expected.yaml}
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/lsd/config.yaml
+    assertFileExists home-files/.config/lsd/colors.yaml
+    assertFileExists home-files/.config/lsd/icons.yaml
+    assertFileContent \
+      home-files/.config/lsd/config.yaml \
+      ${./example-settings-expected.yaml}
+    assertFileContent \
+      home-files/.config/lsd/colors.yaml \
+      ${./example-colors-expected.yaml}
+    assertFileContent \
+      home-files/.config/lsd/icons.yaml \
+      ${./example-icons-expected.yaml}
+  '';
 }
diff --git a/tests/modules/programs/mbsync/mbsync-master-slave-change.nix b/tests/modules/programs/mbsync/mbsync-master-slave-change.nix
deleted file mode 100644
index c6861374b..000000000
--- a/tests/modules/programs/mbsync/mbsync-master-slave-change.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-  imports = [ ../../accounts/email-test-accounts.nix ];
-
-  test.asserts.warnings.expected = [
-    "mbsync channels no longer use masterPattern. Use farPattern in its place."
-    "mbsync channels no longer use slavePattern. Use nearPattern in its place."
-  ];
-
-  config = {
-    programs.mbsync = {
-      enable = true;
-      # programs.mbsync.groups and
-      # accounts.email.accounts.<name>.mbsync.groups should NOT be used at the
-      # same time.
-      # If they are, then the new version will take precedence.
-      groups.inboxes = {
-        "hm@example.com" = [ "Inbox1" "Inbox2" ];
-        hm-account = [ "Inbox" ];
-      };
-    };
-
-    accounts.email.accounts = {
-      "hm@example.com".mbsync = {
-        enable = true;
-        groups.inboxes = {
-          channels = {
-            inbox1 = {
-              farPattern = "Inbox1";
-              nearPattern = "Inboxes";
-            };
-            inbox2 = {
-              farPattern = "Inbox2";
-              nearPattern = "Inboxes";
-            };
-          };
-        };
-      };
-
-      hm-account.mbsync = {
-        enable = true;
-        groups.hm-account = {
-          channels.earlierPatternMatch = {
-            farPattern = "Label";
-            nearPattern = "SomethingUnderLabel";
-            patterns = [
-              "ThingUnderLabel"
-              "!NotThisMaildirThough"
-              ''"[Weird] Label?"''
-            ];
-          };
-          channels.inbox = {
-            farPattern = "Inbox";
-            nearPattern = "Inbox";
-          };
-          channels.strangeHostBoxName = {
-            farPattern = "[Weird]/Label Mess";
-            nearPattern = "[AnotherWeird]/Label";
-          };
-          channels.patternMatch = {
-            farPattern = "Label";
-            nearPattern = "SomethingUnderLabel";
-            patterns = [
-              "ThingUnderLabel"
-              "!NotThisMaildirThough"
-              ''"[Weird] Label?"''
-            ];
-          };
-        };
-        # No group should be printed.
-        groups.emptyGroup = { };
-        # Group should be printed, but left with default channels.
-        groups.emptyChannels = {
-          channels.empty1 = { };
-          channels.empty2 = { };
-        };
-      };
-    };
-
-    test.asserts.warnings.expected = [
-      "mbsync channels no longer use masterPattern. use farPattern in its place."
-      "mbsync channels no longer use slavePattern. Use nearPattern in its place."
-    ];
-
-    test.stubs.isync = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.mbsyncrc
-      assertFileContent home-files/.mbsyncrc ${./mbsync-expected.conf}
-    '';
-  };
-}
diff --git a/tests/modules/programs/mbsync/mbsync.nix b/tests/modules/programs/mbsync/mbsync.nix
index 3880a313a..506c0073b 100644
--- a/tests/modules/programs/mbsync/mbsync.nix
+++ b/tests/modules/programs/mbsync/mbsync.nix
@@ -1,86 +1,72 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    programs.mbsync = {
-      enable = true;
-      # programs.mbsync.groups and
-      # accounts.email.accounts.<name>.mbsync.groups should NOT be used at the
-      # same time.
-      # If they are, then the new version will take precedence.
-      groups.inboxes = {
-        "hm@example.com" = [ "Inbox1" "Inbox2" ];
-        hm-account = [ "Inbox" ];
-      };
+  programs.mbsync = {
+    enable = true;
+    # programs.mbsync.groups and
+    # accounts.email.accounts.<name>.mbsync.groups should NOT be used at the
+    # same time.
+    # If they are, then the new version will take precedence.
+    groups.inboxes = {
+      "hm@example.com" = [ "Inbox1" "Inbox2" ];
+      hm-account = [ "Inbox" ];
     };
-
-    accounts.email.accounts = {
-      "hm@example.com".mbsync = {
-        enable = true;
-        extraConfig.account.TLSVersions = [ "+1.3" "+1.2" "-1.1" ];
-        groups.inboxes = {
-          channels = {
-            inbox1 = {
-              farPattern = "Inbox1";
-              nearPattern = "Inboxes";
-            };
-            inbox2 = {
-              farPattern = "Inbox2";
-              nearPattern = "Inboxes";
-            };
-          };
-        };
-      };
-
-      hm-account.mbsync = {
-        enable = true;
-        groups.hm-account = {
-          channels.earlierPatternMatch = {
-            farPattern = "Label";
-            nearPattern = "SomethingUnderLabel";
-            patterns = [
-              "ThingUnderLabel"
-              "!NotThisMaildirThough"
-              ''"[Weird] Label?"''
-            ];
-          };
-          channels.inbox = {
-            farPattern = "Inbox";
-            nearPattern = "Inbox";
-          };
-          channels.strangeHostBoxName = {
-            farPattern = "[Weird]/Label Mess";
-            nearPattern = "[AnotherWeird]/Label";
-          };
-          channels.patternMatch = {
-            farPattern = "Label";
-            nearPattern = "SomethingUnderLabel";
-            patterns = [
-              "ThingUnderLabel"
-              "!NotThisMaildirThough"
-              ''"[Weird] Label?"''
-            ];
-          };
-        };
-        # No group should be printed.
-        groups.emptyGroup = { };
-        # Group should be printed, but left with default channels.
-        groups.emptyChannels = {
-          channels.empty1 = { };
-          channels.empty2 = { };
-        };
-      };
-    };
-
-    test.stubs.isync = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/isyncrc
-      assertFileContent home-files/.config/isyncrc ${./mbsync-expected.conf}
-    '';
   };
+
+  accounts.email.accounts = {
+    "hm@example.com".mbsync = {
+      enable = true;
+      extraConfig.account.TLSVersions = [ "+1.3" "+1.2" "-1.1" ];
+      groups.inboxes = {
+        channels = {
+          inbox1 = {
+            farPattern = "Inbox1";
+            nearPattern = "Inboxes";
+          };
+          inbox2 = {
+            farPattern = "Inbox2";
+            nearPattern = "Inboxes";
+          };
+        };
+      };
+    };
+
+    hm-account.mbsync = {
+      enable = true;
+      groups.hm-account = {
+        channels.earlierPatternMatch = {
+          farPattern = "Label";
+          nearPattern = "SomethingUnderLabel";
+          patterns =
+            [ "ThingUnderLabel" "!NotThisMaildirThough" ''"[Weird] Label?"'' ];
+        };
+        channels.inbox = {
+          farPattern = "Inbox";
+          nearPattern = "Inbox";
+        };
+        channels.strangeHostBoxName = {
+          farPattern = "[Weird]/Label Mess";
+          nearPattern = "[AnotherWeird]/Label";
+        };
+        channels.patternMatch = {
+          farPattern = "Label";
+          nearPattern = "SomethingUnderLabel";
+          patterns =
+            [ "ThingUnderLabel" "!NotThisMaildirThough" ''"[Weird] Label?"'' ];
+        };
+      };
+      # No group should be printed.
+      groups.emptyGroup = { };
+      # Group should be printed, but left with default channels.
+      groups.emptyChannels = {
+        channels.empty1 = { };
+        channels.empty2 = { };
+      };
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/isyncrc
+    assertFileContent home-files/.config/isyncrc ${./mbsync-expected.conf}
+  '';
 }
diff --git a/tests/modules/programs/micro/micro.nix b/tests/modules/programs/micro/micro.nix
index 92ab90e83..74d589f9e 100644
--- a/tests/modules/programs/micro/micro.nix
+++ b/tests/modules/programs/micro/micro.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.micro = {
     enable = true;
@@ -10,8 +8,6 @@
     };
   };
 
-  test.stubs.micro = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/micro/settings.json \
     ${builtins.toFile "micro-expected-settings.json" ''
diff --git a/tests/modules/programs/mpv/mpv-example-settings.nix b/tests/modules/programs/mpv/mpv-example-settings.nix
index 2fc5ca5de..972ccfdbc 100644
--- a/tests/modules/programs/mpv/mpv-example-settings.nix
+++ b/tests/modules/programs/mpv/mpv-example-settings.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./mpv-stubs.nix ];
-
   programs.mpv = {
     enable = true;
 
diff --git a/tests/modules/programs/mpv/mpv-invalid-settings.nix b/tests/modules/programs/mpv/mpv-invalid-settings.nix
index 896e34fa7..9f661cdd4 100644
--- a/tests/modules/programs/mpv/mpv-invalid-settings.nix
+++ b/tests/modules/programs/mpv/mpv-invalid-settings.nix
@@ -1,14 +1,18 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./mpv-stubs.nix ];
-
   programs.mpv = {
     enable = true;
     package = pkgs.emptyDirectory;
     scripts = [ pkgs.mpvScript ];
   };
 
+  test.stubs = {
+    mpv = { extraAttrs.override = { ... }: pkgs.emptyDirectory; };
+
+    mpvScript = { extraAttrs = { scriptName = "something"; }; };
+  };
+
   test.asserts.assertions.expected = [
     ''
       The programs.mpv "package" option is mutually exclusive with "scripts" option.''
diff --git a/tests/modules/programs/mpv/mpv-stubs.nix b/tests/modules/programs/mpv/mpv-stubs.nix
deleted file mode 100644
index caef8e69d..000000000
--- a/tests/modules/programs/mpv/mpv-stubs.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      mpvScript = prev.runCommandLocal "mpvScript" { scriptName = "something"; }
-        "mkdir $out";
-
-      mpv-unwrapped = let
-        lua = prev.emptyDirectory.overrideAttrs {
-          luaversion = "0";
-          passthru.withPackages = pkgsFn: prev.emptyDirectory;
-        };
-        mpv-unwrapped' = prev.mpv-unwrapped.override { inherit lua; };
-      in mpv-unwrapped'.overrideAttrs {
-        buildInputs = [ ];
-        nativeBuildInputs = [ ];
-        builder = prev.writeShellScript "dummy" ''
-          PATH=${final.coreutils}/bin
-          mkdir -p $dev $doc $man $out/bin $out/Applications/mpv.app/Contents/MacOS
-          touch $out/bin/{mpv,umpv} \
-                $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle}
-          chmod +x $out/bin/{mpv,umpv} \
-                   $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle}
-        '';
-      };
-    })
-  ];
-
-  test.stubs = { yt-dlp = { }; };
-}
diff --git a/tests/modules/programs/mu/basic-configuration.nix b/tests/modules/programs/mu/basic-configuration.nix
index 60c14697a..9c180e1d4 100644
--- a/tests/modules/programs/mu/basic-configuration.nix
+++ b/tests/modules/programs/mu/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
@@ -12,8 +10,6 @@
 
   programs.mu.enable = true;
 
-  test.stubs.mu = { name = "mu"; };
-
   nmt.script = ''
     assertFileContains activate \
       'if [[ ! -d "/home/hm-user/.cache/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then'
diff --git a/tests/modules/programs/mu/custom-configuration.nix b/tests/modules/programs/mu/custom-configuration.nix
index 41f9b84ce..dbaf3d18f 100644
--- a/tests/modules/programs/mu/custom-configuration.nix
+++ b/tests/modules/programs/mu/custom-configuration.nix
@@ -13,8 +13,6 @@
     home = config.xdg.dataHome + "/mu";
   };
 
-  test.stubs.mu = { name = "mu"; };
-
   nmt.script = ''
     assertFileContains activate \
       'if [[ ! -d "/home/hm-user/.local/share/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then'
diff --git a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix
index ba1607ab8..71a89d91d 100644
--- a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix
+++ b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix
@@ -1,25 +1,16 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    # Minimal config reproducing
-    # https://github.com/nix-community/home-manager/issues/3560
-    programs.ncmpcpp.enable = true;
+  # Minimal config reproducing
+  # https://github.com/nix-community/home-manager/issues/3560
+  programs.ncmpcpp.enable = true;
 
-    services.mpd.enable = true;
-    services.mpd.musicDirectory = "~/music";
+  services.mpd.enable = true;
+  services.mpd.musicDirectory = "~/music";
 
-    test.stubs = {
-      ncmpcpp = { };
-      mpd = { };
-    };
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/ncmpcpp/config \
+      ${./ncmpcpp-issue-3560-expected-config}
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/ncmpcpp/config \
-        ${./ncmpcpp-issue-3560-expected-config}
-
-      assertPathNotExists home-files/.config/ncmpcpp/bindings
-    '';
-  };
+    assertPathNotExists home-files/.config/ncmpcpp/bindings
+  '';
 }
diff --git a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix
index f977bddec..21cf961a0 100644
--- a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix
+++ b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix
@@ -1,23 +1,14 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.ncmpcpp.enable = true;
+  programs.ncmpcpp.enable = true;
 
-    services.mpd.enable = true;
-    services.mpd.musicDirectory = "/home/user/music";
+  services.mpd.enable = true;
+  services.mpd.musicDirectory = "/home/user/music";
 
-    test.stubs = {
-      ncmpcpp = { };
-      mpd = { };
-    };
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/ncmpcpp/config \
+      ${./ncmpcpp-use-mpd-config-expected-config}
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/ncmpcpp/config \
-        ${./ncmpcpp-use-mpd-config-expected-config}
-
-      assertPathNotExists home-files/.config/ncmpcpp/bindings
-    '';
-  };
+    assertPathNotExists home-files/.config/ncmpcpp/bindings
+  '';
 }
diff --git a/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix b/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix
index 554366509..3a7452a79 100644
--- a/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix
+++ b/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix
@@ -1,15 +1,9 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.ncmpcpp.enable = true;
+  programs.ncmpcpp.enable = true;
 
-    test.stubs.ncmpcpp = { };
+  nmt.script = ''
+    assertPathNotExists home-files/.config/ncmpcpp/config
 
-    nmt.script = ''
-      assertPathNotExists home-files/.config/ncmpcpp/config
-
-      assertPathNotExists home-files/.config/ncmpcpp/bindings
-    '';
-  };
+    assertPathNotExists home-files/.config/ncmpcpp/bindings
+  '';
 }
diff --git a/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix b/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix
index a85ea552c..bf916dfbe 100644
--- a/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix
+++ b/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix
@@ -1,59 +1,53 @@
-{ pkgs, ... }:
-
 {
-  config = {
-    programs.ncmpcpp = {
-      enable = true;
-      mpdMusicDir = "/home/user/music";
+  programs.ncmpcpp = {
+    enable = true;
+    mpdMusicDir = "/home/user/music";
 
-      settings = {
-        user_interface = "alternative";
-        display_volume_level = false;
-        playlist_disable_highlight_delay = 0;
-      };
-
-      bindings = [
-        {
-          key = "j";
-          command = "scroll_down";
-        }
-        {
-          key = "k";
-          command = "scroll_up";
-        }
-        {
-          key = "J";
-          command = [ "select_item" "scroll_down" ];
-        }
-        {
-          key = "K";
-          command = [ "select_item" "scroll_up" ];
-        }
-        {
-          key = "x";
-          command = "delete_playlist_items";
-        }
-        {
-          key = "x";
-          command = "delete_browser_items";
-        }
-        {
-          key = "x";
-          command = "delete_stored_playlist";
-        }
-      ];
+    settings = {
+      user_interface = "alternative";
+      display_volume_level = false;
+      playlist_disable_highlight_delay = 0;
     };
 
-    test.stubs.ncmpcpp = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/ncmpcpp/config \
-        ${./ncmpcpp-example-settings-expected-config}
-
-      assertFileContent \
-        home-files/.config/ncmpcpp/bindings \
-        ${./ncmpcpp-example-settings-expected-bindings}
-    '';
+    bindings = [
+      {
+        key = "j";
+        command = "scroll_down";
+      }
+      {
+        key = "k";
+        command = "scroll_up";
+      }
+      {
+        key = "J";
+        command = [ "select_item" "scroll_down" ];
+      }
+      {
+        key = "K";
+        command = [ "select_item" "scroll_up" ];
+      }
+      {
+        key = "x";
+        command = "delete_playlist_items";
+      }
+      {
+        key = "x";
+        command = "delete_browser_items";
+      }
+      {
+        key = "x";
+        command = "delete_stored_playlist";
+      }
+    ];
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/ncmpcpp/config \
+      ${./ncmpcpp-example-settings-expected-config}
+
+    assertFileContent \
+      home-files/.config/ncmpcpp/bindings \
+      ${./ncmpcpp-example-settings-expected-bindings}
+  '';
 }
diff --git a/tests/modules/programs/ne/defprefs.nix b/tests/modules/programs/ne/defprefs.nix
index 64d78d276..1fd8cd7f5 100644
--- a/tests/modules/programs/ne/defprefs.nix
+++ b/tests/modules/programs/ne/defprefs.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 let
   defpref = ''
     defined through defaultPreferences
@@ -12,24 +8,20 @@ let
   '';
 
 in {
-  config = {
-    programs.ne = {
-      enable = true;
-      defaultPreferences = defpref;
-      automaticPreferences.".default" = autopref;
-    };
+  programs.ne = {
+    enable = true;
+    defaultPreferences = defpref;
+    automaticPreferences.".default" = autopref;
+  };
 
-    test.stubs.ne = { };
-
-    nmt = {
-      description =
-        "Check that it gracefully handles the case of both defaultPreferences and automaticPreferences.'.default' being set, defaulting to the former.";
-      script = ''
-        assertFileExists home-files/.ne/.default#ap
-        assertFileContent home-files/.ne/.default#ap ${
-          builtins.toFile "defpref" defpref
-        }
-      '';
-    };
+  nmt = {
+    description =
+      "Check that it gracefully handles the case of both defaultPreferences and automaticPreferences.'.default' being set, defaulting to the former.";
+    script = ''
+      assertFileExists home-files/.ne/.default#ap
+      assertFileContent home-files/.ne/.default#ap ${
+        builtins.toFile "defpref" defpref
+      }
+    '';
   };
 }
diff --git a/tests/modules/programs/ne/passthroughs.nix b/tests/modules/programs/ne/passthroughs.nix
index f753826f3..2024b3b6a 100644
--- a/tests/modules/programs/ne/passthroughs.nix
+++ b/tests/modules/programs/ne/passthroughs.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ lib, ... }:
 
 let
 
@@ -44,29 +42,25 @@ let
   '';
 
 in {
-  config = {
-    programs.ne = {
-      enable = true;
-      inherit keybindings;
-      inherit menus;
-      inherit virtualExtensions;
-      inherit automaticPreferences;
-    };
+  programs.ne = {
+    enable = true;
+    inherit keybindings;
+    inherit menus;
+    inherit virtualExtensions;
+    inherit automaticPreferences;
+  };
 
-    test.stubs.ne = { };
+  nmt = {
+    description = "Check that configuration files are correctly written";
+    script = lib.concatStringsSep "\n" [
+      (checkFile ".keys" keybindings)
+      (checkFile ".extensions" virtualExtensions)
+      (checkFile ".menus" menus)
 
-    nmt = {
-      description = "Check that configuration files are correctly written";
-      script = concatStringsSep "\n" [
-        (checkFile ".keys" keybindings)
-        (checkFile ".extensions" virtualExtensions)
-        (checkFile ".menus" menus)
-
-        # Generates a check command for each entry in automaticPreferences.
-        (concatStringsSep "\n" (mapAttrsToList
-          (extension: contents: checkFile "${extension}#ap" contents)
-          automaticPreferences))
-      ];
-    };
+      # Generates a check command for each entry in automaticPreferences.
+      (lib.concatStringsSep "\n" (lib.mapAttrsToList
+        (extension: contents: checkFile "${extension}#ap" contents)
+        automaticPreferences))
+    ];
   };
 }
diff --git a/tests/modules/programs/neomutt/neomutt-no-folder-change.nix b/tests/modules/programs/neomutt/neomutt-no-folder-change.nix
index 0e874c228..3d6aa86dd 100644
--- a/tests/modules/programs/neomutt/neomutt-no-folder-change.nix
+++ b/tests/modules/programs/neomutt/neomutt-no-folder-change.nix
@@ -1,29 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        msmtp.enable = true;
-        neomutt.enable = true;
-        imap.port = 993;
-      };
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      msmtp.enable = true;
+      neomutt.enable = true;
+      imap.port = 993;
     };
-
-    programs.neomutt.enable = true;
-    programs.neomutt.changeFolderWhenSourcingAccount = false;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-no-folder-change-expected.conf
-      }
-    '';
   };
+
+  programs.neomutt.enable = true;
+  programs.neomutt.changeFolderWhenSourcingAccount = false;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-no-folder-change-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-not-primary.nix b/tests/modules/programs/neomutt/neomutt-not-primary.nix
index ccf5444a9..db1f2de64 100644
--- a/tests/modules/programs/neomutt/neomutt-not-primary.nix
+++ b/tests/modules/programs/neomutt/neomutt-not-primary.nix
@@ -1,25 +1,17 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com".maildir = null;
-      hm-account.neomutt.enable = true;
-    };
-
-    programs.neomutt.enable = true;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-not-primary-expected.conf
-      }
-    '';
+  accounts.email.accounts = {
+    "hm@example.com".maildir = null;
+    hm-account.neomutt.enable = true;
   };
+
+  programs.neomutt.enable = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-not-primary-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-unmailboxes.nix b/tests/modules/programs/neomutt/neomutt-unmailboxes.nix
index 162379b80..274fb5db8 100644
--- a/tests/modules/programs/neomutt/neomutt-unmailboxes.nix
+++ b/tests/modules/programs/neomutt/neomutt-unmailboxes.nix
@@ -1,30 +1,22 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        msmtp.enable = true;
-        neomutt.enable = true;
-        imap.port = 993;
-      };
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      msmtp.enable = true;
+      neomutt.enable = true;
+      imap.port = 993;
     };
-
-    programs.neomutt.enable = true;
-    programs.neomutt.unmailboxes = true;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-unmailboxes-expected.conf
-      }
-    '';
   };
+
+  programs.neomutt.enable = true;
+  programs.neomutt.unmailboxes = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-unmailboxes-expected.conf
+    }
+  '';
 }
 
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix b/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix
index 69fe4d9b5..1b420028f 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix
@@ -1,29 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.neomutt = {
-      enable = true;
+  programs.neomutt = {
+    enable = true;
 
-      binds = [{
-        action = "complete-query";
-        key = "<Tab>";
-        map = [ ];
-      }];
+    binds = [{
+      action = "complete-query";
+      key = "<Tab>";
+      map = [ ];
+    }];
 
-      macros = [{
-        action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
-        key = "c";
-        map = [ ];
-      }];
-    };
-
-    test.stubs.neomutt = { };
-
-    test.asserts.assertions.expected = [
-      "The 'programs.neomutt.(binds|macros).map' list must contain at least one element."
-    ];
+    macros = [{
+      action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
+      key = "c";
+      map = [ ];
+    }];
   };
+
+  test.asserts.assertions.expected = [
+    "The 'programs.neomutt.(binds|macros).map' list must contain at least one element."
+  ];
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
index 54012e9dd..f9d144dfd 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
@@ -1,70 +1,62 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 993;
     };
+  };
 
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
 
-      binds = [
-        {
-          action = "complete-query";
-          key = "<Tab>";
-          map = "editor";
-        }
-        {
-          action = "sidebar-prev";
-          key = "\\Cp";
-          map = [ "index" "pager" ];
-        }
-      ];
-
-      macros = [
-        {
-          action = "<save-message>?<tab>";
-          key = "s";
-          map = "index";
-        }
-        {
-          action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
-          key = "c";
-          map = [ "index" "pager" ];
-        }
-      ];
-    };
-
-    test.stubs.neomutt = { };
-
-    test.asserts.warnings.expected = [
-      "Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See https://github.com/nix-community/home-manager/pull/1885."
+    binds = [
+      {
+        action = "complete-query";
+        key = "<Tab>";
+        map = "editor";
+      }
+      {
+        action = "sidebar-prev";
+        key = "\\Cp";
+        map = [ "index" "pager" ];
+      }
     ];
 
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-with-binds-expected.conf
+    macros = [
+      {
+        action = "<save-message>?<tab>";
+        key = "s";
+        map = "index";
       }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-expected
+      {
+        action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
+        key = "c";
+        map = [ "index" "pager" ];
       }
-    '';
+    ];
   };
+
+  test.asserts.warnings.expected = [
+    "Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See https://github.com/nix-community/home-manager/pull/1885."
+  ];
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-with-binds-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds.nix b/tests/modules/programs/neomutt/neomutt-with-binds.nix
index 64ebf80f8..7f97ae9e8 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-binds.nix
@@ -1,66 +1,58 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 993;
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-
-      binds = [
-        {
-          action = "complete-query";
-          key = "<Tab>";
-          map = [ "editor" ];
-        }
-        {
-          action = "sidebar-prev";
-          key = "\\Cp";
-          map = [ "index" "pager" ];
-        }
-      ];
-
-      macros = [
-        {
-          action = "<save-message>?<tab>";
-          key = "s";
-          map = [ "index" ];
-        }
-        {
-          action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
-          key = "c";
-          map = [ "index" "pager" ];
-        }
-      ];
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-with-binds-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+
+    binds = [
+      {
+        action = "complete-query";
+        key = "<Tab>";
+        map = [ "editor" ];
+      }
+      {
+        action = "sidebar-prev";
+        key = "\\Cp";
+        map = [ "index" "pager" ];
+      }
+    ];
+
+    macros = [
+      {
+        action = "<save-message>?<tab>";
+        key = "s";
+        map = [ "index" ];
+      }
+      {
+        action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
+        key = "c";
+        map = [ "index" "pager" ];
+      }
+    ];
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-with-binds-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-gpg.nix b/tests/modules/programs/neomutt/neomutt-with-gpg.nix
index 2eed53583..1f542d747 100644
--- a/tests/modules/programs/neomutt/neomutt-with-gpg.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-gpg.nix
@@ -1,32 +1,27 @@
-{ config, lib, pkgs, ... }:
-with lib; {
+{
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        gpg = {
-          encryptByDefault = true;
-          signByDefault = true;
-        };
-        neomutt.enable = true;
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      gpg = {
+        encryptByDefault = true;
+        signByDefault = true;
       };
+      neomutt.enable = true;
+      imap.port = 993;
     };
-
-    programs.neomutt.enable = true;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-gpg-expected.conf
-      }
-    '';
   };
+
+  programs.neomutt.enable = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-gpg-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix b/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix
index 10dcdbed6..65ce1f22c 100644
--- a/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix
@@ -1,57 +1,49 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-          mailboxName = "someCustomName";
-          extraMailboxes = [
-            "Sent"
-            {
-              mailbox = "Junk Email";
-              name = "Spam";
-              type = "imap";
-            }
-            { mailbox = "Trash"; }
-          ];
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
+        mailboxName = "someCustomName";
+        extraMailboxes = [
+          "Sent"
+          {
+            mailbox = "Junk Email";
+            name = "Spam";
+            type = "imap";
+          }
+          { mailbox = "Trash"; }
+        ];
       };
+      imap.port = 993;
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
-        ./neomutt-with-imap-type-mailboxes-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-expected
-      }
-
-      confFile=$(grep -o \
-          '/nix/store/.*-account-command.sh/bin/account-command.sh' \
-          $TESTED/home-files/.config/neomutt/neomuttrc)
-      assertFileContent "$(normalizeStorePaths "$confFile")" ${
-        ./account-command.sh-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
+      ./neomutt-with-imap-type-mailboxes-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-expected
+    }
+
+    confFile=$(grep -o \
+        '/nix/store/.*-account-command.sh/bin/account-command.sh' \
+        $TESTED/home-files/.config/neomutt/neomuttrc)
+    assertFileContent "$(normalizeStorePaths "$confFile")" ${
+      ./account-command.sh-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-imap.nix b/tests/modules/programs/neomutt/neomutt-with-imap.nix
index 3f234fde7..5d71aed68 100644
--- a/tests/modules/programs/neomutt/neomutt-with-imap.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-imap.nix
@@ -1,44 +1,36 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        neomutt = {
-          enable = true;
-          mailboxType = "imap";
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      neomutt = {
+        enable = true;
+        mailboxType = "imap";
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 993;
     };
-
-    programs.neomutt.enable = true;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
-        ./neomutt-with-imap-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-imap-expected.conf
-      }
-
-      confFile=$(grep -o \
-          '/nix/store/.*-account-command.sh/bin/account-command.sh' \
-          $TESTED/home-files/.config/neomutt/neomuttrc)
-      assertFileContent "$(normalizeStorePaths "$confFile")" ${
-        ./account-command.sh-expected
-      }
-    '';
   };
+
+  programs.neomutt.enable = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
+      ./neomutt-with-imap-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-imap-expected.conf
+    }
+
+    confFile=$(grep -o \
+        '/nix/store/.*-account-command.sh/bin/account-command.sh' \
+        $TESTED/home-files/.config/neomutt/neomuttrc)
+    assertFileContent "$(normalizeStorePaths "$confFile")" ${
+      ./account-command.sh-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-msmtp.nix b/tests/modules/programs/neomutt/neomutt-with-msmtp.nix
index 48b2197d0..b711307b7 100644
--- a/tests/modules/programs/neomutt/neomutt-with-msmtp.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-msmtp.nix
@@ -1,37 +1,29 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        msmtp.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      msmtp.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 993;
     };
-
-    programs.neomutt.enable = true;
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-msmtp-expected.conf
-      }
-    '';
   };
+
+  programs.neomutt.enable = true;
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-msmtp-expected.conf
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
index fd4fedf01..1d1d2fa47 100644
--- a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix
@@ -1,49 +1,41 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-          mailboxName = "someCustomName";
-          extraMailboxes = [
-            "Sent"
-            {
-              mailbox = "Junk Email";
-              name = "Spam";
-            }
-            { mailbox = "Trash"; }
-          ];
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
+        mailboxName = "someCustomName";
+        extraMailboxes = [
+          "Sent"
+          {
+            mailbox = "Junk Email";
+            name = "Spam";
+          }
+          { mailbox = "Trash"; }
+        ];
       };
+      imap.port = 993;
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-with-named-mailboxes-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-with-named-mailboxes-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-signature-command.nix b/tests/modules/programs/neomutt/neomutt-with-signature-command.nix
index 97c2001f9..3700d0efe 100644
--- a/tests/modules/programs/neomutt/neomutt-with-signature-command.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-signature-command.nix
@@ -1,45 +1,39 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
-        signature = {
-          showSignature = "append";
-          command = pkgs.writeScript "signature" "echo This is my signature";
-        };
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
+      };
+      imap.port = 993;
+      signature = {
+        showSignature = "append";
+        command = pkgs.writeScript "signature" "echo This is my signature";
       };
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com")
-      assertFileContent "$expectedSignature" ${
-        ./hm-example.com-signature-command-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com")
+    assertFileContent "$expectedSignature" ${
+      ./hm-example.com-signature-command-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-signature.nix b/tests/modules/programs/neomutt/neomutt-with-signature.nix
index 9461976d3..e8361e0a2 100644
--- a/tests/modules/programs/neomutt/neomutt-with-signature.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-signature.nix
@@ -1,48 +1,40 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
-        signature = {
-          showSignature = "append";
-          text = ''
-            --
-            Test Signature
-          '';
-        };
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
+      };
+      imap.port = 993;
+      signature = {
+        showSignature = "append";
+        text = ''
+          --
+          Test Signature
+        '';
       };
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com")
-      assertFileContent "$expectedSignature" ${
-        ./hm-example.com-signature-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com")
+    assertFileContent "$expectedSignature" ${
+      ./hm-example.com-signature-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt-with-starttls.nix b/tests/modules/programs/neomutt/neomutt-with-starttls.nix
index 09d37ff9e..441985cac 100644
--- a/tests/modules/programs/neomutt/neomutt-with-starttls.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-starttls.nix
@@ -1,41 +1,33 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 143;
-        smtp.tls.useStartTls = true;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 143;
+      smtp.tls.useStartTls = true;
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-starttls-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-starttls-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neomutt/neomutt.nix b/tests/modules/programs/neomutt/neomutt.nix
index 08c8f5bf3..65d74a4f9 100644
--- a/tests/modules/programs/neomutt/neomutt.nix
+++ b/tests/modules/programs/neomutt/neomutt.nix
@@ -1,40 +1,32 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  config = {
-    accounts.email.accounts = {
-      "hm@example.com" = {
-        notmuch.enable = true;
-        neomutt = {
-          enable = true;
-          extraConfig = ''
-            color status cyan default
-          '';
-        };
-        imap.port = 993;
+  accounts.email.accounts = {
+    "hm@example.com" = {
+      notmuch.enable = true;
+      neomutt = {
+        enable = true;
+        extraConfig = ''
+          color status cyan default
+        '';
       };
+      imap.port = 993;
     };
-
-    programs.neomutt = {
-      enable = true;
-      vimKeys = false;
-    };
-
-    test.stubs.neomutt = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/neomutt/neomuttrc
-      assertFileExists home-files/.config/neomutt/hm@example.com
-      assertFileContent home-files/.config/neomutt/neomuttrc ${
-        ./neomutt-expected.conf
-      }
-      assertFileContent home-files/.config/neomutt/hm@example.com ${
-        ./hm-example.com-expected
-      }
-    '';
   };
+
+  programs.neomutt = {
+    enable = true;
+    vimKeys = false;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/neomutt/neomuttrc
+    assertFileExists home-files/.config/neomutt/hm@example.com
+    assertFileContent home-files/.config/neomutt/neomuttrc ${
+      ./neomutt-expected.conf
+    }
+    assertFileContent home-files/.config/neomutt/hm@example.com ${
+      ./hm-example.com-expected
+    }
+  '';
 }
diff --git a/tests/modules/programs/neovide/neovide.nix b/tests/modules/programs/neovide/neovide.nix
index 774964f01..6f3e6525a 100644
--- a/tests/modules/programs/neovide/neovide.nix
+++ b/tests/modules/programs/neovide/neovide.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.neovide = {
     enable = true;
@@ -25,8 +23,6 @@
     };
   };
 
-  test.stubs.neovide = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/neovide/config.toml
     assertFileContent home-files/.config/neovide/config.toml ${./expected.toml}
diff --git a/tests/modules/programs/neovim/coc-config.nix b/tests/modules/programs/neovim/coc-config.nix
index c16514134..cdb879a0f 100644
--- a/tests/modules/programs/neovim/coc-config.nix
+++ b/tests/modules/programs/neovim/coc-config.nix
@@ -1,27 +1,23 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.neovim = {
+  imports = [ ./stubs.nix ];
+
+  programs.neovim = {
+    enable = true;
+    coc = {
       enable = true;
-      coc = {
-        enable = true;
-        settings = {
-          # my variable
-          foo = "bar";
-        };
+      settings = {
+        # my variable
+        foo = "bar";
       };
     };
-
-    nmt.script = ''
-      cocSettings="$TESTED/home-files/.config/nvim/coc-settings.json"
-      cocSettingsNormalized="$(normalizeStorePaths "$cocSettings")"
-
-      assertFileExists "$cocSettings"
-      assertFileContent "$cocSettingsNormalized" "${./coc-config.expected}"
-    '';
   };
+
+  nmt.script = ''
+    cocSettings="$TESTED/home-files/.config/nvim/coc-settings.json"
+    cocSettingsNormalized="$(normalizeStorePaths "$cocSettings")"
+
+    assertFileExists "$cocSettings"
+    assertFileContent "$cocSettingsNormalized" "${./coc-config.expected}"
+  '';
 }
 
diff --git a/tests/modules/programs/neovim/extra-lua-init.nix b/tests/modules/programs/neovim/extra-lua-init.nix
index 2abaa6e9e..32f02fb70 100644
--- a/tests/modules/programs/neovim/extra-lua-init.nix
+++ b/tests/modules/programs/neovim/extra-lua-init.nix
@@ -1,23 +1,20 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.neovim = {
-      enable = true;
+  imports = [ ./stubs.nix ];
 
-      extraLuaConfig = ''
-        -- extraLuaConfig
-      '';
-    };
-    nmt.script = ''
-      nvimFolder="home-files/.config/nvim"
-      assertFileContent "$nvimFolder/init.lua" ${
-        pkgs.writeText "init.lua-expected" ''
-          -- extraLuaConfig
-        ''
-      }
+  programs.neovim = {
+    enable = true;
+
+    extraLuaConfig = ''
+      -- extraLuaConfig
     '';
   };
+
+  nmt.script = ''
+    nvimFolder="home-files/.config/nvim"
+    assertFileContent "$nvimFolder/init.lua" ${
+      builtins.toFile "init.lua-expected" ''
+        -- extraLuaConfig
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/neovim/no-init.nix b/tests/modules/programs/neovim/no-init.nix
index 693bdedec..69d0d08d3 100644
--- a/tests/modules/programs/neovim/no-init.nix
+++ b/tests/modules/programs/neovim/no-init.nix
@@ -1,28 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 {
-  config = {
-    programs.neovim = {
-      enable = true;
-      vimAlias = true;
-      withNodeJs = false;
-      withPython3 = true;
-      withRuby = false;
+  imports = [ ./stubs.nix ];
 
-      extraPython3Packages = (ps: with ps; [ jedi pynvim ]);
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    withNodeJs = false;
+    withPython3 = true;
+    withRuby = false;
 
-      # plugins without associated config should not trigger the creation of init.vim
-      plugins = with pkgs.vimPlugins; [
-        vim-fugitive
-        ({ plugin = vim-sensible; })
-      ];
-    };
-    nmt.script = ''
-      nvimFolder="home-files/.config/nvim"
-      assertPathNotExists "$nvimFolder/init.vim"
-      assertPathNotExists "$nvimFolder/init.lua"
-    '';
+    extraPython3Packages = (ps: with ps; [ jedi pynvim ]);
+
+    # plugins without associated config should not trigger the creation of init.vim
+    plugins = with pkgs.vimPlugins; [
+      vim-fugitive
+      ({ plugin = vim-sensible; })
+    ];
   };
+  nmt.script = ''
+    nvimFolder="home-files/.config/nvim"
+    assertPathNotExists "$nvimFolder/init.vim"
+    assertPathNotExists "$nvimFolder/init.lua"
+  '';
 }
diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix
index b12613588..0e014bc79 100644
--- a/tests/modules/programs/neovim/plugin-config.nix
+++ b/tests/modules/programs/neovim/plugin-config.nix
@@ -1,34 +1,32 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, realPkgs, ... }:
 
-with lib;
-
-{
-  config = {
-    programs.neovim = {
-      enable = true;
-      extraConfig = ''
-        let g:hmExtraConfig='HM_EXTRA_CONFIG'
-      '';
-      plugins = with pkgs.vimPlugins; [
-        vim-nix
-        {
-          plugin = vim-commentary;
-          config = ''
-            let g:hmPlugins='HM_PLUGINS_CONFIG'
-          '';
-        }
-      ];
-      extraLuaPackages = [ pkgs.lua51Packages.luautf8 ];
-    };
-
-    nmt.script = ''
-      vimout=$(mktemp)
-      echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \
-        | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \
-        > "$vimout" || true
-      assertFileContains "$vimout" "HM_EXTRA_CONFIG"
-      assertFileContains "$vimout" "HM_PLUGINS_CONFIG"
+lib.mkIf config.test.enableBig {
+  programs.neovim = {
+    enable = true;
+    extraConfig = ''
+      let g:hmExtraConfig='HM_EXTRA_CONFIG'
     '';
+    plugins = with pkgs.vimPlugins; [
+      vim-nix
+      {
+        plugin = vim-commentary;
+        config = ''
+          let g:hmPlugins='HM_PLUGINS_CONFIG'
+        '';
+      }
+    ];
+    extraLuaPackages = [ pkgs.lua51Packages.luautf8 ];
   };
+
+  _module.args.pkgs = lib.mkForce realPkgs;
+
+  nmt.script = ''
+    vimout=$(mktemp)
+    echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \
+      | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \
+      > "$vimout" || true
+    assertFileContains "$vimout" "HM_EXTRA_CONFIG"
+    assertFileContains "$vimout" "HM_PLUGINS_CONFIG"
+  '';
 }
 
diff --git a/tests/modules/programs/neovim/runtime.nix b/tests/modules/programs/neovim/runtime.nix
index 7f39c8461..61ec8b9b6 100644
--- a/tests/modules/programs/neovim/runtime.nix
+++ b/tests/modules/programs/neovim/runtime.nix
@@ -1,53 +1,51 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, realPkgs, ... }:
 
-with lib;
+lib.mkIf config.test.enableBig {
+  programs.neovim = lib.mkMerge [
+    {
+      enable = true;
+      plugins = with pkgs.vimPlugins; [
+        vim-nix
+        {
+          plugin = vim-commentary;
+          runtime = {
+            "after/ftplugin/c.vim".text = ''
+              " plugin-specific config
+              setlocal commentstring=//\ %s
+              setlocal comments=://
+            '';
+          };
+        }
+      ];
+      extraWrapperArgs = let buildDeps = with pkgs; [ stdenv.cc.cc zlib ];
+      in [
+        "--suffix"
+        "LIBRARY_PATH"
+        ":"
+        "${lib.makeLibraryPath buildDeps}"
+        "--suffix"
+        "PKG_CONFIG_PATH"
+        ":"
+        "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" buildDeps}"
+      ];
+    }
+    {
+      extraPython3Packages = ps: with ps; [ jedi pynvim ];
+      extraLuaPackages = ps: with ps; [ luacheck ];
+    }
+    {
+      extraPython3Packages = with pkgs.python3Packages; [ jedi pynvim ];
+      extraLuaPackages = with pkgs.lua51Packages; [ luacheck ];
+    }
+  ];
 
-{
-  config = {
-    programs.neovim = lib.mkMerge [
-      {
-        enable = true;
-        plugins = with pkgs.vimPlugins; [
-          vim-nix
-          {
-            plugin = vim-commentary;
-            runtime = {
-              "after/ftplugin/c.vim".text = ''
-                " plugin-specific config
-                setlocal commentstring=//\ %s
-                setlocal comments=://
-              '';
-            };
-          }
-        ];
-        extraWrapperArgs = let buildDeps = with pkgs; [ stdenv.cc.cc zlib ];
-        in [
-          "--suffix"
-          "LIBRARY_PATH"
-          ":"
-          "${lib.makeLibraryPath buildDeps}"
-          "--suffix"
-          "PKG_CONFIG_PATH"
-          ":"
-          "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" buildDeps}"
-        ];
-      }
-      {
-        extraPython3Packages = ps: with ps; [ jedi pynvim ];
-        extraLuaPackages = ps: with ps; [ luacheck ];
-      }
-      {
-        extraPython3Packages = with pkgs.python3Packages; [ jedi pynvim ];
-        extraLuaPackages = with pkgs.lua51Packages; [ luacheck ];
-      }
-    ];
+  _module.args.pkgs = lib.mkForce realPkgs;
 
-    nmt.script = ''
-      ftplugin="home-files/.config/nvim/after/ftplugin/c.vim"
-      nvimbin="home-path/bin/nvim"
-      assertFileExists "$ftplugin"
-      assertFileRegex "$nvimbin" 'LIBRARY_PATH'
-      assertFileRegex "$nvimbin" 'PKG_CONFIG_PATH'
-    '';
-  };
+  nmt.script = ''
+    ftplugin="home-files/.config/nvim/after/ftplugin/c.vim"
+    nvimbin="home-path/bin/nvim"
+    assertFileExists "$ftplugin"
+    assertFileRegex "$nvimbin" 'LIBRARY_PATH'
+    assertFileRegex "$nvimbin" 'PKG_CONFIG_PATH'
+  '';
 }
diff --git a/tests/modules/programs/neovim/stubs.nix b/tests/modules/programs/neovim/stubs.nix
new file mode 100644
index 000000000..edd5cebf2
--- /dev/null
+++ b/tests/modules/programs/neovim/stubs.nix
@@ -0,0 +1,35 @@
+{ lib, pkgs, ... }:
+
+{
+  test.stubs = {
+    neovim-unwrapped = {
+      name = "neovim-unwrapped";
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/bin $out/share/applications
+        echo "Name=Neovim" > $out/share/applications/nvim.desktop
+
+        cp ${pkgs.writeShellScript "nvim" "exit 0"} $out/bin/nvim
+        chmod +x $out/bin/nvim
+      '';
+      extraAttrs = {
+        lua = pkgs.writeTextDir "nix-support/utils.sh" ''
+          function _addToLuaPath() {
+            return 0
+          }
+        '';
+
+        meta = let stub = "stub";
+        in {
+          description = stub;
+          longDescription = stub;
+          homepage = stub;
+          mainProgram = stub;
+          license = [ stub ];
+          maintainers = [ stub ];
+          platforms = lib.platforms.all;
+        };
+      };
+    };
+  };
+}
diff --git a/tests/modules/programs/newsboat/newsboat-basics-2003.nix b/tests/modules/programs/newsboat/newsboat-basics-2003.nix
index 26d5f4b32..592d0f8e6 100644
--- a/tests/modules/programs/newsboat/newsboat-basics-2003.nix
+++ b/tests/modules/programs/newsboat/newsboat-basics-2003.nix
@@ -1,33 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    home.stateVersion = "20.03";
+  home.stateVersion = "20.03";
 
-    programs.newsboat = {
-      enable = true;
+  programs.newsboat = {
+    enable = true;
 
-      urls = [
-        {
-          url = "http://example.org/feed.xml";
-          tags = [ "tag1" "tag2" ];
-          title = "Cool feed";
-        }
+    urls = [
+      {
+        url = "http://example.org/feed.xml";
+        tags = [ "tag1" "tag2" ];
+        title = "Cool feed";
+      }
 
-        { url = "http://example.org/feed2.xml"; }
-      ];
+      { url = "http://example.org/feed2.xml"; }
+    ];
 
-      queries = { "foo" = ''rssurl =~ "example.com"''; };
-    };
-
-    test.stubs.newsboat = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.newsboat/urls \
-        ${./newsboat-basics-urls-2003.txt}
-    '';
+    queries = { "foo" = ''rssurl =~ "example.com"''; };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.newsboat/urls \
+      ${./newsboat-basics-urls-2003.txt}
+  '';
 }
diff --git a/tests/modules/programs/newsboat/newsboat-basics-2105.nix b/tests/modules/programs/newsboat/newsboat-basics-2105.nix
index ec0f33728..8cc46754b 100644
--- a/tests/modules/programs/newsboat/newsboat-basics-2105.nix
+++ b/tests/modules/programs/newsboat/newsboat-basics-2105.nix
@@ -1,34 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    home.stateVersion = "21.05";
+  home.stateVersion = "21.05";
 
-    programs.newsboat = {
-      enable = true;
+  programs.newsboat = {
+    enable = true;
 
-      urls = [
-        {
-          url = "http://example.org/feed.xml";
-          tags = [ "tag1" "tag2" ];
-          title = "Cool feed";
-        }
+    urls = [
+      {
+        url = "http://example.org/feed.xml";
+        tags = [ "tag1" "tag2" ];
+        title = "Cool feed";
+      }
 
-        { url = "http://example.org/feed2.xml"; }
-      ];
+      { url = "http://example.org/feed2.xml"; }
+    ];
 
-      queries = { "foo" = ''rssurl =~ "example.com"''; };
-    };
-
-    test.stubs.newsboat = { };
-
-    # The format didn't change since 20.03, just the location.
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/newsboat/urls \
-        ${./newsboat-basics-urls-2003.txt}
-    '';
+    queries = { "foo" = ''rssurl =~ "example.com"''; };
   };
+
+  # The format didn't change since 20.03, just the location.
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/newsboat/urls \
+      ${./newsboat-basics-urls-2003.txt}
+  '';
 }
diff --git a/tests/modules/programs/newsboat/newsboat-basics.nix b/tests/modules/programs/newsboat/newsboat-basics.nix
index fe7f85070..fe417a87a 100644
--- a/tests/modules/programs/newsboat/newsboat-basics.nix
+++ b/tests/modules/programs/newsboat/newsboat-basics.nix
@@ -1,31 +1,23 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.newsboat = {
-      enable = true;
+  programs.newsboat = {
+    enable = true;
 
-      urls = [
-        {
-          url = "http://example.org/feed.xml";
-          tags = [ "tag1" "tag2" ];
-          title = "Cool feed";
-        }
+    urls = [
+      {
+        url = "http://example.org/feed.xml";
+        tags = [ "tag1" "tag2" ];
+        title = "Cool feed";
+      }
 
-        { url = "http://example.org/feed2.xml"; }
-      ];
+      { url = "http://example.org/feed2.xml"; }
+    ];
 
-      queries = { "foo" = ''rssurl =~ "example.com"''; };
-    };
-
-    test.stubs.newsboat = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.newsboat/urls \
-        ${./newsboat-basics-urls.txt}
-    '';
+    queries = { "foo" = ''rssurl =~ "example.com"''; };
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.newsboat/urls \
+      ${./newsboat-basics-urls.txt}
+  '';
 }
diff --git a/tests/modules/programs/nheko/nheko-empty-settings.nix b/tests/modules/programs/nheko/nheko-empty-settings.nix
index 65538d9eb..6979ba1df 100644
--- a/tests/modules/programs/nheko/nheko-empty-settings.nix
+++ b/tests/modules/programs/nheko/nheko-empty-settings.nix
@@ -8,8 +8,6 @@ let
 in {
   programs.nheko.enable = true;
 
-  test.stubs.nheko = { };
-
   nmt.script = ''
     assertPathNotExists "${configDir}/nheko/nheko.conf"
   '';
diff --git a/tests/modules/programs/nheko/nheko-example-settings.nix b/tests/modules/programs/nheko/nheko-example-settings.nix
index 26599c5a0..4700db2ca 100644
--- a/tests/modules/programs/nheko/nheko-example-settings.nix
+++ b/tests/modules/programs/nheko/nheko-example-settings.nix
@@ -74,8 +74,6 @@ in {
     };
   };
 
-  test.stubs.nheko = { };
-
   nmt.script = ''
     assertFileContent \
       "${configDir}/nheko/nheko.conf" \
diff --git a/tests/modules/programs/nix-index/assert-on-command-not-found.nix b/tests/modules/programs/nix-index/assert-on-command-not-found.nix
index 94d7efc34..511dd7d0c 100644
--- a/tests/modules/programs/nix-index/assert-on-command-not-found.nix
+++ b/tests/modules/programs/nix-index/assert-on-command-not-found.nix
@@ -1,31 +1,27 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
-  config = {
-    programs.bash.enable = true;
-    programs.fish.enable = true;
-    programs.zsh.enable = true;
+  programs.bash.enable = true;
+  programs.fish.enable = true;
+  programs.zsh.enable = true;
 
-    programs.command-not-found.enable = true;
+  programs.command-not-found.enable = true;
 
-    # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source =
-      lib.mkForce (builtins.toFile "empty" "");
+  # Needed to avoid error with dummy fish package.
+  xdg.dataFile."fish/home-manager_generated_completions".source =
+    lib.mkForce (builtins.toFile "empty" "");
 
-    test.stubs.zsh = { };
+  programs.nix-index.enable = true;
 
-    programs.nix-index.enable = true;
-
-    # 'command-not-found' does not have a 'fish' integration
-    test.asserts.assertions.expected = [
-      ''
-        The 'programs.command-not-found.enable' option is mutually exclusive
-        with the 'programs.nix-index.enableBashIntegration' option.
-      ''
-      ''
-        The 'programs.command-not-found.enable' option is mutually exclusive
-        with the 'programs.nix-index.enableZshIntegration' option.
-      ''
-    ];
-  };
+  # 'command-not-found' does not have a 'fish' integration
+  test.asserts.assertions.expected = [
+    ''
+      The 'programs.command-not-found.enable' option is mutually exclusive
+      with the 'programs.nix-index.enableBashIntegration' option.
+    ''
+    ''
+      The 'programs.command-not-found.enable' option is mutually exclusive
+      with the 'programs.nix-index.enableZshIntegration' option.
+    ''
+  ];
 }
diff --git a/tests/modules/programs/nix-index/integrations.nix b/tests/modules/programs/nix-index/integrations.nix
index 2fd5253ac..6bcda0502 100644
--- a/tests/modules/programs/nix-index/integrations.nix
+++ b/tests/modules/programs/nix-index/integrations.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 let
   fishRegex = ''
@@ -7,36 +7,32 @@ let
     end
   '';
 in {
-  config = {
-    programs.bash.enable = true;
-    programs.fish.enable = true;
-    programs.zsh.enable = true;
+  programs.bash.enable = true;
+  programs.fish.enable = true;
+  programs.zsh.enable = true;
 
-    # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source =
-      lib.mkForce (builtins.toFile "empty" "");
+  # Needed to avoid error with dummy fish package.
+  xdg.dataFile."fish/home-manager_generated_completions".source =
+    lib.mkForce (builtins.toFile "empty" "");
 
-    test.stubs.zsh = { };
+  programs.nix-index.enable = true;
 
-    programs.nix-index.enable = true;
+  nmt.script = ''
+    # Bash integration
+    assertFileExists home-files/.bashrc
+    assertFileRegex \
+      home-files/.bashrc \
+      'source @nix-index@/etc/profile.d/command-not-found.sh'
 
-    nmt.script = ''
-      # Bash integration
-      assertFileExists home-files/.bashrc
-      assertFileRegex \
-        home-files/.bashrc \
-        'source /nix/store/.*nix-index.*/etc/profile.d/command-not-found.sh'
+    # Zsh integration
+    assertFileExists home-files/.zshrc
+    assertFileRegex \
+      home-files/.zshrc \
+      'source @nix-index@/etc/profile.d/command-not-found.sh'
 
-      # Zsh integration
-      assertFileExists home-files/.zshrc
-      assertFileRegex \
-        home-files/.zshrc \
-        'source /nix/store/.*nix-index.*/etc/profile.d/command-not-found.sh'
-
-      # Fish integration
-      assertFileExists home-files/.config/fish/config.fish
-      assertFileRegex \
-        home-files/.config/fish/config.fish '${fishRegex}'
-    '';
-  };
+    # Fish integration
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileRegex \
+      home-files/.config/fish/config.fish '${fishRegex}'
+  '';
 }
diff --git a/tests/modules/programs/nix-your-shell/enable-shells.nix b/tests/modules/programs/nix-your-shell/enable-shells.nix
index ab8c6909e..8c136da4d 100644
--- a/tests/modules/programs/nix-your-shell/enable-shells.nix
+++ b/tests/modules/programs/nix-your-shell/enable-shells.nix
@@ -13,12 +13,6 @@
     zsh.enable = true;
   };
 
-  test.stubs = {
-    nix-your-shell = { };
-    nushell = { };
-    zsh = { };
-  };
-
   nmt.script = let
     nushellConfigDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
       "home-files/Library/Application Support/nushell"
diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index 9f0108a30..cc9e8f8ec 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -1,8 +1,9 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, realPkgs, config, lib, ... }:
 
 {
   programs.nushell = {
     enable = true;
+    package = realPkgs.nushell;
 
     configFile.text = ''
       let config = {
@@ -23,7 +24,7 @@
       }
     '';
 
-    plugins = [ pkgs.nushellPlugins.formats ];
+    plugins = [ realPkgs.nushellPlugins.formats ];
 
     shellAliases = {
       "ll" = "ls -a";
diff --git a/tests/modules/programs/oh-my-posh/bash.nix b/tests/modules/programs/oh-my-posh/bash.nix
index 2e3d93ac3..6818df8c7 100644
--- a/tests/modules/programs/oh-my-posh/bash.nix
+++ b/tests/modules/programs/oh-my-posh/bash.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     bash.enable = true;
@@ -10,8 +8,6 @@
     };
   };
 
-  test.stubs.oh-my-posh = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/oh-my-posh/fish.nix b/tests/modules/programs/oh-my-posh/fish.nix
index 07137b986..9e890db45 100644
--- a/tests/modules/programs/oh-my-posh/fish.nix
+++ b/tests/modules/programs/oh-my-posh/fish.nix
@@ -14,8 +14,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs.oh-my-posh = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
diff --git a/tests/modules/programs/oh-my-posh/nushell.nix b/tests/modules/programs/oh-my-posh/nushell.nix
index da4ffafd3..2e5079e06 100644
--- a/tests/modules/programs/oh-my-posh/nushell.nix
+++ b/tests/modules/programs/oh-my-posh/nushell.nix
@@ -10,11 +10,6 @@
     };
   };
 
-  test.stubs = {
-    oh-my-posh = { };
-    nushell = { };
-  };
-
   nmt.script = let
     configFile = if pkgs.stdenv.isDarwin && !config.xdg.enable then
       "home-files/Library/Application Support/nushell/config.nu"
diff --git a/tests/modules/programs/oh-my-posh/zsh.nix b/tests/modules/programs/oh-my-posh/zsh.nix
index 6d2a5bedb..0353a31e6 100644
--- a/tests/modules/programs/oh-my-posh/zsh.nix
+++ b/tests/modules/programs/oh-my-posh/zsh.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     zsh.enable = true;
@@ -10,11 +8,6 @@
     };
   };
 
-  test.stubs = {
-    oh-my-posh = { };
-    zsh = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileContains \
diff --git a/tests/modules/programs/openstackclient/openstackclient.nix b/tests/modules/programs/openstackclient/openstackclient.nix
index 0c5e1f0bc..48d3d38f8 100644
--- a/tests/modules/programs/openstackclient/openstackclient.nix
+++ b/tests/modules/programs/openstackclient/openstackclient.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.openstackclient = {
     enable = true;
@@ -22,8 +20,6 @@
 
   };
 
-  test.stubs.openstackclient = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/openstack/clouds.yaml
     assertFileContent home-files/.config/openstack/clouds.yaml \
diff --git a/tests/modules/programs/pandoc/csl.nix b/tests/modules/programs/pandoc/csl.nix
index 7384ec995..e23c53288 100644
--- a/tests/modules/programs/pandoc/csl.nix
+++ b/tests/modules/programs/pandoc/csl.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   programs.pandoc = {
     enable = true;
diff --git a/tests/modules/programs/pandoc/defaults.nix b/tests/modules/programs/pandoc/defaults.nix
index e9288657b..8e3fe39aa 100644
--- a/tests/modules/programs/pandoc/defaults.nix
+++ b/tests/modules/programs/pandoc/defaults.nix
@@ -1,30 +1,30 @@
-{ config, lib, ... }:
+{ config, lib, realPkgs, ... }:
 
 let cfg = config.programs.pandoc;
 
-in {
-  config = lib.mkIf config.test.enableBig {
-    programs.pandoc = {
-      enable = true;
+in lib.mkIf config.test.enableBig {
+  programs.pandoc = {
+    enable = true;
 
-      defaults = {
-        metadata = { author = "John Doe"; };
-        pdf-engine = "xelatex";
-        citeproc = true;
-      };
+    defaults = {
+      metadata = { author = "John Doe"; };
+      pdf-engine = "xelatex";
+      citeproc = true;
     };
-
-    nmt.script = ''
-      assertFileContent ${cfg.defaultsFile} ${./defaults-expected.json}
-
-      # Test that defaults are set by looking at the metadata for an empty file
-      # (it should contain the author that we set in defaults).
-      output=$(mktemp)
-      ${cfg.finalPackage}/bin/pandoc --standalone \
-        -f markdown /dev/null \
-        -t native -o "$output"
-      assertFileContent "$output" ${./output-expected}
-    '';
   };
+
+  nixpkgs.overlays = [ (_: _: { inherit (realPkgs) pandoc; }) ];
+
+  nmt.script = ''
+    assertFileContent ${cfg.defaultsFile} ${./defaults-expected.json}
+
+    # Test that defaults are set by looking at the metadata for an empty file
+    # (it should contain the author that we set in defaults).
+    output=$(mktemp)
+    ${cfg.finalPackage}/bin/pandoc --standalone \
+      -f markdown /dev/null \
+      -t native -o "$output"
+    assertFileContent "$output" ${./output-expected}
+  '';
 }
 
diff --git a/tests/modules/programs/pandoc/templates.nix b/tests/modules/programs/pandoc/templates.nix
index f276381a3..f72e0b8ae 100644
--- a/tests/modules/programs/pandoc/templates.nix
+++ b/tests/modules/programs/pandoc/templates.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   programs.pandoc = {
     enable = true;
diff --git a/tests/modules/programs/papis/papis.nix b/tests/modules/programs/papis/papis.nix
index 507056bed..19990633f 100644
--- a/tests/modules/programs/papis/papis.nix
+++ b/tests/modules/programs/papis/papis.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.papis = {
     enable = true;
@@ -23,8 +21,6 @@
     };
   };
 
-  test.stubs.papis = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/papis/config \
     ${builtins.toFile "papis-expected-settings.ini" ''
diff --git a/tests/modules/programs/pay-respects/integration-disabled.nix b/tests/modules/programs/pay-respects/integration-disabled.nix
index fa0806d3d..a6453e354 100644
--- a/tests/modules/programs/pay-respects/integration-disabled.nix
+++ b/tests/modules/programs/pay-respects/integration-disabled.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   programs = {
     pay-respects.enable = true;
     pay-respects.enableBashIntegration = false;
@@ -11,12 +11,10 @@
     nushell.enable = true;
   };
 
-  test.stubs.pay-respects = { };
-
   nmt.script = ''
-    assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/dummy'
-    assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/dummy'
-    assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/dummy'
-    assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/dummy'
+    assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/pay-respects'
+    assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/pay-respects'
+    assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/pay-respects'
+    assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/pay-respects'
   '';
 }
diff --git a/tests/modules/programs/pay-respects/integration-enabled.nix b/tests/modules/programs/pay-respects/integration-enabled.nix
index d5b3d980c..c76463f2b 100644
--- a/tests/modules/programs/pay-respects/integration-enabled.nix
+++ b/tests/modules/programs/pay-respects/integration-enabled.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   programs = {
     pay-respects.enable = true;
     bash.enable = true;
@@ -7,27 +7,25 @@
     nushell.enable = true;
   };
 
-  test.stubs.pay-respects = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
       home-files/.bashrc \
-      'eval "$(@pay-respects@/bin/dummy bash --alias)"'
+      'eval "$(@pay-respects@/bin/pay-respects bash --alias)"'
 
     assertFileExists home-files/.zshrc
     assertFileContains \
       home-files/.zshrc \
-      'eval "$(@pay-respects@/bin/dummy zsh --alias)"'
+      'eval "$(@pay-respects@/bin/pay-respects zsh --alias)"'
 
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
       home-files/.config/fish/config.fish \
-      '@pay-respects@/bin/dummy fish --alias | source'
+      '@pay-respects@/bin/pay-respects fish --alias | source'
 
     assertFileExists home-files/.config/nushell/config.nu
     assertFileContains \
       home-files/.config/nushell/config.nu \
-      '@pay-respects@/bin/dummy nushell --alias [<alias>]'
+      '@pay-respects@/bin/pay-respects nushell --alias [<alias>]'
   '';
 }
diff --git a/tests/modules/programs/pet/settings_21_05.nix b/tests/modules/programs/pet/settings_21_05.nix
index cf7285487..595737600 100644
--- a/tests/modules/programs/pet/settings_21_05.nix
+++ b/tests/modules/programs/pet/settings_21_05.nix
@@ -1,17 +1,10 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   home.stateVersion = "21.05";
   programs.pet = {
     enable = true;
-    selectcmdPackage = config.lib.test.mkStubPackage { };
     settings.editor = "nvim";
   };
 
-  test.stubs.pet = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/pet/config.toml \
       ${
diff --git a/tests/modules/programs/pet/settings_21_11.nix b/tests/modules/programs/pet/settings_21_11.nix
index 0b82d1f37..05bdc2449 100644
--- a/tests/modules/programs/pet/settings_21_11.nix
+++ b/tests/modules/programs/pet/settings_21_11.nix
@@ -1,12 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   home.stateVersion = "21.11";
   programs.pet = {
     enable = true;
-    selectcmdPackage = config.lib.test.mkStubPackage { };
     settings = {
       General = {
         backend = "Gitlab";
@@ -20,8 +15,6 @@ with lib;
     };
   };
 
-  test.stubs.pet = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/pet/config.toml \
       ${
diff --git a/tests/modules/programs/pet/snippets.nix b/tests/modules/programs/pet/snippets.nix
index 6713b4f16..09dbd17d0 100644
--- a/tests/modules/programs/pet/snippets.nix
+++ b/tests/modules/programs/pet/snippets.nix
@@ -1,29 +1,14 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.pet = {
-      enable = true;
-      selectcmdPackage = pkgs.writeScriptBin "pet-cmd" "" // {
-        outPath = "@pet-cmd@";
-      };
-      snippets = [{
-        description = "git: search full history for regex";
-        command = "git log -p -G <regex>";
-        tag = [ "git" "regex" ];
-      }];
-    };
-
-    nixpkgs.overlays = [
-      (self: super: {
-        pet = pkgs.writeScriptBin "pet" "" // { outPath = "@pet@"; };
-      })
-    ];
-
-    nmt.script = ''
-      assertFileContent home-files/.config/pet/snippet.toml ${./snippet.toml}
-    '';
+  programs.pet = {
+    enable = true;
+    snippets = [{
+      description = "git: search full history for regex";
+      command = "git log -p -G <regex>";
+      tag = [ "git" "regex" ];
+    }];
   };
+
+  nmt.script = ''
+    assertFileContent home-files/.config/pet/snippet.toml ${./snippet.toml}
+  '';
 }
diff --git a/tests/modules/programs/pistol/associations.nix b/tests/modules/programs/pistol/associations.nix
index 764060ba9..29158a489 100644
--- a/tests/modules/programs/pistol/associations.nix
+++ b/tests/modules/programs/pistol/associations.nix
@@ -20,8 +20,6 @@
     ];
   };
 
-  test.stubs.pistol = { };
-
   nmt.script = let
     expected = builtins.toFile "config-expected" ''
       application/json bat %pistol-filename%
diff --git a/tests/modules/programs/pistol/config.nix b/tests/modules/programs/pistol/config.nix
index 1999befa6..8df524a3a 100644
--- a/tests/modules/programs/pistol/config.nix
+++ b/tests/modules/programs/pistol/config.nix
@@ -9,8 +9,6 @@
     };
   };
 
-  test.stubs.pistol = { };
-
   test.asserts.assertions.expected = [
     (let offendingFile = toString ./config.nix;
     in ''
diff --git a/tests/modules/programs/pistol/double-association.nix b/tests/modules/programs/pistol/double-association.nix
index 103f4d057..902c5c4aa 100644
--- a/tests/modules/programs/pistol/double-association.nix
+++ b/tests/modules/programs/pistol/double-association.nix
@@ -9,8 +9,6 @@
     }];
   };
 
-  test.stubs.pistol = { };
-
   test.asserts.assertions.expected = [''
     Each entry in programs.pistol.associations must contain exactly one
     of fpath or mime.
diff --git a/tests/modules/programs/pistol/missing-association.nix b/tests/modules/programs/pistol/missing-association.nix
index 6ea0a4486..ff47a2381 100644
--- a/tests/modules/programs/pistol/missing-association.nix
+++ b/tests/modules/programs/pistol/missing-association.nix
@@ -5,8 +5,6 @@
     associations = [{ command = "bat %pistol-filename%"; }];
   };
 
-  test.stubs.pistol = { };
-
   test.asserts.assertions.expected = [''
     Each entry in programs.pistol.associations must contain exactly one
     of fpath or mime.
diff --git a/tests/modules/programs/pls/bash.nix b/tests/modules/programs/pls/bash.nix
index dc1743997..2d3177a40 100644
--- a/tests/modules/programs/pls/bash.nix
+++ b/tests/modules/programs/pls/bash.nix
@@ -1,29 +1,20 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      bash.enable = true;
+  programs = {
+    bash.enable = true;
 
-      pls = {
-        enable = true;
-        enableAliases = true;
-        package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
-      };
+    pls = {
+      enable = true;
+      enableAliases = true;
     };
-
-    test.stubs.pls = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileContains \
-        home-files/.bashrc \
-        "alias ls=@pls@/bin/pls"
-      assertFileContains \
-        home-files/.bashrc \
-        "alias ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileContains \
+      home-files/.bashrc \
+      "alias ls=@pls@/bin/pls"
+    assertFileContains \
+      home-files/.bashrc \
+      "alias ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
+  '';
 }
diff --git a/tests/modules/programs/pls/fish.nix b/tests/modules/programs/pls/fish.nix
index c745cd768..869feaf8c 100644
--- a/tests/modules/programs/pls/fish.nix
+++ b/tests/modules/programs/pls/fish.nix
@@ -1,33 +1,27 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 {
-  config = {
-    programs = {
-      fish.enable = true;
+  programs = {
+    fish.enable = true;
 
-      pls = {
-        enable = true;
-        enableAliases = true;
-        package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
-      };
+    pls = {
+      enable = true;
+      enableAliases = true;
+      package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
     };
-
-    # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source =
-      mkForce (builtins.toFile "empty" "");
-
-    test.stubs.pls = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-      assertFileContains \
-        home-files/.config/fish/config.fish \
-        "alias ls @pls@/bin/pls"
-      assertFileContains \
-        home-files/.config/fish/config.fish \
-        "alias ll '@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
-    '';
   };
+
+  # Needed to avoid error with dummy fish package.
+  xdg.dataFile."fish/home-manager_generated_completions".source =
+    lib.mkForce (builtins.toFile "empty" "");
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      "alias ls @pls@/bin/pls"
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      "alias ll '@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
+  '';
 }
diff --git a/tests/modules/programs/pls/zsh.nix b/tests/modules/programs/pls/zsh.nix
index bbe68abb5..40e5f1878 100644
--- a/tests/modules/programs/pls/zsh.nix
+++ b/tests/modules/programs/pls/zsh.nix
@@ -1,32 +1,23 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs = {
-      zsh.enable = true;
+  programs = {
+    zsh.enable = true;
 
-      pls = {
-        enable = true;
-        enableAliases = true;
-        package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
-      };
+    pls = {
+      enable = true;
+      enableAliases = true;
+      package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
     };
-
-    test.stubs = {
-      pls = { };
-      zsh = { };
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.zshrc
-      assertFileContains \
-        home-files/.zshrc \
-        "alias -- ls=@pls@/bin/pls"
-      assertFileContains \
-        home-files/.zshrc \
-        "alias -- ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      "alias -- ls=@pls@/bin/pls"
+    assertFileContains \
+      home-files/.zshrc \
+      "alias -- ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'"
+  '';
 }
diff --git a/tests/modules/programs/poetry/custom-settings.nix b/tests/modules/programs/poetry/custom-settings.nix
index fc9793067..376f8bf1f 100644
--- a/tests/modules/programs/poetry/custom-settings.nix
+++ b/tests/modules/programs/poetry/custom-settings.nix
@@ -9,8 +9,6 @@
     };
   };
 
-  test.stubs.poetry = { };
-
   nmt.script = let
     expectedConfDir =
       if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
diff --git a/tests/modules/programs/poetry/default-settings.nix b/tests/modules/programs/poetry/default-settings.nix
index 145cf18ad..31d910047 100644
--- a/tests/modules/programs/poetry/default-settings.nix
+++ b/tests/modules/programs/poetry/default-settings.nix
@@ -3,8 +3,6 @@
 {
   programs.poetry = { enable = true; };
 
-  test.stubs.poetry = { };
-
   nmt.script = let
     expectedConfDir =
       if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
diff --git a/tests/modules/programs/powerline-go/bash.nix b/tests/modules/programs/powerline-go/bash.nix
index a48e16fe0..bab8b38d3 100644
--- a/tests/modules/programs/powerline-go/bash.nix
+++ b/tests/modules/programs/powerline-go/bash.nix
@@ -1,33 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      bash.enable = true;
+  programs = {
+    bash.enable = true;
 
-      powerline-go = {
-        enable = true;
-        newline = true;
-        modules = [ "nix-shell" ];
-        pathAliases = { "\\~/project/foo" = "prj-foo"; };
-        settings = {
-          ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
-        };
+    powerline-go = {
+      enable = true;
+      newline = true;
+      modules = [ "nix-shell" ];
+      pathAliases = { "\\~/project/foo" = "prj-foo"; };
+      settings = {
+        ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
       };
     };
-
-    test.stubs.powerline-go = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileContains \
-        home-files/.bashrc \
-        'PS1='
-      assertFileContains \
-        home-files/.bashrc \
-        '/bin/powerline-go -error $old_exit_status -shell bash -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileContains \
+      home-files/.bashrc \
+      'PS1='
+    assertFileContains \
+      home-files/.bashrc \
+      '/bin/powerline-go -error $old_exit_status -shell bash -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+  '';
 }
diff --git a/tests/modules/programs/powerline-go/bashmodulesright.nix b/tests/modules/programs/powerline-go/bashmodulesright.nix
index 688c0fad7..6b7c2e3d3 100644
--- a/tests/modules/programs/powerline-go/bashmodulesright.nix
+++ b/tests/modules/programs/powerline-go/bashmodulesright.nix
@@ -1,34 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      bash.enable = true;
+  programs = {
+    bash.enable = true;
 
-      powerline-go = {
-        enable = true;
-        newline = true;
-        modules = [ "nix-shell" ];
-        modulesRight = [ "git" ];
-        pathAliases = { "\\~/project/foo" = "prj-foo"; };
-        settings = {
-          ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
-        };
+    powerline-go = {
+      enable = true;
+      newline = true;
+      modules = [ "nix-shell" ];
+      modulesRight = [ "git" ];
+      pathAliases = { "\\~/project/foo" = "prj-foo"; };
+      settings = {
+        ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
       };
     };
-
-    test.stubs.powerline-go = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.bashrc
-      assertFileContains \
-        home-files/.bashrc \
-        'eval'
-      assertFileContains \
-        home-files/.bashrc \
-        '/bin/powerline-go -error $old_exit_status -shell bash -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileContains \
+      home-files/.bashrc \
+      'eval'
+    assertFileContains \
+      home-files/.bashrc \
+      '/bin/powerline-go -error $old_exit_status -shell bash -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+  '';
 }
diff --git a/tests/modules/programs/powerline-go/fish.nix b/tests/modules/programs/powerline-go/fish.nix
index 4861d1ba1..f7749c2aa 100644
--- a/tests/modules/programs/powerline-go/fish.nix
+++ b/tests/modules/programs/powerline-go/fish.nix
@@ -1,34 +1,28 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ lib, ... }:
 
 {
-  config = {
-    programs = {
-      fish.enable = true;
+  programs = {
+    fish.enable = true;
 
-      powerline-go = {
-        enable = true;
-        newline = true;
-        modules = [ "nix-shell" ];
-        pathAliases = { "\\~/project/foo" = "prj-foo"; };
-        settings = {
-          ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
-        };
+    powerline-go = {
+      enable = true;
+      newline = true;
+      modules = [ "nix-shell" ];
+      pathAliases = { "\\~/project/foo" = "prj-foo"; };
+      settings = {
+        ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
       };
     };
-
-    # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source =
-      mkForce (builtins.toFile "empty" "");
-
-    test.stubs.powerline-go = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-      assertFileContains \
-        home-files/.config/fish/config.fish \
-        '/bin/powerline-go -error $status -jobs (count (jobs -p)) -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
-    '';
   };
+
+  # Needed to avoid error with dummy fish package.
+  xdg.dataFile."fish/home-manager_generated_completions".source =
+    lib.mkForce (builtins.toFile "empty" "");
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      '/bin/powerline-go -error $status -jobs (count (jobs -p)) -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+  '';
 }
diff --git a/tests/modules/programs/powerline-go/zsh.nix b/tests/modules/programs/powerline-go/zsh.nix
index 21856e9d1..66845dd53 100644
--- a/tests/modules/programs/powerline-go/zsh.nix
+++ b/tests/modules/programs/powerline-go/zsh.nix
@@ -1,36 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      zsh.enable = true;
+  programs = {
+    zsh.enable = true;
 
-      powerline-go = {
-        enable = true;
-        newline = true;
-        modules = [ "nix-shell" ];
-        pathAliases = { "\\~/project/foo" = "prj-foo"; };
-        settings = {
-          ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
-        };
+    powerline-go = {
+      enable = true;
+      newline = true;
+      modules = [ "nix-shell" ];
+      pathAliases = { "\\~/project/foo" = "prj-foo"; };
+      settings = {
+        ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
       };
     };
-
-    test.stubs = {
-      powerline-go = { };
-      zsh = { };
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.zshrc
-      assertFileContains \
-        home-files/.zshrc \
-        'PS1='
-      assertFileContains \
-        home-files/.zshrc \
-        '/bin/powerline-go -error $? -shell zsh -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      'PS1='
+    assertFileContains \
+      home-files/.zshrc \
+      '/bin/powerline-go -error $? -shell zsh -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+  '';
 }
diff --git a/tests/modules/programs/powerline-go/zshmodulesright.nix b/tests/modules/programs/powerline-go/zshmodulesright.nix
index ffe2e1d28..acd43b6fa 100644
--- a/tests/modules/programs/powerline-go/zshmodulesright.nix
+++ b/tests/modules/programs/powerline-go/zshmodulesright.nix
@@ -1,37 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      zsh.enable = true;
+  programs = {
+    zsh.enable = true;
 
-      powerline-go = {
-        enable = true;
-        newline = true;
-        modules = [ "nix-shell" ];
-        modulesRight = [ "git" ];
-        pathAliases = { "\\~/project/foo" = "prj-foo"; };
-        settings = {
-          ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
-        };
+    powerline-go = {
+      enable = true;
+      newline = true;
+      modules = [ "nix-shell" ];
+      modulesRight = [ "git" ];
+      pathAliases = { "\\~/project/foo" = "prj-foo"; };
+      settings = {
+        ignore-repos = [ "/home/me/project1" "/home/me/project2" ];
       };
     };
-
-    test.stubs = {
-      powerline-go = { };
-      zsh = { };
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.zshrc
-      assertFileContains \
-        home-files/.zshrc \
-        'eval'
-      assertFileContains \
-        home-files/.zshrc \
-        '/bin/powerline-go -error $? -shell zsh -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      'eval'
+    assertFileContains \
+      home-files/.zshrc \
+      '/bin/powerline-go -error $? -shell zsh -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+  '';
 }
diff --git a/tests/modules/programs/pubs/pubs-example-settings.nix b/tests/modules/programs/pubs/pubs-example-settings.nix
index 59f228009..773075d76 100644
--- a/tests/modules/programs/pubs/pubs-example-settings.nix
+++ b/tests/modules/programs/pubs/pubs-example-settings.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   programs.pubs = {
     enable = true;
@@ -27,8 +25,6 @@
     '';
   };
 
-  test.stubs.pubs = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.pubsrc ${./pubs-example-settings-expected-pubsrc}
diff --git a/tests/modules/programs/pyenv/bash.nix b/tests/modules/programs/pyenv/bash.nix
index ac6a8f0c1..4ef778a3b 100644
--- a/tests/modules/programs/pyenv/bash.nix
+++ b/tests/modules/programs/pyenv/bash.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs = {
     bash.enable = true;
     pyenv.enable = true;
   };
 
-  test.stubs.pyenv = { name = "pyenv"; };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/pyenv/fish.nix b/tests/modules/programs/pyenv/fish.nix
index 41b4911bb..f3628c666 100644
--- a/tests/modules/programs/pyenv/fish.nix
+++ b/tests/modules/programs/pyenv/fish.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs = {
     fish.enable = true;
     pyenv.enable = true;
   };
 
-  test.stubs.pyenv = { name = "pyenv"; };
-
   nmt.script = ''
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
diff --git a/tests/modules/programs/pyenv/zsh.nix b/tests/modules/programs/pyenv/zsh.nix
index da029fc2c..f36905300 100644
--- a/tests/modules/programs/pyenv/zsh.nix
+++ b/tests/modules/programs/pyenv/zsh.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs = {
     zsh.enable = true;
     pyenv.enable = true;
   };
 
-  test.stubs.pyenv = { name = "pyenv"; };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileContains \
diff --git a/tests/modules/programs/qcal/http-calendar.nix b/tests/modules/programs/qcal/http-calendar.nix
index c32440601..bc5200ce2 100644
--- a/tests/modules/programs/qcal/http-calendar.nix
+++ b/tests/modules/programs/qcal/http-calendar.nix
@@ -1,5 +1,3 @@
-{ pkgs, lib, ... }:
-
 {
   programs.qcal.enable = true;
   accounts.calendar.accounts.test = {
@@ -7,8 +5,6 @@
     remote = { url = "https://example.com/events.ical"; };
   };
 
-  test.stubs = { qcal = { }; };
-
   nmt.script = ''
     assertFileExists home-files/.config/qcal/config.json
     assertFileContent home-files/.config/qcal/config.json ${
diff --git a/tests/modules/programs/qcal/mixed.nix b/tests/modules/programs/qcal/mixed.nix
index d2241bdcb..0083d7945 100644
--- a/tests/modules/programs/qcal/mixed.nix
+++ b/tests/modules/programs/qcal/mixed.nix
@@ -1,5 +1,3 @@
-{ pkgs, lib, ... }:
-
 {
   programs.qcal.enable = true;
   accounts.calendar.accounts = {
@@ -17,8 +15,6 @@
     };
   };
 
-  test.stubs = { qcal = { }; };
-
   nmt.script = ''
     assertFileExists home-files/.config/qcal/config.json
     assertFileContent home-files/.config/qcal/config.json ${
diff --git a/tests/modules/programs/qcal/webdav-calendar.nix b/tests/modules/programs/qcal/webdav-calendar.nix
index caefe1f16..9cfe5d32a 100644
--- a/tests/modules/programs/qcal/webdav-calendar.nix
+++ b/tests/modules/programs/qcal/webdav-calendar.nix
@@ -1,5 +1,3 @@
-{ pkgs, lib, ... }:
-
 {
   programs.qcal = {
     enable = true;
@@ -15,8 +13,6 @@
     };
   };
 
-  test.stubs = { qcal = { }; };
-
   nmt.script = ''
     assertFileExists home-files/.config/qcal/config.json
     assertFileContent home-files/.config/qcal/config.json ${
diff --git a/tests/modules/programs/qutebrowser/greasemonkey.nix b/tests/modules/programs/qutebrowser/greasemonkey.nix
index d6e8713c7..9377a3951 100644
--- a/tests/modules/programs/qutebrowser/greasemonkey.nix
+++ b/tests/modules/programs/qutebrowser/greasemonkey.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 let
 
@@ -19,8 +17,6 @@ in {
     greasemonkey = [ greasemonkeyScript ];
   };
 
-  test.stubs.qutebrowser = { };
-
   nmt.script = let
     scriptDir = if pkgs.stdenv.hostPlatform.isDarwin then
       ".qutebrowser/greasemonkey"
diff --git a/tests/modules/programs/qutebrowser/keybindings.nix b/tests/modules/programs/qutebrowser/keybindings.nix
index 37ccfeba3..0e1400fde 100644
--- a/tests/modules/programs/qutebrowser/keybindings.nix
+++ b/tests/modules/programs/qutebrowser/keybindings.nix
@@ -21,8 +21,6 @@
     };
   };
 
-  test.stubs.qutebrowser = { };
-
   nmt.script = let
     qutebrowserConfig = if pkgs.stdenv.hostPlatform.isDarwin then
       ".qutebrowser/config.py"
@@ -32,7 +30,7 @@
     assertFileContent \
       home-files/${qutebrowserConfig} \
       ${
-        pkgs.writeText "qutebrowser-expected-config.py" ''
+        builtins.toFile "qutebrowser-expected-config.py" ''
           config.load_autoconfig(False)
           c.bindings.default = {}
           config.bind(",l", "config-cycle spellcheck.languages [\"en-GB\"] [\"en-US\"]", mode="normal")
diff --git a/tests/modules/programs/qutebrowser/quickmarks.nix b/tests/modules/programs/qutebrowser/quickmarks.nix
index 9437fc614..524808c51 100644
--- a/tests/modules/programs/qutebrowser/quickmarks.nix
+++ b/tests/modules/programs/qutebrowser/quickmarks.nix
@@ -10,8 +10,6 @@
     };
   };
 
-  test.stubs.qutebrowser = { };
-
   nmt.script = let
     quickmarksFile = if pkgs.stdenv.hostPlatform.isDarwin then
       ".qutebrowser/quickmarks"
@@ -21,7 +19,7 @@
     assertFileContent \
       home-files/${quickmarksFile} \
       ${
-        pkgs.writeText "qutebrowser-expected-quickmarks" ''
+        builtins.toFile "qutebrowser-expected-quickmarks" ''
           home-manager https://github.com/nix-community/home-manager
           nixpkgs https://github.com/NixOS/nixpkgs''
       }
diff --git a/tests/modules/programs/qutebrowser/settings.nix b/tests/modules/programs/qutebrowser/settings.nix
index e2cf3915f..91a07132a 100644
--- a/tests/modules/programs/qutebrowser/settings.nix
+++ b/tests/modules/programs/qutebrowser/settings.nix
@@ -21,8 +21,6 @@
     '';
   };
 
-  test.stubs.qutebrowser = { };
-
   nmt.script = let
     qutebrowserConfig = if pkgs.stdenv.hostPlatform.isDarwin then
       ".qutebrowser/config.py"
@@ -32,7 +30,7 @@
     assertFileContent \
       home-files/${qutebrowserConfig} \
       ${
-        pkgs.writeText "qutebrowser-expected-config.py" ''
+        builtins.toFile "qutebrowser-expected-config.py" ''
           config.load_autoconfig(False)
           c.colors.hints.bg = "#000000"
           c.colors.hints.fg = "#ffffff"
diff --git a/tests/modules/programs/ranger/configuration.nix b/tests/modules/programs/ranger/configuration.nix
index 90541ac32..a9328a358 100644
--- a/tests/modules/programs/ranger/configuration.nix
+++ b/tests/modules/programs/ranger/configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.ranger = {
     enable = true;
@@ -31,8 +29,6 @@
     ];
   };
 
-  test.stubs = { ranger = { }; };
-
   nmt.script = ''
     assertFileExists home-files/.config/ranger/rc.conf
     assertFileContent home-files/.config/ranger/rc.conf \
diff --git a/tests/modules/programs/rbw/empty-settings.nix b/tests/modules/programs/rbw/empty-settings.nix
index aa25c876c..53b12fd7d 100644
--- a/tests/modules/programs/rbw/empty-settings.nix
+++ b/tests/modules/programs/rbw/empty-settings.nix
@@ -8,8 +8,6 @@ let
   else
     ".config/rbw/config.json";
 in {
-  imports = [ ./rbw-stubs.nix ];
-
   programs.rbw.enable = true;
 
   nmt.script = ''
diff --git a/tests/modules/programs/rbw/rbw-stubs.nix b/tests/modules/programs/rbw/rbw-stubs.nix
deleted file mode 100644
index 77436232d..000000000
--- a/tests/modules/programs/rbw/rbw-stubs.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, ... }:
-
-{
-  test.stubs.rbw = { };
-
-  nixpkgs.overlays = [
-    (self: super: {
-      pinentry-gnome3 =
-        config.lib.test.mkStubPackage { outPath = "@pinentry-gnome3@"; };
-    })
-  ];
-}
diff --git a/tests/modules/programs/rbw/settings.nix b/tests/modules/programs/rbw/settings.nix
index ac5820186..5890fd9ac 100644
--- a/tests/modules/programs/rbw/settings.nix
+++ b/tests/modules/programs/rbw/settings.nix
@@ -8,18 +8,16 @@ let
   else
     ".config/rbw/config.json";
 
-  expected = pkgs.writeText "rbw-expected.json" ''
+  expected = builtins.toFile "rbw-expected.json" ''
     {
       "base_url": "bitwarden.example.com",
       "email": "name@example.com",
       "identity_url": "identity.example.com",
       "lock_timeout": 300,
-      "pinentry": "@pinentry-gnome3@/bin/dummy"
+      "pinentry": "@pinentry-gnome3@/bin/pinentry"
     }
   '';
 in {
-  imports = [ ./rbw-stubs.nix ];
-
   programs.rbw = {
     enable = true;
     settings = {
diff --git a/tests/modules/programs/rbw/simple-settings.nix b/tests/modules/programs/rbw/simple-settings.nix
index b690659a9..dbd05da24 100644
--- a/tests/modules/programs/rbw/simple-settings.nix
+++ b/tests/modules/programs/rbw/simple-settings.nix
@@ -8,7 +8,7 @@ let
   else
     ".config/rbw/config.json";
 
-  expected = pkgs.writeText "rbw-expected.json" ''
+  expected = builtins.toFile "rbw-expected.json" ''
     {
       "base_url": null,
       "email": "name@example.com",
@@ -18,8 +18,6 @@ let
     }
   '';
 in {
-  imports = [ ./rbw-stubs.nix ];
-
   programs.rbw = {
     enable = true;
     settings = { email = "name@example.com"; };
diff --git a/tests/modules/programs/rio/empty-settings.nix b/tests/modules/programs/rio/empty-settings.nix
index 064fc98fa..e89374d1f 100644
--- a/tests/modules/programs/rio/empty-settings.nix
+++ b/tests/modules/programs/rio/empty-settings.nix
@@ -1,10 +1,6 @@
-_:
-
 {
   programs.rio.enable = true;
 
-  test.stubs.rio = { };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/rio
   '';
diff --git a/tests/modules/programs/rio/example-settings.nix b/tests/modules/programs/rio/example-settings.nix
index 68fec3577..48428556b 100644
--- a/tests/modules/programs/rio/example-settings.nix
+++ b/tests/modules/programs/rio/example-settings.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 let
-  expected = pkgs.writeText "rio-expected.toml" ''
+  expected = builtins.toFile "rio-expected.toml" ''
     cursor = "_"
     padding-x = 0
     performance = "Low"
diff --git a/tests/modules/programs/rofi-pass/rofi-pass-config.nix b/tests/modules/programs/rofi-pass/rofi-pass-config.nix
index 2028e840e..8e5e3592d 100644
--- a/tests/modules/programs/rofi-pass/rofi-pass-config.nix
+++ b/tests/modules/programs/rofi-pass/rofi-pass-config.nix
@@ -1,36 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.rofi = {
-      enable = true;
+  programs.rofi = {
+    enable = true;
 
-      pass = {
-        enable = true;
-        extraConfig = ''
+    pass = {
+      enable = true;
+      extraConfig = ''
+        # Extra config for rofi-pass
+        xdotool_delay=12
+      '';
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/rofi-pass/config \
+      ${
+        builtins.toFile "rofi-pass-expected-config" ''
           # Extra config for rofi-pass
           xdotool_delay=12
-        '';
-      };
-    };
 
-    test.stubs = {
-      rofi = { };
-      rofi-pass = { };
-    };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/rofi-pass/config \
-        ${
-          pkgs.writeText "rofi-pass-expected-config" ''
-            # Extra config for rofi-pass
-            xdotool_delay=12
-
-          ''
-        }
-    '';
-  };
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/rofi-pass/rofi-pass-root.nix b/tests/modules/programs/rofi-pass/rofi-pass-root.nix
index 300e89db9..1455b689c 100644
--- a/tests/modules/programs/rofi-pass/rofi-pass-root.nix
+++ b/tests/modules/programs/rofi-pass/rofi-pass-root.nix
@@ -1,31 +1,20 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.rofi = {
+  programs.rofi = {
+    enable = true;
+
+    pass = {
       enable = true;
-
-      pass = {
-        enable = true;
-        stores = [ "~/.local/share/password-store" ];
-      };
+      stores = [ "~/.local/share/password-store" ];
     };
-
-    test.stubs = {
-      rofi = { };
-      rofi-pass = { };
-    };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/rofi-pass/config \
-        ${
-          pkgs.writeText "rofi-pass-expected-config" ''
-            root=~/.local/share/password-store
-          ''
-        }
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/rofi-pass/config \
+      ${
+        builtins.toFile "rofi-pass-expected-config" ''
+          root=~/.local/share/password-store
+        ''
+      }
+  '';
 }
diff --git a/tests/modules/programs/rofi/config-with-deprecated-options.nix b/tests/modules/programs/rofi/config-with-deprecated-options.nix
index b77c5ac9c..9cc3f281e 100644
--- a/tests/modules/programs/rofi/config-with-deprecated-options.nix
+++ b/tests/modules/programs/rofi/config-with-deprecated-options.nix
@@ -1,12 +1,9 @@
-{ ... }:
-
 {
   programs.rofi = {
     enable = true;
     colors = { };
   };
 
-  test.stubs.rofi = { };
   test.asserts.assertions.expected = [
     (let offendingFile = toString ./config-with-deprecated-options.nix;
     in ''
diff --git a/tests/modules/programs/rofi/custom-theme.nix b/tests/modules/programs/rofi/custom-theme.nix
index 99c9a9896..04890078a 100644
--- a/tests/modules/programs/rofi/custom-theme.nix
+++ b/tests/modules/programs/rofi/custom-theme.nix
@@ -1,43 +1,37 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  config = {
-    programs.rofi = {
-      enable = true;
+  programs.rofi = {
+    enable = true;
 
-      theme = let inherit (config.lib.formats.rasi) mkLiteral;
-      in {
-        "@import" = "~/.cache/wal/colors-rofi-dark";
+    theme = let inherit (config.lib.formats.rasi) mkLiteral;
+    in {
+      "@import" = "~/.cache/wal/colors-rofi-dark";
 
-        "*" = {
-          background-color = mkLiteral "#000000";
-          foreground-color = mkLiteral "rgba ( 250, 251, 252, 100 % )";
-          border-color = mkLiteral "#FFFFFF";
-          width = 512;
-        };
+      "*" = {
+        background-color = mkLiteral "#000000";
+        foreground-color = mkLiteral "rgba ( 250, 251, 252, 100 % )";
+        border-color = mkLiteral "#FFFFFF";
+        width = 512;
+      };
 
-        "#inputbar" = { children = map mkLiteral [ "prompt" "entry" ]; };
+      "#inputbar" = { children = map mkLiteral [ "prompt" "entry" ]; };
 
-        "#textbox-prompt-colon" = {
-          expand = false;
-          str = ":";
-          margin = mkLiteral "0px 0.3em 0em 0em";
-          text-color = mkLiteral "@foreground-color";
-        };
+      "#textbox-prompt-colon" = {
+        expand = false;
+        str = ":";
+        margin = mkLiteral "0px 0.3em 0em 0em";
+        text-color = mkLiteral "@foreground-color";
       };
     };
-
-    test.stubs.rofi = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/rofi/config.rasi \
-        ${./custom-theme-config.rasi}
-      assertFileContent \
-        home-files/.local/share/rofi/themes/custom.rasi \
-        ${./custom-theme.rasi}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/rofi/config.rasi \
+      ${./custom-theme-config.rasi}
+    assertFileContent \
+      home-files/.local/share/rofi/themes/custom.rasi \
+      ${./custom-theme.rasi}
+  '';
 }
diff --git a/tests/modules/programs/rofi/valid-config.nix b/tests/modules/programs/rofi/valid-config.nix
index c581c0efd..538d1c422 100644
--- a/tests/modules/programs/rofi/valid-config.nix
+++ b/tests/modules/programs/rofi/valid-config.nix
@@ -1,32 +1,24 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.rofi = {
-      enable = true;
-      font = "Droid Sans Mono 14";
-      terminal = "/some/path";
-      cycle = false;
-      window = {
-        background = "background";
-        border = "border";
-        separator = "separator";
-      };
-      extraConfig = {
-        modi = "drun,emoji,ssh";
-        kb-primary-paste = "Control+V,Shift+Insert";
-        kb-secondary-paste = "Control+v,Insert";
-      };
+  programs.rofi = {
+    enable = true;
+    font = "Droid Sans Mono 14";
+    terminal = "/some/path";
+    cycle = false;
+    window = {
+      background = "background";
+      border = "border";
+      separator = "separator";
+    };
+    extraConfig = {
+      modi = "drun,emoji,ssh";
+      kb-primary-paste = "Control+V,Shift+Insert";
+      kb-secondary-paste = "Control+v,Insert";
     };
-
-    test.stubs.rofi = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/rofi/config.rasi \
-        ${./valid-config-expected.rasi}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/rofi/config.rasi \
+      ${./valid-config-expected.rasi}
+  '';
 }
diff --git a/tests/modules/programs/ruff/ruff.nix b/tests/modules/programs/ruff/ruff.nix
index 26654d550..895719e84 100644
--- a/tests/modules/programs/ruff/ruff.nix
+++ b/tests/modules/programs/ruff/ruff.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.ruff = {
     enable = true;
@@ -14,8 +12,6 @@
     };
   };
 
-  test.stubs.ruff = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/ruff/ruff.toml
     assertFileContent home-files/.config/ruff/ruff.toml ${./expected.toml}
diff --git a/tests/modules/programs/sagemath/sagemath.nix b/tests/modules/programs/sagemath/sagemath.nix
index 2f30ac502..5aba153b2 100644
--- a/tests/modules/programs/sagemath/sagemath.nix
+++ b/tests/modules/programs/sagemath/sagemath.nix
@@ -10,8 +10,6 @@
     '';
   };
 
-  test.stubs.sage = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/sage/init.sage
     assertFileContent home-files/.config/sage/init.sage \
diff --git a/tests/modules/programs/sapling/sapling-basic.nix b/tests/modules/programs/sapling/sapling-basic.nix
index 6f5caabf5..a893f9a4b 100644
--- a/tests/modules/programs/sapling/sapling-basic.nix
+++ b/tests/modules/programs/sapling/sapling-basic.nix
@@ -7,8 +7,6 @@
     userEmail = "johndoe@example.com";
   };
 
-  test.stubs.sapling = { };
-
   nmt.script = let
     configfile = if pkgs.stdenv.isDarwin then
       "Library/Preferences/sapling/sapling.conf"
diff --git a/tests/modules/programs/sapling/sapling-most.nix b/tests/modules/programs/sapling/sapling-most.nix
index 7280e21ec..17916ee93 100644
--- a/tests/modules/programs/sapling/sapling-most.nix
+++ b/tests/modules/programs/sapling/sapling-most.nix
@@ -17,8 +17,6 @@
     };
   };
 
-  test.stubs.sapling = { };
-
   nmt.script = let
     configfile = if pkgs.stdenv.isDarwin then
       "Library/Preferences/sapling/sapling.conf"
diff --git a/tests/modules/programs/sbt/credentials.nix b/tests/modules/programs/sbt/credentials.nix
index 1a79582ab..78bd3a1f2 100644
--- a/tests/modules/programs/sbt/credentials.nix
+++ b/tests/modules/programs/sbt/credentials.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 let
   credentials = [
diff --git a/tests/modules/programs/sbt/deprecated-options.nix b/tests/modules/programs/sbt/deprecated-options.nix
index c760354a4..6a16b52bd 100644
--- a/tests/modules/programs/sbt/deprecated-options.nix
+++ b/tests/modules/programs/sbt/deprecated-options.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs.sbt = {
     enable = true;
     baseConfigPath = "gone";
   };
 
-  test.stubs.sbt = { };
-
   test.asserts.assertions.expected = [
     (let offendingFile = toString ./deprecated-options.nix;
     in ''
diff --git a/tests/modules/programs/sbt/plugins.nix b/tests/modules/programs/sbt/plugins.nix
index c898ad465..02e46d56e 100644
--- a/tests/modules/programs/sbt/plugins.nix
+++ b/tests/modules/programs/sbt/plugins.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 let
   dependencyGraph = {
diff --git a/tests/modules/programs/sbt/user-config-path.nix b/tests/modules/programs/sbt/user-config-path.nix
index ef7c2ca8a..799d77dcf 100644
--- a/tests/modules/programs/sbt/user-config-path.nix
+++ b/tests/modules/programs/sbt/user-config-path.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ pkgs, ... }:
 
 let
   plugins = [{
diff --git a/tests/modules/programs/scmpuff/bash.nix b/tests/modules/programs/scmpuff/bash.nix
index 8f97caa6f..4ec732cbb 100644
--- a/tests/modules/programs/scmpuff/bash.nix
+++ b/tests/modules/programs/scmpuff/bash.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs = {
     scmpuff.enable = true;
     bash.enable = true;
   };
 
-  test.stubs.scmpuff = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/scmpuff/fish.nix b/tests/modules/programs/scmpuff/fish.nix
index a1abbffa3..5f44308d2 100644
--- a/tests/modules/programs/scmpuff/fish.nix
+++ b/tests/modules/programs/scmpuff/fish.nix
@@ -10,8 +10,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs.scmpuff = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
diff --git a/tests/modules/programs/scmpuff/no-aliases.nix b/tests/modules/programs/scmpuff/no-aliases.nix
index 0636c8791..511e12f54 100644
--- a/tests/modules/programs/scmpuff/no-aliases.nix
+++ b/tests/modules/programs/scmpuff/no-aliases.nix
@@ -13,8 +13,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs.scmpuff = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/scmpuff/no-bash.nix b/tests/modules/programs/scmpuff/no-bash.nix
index 5594738ae..8a656e5f8 100644
--- a/tests/modules/programs/scmpuff/no-bash.nix
+++ b/tests/modules/programs/scmpuff/no-bash.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     scmpuff = {
@@ -9,8 +7,6 @@
     bash.enable = true;
   };
 
-  test.stubs.scmpuff = { };
-
   nmt.script = ''
     assertFileNotRegex home-files/.bashrc '@scmpuff@'
   '';
diff --git a/tests/modules/programs/scmpuff/no-fish.nix b/tests/modules/programs/scmpuff/no-fish.nix
index 977b8fd3a..f954d1c36 100644
--- a/tests/modules/programs/scmpuff/no-fish.nix
+++ b/tests/modules/programs/scmpuff/no-fish.nix
@@ -13,8 +13,6 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs.scmpuff = { };
-
   nmt.script = ''
     assertFileNotRegex home-files/.config/fish/config.fish '@scmpuff@'
   '';
diff --git a/tests/modules/programs/scmpuff/no-shell.nix b/tests/modules/programs/scmpuff/no-shell.nix
index 8c33a2b27..ed2c7c086 100644
--- a/tests/modules/programs/scmpuff/no-shell.nix
+++ b/tests/modules/programs/scmpuff/no-shell.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     scmpuff = {
@@ -11,11 +9,6 @@
     zsh.enable = true;
   };
 
-  test.stubs = {
-    zsh = { };
-    scmpuff = { };
-  };
-
   nmt.script = ''
     assertFileNotRegex home-files/.zshrc '@scmpuff@'
     assertFileNotRegex home-files/.bashrc '@scmpuff@'
diff --git a/tests/modules/programs/scmpuff/no-zsh.nix b/tests/modules/programs/scmpuff/no-zsh.nix
index d6ed24490..d8208a16e 100644
--- a/tests/modules/programs/scmpuff/no-zsh.nix
+++ b/tests/modules/programs/scmpuff/no-zsh.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     scmpuff = {
@@ -9,11 +7,6 @@
     zsh.enable = true;
   };
 
-  test.stubs = {
-    zsh = { };
-    scmpuff = { };
-  };
-
   nmt.script = ''
     assertFileNotRegex home-files/.zshrc '@scmpuff@ init -s'
   '';
diff --git a/tests/modules/programs/scmpuff/zsh.nix b/tests/modules/programs/scmpuff/zsh.nix
index 8a4e2e54c..0bb0caa8c 100644
--- a/tests/modules/programs/scmpuff/zsh.nix
+++ b/tests/modules/programs/scmpuff/zsh.nix
@@ -1,16 +1,9 @@
-{ ... }:
-
 {
   programs = {
     scmpuff.enable = true;
     zsh.enable = true;
   };
 
-  test.stubs = {
-    zsh = { };
-    scmpuff = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.zshrc
     assertFileContains \
diff --git a/tests/modules/programs/sftpman/assert-on-no-sshkey.nix b/tests/modules/programs/sftpman/assert-on-no-sshkey.nix
index 549b68902..990aacacb 100644
--- a/tests/modules/programs/sftpman/assert-on-no-sshkey.nix
+++ b/tests/modules/programs/sftpman/assert-on-no-sshkey.nix
@@ -1,21 +1,17 @@
 {
-  config = {
-    programs.sftpman = {
-      enable = true;
+  programs.sftpman = {
+    enable = true;
 
-      mounts = {
-        mount1 = {
-          host = "host1.example.com";
-          mountPoint = "/path/to/somewhere";
-          user = "root";
-        };
+    mounts = {
+      mount1 = {
+        host = "host1.example.com";
+        mountPoint = "/path/to/somewhere";
+        user = "root";
       };
     };
-
-    test.stubs.sftpman = { };
-
-    test.asserts.assertions.expected = [''
-      sftpman mounts using authentication type "publickey" but missing 'sshKey': mount1
-    ''];
   };
+
+  test.asserts.assertions.expected = [''
+    sftpman mounts using authentication type "publickey" but missing 'sshKey': mount1
+  ''];
 }
diff --git a/tests/modules/programs/sftpman/example-settings.nix b/tests/modules/programs/sftpman/example-settings.nix
index 265f35525..b782fea2b 100644
--- a/tests/modules/programs/sftpman/example-settings.nix
+++ b/tests/modules/programs/sftpman/example-settings.nix
@@ -1,44 +1,40 @@
 {
-  config = {
-    programs.sftpman = {
-      enable = true;
-      defaultSshKey = "/home/user/.ssh/id_ed25519";
+  programs.sftpman = {
+    enable = true;
+    defaultSshKey = "/home/user/.ssh/id_ed25519";
 
-      mounts = {
-        mount1 = {
-          host = "host1.example.com";
-          mountPoint = "/path/to/somewhere";
-          user = "root";
-          mountOptions = [ "idmap=user" ];
-        };
-        mount2 = {
-          host = "host2.example.com";
-          mountPoint = "/another/path";
-          user = "someuser";
-          authType = "password";
-          sshKey = null;
-        };
-        mount3 = {
-          host = "host3.example.com";
-          mountPoint = "/yet/another/path";
-          user = "user";
-          sshKey = "/home/user/.ssh/id_rsa";
-        };
+    mounts = {
+      mount1 = {
+        host = "host1.example.com";
+        mountPoint = "/path/to/somewhere";
+        user = "root";
+        mountOptions = [ "idmap=user" ];
+      };
+      mount2 = {
+        host = "host2.example.com";
+        mountPoint = "/another/path";
+        user = "someuser";
+        authType = "password";
+        sshKey = null;
+      };
+      mount3 = {
+        host = "host3.example.com";
+        mountPoint = "/yet/another/path";
+        user = "user";
+        sshKey = "/home/user/.ssh/id_rsa";
       };
     };
-
-    test.stubs.sftpman = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/sftpman/mounts/mount1.json \
-        ${./expected-mount1.json}
-      assertFileContent \
-        home-files/.config/sftpman/mounts/mount2.json \
-        ${./expected-mount2.json}
-      assertFileContent \
-        home-files/.config/sftpman/mounts/mount3.json \
-        ${./expected-mount3.json}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/sftpman/mounts/mount1.json \
+      ${./expected-mount1.json}
+    assertFileContent \
+      home-files/.config/sftpman/mounts/mount2.json \
+      ${./expected-mount2.json}
+    assertFileContent \
+      home-files/.config/sftpman/mounts/mount3.json \
+      ${./expected-mount3.json}
+  '';
 }
diff --git a/tests/modules/programs/sioyek/sioyek-basic-configuration.nix b/tests/modules/programs/sioyek/sioyek-basic-configuration.nix
index 42eb13020..5948d3dc5 100644
--- a/tests/modules/programs/sioyek/sioyek-basic-configuration.nix
+++ b/tests/modules/programs/sioyek/sioyek-basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   programs.sioyek = {
     enable = true;
@@ -17,8 +15,6 @@
     };
   };
 
-  test.stubs.sioyek = { };
-
   nmt = {
     description = "Sioyek basic setup with sample configuration";
     script = ''
diff --git a/tests/modules/programs/sm64ex/settings.nix b/tests/modules/programs/sm64ex/settings.nix
index 04499f158..da0fc521c 100644
--- a/tests/modules/programs/sm64ex/settings.nix
+++ b/tests/modules/programs/sm64ex/settings.nix
@@ -1,80 +1,72 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.sm64ex = {
-      enable = true;
+  programs.sm64ex = {
+    enable = true;
 
-      settings = {
-        fullscreen = true;
-        window_x = 0;
-        window_y = 0;
-        window_w = 1920;
-        window_h = 1080;
-        vsync = 1;
-        texture_filtering = 1;
-        master_volume = 127;
-        music_volume = 127;
-        sfx_volume = 127;
-        env_volume = 127;
-        key_a = [ "0026" "1000" "1103" ];
-        key_b = [ "0033" "1002" "1101" ];
-        key_start = [ "0039" "1006" "ffff" ];
-        key_l = [ "0034" "1007" "1104" ];
-        key_r = [ "0036" "100a" "1105" ];
-        key_z = [ "0025" "1009" "1102" ];
-        key_cup = [ "100b" "ffff" "ffff" ];
-        key_cdown = [ "100c" "ffff" "ffff" ];
-        key_cleft = [ "100d" "ffff" "ffff" ];
-        key_cright = [ "100e" "ffff" "ffff" ];
-        key_stickup = [ "0011" "ffff" "ffff" ];
-        key_stickdown = [ "001f" "ffff" "ffff" ];
-        key_stickleft = [ "001e" "ffff" "ffff" ];
-        key_stickright = [ "0020" "ffff" "ffff" ];
-        stick_deadzone = 16;
-        rumble_strength = 10;
-        skip_intro = 1;
-      };
+    settings = {
+      fullscreen = true;
+      window_x = 0;
+      window_y = 0;
+      window_w = 1920;
+      window_h = 1080;
+      vsync = 1;
+      texture_filtering = 1;
+      master_volume = 127;
+      music_volume = 127;
+      sfx_volume = 127;
+      env_volume = 127;
+      key_a = [ "0026" "1000" "1103" ];
+      key_b = [ "0033" "1002" "1101" ];
+      key_start = [ "0039" "1006" "ffff" ];
+      key_l = [ "0034" "1007" "1104" ];
+      key_r = [ "0036" "100a" "1105" ];
+      key_z = [ "0025" "1009" "1102" ];
+      key_cup = [ "100b" "ffff" "ffff" ];
+      key_cdown = [ "100c" "ffff" "ffff" ];
+      key_cleft = [ "100d" "ffff" "ffff" ];
+      key_cright = [ "100e" "ffff" "ffff" ];
+      key_stickup = [ "0011" "ffff" "ffff" ];
+      key_stickdown = [ "001f" "ffff" "ffff" ];
+      key_stickleft = [ "001e" "ffff" "ffff" ];
+      key_stickright = [ "0020" "ffff" "ffff" ];
+      stick_deadzone = 16;
+      rumble_strength = 10;
+      skip_intro = 1;
     };
-
-    test.stubs.sm64ex = { };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.local/share/sm64pc/sm64config.txt \
-        ${
-          pkgs.writeText "sm64ex-expected-settings" ''
-            env_volume 127
-            fullscreen true
-            key_a 0026 1000 1103
-            key_b 0033 1002 1101
-            key_cdown 100c ffff ffff
-            key_cleft 100d ffff ffff
-            key_cright 100e ffff ffff
-            key_cup 100b ffff ffff
-            key_l 0034 1007 1104
-            key_r 0036 100a 1105
-            key_start 0039 1006 ffff
-            key_stickdown 001f ffff ffff
-            key_stickleft 001e ffff ffff
-            key_stickright 0020 ffff ffff
-            key_stickup 0011 ffff ffff
-            key_z 0025 1009 1102
-            master_volume 127
-            music_volume 127
-            rumble_strength 10
-            sfx_volume 127
-            skip_intro 1
-            stick_deadzone 16
-            texture_filtering 1
-            vsync 1
-            window_h 1080
-            window_w 1920
-            window_x 0
-            window_y 0''
-        }
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.local/share/sm64pc/sm64config.txt \
+      ${
+        builtins.toFile "sm64ex-expected-settings" ''
+          env_volume 127
+          fullscreen true
+          key_a 0026 1000 1103
+          key_b 0033 1002 1101
+          key_cdown 100c ffff ffff
+          key_cleft 100d ffff ffff
+          key_cright 100e ffff ffff
+          key_cup 100b ffff ffff
+          key_l 0034 1007 1104
+          key_r 0036 100a 1105
+          key_start 0039 1006 ffff
+          key_stickdown 001f ffff ffff
+          key_stickleft 001e ffff ffff
+          key_stickright 0020 ffff ffff
+          key_stickup 0011 ffff ffff
+          key_z 0025 1009 1102
+          master_volume 127
+          music_volume 127
+          rumble_strength 10
+          sfx_volume 127
+          skip_intro 1
+          stick_deadzone 16
+          texture_filtering 1
+          vsync 1
+          window_h 1080
+          window_w 1920
+          window_x 0
+          window_y 0''
+      }
+  '';
 }
diff --git a/tests/modules/programs/spotify-player/settings.nix b/tests/modules/programs/spotify-player/settings.nix
index e0442360b..cf90d1bf9 100644
--- a/tests/modules/programs/spotify-player/settings.nix
+++ b/tests/modules/programs/spotify-player/settings.nix
@@ -105,8 +105,6 @@
     ];
   };
 
-  test.stubs.spotify-player = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/spotify-player/app.toml ${./app.toml}
     assertFileContent home-files/.config/spotify-player/theme.toml ${
diff --git a/tests/modules/programs/starship/fish_with_interactive.nix b/tests/modules/programs/starship/fish_with_interactive.nix
index 0ffd6fd4b..1fdc3d01c 100644
--- a/tests/modules/programs/starship/fish_with_interactive.nix
+++ b/tests/modules/programs/starship/fish_with_interactive.nix
@@ -1,27 +1,21 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      fish.enable = true;
-      starship.enable = true;
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-
-      export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
-      export NOT_EXPECTED="
-      if test \"\$TERM\" != dumb
-          /home/hm-user/.nix-profile/bin/starship init fish | source
-
-      end"
-
-      if [[ "$GOT" == "$NOT_EXPECTED" ]]; then
-        fail "Expected starship init to be inside the 'is-interactive' block but it wasn't."
-      fi
-    '';
+  programs = {
+    fish.enable = true;
+    starship.enable = true;
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+
+    export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
+    export NOT_EXPECTED="
+    if test \"\$TERM\" != dumb
+        /home/hm-user/.nix-profile/bin/starship init fish | source
+
+    end"
+
+    if [[ "$GOT" == "$NOT_EXPECTED" ]]; then
+      fail "Expected starship init to be inside the 'is-interactive' block but it wasn't."
+    fi
+  '';
 }
diff --git a/tests/modules/programs/starship/fish_with_transience.nix b/tests/modules/programs/starship/fish_with_transience.nix
index c7a0fbf52..f78e1cfda 100644
--- a/tests/modules/programs/starship/fish_with_transience.nix
+++ b/tests/modules/programs/starship/fish_with_transience.nix
@@ -1,21 +1,15 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      fish.enable = true;
+  programs = {
+    fish.enable = true;
 
-      starship = {
-        enable = true;
-        enableTransience = true;
-      };
+    starship = {
+      enable = true;
+      enableTransience = true;
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-      assertFileRegex home-files/.config/fish/config.fish 'enable_transience'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileRegex home-files/.config/fish/config.fish 'enable_transience'
+  '';
 }
diff --git a/tests/modules/programs/starship/fish_without_interactive.nix b/tests/modules/programs/starship/fish_without_interactive.nix
index 0ec8f9646..52150715e 100644
--- a/tests/modules/programs/starship/fish_without_interactive.nix
+++ b/tests/modules/programs/starship/fish_without_interactive.nix
@@ -1,43 +1,37 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      fish.enable = true;
+  programs = {
+    fish.enable = true;
 
-      starship = {
-        enable = true;
-        enableInteractive = false;
-      };
+    starship = {
+      enable = true;
+      enableInteractive = false;
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-
-      export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
-      export EXPECTED="
-      if test \"\$TERM\" != dumb
-          /home/hm-user/.nix-profile/bin/starship init fish | source
-
-      end"
-
-      export MESSAGE="
-      ==========
-       Expected
-      ==========
-      $EXPECTED
-      ==========
-         Got
-      ==========
-      $GOT
-      ==========
-      "
-
-      if [[ "$GOT" != "$EXPECTED" ]]; then
-        fail "$MESSAGE"
-      fi
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+
+    export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)"
+    export EXPECTED="
+    if test \"\$TERM\" != dumb
+        /home/hm-user/.nix-profile/bin/starship init fish | source
+
+    end"
+
+    export MESSAGE="
+    ==========
+     Expected
+    ==========
+    $EXPECTED
+    ==========
+       Got
+    ==========
+    $GOT
+    ==========
+    "
+
+    if [[ "$GOT" != "$EXPECTED" ]]; then
+      fail "$MESSAGE"
+    fi
+  '';
 }
diff --git a/tests/modules/programs/starship/fish_without_transience.nix b/tests/modules/programs/starship/fish_without_transience.nix
index 7ba8e67fc..a92d9cb20 100644
--- a/tests/modules/programs/starship/fish_without_transience.nix
+++ b/tests/modules/programs/starship/fish_without_transience.nix
@@ -1,17 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs = {
-      fish.enable = true;
-      starship.enable = true;
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/fish/config.fish
-      assertFileNotRegex home-files/.config/fish/config.fish 'enable_transience'
-    '';
+  programs = {
+    fish.enable = true;
+    starship.enable = true;
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileNotRegex home-files/.config/fish/config.fish 'enable_transience'
+  '';
 }
diff --git a/tests/modules/programs/starship/settings.nix b/tests/modules/programs/starship/settings.nix
index c3517cae7..69845d410 100644
--- a/tests/modules/programs/starship/settings.nix
+++ b/tests/modules/programs/starship/settings.nix
@@ -1,55 +1,49 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ lib, ... }:
 
 {
-  config = {
-    programs.starship = {
-      enable = true;
+  programs.starship = {
+    enable = true;
 
-      settings = mkMerge [
-        {
-          add_newline = false;
-          format = concatStrings [
-            "$line_break"
-            "$package"
-            "$line_break"
-            "$character"
-          ];
-          scan_timeout = 10;
-          character = {
-            success_symbol = "➜";
-            error_symbol = "➜";
-          };
-          package.disabled = true;
-          memory_usage.threshold = -1;
-          aws.style = "bold blue";
-          battery = {
-            charging_symbol = "⚡️";
-            display = [{
-              threshold = 10;
-              style = "bold red";
-            }];
-          };
-        }
-
-        {
-          aws.disabled = true;
-
-          battery.display = [{
-            threshold = 30;
-            style = "bold yellow";
+    settings = lib.mkMerge [
+      {
+        add_newline = false;
+        format = lib.concatStrings [
+          "$line_break"
+          "$package"
+          "$line_break"
+          "$character"
+        ];
+        scan_timeout = 10;
+        character = {
+          success_symbol = "➜";
+          error_symbol = "➜";
+        };
+        package.disabled = true;
+        memory_usage.threshold = -1;
+        aws.style = "bold blue";
+        battery = {
+          charging_symbol = "⚡️";
+          display = [{
+            threshold = 10;
+            style = "bold red";
           }];
-        }
-      ];
-    };
+        };
+      }
 
-    test.stubs.starship = { };
+      {
+        aws.disabled = true;
 
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/starship.toml \
-        ${./settings-expected.toml}
-    '';
+        battery.display = [{
+          threshold = 30;
+          style = "bold yellow";
+        }];
+      }
+    ];
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/starship.toml \
+      ${./settings-expected.toml}
+  '';
 }
diff --git a/tests/modules/programs/taskwarrior/taskwarrior.nix b/tests/modules/programs/taskwarrior/taskwarrior.nix
index 163135a03..d3c91a29f 100644
--- a/tests/modules/programs/taskwarrior/taskwarrior.nix
+++ b/tests/modules/programs/taskwarrior/taskwarrior.nix
@@ -1,41 +1,32 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    programs.taskwarrior = {
-      enable = true;
-      package = pkgs.taskwarrior3;
-      colorTheme = "dark-violets-256";
-      dataLocation = "/some/data/location";
-      config = {
-        urgency.user.tag.next.coefficient = 42.42;
-        urgency.blocked.coefficient = -42;
-      };
-      extraConfig = ''
-        include /my/stuff
-        urgency.user.tag.test.coefficient=-42.42
-      '';
+  programs.taskwarrior = {
+    enable = true;
+    colorTheme = "dark-violets-256";
+    dataLocation = "/some/data/location";
+    config = {
+      urgency.user.tag.next.coefficient = 42.42;
+      urgency.blocked.coefficient = -42;
     };
-
-    test.stubs.taskwarrior3 = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/task/home-manager-taskrc
-      assertFileContent home-files/.config/task/home-manager-taskrc ${
-        pkgs.writeText "taskwarrior.home-conf.expected" ''
-          data.location=/some/data/location
-          include dark-violets-256.theme
-
-          urgency.blocked.coefficient=-42
-          urgency.user.tag.next.coefficient=42.420000
-
-          include /my/stuff
-          urgency.user.tag.test.coefficient=-42.42
-
-        ''
-      }
+    extraConfig = ''
+      include /my/stuff
+      urgency.user.tag.test.coefficient=-42.42
     '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/task/home-manager-taskrc
+    assertFileContent home-files/.config/task/home-manager-taskrc ${
+      builtins.toFile "taskwarrior.home-conf.expected" ''
+        data.location=/some/data/location
+        include dark-violets-256.theme
+
+        urgency.blocked.coefficient=-42
+        urgency.user.tag.next.coefficient=42.420000
+
+        include /my/stuff
+        urgency.user.tag.test.coefficient=-42.42
+
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/terminator/config-file.nix b/tests/modules/programs/terminator/config-file.nix
index 9e4e5d6e6..5cc020630 100644
--- a/tests/modules/programs/terminator/config-file.nix
+++ b/tests/modules/programs/terminator/config-file.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   programs.terminator = {
     enable = true;
@@ -9,11 +7,9 @@
     };
   };
 
-  test.stubs.terminator = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/terminator/config ${
-      pkgs.writeText "expected" ''
+      builtins.toFile "expected" ''
         [global_config]
         borderless = True
         [profiles]
diff --git a/tests/modules/programs/thefuck/integration-disabled.nix b/tests/modules/programs/thefuck/integration-disabled.nix
index 456963596..b69293578 100644
--- a/tests/modules/programs/thefuck/integration-disabled.nix
+++ b/tests/modules/programs/thefuck/integration-disabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     thefuck.enable = true;
@@ -12,8 +10,6 @@
     nushell.enable = true;
   };
 
-  test.stubs.thefuck = { };
-
   nmt.script = ''
     assertFileNotRegex home-files/.bashrc '@thefuck@/bin/thefuck'
     assertPathNotExists home-files/.config/fish/functions/fuck.fish
diff --git a/tests/modules/programs/thefuck/integration-enabled-instant.nix b/tests/modules/programs/thefuck/integration-enabled-instant.nix
index 7b89276af..8d007e685 100644
--- a/tests/modules/programs/thefuck/integration-enabled-instant.nix
+++ b/tests/modules/programs/thefuck/integration-enabled-instant.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     thefuck = {
@@ -10,8 +8,6 @@
     zsh.enable = true;
   };
 
-  test.stubs.thefuck = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/thefuck/integration-enabled.nix b/tests/modules/programs/thefuck/integration-enabled.nix
index fb220e6cb..dae5cebef 100644
--- a/tests/modules/programs/thefuck/integration-enabled.nix
+++ b/tests/modules/programs/thefuck/integration-enabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     thefuck.enable = true;
@@ -9,8 +7,6 @@
     nushell.enable = true;
   };
 
-  test.stubs.thefuck = { };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 366f8b045..4526d6686 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -68,8 +68,6 @@
     };
   };
 
-  test.stubs.thunderbird = { };
-
   nmt.script = let
     isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
     configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
diff --git a/tests/modules/programs/tmate/tmate.nix b/tests/modules/programs/tmate/tmate.nix
index 4beb84c11..76e07d881 100644
--- a/tests/modules/programs/tmate/tmate.nix
+++ b/tests/modules/programs/tmate/tmate.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   programs.tmate = {
     enable = true;
@@ -8,8 +6,6 @@
     extraConfig = ''set tmate-session-name "session-name"'';
   };
 
-  test.stubs.tmate = { };
-
   nmt.script = let
     expectedConfig = ''
       set -g tmate-server-port 222
diff --git a/tests/modules/programs/todoman/config.nix b/tests/modules/programs/todoman/config.nix
index 7323b7a43..789f32168 100644
--- a/tests/modules/programs/todoman/config.nix
+++ b/tests/modules/programs/todoman/config.nix
@@ -10,8 +10,6 @@
 
   accounts.calendar.basePath = "base/path/calendar";
 
-  test.stubs = { todoman = { }; };
-
   nmt.script = ''
     configFile=home-files/.config/todoman/config.py
     assertFileExists $configFile
diff --git a/tests/modules/programs/tofi/basic-configuration.nix b/tests/modules/programs/tofi/basic-configuration.nix
index 28b289969..95da2d254 100644
--- a/tests/modules/programs/tofi/basic-configuration.nix
+++ b/tests/modules/programs/tofi/basic-configuration.nix
@@ -1,28 +1,23 @@
-{ config, pkgs, ... }: {
-  config = {
-    programs.tofi = {
-      enable = true;
-      package = pkgs.tofi;
-      settings = {
-        background-color = "#000000";
-        border-width = 0;
-        font = "monospace";
-        height = "100%";
-        num-results = 5;
-        outline-width = 0;
-        padding-left = "35%";
-        padding-top = "35%";
-        result-spacing = 25;
-        width = "100%";
-      };
+{
+  programs.tofi = {
+    enable = true;
+    settings = {
+      background-color = "#000000";
+      border-width = 0;
+      font = "monospace";
+      height = "100%";
+      num-results = 5;
+      outline-width = 0;
+      padding-left = "35%";
+      padding-top = "35%";
+      result-spacing = 25;
+      width = "100%";
     };
-
-    test.stubs.tofi = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/tofi/config
-      assertFileContent home-files/.config/tofi/config \
-        ${./basic-configuration.conf}
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/tofi/config
+    assertFileContent home-files/.config/tofi/config \
+      ${./basic-configuration.conf}
+  '';
 }
diff --git a/tests/modules/programs/topgrade/settings.nix b/tests/modules/programs/topgrade/settings.nix
index 1e893eb47..f9b2b3dee 100644
--- a/tests/modules/programs/topgrade/settings.nix
+++ b/tests/modules/programs/topgrade/settings.nix
@@ -26,8 +26,6 @@
     ];
   };
 
-  test.stubs.topgrade = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/topgrade.toml \
diff --git a/tests/modules/programs/translate-shell/translate-shell.nix b/tests/modules/programs/translate-shell/translate-shell.nix
index 3c1d27bdd..2e6f61d9d 100644
--- a/tests/modules/programs/translate-shell/translate-shell.nix
+++ b/tests/modules/programs/translate-shell/translate-shell.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.translate-shell = {
     enable = true;
@@ -12,8 +10,6 @@
     };
   };
 
-  test.stubs.translate-shell = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/translate-shell/init.trans \
     ${builtins.toFile "translate-shell-expected-settings.trans" ''
diff --git a/tests/modules/programs/vifm/empty-settings.nix b/tests/modules/programs/vifm/empty-settings.nix
index 4e1df9c18..4231546e7 100644
--- a/tests/modules/programs/vifm/empty-settings.nix
+++ b/tests/modules/programs/vifm/empty-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   programs.vifm.enable = true;
 
-  test.stubs.vifm = { };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/vifm
   '';
diff --git a/tests/modules/programs/vim-vint/basic-configuration.nix b/tests/modules/programs/vim-vint/basic-configuration.nix
index 2e538f37f..8a17761d8 100644
--- a/tests/modules/programs/vim-vint/basic-configuration.nix
+++ b/tests/modules/programs/vim-vint/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.vim-vint = {
     enable = true;
@@ -19,8 +17,6 @@
     };
   };
 
-  test.stubs = { vim-vint = { }; };
-
   nmt.script = ''
     assertFileContent home-files/.config/.vintrc.yaml ${
       ./basic-configuration.yaml
diff --git a/tests/modules/programs/wezterm/bash-integration-default.nix b/tests/modules/programs/wezterm/bash-integration-default.nix
index 84f34effb..3a63a6848 100644
--- a/tests/modules/programs/wezterm/bash-integration-default.nix
+++ b/tests/modules/programs/wezterm/bash-integration-default.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   programs.bash.enable = true;
 
   # Bash integration is enabled by default.
   programs.wezterm.enable = true;
 
-  test.stubs.wezterm = { };
-
   nmt.script = ''
     assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wezterm/bash-integration-disabled.nix b/tests/modules/programs/wezterm/bash-integration-disabled.nix
index 43c5f5fd9..d0c65eb9a 100644
--- a/tests/modules/programs/wezterm/bash-integration-disabled.nix
+++ b/tests/modules/programs/wezterm/bash-integration-disabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.bash.enable = true;
 
@@ -8,8 +6,6 @@
     enableBashIntegration = false;
   };
 
-  test.stubs.wezterm = { };
-
   nmt.script = ''
     assertFileNotRegex home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wezterm/bash-integration-enabled.nix b/tests/modules/programs/wezterm/bash-integration-enabled.nix
index 007bc0d1a..6371f8c6f 100644
--- a/tests/modules/programs/wezterm/bash-integration-enabled.nix
+++ b/tests/modules/programs/wezterm/bash-integration-enabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.bash.enable = true;
 
@@ -8,8 +6,6 @@
     enableBashIntegration = true;
   };
 
-  test.stubs.wezterm = { };
-
   nmt.script = ''
     assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wezterm/empty-setting.nix b/tests/modules/programs/wezterm/empty-setting.nix
index 2f2ffa084..fda2eb572 100644
--- a/tests/modules/programs/wezterm/empty-setting.nix
+++ b/tests/modules/programs/wezterm/empty-setting.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   programs.wezterm = { enable = true; };
 
-  test.stubs.wezterm = { };
-
   nmt.script = let
     expected = builtins.toFile "wezterm.lua" ''
       -- Generated by Home Manager.
diff --git a/tests/modules/programs/wezterm/example-setting.nix b/tests/modules/programs/wezterm/example-setting.nix
index 264953dee..640328060 100644
--- a/tests/modules/programs/wezterm/example-setting.nix
+++ b/tests/modules/programs/wezterm/example-setting.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.wezterm = {
     enable = true;
@@ -46,8 +44,6 @@
     };
   };
 
-  test.stubs.wezterm = { };
-
   nmt.script = let
     expectedConfig = builtins.toFile "wezterm.lua" ''
       -- Generated by Home Manager.
diff --git a/tests/modules/programs/wezterm/zsh-integration-default.nix b/tests/modules/programs/wezterm/zsh-integration-default.nix
index cc398c9d9..25abddabb 100644
--- a/tests/modules/programs/wezterm/zsh-integration-default.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-default.nix
@@ -1,14 +1,9 @@
-{ ... }:
-
 {
   programs.zsh.enable = true;
 
   # Zsh integration is enabled by default.
   programs.wezterm.enable = true;
 
-  test.stubs.wezterm = { };
-  test.stubs.zsh = { };
-
   nmt.script = ''
     assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wezterm/zsh-integration-disabled.nix b/tests/modules/programs/wezterm/zsh-integration-disabled.nix
index fe7375245..702e2cb7c 100644
--- a/tests/modules/programs/wezterm/zsh-integration-disabled.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-disabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.zsh.enable = true;
 
@@ -8,9 +6,6 @@
     enableZshIntegration = false;
   };
 
-  test.stubs.wezterm = { };
-  test.stubs.zsh = { };
-
   nmt.script = ''
     assertFileNotRegex home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wezterm/zsh-integration-enabled.nix b/tests/modules/programs/wezterm/zsh-integration-enabled.nix
index 4e0928709..13efc53f2 100644
--- a/tests/modules/programs/wezterm/zsh-integration-enabled.nix
+++ b/tests/modules/programs/wezterm/zsh-integration-enabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.zsh.enable = true;
 
@@ -8,9 +6,6 @@
     enableZshIntegration = true;
   };
 
-  test.stubs.wezterm = { };
-  test.stubs.zsh = { };
-
   nmt.script = ''
     assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"'
   '';
diff --git a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix b/tests/modules/programs/wpaperd/wpaperd-example-settings.nix
index 8869f68cc..a10a2eac3 100644
--- a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix
+++ b/tests/modules/programs/wpaperd/wpaperd-example-settings.nix
@@ -1,26 +1,20 @@
-{ ... }:
-
 {
-  config = {
-    programs.wpaperd = {
-      enable = true;
-      settings = {
-        eDP-1 = {
-          path = "/home/foo/Pictures/Wallpaper";
-          apply-shadow = true;
-        };
-        DP-2 = {
-          path = "/home/foo/Pictures/Anime";
-          sorting = "descending";
-        };
+  programs.wpaperd = {
+    enable = true;
+    settings = {
+      eDP-1 = {
+        path = "/home/foo/Pictures/Wallpaper";
+        apply-shadow = true;
+      };
+      DP-2 = {
+        path = "/home/foo/Pictures/Anime";
+        sorting = "descending";
       };
     };
-
-    test.stubs.wpaperd = { };
-
-    nmt.script = ''
-      assertFileContent home-files/.config/wpaperd/wallpaper.toml \
-        ${./wpaperd-expected-settings.toml}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent home-files/.config/wpaperd/wallpaper.toml \
+      ${./wpaperd-expected-settings.toml}
+  '';
 }
diff --git a/tests/modules/programs/yambar/empty-settings.nix b/tests/modules/programs/yambar/empty-settings.nix
index 56cdf27d0..103ce595f 100644
--- a/tests/modules/programs/yambar/empty-settings.nix
+++ b/tests/modules/programs/yambar/empty-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   programs.yambar.enable = true;
 
-  test.stubs.yambar = { };
-
   nmt.script = ''
     assertPathNotExists home-files/.config/yambar
   '';
diff --git a/tests/modules/programs/yambar/example-settings.nix b/tests/modules/programs/yambar/example-settings.nix
index de572090c..19b3e203b 100644
--- a/tests/modules/programs/yambar/example-settings.nix
+++ b/tests/modules/programs/yambar/example-settings.nix
@@ -1,10 +1,6 @@
-{ config, ... }:
-
 {
   programs.yambar = {
     enable = true;
-    package = config.lib.test.mkStubPackage { };
-
     settings = {
       bar = {
         location = "top";
diff --git a/tests/modules/programs/yazi/bash-integration-enabled.nix b/tests/modules/programs/yazi/bash-integration-enabled.nix
index 474a989f9..3c590ff6d 100644
--- a/tests/modules/programs/yazi/bash-integration-enabled.nix
+++ b/tests/modules/programs/yazi/bash-integration-enabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 let
   shellIntegration = ''
     function yy() {
@@ -19,8 +17,6 @@ in {
     enableBashIntegration = true;
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = ''
     assertFileContains home-files/.bashrc '${shellIntegration}'
   '';
diff --git a/tests/modules/programs/yazi/fish-integration-enabled.nix b/tests/modules/programs/yazi/fish-integration-enabled.nix
index 8e54e5e7a..a07940f4b 100644
--- a/tests/modules/programs/yazi/fish-integration-enabled.nix
+++ b/tests/modules/programs/yazi/fish-integration-enabled.nix
@@ -9,8 +9,6 @@
     enableFishIntegration = true;
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/fish/functions/${config.programs.yazi.shellWrapperName}.fish \
       ${./fish-integration-expected.fish}
diff --git a/tests/modules/programs/yazi/init-lua-string.nix b/tests/modules/programs/yazi/init-lua-string.nix
index 999dd6bc6..b28d4a139 100644
--- a/tests/modules/programs/yazi/init-lua-string.nix
+++ b/tests/modules/programs/yazi/init-lua-string.nix
@@ -1,12 +1,10 @@
-{ ... }: {
+{
   programs.yazi = {
     enable = true;
 
     initLua = builtins.readFile ./init.lua;
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/yazi/init.lua \
       ${./init.lua}
diff --git a/tests/modules/programs/yazi/nushell-integration-enabled.nix b/tests/modules/programs/yazi/nushell-integration-enabled.nix
index a2de2d8b7..6753c74ee 100644
--- a/tests/modules/programs/yazi/nushell-integration-enabled.nix
+++ b/tests/modules/programs/yazi/nushell-integration-enabled.nix
@@ -20,8 +20,6 @@ in {
     enableNushellIntegration = true;
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = let
     configPath = if pkgs.stdenv.isDarwin && !config.xdg.enable then
       "home-files/Library/Application Support/nushell/config.nu"
diff --git a/tests/modules/programs/yazi/settings.nix b/tests/modules/programs/yazi/settings.nix
index 32b8a9d5f..f2e194f0e 100644
--- a/tests/modules/programs/yazi/settings.nix
+++ b/tests/modules/programs/yazi/settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.yazi = {
     enable = true;
@@ -88,8 +86,6 @@
     };
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = ''
     assertFileContent home-files/.config/yazi/keymap.toml \
       ${./keymap-expected.toml}
diff --git a/tests/modules/programs/yazi/zsh-integration-enabled.nix b/tests/modules/programs/yazi/zsh-integration-enabled.nix
index 0c0ec217f..669b8a517 100644
--- a/tests/modules/programs/yazi/zsh-integration-enabled.nix
+++ b/tests/modules/programs/yazi/zsh-integration-enabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 let
   shellIntegration = ''
     function yy() {
@@ -19,8 +17,6 @@ in {
     enableBashIntegration = true;
   };
 
-  test.stubs.yazi = { };
-
   nmt.script = ''
     assertFileContains home-files/.zshrc '${shellIntegration}'
   '';
diff --git a/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix b/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix
index c28d44e57..37a0d034f 100644
--- a/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix
+++ b/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.yt-dlp = {
     enable = true;
@@ -8,8 +6,6 @@
     '';
   };
 
-  test.stubs.yt-dlp = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/yt-dlp/config
     assertFileContent home-files/.config/yt-dlp/config ${
diff --git a/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix b/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix
index 229f0438c..734a5c10a 100644
--- a/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix
+++ b/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.yt-dlp = {
     enable = true;
@@ -16,8 +14,6 @@
     '';
   };
 
-  test.stubs.yt-dlp = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/yt-dlp/config
     assertFileContent home-files/.config/yt-dlp/config ${
diff --git a/tests/modules/programs/zellij/enable-shells.nix b/tests/modules/programs/zellij/enable-shells.nix
index c648cf7dd..63e13facc 100644
--- a/tests/modules/programs/zellij/enable-shells.nix
+++ b/tests/modules/programs/zellij/enable-shells.nix
@@ -17,25 +17,20 @@
   xdg.dataFile."fish/home-manager_generated_completions".source =
     lib.mkForce (builtins.toFile "empty" "");
 
-  test.stubs = {
-    zsh = { };
-    zellij = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.bashrc
     assertFileContains \
       home-files/.bashrc \
-      'eval "$(@zellij@/bin/dummy setup --generate-auto-start bash)"'
+      'eval "$(@zellij@/bin/zellij setup --generate-auto-start bash)"'
 
     assertFileExists home-files/.zshrc
     assertFileContains \
       home-files/.zshrc \
-      'eval "$(@zellij@/bin/dummy setup --generate-auto-start zsh)"'
+      'eval "$(@zellij@/bin/zellij setup --generate-auto-start zsh)"'
 
     assertFileExists home-files/.config/fish/config.fish
     assertFileContains \
       home-files/.config/fish/config.fish \
-      'eval (@zellij@/bin/dummy setup --generate-auto-start fish | string collect)'
+      'eval (@zellij@/bin/zellij setup --generate-auto-start fish | string collect)'
   '';
 }
diff --git a/tests/modules/programs/zk/zk.nix b/tests/modules/programs/zk/zk.nix
index 8907d1677..b22eb35d9 100644
--- a/tests/modules/programs/zk/zk.nix
+++ b/tests/modules/programs/zk/zk.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.zk = {
     enable = true;
@@ -21,8 +19,6 @@
     };
   };
 
-  test.stubs.zk = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/zk/config.toml
     assertFileContent home-files/.config/zk/config.toml ${./expected.toml}
diff --git a/tests/modules/programs/zplug/modules.nix b/tests/modules/programs/zplug/modules.nix
index 1256e33c2..ffb81d7c1 100644
--- a/tests/modules/programs/zplug/modules.nix
+++ b/tests/modules/programs/zplug/modules.nix
@@ -19,11 +19,6 @@
     };
   };
 
-  test.stubs = {
-    zplug = { };
-    zsh = { };
-  };
-
   nmt.script = ''
     assertFileContains home-files/.zshrc \
       'source @zplug@/share/zplug/init.zsh'
diff --git a/tests/modules/programs/zsh/history-ignore-pattern.nix b/tests/modules/programs/zsh/history-ignore-pattern.nix
index 49865e846..2442c32f3 100644
--- a/tests/modules/programs/zsh/history-ignore-pattern.nix
+++ b/tests/modules/programs/zsh/history-ignore-pattern.nix
@@ -1,17 +1,12 @@
-{ ... }:
-
 {
   imports = [
-    ./zsh-stubs.nix
     ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "echo *" ]; })
     ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "rm *" ]; })
   ];
 
-  config = {
-    programs.zsh.enable = true;
+  programs.zsh.enable = true;
 
-    nmt.script = ''
-      assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'"
-    '';
-  };
+  nmt.script = ''
+    assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'"
+  '';
 }
diff --git a/tests/modules/programs/zsh/history-path-new-custom.nix b/tests/modules/programs/zsh/history-path-new-custom.nix
index ee6deb883..497796186 100644
--- a/tests/modules/programs/zsh/history-path-new-custom.nix
+++ b/tests/modules/programs/zsh/history-path-new-custom.nix
@@ -1,17 +1,11 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
-
-  config = {
-    home.stateVersion = "20.03";
-    programs.zsh = {
-      enable = true;
-      history.path = "$HOME/some/directory/zsh_history";
-    };
-
-    nmt.script = ''
-      assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
-    '';
+  home.stateVersion = "20.03";
+  programs.zsh = {
+    enable = true;
+    history.path = "$HOME/some/directory/zsh_history";
   };
+
+  nmt.script = ''
+    assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
+  '';
 }
diff --git a/tests/modules/programs/zsh/history-path-new-default.nix b/tests/modules/programs/zsh/history-path-new-default.nix
index 3ead97597..4dfca0d06 100644
--- a/tests/modules/programs/zsh/history-path-new-default.nix
+++ b/tests/modules/programs/zsh/history-path-new-default.nix
@@ -1,14 +1,8 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
+  home.stateVersion = "20.03";
+  programs.zsh.enable = true;
 
-  config = {
-    home.stateVersion = "20.03";
-    programs.zsh.enable = true;
-
-    nmt.script = ''
-      assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
-    '';
-  };
+  nmt.script = ''
+    assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
+  '';
 }
diff --git a/tests/modules/programs/zsh/history-path-old-custom.nix b/tests/modules/programs/zsh/history-path-old-custom.nix
index 25a2babf5..f4f5ac38d 100644
--- a/tests/modules/programs/zsh/history-path-old-custom.nix
+++ b/tests/modules/programs/zsh/history-path-old-custom.nix
@@ -1,17 +1,11 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
-
-  config = {
-    home.stateVersion = "19.09";
-    programs.zsh = {
-      enable = true;
-      history.path = "some/directory/zsh_history";
-    };
-
-    nmt.script = ''
-      assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
-    '';
+  home.stateVersion = "19.09";
+  programs.zsh = {
+    enable = true;
+    history.path = "some/directory/zsh_history";
   };
+
+  nmt.script = ''
+    assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$'
+  '';
 }
diff --git a/tests/modules/programs/zsh/history-path-old-default.nix b/tests/modules/programs/zsh/history-path-old-default.nix
index b988ddb62..8e4debb32 100644
--- a/tests/modules/programs/zsh/history-path-old-default.nix
+++ b/tests/modules/programs/zsh/history-path-old-default.nix
@@ -1,14 +1,8 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
+  home.stateVersion = "19.03";
+  programs.zsh.enable = true;
 
-  config = {
-    home.stateVersion = "19.03";
-    programs.zsh.enable = true;
-
-    nmt.script = ''
-      assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
-    '';
-  };
+  nmt.script = ''
+    assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$'
+  '';
 }
diff --git a/tests/modules/programs/zsh/history-substring-search.nix b/tests/modules/programs/zsh/history-substring-search.nix
index a5f28b724..94c2bae9c 100644
--- a/tests/modules/programs/zsh/history-substring-search.nix
+++ b/tests/modules/programs/zsh/history-substring-search.nix
@@ -1,23 +1,17 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
-
-  config = {
-    programs.zsh = {
+  programs.zsh = {
+    enable = true;
+    historySubstringSearch = {
       enable = true;
-      historySubstringSearch = {
-        enable = true;
-        searchDownKey = "^[[B";
-        searchUpKey = [ "^[[A" "\\eOA" ];
-      };
+      searchDownKey = "^[[B";
+      searchUpKey = [ "^[[A" "\\eOA" ];
     };
-
-    # Written with regex to ensure we don't end up missing newlines in the future
-    nmt.script = ''
-      assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[B\" history-substring-search-down$"
-      assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[A\" history-substring-search-up$"
-      assertFileRegex home-files/.zshrc "^bindkey \"\\\\eOA\" history-substring-search-up$"
-    '';
   };
+
+  # Written with regex to ensure we don't end up missing newlines in the future
+  nmt.script = ''
+    assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[B\" history-substring-search-down$"
+    assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[A\" history-substring-search-up$"
+    assertFileRegex home-files/.zshrc "^bindkey \"\\\\eOA\" history-substring-search-up$"
+  '';
 }
diff --git a/tests/modules/programs/zsh/prezto.nix b/tests/modules/programs/zsh/prezto.nix
index 7ce609063..ffb5d1835 100644
--- a/tests/modules/programs/zsh/prezto.nix
+++ b/tests/modules/programs/zsh/prezto.nix
@@ -1,10 +1,19 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
-
   programs.zsh.prezto.enable = true;
 
+  test.stubs = {
+    zsh-prezto = {
+      outPath = null;
+      buildScript = ''
+        mkdir -p $out/share/zsh-prezto/runcoms
+        echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile
+        echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin
+        echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout
+        echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv
+      '';
+    };
+  };
+
   nmt.script = ''
     assertFileExists home-files/.zpreztorc
   '';
diff --git a/tests/modules/programs/zsh/session-variables.nix b/tests/modules/programs/zsh/session-variables.nix
index 45c63d236..0aa20c8c2 100644
--- a/tests/modules/programs/zsh/session-variables.nix
+++ b/tests/modules/programs/zsh/session-variables.nix
@@ -1,22 +1,18 @@
 { config, ... }:
 
 {
-  imports = [ ./zsh-stubs.nix ];
+  programs.zsh = {
+    enable = true;
 
-  config = {
-    programs.zsh = {
-      enable = true;
-
-      sessionVariables = {
-        V1 = "v1";
-        V2 = "v2-${config.programs.zsh.sessionVariables.V1}";
-      };
+    sessionVariables = {
+      V1 = "v1";
+      V2 = "v2-${config.programs.zsh.sessionVariables.V1}";
     };
-
-    nmt.script = ''
-      assertFileExists home-files/.zshenv
-      assertFileRegex home-files/.zshenv 'export V1="v1"'
-      assertFileRegex home-files/.zshenv 'export V2="v2-v1"'
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshenv
+    assertFileRegex home-files/.zshenv 'export V1="v1"'
+    assertFileRegex home-files/.zshenv 'export V2="v2-v1"'
+  '';
 }
diff --git a/tests/modules/programs/zsh/syntax-highlighting.nix b/tests/modules/programs/zsh/syntax-highlighting.nix
index 2bd581473..27970a123 100644
--- a/tests/modules/programs/zsh/syntax-highlighting.nix
+++ b/tests/modules/programs/zsh/syntax-highlighting.nix
@@ -1,24 +1,20 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./zsh-stubs.nix ];
-
-  config = {
-    programs.zsh = {
+  programs.zsh = {
+    enable = true;
+    syntaxHighlighting = {
       enable = true;
-      syntaxHighlighting = {
-        enable = true;
-        package = pkgs.hello;
-        highlighters = [ "brackets" "pattern" "cursor" ];
-        styles.comment = "fg=#6c6c6c";
-        patterns."rm -rf *" = "fg=white,bold,bg=red";
-      };
+      package = pkgs.hello;
+      highlighters = [ "brackets" "pattern" "cursor" ];
+      styles.comment = "fg=#6c6c6c";
+      patterns."rm -rf *" = "fg=white,bold,bg=red";
     };
-
-    nmt.script = ''
-      assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-      assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)"
-      assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=(comment 'fg=#6c6c6c')"
-    '';
   };
+
+  nmt.script = ''
+    assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+    assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)"
+    assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=(comment 'fg=#6c6c6c')"
+  '';
 }
diff --git a/tests/modules/programs/zsh/zsh-abbr.nix b/tests/modules/programs/zsh/zsh-abbr.nix
index f08345e05..5be5e2b03 100644
--- a/tests/modules/programs/zsh/zsh-abbr.nix
+++ b/tests/modules/programs/zsh/zsh-abbr.nix
@@ -1,8 +1,4 @@
-{ ... }:
-
 {
-  imports = [ ./zsh-stubs.nix ];
-
   programs.zsh.zsh-abbr = {
     enable = true;
     abbreviations = { ga = "git add"; };
diff --git a/tests/modules/programs/zsh/zsh-stubs.nix b/tests/modules/programs/zsh/zsh-stubs.nix
deleted file mode 100644
index d9e275aab..000000000
--- a/tests/modules/programs/zsh/zsh-stubs.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ ... }:
-
-{
-  test.stubs = {
-    hello = { };
-    nix-zsh-completions = { };
-    zsh = { };
-    zsh-abbr = { };
-    zsh-history-substring-search = { };
-    zsh-prezto = {
-      outPath = null;
-      buildScript = ''
-        mkdir -p $out/share/zsh-prezto/runcoms
-        echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile
-        echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin
-        echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout
-        echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv
-      '';
-    };
-    zsh-syntax-highlighting = { };
-  };
-}
diff --git a/tests/modules/services/activitywatch/basic-setup.nix b/tests/modules/services/activitywatch/basic-setup.nix
index a8ba1cb49..d3a14ae87 100644
--- a/tests/modules/services/activitywatch/basic-setup.nix
+++ b/tests/modules/services/activitywatch/basic-setup.nix
@@ -5,7 +5,6 @@ let stubPackage = config.lib.test.mkStubPackage { };
 in {
   services.activitywatch = {
     enable = true;
-    package = stubPackage;
     settings = {
       port = 3012;
       custom_static = { custom-watcher = stubPackage; };
diff --git a/tests/modules/services/activitywatch/empty-server-settings.nix b/tests/modules/services/activitywatch/empty-server-settings.nix
index 89c65b1f0..290c1fb0a 100644
--- a/tests/modules/services/activitywatch/empty-server-settings.nix
+++ b/tests/modules/services/activitywatch/empty-server-settings.nix
@@ -3,8 +3,6 @@
 {
   services.activitywatch.enable = true;
 
-  test.stubs.activitywatch = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/activitywatch.service
     assertFileExists home-files/.config/systemd/user/activitywatch.target
diff --git a/tests/modules/services/avizo/with-settings.nix b/tests/modules/services/avizo/with-settings.nix
index 4c54f261d..80b219392 100644
--- a/tests/modules/services/avizo/with-settings.nix
+++ b/tests/modules/services/avizo/with-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.avizo = {
     enable = true;
@@ -14,8 +12,6 @@
     };
   };
 
-  test.stubs.avizo = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/avizo.service
     assertFileExists $serviceFile
diff --git a/tests/modules/services/avizo/without-settings.nix b/tests/modules/services/avizo/without-settings.nix
index 49a960614..b6bf03cff 100644
--- a/tests/modules/services/avizo/without-settings.nix
+++ b/tests/modules/services/avizo/without-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   services.avizo.enable = true;
 
-  test.stubs.avizo = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/avizo.service
     assertFileExists $serviceFile
diff --git a/tests/modules/services/barrier/basic-configuration.nix b/tests/modules/services/barrier/basic-configuration.nix
index e7e393184..7a9ad097a 100644
--- a/tests/modules/services/barrier/basic-configuration.nix
+++ b/tests/modules/services/barrier/basic-configuration.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   services.barrier.client = {
     enable = true;
     server = "testServer";
   };
 
-  test.stubs.barrier = { };
-
   nmt.script = ''
     clientServiceFile=home-files/.config/systemd/user/barrierc.service
 
diff --git a/tests/modules/services/blanket/basic-configuration.nix b/tests/modules/services/blanket/basic-configuration.nix
index 740c4d08d..f51d5ac0a 100644
--- a/tests/modules/services/blanket/basic-configuration.nix
+++ b/tests/modules/services/blanket/basic-configuration.nix
@@ -1,9 +1,5 @@
-{ ... }:
-
 {
-  services.blanket = { enable = true; };
-
-  test.stubs.blanket = { };
+  services.blanket.enable = true;
 
   nmt.script = ''
     clientServiceFile=home-files/.config/systemd/user/blanket.service
diff --git a/tests/modules/services/borgmatic/basic-configuration.nix b/tests/modules/services/borgmatic/basic-configuration.nix
index 3763b98fa..85c8efd57 100644
--- a/tests/modules/services/borgmatic/basic-configuration.nix
+++ b/tests/modules/services/borgmatic/basic-configuration.nix
@@ -1,22 +1,16 @@
-{ config, pkgs, ... }:
-
 {
-  config = {
-    services.borgmatic = {
-      enable = true;
-      frequency = "weekly";
-    };
-
-    test.stubs.borgmatic = { };
-
-    nmt.script = ''
-      assertFileContent \
-        $(normalizeStorePaths home-files/.config/systemd/user/borgmatic.service) \
-        ${./basic-configuration.service}
-
-      assertFileContent \
-        home-files/.config/systemd/user/borgmatic.timer \
-        ${./basic-configuration.timer}
-    '';
+  services.borgmatic = {
+    enable = true;
+    frequency = "weekly";
   };
+
+  nmt.script = ''
+    assertFileContent \
+      $(normalizeStorePaths home-files/.config/systemd/user/borgmatic.service) \
+      ${./basic-configuration.service}
+
+    assertFileContent \
+      home-files/.config/systemd/user/borgmatic.timer \
+      ${./basic-configuration.timer}
+  '';
 }
diff --git a/tests/modules/services/borgmatic/basic-configuration.service b/tests/modules/services/borgmatic/basic-configuration.service
index 8b760293a..82d4d8363 100644
--- a/tests/modules/services/borgmatic/basic-configuration.service
+++ b/tests/modules/services/borgmatic/basic-configuration.service
@@ -1,5 +1,5 @@
 [Service]
-ExecStart=/nix/store/00000000000000000000000000000000-systemd/bin/systemd-inhibit \
+ExecStart=@systemd@/bin/systemd-inhibit \
   --who="borgmatic" \
   --what="sleep:shutdown" \
   --why="Prevent interrupting scheduled backup" \
diff --git a/tests/modules/services/cachix-agent/basic-setup.nix b/tests/modules/services/cachix-agent/basic-setup.nix
index 22c088900..9371d8343 100644
--- a/tests/modules/services/cachix-agent/basic-setup.nix
+++ b/tests/modules/services/cachix-agent/basic-setup.nix
@@ -1,14 +1,9 @@
-{ config, ... }:
-
 {
   services.cachix-agent = {
     enable = true;
-    package = config.lib.test.mkStubPackage { outPath = "@cachix-agent@"; };
     name = "test-agent";
   };
 
-  test.stubs.nix = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/systemd/user/cachix-agent.service \
@@ -20,7 +15,7 @@
           [Service]
           Environment=PATH=@nix@/bin
           EnvironmentFile=/home/hm-user/.config/cachix-agent.token
-          ExecStart=@cachix-agent@/bin/cachix deploy agent test-agent home-manager
+          ExecStart=@cachix@/bin/cachix deploy agent test-agent home-manager
           KillMode=process
           Restart=on-failure
 
diff --git a/tests/modules/services/cliphist/cliphist-extra-options.nix b/tests/modules/services/cliphist/cliphist-extra-options.nix
index dcf097c6c..60a3ce7aa 100644
--- a/tests/modules/services/cliphist/cliphist-extra-options.nix
+++ b/tests/modules/services/cliphist/cliphist-extra-options.nix
@@ -1,15 +1,10 @@
-{ ... }: {
+{
   services.cliphist = {
     enable = true;
     allowImages = true;
     extraOptions = [ "-max-dedupe-search" "10" "-max-items" "500" ];
   };
 
-  test.stubs = {
-    cliphist = { };
-    wl-clipboard = { };
-  };
-
   nmt.script = ''
     servicePath=home-files/.config/systemd/user
 
diff --git a/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix
index e4c0e828c..64c804723 100644
--- a/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix
+++ b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.cliphist = {
     enable = true;
@@ -7,11 +5,6 @@
     systemdTargets = [ "sway-session.target" "hyprland-session.target" ];
   };
 
-  test.stubs = {
-    cliphist = { };
-    wl-clipboard = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/cliphist.service
     assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service
diff --git a/tests/modules/services/cliphist/cliphist-sway-session-target.nix b/tests/modules/services/cliphist/cliphist-sway-session-target.nix
index 71171be78..a3d13ad10 100644
--- a/tests/modules/services/cliphist/cliphist-sway-session-target.nix
+++ b/tests/modules/services/cliphist/cliphist-sway-session-target.nix
@@ -6,11 +6,6 @@
     systemdTarget = "sway-session.target";
   };
 
-  test.stubs = {
-    cliphist = { };
-    wl-clipboard = { };
-  };
-
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/cliphist.service
     assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service
diff --git a/tests/modules/services/clipman/clipman-sway-session-target.nix b/tests/modules/services/clipman/clipman-sway-session-target.nix
index 129ab554f..aa33a0730 100644
--- a/tests/modules/services/clipman/clipman-sway-session-target.nix
+++ b/tests/modules/services/clipman/clipman-sway-session-target.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.stateVersion = "21.11";
 
@@ -8,11 +6,6 @@
     systemdTarget = "sway-session.target";
   };
 
-  test.stubs = {
-    clipman = { };
-    wl-clipboard = { };
-  };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/clipman.service)
     assertFileContent "$serviceFile" ${./clipman-sway-session-target.service}
diff --git a/tests/modules/services/comodoro/comodoro.nix b/tests/modules/services/comodoro/comodoro.nix
index 35974ecd7..3c34951ec 100644
--- a/tests/modules/services/comodoro/comodoro.nix
+++ b/tests/modules/services/comodoro/comodoro.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.comodoro = {
     enable = true;
@@ -7,8 +5,6 @@
     protocols = [ "tcp" ];
   };
 
-  test.stubs.comodoro = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/comodoro.service)
     assertFileContent "$serviceFile" ${./expected.service}
diff --git a/tests/modules/services/conky/basic-configuration.nix b/tests/modules/services/conky/basic-configuration.nix
index 479a19239..15a0e3d30 100644
--- a/tests/modules/services/conky/basic-configuration.nix
+++ b/tests/modules/services/conky/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.conky = {
     enable = true;
@@ -14,8 +12,6 @@
     '';
   };
 
-  test.stubs.conky = { };
-
   nmt.script = ''
     serviceFile="$TESTED/home-files/.config/systemd/user/conky.service"
 
diff --git a/tests/modules/services/copyq/basic-configuration.nix b/tests/modules/services/copyq/basic-configuration.nix
index f90872815..6394e393f 100644
--- a/tests/modules/services/copyq/basic-configuration.nix
+++ b/tests/modules/services/copyq/basic-configuration.nix
@@ -1,17 +1,11 @@
-{ ... }:
-
 {
-  config = {
-    services.copyq = {
-      enable = true;
-      systemdTarget = "sway-session.target";
-    };
-
-    test.stubs.copyq = { };
-
-    nmt.script = ''
-      serviceFile=home-files/.config/systemd/user/copyq.service
-      assertFileContent $serviceFile ${./basic-expected.service}
-    '';
+  services.copyq = {
+    enable = true;
+    systemdTarget = "sway-session.target";
   };
+
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/copyq.service
+    assertFileContent $serviceFile ${./basic-expected.service}
+  '';
 }
diff --git a/tests/modules/services/copyq/basic-expected.service b/tests/modules/services/copyq/basic-expected.service
index f20c23bbc..28f56356a 100644
--- a/tests/modules/services/copyq/basic-expected.service
+++ b/tests/modules/services/copyq/basic-expected.service
@@ -3,7 +3,7 @@ WantedBy=sway-session.target
 
 [Service]
 Environment=QT_QPA_PLATFORM=xcb
-ExecStart=@copyq@/bin/copyq
+ExecStart=@CopyQ@/bin/copyq
 Restart=on-failure
 
 [Unit]
diff --git a/tests/modules/services/copyq/dont-force-x-configuration.nix b/tests/modules/services/copyq/dont-force-x-configuration.nix
index a233ae264..7948d2409 100644
--- a/tests/modules/services/copyq/dont-force-x-configuration.nix
+++ b/tests/modules/services/copyq/dont-force-x-configuration.nix
@@ -1,17 +1,11 @@
-{ ... }:
-
 {
-  config = {
-    services.copyq = {
-      enable = true;
-      forceXWayland = false;
-    };
-
-    test.stubs.copyq = { };
-
-    nmt.script = ''
-      serviceFile=home-files/.config/systemd/user/copyq.service
-      assertFileContent $serviceFile ${./dont-force-x-expected.service}
-    '';
+  services.copyq = {
+    enable = true;
+    forceXWayland = false;
   };
+
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/copyq.service
+    assertFileContent $serviceFile ${./dont-force-x-expected.service}
+  '';
 }
diff --git a/tests/modules/services/copyq/dont-force-x-expected.service b/tests/modules/services/copyq/dont-force-x-expected.service
index 7680f1fe5..0ecdbaf50 100644
--- a/tests/modules/services/copyq/dont-force-x-expected.service
+++ b/tests/modules/services/copyq/dont-force-x-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@copyq@/bin/copyq
+ExecStart=@CopyQ@/bin/copyq
 Restart=on-failure
 
 [Unit]
diff --git a/tests/modules/services/darkman/basic-configuration.nix b/tests/modules/services/darkman/basic-configuration.nix
index 4c3e85470..8e1a33bc6 100644
--- a/tests/modules/services/darkman/basic-configuration.nix
+++ b/tests/modules/services/darkman/basic-configuration.nix
@@ -23,8 +23,6 @@
     '';
   };
 
-  test.stubs.python = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/darkman.service)
     darkModeScriptFile=$(normalizeStorePaths home-files/.local/share/dark-mode.d/color-scheme-dark)
diff --git a/tests/modules/services/darkman/no-configuration.nix b/tests/modules/services/darkman/no-configuration.nix
index 1ab6346f4..50802eb42 100644
--- a/tests/modules/services/darkman/no-configuration.nix
+++ b/tests/modules/services/darkman/no-configuration.nix
@@ -1,11 +1,6 @@
 {
   services.darkman.enable = true;
 
-  test.stubs = {
-    python = { };
-    darkman = { };
-  };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/darkman.service)
 
@@ -17,7 +12,7 @@
 
         [Service]
         BusName=nl.whynothugo.darkman
-        ExecStart=@darkman@/bin/dummy run
+        ExecStart=@darkman@/bin/darkman run
         Restart=on-failure
         Slice=background.slice
         TimeoutStopSec=15
diff --git a/tests/modules/services/devilspie2/configuration.nix b/tests/modules/services/devilspie2/configuration.nix
index 14bdc6f0c..a6b819878 100644
--- a/tests/modules/services/devilspie2/configuration.nix
+++ b/tests/modules/services/devilspie2/configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.devilspie2 = {
     enable = true;
@@ -19,8 +17,6 @@
     '';
   };
 
-  test.stubs.devilspie2 = { };
-
   nmt.script = ''
     configlua=home-files/.config/devilspie2/config.lua
 
diff --git a/tests/modules/services/dropbox/basic-configuration.nix b/tests/modules/services/dropbox/basic-configuration.nix
index 9b8a6d651..8e3096ea0 100644
--- a/tests/modules/services/dropbox/basic-configuration.nix
+++ b/tests/modules/services/dropbox/basic-configuration.nix
@@ -7,13 +7,10 @@
       path = "${config.home.homeDirectory}/dropbox";
     };
 
-    test.stubs.dropbox-cli = { };
-
     nmt.script = ''
       serviceFile=home-files/.config/systemd/user/dropbox.service
 
       assertFileExists $serviceFile
     '';
-
   };
 }
diff --git a/tests/modules/services/espanso-darwin/basic-configuration.nix b/tests/modules/services/espanso-darwin/basic-configuration.nix
index 4a2f2ee77..cd9d2f297 100644
--- a/tests/modules/services/espanso-darwin/basic-configuration.nix
+++ b/tests/modules/services/espanso-darwin/basic-configuration.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   services.espanso = {
     enable = true;
     configs = { default = { show_notifications = false; }; };
@@ -36,8 +36,6 @@
     };
   };
 
-  test.stubs.espanso = { };
-
   nmt.script = ''
     serviceFile="LaunchAgents/org.nix-community.home.espanso.plist"
     serviceFileNormalized="$(normalizeStorePaths "$serviceFile")"
diff --git a/tests/modules/services/espanso/basic-configuration.nix b/tests/modules/services/espanso/basic-configuration.nix
index 6d04c53d2..93c6a5a2d 100644
--- a/tests/modules/services/espanso/basic-configuration.nix
+++ b/tests/modules/services/espanso/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.espanso = {
     enable = true;
@@ -38,8 +36,6 @@
     };
   };
 
-  test.stubs.espanso = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/espanso.service
     assertFileExists "$serviceFile"
diff --git a/tests/modules/services/flameshot/empty-settings.nix b/tests/modules/services/flameshot/empty-settings.nix
index 2c700c49d..14e35d826 100644
--- a/tests/modules/services/flameshot/empty-settings.nix
+++ b/tests/modules/services/flameshot/empty-settings.nix
@@ -1,9 +1,5 @@
-{ ... }:
-
 {
-  services.flameshot = { enable = true; };
-
-  test.stubs.flameshot = { };
+  services.flameshot.enable = true;
 
   nmt.script = ''
     assertPathNotExists home-files/.config/flameshot/flameshot.ini
diff --git a/tests/modules/services/flameshot/example-settings.nix b/tests/modules/services/flameshot/example-settings.nix
index d61b93e93..25aa4f75c 100644
--- a/tests/modules/services/flameshot/example-settings.nix
+++ b/tests/modules/services/flameshot/example-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.flameshot = {
     enable = true;
@@ -12,8 +10,6 @@
     };
   };
 
-  test.stubs.flameshot = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/flameshot/flameshot.ini \
diff --git a/tests/modules/services/fluidsynth/service.nix b/tests/modules/services/fluidsynth/service.nix
index ce0427b83..97ca0a4b4 100644
--- a/tests/modules/services/fluidsynth/service.nix
+++ b/tests/modules/services/fluidsynth/service.nix
@@ -6,8 +6,6 @@
   services.fluidsynth.soundFont = "/path/to/soundFont";
   services.fluidsynth.extraOptions = [ "--sample-rate 96000" ];
 
-  test.stubs.fluidsynth = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/fluidsynth.service
 
diff --git a/tests/modules/services/fusuma/fusuma-stubs.nix b/tests/modules/services/fusuma/fusuma-stubs.nix
new file mode 100644
index 000000000..b2904b7d0
--- /dev/null
+++ b/tests/modules/services/fusuma/fusuma-stubs.nix
@@ -0,0 +1,11 @@
+{ realPkgs, ... }:
+
+{
+  nixpkgs.overlays = [
+    (_: super: {
+      inherit (realPkgs) remarshal;
+      python3Packages = super.python3Packages.overrideScope
+        (self: super: { inherit (realPkgs.python3Packages) pyyaml; });
+    })
+  ];
+}
diff --git a/tests/modules/services/fusuma/service.nix b/tests/modules/services/fusuma/service.nix
index 8041bf7b8..028054e4e 100644
--- a/tests/modules/services/fusuma/service.nix
+++ b/tests/modules/services/fusuma/service.nix
@@ -1,9 +1,10 @@
 { config, ... }:
 
 {
+  imports = [ ./fusuma-stubs.nix ];
+
   services.fusuma = {
     enable = true;
-    package = config.lib.test.mkStubPackage { outPath = "@fusuma@"; };
     extraPackages = [
       (config.lib.test.mkStubPackage { outPath = "@coreutils@"; })
       (config.lib.test.mkStubPackage { outPath = "@xdotool@"; })
diff --git a/tests/modules/services/fusuma/settings.nix b/tests/modules/services/fusuma/settings.nix
index a1500cb21..da329673d 100644
--- a/tests/modules/services/fusuma/settings.nix
+++ b/tests/modules/services/fusuma/settings.nix
@@ -1,10 +1,12 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
+  imports = [ ./fusuma-stubs.nix ];
+
   services.fusuma = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@fusuma@"; };
-    extraPackages = [ (config.lib.test.mkStubPackage { }) ];
+    extraPackages = [ pkgs.xdotool ];
 
     settings = {
       threshold = { swipe = 1; };
diff --git a/tests/modules/services/git-sync/basic.nix b/tests/modules/services/git-sync/basic.nix
index 0412f93b1..88c180201 100644
--- a/tests/modules/services/git-sync/basic.nix
+++ b/tests/modules/services/git-sync/basic.nix
@@ -10,21 +10,18 @@
     };
   };
 
-  test.stubs.openssh = { name = "openssh"; };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/git-sync-test.service
 
     assertFileExists $serviceFile
 
-    serviceFile=$(normalizeStorePaths $serviceFile)
     assertFileContent $serviceFile ${
       builtins.toFile "expected" ''
         [Install]
         WantedBy=default.target
 
         [Service]
-        Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin
+        Environment=PATH=@openssh@/bin:@git@/bin
         Environment=GIT_SYNC_DIRECTORY=/a/path
         Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
         Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path/to/repo.git'
diff --git a/tests/modules/services/git-sync/whitespace.nix b/tests/modules/services/git-sync/whitespace.nix
index 871843553..9097b4ff8 100644
--- a/tests/modules/services/git-sync/whitespace.nix
+++ b/tests/modules/services/git-sync/whitespace.nix
@@ -1,9 +1,6 @@
-{ config, ... }:
-
 {
   services.git-sync = {
     enable = true;
-    package = config.lib.test.mkStubPackage { outPath = "@git-sync@"; };
     repositories = {
       testWithWhitespace = {
         path = "/a path";
@@ -12,21 +9,18 @@
     };
   };
 
-  test.stubs.openssh = { name = "openssh"; };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/git-sync-testWithWhitespace.service
 
     assertFileExists $serviceFile
 
-    serviceFile=$(normalizeStorePaths $serviceFile)
     assertFileContent $serviceFile ${
       builtins.toFile "expected" ''
         [Install]
         WantedBy=default.target
 
         [Service]
-        Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin
+        Environment=PATH=@openssh@/bin:@git@/bin
         Environment=GIT_SYNC_DIRECTORY='/a path'
         Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
         Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path to/repo.git'
diff --git a/tests/modules/services/glance/default-settings.nix b/tests/modules/services/glance/default-settings.nix
index 7b35db779..fbd9159cc 100644
--- a/tests/modules/services/glance/default-settings.nix
+++ b/tests/modules/services/glance/default-settings.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   services.glance.enable = true;
 
-  test.stubs.glance = { };
-
   nmt.script = ''
     configFile=home-files/.config/glance/glance.yml
     serviceFile=home-files/.config/systemd/user/glance.service
diff --git a/tests/modules/services/glance/example-settings.nix b/tests/modules/services/glance/example-settings.nix
index 9e2101d2e..6b9dd59f3 100644
--- a/tests/modules/services/glance/example-settings.nix
+++ b/tests/modules/services/glance/example-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.glance = {
     enable = true;
@@ -21,8 +19,6 @@
     };
   };
 
-  test.stubs.glance = { };
-
   nmt.script = ''
     configFile=home-files/.config/glance/glance.yml
     serviceFile=home-files/.config/systemd/user/glance.service
diff --git a/tests/modules/services/glance/glance.service b/tests/modules/services/glance/glance.service
index 07b82d1d9..2f89ca23a 100644
--- a/tests/modules/services/glance/glance.service
+++ b/tests/modules/services/glance/glance.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@glance@/bin/dummy --config /home/hm-user/.config/glance/glance.yml
+ExecStart=@glance@/bin/glance --config /home/hm-user/.config/glance/glance.yml
 
 [Unit]
 Description=Glance feed dashboard server
diff --git a/tests/modules/services/gpg-agent/default-homedir.nix b/tests/modules/services/gpg-agent/default-homedir.nix
index 9c13520ae..ba7178078 100644
--- a/tests/modules/services/gpg-agent/default-homedir.nix
+++ b/tests/modules/services/gpg-agent/default-homedir.nix
@@ -1,29 +1,19 @@
 { config, lib, pkgs, ... }:
 
-with lib;
+lib.mkIf pkgs.stdenv.isLinux {
+  services.gpg-agent.enable = true;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  programs.gpg.enable = true;
 
-mkIf pkgs.stdenv.isLinux {
-  config = {
-    services.gpg-agent.enable = true;
-    services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
-    programs.gpg.enable = true;
+  nmt.script = ''
+    in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}"
+    if [[ $in != "%t/gnupg/S.gpg-agent" ]]
+    then
+      echo $in
+      fail "gpg-agent socket directory not set to default value"
+    fi
 
-    test.stubs = {
-      gnupg = { };
-      systemd = { }; # depends on gnupg.override
-      pinentry-gnome3 = { };
-    };
-
-    nmt.script = ''
-      in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}"
-      if [[ $in != "%t/gnupg/S.gpg-agent" ]]
-      then
-        echo $in
-        fail "gpg-agent socket directory not set to default value"
-      fi
-
-      configFile=home-files/.gnupg/gpg-agent.conf
-      assertFileRegex $configFile "pinentry-program @pinentry-gnome3@/bin/dummy"
-    '';
-  };
+    configFile=home-files/.gnupg/gpg-agent.conf
+    assertFileRegex $configFile "pinentry-program @pinentry-gnome3@/bin/pinentry"
+  '';
 }
diff --git a/tests/modules/services/gpg-agent/override-homedir.nix b/tests/modules/services/gpg-agent/override-homedir.nix
index 82dec0f95..9cebadf3c 100644
--- a/tests/modules/services/gpg-agent/override-homedir.nix
+++ b/tests/modules/services/gpg-agent/override-homedir.nix
@@ -1,32 +1,25 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, pkgs, ... }:
 
 let inherit (pkgs.stdenv) isDarwin;
 in {
-  config = {
-    services.gpg-agent.enable = true;
-    services.gpg-agent.pinentryPackage = null; # Don't build pinentry package.
-    programs.gpg = {
-      enable = true;
-      homedir = "/path/to/hash";
-      package = config.lib.test.mkStubPackage { outPath = "@gpg@"; };
-    };
-
-    test.stubs.gnupg = { };
-    test.stubs.systemd = { }; # depends on gnupg.override
-
-    nmt.script = if isDarwin then ''
-      serviceFile=LaunchAgents/org.nix-community.home.gpg-agent.plist
-      assertFileExists "$serviceFile"
-      assertFileContent "$serviceFile" ${./expected-agent.plist}
-    '' else ''
-      in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}"
-      if [[ $in != "%t/gnupg/d.wp4h7ks5zxy4dodqadgpbbpz/S.gpg-agent" ]]
-      then
-        echo $in
-        fail "gpg-agent socket directory is malformed"
-      fi
-    '';
+  services.gpg-agent.enable = true;
+  services.gpg-agent.pinentryPackage = null; # Don't build pinentry package.
+  programs.gpg = {
+    enable = true;
+    homedir = "/path/to/hash";
+    package = config.lib.test.mkStubPackage { outPath = "@gpg@"; };
   };
+
+  nmt.script = if isDarwin then ''
+    serviceFile=LaunchAgents/org.nix-community.home.gpg-agent.plist
+    assertFileExists "$serviceFile"
+    assertFileContent "$serviceFile" ${./expected-agent.plist}
+  '' else ''
+    in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}"
+    if [[ $in != "%t/gnupg/d.wp4h7ks5zxy4dodqadgpbbpz/S.gpg-agent" ]]
+    then
+      echo $in
+      fail "gpg-agent socket directory is malformed"
+    fi
+  '';
 }
diff --git a/tests/modules/services/hypridle/basic-configuration.nix b/tests/modules/services/hypridle/basic-configuration.nix
index 461f70a51..83347bcc7 100644
--- a/tests/modules/services/hypridle/basic-configuration.nix
+++ b/tests/modules/services/hypridle/basic-configuration.nix
@@ -1,9 +1,6 @@
-{ pkgs, ... }:
-
 {
   services.hypridle = {
     enable = true;
-    package = pkgs.hypridle;
 
     settings = {
       general = {
@@ -26,8 +23,6 @@
     };
   };
 
-  test.stubs.hypridle = { };
-
   nmt.script = ''
     config=home-files/.config/hypr/hypridle.conf
     clientServiceFile=home-files/.config/systemd/user/hypridle.service
diff --git a/tests/modules/services/hypridle/no-configuration.nix b/tests/modules/services/hypridle/no-configuration.nix
index 805e49561..5b0b23cd5 100644
--- a/tests/modules/services/hypridle/no-configuration.nix
+++ b/tests/modules/services/hypridle/no-configuration.nix
@@ -1,10 +1,6 @@
-{ pkgs, ... }:
-
 {
   services.hypridle.enable = true;
 
-  test.stubs.hypridle = { };
-
   nmt.script = ''
     config=home-files/.config/hypr/hypridle.conf
     clientServiceFile=home-files/.config/systemd/user/hypridle.service
diff --git a/tests/modules/services/hyprpaper/basic-configuration.nix b/tests/modules/services/hyprpaper/basic-configuration.nix
index 7bf944fbd..dc583575c 100644
--- a/tests/modules/services/hyprpaper/basic-configuration.nix
+++ b/tests/modules/services/hyprpaper/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   services.hyprpaper = {
     enable = true;
@@ -18,8 +16,6 @@
     };
   };
 
-  test.stubs.hyprpaper = { };
-
   nmt.script = ''
     config=home-files/.config/hypr/hyprpaper.conf
     clientServiceFile=home-files/.config/systemd/user/hyprpaper.service
diff --git a/tests/modules/services/hyprpaper/no-configuration.nix b/tests/modules/services/hyprpaper/no-configuration.nix
index 15775e886..a6ed41a82 100644
--- a/tests/modules/services/hyprpaper/no-configuration.nix
+++ b/tests/modules/services/hyprpaper/no-configuration.nix
@@ -1,13 +1,9 @@
-{ pkgs, ... }:
-
 {
   services.hyprpaper = {
     enable = true;
     settings = { };
   };
 
-  test.stubs.hyprpaper = { };
-
   nmt.script = ''
     config=home-files/.config/hypr/hyprpaper.conf
     clientServiceFile=home-files/.config/systemd/user/hyprpaper.service
diff --git a/tests/modules/services/imapnotify-darwin/launchd.nix b/tests/modules/services/imapnotify-darwin/launchd.nix
index 5502ebbfc..22630d701 100644
--- a/tests/modules/services/imapnotify-darwin/launchd.nix
+++ b/tests/modules/services/imapnotify-darwin/launchd.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, pkgs, ... }:
 
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
@@ -28,8 +26,6 @@ with lib;
     });
   };
 
-  test.stubs.notmuch = { };
-
   nmt.script = let
     serviceFileName = "org.nix-community.home.imapnotify-hm-example.com.plist";
   in ''
diff --git a/tests/modules/services/imapnotify/imapnotify.nix b/tests/modules/services/imapnotify/imapnotify.nix
index 5a9e2b003..82d6f433b 100644
--- a/tests/modules/services/imapnotify/imapnotify.nix
+++ b/tests/modules/services/imapnotify/imapnotify.nix
@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, pkgs, ... }:
 
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
@@ -28,8 +26,6 @@ with lib;
     });
   };
 
-  test.stubs.notmuch = { };
-
   nmt.script = ''
     serviceFile="home-files/.config/systemd/user/imapnotify-hm-example.com.service"
     serviceFileNormalized="$(normalizeStorePaths "$serviceFile")"
diff --git a/tests/modules/services/lieer/lieer-service.nix b/tests/modules/services/lieer/lieer-service.nix
index 796afc072..cd2cde2e2 100644
--- a/tests/modules/services/lieer/lieer-service.nix
+++ b/tests/modules/services/lieer/lieer-service.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
@@ -16,8 +14,6 @@
     };
   };
 
-  test.stubs.lieer = { };
-
   nmt.script = ''
     assertFileExists home-files/.config/systemd/user/lieer-hm-example-com.service
     assertFileExists home-files/.config/systemd/user/lieer-hm-example-com.timer
diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
index 8aefc0582..b0827a39d 100644
--- a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
+++ b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@linux-wallpaperengine@/bin/dummy --assets-dir /some/path/to/assets --clamping border --fps 6 --scaling fit --screen-root HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root DP-1 --silent --scaling fill --fps 12 --bg 87654321
+ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --assets-dir /some/path/to/assets --clamping border --fps 6 --scaling fit --screen-root HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root DP-1 --silent --scaling fill --fps 12 --bg 87654321
 Restart=on-failure
 
 [Unit]
diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration.nix b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix
index 2f51bf5b3..afb2e964d 100644
--- a/tests/modules/services/linux-wallpaperengine/basic-configuration.nix
+++ b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.linux-wallpaperengine = {
     enable = true;
@@ -25,8 +23,6 @@
     ];
   };
 
-  test.stubs.linux-wallpaperengine = { };
-
   nmt.script = ''
     assertFileContent \
         home-files/.config/systemd/user/linux-wallpaperengine.service \
diff --git a/tests/modules/services/mopidy/basic-configuration.nix b/tests/modules/services/mopidy/basic-configuration.nix
index 99aaeece8..26bc1c846 100644
--- a/tests/modules/services/mopidy/basic-configuration.nix
+++ b/tests/modules/services/mopidy/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.mopidy = {
     enable = true;
diff --git a/tests/modules/services/mopidy/mopidy-scan.nix b/tests/modules/services/mopidy/mopidy-scan.nix
index 16b04292a..be7fe700a 100644
--- a/tests/modules/services/mopidy/mopidy-scan.nix
+++ b/tests/modules/services/mopidy/mopidy-scan.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   services.mopidy = {
@@ -16,8 +16,6 @@
         chmod +x $out/bin/mopidy
       '';
     };
-
-    mopidy-local = { };
   };
 
   nmt.script = ''
diff --git a/tests/modules/services/mpd-mpris/configuration-basic.nix b/tests/modules/services/mpd-mpris/configuration-basic.nix
index de7c594f3..afe1c3df1 100644
--- a/tests/modules/services/mpd-mpris/configuration-basic.nix
+++ b/tests/modules/services/mpd-mpris/configuration-basic.nix
@@ -1,10 +1,6 @@
-{ ... }:
-
 {
   services.mpd-mpris = { enable = true; };
 
-  test.stubs.mpd-mpris = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/mpd-mpris.service
     assertFileContent "$serviceFile" ${./configuration-basic.service}
diff --git a/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix b/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix
index a3a6b38d9..f1f8c8641 100644
--- a/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix
+++ b/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   services.mpd-mpris = {
     enable = true;
     mpd.useLocal = true;
   };
 
-  test.stubs.mpd-mpris = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/mpd-mpris.service
     assertFileContent "$serviceFile" ${./configuration-with-local-mpd.service}
diff --git a/tests/modules/services/mpd-mpris/configuration-with-password.nix b/tests/modules/services/mpd-mpris/configuration-with-password.nix
index b10958253..5c5c6a936 100644
--- a/tests/modules/services/mpd-mpris/configuration-with-password.nix
+++ b/tests/modules/services/mpd-mpris/configuration-with-password.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.mpd-mpris = {
     enable = true;
@@ -11,8 +9,6 @@
     };
   };
 
-  test.stubs.mpd-mpris = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/mpd-mpris.service
     assertFileContent "$serviceFile" ${./configuration-with-password.service}
diff --git a/tests/modules/services/mpd/basic-configuration.nix b/tests/modules/services/mpd/basic-configuration.nix
index 6ae0e91fc..9254a2cee 100644
--- a/tests/modules/services/mpd/basic-configuration.nix
+++ b/tests/modules/services/mpd/basic-configuration.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   services.mpd = {
     enable = true;
@@ -11,8 +7,6 @@ with lib;
 
   home.stateVersion = "22.11";
 
-  test.stubs.mpd = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service)
     assertFileContent "$serviceFile" ${./basic-configuration.service}
diff --git a/tests/modules/services/mpd/basic-configuration.service b/tests/modules/services/mpd/basic-configuration.service
index feb155ac4..05ec03846 100644
--- a/tests/modules/services/mpd/basic-configuration.service
+++ b/tests/modules/services/mpd/basic-configuration.service
@@ -4,7 +4,7 @@ WantedBy=default.target
 [Service]
 Environment=PATH=/home/hm-user/.nix-profile/bin
 ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose
-ExecStartPre=/nix/store/00000000000000000000000000000000-bash/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
+ExecStartPre=@bash@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
 Type=notify
 
 [Unit]
diff --git a/tests/modules/services/mpd/before-state-version-22_11.nix b/tests/modules/services/mpd/before-state-version-22_11.nix
index f29859ace..3bc1af4cc 100644
--- a/tests/modules/services/mpd/before-state-version-22_11.nix
+++ b/tests/modules/services/mpd/before-state-version-22_11.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   services.mpd = {
     enable = true;
@@ -10,8 +6,6 @@ with lib;
 
   home.stateVersion = "18.09";
 
-  test.stubs.mpd = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service)
     assertFileContent "$serviceFile" ${./basic-configuration.service}
diff --git a/tests/modules/services/mpd/start-when-needed.nix b/tests/modules/services/mpd/start-when-needed.nix
index 31017c9e3..ae39c92d8 100644
--- a/tests/modules/services/mpd/start-when-needed.nix
+++ b/tests/modules/services/mpd/start-when-needed.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   services.mpd = {
     enable = true;
@@ -12,8 +8,6 @@ with lib;
 
   home.stateVersion = "22.11";
 
-  test.stubs.mpd = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service)
     assertFileContent "$serviceFile" ${./start-when-needed.service}
diff --git a/tests/modules/services/mpd/start-when-needed.service b/tests/modules/services/mpd/start-when-needed.service
index ac98a3f97..91ce3890c 100644
--- a/tests/modules/services/mpd/start-when-needed.service
+++ b/tests/modules/services/mpd/start-when-needed.service
@@ -1,7 +1,7 @@
 [Service]
 Environment=PATH=/home/hm-user/.nix-profile/bin
 ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose
-ExecStartPre=/nix/store/00000000000000000000000000000000-bash/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
+ExecStartPre=@bash@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
 Type=notify
 
 [Unit]
diff --git a/tests/modules/services/mpd/xdg-music-dir.nix b/tests/modules/services/mpd/xdg-music-dir.nix
index 6df2cec46..bcaeeece2 100644
--- a/tests/modules/services/mpd/xdg-music-dir.nix
+++ b/tests/modules/services/mpd/xdg-music-dir.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   services.mpd = {
     enable = true;
@@ -12,8 +8,6 @@ with lib;
 
   home.stateVersion = "22.11";
 
-  test.stubs.mpd = { };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service)
     assertFileContent "$serviceFile" ${./basic-configuration.service}
diff --git a/tests/modules/services/mpdris2/basic-configuration.nix b/tests/modules/services/mpdris2/basic-configuration.nix
index b8c595be2..f98f61ad8 100644
--- a/tests/modules/services/mpdris2/basic-configuration.nix
+++ b/tests/modules/services/mpdris2/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.mpdris2 = {
     enable = true;
@@ -9,8 +7,6 @@
 
   services.mpd.musicDirectory = "/home/hm-user/music";
 
-  test.stubs.mpdris2 = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/mpdris2.service
     assertFileContent "$serviceFile" ${./basic-configuration.service}
diff --git a/tests/modules/services/mpdris2/basic-configuration.service b/tests/modules/services/mpdris2/basic-configuration.service
index 2ea4656c7..9d58a9e51 100644
--- a/tests/modules/services/mpdris2/basic-configuration.service
+++ b/tests/modules/services/mpdris2/basic-configuration.service
@@ -3,7 +3,7 @@ WantedBy=default.target
 
 [Service]
 BusName=org.mpris.MediaPlayer2.mpd
-ExecStart=@mpdris2@/bin/mpDris2
+ExecStart=@mpDris2@/bin/mpDris2
 Restart=on-failure
 RestartSec=5s
 Type=simple
diff --git a/tests/modules/services/mpdris2/with-password.nix b/tests/modules/services/mpdris2/with-password.nix
index af4ef33cc..496d26e63 100644
--- a/tests/modules/services/mpdris2/with-password.nix
+++ b/tests/modules/services/mpdris2/with-password.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.mpdris2 = {
     enable = true;
@@ -12,8 +10,6 @@
 
   services.mpd.musicDirectory = "/home/hm-user/music";
 
-  test.stubs.mpdris2 = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/mpdris2.service
     assertFileContent "$serviceFile" ${./basic-configuration.service}
diff --git a/tests/modules/services/nix-gc-darwin/basic.nix b/tests/modules/services/nix-gc-darwin/basic.nix
index f09309fe0..707ae44e6 100644
--- a/tests/modules/services/nix-gc-darwin/basic.nix
+++ b/tests/modules/services/nix-gc-darwin/basic.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   nix.gc = {
     automatic = true;
@@ -7,8 +5,6 @@
     options = "--delete-older-than 30d";
   };
 
-  test.stubs.nix = { name = "nix"; };
-
   nmt.script = ''
     serviceFile=LaunchAgents/org.nix-community.home.nix-gc.plist
 
diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/basic.nix
index 1fc019da7..a6b06f246 100644
--- a/tests/modules/services/nix-gc/basic.nix
+++ b/tests/modules/services/nix-gc/basic.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   nix.gc = {
     automatic = true;
@@ -8,8 +6,6 @@
     options = "--delete-older-than 30d --max-freed $((64 * 1024**3))";
   };
 
-  test.stubs.nix = { name = "nix"; };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/nix-gc.service
 
diff --git a/tests/modules/services/ollama/darwin/basic.nix b/tests/modules/services/ollama/darwin/basic.nix
index b9203cc7e..bb072a977 100644
--- a/tests/modules/services/ollama/darwin/basic.nix
+++ b/tests/modules/services/ollama/darwin/basic.nix
@@ -11,8 +11,6 @@ lib.mkMerge [
         HIP_VISIBLE_DEVICES = "0,1";
       };
     };
-
-    test.stubs.ollama = { };
   }
   (lib.mkIf pkgs.stdenv.isDarwin {
     nmt.script = ''
diff --git a/tests/modules/services/ollama/linux/basic.nix b/tests/modules/services/ollama/linux/basic.nix
index fecee950f..2480d8466 100644
--- a/tests/modules/services/ollama/linux/basic.nix
+++ b/tests/modules/services/ollama/linux/basic.nix
@@ -1,13 +1,9 @@
 {
-  config = {
-    services.ollama.enable = true;
+  services.ollama.enable = true;
 
-    test.stubs.ollama = { };
-
-    nmt.script = ''
-      serviceFile="home-files/.config/systemd/user/ollama.service"
-      assertFileRegex "$serviceFile" 'After=network\.target'
-      assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=127.0.0.1:11434'
-    '';
-  };
+  nmt.script = ''
+    serviceFile="home-files/.config/systemd/user/ollama.service"
+    assertFileRegex "$serviceFile" 'After=network\.target'
+    assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=127.0.0.1:11434'
+  '';
 }
diff --git a/tests/modules/services/ollama/linux/set-environment-variables.nix b/tests/modules/services/ollama/linux/set-environment-variables.nix
index b9ad280c9..672c6dddd 100644
--- a/tests/modules/services/ollama/linux/set-environment-variables.nix
+++ b/tests/modules/services/ollama/linux/set-environment-variables.nix
@@ -1,22 +1,18 @@
 {
-  config = {
-    services.ollama = {
-      enable = true;
-      host = "localhost";
-      port = 11111;
-      environmentVariables = {
-        OLLAMA_LLM_LIBRARY = "cpu";
-        HIP_VISIBLE_DEVICES = "0,1";
-      };
+  services.ollama = {
+    enable = true;
+    host = "localhost";
+    port = 11111;
+    environmentVariables = {
+      OLLAMA_LLM_LIBRARY = "cpu";
+      HIP_VISIBLE_DEVICES = "0,1";
     };
-
-    test.stubs.ollama = { };
-
-    nmt.script = ''
-      serviceFile="home-files/.config/systemd/user/ollama.service"
-      assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=localhost:11111'
-      assertFileRegex "$serviceFile" 'Environment=OLLAMA_LLM_LIBRARY=cpu'
-      assertFileRegex "$serviceFile" 'Environment=HIP_VISIBLE_DEVICES=0,1'
-    '';
   };
+
+  nmt.script = ''
+    serviceFile="home-files/.config/systemd/user/ollama.service"
+    assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=localhost:11111'
+    assertFileRegex "$serviceFile" 'Environment=OLLAMA_LLM_LIBRARY=cpu'
+    assertFileRegex "$serviceFile" 'Environment=HIP_VISIBLE_DEVICES=0,1'
+  '';
 }
diff --git a/tests/modules/services/pasystray/service.nix b/tests/modules/services/pasystray/service.nix
index 5b8548c8b..34b3291bc 100644
--- a/tests/modules/services/pasystray/service.nix
+++ b/tests/modules/services/pasystray/service.nix
@@ -1,17 +1,9 @@
-{ ... }:
-
 {
   services.pasystray = {
     enable = true;
     extraOptions = [ "-g" ];
   };
 
-  test.stubs = {
-    pasystray = { };
-    paprefs = { };
-    pavucontrol = { };
-  };
-
   nmt.script = ''
     serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/pasystray.service)
     assertFileContent "$serviceFile" ${./expected.service}
diff --git a/tests/modules/services/pbgopy/service.nix b/tests/modules/services/pbgopy/service.nix
index 465024537..8093eed52 100644
--- a/tests/modules/services/pbgopy/service.nix
+++ b/tests/modules/services/pbgopy/service.nix
@@ -1,16 +1,12 @@
-{ config, pkgs, ... }: {
-  config = {
-    services.pbgopy.enable = true;
+{
+  services.pbgopy.enable = true;
 
-    test.stubs.pbgopy = { };
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/pbgopy.service
 
-    nmt.script = ''
-      serviceFile=home-files/.config/systemd/user/pbgopy.service
+    assertFileExists $serviceFile
 
-      assertFileExists $serviceFile
-
-      assertFileContains $serviceFile \
-        'ExecStart=@pbgopy@/bin/pbgopy serve --port 9090 --ttl 24h'
-    '';
-  };
+    assertFileContains $serviceFile \
+      'ExecStart=@pbgopy@/bin/pbgopy serve --port 9090 --ttl 24h'
+  '';
 }
diff --git a/tests/modules/services/picom/picom-basic-configuration-expected.service b/tests/modules/services/picom/picom-basic-configuration-expected.service
index f5d0efeb0..6aeef2249 100644
--- a/tests/modules/services/picom/picom-basic-configuration-expected.service
+++ b/tests/modules/services/picom/picom-basic-configuration-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@picom@/bin/dummy --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends
+ExecStart=@picom@/bin/picom --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends
 Restart=always
 RestartSec=3
 
diff --git a/tests/modules/services/picom/picom-basic-configuration.nix b/tests/modules/services/picom/picom-basic-configuration.nix
index 1c2689799..065c40b52 100644
--- a/tests/modules/services/picom/picom-basic-configuration.nix
+++ b/tests/modules/services/picom/picom-basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.picom = {
     enable = true;
@@ -22,8 +20,6 @@
     extraArgs = [ "--legacy-backends" ];
   };
 
-  test.stubs.picom = { };
-
   nmt.script = ''
     assertFileContent \
         home-files/.config/picom/picom.conf \
diff --git a/tests/modules/services/podman-linux/configuration.nix b/tests/modules/services/podman-linux/configuration.nix
index b1c0d596b..a45524f8c 100644
--- a/tests/modules/services/podman-linux/configuration.nix
+++ b/tests/modules/services/podman-linux/configuration.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.podman = {
     enable = true;
diff --git a/tests/modules/services/podman-linux/container.nix b/tests/modules/services/podman-linux/container.nix
index 102a7fb10..fa9c654d4 100644
--- a/tests/modules/services/podman-linux/container.nix
+++ b/tests/modules/services/podman-linux/container.nix
@@ -1,6 +1,6 @@
-{ ... }:
-
 {
+  imports = [ ./podman-stubs.nix ];
+
   services.podman = {
     enable = true;
     containers = {
diff --git a/tests/modules/services/podman-linux/integration-network-expected.service b/tests/modules/services/podman-linux/integration-network-expected.service
index 49acd4b9f..5af3bccea 100644
--- a/tests/modules/services/podman-linux/integration-network-expected.service
+++ b/tests/modules/services/podman-linux/integration-network-expected.service
@@ -15,7 +15,7 @@ NetworkName=my-net
 Subnet=192.168.123.0/24
 
 [Service]
-Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
 ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
 RemainAfterExit=yes
 TimeoutStartSec=15
diff --git a/tests/modules/services/podman-linux/integration.nix b/tests/modules/services/podman-linux/integration.nix
index de213092d..6b28fcd7a 100644
--- a/tests/modules/services/podman-linux/integration.nix
+++ b/tests/modules/services/podman-linux/integration.nix
@@ -1,6 +1,6 @@
-{ ... }:
-
 {
+  imports = [ ./podman-stubs.nix ];
+
   services.podman = {
     enable = true;
     containers."my-container" = {
diff --git a/tests/modules/services/podman-linux/manifest.nix b/tests/modules/services/podman-linux/manifest.nix
index b692ea7ae..13a0ab387 100644
--- a/tests/modules/services/podman-linux/manifest.nix
+++ b/tests/modules/services/podman-linux/manifest.nix
@@ -1,6 +1,6 @@
-{ ... }:
-
 {
+  imports = [ ./podman-stubs.nix ];
+
   services.podman = {
     enable = true;
     containers."my-container-1" = {
diff --git a/tests/modules/services/podman-linux/network-expected.service b/tests/modules/services/podman-linux/network-expected.service
index 1017a17e7..6d3cf8633 100644
--- a/tests/modules/services/podman-linux/network-expected.service
+++ b/tests/modules/services/podman-linux/network-expected.service
@@ -19,7 +19,7 @@ PodmanArgs=--log-level=debug
 Subnet=192.168.1.0/24
 
 [Service]
-Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
 ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
 RemainAfterExit=yes
 TimeoutStartSec=15
diff --git a/tests/modules/services/podman-linux/network.nix b/tests/modules/services/podman-linux/network.nix
index b6a46eba5..0f53b0d5d 100644
--- a/tests/modules/services/podman-linux/network.nix
+++ b/tests/modules/services/podman-linux/network.nix
@@ -1,6 +1,6 @@
-{ ... }:
-
 {
+  imports = [ ./podman-stubs.nix ];
+
   services.podman = {
     enable = true;
     networks = {
diff --git a/tests/modules/services/podman-linux/podman-stubs.nix b/tests/modules/services/podman-linux/podman-stubs.nix
new file mode 100644
index 000000000..70f3bfbc6
--- /dev/null
+++ b/tests/modules/services/podman-linux/podman-stubs.nix
@@ -0,0 +1,5 @@
+{ realPkgs, ... }:
+
+{
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) podman skopeo; }) ];
+}
diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix
index 6f0454bf3..06093154d 100644
--- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix
+++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix
@@ -1,30 +1,24 @@
-{ config, pkgs, ... }:
-
 {
-  config = {
-    services.gammastep = {
-      enable = true;
-      provider = "manual";
-      dawnTime = "6:00-7:45";
-      duskTime = "18:35-20:15";
-      settings = {
-        general = {
-          adjustment-method = "randr";
-          gamma = 0.8;
-        };
-        randr = { screen = 0; };
+  services.gammastep = {
+    enable = true;
+    provider = "manual";
+    dawnTime = "6:00-7:45";
+    duskTime = "18:35-20:15";
+    settings = {
+      general = {
+        adjustment-method = "randr";
+        gamma = 0.8;
       };
+      randr = { screen = 0; };
     };
-
-    test.stubs.gammastep = { };
-
-    nmt.script = ''
-      assertFileContent \
-          home-files/.config/gammastep/config.ini \
-          ${./gammastep-basic-configuration-file-expected.conf}
-      assertFileContent \
-          home-files/.config/systemd/user/gammastep.service \
-          ${./gammastep-basic-configuration-expected.service}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+        home-files/.config/gammastep/config.ini \
+        ${./gammastep-basic-configuration-file-expected.conf}
+    assertFileContent \
+        home-files/.config/systemd/user/gammastep.service \
+        ${./gammastep-basic-configuration-expected.service}
+  '';
 }
diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix b/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix
index 691d01e25..0ecb3ec81 100644
--- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix
+++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix
@@ -1,30 +1,24 @@
-{ config, pkgs, ... }:
-
 {
-  config = {
-    services.redshift = {
-      enable = true;
-      provider = "manual";
-      latitude = 0.0;
-      longitude = "0.0";
-      settings = {
-        redshift = {
-          adjustment-method = "randr";
-          gamma = 0.8;
-        };
-        randr = { screen = 0; };
+  services.redshift = {
+    enable = true;
+    provider = "manual";
+    latitude = 0.0;
+    longitude = "0.0";
+    settings = {
+      redshift = {
+        adjustment-method = "randr";
+        gamma = 0.8;
       };
+      randr = { screen = 0; };
     };
-
-    test.stubs.redshift = { };
-
-    nmt.script = ''
-      assertFileContent \
-          home-files/.config/redshift/redshift.conf \
-          ${./redshift-basic-configuration-file-expected.conf}
-      assertFileContent \
-          home-files/.config/systemd/user/redshift.service \
-          ${./redshift-basic-configuration-expected.service}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+        home-files/.config/redshift/redshift.conf \
+        ${./redshift-basic-configuration-file-expected.conf}
+    assertFileContent \
+        home-files/.config/systemd/user/redshift.service \
+        ${./redshift-basic-configuration-expected.service}
+  '';
 }
diff --git a/tests/modules/services/screen-locker/basic-configuration.nix b/tests/modules/services/screen-locker/basic-configuration.nix
index 9eee2a8e2..855370d2b 100644
--- a/tests/modules/services/screen-locker/basic-configuration.nix
+++ b/tests/modules/services/screen-locker/basic-configuration.nix
@@ -1,30 +1,25 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  config = {
-    services.screen-locker = {
+  services.screen-locker = {
+    enable = true;
+    inactiveInterval = 5;
+    lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
+    xss-lock = { extraOptions = [ "-test" ]; };
+    xautolock = {
       enable = true;
-      inactiveInterval = 5;
-      lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
-      xss-lock = { extraOptions = [ "-test" ]; };
-      xautolock = {
-        enable = true;
-        detectSleep = true;
-        extraOptions = [ "-test" ];
-      };
+      detectSleep = true;
+      extraOptions = [ "-test" ];
     };
-
-    test.stubs.i3lock = { };
-    test.stubs.xss-lock = { };
-
-    nmt.script = ''
-      xssService=home-files/.config/systemd/user/xss-lock.service
-      xautolockService=home-files/.config/systemd/user/xautolock-session.service
-
-      assertFileExists $xssService
-      assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
-      assertFileExists $xautolockService
-      assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*'
-    '';
   };
+
+  nmt.script = ''
+    xssService=home-files/.config/systemd/user/xss-lock.service
+    xautolockService=home-files/.config/systemd/user/xautolock-session.service
+
+    assertFileExists $xssService
+    assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
+    assertFileExists $xautolockService
+    assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*'
+  '';
 }
diff --git a/tests/modules/services/screen-locker/moved-options.nix b/tests/modules/services/screen-locker/moved-options.nix
index 4c9cad19e..9e0ca0da4 100644
--- a/tests/modules/services/screen-locker/moved-options.nix
+++ b/tests/modules/services/screen-locker/moved-options.nix
@@ -1,36 +1,30 @@
 { config, pkgs, options, lib, ... }:
 
 {
-  config = {
-    services.screen-locker = {
-      enable = true;
-      inactiveInterval = 5;
-      lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
-      xssLockExtraOptions = [ "-test" ];
-      xautolockExtraOptions = [ "-test" ];
-      enableDetectSleep = true;
-    };
-
-    test.stubs.i3lock = { };
-    test.stubs.xss-lock = { };
-
-    # Use the same verification script as the basic configuration. The result
-    # with the old options should be identical.
-    nmt.script = (import ./basic-configuration.nix {
-      inherit config pkgs;
-    }).config.nmt.script;
-
-    test.asserts.warnings.expected = with lib;
-      let
-        renamed = {
-          xssLockExtraOptions = "xss-lock.extraOptions";
-          xautolockExtraOptions = "xautolock.extraOptions";
-          enableDetectSleep = "xautolock.detectSleep";
-        };
-      in mapAttrsToList (old: new:
-        builtins.replaceStrings [ "\n" ] [ " " ] ''
-          The option `services.screen-locker.${old}' defined in
-          ${showFiles options.services.screen-locker.${old}.files}
-          has been renamed to `services.screen-locker.${new}'.'') renamed;
+  services.screen-locker = {
+    enable = true;
+    inactiveInterval = 5;
+    lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
+    xssLockExtraOptions = [ "-test" ];
+    xautolockExtraOptions = [ "-test" ];
+    enableDetectSleep = true;
   };
+
+  # Use the same verification script as the basic configuration. The result
+  # with the old options should be identical.
+  nmt.script =
+    (import ./basic-configuration.nix { inherit config pkgs; }).nmt.script;
+
+  test.asserts.warnings.expected = with lib;
+    let
+      renamed = {
+        xssLockExtraOptions = "xss-lock.extraOptions";
+        xautolockExtraOptions = "xautolock.extraOptions";
+        enableDetectSleep = "xautolock.detectSleep";
+      };
+    in mapAttrsToList (old: new:
+      builtins.replaceStrings [ "\n" ] [ " " ] ''
+        The option `services.screen-locker.${old}' defined in
+        ${showFiles options.services.screen-locker.${old}.files}
+        has been renamed to `services.screen-locker.${new}'.'') renamed;
 }
diff --git a/tests/modules/services/screen-locker/no-xautolock.nix b/tests/modules/services/screen-locker/no-xautolock.nix
index 7ec5152b0..5883d09b6 100644
--- a/tests/modules/services/screen-locker/no-xautolock.nix
+++ b/tests/modules/services/screen-locker/no-xautolock.nix
@@ -1,27 +1,22 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  config = {
-    services.screen-locker = {
-      enable = true;
-      inactiveInterval = 5;
-      lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
-      xss-lock = {
-        extraOptions = [ "-test" ];
-        screensaverCycle = 5;
-      };
-      xautolock = { enable = false; };
+  services.screen-locker = {
+    enable = true;
+    inactiveInterval = 5;
+    lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
+    xss-lock = {
+      extraOptions = [ "-test" ];
+      screensaverCycle = 5;
     };
-
-    test.stubs.i3lock = { };
-    test.stubs.xss-lock = { };
-
-    nmt.script = ''
-      xssService=home-files/.config/systemd/user/xss-lock.service
-
-      assertFileExists $xssService
-      assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
-      assertFileRegex $xssService 'ExecStartPre=.*/xset s 300 5'
-    '';
+    xautolock = { enable = false; };
   };
+
+  nmt.script = ''
+    xssService=home-files/.config/systemd/user/xss-lock.service
+
+    assertFileExists $xssService
+    assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
+    assertFileRegex $xssService 'ExecStartPre=.*/xset s 300 5'
+  '';
 }
diff --git a/tests/modules/services/signaturepdf/basic-configuration.nix b/tests/modules/services/signaturepdf/basic-configuration.nix
index 66c1b0834..0cfe0c3e8 100644
--- a/tests/modules/services/signaturepdf/basic-configuration.nix
+++ b/tests/modules/services/signaturepdf/basic-configuration.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   services.signaturepdf = {
     enable = true;
@@ -7,10 +5,7 @@
     extraConfig = { upload_max_filesize = "24M"; };
   };
 
-  test.stubs = {
-    signaturepdf = { outPath = "/signaturepdf"; };
-    xdg-utils = { };
-  };
+  test.stubs.signaturepdf = { outPath = "/signaturepdf"; };
 
   nmt.script = ''
     assertFileContent \
diff --git a/tests/modules/services/snixembed/basic-configuration.nix b/tests/modules/services/snixembed/basic-configuration.nix
index fd8ec4701..3d999dcd6 100644
--- a/tests/modules/services/snixembed/basic-configuration.nix
+++ b/tests/modules/services/snixembed/basic-configuration.nix
@@ -1,13 +1,9 @@
-{ ... }:
-
 {
   services.snixembed = {
     enable = true;
     beforeUnits = [ "safeeyes.service" ];
   };
 
-  test.stubs = { snixembed = { outPath = "/snixembed"; }; };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/systemd/user/snixembed.service \
diff --git a/tests/modules/services/snixembed/basic-configuration.service b/tests/modules/services/snixembed/basic-configuration.service
index 97e87664b..5bcfc29ec 100644
--- a/tests/modules/services/snixembed/basic-configuration.service
+++ b/tests/modules/services/snixembed/basic-configuration.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=/snixembed/bin/dummy
+ExecStart=@snixembed@/bin/snixembed
 Restart=on-failure
 RestartSec=3
 
diff --git a/tests/modules/services/swayidle/basic-configuration.nix b/tests/modules/services/swayidle/basic-configuration.nix
index c863883bb..697c1de46 100644
--- a/tests/modules/services/swayidle/basic-configuration.nix
+++ b/tests/modules/services/swayidle/basic-configuration.nix
@@ -44,7 +44,7 @@
         WantedBy=graphical-session.target
 
         [Service]
-        Environment=PATH=/nix/store/00000000000000000000000000000000-bash/bin
+        Environment=PATH=@bash@/bin
         ExecStart=@swayidle@/bin/dummy -w timeout 50 'notify-send -t 10000 -- "Screen lock in 10 seconds"' timeout 60 'swaylock -fF' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -fF' lock 'swaylock -fF'
         Restart=always
         Type=simple
diff --git a/tests/modules/services/syncthing/common/extra-options.nix b/tests/modules/services/syncthing/common/extra-options.nix
index f861e2a63..9db9f5940 100644
--- a/tests/modules/services/syncthing/common/extra-options.nix
+++ b/tests/modules/services/syncthing/common/extra-options.nix
@@ -6,9 +6,8 @@ lib.mkMerge [
       enable = true;
       extraOptions = [ "-foo" ''-bar "baz"'' ];
     };
-
-    test.stubs.syncthing = { };
   }
+
   (lib.mkIf pkgs.stdenv.isLinux {
     nmt.script = ''
       assertFileExists home-files/.config/systemd/user/syncthing.service
@@ -16,6 +15,7 @@ lib.mkMerge [
       "ExecStart=@syncthing@/bin/syncthing -no-browser -no-restart -no-upgrade '-gui-address=127.0.0.1:8384' '-logflags=0' -foo '-bar \"baz\"'"
     '';
   })
+
   (lib.mkIf pkgs.stdenv.isDarwin {
     nmt.script = ''
       serviceFile=LaunchAgents/org.nix-community.home.syncthing.plist
diff --git a/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix b/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix
index ca018c2d8..355da3214 100644
--- a/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix
+++ b/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix
@@ -1,19 +1,11 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    services.syncthing.tray = true;
+  services.syncthing.tray = true;
 
-    test.asserts.warnings.expected = [
-      "Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257."
-    ];
+  test.asserts.warnings.expected = [
+    "Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257."
+  ];
 
-    test.stubs.syncthingtray-minimal = { };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/systemd/user/syncthingtray.service
-    '';
-  };
+  nmt.script = ''
+    assertFileExists home-files/.config/systemd/user/syncthingtray.service
+  '';
 }
diff --git a/tests/modules/services/syncthing/linux/tray.nix b/tests/modules/services/syncthing/linux/tray.nix
index 5ff3c2841..a1a426a12 100644
--- a/tests/modules/services/syncthing/linux/tray.nix
+++ b/tests/modules/services/syncthing/linux/tray.nix
@@ -1,21 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
-  config = {
-    services.syncthing.tray.enable = true;
+  services.syncthing.tray.enable = true;
 
-    nixpkgs.overlays = [
-      (self: super: {
-        syncthingtray-minimal =
-          pkgs.runCommandLocal "syncthingtray" { pname = "syncthingtray"; }
-          "mkdir $out";
-      })
-    ];
-
-    nmt.script = ''
-      assertFileExists home-files/.config/systemd/user/syncthingtray.service
-    '';
-  };
+  nmt.script = ''
+    assertFileExists home-files/.config/systemd/user/syncthingtray.service
+  '';
 }
diff --git a/tests/modules/services/trayscale/hide-window.nix b/tests/modules/services/trayscale/hide-window.nix
index 72181e898..fafb00c3d 100644
--- a/tests/modules/services/trayscale/hide-window.nix
+++ b/tests/modules/services/trayscale/hide-window.nix
@@ -1,11 +1,9 @@
-{ ... }: {
+{
   services.trayscale = {
     enable = true;
     hideWindow = true;
   };
 
-  test.stubs = { trayscale = { }; };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/trayscale.service
     assertFileExists $serviceFile
diff --git a/tests/modules/services/trayscale/show-window.nix b/tests/modules/services/trayscale/show-window.nix
index 62157ab54..7ac11c902 100644
--- a/tests/modules/services/trayscale/show-window.nix
+++ b/tests/modules/services/trayscale/show-window.nix
@@ -1,11 +1,9 @@
-{ ... }: {
+{
   services.trayscale = {
     enable = true;
     hideWindow = false;
   };
 
-  test.stubs = { trayscale = { }; };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/trayscale.service
     assertFileExists $serviceFile
diff --git a/tests/modules/services/twmn/basic-configuration.nix b/tests/modules/services/twmn/basic-configuration.nix
index 5da926e48..1779f0ae8 100644
--- a/tests/modules/services/twmn/basic-configuration.nix
+++ b/tests/modules/services/twmn/basic-configuration.nix
@@ -1,51 +1,47 @@
 {
-  config = {
-    services.twmn = {
-      enable = true;
-      duration = 4242;
-      host = "example.com";
-      port = 9006;
-      screen = 0;
-      soundCommand = "/path/sound/command";
-      icons.critical = "/path/icon/critical";
-      icons.info = "/path/icon/info";
-      icons.warning = "/path/icon/warning";
-      text = {
-        color = "#FF00FF";
-        font.family = "Noto Sans";
-        font.size = 16;
-        font.variant = "italic";
-        maxLength = 80;
-      };
-      window = {
-        alwaysOnTop = true;
-        color = "black";
-        height = 20;
-        offset.x = 20;
-        offset.y = -60;
-        opacity = 80;
-        position = "center";
-        animation = {
-          easeIn.curve = 27;
-          easeIn.duration = 314;
-          easeOut.curve = 13;
-          easeOut.duration = 168;
-          bounce.enable = true;
-          bounce.duration = 271;
-        };
+  services.twmn = {
+    enable = true;
+    duration = 4242;
+    host = "example.com";
+    port = 9006;
+    screen = 0;
+    soundCommand = "/path/sound/command";
+    icons.critical = "/path/icon/critical";
+    icons.info = "/path/icon/info";
+    icons.warning = "/path/icon/warning";
+    text = {
+      color = "#FF00FF";
+      font.family = "Noto Sans";
+      font.size = 16;
+      font.variant = "italic";
+      maxLength = 80;
+    };
+    window = {
+      alwaysOnTop = true;
+      color = "black";
+      height = 20;
+      offset.x = 20;
+      offset.y = -60;
+      opacity = 80;
+      position = "center";
+      animation = {
+        easeIn.curve = 27;
+        easeIn.duration = 314;
+        easeOut.curve = 13;
+        easeOut.duration = 168;
+        bounce.enable = true;
+        bounce.duration = 271;
       };
     };
-
-    test.stubs.twmn = { };
-
-    nmt.script = ''
-      serviceFile="home-files/.config/systemd/user/twmnd.service"
-      assertFileExists "$serviceFile"
-      assertFileRegex "$serviceFile" 'X-Restart-Triggers=.*twmn\.conf'
-      assertFileRegex "$serviceFile" 'ExecStart=@twmn@/bin/twmnd'
-      assertFileExists "home-files/.config/twmn/twmn.conf"
-      assertFileContent "home-files/.config/twmn/twmn.conf" \
-          ${./basic-configuration.conf}
-    '';
   };
+
+  nmt.script = ''
+    serviceFile="home-files/.config/systemd/user/twmnd.service"
+    assertFileExists "$serviceFile"
+    assertFileRegex "$serviceFile" 'X-Restart-Triggers=.*twmn\.conf'
+    assertFileRegex "$serviceFile" 'ExecStart=@twmn@/bin/twmnd'
+    assertFileExists "home-files/.config/twmn/twmn.conf"
+    assertFileContent "home-files/.config/twmn/twmn.conf" \
+        ${./basic-configuration.conf}
+  '';
 }
diff --git a/tests/modules/services/udiskie/basic.nix b/tests/modules/services/udiskie/basic.nix
index 5fa623c3e..0c07276b8 100644
--- a/tests/modules/services/udiskie/basic.nix
+++ b/tests/modules/services/udiskie/basic.nix
@@ -1,15 +1,11 @@
 {
-  config = {
-    services.udiskie.enable = true;
+  services.udiskie.enable = true;
 
-    test.stubs.udiskie = { };
-
-    nmt.script = ''
-      serviceFile="home-files/.config/systemd/user/udiskie.service"
-      assertFileRegex "$serviceFile" 'After=tray\.target'
-      assertFileRegex "$serviceFile" 'Requires=tray\.target'
-      assertFileContent "home-files/.config/udiskie/config.yml" \
-          ${./basic.yml}
-    '';
-  };
+  nmt.script = ''
+    serviceFile="home-files/.config/systemd/user/udiskie.service"
+    assertFileRegex "$serviceFile" 'After=tray\.target'
+    assertFileRegex "$serviceFile" 'Requires=tray\.target'
+    assertFileContent "home-files/.config/udiskie/config.yml" \
+        ${./basic.yml}
+  '';
 }
diff --git a/tests/modules/services/udiskie/no-tray.nix b/tests/modules/services/udiskie/no-tray.nix
index 0c7ede0bd..aa9ca9310 100644
--- a/tests/modules/services/udiskie/no-tray.nix
+++ b/tests/modules/services/udiskie/no-tray.nix
@@ -1,18 +1,14 @@
 {
-  config = {
-    services.udiskie = {
-      enable = true;
-      tray = "never";
-    };
-
-    test.stubs.udiskie = { };
-
-    nmt.script = ''
-      serviceFile="home-files/.config/systemd/user/udiskie.service"
-      assertFileNotRegex "$serviceFile" 'After=tray\.target'
-      assertFileNotRegex "$serviceFile" 'Requires=tray\.target'
-      assertFileContent "home-files/.config/udiskie/config.yml" \
-          ${./no-tray.yml}
-    '';
+  services.udiskie = {
+    enable = true;
+    tray = "never";
   };
+
+  nmt.script = ''
+    serviceFile="home-files/.config/systemd/user/udiskie.service"
+    assertFileNotRegex "$serviceFile" 'After=tray\.target'
+    assertFileNotRegex "$serviceFile" 'Requires=tray\.target'
+    assertFileContent "home-files/.config/udiskie/config.yml" \
+        ${./no-tray.yml}
+  '';
 }
diff --git a/tests/modules/services/volnoti/package-option.nix b/tests/modules/services/volnoti/package-option.nix
index ab403cdb2..c199a3a8f 100644
--- a/tests/modules/services/volnoti/package-option.nix
+++ b/tests/modules/services/volnoti/package-option.nix
@@ -9,8 +9,6 @@
     };
   };
 
-  test.stubs.volnoti = { };
-
   nmt.script = ''
     serviceFile=home-files/.config/systemd/user/volnoti.service
     assertFileExists $serviceFile
diff --git a/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix b/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix
deleted file mode 100644
index 7e9fd5efd..000000000
--- a/tests/modules/services/window-managers/bspwm/bspwm-stubs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = { bspwm = { }; };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/bspwm/configuration.nix b/tests/modules/services/window-managers/bspwm/configuration.nix
index 5a4dec12e..9d58bb932 100644
--- a/tests/modules/services/window-managers/bspwm/configuration.nix
+++ b/tests/modules/services/window-managers/bspwm/configuration.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./bspwm-stubs.nix ];
-
   xsession.windowManager.bspwm = {
     enable = true;
     monitors.focused = [ "desktop 1" "d'esk top" ]; # pathological desktop names
@@ -31,8 +29,6 @@
     startupPrograms = [ "foo" "bar || qux" ];
   };
 
-  test.stubs.bspwm = { };
-
   nmt.script = ''
     bspwmrc=home-files/.config/bspwm/bspwmrc
     assertFileExists "$bspwmrc"
diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
index 207421652..44ed150b9 100644
--- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
+++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix
@@ -1,12 +1,6 @@
-{ lib, pkgs, ... }:
-
 {
-  imports = [ ./herbstluftwm-stubs.nix ];
-
   xsession.windowManager.herbstluftwm = { enable = true; };
 
-  test.stubs.herbstluftwm = { };
-
   nmt.script = ''
     autostart=home-files/.config/herbstluftwm/autostart
     assertFileExists "$autostart"
diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
index 9a93358cf..23e1a97d3 100644
--- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
+++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix
@@ -1,8 +1,4 @@
-{ lib, pkgs, ... }:
-
 {
-  imports = [ ./herbstluftwm-stubs.nix ];
-
   xsession.windowManager.herbstluftwm = {
     enable = true;
     settings = {
@@ -33,8 +29,6 @@
     '';
   };
 
-  test.stubs.herbstluftwm = { };
-
   nmt.script = ''
     autostart=home-files/.config/herbstluftwm/autostart
     assertFileExists "$autostart"
diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix
deleted file mode 100644
index 7c24083a2..000000000
--- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-stubs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = { herbstluftwm = { }; };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix b/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix
deleted file mode 100644
index 02d1885bb..000000000
--- a/tests/modules/services/window-managers/hyprland/hyprland-stubs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = {
-    xdg-desktop-portal = { };
-    xwayland = { };
-  };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      hyprland = lib.makeOverridable
-        (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { };
-      xdg-desktop-portal-hyprland = lib.makeOverridable (_:
-        config.lib.test.mkStubPackage { name = "xdg-desktop-portal-hyprland"; })
-        { };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf b/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf
index 5d9102973..d0e82572d 100644
--- a/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf
+++ b/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf
@@ -1,4 +1,4 @@
-exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
+exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
 plugin=/path/to/plugin1
 plugin=/nix/store/00000000000000000000000000000000-foo/lib/libfoo.so
 $mod=SUPER
diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
index 40f92a911..7e27de042 100644
--- a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
+++ b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix
@@ -1,6 +1,6 @@
-{ config, ... }: {
-  imports = [ ./hyprland-stubs.nix ];
+{ config, ... }:
 
+{
   wayland.windowManager.hyprland = {
     enable = true;
     plugins =
diff --git a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
index c27bff010..e20b98e83 100644
--- a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix
@@ -1,6 +1,4 @@
-{ ... }: {
-  imports = [ ./hyprland-stubs.nix ];
-
+{
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;
diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.nix b/tests/modules/services/window-managers/hyprland/null-package-config.nix
index 463cbd538..dc89fcda1 100644
--- a/tests/modules/services/window-managers/hyprland/null-package-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-package-config.nix
@@ -1,6 +1,4 @@
 {
-  imports = [ ./hyprland-stubs.nix ];
-
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;
diff --git a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
index c118e23e2..65ae67535 100644
--- a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
+++ b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix
@@ -1,6 +1,4 @@
 {
-  imports = [ ./hyprland-stubs.nix ];
-
   wayland.windowManager.hyprland = {
     enable = true;
 
diff --git a/tests/modules/services/window-managers/hyprland/simple-config.conf b/tests/modules/services/window-managers/hyprland/simple-config.conf
index 29dcd7cd8..c076f5382 100644
--- a/tests/modules/services/window-managers/hyprland/simple-config.conf
+++ b/tests/modules/services/window-managers/hyprland/simple-config.conf
@@ -1,4 +1,4 @@
-exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
+exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
 plugin=/path/to/plugin1
 plugin=/nix/store/00000000000000000000000000000000-foo/lib/libfoo.so
 $mod=SUPER
diff --git a/tests/modules/services/window-managers/hyprland/simple-config.nix b/tests/modules/services/window-managers/hyprland/simple-config.nix
index 5feaffe0d..820fcc3e2 100644
--- a/tests/modules/services/window-managers/hyprland/simple-config.nix
+++ b/tests/modules/services/window-managers/hyprland/simple-config.nix
@@ -1,6 +1,6 @@
-{ config, ... }: {
-  imports = [ ./hyprland-stubs.nix ];
+{ config, ... }:
 
+{
   wayland.windowManager.hyprland = {
     enable = true;
     plugins =
diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf
index 3dc8c39c0..e3d54eff0 100644
--- a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf
+++ b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf
@@ -1,4 +1,4 @@
-exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
+exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
 bezier=smoothOut, 0.36, 0, 0.66, -0.56
 bezier=smoothIn, 0.25, 1, 0.5, 1
 bezier=overshot, 0.4,0.8,0.2,1.2
diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
index 005c7bc41..06cfdf453 100644
--- a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
+++ b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix
@@ -1,6 +1,4 @@
 {
-  imports = [ ./hyprland-stubs.nix ];
-
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
diff --git a/tests/modules/services/window-managers/i3/i3-stubs.nix b/tests/modules/services/window-managers/i3/i3-stubs.nix
index a104eace0..f0d96944f 100644
--- a/tests/modules/services/window-managers/i3/i3-stubs.nix
+++ b/tests/modules/services/window-managers/i3/i3-stubs.nix
@@ -1,9 +1,7 @@
-{ config, lib, ... }: {
+{
   # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
   # not containing hashes, version numbers etc.
   test.stubs = {
-    dmenu = { };
-
     i3 = {
       buildScript = ''
         mkdir -p $out/bin
@@ -11,17 +9,5 @@
         chmod 755 $out/bin/i3
       '';
     };
-
-    i3-gaps = { };
-
-    i3status = { };
   };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
 }
diff --git a/tests/modules/services/window-managers/river/configuration.nix b/tests/modules/services/window-managers/river/configuration.nix
index a180683b1..10e4d4db7 100644
--- a/tests/modules/services/window-managers/river/configuration.nix
+++ b/tests/modules/services/window-managers/river/configuration.nix
@@ -1,8 +1,4 @@
-{ ... }:
-
 {
-  imports = [ ./river-stubs.nix ];
-
   wayland.windowManager.river = {
     enable = true;
     xwayland.enable = true;
@@ -80,11 +76,6 @@
     '';
   };
 
-  test.stubs = {
-    river = { };
-    xwayland = { };
-  };
-
   nmt.script = ''
     riverInit=home-files/.config/river/init
     assertFileExists "$riverInit"
diff --git a/tests/modules/services/window-managers/river/init b/tests/modules/services/window-managers/river/init
index 8662dc910..c266ca9e9 100755
--- a/tests/modules/services/window-managers/river/init
+++ b/tests/modules/services/window-managers/river/init
@@ -62,6 +62,6 @@ extra config
 
 
 ### SYSTEMD INTEGRATION ###
-/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target
+@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target
 
 
diff --git a/tests/modules/services/window-managers/river/river-stubs.nix b/tests/modules/services/window-managers/river/river-stubs.nix
deleted file mode 100644
index 21826ac29..000000000
--- a/tests/modules/services/window-managers/river/river-stubs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = { river = { }; };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
index 8c7fd00cf..7145cbc44 100644
--- a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
+++ b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix
@@ -1,8 +1,4 @@
-{ ... }:
-
 {
-  imports = [ ./spectrwm-stubs.nix ];
-
   xsession.windowManager.spectrwm = {
     enable = true;
     settings = {
@@ -16,8 +12,6 @@
     unbindings = [ "MOD+Return" ];
   };
 
-  test.stubs.spectrwm = { };
-
   nmt.script = ''
     assertFileContent \
       home-files/.config/spectrwm/spectrwm.conf ${
diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix b/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix
deleted file mode 100644
index 7f64ae083..000000000
--- a/tests/modules/services/window-managers/spectrwm/spectrwm-stubs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = { spectrwm = { }; };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
index 100193192..c1c046620 100644
--- a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
+++ b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
@@ -108,4 +108,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix
index 9488d00f6..0cda0a661 100644
--- a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix
+++ b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
@@ -19,7 +17,7 @@
 
   nmt.script = ''
     assertFileExists home-files/.config/sway/config
-    assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \
+    assertFileContent home-files/.config/sway/config \
       ${./sway-bar-focused-colors.conf}
   '';
 }
diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
index 28513fcd5..e913c7d0e 100644
--- a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
+++ b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
@@ -107,5 +107,5 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
 exec_always pkill flashfocus; flasfocus &
diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix
index cf316988b..8adf112ba 100644
--- a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix
+++ b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
@@ -20,7 +18,7 @@
 
   nmt.script = ''
     assertFileExists home-files/.config/sway/config
-    assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \
+    assertFileContent home-files/.config/sway/config \
       ${./sway-bindkeys-to-code-and-extra-config.conf}
   '';
 }
diff --git a/tests/modules/services/window-managers/sway/sway-check-config.nix b/tests/modules/services/window-managers/sway/sway-check-config.nix
index e566e4fda..83558ecee 100644
--- a/tests/modules/services/window-managers/sway/sway-check-config.nix
+++ b/tests/modules/services/window-managers/sway/sway-check-config.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, realPkgs, ... }:
 
 lib.mkIf config.test.enableBig {
   wayland.windowManager.sway = {
@@ -6,6 +6,8 @@ lib.mkIf config.test.enableBig {
     checkConfig = true;
   };
 
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) xvfb-run; }) ];
+
   nmt.script = ''
     assertFileExists home-files/.config/sway/config
   '';
diff --git a/tests/modules/services/window-managers/sway/sway-default.conf b/tests/modules/services/window-managers/sway/sway-default.conf
index cefe4e0af..e47db636a 100644
--- a/tests/modules/services/window-managers/sway/sway-default.conf
+++ b/tests/modules/services/window-managers/sway/sway-default.conf
@@ -105,4 +105,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-default.nix b/tests/modules/services/window-managers/sway/sway-default.nix
index c62effbe8..cf21cbafa 100644
--- a/tests/modules/services/window-managers/sway/sway-default.nix
+++ b/tests/modules/services/window-managers/sway/sway-default.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
index f4f60ddf0..3ad8c181b 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
@@ -83,4 +83,4 @@ mode "resize" {
   bindsym l resize grow width 10 px
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
index c10dbd90d..50f6a11d7 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
@@ -83,4 +83,4 @@ mode "resize" {
   bindsym l resize grow width 10 px
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix b/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix
index 3bce48507..425931b83 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix
+++ b/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-followmouse.nix b/tests/modules/services/window-managers/sway/sway-followmouse.nix
index de2e91b39..7b0bcfeb8 100644
--- a/tests/modules/services/window-managers/sway/sway-followmouse.nix
+++ b/tests/modules/services/window-managers/sway/sway-followmouse.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-modules.conf b/tests/modules/services/window-managers/sway/sway-modules.conf
index d36a164ee..85ca8338a 100644
--- a/tests/modules/services/window-managers/sway/sway-modules.conf
+++ b/tests/modules/services/window-managers/sway/sway-modules.conf
@@ -117,4 +117,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-modules.nix b/tests/modules/services/window-managers/sway/sway-modules.nix
index 287dec176..d9a566c60 100644
--- a/tests/modules/services/window-managers/sway/sway-modules.nix
+++ b/tests/modules/services/window-managers/sway/sway-modules.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-no-xwayland.nix b/tests/modules/services/window-managers/sway/sway-no-xwayland.nix
index 5eded3b88..d754d67d5 100644
--- a/tests/modules/services/window-managers/sway/sway-no-xwayland.nix
+++ b/tests/modules/services/window-managers/sway/sway-no-xwayland.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
@@ -16,7 +14,7 @@
     assertFileExists home-files/.config/sway/config
     assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \
         ${
-          pkgs.writeText "expected" ''
+          builtins.toFile "expected" ''
             xwayland disable
           ''
         }
diff --git a/tests/modules/services/window-managers/sway/sway-null-config.nix b/tests/modules/services/window-managers/sway/sway-null-config.nix
index 46e4df23e..38e2082fa 100644
--- a/tests/modules/services/window-managers/sway/sway-null-config.nix
+++ b/tests/modules/services/window-managers/sway/sway-null-config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
@@ -13,7 +11,7 @@
 
   nmt.script = ''
     assertFileExists home-files/.config/sway/config
-    assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \
-      ${pkgs.writeText "expected" ""}
+    assertFileContent home-files/.config/sway/config \
+      ${builtins.toFile "expected" ""}
   '';
 }
diff --git a/tests/modules/services/window-managers/sway/sway-null-package.conf b/tests/modules/services/window-managers/sway/sway-null-package.conf
index 9df934b2f..0cb9d9d40 100644
--- a/tests/modules/services/window-managers/sway/sway-null-package.conf
+++ b/tests/modules/services/window-managers/sway/sway-null-package.conf
@@ -105,4 +105,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-null-package.nix b/tests/modules/services/window-managers/sway/sway-null-package.nix
index 042830d18..3ab770813 100644
--- a/tests/modules/services/window-managers/sway/sway-null-package.nix
+++ b/tests/modules/services/window-managers/sway/sway-null-package.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   # Enables the default bar configuration
   home.stateVersion = "20.09";
 
diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.conf b/tests/modules/services/window-managers/sway/sway-post-2003.conf
index 9df934b2f..0cb9d9d40 100644
--- a/tests/modules/services/window-managers/sway/sway-post-2003.conf
+++ b/tests/modules/services/window-managers/sway/sway-post-2003.conf
@@ -105,4 +105,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.nix b/tests/modules/services/window-managers/sway/sway-post-2003.nix
index 3617a3b1c..73934382e 100644
--- a/tests/modules/services/window-managers/sway/sway-post-2003.nix
+++ b/tests/modules/services/window-managers/sway/sway-post-2003.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   home.stateVersion = "20.09";
 
   wayland.windowManager.sway = {
diff --git a/tests/modules/services/window-managers/sway/sway-stubs.nix b/tests/modules/services/window-managers/sway/sway-stubs.nix
deleted file mode 100644
index ddf11730b..000000000
--- a/tests/modules/services/window-managers/sway/sway-stubs.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = {
-    dmenu = { };
-    foot = { };
-    i3status = { };
-    sway = { version = "1"; };
-    sway-unwrapped = { version = "1"; };
-    swaybg = { };
-    xwayland = { };
-  };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      procps = config.lib.test.mkStubPackage { name = "procps"; };
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix b/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix
index 5c32c19cd..84c41ac57 100644
--- a/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix
+++ b/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
index 3710c5392..e0534715b 100644
--- a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
+++ b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf
@@ -105,4 +105,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.nix b/tests/modules/services/window-managers/sway/sway-systemd-variables.nix
index f0b42ecc1..b8f342210 100644
--- a/tests/modules/services/window-managers/sway/sway-systemd-variables.nix
+++ b/tests/modules/services/window-managers/sway/sway-systemd-variables.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
index 4fe872821..b70c17515 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
@@ -104,4 +104,4 @@ bar {
   }
 }
 
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default.nix b/tests/modules/services/window-managers/sway/sway-workspace-default.nix
index e5637fd94..ef24f38a9 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-default.nix
+++ b/tests/modules/services/window-managers/sway/sway-workspace-default.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
index 7148d0030..241866f36 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
+++ b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
@@ -110,4 +110,4 @@ workspace "ABC" output "DP"
 workspace "3: Test" output "HDMI"
 workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output "DVI"
 workspace "Multiple" output "DVI" "HDMI" "DP"
-exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
+exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target"
diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output.nix b/tests/modules/services/window-managers/sway/sway-workspace-output.nix
index dcbff91e1..2f8816bc4 100644
--- a/tests/modules/services/window-managers/sway/sway-workspace-output.nix
+++ b/tests/modules/services/window-managers/sway/sway-workspace-output.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 let
   i3 = {
@@ -10,8 +10,6 @@ let
   };
 
 in {
-  imports = [ ./sway-stubs.nix ];
-
   wayland.windowManager.sway = {
     enable = true;
     package = config.lib.test.mkStubPackage { outPath = "@sway@"; };
diff --git a/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix b/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix
index 56782547f..f6fce496d 100644
--- a/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix
+++ b/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   wayland.windowManager.sway.swaynag = {
     enable = true;
diff --git a/tests/modules/services/window-managers/sway/swaynag-example-settings.nix b/tests/modules/services/window-managers/sway/swaynag-example-settings.nix
index 513d185da..63a9f6a1d 100644
--- a/tests/modules/services/window-managers/sway/swaynag-example-settings.nix
+++ b/tests/modules/services/window-managers/sway/swaynag-example-settings.nix
@@ -1,30 +1,26 @@
-{ config, lib, pkgs, ... }:
-
 {
-  config = {
-    wayland.windowManager.sway.swaynag = {
-      enable = true;
+  wayland.windowManager.sway.swaynag = {
+    enable = true;
 
-      settings = {
-        "<config>" = {
-          edge = "bottom";
-          font = "Dina 12";
-        };
+    settings = {
+      "<config>" = {
+        edge = "bottom";
+        font = "Dina 12";
+      };
 
-        green = {
-          edge = "top";
-          background = "00AA00";
-          text = "FFFFFF";
-          button-background = "00CC00";
-          message-padding = 10;
-        };
+      green = {
+        edge = "top";
+        background = "00AA00";
+        text = "FFFFFF";
+        button-background = "00CC00";
+        message-padding = 10;
       };
     };
-
-    nmt.script = ''
-      assertFileContent \
-        home-files/.config/swaynag/config \
-        ${./swaynag-example-settings-expected.conf}
-    '';
   };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/swaynag/config \
+      ${./swaynag-example-settings-expected.conf}
+  '';
 }
diff --git a/tests/modules/services/window-managers/wayfire/configuration.ini b/tests/modules/services/window-managers/wayfire/configuration.ini
index a40480412..1467c269a 100644
--- a/tests/modules/services/window-managers/wayfire/configuration.ini
+++ b/tests/modules/services/window-managers/wayfire/configuration.ini
@@ -1,5 +1,5 @@
 [autostart]
-systemdActivation=/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop wayfire-session.target && systemctl --user start wayfire-session.target
+systemdActivation=@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop wayfire-session.target && systemctl --user start wayfire-session.target
 
 [command]
 binding_terminal=alacritty
diff --git a/tests/modules/services/window-managers/wayfire/configuration.nix b/tests/modules/services/window-managers/wayfire/configuration.nix
index d199e9202..940fb76ae 100644
--- a/tests/modules/services/window-managers/wayfire/configuration.nix
+++ b/tests/modules/services/window-managers/wayfire/configuration.nix
@@ -1,6 +1,4 @@
-{ ... }: {
-  imports = [ ./wayfire-stubs.nix ];
-
+{
   wayland.windowManager.wayfire = {
     enable = true;
     package = null;
@@ -17,8 +15,6 @@
     wayfireConfig=home-files/.config/wayfire.ini
 
     assertFileExists "$wayfireConfig"
-
-    normalizedConfig=$(normalizeStorePaths "$wayfireConfig")
-    assertFileContent "$normalizedConfig" "${./configuration.ini}"
+    assertFileContent "$wayfireConfig" "${./configuration.ini}"
   '';
 }
diff --git a/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix b/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix
deleted file mode 100644
index 0fd2bf850..000000000
--- a/tests/modules/services/window-managers/wayfire/wayfire-stubs.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }: {
-  # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e.,
-  # not containing hashes, version numbers etc.
-  test.stubs = { wayfire = { }; };
-
-  nixpkgs.overlays = [
-    (_final: _prev: {
-      dbus = config.lib.test.mkStubPackage { name = "dbus"; };
-      systemd =
-        lib.makeOverridable (_attrs: config.lib.test.mkStubPackage { }) { };
-    })
-  ];
-}
diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.nix b/tests/modules/services/window-managers/wayfire/wf-shell.nix
index f88761db1..f7700ff33 100644
--- a/tests/modules/services/window-managers/wayfire/wf-shell.nix
+++ b/tests/modules/services/window-managers/wayfire/wf-shell.nix
@@ -1,12 +1,9 @@
-{ pkgs, ... }: {
-  imports = [ ./wayfire-stubs.nix ];
-
+{
   wayland.windowManager.wayfire = {
     enable = true;
     package = null;
     wf-shell = {
       enable = true;
-      package = pkgs.mkStubPackage { };
       settings = {
         panel = {
           widgets_left = "menu spacing4 launchers window-list";
@@ -20,8 +17,6 @@
     wfShellConfig=home-files/.config/wf-shell.ini
 
     assertFileExists "$wfShellConfig"
-
-    normalizedConfig=$(normalizeStorePaths "$wfShellConfig")
-    assertFileContent "$normalizedConfig" "${./wf-shell.ini}"
+    assertFileContent "$wfShellConfig" "${./wf-shell.ini}"
   '';
 }
diff --git a/tests/stubs.nix b/tests/stubs.nix
index b9c933ac8..25863143d 100644
--- a/tests/stubs.nix
+++ b/tests/stubs.nix
@@ -28,6 +28,11 @@ let
         type = types.str;
         default = defaultBuildScript;
       };
+
+      extraAttrs = mkOption {
+        type = types.attrsOf types.anything;
+        default = { };
+      };
     };
   });
 
@@ -37,7 +42,7 @@ let
     defaultBuildScript;
 
   mkStubPackage = { name ? "dummy", outPath ? null, version ? null
-    , buildScript ? defaultBuildScript }:
+    , buildScript ? defaultBuildScript, extraAttrs ? { } }:
     let
       pkg = if name == "dummy" && buildScript == defaultBuildScript then
         dummyPackage
@@ -46,35 +51,50 @@ let
           pname = name;
           meta.mainProgram = name;
         } buildScript;
-    in pkg // optionalAttrs (outPath != null) {
-      inherit outPath;
 
-      # Prevent getOutput from descending into outputs
-      outputSpecified = true;
+      stubbedPkg = pkg // optionalAttrs (outPath != null) {
+        inherit outPath;
 
-      # Allow the original package to be used in derivation inputs
-      __spliced = {
-        buildHost = pkg;
-        hostTarget = pkg;
-      };
-    } // optionalAttrs (version != null) { inherit version; };
+        # Prevent getOutput from descending into outputs
+        outputSpecified = true;
+
+        # Allow the original package to be used in derivation inputs
+        __spliced = {
+          buildHost = pkg;
+          hostTarget = pkg;
+        };
+      } // optionalAttrs (version != null) { inherit version; } // extraAttrs;
+    in stubbedPkg;
 
 in {
-  options.test.stubs = mkOption {
-    type = types.attrsOf stubType;
-    default = { };
-    description =
-      "Package attributes that should be replaced by a stub package.";
+  options.test = {
+    stubs = mkOption {
+      type = types.attrsOf stubType;
+      default = { };
+      description =
+        "Package attributes that should be replaced by a stub package.";
+    };
+
+    stubOverlays = mkOption {
+      type = types.anything;
+      default = [ ];
+      internal = true;
+    };
+
+    unstubs = mkOption {
+      type = types.listOf types.anything;
+      default = [ ];
+    };
   };
 
   config = {
     lib.test.mkStubPackage = mkStubPackage;
 
-    nixpkgs.overlays = [ (self: super: { inherit mkStubPackage; }) ]
-      ++ optional (config.test.stubs != { }) (self: super:
-        mapAttrs (n: v:
-          mkStubPackage (v // optionalAttrs (v.version == null) {
+    test.stubOverlays = [ ] ++ optional (config.test.stubs != { }) (self: super:
+      mapAttrs (n: v:
+        builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v
+          // optionalAttrs (v.version == null) {
             version = super.${n}.version or null;
-          })) config.test.stubs);
+          }))) config.test.stubs) ++ config.test.unstubs;
   };
 }

From f2d32e46fac9d51da6912948ae1156044c71774b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 4 Feb 2025 23:56:05 +0100
Subject: [PATCH 331/546] broot: use hjson-go

Reduces the build closure quite a bit.
---
 modules/programs/broot.nix             | 4 ++--
 tests/modules/programs/broot/broot.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index c1ce94776..7daba09f5 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -228,9 +228,9 @@ in {
 
     programs.broot.settings = builtins.fromJSON (builtins.readFile
       (pkgs.runCommand "default-conf.json" {
-        nativeBuildInputs = [ pkgs.hjson ];
+        nativeBuildInputs = [ pkgs.hjson-go ];
       }
-        "hjson -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out"));
+        "hjson-cli -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out"));
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash");
 
diff --git a/tests/modules/programs/broot/broot.nix b/tests/modules/programs/broot/broot.nix
index f4061b692..d4f60a7c2 100644
--- a/tests/modules/programs/broot/broot.nix
+++ b/tests/modules/programs/broot/broot.nix
@@ -6,7 +6,7 @@
     settings.modal = true;
   };
 
-  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson; }) ];
+  nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson-go; }) ];
 
   nmt.script = ''
     assertFileExists home-files/.config/broot/conf.toml

From 5997112695f3b02d3992764760fc6ddfef51fba3 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 5 Feb 2025 08:48:17 +0100
Subject: [PATCH 332/546] 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/852ff1d9e153d8875a83602e03fdef8a63f0ecf8?narHash=sha256-Zf0hSrtzaM1DEz8//%2BXs51k/wdSajticVrATqDrfQjg%3D' (2025-01-26)
  → 'github:NixOS/nixpkgs/799ba5bffed04ced7067a91798353d360788b30d?narHash=sha256-ooLh%2BXW8jfa%2B91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U%3D' (2025-02-04)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1bb2222c5..7e36e5375 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1738680400,
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {

From d092f0a4c07fea79f14886da83c9ee7249c6a84f Mon Sep 17 00:00:00 2001
From: Gavagai53 <masella_portlock@aleeas.com>
Date: Thu, 30 Jan 2025 17:22:09 +0100
Subject: [PATCH 333/546] Translate using Weblate (Spanish)

Currently translated at 100.0% (16 of 16 strings)

Co-authored-by: Gavagai53 <masella_portlock@aleeas.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/es/
Translation: Home Manager/Home Manager Modules
---
 modules/po/es.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/po/es.po b/modules/po/es.po
index 33eee711c..d10ce440d 100644
--- a/modules/po/es.po
+++ b/modules/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-05-27 12:11+0000\n"
-"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
+"PO-Revision-Date: 2025-01-30 12:43+0000\n"
+"Last-Translator: Gavagai53 <masella_portlock@aleeas.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/home-manager/"
 "modules/es/>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Limpiando vínculos huérfanos de %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Creando nueva generación de perfil"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "No hubo cambio, así que reusando la última generación de perfil"
 
 #: modules/home-environment.nix:643
 msgid ""

From 396025251ae173da389133ed3aa7a3f18d333ea3 Mon Sep 17 00:00:00 2001
From: Kiril Pan <eccyboo@protonmail.com>
Date: Thu, 30 Jan 2025 17:22:09 +0100
Subject: [PATCH 334/546] Translate using Weblate (Bulgarian)

Currently translated at 100.0% (37 of 37 strings)

Add translation using Weblate (Bulgarian)

Co-authored-by: Kiril Pan <eccyboo@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/bg/
Translation: Home Manager/Home Manager CLI
---
 home-manager/po/bg.po | 262 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 262 insertions(+)
 create mode 100644 home-manager/po/bg.po

diff --git a/home-manager/po/bg.po b/home-manager/po/bg.po
new file mode 100644
index 000000000..8d3df163d
--- /dev/null
+++ b/home-manager/po/bg.po
@@ -0,0 +1,262 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
+"PO-Revision-Date: 2025-01-30 16:22+0000\n"
+"Last-Translator: Kiril Pan <eccyboo@protonmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/home-manager/"
+"cli/bg/>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.10-dev\n"
+
+#. translators: For example: "home-manager: missing argument for --cores"
+#: home-manager/home-manager:16
+msgid "%s: missing argument for %s"
+msgstr "%s: липсващ аргумент за %s"
+
+#: home-manager/home-manager:69
+msgid "No configuration file found at %s"
+msgstr "Не е намерен конфигурационен файл на %s"
+
+#. translators: The first '%s' specifier will be replaced by either
+#. 'home.nix' or 'flake.nix'.
+#: home-manager/home-manager:86 home-manager/home-manager:90
+#: home-manager/home-manager:189
+msgid ""
+"Keeping your Home Manager %s in %s is deprecated,\n"
+"please move it to %s"
+msgstr ""
+"Запазването на Вашия Домоуправител %s в %s \n"
+"е остаряла практика, моля преместете го в %s"
+
+#: home-manager/home-manager:97
+msgid "No configuration file found. Please create one at %s"
+msgstr "Конфигурационният файл не намерен. Моля създайте такъв в %s"
+
+#: home-manager/home-manager:112
+msgid "Home Manager not found at %s."
+msgstr "Home Manager не е открит в %s."
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:120
+msgid ""
+"The fallback Home Manager path %s has been deprecated and a file/directory "
+"was found there."
+msgstr ""
+"Изборът на резервната локация на Home Manager в %s е остаряла практика и "
+"файлът/директорията беше намерен/а там."
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:123
+msgid ""
+"To remove this warning, do one of the following.\n"
+"\n"
+"1. Explicitly tell Home Manager to use the path, for example by adding\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   to your configuration.\n"
+"\n"
+"   If you import Home Manager directly, you can use the `path` parameter\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   when calling the Home Manager package.\n"
+"\n"
+"2. Remove the deprecated path.\n"
+"\n"
+"     $ rm -r \"%s\""
+msgstr ""
+"За да премахнете това предупреждение, направенете една от следните опции:\n"
+"\n"
+"1. Изрично наредете на Home Manager да ползва локацията, като например "
+"добавите:\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   в конфигурацията си.\n"
+"\n"
+"   Ако импортирате Home Manager директно, можете да ползвате `path` "
+"параметъра.\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   Когато повиквате Home Manager пакета.\n"
+"\n"
+"2. Премахнате остарялата локация.\n"
+"\n"
+"     $ rm -r \"%s\""
+
+#: home-manager/home-manager:151
+msgid "Sanity checking Nix"
+msgstr "Разумна проверка на Nix"
+
+#: home-manager/home-manager:171
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr "Не е намерена подходяща профилна директория, пробвани са %s и %s"
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:226
+msgid "Can't inspect options of a flake configuration"
+msgstr "Опциите на флейк конфигурацията не могат да бъдат прегледани"
+
+#: home-manager/home-manager:301 home-manager/home-manager:324
+#: home-manager/home-manager:1061
+msgid "%s: unknown option '%s'"
+msgstr "%s: непозната опция '%s'"
+
+#: home-manager/home-manager:306 home-manager/home-manager:1062
+msgid "Run '%s --help' for usage help"
+msgstr "Изпълнете командата '%s --help' за повече информация"
+
+#: home-manager/home-manager:332 home-manager/home-manager:437
+msgid "The file %s already exists, leaving it unchanged..."
+msgstr "Файлът %s вече съществува, пропускане на промениете му..."
+
+#: home-manager/home-manager:334 home-manager/home-manager:439
+msgid "Creating %s..."
+msgstr "Създаване на %s..."
+
+#: home-manager/home-manager:481
+msgid "Creating initial Home Manager generation..."
+msgstr "Създаване на първоначалната Home Manager генерация..."
+
+#. translators: The "%s" specifier will be replaced by a file path.
+#: home-manager/home-manager:486
+msgid ""
+"All done! The home-manager tool should now be installed and you can edit\n"
+"\n"
+"    %s\n"
+"\n"
+"to configure Home Manager. Run 'man home-configuration.nix' to\n"
+"see all available options."
+msgstr ""
+"Всичко е готово! Инструментът home-manager е инсталиран и Вие можете да "
+"редактирате\n"
+"\n"
+"....%s\n"
+"\n"
+"за да конфигурате Home Manager. Изпълнете командата 'man home-"
+"configuration.nix'\n"
+"за да видите всички налични опции."
+
+#. translators: The "%s" specifier will be replaced by a URL.
+#: home-manager/home-manager:491
+msgid ""
+"Uh oh, the installation failed! Please create an issue at\n"
+"\n"
+"    %s\n"
+"\n"
+"if the error seems to be the fault of Home Manager."
+msgstr ""
+"О не, инсталацията се провали! Моля създайте запитване на\n"
+"\n"
+"....%s\n"
+"\n"
+"ако смятате, че грешката се дължи на Home Manager."
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:502
+msgid "Can't instantiate a flake configuration"
+msgstr "Флейк конфигурацията не може да се инстанцира"
+
+#: home-manager/home-manager:578
+msgid ""
+"There is %d unread and relevant news item.\n"
+"Read it by running the command \"%s news\"."
+msgid_plural ""
+"There are %d unread and relevant news items.\n"
+"Read them by running the command \"%s news\"."
+msgstr[0] ""
+"Има %d непрочетена релевантна новина.\n"
+"Прочетете я като изпълните \"%s news\" командата."
+msgstr[1] ""
+"Има %d непрочетени релевантни новини.\n"
+"Прочетете ги като изпълните \"%s news\" командата."
+
+#: home-manager/home-manager:592
+msgid "Unknown \"news.display\" setting \"%s\"."
+msgstr "Непозната \"news.display\" настройка \"%s\"."
+
+#: home-manager/home-manager:600
+#, sh-format
+msgid "Please set the $EDITOR or $VISUAL environment variable"
+msgstr "Моля задайте $EDITOR или $VISUAL променливите на средата"
+
+#: home-manager/home-manager:618
+msgid "Cannot run build in read-only directory"
+msgstr ""
+"Компилацията не може да се стартира в директория предназначена само за четене"
+
+#: home-manager/home-manager:699
+msgid "No generation with ID %s"
+msgstr "Не е намерена генерация с ID %s"
+
+#: home-manager/home-manager:701
+msgid "Cannot remove the current generation %s"
+msgstr "Не може да бъде премахната сегашната генерация %s"
+
+#: home-manager/home-manager:703
+msgid "Removing generation %s"
+msgstr "Премахване генерацията %s"
+
+#: home-manager/home-manager:724
+msgid "No generations to expire"
+msgstr "Няма изтичащи генерации"
+
+#: home-manager/home-manager:735
+msgid "No home-manager packages seem to be installed."
+msgstr "Изглежда няма нито един инсталиран home-manager пакет."
+
+#: home-manager/home-manager:820
+msgid "Unknown argument %s"
+msgstr "Непознат аргумент %s"
+
+#: home-manager/home-manager:845
+msgid "This will remove Home Manager from your system."
+msgstr "Това ще премахне Home Manager от системата Ви."
+
+#: home-manager/home-manager:848
+msgid "This is a dry run, nothing will actually be uninstalled."
+msgstr "Това е сухо изпълнение - нищо няма да бъде деинсталирано."
+
+#: home-manager/home-manager:852
+msgid "Really uninstall Home Manager?"
+msgstr "Наистина ли искате да деинсталирате Home Manager?"
+
+#: home-manager/home-manager:858
+msgid "Switching to empty Home Manager configuration..."
+msgstr "Превключване към празна Home Manager конфигурация..."
+
+#: home-manager/home-manager:873
+msgid "Yay!"
+msgstr "Ура!"
+
+#: home-manager/home-manager:878
+msgid "Home Manager is uninstalled but your home.nix is left untouched."
+msgstr ""
+"Home Manager бе деинсталиран но Вашия home.nix файл е оставен непроменен."
+
+#: home-manager/home-manager:1101
+msgid "expire-generations expects one argument, got %d."
+msgstr "expire-generations очаква един аргумент, получил е %d."
+
+#: home-manager/home-manager:1123
+msgid "Unknown command: %s"
+msgstr "Непозната команда: %s"
+
+#: home-manager/install.nix:18
+msgid "This derivation is not buildable, please run it using nix-shell."
+msgstr ""
+"Тази деривация не може да се компилира, моля стартирайте я ползвайки nix-"
+"shell."

From 987f622cc4368626d8b041ea495edf0d243714ba Mon Sep 17 00:00:00 2001
From: Languages add-on <noreply-addon-languages@weblate.org>
Date: Thu, 30 Jan 2025 17:22:09 +0100
Subject: [PATCH 335/546] Add translation using Weblate (Bulgarian)

Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>
---
 modules/po/bg.po | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 modules/po/bg.po

diff --git a/modules/po/bg.po b/modules/po/bg.po
new file mode 100644
index 000000000..f2bcc905f
--- /dev/null
+++ b/modules/po/bg.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager Modules package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager Modules\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2025-01-03 09:09+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: modules/files.nix:188
+msgid "Creating home file links in %s"
+msgstr ""
+
+#: modules/files.nix:201
+msgid "Cleaning up orphan links from %s"
+msgstr ""
+
+#: modules/home-environment.nix:591
+msgid "Creating new profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:594
+msgid "No change so reusing latest profile generation"
+msgstr ""
+
+#: modules/home-environment.nix:643
+msgid ""
+"Oops, Nix failed to install your new Home Manager profile!\n"
+"\n"
+"Perhaps there is a conflict with a package that was installed using\n"
+"\"%s\"? Try running\n"
+"\n"
+"    %s\n"
+"\n"
+"and if there is a conflicting package you can remove it with\n"
+"\n"
+"    %s\n"
+"\n"
+"Then try activating your Home Manager configuration again."
+msgstr ""
+
+#: modules/home-environment.nix:676
+msgid "Activating %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:22
+msgid "Migrating profile from %s to %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:54
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:106
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:115
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:132
+msgid "Starting Home Manager activation"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:136
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:149
+msgid "This is a dry run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:153
+msgid "This is a live run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:159
+msgid "Using Nix version: %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:162
+msgid "Activation variables:"
+msgstr ""

From 3b6fde96d8b41a4a21cbacba8de7debf7ea78021 Mon Sep 17 00:00:00 2001
From: Vladimir <kirillov.vladimir@gmail.com>
Date: Fri, 31 Jan 2025 14:34:06 +0000
Subject: [PATCH 336/546] Translate using Weblate (Russian)

Currently translated at 100.0% (16 of 16 strings)

Translation: Home Manager/Home Manager Modules
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/ru/
---
 modules/po/ru.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/po/ru.po b/modules/po/ru.po
index d3c20b3fb..271de0d68 100644
--- a/modules/po/ru.po
+++ b/modules/po/ru.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-12-11 16:06+0000\n"
-"Last-Translator: Blezz Rot <markus.jenya04@yandex.ru>\n"
+"PO-Revision-Date: 2025-01-31 17:29+0000\n"
+"Last-Translator: Vladimir <kirillov.vladimir@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/"
 "modules/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -30,11 +30,11 @@ msgstr "Удаляю устаревшие ссылки из %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Создание нового поколения профиля"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Изменений нет, повторно исползуем последнее поколение профиля"
 
 #: modules/home-environment.nix:643
 msgid ""

From f20b7a8ab527a2482f13754dc00b2deaddc34599 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 5 Feb 2025 06:11:16 -0500
Subject: [PATCH 337/546] firefox: fix referencing firefox fork name in
 profile-specific docs (#6407)

* firefox: fix referencing firefox fork name in profile-specific docs

Within the context of the profiles submodule, `${name}` refers to the
profile name, and not the firefox fork name.

This fixes all descriptions to use `${cfg.name}` instead.

* firefox: prefer cfg.name instead of name for consistency
---
 modules/programs/firefox/mkFirefoxModule.nix | 38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 66f1729b2..0f614e660 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -201,7 +201,7 @@ let
     in {
       assertion = duplicates == { };
       message = ''
-        Must not have a ${name} ${entityKind} with an existing ID but
+        Must not have a ${cfg.name} ${entityKind} with an existing ID but
       '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
     });
 
@@ -236,7 +236,7 @@ in {
       default = false;
       example = true;
       description = ''
-        Whether to enable ${name}.${
+        Whether to enable ${cfg.name}.${
           optionalString (description != null) " ${description}"
         }
         ${optionalString (!visible)
@@ -261,10 +261,10 @@ in {
         }
       '';
       description = ''
-        The ${name} package to use. If state version ≥ 19.09 then
-        this should be a wrapped ${name} package. For earlier state
-        versions it should be an unwrapped ${name} package.
-        Set to `null` to disable installing ${name}.
+        The ${cfg.name} package to use. If state version ≥ 19.09 then
+        this should be a wrapped ${cfg.name} package. For earlier state
+        versions it should be an unwrapped ${cfg.name} package.
+        Set to `null` to disable installing ${cfg.name}.
       '';
     };
 
@@ -275,7 +275,7 @@ in {
         The language packs to install. Available language codes can be found
         on the releases page:
         `https://releases.mozilla.org/pub/firefox/releases/''${version}/linux-x86_64/xpi/`,
-        replacing `''${version}` with the version of Firefox you have.
+        replacing `''${version}` with the version of ${cfg.name} you have.
       '';
       example = [ "en-GB" "de" ];
     };
@@ -314,7 +314,7 @@ in {
       default = with platforms;
         if isDarwin then darwin.configPath else linux.configPath;
       example = ".mozilla/firefox";
-      description = "Directory containing the ${name} configuration files.";
+      description = "Directory containing the ${cfg.name} configuration files.";
     };
 
     nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
@@ -323,7 +323,7 @@ in {
       default = [ ];
       description = ''
         Additional packages containing native messaging hosts that should be
-        made available to ${name} extensions.
+        made available to ${cfg.name} extensions.
       '';
     });
 
@@ -388,7 +388,7 @@ in {
           settings = mkOption {
             type = types.attrsOf (jsonFormat.type // {
               description =
-                "${name} preference (int, bool, string, and also attrs, list, float as a JSON string)";
+                "${cfg.name} preference (int, bool, string, and also attrs, list, float as a JSON string)";
             });
             default = { };
             example = literalExpression ''
@@ -406,9 +406,9 @@ in {
               }
             '';
             description = ''
-              Attribute set of ${name} preferences.
+              Attribute set of ${cfg.name} preferences.
 
-              ${name} only supports int, bool, and string types for
+              ${cfg.name} only supports int, bool, and string types for
               preferences, but home-manager will automatically
               convert all other JSON-compatible values into strings.
             '';
@@ -425,7 +425,7 @@ in {
           userChrome = mkOption {
             type = types.lines;
             default = "";
-            description = "Custom ${name} user chrome CSS.";
+            description = "Custom ${cfg.name} user chrome CSS.";
             example = ''
               /* Hide tab bar in FF Quantum */
               @-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) {
@@ -444,7 +444,7 @@ in {
           userContent = mkOption {
             type = types.lines;
             default = "";
-            description = "Custom ${name} user content CSS.";
+            description = "Custom ${cfg.name} user content CSS.";
             example = ''
               /* Hide scrollbar in FF Quantum */
               *{scrollbar-width:none !important}
@@ -584,7 +584,7 @@ in {
             default = false;
             description = ''
               Whether to force replace the existing containers configuration.
-              This is recommended since Firefox will replace the symlink on
+              This is recommended since ${cfg.name} will replace the symlink on
               every launch, but note that you'll lose any existing configuration
               by enabling this.
             '';
@@ -676,7 +676,7 @@ in {
               ]
             '';
             description = ''
-              List of ${name} add-on packages to install for this profile.
+              List of ${cfg.name} add-on packages to install for this profile.
               Some pre-packaged add-ons are accessible from the
               [Nix User Repository](https://github.com/nix-community/NUR).
               Once you have NUR installed run
@@ -685,10 +685,10 @@ in {
               $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
               ```
 
-              to list the available ${name} add-ons.
+              to list the available ${cfg.name} add-ons.
 
               Note that it is necessary to manually enable these extensions
-              inside ${name} after the first installation.
+              inside ${cfg.name} after the first installation.
 
               To automatically enable extensions add
               `"extensions.autoDisableScopes" = 0;`
@@ -700,7 +700,7 @@ in {
         };
       }));
       default = { };
-      description = "Attribute set of ${name} profiles.";
+      description = "Attribute set of ${cfg.name} profiles.";
     };
 
     enableGnomeExtensions = mkOption {

From 30ea6fed4e4b41693cebc2263373dd810de4de49 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 5 Feb 2025 16:10:32 -0500
Subject: [PATCH 338/546] firefox: fix referencing name in profile-specific
 docs

Within the context of the profiles submodule, `${name}` refers to the
profile name, and not the Firefox fork name.

This fixes all descriptions to use the right name. This fixes a
previous commit that introduced a dependency between the documentation
and the user's configuration.
---
 modules/programs/firefox/mkFirefoxModule.nix | 47 ++++++++++----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 0f614e660..76954dd9c 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -10,6 +10,8 @@ let
 
   inherit (pkgs.stdenv.hostPlatform) isDarwin;
 
+  appName = name;
+
   moduleName = concatStringsSep "." modulePath;
 
   cfg = getAttrFromPath modulePath config;
@@ -201,7 +203,7 @@ let
     in {
       assertion = duplicates == { };
       message = ''
-        Must not have a ${cfg.name} ${entityKind} with an existing ID but
+        Must not have a ${appName} ${entityKind} with an existing ID but
       '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
     });
 
@@ -236,7 +238,7 @@ in {
       default = false;
       example = true;
       description = ''
-        Whether to enable ${cfg.name}.${
+        Whether to enable ${appName}.${
           optionalString (description != null) " ${description}"
         }
         ${optionalString (!visible)
@@ -261,10 +263,10 @@ in {
         }
       '';
       description = ''
-        The ${cfg.name} package to use. If state version ≥ 19.09 then
-        this should be a wrapped ${cfg.name} package. For earlier state
-        versions it should be an unwrapped ${cfg.name} package.
-        Set to `null` to disable installing ${cfg.name}.
+        The ${appName} package to use. If state version ≥ 19.09 then
+        this should be a wrapped ${appName} package. For earlier state
+        versions it should be an unwrapped ${appName} package.
+        Set to `null` to disable installing ${appName}.
       '';
     };
 
@@ -275,7 +277,7 @@ in {
         The language packs to install. Available language codes can be found
         on the releases page:
         `https://releases.mozilla.org/pub/firefox/releases/''${version}/linux-x86_64/xpi/`,
-        replacing `''${version}` with the version of ${cfg.name} you have.
+        replacing `''${version}` with the version of ${appName} you have.
       '';
       example = [ "en-GB" "de" ];
     };
@@ -314,7 +316,7 @@ in {
       default = with platforms;
         if isDarwin then darwin.configPath else linux.configPath;
       example = ".mozilla/firefox";
-      description = "Directory containing the ${cfg.name} configuration files.";
+      description = "Directory containing the ${appName} configuration files.";
     };
 
     nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
@@ -323,7 +325,7 @@ in {
       default = [ ];
       description = ''
         Additional packages containing native messaging hosts that should be
-        made available to ${cfg.name} extensions.
+        made available to ${appName} extensions.
       '';
     });
 
@@ -331,7 +333,7 @@ in {
       inherit visible;
       type = with types; nullOr package;
       readOnly = true;
-      description = "Resulting ${cfg.name} package.";
+      description = "Resulting ${appName} package.";
     };
 
     policies = optionalAttrs (wrappedPackageName != null) (mkOption {
@@ -388,7 +390,7 @@ in {
           settings = mkOption {
             type = types.attrsOf (jsonFormat.type // {
               description =
-                "${cfg.name} preference (int, bool, string, and also attrs, list, float as a JSON string)";
+                "${appName} preference (int, bool, string, and also attrs, list, float as a JSON string)";
             });
             default = { };
             example = literalExpression ''
@@ -406,9 +408,9 @@ in {
               }
             '';
             description = ''
-              Attribute set of ${cfg.name} preferences.
+              Attribute set of ${appName} preferences.
 
-              ${cfg.name} only supports int, bool, and string types for
+              ${appName} only supports int, bool, and string types for
               preferences, but home-manager will automatically
               convert all other JSON-compatible values into strings.
             '';
@@ -425,7 +427,7 @@ in {
           userChrome = mkOption {
             type = types.lines;
             default = "";
-            description = "Custom ${cfg.name} user chrome CSS.";
+            description = "Custom ${appName} user chrome CSS.";
             example = ''
               /* Hide tab bar in FF Quantum */
               @-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) {
@@ -444,7 +446,7 @@ in {
           userContent = mkOption {
             type = types.lines;
             default = "";
-            description = "Custom ${cfg.name} user content CSS.";
+            description = "Custom ${appName} user content CSS.";
             example = ''
               /* Hide scrollbar in FF Quantum */
               *{scrollbar-width:none !important}
@@ -569,8 +571,7 @@ in {
             type = types.submodule (args:
               import ./profiles/search.nix {
                 inherit (args) config;
-                inherit lib pkgs;
-                appName = cfg.name;
+                inherit lib pkgs appName;
                 package = cfg.finalPackage;
                 modulePath = modulePath ++ [ "profiles" name "search" ];
                 profilePath = config.path;
@@ -584,7 +585,7 @@ in {
             default = false;
             description = ''
               Whether to force replace the existing containers configuration.
-              This is recommended since ${cfg.name} will replace the symlink on
+              This is recommended since ${appName} will replace the symlink on
               every launch, but note that you'll lose any existing configuration
               by enabling this.
             '';
@@ -676,7 +677,7 @@ in {
               ]
             '';
             description = ''
-              List of ${cfg.name} add-on packages to install for this profile.
+              List of ${appName} add-on packages to install for this profile.
               Some pre-packaged add-ons are accessible from the
               [Nix User Repository](https://github.com/nix-community/NUR).
               Once you have NUR installed run
@@ -685,10 +686,10 @@ in {
               $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
               ```
 
-              to list the available ${cfg.name} add-ons.
+              to list the available ${appName} add-ons.
 
               Note that it is necessary to manually enable these extensions
-              inside ${cfg.name} after the first installation.
+              inside ${appName} after the first installation.
 
               To automatically enable extensions add
               `"extensions.autoDisableScopes" = 0;`
@@ -700,7 +701,7 @@ in {
         };
       }));
       default = { };
-      description = "Attribute set of ${cfg.name} profiles.";
+      description = "Attribute set of ${appName} profiles.";
     };
 
     enableGnomeExtensions = mkOption {
@@ -725,7 +726,7 @@ in {
           catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
       in {
         assertion = cfg.profiles == { } || length defaults == 1;
-        message = "Must have exactly one default ${cfg.name} profile but found "
+        message = "Must have exactly one default ${appName} profile but found "
           + toString (length defaults) + optionalString (length defaults > 1)
           (", namely " + concatStringsSep ", " defaults);
       })

From 15bd673658c189491cd896f06b3dd8f09bb0dfe4 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 6 Feb 2025 06:00:06 -0500
Subject: [PATCH 339/546] firefox: remove old unused test file (#6403)

---
 .../programs/firefox/profile-settings.nix     | 241 ------------------
 1 file changed, 241 deletions(-)
 delete mode 100644 tests/modules/programs/firefox/profile-settings.nix

diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
deleted file mode 100644
index 897067625..000000000
--- a/tests/modules/programs/firefox/profile-settings.nix
+++ /dev/null
@@ -1,241 +0,0 @@
-modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = getAttrFromPath modulePath config;
-
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
-  withName = path:
-    pkgs.substituteAll {
-      src = path;
-      name = cfg.wrappedPackageName;
-    };
-
-in {
-  imports = [ firefoxMockOverlay ];
-
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
-    enable = true;
-    profiles.basic.isDefault = true;
-
-    profiles.test = {
-      id = 1;
-      settings = {
-        "general.smoothScroll" = false;
-        "browser.newtabpage.pinned" = [{
-          title = "NixOS";
-          url = "https://nixos.org";
-        }];
-      };
-    };
-
-    profiles.bookmarks = {
-      id = 2;
-      settings = { "general.smoothScroll" = false; };
-      bookmarks = [
-        {
-          toolbar = true;
-          bookmarks = [{
-            name = "Home Manager";
-            url = "https://wiki.nixos.org/wiki/Home_Manager";
-          }];
-        }
-        {
-          name = "wikipedia";
-          tags = [ "wiki" ];
-          keyword = "wiki";
-          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
-        }
-        {
-          name = "kernel.org";
-          url = "https://www.kernel.org";
-        }
-        {
-          name = "Nix sites";
-          bookmarks = [
-            {
-              name = "homepage";
-              url = "https://nixos.org/";
-            }
-            {
-              name = "wiki";
-              tags = [ "wiki" "nix" ];
-              url = "https://wiki.nixos.org/";
-            }
-            {
-              name = "Nix sites";
-              bookmarks = [
-                {
-                  name = "homepage";
-                  url = "https://nixos.org/";
-                }
-                {
-                  name = "wiki";
-                  url = "https://wiki.nixos.org/";
-                }
-              ];
-            }
-          ];
-        }
-      ];
-    };
-
-    profiles.search = {
-      id = 3;
-      search = {
-        force = true;
-        default = "Google";
-        privateDefault = "DuckDuckGo";
-        order = [ "Nix Packages" "NixOS Wiki" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            icon =
-              "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-
-            definedAliases = [ "@np" ];
-          };
-
-          "NixOS Wiki" = {
-            urls = [{
-              template =
-                "https://wiki.nixos.org/index.php?search={searchTerms}";
-            }];
-            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-            updateInterval = 24 * 60 * 60 * 1000;
-            definedAliases = [ "@nw" ];
-          };
-
-          "Bing".metaData.hidden = true;
-          "Google".metaData.alias = "@g";
-        };
-      };
-    };
-
-    profiles.searchWithoutDefault = {
-      id = 4;
-      search = {
-        force = true;
-        order = [ "Google" "Nix Packages" ];
-        engines = {
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }];
-
-            definedAliases = [ "@np" ];
-          };
-        };
-      };
-    };
-
-    profiles.containers = {
-      id = 5;
-      containers = {
-        "shopping" = {
-          id = 6;
-          icon = "circle";
-          color = "yellow";
-        };
-      };
-    };
-  } // {
-
-    nmt.script = let
-
-      noHashQuery = ''
-        'def walk(f):
-             . as $in
-             | if type == "object" then
-                 reduce keys[] as $key
-                 ( {}; . + { ($key): ($in[$key] | walk(f)) } | f )
-               elif type == "array" then
-                 map( walk(f) )
-               else
-                 f
-               end;
-             walk(if type == "object" then
-                     if has("hash") then .hash = null else . end |
-                     if has("privateHash") then .privateHash = null else . end
-                  else
-                     .
-                  end)' '';
-
-    in ''
-      assertFileRegex \
-        home-path/bin/${cfg.wrappedPackageName} \
-        MOZ_APP_LAUNCHER
-
-      assertDirectoryExists home-files/${cfg.configPath}/basic
-
-      assertFileContent \
-        home-files/${cfg.configPath}/test/user.js \
-        ${withName ./profile-settings-expected-user.js}
-
-      assertFileContent \
-        home-files/${cfg.configPath}/containers/containers.json \
-        ${withName ./profile-settings-expected-containers.json}
-
-      bookmarksUserJs=$(normalizeStorePaths \
-        home-files/${cfg.configPath}/bookmarks/user.js)
-
-      assertFileContent \
-        $bookmarksUserJs \
-        ${withName ./profile-settings-expected-bookmarks-user.js}
-
-      bookmarksFile="$(sed -n \
-        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
-        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
-
-      assertFileContent \
-        $bookmarksFile \
-        ${withName ./profile-settings-expected-bookmarks.html}
-
-      function assertFirefoxSearchContent() {
-        compressedSearch=$(normalizeStorePaths "$1")
-
-        decompressedSearch=$(dirname $compressedSearch)/search.json
-        ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq ${noHashQuery} > "$decompressedSearch")
-
-        assertFileContent \
-          $decompressedSearch \
-          "$2"
-      }
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/search/search.json.mozlz4 \
-        ${withName ./profile-settings-expected-search.json}
-
-      assertFirefoxSearchContent \
-        home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \
-        ${withName ./profile-settings-expected-search-without-default.json}
-    '';
-  });
-}

From f99c704fe3a4cf8d72b2d568ec80bc38be1a9407 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 12 Jan 2025 18:09:08 +0100
Subject: [PATCH 340/546] bash: Make sure HISTFILE's directory exists

Co-authored-by: Robert Helgesson <robert@rycee.net>
---
 modules/programs/bash.nix                     |  5 +++--
 .../bash/bash-history-control-with-file.nix   | 20 +++++++++++++++++++
 tests/modules/programs/bash/default.nix       |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/programs/bash/bash-history-control-with-file.nix

diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 3a367b9e7..8356d8a06 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -180,7 +180,7 @@ in {
 
     sessionVarsStr = config.lib.shell.exportAll cfg.sessionVariables;
 
-    historyControlStr = concatStringsSep "\n"
+    historyControlStr = (concatStringsSep "\n"
       (mapAttrsToList (n: v: "${n}=${v}") ({
         HISTFILESIZE = toString cfg.historyFileSize;
         HISTSIZE = toString cfg.historySize;
@@ -190,7 +190,8 @@ in {
         HISTCONTROL = concatStringsSep ":" cfg.historyControl;
       } // optionalAttrs (cfg.historyIgnore != [ ]) {
         HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore);
-      }));
+      }) ++ optional (cfg.historyFile != null)
+        ''mkdir -p "$(dirname "$HISTFILE")"''));
   in mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
diff --git a/tests/modules/programs/bash/bash-history-control-with-file.nix b/tests/modules/programs/bash/bash-history-control-with-file.nix
new file mode 100644
index 000000000..449da8860
--- /dev/null
+++ b/tests/modules/programs/bash/bash-history-control-with-file.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.bash = {
+      enable = true;
+      historyControl = [ "erasedups" ];
+      historyFile = "/home/hm-user/foo/bash/history";
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.bashrc
+
+      assertFileRegex home-files/.bashrc \
+        '^mkdir -p "\$(dirname "\$HISTFILE")"'
+    '';
+  };
+}
diff --git a/tests/modules/programs/bash/default.nix b/tests/modules/programs/bash/default.nix
index 1dbbee777..6b20d1fbc 100644
--- a/tests/modules/programs/bash/default.nix
+++ b/tests/modules/programs/bash/default.nix
@@ -2,4 +2,5 @@
   bash-completion = ./completion.nix;
   bash-logout = ./logout.nix;
   bash-session-variables = ./session-variables.nix;
+  bash-history-control-with-file = ./bash-history-control-with-file.nix;
 }

From 433799271274c9f2ab520a49527ebfe2992dcfbd Mon Sep 17 00:00:00 2001
From: Coutinho de Souza <dev@onemoresuza.com>
Date: Thu, 6 Feb 2025 21:50:03 +0000
Subject: [PATCH 341/546] wayland: create tray.target if xsession is not
 enabled (#6332)

Create a internal/read-only trayTarget option for the xsession, which is
also used in wayland's config, if the former is not enabled.

Remove all other definitions of `systemd.user.targets.tray`, i. e, the
ones from the following modules: hyprland, sway, river and wayfire.
---
 modules/services/window-managers/hyprland.nix |  7 -------
 .../services/window-managers/i3-sway/sway.nix |  7 -------
 modules/services/window-managers/river.nix    |  7 -------
 modules/services/window-managers/wayfire.nix  |  7 -------
 modules/wayland.nix                           |  6 +++++-
 modules/xsession.nix                          | 21 +++++++++++++------
 6 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix
index ec73f99f6..35e47a152 100644
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -312,12 +312,5 @@ in {
           [ "xdg-desktop-autostart.target" ];
       };
     };
-
-    systemd.user.targets.tray = {
-      Unit = {
-        Description = "Home Manager System Tray";
-        Requires = [ "graphical-session-pre.target" ];
-      };
-    };
   };
 }
diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix
index 4148fcf1d..36d27328e 100644
--- a/modules/services/window-managers/i3-sway/sway.nix
+++ b/modules/services/window-managers/i3-sway/sway.nix
@@ -553,13 +553,6 @@ in {
             optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target";
         };
       };
-
-      systemd.user.targets.tray = {
-        Unit = {
-          Description = "Home Manager System Tray";
-          Requires = [ "graphical-session-pre.target" ];
-        };
-      };
     }
   ]);
 }
diff --git a/modules/services/window-managers/river.nix b/modules/services/window-managers/river.nix
index 06d458411..cc10a4344 100644
--- a/modules/services/window-managers/river.nix
+++ b/modules/services/window-managers/river.nix
@@ -201,12 +201,5 @@ in {
         After = [ "graphical-session-pre.target" ];
       };
     };
-
-    systemd.user.targets.tray = {
-      Unit = {
-        Description = "Home Manager System Tray";
-        Requires = [ "graphical-session-pre.target" ];
-      };
-    };
   };
 }
diff --git a/modules/services/window-managers/wayfire.nix b/modules/services/window-managers/wayfire.nix
index c551eb05f..e52201c79 100644
--- a/modules/services/window-managers/wayfire.nix
+++ b/modules/services/window-managers/wayfire.nix
@@ -189,12 +189,5 @@
         After = [ "graphical-session-pre.target" ];
       };
     };
-
-    systemd.user.targets.tray = {
-      Unit = {
-        Description = "Home Manager System Tray";
-        Requires = [ "graphical-session-pre.target" ];
-      };
-    };
   };
 }
diff --git a/modules/wayland.nix b/modules/wayland.nix
index 9a485c56c..6bf36162a 100644
--- a/modules/wayland.nix
+++ b/modules/wayland.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
 {
   meta.maintainers = [ lib.maintainers.thiagokokada ];
@@ -21,4 +21,8 @@
       };
     };
   };
+
+  config = lib.mkIf (!config.xsession.enable) {
+    systemd.user.targets.tray = config.xsession.trayTarget;
+  };
 }
diff --git a/modules/xsession.nix b/modules/xsession.nix
index 269ce1fa0..edb99300e 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -13,6 +13,20 @@ in {
     xsession = {
       enable = mkEnableOption "X Session";
 
+      trayTarget = mkOption {
+        readOnly = true;
+        internal = true;
+        visible = false;
+        description = "Common tray.target for both xsession and wayland";
+        type = types.attrs;
+        default = {
+          Unit = {
+            Description = "Home Manager System Tray";
+            Requires = [ "graphical-session-pre.target" ];
+          };
+        };
+      };
+
       scriptPath = mkOption {
         type = types.str;
         default = ".xsession";
@@ -163,12 +177,7 @@ in {
           };
         };
 
-        tray = {
-          Unit = {
-            Description = "Home Manager System Tray";
-            Requires = [ "graphical-session-pre.target" ];
-          };
-        };
+        tray = cfg.trayTarget;
       };
     };
 

From 947eef9e99c42346cf0aac2bebe1cd94924c173b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 8 Feb 2025 09:17:02 +0100
Subject: [PATCH 342/546] neovim: disable neovim-coc-config test

---
 tests/modules/programs/neovim/coc-config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/modules/programs/neovim/coc-config.nix b/tests/modules/programs/neovim/coc-config.nix
index cdb879a0f..9f9be0f55 100644
--- a/tests/modules/programs/neovim/coc-config.nix
+++ b/tests/modules/programs/neovim/coc-config.nix
@@ -1,4 +1,7 @@
-{
+{ lib, ... }:
+
+# Currently broken due to a change in Nixpkgs.
+lib.mkIf false {
   imports = [ ./stubs.nix ];
 
   programs.neovim = {

From 90a4374b174edb88a2e36889ee39ce45a186c7f6 Mon Sep 17 00:00:00 2001
From: Bruno Fragoso <darth_signa@hotmail.com>
Date: Thu, 6 Feb 2025 21:41:44 +0000
Subject: [PATCH 343/546] Translate using Weblate (Portuguese)

Currently translated at 100.0% (16 of 16 strings)

Translation: Home Manager/Home Manager Modules
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/pt/
---
 modules/po/pt.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/po/pt.po b/modules/po/pt.po
index 84ef27231..aea710aa5 100644
--- a/modules/po/pt.po
+++ b/modules/po/pt.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-10-19 04:00+0000\n"
-"Last-Translator: SrGesus <gabriel.fcf04@gmail.com>\n"
+"PO-Revision-Date: 2025-02-07 22:02+0000\n"
+"Last-Translator: Bruno Fragoso <darth_signa@hotmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/home-manager/"
 "modules/pt/>\n"
 "Language: pt\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.1\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "A limpar links órfãos do directório %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Criando nova geração de perfil"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Reutilizando última geração de perfil devido a não existirem alterações"
 
 #: modules/home-environment.nix:643
 msgid ""

From bf9a1a068919ccdfa7d130873936c5fd4c826e85 Mon Sep 17 00:00:00 2001
From: bittin1ddc447d824349b2 <bittin@reimu.nl>
Date: Sat, 8 Feb 2025 04:46:43 +0000
Subject: [PATCH 344/546] Translate using Weblate (Swedish)

Currently translated at 100.0% (16 of 16 strings)

Translation: Home Manager/Home Manager Modules
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/sv/
---
 modules/po/sv.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/po/sv.po b/modules/po/sv.po
index 13ae0058b..69c910b01 100644
--- a/modules/po/sv.po
+++ b/modules/po/sv.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-05-27 12:11+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2025-02-08 08:17+0000\n"
+"Last-Translator: bittin1ddc447d824349b2 <bittin@reimu.nl>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/home-manager/"
 "modules/sv/>\n"
 "Language: sv\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Rensar bort överflödiga länkar från %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Skapar ny profilgeneration"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Ingen förändring så återanvänder senaste profilgeneration"
 
 #: modules/home-environment.nix:643
 msgid ""

From 5af1b9a0f193ab6138b89a8e0af8763c21bbf491 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:16:15 +0100
Subject: [PATCH 345/546] treewide: standardize shell integration options

Standardize all 'programs.<PROGRAM>.enable<SHELL>Integration' options
with the following new functions:

- lib.hm.shell.mkBashIntegrationOption
- lib.hm.shell.mkFishIntegrationOption
- lib.hm.shell.mkIonIntegrationOption
- lib.hm.shell.mkNushellIntegrationOption
- lib.hm.shell.mkZshIntegrationOption

These functions should default to their corresponding global option:

- home.shell.enableBashIntegration
- home.shell.enableFishIntegration
- home.shell.enableIonIntegration
- home.shell.enableNushellIntegration
- home.shell.enableZshIntegration

All these global options default to the
'home.shell.enableShellIntegration' value.

This hierarchy standardizes the shell integration and increases end-user
flexibility.

BREAKING CHANGE: The following inconsistent default values change from
'false' to 'true':

- programs.zellij.enableBashIntegration
- programs.zellij.enableFishIntegration
- programs.zellij.enableZshIntegration

Link: https://github.com/nix-community/home-manager/pull/6358

Co-authored-by: Robert Helgesson <robert@rycee.net>
---
 modules/lib/shell.nix               | 24 ++++++++++++++-
 modules/misc/news.nix               | 16 ++++++++++
 modules/misc/shell.nix              | 43 ++++++++++++++++++++++++++
 modules/modules.nix                 |  1 +
 modules/programs/atuin.nix          | 45 +++++++++------------------
 modules/programs/autojump.nix       | 27 ++++------------
 modules/programs/broot.nix          | 36 +++++-----------------
 modules/programs/carapace.nix       | 20 +++++-------
 modules/programs/dircolors.nix      | 27 ++++------------
 modules/programs/direnv.nix         | 48 +++++++++++------------------
 modules/programs/eww.nix            | 15 ++++-----
 modules/programs/eza.nix            | 23 ++++++--------
 modules/programs/fzf.nix            | 27 ++++------------
 modules/programs/ghostty.nix        | 44 +++++++++++++-------------
 modules/programs/granted.nix        |  9 ++----
 modules/programs/hstr.nix           | 10 +++---
 modules/programs/keychain.nix       | 36 +++++-----------------
 modules/programs/kitty.nix          | 27 ++++++++--------
 modules/programs/mcfly.nix          | 27 ++++------------
 modules/programs/mise.nix           | 15 ++++-----
 modules/programs/navi.nix           | 15 ++++-----
 modules/programs/nix-index.nix      | 15 ++++-----
 modules/programs/nix-your-shell.nix | 15 ++++-----
 modules/programs/oh-my-posh.nix     | 36 +++++-----------------
 modules/programs/opam.nix           | 27 ++++------------
 modules/programs/pay-respects.nix   | 20 +++++-------
 modules/programs/pazi.nix           | 27 ++++------------
 modules/programs/pyenv.nix          | 27 ++++------------
 modules/programs/rbenv.nix          | 15 ++++-----
 modules/programs/scmpuff.nix        | 27 ++++------------
 modules/programs/skim.nix           | 27 ++++------------
 modules/programs/starship.nix       | 25 ++++++---------
 modules/programs/thefuck.nix        | 32 +++++--------------
 modules/programs/watson.nix         | 15 ++++-----
 modules/programs/wezterm.nix        | 10 +++---
 modules/programs/yazi.nix           | 20 +++++-------
 modules/programs/z-lua.nix          | 27 ++++------------
 modules/programs/zellij.nix         | 15 ++++-----
 modules/programs/zoxide.nix         | 36 +++++-----------------
 modules/services/gpg-agent.nix      | 20 +++++-------
 40 files changed, 362 insertions(+), 609 deletions(-)
 create mode 100644 modules/misc/shell.nix

diff --git a/modules/lib/shell.nix b/modules/lib/shell.nix
index 5e5743f51..ae30e0b0f 100644
--- a/modules/lib/shell.nix
+++ b/modules/lib/shell.nix
@@ -1,6 +1,22 @@
 { lib }:
 
-rec {
+let
+
+  mkShellIntegrationOption = name:
+    { config, baseName ? name, extraDescription ? "" }:
+    let attrName = "enable${baseName}Integration";
+    in lib.mkOption {
+      default = config.home.shell.${attrName};
+      defaultText = lib.literalMD "[](#opt-home.shell.${attrName})";
+      example = false;
+      description = "Whether to enable ${name} integration.${
+          lib.optionalString (extraDescription != "")
+          ("\n\n" + extraDescription)
+        }";
+      type = lib.types.bool;
+    };
+
+in rec {
   # Produces a Bourne shell like variable export statement.
   export = n: v: ''export ${n}="${toString v}"'';
 
@@ -8,4 +24,10 @@ rec {
   # assignment, this function produces a string containing an export
   # statement for each set entry.
   exportAll = vars: lib.concatStringsSep "\n" (lib.mapAttrsToList export vars);
+
+  mkBashIntegrationOption = mkShellIntegrationOption "Bash";
+  mkFishIntegrationOption = mkShellIntegrationOption "Fish";
+  mkIonIntegrationOption = mkShellIntegrationOption "Ion";
+  mkNushellIntegrationOption = mkShellIntegrationOption "Nushell";
+  mkZshIntegrationOption = mkShellIntegrationOption "Zsh";
 }
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 1eca33626..c34fbcba8 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2018,6 +2018,22 @@ in {
           systems.
         '';
       }
+
+      {
+        time = "2025-02-07T22:31:45+00:00";
+        message = ''
+          All 'programs.<PROGRAM>.enable<SHELL>Integration' values now default
+          to the new 'home.shell.enable<SHELL>Integration' options, which
+          inherit from the new the 'home.shell.enableShellIntegration' option.
+
+          The following inconsistent default values change from 'false' to
+          'true':
+
+          - programs.zellij.enableBashIntegration
+          - programs.zellij.enableFishIntegration
+          - programs.zellij.enableZshIntegration
+        '';
+      }
     ];
   };
 }
diff --git a/modules/misc/shell.nix b/modules/misc/shell.nix
new file mode 100644
index 000000000..7ef8bbfc7
--- /dev/null
+++ b/modules/misc/shell.nix
@@ -0,0 +1,43 @@
+{ config, lib, ... }:
+
+{
+  options.home.shell = {
+    enableShellIntegration = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = ''
+        Whether to globally enable shell integration for all supported shells.
+
+        Individual shell integrations can be overridden with their respective
+        `shell.enable<SHELL>Integration` option. For example, the following
+        declaration globally disables shell integration for Bash:
+
+        ```nix
+        home.shell.enableBashIntegration = false;
+        ```
+      '';
+    };
+
+    enableBashIntegration = lib.hm.shell.mkBashIntegrationOption {
+      inherit config;
+      baseName = "Shell";
+    };
+    enableFishIntegration = lib.hm.shell.mkFishIntegrationOption {
+      inherit config;
+      baseName = "Shell";
+    };
+    enableIonIntegration = lib.hm.shell.mkIonIntegrationOption {
+      inherit config;
+      baseName = "Shell";
+    };
+    enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption {
+      inherit config;
+      baseName = "Shell";
+    };
+    enableZshIntegration = lib.hm.shell.mkZshIntegrationOption {
+      inherit config;
+      baseName = "Shell";
+    };
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index 074e719d2..aa1d2e744 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -36,6 +36,7 @@ let
     ./misc/pam.nix
     ./misc/qt.nix
     ./misc/qt/kconfig.nix
+    ./misc/shell.nix
     ./misc/specialisation.nix
     ./misc/submodule-support.nix
     ./misc/tmpfiles.nix
diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 9160edd3f..50e088b12 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -23,33 +23,26 @@ in {
       description = "The package to use for atuin.";
     };
 
-    enableBashIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Atuin's Bash integration. This will bind
-        `ctrl-r` to open the Atuin history.
-      '';
+    enableBashIntegration = lib.hm.shell.mkBashIntegrationOption {
+      inherit config;
+      extraDescription =
+        "If enabled, this will bind `ctrl-r` to open the Atuin history.";
     };
 
-    enableZshIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Atuin's Zsh integration.
-
-        If enabled, this will bind `ctrl-r` and the up-arrow
-        key to open the Atuin history.
-      '';
+    enableFishIntegration = lib.hm.shell.mkFishIntegrationOption {
+      inherit config;
+      extraDescription =
+        "If enabled, this will bind the up-arrow key to open the Atuin history.";
     };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Atuin's Fish integration.
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-        If enabled, this will bind the up-arrow key to open the Atuin history.
+    enableZshIntegration = lib.hm.shell.mkZshIntegrationOption {
+      inherit config;
+      extraDescription = ''
+        If enabled, this will bind `ctrl-r` and the up-arrow key to open the
+        Atuin history.
       '';
     };
 
@@ -89,14 +82,6 @@ in {
       '';
     };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
-
     daemon = {
       enable = mkEnableOption "Atuin daemon";
 
diff --git a/modules/programs/autojump.nix b/modules/programs/autojump.nix
index e8bf6b437..3177001c8 100644
--- a/modules/programs/autojump.nix
+++ b/modules/programs/autojump.nix
@@ -13,29 +13,14 @@ in {
   options.programs.autojump = {
     enable = mkEnableOption "autojump";
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index 7daba09f5..c19534f1a 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -154,37 +154,17 @@ in {
   options.programs.broot = {
     enable = mkEnableOption "Broot, a better way to navigate directories";
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     package = mkOption {
       type = types.package;
diff --git a/modules/programs/carapace.nix b/modules/programs/carapace.nix
index c31e2feed..09cc55635 100644
--- a/modules/programs/carapace.nix
+++ b/modules/programs/carapace.nix
@@ -16,21 +16,17 @@ in {
 
     package = mkPackageOption pkgs "carapace" { };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix
index de4610893..91aaff41f 100644
--- a/modules/programs/dircolors.nix
+++ b/modules/programs/dircolors.nix
@@ -19,29 +19,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     settings = mkOption {
       type = with types; attrsOf str;
diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index b0b3baee4..a387a4bc7 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -48,44 +48,32 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration = lib.hm.shell.mkFishIntegrationOption {
+      inherit config;
+      extraDescription = ''
+        Note, enabling the direnv module will always active its functionality
+        for Fish since the direnv package automatically gets loaded in Fish.
+        If this is not the case try adding
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      readOnly = true;
-      description = ''
-        Whether to enable Fish integration. Note, enabling the direnv module
-        will always active its functionality for Fish since the direnv package
-        automatically gets loaded in Fish. If this is not the case try adding
         ```nix
-          environment.pathsToLink = [ "/share/fish" ];
+        environment.pathsToLink = [ "/share/fish" ];
         ```
+
         to the system configuration.
       '';
+    } // {
+      default = true;
+      readOnly = true;
     };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
+
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     nix-direnv = {
       enable = mkEnableOption ''
diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index 75a109226..71432590d 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -32,17 +32,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix
index f35912b8c..55a4a1001 100644
--- a/modules/programs/eza.nix
+++ b/modules/programs/eza.nix
@@ -21,23 +21,20 @@ with lib;
   options.programs.eza = {
     enable = mkEnableOption "eza, a modern replacement for {command}`ls`";
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableIonIntegration =
+      lib.hm.shell.mkIonIntegrationOption { inherit config; };
 
-    enableIonIntegration = mkEnableOption "Ion integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration";
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     extraOptions = mkOption {
       type = types.listOf types.str;
diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix
index 85ada14d6..6f45682ca 100644
--- a/modules/programs/fzf.nix
+++ b/modules/programs/fzf.nix
@@ -158,29 +158,14 @@ in {
       };
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 3c2f88f86..c0fe86208 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -10,7 +10,22 @@ let
 in {
   meta.maintainers = with lib.maintainers; [ HeitorAugustoLN khaneliman ];
 
-  options.programs.ghostty = {
+  options.programs.ghostty = let
+    mkShellIntegrationOption = option:
+      option // {
+        description = ''
+          ${option.description}
+
+          This ensures that shell integration works in more scenarios, such as
+          switching shells within Ghostty. But it is not needed to have shell
+          integration.
+
+          See
+          <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup>
+          for more information.
+        '';
+      };
+  in {
     enable = lib.mkEnableOption "Ghostty";
 
     package = lib.mkPackageOption pkgs "ghostty" {
@@ -91,29 +106,14 @@ in {
           lib.literalMD "`true` if programs.ghostty.package is not null";
       };
 
-    enableBashIntegration = lib.mkEnableOption ''
-      bash shell integration.
+    enableBashIntegration = mkShellIntegrationOption
+      (lib.hm.shell.mkBashIntegrationOption { inherit config; });
 
-      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
-      But it is not needed to have shell integration.
-      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
-    '';
+    enableFishIntegration = mkShellIntegrationOption
+      (lib.hm.shell.mkFishIntegrationOption { inherit config; });
 
-    enableFishIntegration = lib.mkEnableOption ''
-      fish shell integration.
-
-      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
-      But it is not needed to have shell integration.
-      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
-    '';
-
-    enableZshIntegration = lib.mkEnableOption ''
-      zsh shell integration.
-
-      This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty.
-      But it is not needed to have shell integration.
-      See <https://ghostty.org/docs/features/shell-integration#manual-shell-integration-setup> for more information
-    '';
+    enableZshIntegration = mkShellIntegrationOption
+      (lib.hm.shell.mkZshIntegrationOption { inherit config; });
   };
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix
index 93cdb97df..d3a7e5e00 100644
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@@ -13,13 +13,8 @@ in {
   options.programs.granted = {
     enable = mkEnableOption "granted";
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/hstr.nix b/modules/programs/hstr.nix
index e85832174..6dc2c0a33 100644
--- a/modules/programs/hstr.nix
+++ b/modules/programs/hstr.nix
@@ -16,13 +16,11 @@ in {
 
     package = mkPackageOption pkgs "hstr" { };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/keychain.nix b/modules/programs/keychain.nix
index 4aeef4132..c428f40cf 100644
--- a/modules/programs/keychain.nix
+++ b/modules/programs/keychain.nix
@@ -63,37 +63,17 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     enableXsessionIntegration = mkOption {
       default = true;
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 53f7c9fc1..ea528b24e 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -50,13 +50,14 @@ let
     '';
   };
 
-  shellIntegrationDefaultOpt = {
-    default =
-      !(lib.elem "disabled" (lib.splitString " " cfg.shellIntegration.mode));
-    defaultText = literalExpression ''
-      !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode))
-    '';
-  };
+  mkShellIntegrationOption = option:
+    option // {
+      default =
+        !(lib.elem "disabled" (lib.splitString " " cfg.shellIntegration.mode));
+      defaultText = literalExpression ''
+        !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode))
+      '';
+    };
 in {
   imports = [
     (lib.mkChangedOptionModule [ "programs" "kitty" "theme" ] [
@@ -184,14 +185,14 @@ in {
         '';
       };
 
-      enableBashIntegration = mkEnableOption "Kitty Bash integration"
-        // shellIntegrationDefaultOpt;
+      enableBashIntegration = mkShellIntegrationOption
+        (lib.hm.shell.mkBashIntegrationOption { inherit config; });
 
-      enableFishIntegration = mkEnableOption "Kitty fish integration"
-        // shellIntegrationDefaultOpt;
+      enableFishIntegration = mkShellIntegrationOption
+        (lib.hm.shell.mkFishIntegrationOption { inherit config; });
 
-      enableZshIntegration = mkEnableOption "Kitty Z Shell integration"
-        // shellIntegrationDefaultOpt;
+      enableZshIntegration = mkShellIntegrationOption
+        (lib.hm.shell.mkZshIntegrationOption { inherit config; });
     };
 
     extraConfig = mkOption {
diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly.nix
index d0dddba21..cf115129d 100644
--- a/modules/programs/mcfly.nix
+++ b/modules/programs/mcfly.nix
@@ -109,29 +109,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable (mkMerge [
diff --git a/modules/programs/mise.nix b/modules/programs/mise.nix
index 404f1bf9c..e0d1b1c8b 100644
--- a/modules/programs/mise.nix
+++ b/modules/programs/mise.nix
@@ -30,17 +30,14 @@ in {
 
       package = mkPackageOption pkgs "mise" { };
 
-      enableBashIntegration = mkEnableOption "Bash Integration" // {
-        default = true;
-      };
+      enableBashIntegration =
+        lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-      enableZshIntegration = mkEnableOption "Zsh Integration" // {
-        default = true;
-      };
+      enableFishIntegration =
+        lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-      enableFishIntegration = mkEnableOption "Fish Integration" // {
-        default = true;
-      };
+      enableZshIntegration =
+        lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
       globalConfig = mkOption {
         type = tomlFormat.type;
diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix
index aff50b5c7..23fb04864 100644
--- a/modules/programs/navi.nix
+++ b/modules/programs/navi.nix
@@ -47,17 +47,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix
index 746909d5a..f483cd2bc 100644
--- a/modules/programs/nix-index.nix
+++ b/modules/programs/nix-index.nix
@@ -14,17 +14,14 @@ in {
       description = "Package providing the {command}`nix-index` tool.";
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell.nix
index 20b5fd19e..adace4e15 100644
--- a/modules/programs/nix-your-shell.nix
+++ b/modules/programs/nix-your-shell.nix
@@ -16,17 +16,14 @@ in {
 
     package = mkPackageOption pkgs "nix-your-shell" { };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix
index 8c46a1c69..be406e662 100644
--- a/modules/programs/oh-my-posh.nix
+++ b/modules/programs/oh-my-posh.nix
@@ -47,37 +47,17 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/opam.nix b/modules/programs/opam.nix
index 34338514a..6027737cd 100644
--- a/modules/programs/opam.nix
+++ b/modules/programs/opam.nix
@@ -19,29 +19,14 @@ in {
       description = "Opam package to install.";
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects.nix
index ea47bee4c..8802ad25e 100644
--- a/modules/programs/pay-respects.nix
+++ b/modules/programs/pay-respects.nix
@@ -12,21 +12,17 @@ in {
 
     package = mkPackageOption pkgs "pay-respects" { };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/pazi.nix b/modules/programs/pazi.nix
index 9e603df23..848dfa309 100644
--- a/modules/programs/pazi.nix
+++ b/modules/programs/pazi.nix
@@ -12,29 +12,14 @@ in {
   options.programs.pazi = {
     enable = mkEnableOption "pazi";
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/pyenv.nix b/modules/programs/pyenv.nix
index c2273c676..1ff1f2832 100644
--- a/modules/programs/pyenv.nix
+++ b/modules/programs/pyenv.nix
@@ -19,29 +19,14 @@ in {
       description = "The package to use for pyenv.";
     };
 
-    enableBashIntegration = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = ''
-        Whether to enable pyenv's Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = ''
-        Whether to enable pyenv's Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = ''
-        Whether to enable pyenv's Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     rootDirectory = lib.mkOption {
       type = lib.types.path;
diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix
index e740c5602..11b48abf4 100644
--- a/modules/programs/rbenv.nix
+++ b/modules/programs/rbenv.nix
@@ -55,17 +55,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff.nix
index a85ae8d9c..f9ff922a9 100644
--- a/modules/programs/scmpuff.nix
+++ b/modules/programs/scmpuff.nix
@@ -16,29 +16,14 @@ in {
       description = "Package providing the {command}`scmpuff` tool.";
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     enableAliases = mkOption {
       default = true;
diff --git a/modules/programs/skim.nix b/modules/programs/skim.nix
index 2bb17d1b9..0f47a00bf 100644
--- a/modules/programs/skim.nix
+++ b/modules/programs/skim.nix
@@ -83,29 +83,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix
index 654c43fca..bb1c87b9c 100644
--- a/modules/programs/starship.nix
+++ b/modules/programs/starship.nix
@@ -53,25 +53,20 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableIonIntegration =
+      lib.hm.shell.mkIonIntegrationOption { inherit config; };
 
-    enableIonIntegration = mkEnableOption "Ion integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     enableInteractive = mkOption {
       type = types.bool;
diff --git a/modules/programs/thefuck.nix b/modules/programs/thefuck.nix
index ab56ea016..79b1f9462 100644
--- a/modules/programs/thefuck.nix
+++ b/modules/programs/thefuck.nix
@@ -13,33 +13,17 @@ with lib;
 
     enableInstantMode = mkEnableOption "thefuck's experimental instant mode";
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = let
diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix
index c842c519a..1f9864559 100644
--- a/modules/programs/watson.nix
+++ b/modules/programs/watson.nix
@@ -26,17 +26,14 @@ in {
       description = "Package providing the {command}`watson`.";
     };
 
-    enableBashIntegration = mkEnableOption "watson's bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "watson's zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "watson's fish integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     settings = mkOption {
       type = iniFormat.type;
diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix
index f5c4c3392..c1478d64a 100644
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -82,13 +82,11 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "WezTerm's Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "WezTerm's Zsh integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 27737f86a..946691f6b 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -54,21 +54,17 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkEnableOption "Nushell integration" // {
-      default = true;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     keymap = mkOption {
       type = tomlFormat.type;
diff --git a/modules/programs/z-lua.nix b/modules/programs/z-lua.nix
index 74dee31dc..4164aa394 100644
--- a/modules/programs/z-lua.nix
+++ b/modules/programs/z-lua.nix
@@ -29,29 +29,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
     enableAliases = mkOption {
       default = false;
diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix
index 0906a028d..77027b5df 100644
--- a/modules/programs/zellij.nix
+++ b/modules/programs/zellij.nix
@@ -41,17 +41,14 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = false;
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = false;
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = false;
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index f5e258af9..23a18a357 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -32,37 +32,17 @@ in {
       '';
     };
 
-    enableBashIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Bash integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-    enableZshIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Zsh integration.
-      '';
-    };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-    enableFishIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Fish integration.
-      '';
-    };
+    enableNushellIntegration =
+      lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-    enableNushellIntegration = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable Nushell integration.
-      '';
-    };
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 786a9f2e9..f32d85af3 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -260,21 +260,17 @@ in {
         '';
       };
 
-      enableBashIntegration = mkEnableOption "Bash integration" // {
-        default = true;
-      };
+      enableBashIntegration =
+        lib.hm.shell.mkBashIntegrationOption { inherit config; };
 
-      enableZshIntegration = mkEnableOption "Zsh integration" // {
-        default = true;
-      };
+      enableFishIntegration =
+        lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
-      enableFishIntegration = mkEnableOption "Fish integration" // {
-        default = true;
-      };
+      enableNushellIntegration =
+        lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 
-      enableNushellIntegration = mkEnableOption "Nushell integration" // {
-        default = true;
-      };
+      enableZshIntegration =
+        lib.hm.shell.mkZshIntegrationOption { inherit config; };
     };
   };
 

From b0bd29bb4b8df265b13bbb4a6639afa74faaa831 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Mon, 10 Feb 2025 15:34:12 +0100
Subject: [PATCH 346/546] tldr-update: init (#6401)

Adds `tldr-update` module for enabling automatic `tldr update` on a schedule.
Adds option to `tealdeer` to enable integration with new `tldr-update` module.
---
 modules/modules.nix                           |  1 +
 modules/programs/tealdeer.nix                 | 10 ++++
 modules/services/tldr-update.nix              | 50 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../modules/services/tldr-update/default.nix  |  1 +
 .../services/tldr-update/tldr-update.nix      | 21 ++++++++
 .../services/tldr-update/tldr-update.service  |  8 +++
 .../services/tldr-update/tldr-update.timer    |  9 ++++
 8 files changed, 101 insertions(+)
 create mode 100644 modules/services/tldr-update.nix
 create mode 100644 tests/modules/services/tldr-update/default.nix
 create mode 100644 tests/modules/services/tldr-update/tldr-update.nix
 create mode 100644 tests/modules/services/tldr-update/tldr-update.service
 create mode 100644 tests/modules/services/tldr-update/tldr-update.timer

diff --git a/modules/modules.nix b/modules/modules.nix
index aa1d2e744..cdfb90804 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -394,6 +394,7 @@ let
     ./services/taffybar.nix
     ./services/tahoe-lafs.nix
     ./services/taskwarrior-sync.nix
+    ./services/tldr-update.nix
     ./services/trayer.nix
     ./services/trayscale.nix
     ./services/twmn.nix
diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer.nix
index 6cf1160ec..6efc5aa3a 100644
--- a/modules/programs/tealdeer.nix
+++ b/modules/programs/tealdeer.nix
@@ -80,6 +80,11 @@ in {
         See <https://tealdeer-rs.github.io/tealdeer/config.html> for more information.
       '';
     };
+
+    enableAutoUpdates = mkEnableOption "Auto updates" // {
+      default = true;
+      example = false;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -89,5 +94,10 @@ in {
       mkIf (cfg.settings != null && cfg.settings != { }) {
         source = tomlFormat.generate "tealdeer-config" cfg.settings;
       };
+
+    services.tldr-update = mkIf cfg.enableAutoUpdates {
+      enable = true;
+      package = pkgs.tealdeer;
+    };
   };
 }
diff --git a/modules/services/tldr-update.nix b/modules/services/tldr-update.nix
new file mode 100644
index 000000000..47be1ab24
--- /dev/null
+++ b/modules/services/tldr-update.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+let cfg = config.services.tldr-update;
+in {
+  meta.maintainers = [ lib.maintainers.perchun ];
+
+  options.services.tldr-update = {
+    enable = lib.mkEnableOption ''
+      Automatic updates for the tldr CLI
+    '';
+
+    package = lib.mkPackageOption pkgs "tldr" { example = "tlrc"; };
+
+    period = lib.mkOption {
+      type = lib.types.str;
+      default = "weekly";
+      description = ''
+        Systemd timer period to create for scheduled {command}`tldr --update`.
+
+        The format is described in {manpage}`systemd.time(7)`.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.user.services.tldr-update = {
+      Unit = {
+        Description = "Update tldr CLI cache";
+        Documentation = "https://tldr.sh/";
+      };
+
+      Service = {
+        Type = "oneshot";
+        ExecStart = ''
+          ${lib.getExe cfg.package} --update
+        '';
+      };
+    };
+
+    systemd.user.timers.tldr-update = {
+      Unit.Description = "Update tldr CLI cache";
+
+      Timer = {
+        OnCalendar = cfg.period;
+        Persistent = true;
+      };
+
+      Install.WantedBy = [ "timers.target" ];
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 98531f856..792c99951 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -370,6 +370,7 @@ in import nmtSrc {
     ./modules/services/swayosd
     ./modules/services/sxhkd
     ./modules/services/syncthing/linux
+    ./modules/services/tldr-update
     ./modules/services/trayer
     ./modules/services/trayscale
     ./modules/services/twmn
diff --git a/tests/modules/services/tldr-update/default.nix b/tests/modules/services/tldr-update/default.nix
new file mode 100644
index 000000000..f67047037
--- /dev/null
+++ b/tests/modules/services/tldr-update/default.nix
@@ -0,0 +1 @@
+{ tldr-update = ./tldr-update.nix; }
diff --git a/tests/modules/services/tldr-update/tldr-update.nix b/tests/modules/services/tldr-update/tldr-update.nix
new file mode 100644
index 000000000..90daeed12
--- /dev/null
+++ b/tests/modules/services/tldr-update/tldr-update.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+
+{
+  config = {
+    home.stateVersion = "24.11";
+
+    services.tldr-update = {
+      enable = true;
+      package = config.lib.test.mkStubPackage { outPath = "@tldr@"; };
+      period = "monthly";
+    };
+
+    nmt.script = ''
+      serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/tldr-update.service)
+      assertFileContent "$serviceFile" ${./tldr-update.service}
+
+      timerFile=$(normalizeStorePaths home-files/.config/systemd/user/tldr-update.timer)
+      assertFileContent "$timerFile" ${./tldr-update.timer}
+    '';
+  };
+}
diff --git a/tests/modules/services/tldr-update/tldr-update.service b/tests/modules/services/tldr-update/tldr-update.service
new file mode 100644
index 000000000..69adaebac
--- /dev/null
+++ b/tests/modules/services/tldr-update/tldr-update.service
@@ -0,0 +1,8 @@
+[Service]
+ExecStart=@tldr@/bin/dummy --update
+
+Type=oneshot
+
+[Unit]
+Description=Update tldr CLI cache
+Documentation=https://tldr.sh/
diff --git a/tests/modules/services/tldr-update/tldr-update.timer b/tests/modules/services/tldr-update/tldr-update.timer
new file mode 100644
index 000000000..26b6326a0
--- /dev/null
+++ b/tests/modules/services/tldr-update/tldr-update.timer
@@ -0,0 +1,9 @@
+[Install]
+WantedBy=timers.target
+
+[Timer]
+OnCalendar=monthly
+Persistent=true
+
+[Unit]
+Description=Update tldr CLI cache

From cf2ea71e6877dddd9b94812fcb21a19f21f3d351 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 9 Feb 2025 03:59:34 +0000
Subject: [PATCH 347/546] 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/799ba5bffed04ced7067a91798353d360788b30d?narHash=sha256-ooLh%2BXW8jfa%2B91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U%3D' (2025-02-04)
  → 'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7e36e5375..6ca2bd080 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738680400,
-        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
+        "lastModified": 1739020877,
+        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
+        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
         "type": "github"
       },
       "original": {

From 0f9e92302a6bd86087e8b6f1a539d1d1f0ccbe62 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 10 Feb 2025 23:32:14 +0100
Subject: [PATCH 348/546] neovim: re-enable test

---
 tests/modules/programs/neovim/coc-config.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/modules/programs/neovim/coc-config.nix b/tests/modules/programs/neovim/coc-config.nix
index 9f9be0f55..cdb879a0f 100644
--- a/tests/modules/programs/neovim/coc-config.nix
+++ b/tests/modules/programs/neovim/coc-config.nix
@@ -1,7 +1,4 @@
-{ lib, ... }:
-
-# Currently broken due to a change in Nixpkgs.
-lib.mkIf false {
+{
   imports = [ ./stubs.nix ];
 
   programs.neovim = {

From a3c9e88177f0dc4a2662b5324572425f59129f11 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 10 Feb 2025 23:32:27 +0100
Subject: [PATCH 349/546] nushell: temporarily disable test

---
 tests/modules/programs/nushell/example-settings.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index cc9e8f8ec..f93dd8ed4 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -1,6 +1,7 @@
 { pkgs, realPkgs, config, lib, ... }:
 
-{
+# Temporarily broken due to Nixpkgs issue.
+lib.mkIf false {
   programs.nushell = {
     enable = true;
     package = realPkgs.nushell;

From fc3cd1e40870cb40692d1272468fa5e187d07591 Mon Sep 17 00:00:00 2001
From: MithicSpirit <rpc01234@gmail.com>
Date: Sat, 12 Oct 2024 21:11:00 -0400
Subject: [PATCH 350/546] kitty: allow not setting shell_integration

This allows better support for using kitty's built-in shell integration
method by setting `shellIntegration.mode' to `null', which makes it not
be set at all in the config file and disables modification to shell
initialization scripts by default. If this is used, the user should set
`settings.shell_integration' instead (if shell integration is desired),
which receives no special handling.
---
 modules/programs/kitty.nix                    | 19 ++++++++--------
 tests/modules/programs/kitty/default.nix      |  1 +
 .../kitty/null-shellIntegration-expected.conf |  8 +++++++
 .../programs/kitty/null-shellIntegration.nix  | 22 +++++++++++++++++++
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 tests/modules/programs/kitty/null-shellIntegration-expected.conf
 create mode 100644 tests/modules/programs/kitty/null-shellIntegration.nix

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index ea528b24e..82b9ca2cf 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -52,10 +52,11 @@ let
 
   mkShellIntegrationOption = option:
     option // {
-      default =
-        !(lib.elem "disabled" (lib.splitString " " cfg.shellIntegration.mode));
+      default = (cfg.shellIntegration.mode != null) && !(lib.elem "disabled"
+        (lib.splitString " " cfg.shellIntegration.mode));
       defaultText = literalExpression ''
-        !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode))
+        (cfg.shellIntegration.mode != null)
+        && !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode))
       '';
     };
 in {
@@ -167,19 +168,19 @@ in {
 
     shellIntegration = {
       mode = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         default = "no-rc";
         example = "no-cursor";
-        apply = o:
+        apply = lib.mapNullable (o:
           let
             modes = lib.splitString " " o;
             filtered = lib.filter (m: m != "no-rc") modes;
           in lib.concatStringsSep " "
-          (lib.concatLists [ [ "no-rc" ] filtered ]);
+          (lib.concatLists [ [ "no-rc" ] filtered ]));
         description = ''
           Set the mode of the shell integration. This accepts the same options
           as the `shell_integration` option of Kitty. Note that
-          `no-rc` is always implied. See
+          `no-rc` is always implied, unless this set to `null`. See
           <https://sw.kovidgoyal.net/kitty/shell-integration>
           for more details.
         '';
@@ -219,10 +220,10 @@ in {
         (optionalString (cfg.themeFile != null) ''
           include ${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf
         '')
-        ''
+        (optionalString (cfg.shellIntegration.mode != null) ''
           # Shell integration is sourced and configured manually
           shell_integration ${cfg.shellIntegration.mode}
-        ''
+        '')
         (toKittyConfig cfg.settings)
         (toKittyKeybindings cfg.keybindings)
         (toKittyEnv cfg.environment)
diff --git a/tests/modules/programs/kitty/default.nix b/tests/modules/programs/kitty/default.nix
index 76016d516..054353e43 100644
--- a/tests/modules/programs/kitty/default.nix
+++ b/tests/modules/programs/kitty/default.nix
@@ -1,4 +1,5 @@
 {
   kitty-example-settings = ./example-settings.nix;
   kitty-theme-to-themeFile = ./theme-to-themeFile.nix;
+  kitty-null-shellIntegration = ./null-shellIntegration.nix;
 }
diff --git a/tests/modules/programs/kitty/null-shellIntegration-expected.conf b/tests/modules/programs/kitty/null-shellIntegration-expected.conf
new file mode 100644
index 000000000..df3ae5984
--- /dev/null
+++ b/tests/modules/programs/kitty/null-shellIntegration-expected.conf
@@ -0,0 +1,8 @@
+# Generated by Home Manager.
+# See https://sw.kovidgoyal.net/kitty/conf.html
+
+
+
+
+
+
diff --git a/tests/modules/programs/kitty/null-shellIntegration.nix b/tests/modules/programs/kitty/null-shellIntegration.nix
new file mode 100644
index 000000000..293249d69
--- /dev/null
+++ b/tests/modules/programs/kitty/null-shellIntegration.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.kitty = {
+      enable = true;
+
+      shellIntegration.mode = null;
+    };
+
+    test.stubs.kitty = { };
+
+    nmt.script = ''
+      assertFileExists home-files/.config/kitty/kitty.conf
+      assertFileContent \
+        home-files/.config/kitty/kitty.conf \
+        ${./null-shellIntegration-expected.conf}
+    '';
+  };
+}

From c0d06189f27f9cd0f97c13a0e75c4fd12c7e9d61 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 4 Feb 2025 16:19:49 -0600
Subject: [PATCH 351/546] kitty: assert can't enable shell integrations when
 mode is null

We use the mode within the script for each integration. Make sure the
user understands what they are doing.
---
 modules/programs/kitty.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 82b9ca2cf..04dada1fa 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -204,6 +204,15 @@ in {
   };
 
   config = mkIf cfg.enable {
+    assertions = [{
+      assertion = !(cfg.shellIntegration.mode == null
+        && (cfg.shellIntegration.enableBashIntegration
+          || cfg.shellIntegration.enableFishIntegration
+          || cfg.shellIntegration.enableZshIntegration));
+      message =
+        "Cannot enable shell integration when `programs.kitty.shellIntegration.mode` is `null`";
+    }];
+
     home.packages = [ cfg.package ] ++ optionalPackage cfg.font;
 
     xdg.configFile."kitty/kitty.conf" = {

From b34b56689dcc75294e14e8c95db4e054a4e9573f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 2 Feb 2025 09:21:00 -0600
Subject: [PATCH 352/546] yazi: remove with lib

---
 modules/programs/yazi.nix | 45 +++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 946691f6b..c4fbdf39f 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -1,8 +1,10 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib)
+    literalExpression mapAttrsToList mkEnableOption mkIf mkOption optionalString
+    types;
+
   cfg = config.programs.yazi;
   tomlFormat = pkgs.formats.toml { };
 
@@ -43,9 +45,9 @@ in {
   options.programs.yazi = {
     enable = mkEnableOption "yazi";
 
-    package = mkPackageOption pkgs "yazi" { };
+    package = lib.mkPackageOption pkgs "yazi" { };
 
-    shellWrapperName = mkOption {
+    shellWrapperName = lib.mkOption {
       type = types.str;
       default = "yy";
       example = "y";
@@ -218,27 +220,27 @@ in {
         } else {
           text = cfg.initLua;
         });
-    } // (mapAttrs' (name: value:
-      nameValuePair "yazi/flavors/${name}.yazi" { source = value; })
-      cfg.flavors) // (mapAttrs' (name: value:
-        nameValuePair "yazi/plugins/${name}.yazi" { source = value; })
+    } // (lib.mapAttrs' (name: value:
+      lib.nameValuePair "yazi/flavors/${name}.yazi" { source = value; })
+      cfg.flavors) // (lib.mapAttrs' (name: value:
+        lib.nameValuePair "yazi/plugins/${name}.yazi" { source = value; })
         cfg.plugins);
 
-    warnings = filter (s: s != "") (concatLists [
-      (mapAttrsToList (name: value:
-        optionalString (hasSuffix ".yazi" name) ''
+    warnings = lib.filter (s: s != "") (lib.concatLists [
+      (mapAttrsToList (name: _value:
+        optionalString (lib.hasSuffix ".yazi" name) ''
           Flavors like `programs.yazi.flavors."${name}"` should no longer have the suffix ".yazi" in their attribute name.
           The flavor will be linked to `$XDG_CONFIG_HOME/yazi/flavors/${name}.yazi`.
           You probably want to rename it to `programs.yazi.flavors."${
-            removeSuffix ".yazi" name
+            lib.removeSuffix ".yazi" name
           }"`.
         '') cfg.flavors)
-      (mapAttrsToList (name: value:
-        optionalString (hasSuffix ".yazi" name) ''
+      (mapAttrsToList (name: _value:
+        optionalString (lib.hasSuffix ".yazi" name) ''
           Plugins like `programs.yazi.plugins."${name}"` should no longer have the suffix ".yazi" in their attribute name.
           The plugin will be linked to `$XDG_CONFIG_HOME/yazi/plugins/${name}.yazi`.
           You probably want to rename it to `programs.yazi.plugins."${
-            removeSuffix ".yazi" name
+            lib.removeSuffix ".yazi" name
           }"`.
         '') cfg.plugins)
     ]);
@@ -247,20 +249,21 @@ in {
       mkAsserts = opt: requiredFiles:
         mapAttrsToList (name: value:
           let
-            isDir = pathIsDirectory "${value}";
+            isDir = lib.pathIsDirectory "${value}";
             msgNotDir = optionalString (!isDir)
               "The path or package should be a directory, not a single file.";
             isFileMissing = file:
-              !(pathExists "${value}/${file}")
-              || pathIsDirectory "${value}/${file}";
-            missingFiles = filter isFileMissing requiredFiles;
+              !(lib.pathExists "${value}/${file}")
+              || lib.pathIsDirectory "${value}/${file}";
+            missingFiles = lib.filter isFileMissing requiredFiles;
             msgFilesMissing = optionalString (missingFiles != [ ])
               "The ${singularOpt} is missing these files: ${
                 toString missingFiles
               }";
-            singularOpt = removeSuffix "s" opt;
+            singularOpt = lib.removeSuffix "s" opt;
             isPluginValid = opt == "plugins"
-              && (any (file: pathExists "${value}/${file}") requiredFiles);
+              && (lib.any (file: lib.pathExists "${value}/${file}")
+                requiredFiles);
             isValid =
               if opt == "plugins" then isPluginValid else missingFiles == [ ];
           in {

From 5795f792abf38e4f2701b4f7454deeb8e2575ae4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 2 Feb 2025 09:23:57 -0600
Subject: [PATCH 353/546] yazi: organization tweak

Moving variable declaration closer to usage so it's easier to manage /
see.
---
 modules/programs/yazi.nix | 79 ++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index c4fbdf39f..67fa6d291 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-
 let
   inherit (lib)
     literalExpression mapAttrsToList mkEnableOption mkIf mkOption optionalString
@@ -7,38 +6,6 @@ let
 
   cfg = config.programs.yazi;
   tomlFormat = pkgs.formats.toml { };
-
-  bashIntegration = ''
-    function ${cfg.shellWrapperName}() {
-      local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
-      yazi "$@" --cwd-file="$tmp"
-      if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
-        builtin cd -- "$cwd"
-      fi
-      rm -f -- "$tmp"
-    }
-  '';
-
-  fishIntegration = ''
-    set -l tmp (mktemp -t "yazi-cwd.XXXXX")
-    command yazi $argv --cwd-file="$tmp"
-    if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-      builtin cd -- "$cwd"
-    end
-    rm -f -- "$tmp"
-  '';
-
-  nushellIntegration = ''
-    def --env ${cfg.shellWrapperName} [...args] {
-      let tmp = (mktemp -t "yazi-cwd.XXXXX")
-      yazi ...$args --cwd-file $tmp
-      let cwd = (open $tmp)
-      if $cwd != "" and $cwd != $env.PWD {
-        cd $cwd
-      }
-      rm -fp $tmp
-    }
-  '';
 in {
   meta.maintainers = with lib.maintainers; [ eljamm khaneliman xyenon ];
 
@@ -194,15 +161,49 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration;
+    programs = let
+      bashIntegration = ''
+        function ${cfg.shellWrapperName}() {
+          local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
+          yazi "$@" --cwd-file="$tmp"
+          if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
+            builtin cd -- "$cwd"
+          fi
+          rm -f -- "$tmp"
+        }
+      '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration;
+      fishIntegration = ''
+        set -l tmp (mktemp -t "yazi-cwd.XXXXX")
+        command yazi $argv --cwd-file="$tmp"
+        if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+          builtin cd -- "$cwd"
+        end
+        rm -f -- "$tmp"
+      '';
 
-    programs.fish.functions.${cfg.shellWrapperName} =
-      mkIf cfg.enableFishIntegration fishIntegration;
+      nushellIntegration = ''
+        def --env ${cfg.shellWrapperName} [...args] {
+          let tmp = (mktemp -t "yazi-cwd.XXXXX")
+          yazi ...$args --cwd-file $tmp
+          let cwd = (open $tmp)
+          if $cwd != "" and $cwd != $env.PWD {
+            cd $cwd
+          }
+          rm -fp $tmp
+        }
+      '';
+    in {
+      bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration;
 
-    programs.nushell.extraConfig =
-      mkIf cfg.enableNushellIntegration nushellIntegration;
+      zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration;
+
+      fish.functions.${cfg.shellWrapperName} =
+        mkIf cfg.enableFishIntegration fishIntegration;
+
+      nushell.extraConfig =
+        mkIf cfg.enableNushellIntegration nushellIntegration;
+    };
 
     xdg.configFile = {
       "yazi/keymap.toml" = mkIf (cfg.keymap != { }) {

From e5854b98cd759b91c83ba5caa5ff32f274f1dc78 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 11 Feb 2025 00:07:00 +0000
Subject: [PATCH 354/546] flake-module: change type from lazyAttrsOf raw to
 lazyAttrsOf deferredModule (#6408)

---
 flake-module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake-module.nix b/flake-module.nix
index c1b07ad0c..980fb31eb 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -4,7 +4,7 @@ in {
   options = {
     flake = flake-parts-lib.mkSubmoduleOptions {
       homeConfigurations = mkOption {
-        type = types.lazyAttrsOf types.raw;
+        type = types.lazyAttrsOf types.deferredModule;
         default = { };
         description = ''
           Instantiated Home Manager configurations.

From ba4a1a110204c27805d1a1b5c8b24b3a0da4d063 Mon Sep 17 00:00:00 2001
From: PopeRigby <poperigby@mailbox.org>
Date: Mon, 10 Feb 2025 16:23:20 -0800
Subject: [PATCH 355/546] ludusavi: create Ludusavi module (#5626)

---
 modules/lib/maintainers.nix   |  5 ++
 modules/services/ludusavi.nix | 93 +++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 modules/services/ludusavi.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index ede933ff6..7708248c7 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -597,6 +597,11 @@
     github = "pedorich-n";
     githubId = 15573098;
   };
+  PopeRigby = {
+    name = "PopeRigby";
+    github = "poperigby";
+    githubId = 20866468;
+  };
   liyangau = {
     name = "Li Yang";
     email = "d@aufomm.com";
diff --git a/modules/services/ludusavi.nix b/modules/services/ludusavi.nix
new file mode 100644
index 000000000..7acadc1a0
--- /dev/null
+++ b/modules/services/ludusavi.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) getExe maintainers mkEnableOption mkIf mkOption;
+
+  inherit (lib.types) bool nullOr path;
+
+  cfg = config.services.ludusavi;
+  settingsFormat = pkgs.formats.yaml { };
+
+  configFile = if cfg.configFile == null then
+    settingsFormat.generate "config.yaml" cfg.settings
+  else
+    cfg.configFile;
+in {
+
+  options.services.ludusavi = {
+    enable = mkEnableOption "Ludusavi game backup tool";
+    configFile = mkOption {
+      type = nullOr path;
+      default = null;
+      description = ''
+        Path to a Ludusavi `config.yaml`. Mutually exclusive with the `settings` option.
+        See https://github.com/mtkennerly/ludusavi/blob/master/docs/help/configuration-file.md for available options.
+      '';
+    };
+    settings = mkOption {
+      type = settingsFormat.type;
+      default = {
+        manifest.url =
+          "https://raw.githubusercontent.com/mtkennerly/ludusavi-manifest/master/data/manifest.yaml";
+        roots = [ ];
+        backup.path = "$XDG_STATE_HOME/backups/ludusavi";
+        restore.path = "$XDG_STATE_HOME/backups/ludusavi";
+      };
+      example = {
+        language = "en-US";
+        theme = "light";
+        roots = [{
+          path = "~/.local/share/Steam";
+          store = "steam";
+        }];
+        backup.path = "~/.local/state/backups/ludusavi";
+        restore.path = "~/.local/state/backups/ludusavi";
+      };
+      description = ''
+        Ludusavi configuration as an attribute set. See
+        https://github.com/mtkennerly/ludusavi#configuration-file
+        for available options.
+      '';
+    };
+    backupNotification = mkOption {
+      type = bool;
+      default = false;
+      description = ''
+        Send a notification message after a successful backup.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [{
+      assertion = (cfg.settings != { }) != (cfg.configFile != null);
+      message =
+        "The `settings` and `configFile` options are mutually exclusive.";
+    }];
+
+    systemd.user = {
+      services.ludusavi = {
+        Unit.Description = "Run a game save backup with Ludusavi";
+        Service = {
+          Type = "oneshot";
+          ExecStart = "${getExe pkgs.ludusavi} backup --force";
+        } // lib.optionalAttrs cfg.backupNotification {
+          ExecStartPost = "${
+              getExe pkgs.libnotify
+            } 'Ludusavi' 'Backup completed' -i ludusavi -a 'Ludusavi'";
+        };
+      };
+      timers.ludusavi = {
+        Unit.Description = "Run a game save backup with Ludusavi, daily";
+        Timer.OnCalendar = "daily";
+        Install.WantedBy = [ "timers.target" ];
+      };
+    };
+
+    xdg.configFile."ludusavi/config.yaml".source = configFile;
+
+    home.packages = [ pkgs.ludusavi ];
+  };
+
+  meta.maintainers = [ maintainers.PopeRigby ];
+}

From 59fe145f0bb7cfde99f148140a47a54deb8cc23f Mon Sep 17 00:00:00 2001
From: Yuki Kobayashi <137767097+aster-void@users.noreply.github.com>
Date: Tue, 11 Feb 2025 23:27:04 +0900
Subject: [PATCH 356/546] eww: make configDir optional (#6282)

Some people like to manage config directories themselves, and it should not be a requirement but rather an optional feature.
---
 modules/programs/eww.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index 71432590d..d2860be88 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -24,7 +24,8 @@ in {
     };
 
     configDir = mkOption {
-      type = types.path;
+      type = types.nullOr types.path;
+      default = null;
       example = literalExpression "./eww-config-dir";
       description = ''
         The directory that gets symlinked to
@@ -44,7 +45,8 @@ in {
 
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
-    xdg.configFile."eww".source = cfg.configDir;
+    xdg.configFile."eww".source =
+      mkIf (!types.isNull cfg.configDir) cfg.configDir;
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
       if [[ $TERM != "dumb" ]]; then

From 9c8169b4466391999b1ad5ea86be4e79d560af52 Mon Sep 17 00:00:00 2001
From: Mateus Auler <mateus@auler.dev>
Date: Sat, 14 Dec 2024 16:13:07 -0300
Subject: [PATCH 357/546] git-worktree-switcher: init module

---
 modules/misc/news.nix                         | 12 ++++-
 modules/modules.nix                           |  1 +
 modules/programs/git-worktree-switcher.nix    | 52 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../programs/git-worktree-switcher/bash.nix   | 17 ++++++
 .../git-worktree-switcher/default.nix         |  5 ++
 .../programs/git-worktree-switcher/fish.nix   | 17 ++++++
 .../programs/git-worktree-switcher/zsh.nix    | 17 ++++++
 8 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 modules/programs/git-worktree-switcher.nix
 create mode 100644 tests/modules/programs/git-worktree-switcher/bash.nix
 create mode 100644 tests/modules/programs/git-worktree-switcher/default.nix
 create mode 100644 tests/modules/programs/git-worktree-switcher/fish.nix
 create mode 100644 tests/modules/programs/git-worktree-switcher/zsh.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index c34fbcba8..dc605ae4c 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2034,7 +2034,17 @@ in {
           - programs.zellij.enableZshIntegration
         '';
       }
+
+      {
+        time = "2025-02-11T15:25:26+00:00";
+        message = ''
+          A new module is available: 'programs.git-worktree-switcher'.
+
+          git-worktree-switcher allows you to quickly switch git worktrees.
+          It includes shell completions for Bash, Fish and Zsh.
+          See https://github.com/mateusauler/git-worktree-switcher for more.
+        '';
+      }
     ];
   };
 }
-
diff --git a/modules/modules.nix b/modules/modules.nix
index cdfb90804..5fd4394aa 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -110,6 +110,7 @@ let
     ./programs/ghostty.nix
     ./programs/git-cliff.nix
     ./programs/git-credential-oauth.nix
+    ./programs/git-worktree-switcher.nix
     ./programs/git.nix
     ./programs/gitui.nix
     ./programs/gnome-shell.nix
diff --git a/modules/programs/git-worktree-switcher.nix b/modules/programs/git-worktree-switcher.nix
new file mode 100644
index 000000000..e7dcbf2c3
--- /dev/null
+++ b/modules/programs/git-worktree-switcher.nix
@@ -0,0 +1,52 @@
+{ pkgs, config, lib, ... }:
+
+let
+  inherit (lib) mkEnableOption mkOption mkPackageOption optionalString;
+
+  cfg = config.programs.git-worktree-switcher;
+
+  initScript = shell:
+    if (shell == "fish") then ''
+      ${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source
+    '' else ''
+      eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})"
+    '';
+in {
+  meta.maintainers = with lib.maintainers; [ jiriks74 mateusauler ];
+
+  options.programs.git-worktree-switcher = {
+    enable = mkEnableOption "git-worktree-switcher";
+    package = mkPackageOption pkgs "git-worktree-switcher" { };
+    enableBashIntegration = mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Whether to enable git-worktree-switcher's Bash integration.
+      '';
+    };
+    enableFishIntegration = mkOption {
+      type = lib.types.bool;
+      default = config.programs.fish.enable;
+      description = ''
+        Whether to enable git-worktree-switcher's Fish integration.
+      '';
+    };
+    enableZshIntegration = mkOption {
+      type = lib.types.bool;
+      default = config.programs.zsh.enable;
+      description = ''
+        Whether to enable git-worktree-switcher's Zsh integration.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+    programs.bash.initExtra =
+      optionalString cfg.enableBashIntegration (initScript "bash");
+    programs.fish.interactiveShellInit =
+      optionalString cfg.enableFishIntegration (initScript "fish");
+    programs.zsh.initExtra =
+      optionalString cfg.enableZshIntegration (initScript "zsh");
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 792c99951..5c487bd8d 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -157,6 +157,7 @@ in import nmtSrc {
     ./modules/programs/git
     ./modules/programs/git-cliff
     ./modules/programs/git-credential-oauth
+    ./modules/programs/git-worktree-switcher
     ./modules/programs/go
     ./modules/programs/gpg
     ./modules/programs/gradle
diff --git a/tests/modules/programs/git-worktree-switcher/bash.nix b/tests/modules/programs/git-worktree-switcher/bash.nix
new file mode 100644
index 000000000..0e0fb55e2
--- /dev/null
+++ b/tests/modules/programs/git-worktree-switcher/bash.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs = {
+    bash.enable = true;
+    git-worktree-switcher.enable = true;
+  };
+
+  test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; };
+
+  nmt.script = ''
+    assertFileExists home-files/.bashrc
+    assertFileContains \
+      home-files/.bashrc \
+      'eval "$(@git-worktree-switcher@/bin/git-worktree-switcher init bash)"'
+  '';
+}
diff --git a/tests/modules/programs/git-worktree-switcher/default.nix b/tests/modules/programs/git-worktree-switcher/default.nix
new file mode 100644
index 000000000..d5a34f1c0
--- /dev/null
+++ b/tests/modules/programs/git-worktree-switcher/default.nix
@@ -0,0 +1,5 @@
+{
+  git-worktree-switcher-bash = ./bash.nix;
+  git-worktree-switcher-fish = ./fish.nix;
+  git-worktree-switcher-zsh = ./zsh.nix;
+}
diff --git a/tests/modules/programs/git-worktree-switcher/fish.nix b/tests/modules/programs/git-worktree-switcher/fish.nix
new file mode 100644
index 000000000..b6b29c2ae
--- /dev/null
+++ b/tests/modules/programs/git-worktree-switcher/fish.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs = {
+    fish.enable = true;
+    git-worktree-switcher.enable = true;
+  };
+
+  test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/config.fish
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      '@git-worktree-switcher@/bin/git-worktree-switcher init fish | source'
+  '';
+}
diff --git a/tests/modules/programs/git-worktree-switcher/zsh.nix b/tests/modules/programs/git-worktree-switcher/zsh.nix
new file mode 100644
index 000000000..5e0672763
--- /dev/null
+++ b/tests/modules/programs/git-worktree-switcher/zsh.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs = {
+    zsh.enable = true;
+    git-worktree-switcher.enable = true;
+  };
+
+  test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshrc
+    assertFileContains \
+      home-files/.zshrc \
+      'eval "$(@git-worktree-switcher@/bin/git-worktree-switcher init zsh)"'
+  '';
+}

From 8f351726c5841d86854e7fa6003ea472352f5208 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 11 Feb 2025 08:33:28 -0600
Subject: [PATCH 358/546] git-worktree-switcher: use
 lib.hm.shell.mkShellIntegrationOption

---
 modules/programs/git-worktree-switcher.nix | 31 +++++++---------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/modules/programs/git-worktree-switcher.nix b/modules/programs/git-worktree-switcher.nix
index e7dcbf2c3..cb38f2e62 100644
--- a/modules/programs/git-worktree-switcher.nix
+++ b/modules/programs/git-worktree-switcher.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 
 let
-  inherit (lib) mkEnableOption mkOption mkPackageOption optionalString;
+  inherit (lib) mkEnableOption mkPackageOption optionalString;
 
   cfg = config.programs.git-worktree-switcher;
 
@@ -17,27 +17,14 @@ in {
   options.programs.git-worktree-switcher = {
     enable = mkEnableOption "git-worktree-switcher";
     package = mkPackageOption pkgs "git-worktree-switcher" { };
-    enableBashIntegration = mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = ''
-        Whether to enable git-worktree-switcher's Bash integration.
-      '';
-    };
-    enableFishIntegration = mkOption {
-      type = lib.types.bool;
-      default = config.programs.fish.enable;
-      description = ''
-        Whether to enable git-worktree-switcher's Fish integration.
-      '';
-    };
-    enableZshIntegration = mkOption {
-      type = lib.types.bool;
-      default = config.programs.zsh.enable;
-      description = ''
-        Whether to enable git-worktree-switcher's Zsh integration.
-      '';
-    };
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
+
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
+
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
   config = lib.mkIf cfg.enable {

From f0a31d38e6de48970ce1fe93e6ea343e20a9c80a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Tue, 11 Feb 2025 19:33:45 +0100
Subject: [PATCH 359/546] neomutt: fix default for 'map' in macros/binds
 (#6429)

https://github.com/nix-community/home-manager/pull/1885  changed 'map'
from a string to a list of string but the default wasn't updated accordingly.
When not defining map, you would get the warning `evaluation warning: teto profile: Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See `.
---
 modules/programs/neomutt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index b513939df..13ee897f1 100644
--- a/modules/programs/neomutt.nix
+++ b/modules/programs/neomutt.nix
@@ -123,7 +123,7 @@ let
             "smime"
           ];
         in with types; either (enum menus) (listOf (enum menus));
-        default = "index";
+        default = [ "index" ];
         description = "Select the menu to bind the command to.";
       };
 

From 83bd3a26ac0526ae04fa74df46738bb44b89dcdd Mon Sep 17 00:00:00 2001
From: David Arnold <dgx.arnold@gmail.com>
Date: Tue, 11 Feb 2025 23:55:52 +0100
Subject: [PATCH 360/546] email: add migadu.com flavor

Migadu is a very friendly and no-fuzz email service that presumably
will be highly valued by HM users.
---
 modules/accounts/email.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix
index f3996195d..e8cc708ed 100644
--- a/modules/accounts/email.nix
+++ b/modules/accounts/email.nix
@@ -247,6 +247,7 @@ let
           "fastmail.com"
           "yandex.com"
           "outlook.office365.com"
+          "migadu.com"
         ];
         default = "plain";
         description = ''
@@ -450,6 +451,20 @@ let
         };
       })
 
+      (mkIf (config.flavor == "migadu.com") {
+        userName = mkDefault config.address;
+
+        imap = {
+          host = "imap.migadu.com";
+          port = 993;
+        };
+
+        smtp = {
+          host = "smtp.migadu.com";
+          port = 465;
+        };
+      })
+
       (mkIf (config.flavor == "gmail.com") {
         userName = mkDefault config.address;
 

From f8729b11ee49a40fc21b6ec6578a16e9a5261414 Mon Sep 17 00:00:00 2001
From: Christoffer Hald Christensen
 <87864377+KneeCapStealer@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:31:39 +0100
Subject: [PATCH 361/546] eww: fix confDir config using missing attribute
 "types.isNull"

---
 modules/programs/eww.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index d2860be88..fba294aaf 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -45,8 +45,7 @@ in {
 
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
-    xdg.configFile."eww".source =
-      mkIf (!types.isNull cfg.configDir) cfg.configDir;
+    xdg.configFile."eww".source = mkIf (cfg.configDir != null) cfg.configDir;
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
       if [[ $TERM != "dumb" ]]; then

From 1f6fa878080fd1b59b21b43695fd523ea4cae8d6 Mon Sep 17 00:00:00 2001
From: Christoffer Hald Christensen <chrishald@proton.me>
Date: Wed, 12 Feb 2025 13:52:35 +0100
Subject: [PATCH 362/546] eww: added tests

---
 tests/default.nix                             |  1 +
 tests/modules/programs/eww/basic-config.nix   | 15 +++++
 .../modules/programs/eww/config-dir/eww.scss  |  4 ++
 .../modules/programs/eww/config-dir/eww.yuck  | 58 +++++++++++++++++++
 tests/modules/programs/eww/default.nix        |  1 +
 5 files changed, 79 insertions(+)
 create mode 100644 tests/modules/programs/eww/basic-config.nix
 create mode 100644 tests/modules/programs/eww/config-dir/eww.scss
 create mode 100644 tests/modules/programs/eww/config-dir/eww.yuck
 create mode 100644 tests/modules/programs/eww/default.nix

diff --git a/tests/default.nix b/tests/default.nix
index 5c487bd8d..96625abec 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -282,6 +282,7 @@ in import nmtSrc {
     ./modules/programs/bemenu
     ./modules/programs/boxxy
     ./modules/programs/cavalier
+    ./modules/programs/eww
     ./modules/programs/firefox/firefox.nix
     ./modules/programs/firefox/floorp.nix
     ./modules/programs/foot
diff --git a/tests/modules/programs/eww/basic-config.nix b/tests/modules/programs/eww/basic-config.nix
new file mode 100644
index 000000000..cc207e100
--- /dev/null
+++ b/tests/modules/programs/eww/basic-config.nix
@@ -0,0 +1,15 @@
+{ ... }: {
+  config = {
+    programs.eww = {
+      enable = true;
+      configDir = ./config-dir;
+    };
+
+    nmt.script = ''
+      yuckDir=home-files/.config/eww
+
+      assertFileExists $yuckDir/eww.yuck
+      assertFileExists $yuckDir/eww.scss
+    '';
+  };
+}
diff --git a/tests/modules/programs/eww/config-dir/eww.scss b/tests/modules/programs/eww/config-dir/eww.scss
new file mode 100644
index 000000000..880b93238
--- /dev/null
+++ b/tests/modules/programs/eww/config-dir/eww.scss
@@ -0,0 +1,4 @@
+.powermenu {
+  padding: 10px 10px;
+  border-radius: 10px;
+}
diff --git a/tests/modules/programs/eww/config-dir/eww.yuck b/tests/modules/programs/eww/config-dir/eww.yuck
new file mode 100644
index 000000000..f7fd7d5c0
--- /dev/null
+++ b/tests/modules/programs/eww/config-dir/eww.yuck
@@ -0,0 +1,58 @@
+(defwindow powermenu
+    :monitor 0
+    :geometry (geometry
+        :anchor "center"
+    )
+    ; Widgets
+    (box
+        :spacing 5
+        :class "powermenu"
+        :space-evenly true
+        :orientation "vertical"
+        :halign "left"
+        :valign "center"
+
+        ; Contents
+        (button
+            :onclick "eww open confirm-command --arg action=poweroff --arg command=poweroff"
+            "Poweroff"
+        )
+        (button
+            :onclick "eww open confirm-command --arg action=reboot --arg command=reboot"
+            "Reboot"
+        )
+        (button
+            :onclick "eww close powermenu"
+            "Cancel"
+        )
+    )
+)
+
+(defwindow confirm-command [action command]
+    :monitor 0
+    :geometry (geometry
+        :anchor "center"
+        :width "13%"
+        :height "8%"
+    )
+    ; Widgets
+    (box
+        :class "powermenu"
+        :orientation "vertical"
+        :halign "center"
+        :valign "center"
+        "Are you sure you want to ${action}"
+        (box
+            :orientation "horizontal"
+            :spacing 10
+            (button
+                :onclick "eww close confirm-command"
+                "No"
+            )
+            (button
+                :onclick command
+                "Yes"
+            )
+        )
+    )
+)
diff --git a/tests/modules/programs/eww/default.nix b/tests/modules/programs/eww/default.nix
new file mode 100644
index 000000000..d3a95f3ca
--- /dev/null
+++ b/tests/modules/programs/eww/default.nix
@@ -0,0 +1 @@
+{ eww-basic-config = ./basic-config.nix; }

From d303453b134cff1dec350ae2e50fec34d06bee73 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 12 Feb 2025 10:11:25 -0600
Subject: [PATCH 363/546] eww: add null configDir test

---
 tests/modules/programs/eww/default.nix     |  5 ++++-
 tests/modules/programs/eww/null-config.nix | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/programs/eww/null-config.nix

diff --git a/tests/modules/programs/eww/default.nix b/tests/modules/programs/eww/default.nix
index d3a95f3ca..b87014079 100644
--- a/tests/modules/programs/eww/default.nix
+++ b/tests/modules/programs/eww/default.nix
@@ -1 +1,4 @@
-{ eww-basic-config = ./basic-config.nix; }
+{
+  eww-basic-config = ./basic-config.nix;
+  eww-null-config = ./null-config.nix;
+}
diff --git a/tests/modules/programs/eww/null-config.nix b/tests/modules/programs/eww/null-config.nix
new file mode 100644
index 000000000..28cd6fc68
--- /dev/null
+++ b/tests/modules/programs/eww/null-config.nix
@@ -0,0 +1,11 @@
+{ ... }: {
+  config = {
+    programs.eww = { enable = true; };
+
+    nmt.script = ''
+      yuckDir=home-files/.config/eww
+
+      assertPathNotExists  $yuckDir/eww.yuck
+    '';
+  };
+}

From 15b59d4191b993ebdfcb1f61b834fced217882ba Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 12 Feb 2025 10:12:01 -0600
Subject: [PATCH 364/546] eww: fix eww source creation

Source can't be accessed without being defined, need to move condition
earlier.
---
 modules/programs/eww.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index fba294aaf..2559068ad 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -45,7 +45,8 @@ in {
 
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
-    xdg.configFile."eww".source = mkIf (cfg.configDir != null) cfg.configDir;
+    xdg =
+      mkIf (cfg.configDir != null) { configFile."eww".source = cfg.configDir; };
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
       if [[ $TERM != "dumb" ]]; then

From c9d343cfa0565671cc7e8d5aefebaf61cc840abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Plagborg=20Bak=20S=C3=B8rensen?=
 <57013304+kpbaks@users.noreply.github.com>
Date: Thu, 13 Feb 2025 04:07:02 +0100
Subject: [PATCH 365/546] docs(zellij): `programs.zellij.settings` are
 serialized as `kdl` and not `yaml` from version 0.32.0 (#6010)

---
 modules/programs/zellij.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix
index 77027b5df..8d5f00051 100644
--- a/modules/programs/zellij.nix
+++ b/modules/programs/zellij.nix
@@ -34,7 +34,10 @@ in {
       '';
       description = ''
         Configuration written to
-        {file}`$XDG_CONFIG_HOME/zellij/config.yaml`.
+        {file}`$XDG_CONFIG_HOME/zellij/config.kdl`.
+
+        If `programs.zellij.package.version` is older than 0.32.0, then
+        the configuration is written to {file}`$XDG_CONFIG_HOME/zellij/config.yaml`.
 
         See <https://zellij.dev/documentation> for the full
         list of options.

From a70d788923061a00a488f60a01768ca4c6a8b727 Mon Sep 17 00:00:00 2001
From: derrik <82898438+derrik-fleming@users.noreply.github.com>
Date: Thu, 13 Feb 2025 09:24:38 -0500
Subject: [PATCH 366/546] aerospace: fix workspace assignment config (#6442)

with the default to `{}`, this table is always set in the generated
config. this change allows `null` for
`workspace-to-monitor-force-assignment` and sets the default to `null`

Co-authored-by: derrik.fleming <derrik.fleming@spindance.com>
---
 modules/programs/aerospace.nix                          | 5 +++--
 tests/modules/programs/aerospace/settings-expected.toml | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
index 10bb75e3d..62f33752f 100644
--- a/modules/programs/aerospace.nix
+++ b/modules/programs/aerospace.nix
@@ -154,8 +154,9 @@ in {
               "Commands to run every time a new window is detected with optional conditions.";
           };
           workspace-to-monitor-force-assignment = mkOption {
-            type = with types; attrsOf (oneOf [ int str (listOf str) ]);
-            default = { };
+            type = with types;
+              nullOr (attrsOf (oneOf [ int str (listOf str) ]));
+            default = null;
             description = ''
               Map workspaces to specific monitors.
               Left-hand side is the workspace name, and right-hand side is the monitor pattern.
diff --git a/tests/modules/programs/aerospace/settings-expected.toml b/tests/modules/programs/aerospace/settings-expected.toml
index d38cba45e..b46ebad41 100644
--- a/tests/modules/programs/aerospace/settings-expected.toml
+++ b/tests/modules/programs/aerospace/settings-expected.toml
@@ -25,5 +25,3 @@ alt-h = "focus left"
 alt-j = "focus down"
 alt-k = "focus up"
 alt-l = "focus right"
-
-[workspace-to-monitor-force-assignment]

From 22b418c13fb0be43f4bc5c185f323a3237028594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= <andre.schroeder@andresco.de>
Date: Thu, 13 Feb 2025 15:58:45 +0100
Subject: [PATCH 367/546] bash: Make HISTFILESIZE and HISTSIZE nullable (#6443)

---
 modules/programs/bash.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 8356d8a06..0c99da3ed 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -51,7 +51,7 @@ in {
       };
 
       historySize = mkOption {
-        type = types.int;
+        type = types.nullOr types.int;
         default = 10000;
         description = "Number of history lines to keep in memory.";
       };
@@ -63,7 +63,7 @@ in {
       };
 
       historyFileSize = mkOption {
-        type = types.int;
+        type = types.nullOr types.int;
         default = 100000;
         description = "Number of history lines to keep on file.";
       };
@@ -181,16 +181,18 @@ in {
     sessionVarsStr = config.lib.shell.exportAll cfg.sessionVariables;
 
     historyControlStr = (concatStringsSep "\n"
-      (mapAttrsToList (n: v: "${n}=${v}") ({
-        HISTFILESIZE = toString cfg.historyFileSize;
-        HISTSIZE = toString cfg.historySize;
-      } // optionalAttrs (cfg.historyFile != null) {
-        HISTFILE = ''"${cfg.historyFile}"'';
-      } // optionalAttrs (cfg.historyControl != [ ]) {
-        HISTCONTROL = concatStringsSep ":" cfg.historyControl;
-      } // optionalAttrs (cfg.historyIgnore != [ ]) {
-        HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore);
-      }) ++ optional (cfg.historyFile != null)
+      (mapAttrsToList (n: v: "${n}=${v}")
+        (optionalAttrs (cfg.historyFileSize != null) {
+          HISTFILESIZE = toString cfg.historyFileSize;
+        } // optionalAttrs (cfg.historySize != null) {
+          HISTSIZE = toString cfg.historySize;
+        } // optionalAttrs (cfg.historyFile != null) {
+          HISTFILE = ''"${cfg.historyFile}"'';
+        } // optionalAttrs (cfg.historyControl != [ ]) {
+          HISTCONTROL = concatStringsSep ":" cfg.historyControl;
+        } // optionalAttrs (cfg.historyIgnore != [ ]) {
+          HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore);
+        }) ++ optional (cfg.historyFile != null)
         ''mkdir -p "$(dirname "$HISTFILE")"''));
   in mkIf cfg.enable {
     home.packages = [ cfg.package ];

From 20fac9bbdf22d697ad68faabb7f95d4deba4f712 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Feb 2025 10:16:42 -0600
Subject: [PATCH 368/546] syncthing: use package options

Currently, all references are hardcoded even though we offer package
options. Update to use package options.
---
 modules/services/syncthing.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index f609b3b65..5cfce683e 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -38,13 +38,13 @@ let
           device) folder.devices;
     }) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
 
-  jq = "${pkgs.jq}/bin/jq";
-  sleep = "${pkgs.coreutils}/bin/sleep";
-  printf = "${pkgs.coreutils}/bin/printf";
-  cat = "${pkgs.coreutils}/bin/cat";
-  curl = "${pkgs.curl}/bin/curl";
-  install = "${pkgs.coreutils}/bin/install";
-  syncthing = "${pkgs.syncthing}/bin/syncthing";
+  jq = lib.getExe pkgs.jq;
+  sleep = lib.getExe' pkgs.coreutils "sleep";
+  printf = lib.getExe' pkgs.coreutils "printf";
+  cat = lib.getExe' pkgs.coreutils "cat";
+  curl = lib.getExe pkgs.curl;
+  install = lib.getExe' pkgs.coreutils "install";
+  syncthing = lib.getExe cfg.package;
 
   updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
     set -efu
@@ -606,7 +606,7 @@ in {
 
   config = mkMerge [
     (mkIf cfg.enable {
-      home.packages = [ (getOutput "man" pkgs.syncthing) ];
+      home.packages = [ (getOutput "man" cfg.package) ];
 
       systemd.user.services = {
         syncthing = {

From 5031c6d2978109336637977c165f82aa49fa16a7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Feb 2025 10:50:17 -0600
Subject: [PATCH 369/546] syncthing: remove with lib

---
 modules/services/syncthing.nix | 113 +++++++++++++++++----------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 5cfce683e..197d00d0c 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib) literalExpression mkOption mkEnableOption mkPackageOption types;
 
   cfg = config.services.syncthing;
+
   settingsFormat = pkgs.formats.json { };
   cleanedConfig =
-    converge (filterAttrsRecursive (_: v: v != null && v != { })) cfg.settings;
+    lib.converge (lib.filterAttrsRecursive (_: v: v != null && v != { }))
+    cfg.settings;
 
   isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
 
@@ -26,17 +26,17 @@ let
     else
       "${cfg.guiAddress}${path}";
 
-  devices = mapAttrsToList (_: device: device // { deviceID = device.id; })
+  devices = lib.mapAttrsToList (_: device: device // { deviceID = device.id; })
     cfg.settings.devices;
 
-  folders = mapAttrsToList (_: folder:
+  folders = lib.mapAttrsToList (_: folder:
     folder // {
       devices = map (device:
         if builtins.isString device then {
           deviceId = cfg.settings.devices.${device}.id;
         } else
           device) folder.devices;
-    }) (filterAttrs (_: folder: folder.enable) cfg.settings.folders);
+    }) (lib.filterAttrs (_: folder: folder.enable) cfg.settings.folders);
 
   jq = lib.getExe pkgs.jq;
   sleep = lib.getExe' pkgs.coreutils "sleep";
@@ -91,7 +91,7 @@ let
     } [
       # Now for each of these attributes, write the curl commands that are
       # identical to both folders and devices.
-      (mapAttrs (conf_type: s:
+      (lib.mapAttrs (conf_type: s:
         # We iterate the `conf` list now, and run a curl -X POST command for each, that
         # should update that device/folder only.
         lib.pipe s.conf [
@@ -167,9 +167,9 @@ let
 
   syncthingArgs = defaultSyncthingArgs ++ cfg.extraOptions;
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
-  options = with types; {
+  options = {
     services.syncthing = {
       enable = mkEnableOption ''
         Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync.
@@ -177,7 +177,7 @@ in {
       '';
 
       cert = mkOption {
-        type = nullOr str;
+        type = with types; nullOr str;
         default = null;
         description = ''
           Path to the `cert.pem` file, which will be copied into Syncthing's
@@ -186,7 +186,7 @@ in {
       };
 
       key = mkOption {
-        type = nullOr str;
+        type = with types; nullOr str;
         default = null;
         description = ''
           Path to the `key.pem` file, which will be copied into Syncthing's
@@ -195,7 +195,7 @@ in {
       };
 
       passwordFile = mkOption {
-        type = nullOr path;
+        type = with types; nullOr path;
         default = null;
         description = ''
           Path to the gui password file.
@@ -203,7 +203,7 @@ in {
       };
 
       overrideDevices = mkOption {
-        type = bool;
+        type = types.bool;
         default = true;
         description = ''
           Whether to delete the devices which are not configured via the
@@ -214,7 +214,7 @@ in {
       };
 
       overrideFolders = mkOption {
-        type = bool;
+        type = types.bool;
         default = true;
         description = ''
           Whether to delete the folders which are not configured via the
@@ -225,7 +225,7 @@ in {
       };
 
       settings = mkOption {
-        type = submodule {
+        type = types.submodule {
           freeformType = settingsFormat.type;
           options = {
             # global options
@@ -234,11 +234,11 @@ in {
               description = ''
                 The options element contains all other global configuration options
               '';
-              type = submodule ({ name, ... }: {
+              type = types.submodule {
                 freeformType = settingsFormat.type;
                 options = {
                   localAnnounceEnabled = mkOption {
-                    type = nullOr bool;
+                    type = with types; nullOr bool;
                     default = null;
                     description = ''
                       Whether to send announcements to the local LAN, also use such announcements to find other devices.
@@ -246,7 +246,7 @@ in {
                   };
 
                   localAnnouncePort = mkOption {
-                    type = nullOr int;
+                    type = with types; nullOr int;
                     default = null;
                     description = ''
                       The port on which to listen and send IPv4 broadcast announcements to.
@@ -254,7 +254,7 @@ in {
                   };
 
                   relaysEnabled = mkOption {
-                    type = nullOr bool;
+                    type = with types; nullOr bool;
                     default = null;
                     description = ''
                       When true, relays will be connected to and potentially used for device to device connections.
@@ -262,7 +262,7 @@ in {
                   };
 
                   urAccepted = mkOption {
-                    type = nullOr int;
+                    type = with types; nullOr int;
                     default = null;
                     description = ''
                       Whether the user has accepted to submit anonymous usage data.
@@ -272,7 +272,7 @@ in {
                   };
 
                   limitBandwidthInLan = mkOption {
-                    type = nullOr bool;
+                    type = with types; nullOr bool;
                     default = null;
                     description = ''
                       Whether to apply bandwidth limits to devices in the same broadcast domain as the local device.
@@ -280,7 +280,7 @@ in {
                   };
 
                   maxFolderConcurrency = mkOption {
-                    type = nullOr int;
+                    type = with types; nullOr int;
                     default = null;
                     description = ''
                       This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning.
@@ -288,7 +288,7 @@ in {
                     '';
                   };
                 };
-              });
+              };
             };
 
             # device settings
@@ -308,12 +308,12 @@ in {
                   addresses = [ "tcp://192.168.0.10:51820" ];
                 };
               };
-              type = attrsOf (submodule ({ name, ... }: {
+              type = types.attrsOf (types.submodule ({ name, ... }: {
                 freeformType = settingsFormat.type;
                 options = {
 
                   name = mkOption {
-                    type = str;
+                    type = types.str;
                     default = name;
                     description = ''
                       The name of the device.
@@ -321,14 +321,14 @@ in {
                   };
 
                   id = mkOption {
-                    type = str;
+                    type = types.str;
                     description = ''
                       The device ID. See <https://docs.syncthing.net/dev/device-ids.html>.
                     '';
                   };
 
                   autoAcceptFolders = mkOption {
-                    type = bool;
+                    type = types.bool;
                     default = false;
                     description = ''
                       Automatically create or share folders that this device advertises at the default path.
@@ -358,12 +358,12 @@ in {
                   };
                 }
               '';
-              type = attrsOf (submodule ({ name, ... }: {
+              type = types.attrsOf (types.submodule ({ name, ... }: {
                 freeformType = settingsFormat.type;
                 options = {
 
                   enable = mkOption {
-                    type = bool;
+                    type = types.bool;
                     default = true;
                     description = ''
                       Whether to share this folder.
@@ -373,11 +373,12 @@ in {
                   };
 
                   path = mkOption {
-                    type = str // {
+                    type = types.str // {
                       check = x:
-                        str.check x
-                        && (substring 0 1 x == "/" || substring 0 2 x == "~/");
-                      description = str.description + " starting with / or ~/";
+                        types.str.check x && (lib.substring 0 1 x == "/"
+                          || lib.substring 0 2 x == "~/");
+                      description = types.str.description
+                        + " starting with / or ~/";
                     };
                     default = name;
                     description = ''
@@ -388,7 +389,7 @@ in {
                   };
 
                   id = mkOption {
-                    type = str;
+                    type = types.str;
                     default = name;
                     description = ''
                       The ID of the folder. Must be the same on all devices.
@@ -396,7 +397,7 @@ in {
                   };
 
                   label = mkOption {
-                    type = str;
+                    type = types.str;
                     default = name;
                     description = ''
                       The label of the folder.
@@ -404,7 +405,7 @@ in {
                   };
 
                   type = mkOption {
-                    type = enum [
+                    type = types.enum [
                       "sendreceive"
                       "sendonly"
                       "receiveonly"
@@ -418,7 +419,7 @@ in {
                   };
 
                   devices = mkOption {
-                    type = listOf str;
+                    type = with types; listOf str;
                     default = [ ];
                     description = ''
                       The devices this folder should be shared with. Each device must
@@ -490,7 +491,7 @@ in {
                   };
 
                   copyOwnershipFromParent = mkOption {
-                    type = bool;
+                    type = types.bool;
                     default = false;
                     description = ''
                       On Unix systems, tries to copy file/folder ownership from
@@ -541,7 +542,7 @@ in {
       };
 
       guiAddress = mkOption {
-        type = str;
+        type = types.str;
         default = "127.0.0.1:8384";
         description = ''
           The address to serve the web interface at.
@@ -561,7 +562,7 @@ in {
       };
 
       extraOptions = mkOption {
-        type = listOf str;
+        type = with types; listOf str;
         default = [ ];
         example = [ "--reset-deltas" ];
         description = ''
@@ -604,9 +605,9 @@ in {
     };
   };
 
-  config = mkMerge [
-    (mkIf cfg.enable {
-      home.packages = [ (getOutput "man" cfg.package) ];
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      home.packages = [ (lib.getOutput "man" cfg.package) ];
 
       systemd.user.services = {
         syncthing = {
@@ -618,28 +619,28 @@ in {
           };
 
           Service = {
-            ExecStartPre = mkIf (cfg.cert != null || cfg.key != null) "+${
+            ExecStartPre = lib.mkIf (cfg.cert != null || cfg.key != null) "+${
                 pkgs.writers.writeBash "syncthing-copy-keys" ''
                   syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"
                   ${install} -dm700 "$syncthing_dir"
-                  ${optionalString (cfg.cert != null) ''
+                  ${lib.optionalString (cfg.cert != null) ''
                     ${install} -Dm400 ${
                       toString cfg.cert
                     } "$syncthing_dir/cert.pem"
                   ''}
-                  ${optionalString (cfg.key != null) ''
+                  ${lib.optionalString (cfg.key != null) ''
                     ${install} -Dm400 ${
                       toString cfg.key
                     } "$syncthing_dir/key.pem"
                   ''}
                 ''
               }";
-            ExecStart = escapeShellArgs syncthingArgs;
+            ExecStart = lib.escapeShellArgs syncthingArgs;
             Restart = "on-failure";
             SuccessExitStatus = [ 3 4 ];
             RestartForceExitStatus = [ 3 4 ];
             Environment =
-              mkIf (cfg.allProxy != null) { all_proxy = cfg.allProxy; };
+              lib.mkIf (cfg.allProxy != null) { all_proxy = cfg.allProxy; };
 
             # Sandboxing.
             LockPersonality = true;
@@ -654,7 +655,7 @@ in {
           Install = { WantedBy = [ "default.target" ]; };
         };
 
-        syncthing-init = mkIf (cleanedConfig != { }) {
+        syncthing-init = lib.mkIf (cleanedConfig != { }) {
           Unit = {
             Description = "Syncthing configuration updater";
             Requires = [ "syncthing.service" ];
@@ -685,10 +686,10 @@ in {
       };
     })
 
-    (mkIf (isAttrs cfg.tray && cfg.tray.enable) {
+    (lib.mkIf (lib.isAttrs cfg.tray && cfg.tray.enable) {
       assertions = [
-        (hm.assertions.assertPlatform "services.syncthing.tray" pkgs
-          platforms.linux)
+        (lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs
+          lib.platforms.linux)
       ];
 
       systemd.user.services = {
@@ -710,10 +711,10 @@ in {
     })
 
     # deprecated
-    (mkIf (isBool cfg.tray && cfg.tray) {
+    (lib.mkIf (lib.isBool cfg.tray && cfg.tray) {
       assertions = [
-        (hm.assertions.assertPlatform "services.syncthing.tray" pkgs
-          platforms.linux)
+        (lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs
+          lib.platforms.linux)
       ];
 
       systemd.user.services = {

From 7da01bc47ad48d696c96fcfd63d10063855d5486 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 15 Feb 2025 02:47:27 +0800
Subject: [PATCH 370/546] git: support alternate signing methods (#5516)

The Git module now supports SSH and X.509 signing in addition to
OpenPGP/GnuPG, via setting the `programs.git.signing.format` option.
It defaults to `openpgp` for now as a backwards compatibility measure,
but I feel like we shouldn't enforce GPG as the default on everyone,
especially for people who use SSH signing like me.

Accordingly, `programs.git.signing.gpgPath` has been renamed to
`programs.git.signing.signer`, as now the signer binary is not
restricted to GnuPG. Users should only get a warning and everything
should continue to work.

Fixes #4221, supersedes #4235

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
Co-authored-by: Sumner Evans <me@sumnerevans.com>
Co-authored-by: Leah Amelia Chen <hi@pluie.me>
---
 modules/misc/news.nix                         |  17 +++
 modules/programs/git.nix                      | 104 +++++++++++-------
 .../programs/gh/credential-helper.git.conf    |  12 ++
 .../modules/programs/gh/credential-helper.nix |   5 +-
 tests/modules/programs/git/default.nix        |   1 +
 tests/modules/programs/git/git-expected.conf  |   3 +
 .../programs/git/git-with-email-expected.conf |  12 ++
 tests/modules/programs/git/git-with-email.nix |   1 +
 .../programs/git/git-with-msmtp-expected.conf |  12 ++
 tests/modules/programs/git/git-with-msmtp.nix |   1 +
 .../git/git-with-signing-key-id-expected.conf |   7 +-
 ...t-with-signing-key-id-legacy-expected.conf |  16 +++
 .../git/git-with-signing-key-id-legacy.nix    |  28 +++++
 .../programs/git/git-with-signing-key-id.nix  |   6 +-
 .../git-with-str-extra-config-expected.conf   |  12 ++
 .../git/git-with-str-extra-config.nix         |   1 +
 .../git-without-signing-key-id-expected.conf  |   3 +
 .../git/git-without-signing-key-id.nix        |   2 +-
 tests/modules/programs/git/git.nix            |   3 +-
 19 files changed, 201 insertions(+), 45 deletions(-)
 create mode 100644 tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf
 create mode 100644 tests/modules/programs/git/git-with-signing-key-id-legacy.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index dc605ae4c..395a45d5f 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1653,6 +1653,23 @@ in {
         '';
       }
 
+      {
+        time = "2024-05-21T20:22:57+00:00";
+        condition = config.programs.git.signing != { };
+        message = ''
+          The Git module now supports signing via SSH and X.509 keys, in addition to OpenPGP/GnuPG,
+          via the `programs.git.signing.format` option.
+
+          The format defaults to `openpgp` for now, due to backwards compatibility reasons — this is
+          not guaranteed to last! GPG users should manually set `programs.git.signing.format` to
+          `openpgp` as soon as possible.
+
+          Accordingly, `programs.git.signing.gpgPath` has been renamed to the more generic option
+          `programs.git.signing.signer` as not everyone uses GPG.
+          Please migrate to the new option to suppress the generated warning.
+        '';
+      }
+
       {
         time = "2024-05-25T14:36:03+00:00";
         message = ''
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index a8b1c5942..b3cb57c28 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -14,34 +14,6 @@ let
       supersectionType = attrsOf (either multipleType sectionType);
     in attrsOf supersectionType;
 
-  signModule = types.submodule {
-    options = {
-      key = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          The default GPG signing key fingerprint.
-
-          Set to `null` to let GnuPG decide what signing key
-          to use depending on commit’s author.
-        '';
-      };
-
-      signByDefault = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether commits and tags should be signed by default.";
-      };
-
-      gpgPath = mkOption {
-        type = types.str;
-        default = "${pkgs.gnupg}/bin/gpg2";
-        defaultText = "\${pkgs.gnupg}/bin/gpg2";
-        description = "Path to GnuPG binary to use.";
-      };
-    };
-  };
-
   includeModule = types.submodule ({ config, ... }: {
     options = {
       condition = mkOption {
@@ -133,10 +105,40 @@ in {
         description = "Git aliases to define.";
       };
 
-      signing = mkOption {
-        type = types.nullOr signModule;
-        default = null;
-        description = "Options related to signing commits using GnuPG.";
+      signing = {
+        key = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            The default signing key fingerprint.
+
+            Set to `null` to let the signer decide what signing key
+            to use depending on commit’s author.
+          '';
+        };
+
+        format = mkOption {
+          type = types.enum [ "openpgp" "ssh" "x509" ];
+          defaultText = literalExpression ''
+            "openpgp" for state version < 24.11,
+            undefined for state version ≥ 24.11
+          '';
+          description = ''
+            The signing method to use when signing commits and tags.
+            Valid values are `openpgp` (OpenPGP/GnuPG), `ssh` (SSH), and `x509` (X.509 certificates).
+          '';
+        };
+
+        signByDefault = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Whether commits and tags should be signed by default.";
+        };
+
+        signer = mkOption {
+          type = types.str;
+          description = "Path to signer binary to use.";
+        };
       };
 
       extraConfig = mkOption {
@@ -409,9 +411,19 @@ in {
     };
   };
 
+  imports = [
+    (mkRenamedOptionModule [ "programs" "git" "signing" "gpgPath" ] [
+      "programs"
+      "git"
+      "signing"
+      "signer"
+    ])
+  ];
+
   config = mkIf cfg.enable (mkMerge [
     {
       home.packages = [ cfg.package ];
+
       assertions = [{
         assertion = let
           enabled = [
@@ -475,12 +487,28 @@ in {
       (filterAttrs hasSmtp config.accounts.email.accounts);
     }
 
-    (mkIf (cfg.signing != null) {
-      programs.git.iniContent = {
-        user.signingKey = mkIf (cfg.signing.key != null) cfg.signing.key;
-        commit.gpgSign = mkDefault cfg.signing.signByDefault;
-        tag.gpgSign = mkDefault cfg.signing.signByDefault;
-        gpg.program = cfg.signing.gpgPath;
+    (mkIf (cfg.signing != { }) {
+      programs.git = {
+        signing = {
+          format = mkIf (versionOlder config.home.stateVersion "24.11")
+            (mkOptionDefault "openpgp");
+          signer = mkIf (cfg.signing.format != null) (mkOptionDefault {
+            openpgp = getExe config.programs.gpg.package;
+            ssh = getExe' pkgs.openssh "ssh-keygen";
+            x509 = getExe' config.programs.gpg.package "gpgsm";
+          }.${cfg.signing.format});
+        };
+
+        iniContent = let inherit (cfg.signing) format;
+        in {
+          user.signingKey = mkIf (cfg.signing.key != null) cfg.signing.key;
+          commit.gpgSign = mkDefault cfg.signing.signByDefault;
+          tag.gpgSign = mkDefault cfg.signing.signByDefault;
+          gpg = {
+            inherit format;
+            ${format}.program = cfg.signing.signer;
+          };
+        };
       };
     })
 
diff --git a/tests/modules/programs/gh/credential-helper.git.conf b/tests/modules/programs/gh/credential-helper.git.conf
index 529d6725a..8b712cd86 100644
--- a/tests/modules/programs/gh/credential-helper.git.conf
+++ b/tests/modules/programs/gh/credential-helper.git.conf
@@ -1,5 +1,17 @@
+[commit]
+	gpgSign = false
+
 [credential "https://github.com"]
 	helper = "@gh@/bin/gh auth git-credential"
 
 [credential "https://github.example.com"]
 	helper = "@gh@/bin/gh auth git-credential"
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
+[tag]
+	gpgSign = false
diff --git a/tests/modules/programs/gh/credential-helper.nix b/tests/modules/programs/gh/credential-helper.nix
index 547ad446a..b0cad9454 100644
--- a/tests/modules/programs/gh/credential-helper.nix
+++ b/tests/modules/programs/gh/credential-helper.nix
@@ -7,7 +7,10 @@
     };
   };
 
-  programs.git.enable = true;
+  programs.git = {
+    enable = true;
+    signing.signer = "path-to-gpg";
+  };
 
   nmt.script = ''
     assertFileExists home-files/.config/git/config
diff --git a/tests/modules/programs/git/default.nix b/tests/modules/programs/git/default.nix
index 3b92b2ff1..a1211f254 100644
--- a/tests/modules/programs/git/default.nix
+++ b/tests/modules/programs/git/default.nix
@@ -3,6 +3,7 @@
   git-with-most-options = ./git.nix;
   git-with-msmtp = ./git-with-msmtp.nix;
   git-with-str-extra-config = ./git-with-str-extra-config.nix;
+  git-with-signing-key-id-legacy = ./git-with-signing-key-id-legacy.nix;
   git-with-signing-key-id = ./git-with-signing-key-id.nix;
   git-without-signing-key-id = ./git-without-signing-key-id.nix;
   git-with-hooks = ./git-with-hooks.nix;
diff --git a/tests/modules/programs/git/git-expected.conf b/tests/modules/programs/git/git-expected.conf
index 61e0a2cc5..3d072b404 100644
--- a/tests/modules/programs/git/git-expected.conf
+++ b/tests/modules/programs/git/git-expected.conf
@@ -38,6 +38,9 @@
 	smudge = "git-lfs smudge -- %f"
 
 [gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
 	program = "path-to-gpg"
 
 [interactive]
diff --git a/tests/modules/programs/git/git-with-email-expected.conf b/tests/modules/programs/git/git-with-email-expected.conf
index fa027422f..d7c40973a 100644
--- a/tests/modules/programs/git/git-with-email-expected.conf
+++ b/tests/modules/programs/git/git-with-email-expected.conf
@@ -1,3 +1,12 @@
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
 [sendemail "hm-account"]
 	from = "H. M. Test Jr. <hm@example.org>"
 	smtpEncryption = "tls"
@@ -12,6 +21,9 @@
 	smtpSslCertPath = "/etc/ssl/certs/ca-certificates.crt"
 	smtpUser = "home.manager"
 
+[tag]
+	gpgSign = false
+
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"
diff --git a/tests/modules/programs/git/git-with-email.nix b/tests/modules/programs/git/git-with-email.nix
index db6053a53..c1a375b9b 100644
--- a/tests/modules/programs/git/git-with-email.nix
+++ b/tests/modules/programs/git/git-with-email.nix
@@ -8,6 +8,7 @@
 
   programs.git = {
     enable = true;
+    signing.signer = "path-to-gpg";
     userEmail = "hm@example.com";
     userName = "H. M. Test";
   };
diff --git a/tests/modules/programs/git/git-with-msmtp-expected.conf b/tests/modules/programs/git/git-with-msmtp-expected.conf
index 8cd5d86f0..8cf588c7a 100644
--- a/tests/modules/programs/git/git-with-msmtp-expected.conf
+++ b/tests/modules/programs/git/git-with-msmtp-expected.conf
@@ -1,3 +1,12 @@
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
 [sendemail "hm-account"]
 	from = "H. M. Test Jr. <hm@example.org>"
 	smtpEncryption = "tls"
@@ -10,6 +19,9 @@
 	from = "H. M. Test <hm@example.com>"
 	smtpServer = "@msmtp@/bin/msmtp"
 
+[tag]
+	gpgSign = false
+
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"
diff --git a/tests/modules/programs/git/git-with-msmtp.nix b/tests/modules/programs/git/git-with-msmtp.nix
index 917955130..5b5416189 100644
--- a/tests/modules/programs/git/git-with-msmtp.nix
+++ b/tests/modules/programs/git/git-with-msmtp.nix
@@ -7,6 +7,7 @@
 
   programs.git = {
     enable = true;
+    signing.signer = "path-to-gpg";
     userEmail = "hm@example.com";
     userName = "H. M. Test";
   };
diff --git a/tests/modules/programs/git/git-with-signing-key-id-expected.conf b/tests/modules/programs/git/git-with-signing-key-id-expected.conf
index b26377aac..aefca4142 100644
--- a/tests/modules/programs/git/git-with-signing-key-id-expected.conf
+++ b/tests/modules/programs/git/git-with-signing-key-id-expected.conf
@@ -2,7 +2,10 @@
 	gpgSign = true
 
 [gpg]
-	program = "path-to-gpg"
+	format = "ssh"
+
+[gpg "ssh"]
+	program = "path-to-ssh"
 
 [tag]
 	gpgSign = true
@@ -10,4 +13,4 @@
 [user]
 	email = "user@example.org"
 	name = "John Doe"
-	signingKey = "00112233445566778899AABBCCDDEEFF"
+	signingKey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf b/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf
new file mode 100644
index 000000000..7c9bc1d02
--- /dev/null
+++ b/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf
@@ -0,0 +1,16 @@
+[commit]
+	gpgSign = true
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
+[tag]
+	gpgSign = true
+
+[user]
+	email = "user@example.org"
+	name = "John Doe"
+	signingKey = "00112233445566778899AABBCCDDEEFF"
diff --git a/tests/modules/programs/git/git-with-signing-key-id-legacy.nix b/tests/modules/programs/git/git-with-signing-key-id-legacy.nix
new file mode 100644
index 000000000..36f092299
--- /dev/null
+++ b/tests/modules/programs/git/git-with-signing-key-id-legacy.nix
@@ -0,0 +1,28 @@
+{ lib, options, ... }: {
+  config = {
+    programs.git = {
+      enable = true;
+      userName = "John Doe";
+      userEmail = "user@example.org";
+
+      signing = {
+        gpgPath = "path-to-gpg";
+        key = "00112233445566778899AABBCCDDEEFF";
+        signByDefault = true;
+      };
+    };
+
+    test.asserts.warnings.expected = [
+      "The option `programs.git.signing.gpgPath' defined in ${
+        lib.showFiles options.programs.git.signing.gpgPath.files
+      } has been renamed to `programs.git.signing.signer'."
+    ];
+
+    nmt.script = ''
+      assertFileExists home-files/.config/git/config
+      assertFileContent home-files/.config/git/config ${
+        ./git-with-signing-key-id-legacy-expected.conf
+      }
+    '';
+  };
+}
diff --git a/tests/modules/programs/git/git-with-signing-key-id.nix b/tests/modules/programs/git/git-with-signing-key-id.nix
index a6386e347..a0aae8b53 100644
--- a/tests/modules/programs/git/git-with-signing-key-id.nix
+++ b/tests/modules/programs/git/git-with-signing-key-id.nix
@@ -5,8 +5,10 @@
     userEmail = "user@example.org";
 
     signing = {
-      gpgPath = "path-to-gpg";
-      key = "00112233445566778899AABBCCDDEEFF";
+      signer = "path-to-ssh";
+      format = "ssh";
+      key =
+        "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
       signByDefault = true;
     };
   };
diff --git a/tests/modules/programs/git/git-with-str-extra-config-expected.conf b/tests/modules/programs/git/git-with-str-extra-config-expected.conf
index 071268e83..2154bc580 100644
--- a/tests/modules/programs/git/git-with-str-extra-config-expected.conf
+++ b/tests/modules/programs/git/git-with-str-extra-config-expected.conf
@@ -1,5 +1,17 @@
 This can be anything.
 
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
+[tag]
+	gpgSign = false
+
 [user]
 	email = "user@example.org"
 	name = "John Doe"
diff --git a/tests/modules/programs/git/git-with-str-extra-config.nix b/tests/modules/programs/git/git-with-str-extra-config.nix
index d9bd7e572..90ed363b2 100644
--- a/tests/modules/programs/git/git-with-str-extra-config.nix
+++ b/tests/modules/programs/git/git-with-str-extra-config.nix
@@ -1,6 +1,7 @@
 {
   programs.git = {
     enable = true;
+    signing.signer = "path-to-gpg";
     extraConfig = ''
       This can be anything.
     '';
diff --git a/tests/modules/programs/git/git-without-signing-key-id-expected.conf b/tests/modules/programs/git/git-without-signing-key-id-expected.conf
index 8c04aeda1..29452a2db 100644
--- a/tests/modules/programs/git/git-without-signing-key-id-expected.conf
+++ b/tests/modules/programs/git/git-without-signing-key-id-expected.conf
@@ -2,6 +2,9 @@
 	gpgSign = true
 
 [gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
 	program = "path-to-gpg"
 
 [tag]
diff --git a/tests/modules/programs/git/git-without-signing-key-id.nix b/tests/modules/programs/git/git-without-signing-key-id.nix
index a06cb692e..adc7995bf 100644
--- a/tests/modules/programs/git/git-without-signing-key-id.nix
+++ b/tests/modules/programs/git/git-without-signing-key-id.nix
@@ -5,7 +5,7 @@
     userEmail = "user@example.org";
 
     signing = {
-      gpgPath = "path-to-gpg";
+      signer = "path-to-gpg";
       key = null;
       signByDefault = true;
     };
diff --git a/tests/modules/programs/git/git.nix b/tests/modules/programs/git/git.nix
index 51ed97180..2e436bc75 100644
--- a/tests/modules/programs/git/git.nix
+++ b/tests/modules/programs/git/git.nix
@@ -52,7 +52,8 @@ in {
         }
       ];
       signing = {
-        gpgPath = "path-to-gpg";
+        signer = "path-to-gpg";
+        format = "openpgp";
         key = "00112233445566778899AABBCCDDEEFF";
         signByDefault = true;
       };

From 9daae9a67af7b4d341e2c806fa274a9c0925d7cf Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Fri, 14 Feb 2025 19:05:06 +0000
Subject: [PATCH 371/546] nixos/common: forward `nix.enable` from the OS
 configuration (#6383)

This prevents problematic references to `nix.package` when Nix
management is disabled in the host OS.
---
 nixos/common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/common.nix b/nixos/common.nix
index 08491be9b..d7343fbc4 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -34,6 +34,14 @@ let
           home.username = config.users.users.${name}.name;
           home.homeDirectory = config.users.users.${name}.home;
 
+          # Forward `nix.enable` from the OS configuration. The
+          # conditional is to check whether nix-darwin is new enough
+          # to have the `nix.enable` option; it was previously a
+          # `mkRemovedOptionModule` error, which we can crudely detect
+          # by `visible` being set to `false`.
+          nix.enable =
+            mkIf (options.nix.enable.visible or true) config.nix.enable;
+
           # Make activation script use same version of Nix as system as a whole.
           # This avoids problems with Nix not being in PATH.
           nix.package = config.nix.package;

From 582d3cd42df7d2c7565d77119106336ea46e33df Mon Sep 17 00:00:00 2001
From: Calum MacRae <hi@cmacr.ae>
Date: Fri, 14 Feb 2025 21:10:24 +0000
Subject: [PATCH 372/546] yubikey-agent: init service module (#6446)

---
 modules/modules.nix                           |  1 +
 modules/services/yubikey-agent.nix            | 92 +++++++++++++++++++
 tests/default.nix                             |  2 +
 .../services/yubikey-agent-darwin/default.nix |  1 +
 .../services/yubikey-agent-darwin/service.nix | 50 ++++++++++
 .../services/yubikey-agent/default.nix        |  1 +
 .../services/yubikey-agent/service.nix        | 49 ++++++++++
 7 files changed, 196 insertions(+)
 create mode 100644 modules/services/yubikey-agent.nix
 create mode 100644 tests/modules/services/yubikey-agent-darwin/default.nix
 create mode 100644 tests/modules/services/yubikey-agent-darwin/service.nix
 create mode 100644 tests/modules/services/yubikey-agent/default.nix
 create mode 100644 tests/modules/services/yubikey-agent/service.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 5fd4394aa..156094c85 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -424,6 +424,7 @@ let
     ./services/xscreensaver.nix
     ./services/xsettingsd.nix
     ./services/xsuspender.nix
+    ./services/yubikey-agent.nix
     ./systemd.nix
     ./targets/darwin
     ./targets/generic-linux.nix
diff --git a/modules/services/yubikey-agent.nix b/modules/services/yubikey-agent.nix
new file mode 100644
index 000000000..5e1379a38
--- /dev/null
+++ b/modules/services/yubikey-agent.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.services.yubikey-agent;
+
+in {
+  meta.maintainers = [ lib.maintainers.cmacrae ];
+
+  options.services.yubikey-agent = {
+    enable = lib.mkEnableOption "Seamless ssh-agent for YubiKeys";
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.yubikey-agent;
+      defaultText = lib.literalExpression "pkgs.yubikey-agent";
+      description = "The yubikey-agent package to use.";
+    };
+  };
+
+  config = mkIf cfg.enable (lib.mkMerge [
+    { home.packages = [ cfg.package ]; }
+
+    (mkIf pkgs.stdenv.isLinux {
+      systemd.user.services.yubikey-agent = {
+        Unit = {
+          Description = "Seamless ssh-agent for YubiKeys";
+          Documentation = "https://github.com/FiloSottile/yubikey-agent";
+          Requires = "yubikey-agent.socket";
+          After = "yubikey-agent.socket";
+          RefuseManualStart = true;
+        };
+
+        Service = {
+          ExecStart =
+            "${cfg.package}/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock";
+          Type = "simple";
+          # /run/user/$UID for the socket
+          ReadWritePaths = [ "%t" ];
+        };
+      };
+
+      systemd.user.sockets.yubikey-agent = {
+        Unit = {
+          Description = "Unix domain socket for Yubikey SSH agent";
+          Documentation = "https://github.com/FiloSottile/yubikey-agent";
+        };
+
+        Socket = {
+          ListenStream = "%t/yubikey-agent/yubikey-agent.sock";
+          RuntimeDirectory = "yubikey-agent";
+          SocketMode = "0600";
+          DirectoryMode = "0700";
+        };
+
+        Install = { WantedBy = [ "sockets.target" ]; };
+      };
+
+      home.sessionVariables = {
+        SSH_AUTH_SOCK =
+          "\${XDG_RUNTIME_DIR:-/run/user/$UID}/yubikey-agent/yubikey-agent.sock";
+      };
+    })
+
+    (mkIf pkgs.stdenv.isDarwin {
+      launchd.agents.yubikey-agent = {
+        enable = true;
+        config = {
+          ProgramArguments = [
+            "${cfg.package}/bin/yubikey-agent"
+            "-l"
+            "/tmp/yubikey-agent.sock"
+          ];
+
+          KeepAlive = {
+            Crashed = true;
+            SuccessfulExit = false;
+          };
+          ProcessType = "Background";
+          Sockets = {
+            Listener = {
+              SockPathName = "/tmp/yubikey-agent.sock";
+              SockPathMode = 384; # 0600 in decimal
+            };
+          };
+        };
+      };
+
+      home.sessionVariables = { SSH_AUTH_SOCK = "/tmp/yubikey-agent.sock"; };
+    })
+  ]);
+}
diff --git a/tests/default.nix b/tests/default.nix
index 96625abec..5fba00801 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -263,6 +263,7 @@ in import nmtSrc {
     ./modules/services/imapnotify-darwin
     ./modules/services/nix-gc-darwin
     ./modules/services/ollama/darwin
+    ./modules/services/yubikey-agent-darwin
     ./modules/targets-darwin
   ] ++ lib.optionals isLinux [
     ./modules/config/i18n
@@ -389,6 +390,7 @@ in import nmtSrc {
     ./modules/services/wlsunset
     ./modules/services/wob
     ./modules/services/xsettingsd
+    ./modules/services/yubikey-agent
     ./modules/systemd
     ./modules/targets-linux
   ]);
diff --git a/tests/modules/services/yubikey-agent-darwin/default.nix b/tests/modules/services/yubikey-agent-darwin/default.nix
new file mode 100644
index 000000000..5594aa8e8
--- /dev/null
+++ b/tests/modules/services/yubikey-agent-darwin/default.nix
@@ -0,0 +1 @@
+{ yubikey-agent-darwin = ./service.nix; }
diff --git a/tests/modules/services/yubikey-agent-darwin/service.nix b/tests/modules/services/yubikey-agent-darwin/service.nix
new file mode 100644
index 000000000..aa09695d0
--- /dev/null
+++ b/tests/modules/services/yubikey-agent-darwin/service.nix
@@ -0,0 +1,50 @@
+{ config, ... }:
+
+{
+  services.yubikey-agent = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = "@yubikey-agent@"; };
+  };
+
+  nmt.script = ''
+    serviceFile=LaunchAgents/org.nix-community.home.yubikey-agent.plist
+    assertFileExists "$serviceFile"
+    assertFileContent "$serviceFile" ${
+      builtins.toFile "expected-agent.plist" ''
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+        	<key>KeepAlive</key>
+        	<dict>
+        		<key>Crashed</key>
+        		<true/>
+        		<key>SuccessfulExit</key>
+        		<false/>
+        	</dict>
+        	<key>Label</key>
+        	<string>org.nix-community.home.yubikey-agent</string>
+        	<key>ProcessType</key>
+        	<string>Background</string>
+        	<key>ProgramArguments</key>
+        	<array>
+                        <string>@yubikey-agent@/bin/yubikey-agent</string>
+        		<string>-l</string>
+        		<string>/tmp/yubikey-agent.sock</string>
+        	</array>
+        	<key>Sockets</key>
+        	<dict>
+        		<key>Listener</key>
+        		<dict>
+        			<key>SockPathMode</key>
+        			<integer>384</integer>
+        			<key>SockPathName</key>
+        			<string>/tmp/yubikey-agent.sock</string>
+        		</dict>
+        	</dict>
+        </dict>
+        </plist>
+      ''
+    }
+  '';
+}
diff --git a/tests/modules/services/yubikey-agent/default.nix b/tests/modules/services/yubikey-agent/default.nix
new file mode 100644
index 000000000..d2ff5a353
--- /dev/null
+++ b/tests/modules/services/yubikey-agent/default.nix
@@ -0,0 +1 @@
+{ yubikey-agent = ./service.nix; }
diff --git a/tests/modules/services/yubikey-agent/service.nix b/tests/modules/services/yubikey-agent/service.nix
new file mode 100644
index 000000000..90ff5cc72
--- /dev/null
+++ b/tests/modules/services/yubikey-agent/service.nix
@@ -0,0 +1,49 @@
+{ config, ... }:
+
+{
+  services.yubikey-agent = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = "@yubikey-agent@"; };
+  };
+
+  nmt.script = ''
+    serviceFile=home-files/.config/systemd/user/yubikey-agent.service
+    socketFile=home-files/.config/systemd/user/yubikey-agent.socket
+
+    assertFileExists $serviceFile
+    assertFileExists $socketFile
+
+    assertFileContent $serviceFile ${
+      builtins.toFile "expected-service" ''
+        [Service]
+        ExecStart=@yubikey-agent@/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock
+        ReadWritePaths=%t
+        Type=simple
+
+        [Unit]
+        After=yubikey-agent.socket
+        Description=Seamless ssh-agent for YubiKeys
+        Documentation=https://github.com/FiloSottile/yubikey-agent
+        RefuseManualStart=true
+        Requires=yubikey-agent.socket
+      ''
+    }
+
+    assertFileContent $socketFile ${
+      builtins.toFile "expected-socket" ''
+        [Install]
+        WantedBy=sockets.target
+
+        [Socket]
+        DirectoryMode=0700
+        ListenStream=%t/yubikey-agent/yubikey-agent.sock
+        RuntimeDirectory=yubikey-agent
+        SocketMode=0600
+
+        [Unit]
+        Description=Unix domain socket for Yubikey SSH agent
+        Documentation=https://github.com/FiloSottile/yubikey-agent
+      ''
+    }
+  '';
+}

From 67b9f9de22c78bd1d2cf45583bfb18470d1d3ef8 Mon Sep 17 00:00:00 2001
From: Sof <128620044+0x50F1A@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:16:26 -0700
Subject: [PATCH 373/546] vscode: add windsurf directories (#6427)

---
 modules/programs/vscode.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index f77937d66..fec69aac5 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -16,6 +16,7 @@ let
     "vscode-insiders" = "Code - Insiders";
     "vscodium" = "VSCodium";
     "openvscode-server" = "OpenVSCode Server";
+    "windsurf" = "Windsurf";
   }.${vscodePname};
 
   extensionDir = {
@@ -23,6 +24,7 @@ let
     "vscode-insiders" = "vscode-insiders";
     "vscodium" = "vscode-oss";
     "openvscode-server" = "openvscode-server";
+    "windsurf" = "windsurf";
   }.${vscodePname};
 
   userDir = if pkgs.stdenv.hostPlatform.isDarwin then

From 6d3163aea47fdb1fe19744e91306a2ea4f602292 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 14 Feb 2025 14:21:52 -0800
Subject: [PATCH 374/546] git: change stateVersion check for compatiblity
 (#6453)

Original change was created before 24.11 release. We are in 25.05 now.
---
 modules/programs/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index b3cb57c28..ff6f3a23d 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -120,8 +120,8 @@ in {
         format = mkOption {
           type = types.enum [ "openpgp" "ssh" "x509" ];
           defaultText = literalExpression ''
-            "openpgp" for state version < 24.11,
-            undefined for state version ≥ 24.11
+            "openpgp" for state version < 25.05,
+            undefined for state version ≥ 25.05
           '';
           description = ''
             The signing method to use when signing commits and tags.
@@ -490,7 +490,7 @@ in {
     (mkIf (cfg.signing != { }) {
       programs.git = {
         signing = {
-          format = mkIf (versionOlder config.home.stateVersion "24.11")
+          format = mkIf (versionOlder config.home.stateVersion "25.05")
             (mkOptionDefault "openpgp");
           signer = mkIf (cfg.signing.format != null) (mkOptionDefault {
             openpgp = getExe config.programs.gpg.package;

From 8bc5e4c9b277e571d6d639d82b0b9335a8e490a9 Mon Sep 17 00:00:00 2001
From: sinavir <sinavir@sinavir.fr>
Date: Thu, 31 Oct 2024 12:57:21 +0100
Subject: [PATCH 375/546] git-maintenance: More details in the documentation

Signed-off-by: Sumner Evans <me@sumnerevans.com>
---
 modules/programs/git.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index ff6f3a23d..6de8e812d 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -222,6 +222,9 @@ in {
           description = ''
             Enable the automatic {command}`git maintenance`.
 
+            If you have SSH remotes, set {option}`programs.git.package` to a
+            git version with SSH support (eg: `pkgs.gitFull`).
+
             See <https://git-scm.com/docs/git-maintenance>.
           '';
         };

From 53efb68b4b098a37b1584757e2e7f4119d7ad92c Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:21:38 +0200
Subject: [PATCH 376/546] move syncthing-copy-keys to dedicated variable

This makes it possible to reuse the script in launchd setup.
---
 modules/services/syncthing.nix | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 197d00d0c..323cf1e14 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -46,6 +46,21 @@ let
   install = lib.getExe' pkgs.coreutils "install";
   syncthing = lib.getExe cfg.package;
 
+  copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" ''
+    syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"
+    ${install} -dm700 "$syncthing_dir"
+    ${lib.optionalString (cfg.cert != null) ''
+      ${install} -Dm400 ${
+        toString cfg.cert
+      } "$syncthing_dir/cert.pem"
+    ''}
+    ${lib.optionalString (cfg.key != null) ''
+      ${install} -Dm400 ${
+        toString cfg.key
+      } "$syncthing_dir/key.pem"
+    ''}
+  '';
+
   updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
     set -efu
 
@@ -619,22 +634,7 @@ in {
           };
 
           Service = {
-            ExecStartPre = lib.mkIf (cfg.cert != null || cfg.key != null) "+${
-                pkgs.writers.writeBash "syncthing-copy-keys" ''
-                  syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"
-                  ${install} -dm700 "$syncthing_dir"
-                  ${lib.optionalString (cfg.cert != null) ''
-                    ${install} -Dm400 ${
-                      toString cfg.cert
-                    } "$syncthing_dir/cert.pem"
-                  ''}
-                  ${lib.optionalString (cfg.key != null) ''
-                    ${install} -Dm400 ${
-                      toString cfg.key
-                    } "$syncthing_dir/key.pem"
-                  ''}
-                ''
-              }";
+            ExecStartPre = lib.mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}";
             ExecStart = lib.escapeShellArgs syncthingArgs;
             Restart = "on-failure";
             SuccessExitStatus = [ 3 4 ];

From 17a78d3eeddc70be09b53dfa34357b0845e9d11a Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:28:00 +0200
Subject: [PATCH 377/546] nix variable for syncthing's configuration directory

Is set according to the corresponding OS default, see https://docs.syncthing.net/users/config.html.
---
 modules/services/syncthing.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 323cf1e14..755695890 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -11,6 +11,12 @@ let
 
   isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/";
 
+  # syncthing's configuration directory (see https://docs.syncthing.net/users/config.html)
+  syncthing_dir = if pkgs.stdenv.isDarwin then
+      "$HOME/Library/Application Support/Syncthing"
+    else
+      "\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing";
+
   # Syncthing supports serving the GUI over Unix sockets. If that happens, the
   # API is served over the Unix socket as well.  This function returns the correct
   # curl arguments for the address portion of the curl command for both network
@@ -47,17 +53,16 @@ let
   syncthing = lib.getExe cfg.package;
 
   copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" ''
-    syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"
-    ${install} -dm700 "$syncthing_dir"
+    ${install} -dm700 "${syncthing_dir}"
     ${lib.optionalString (cfg.cert != null) ''
       ${install} -Dm400 ${
         toString cfg.cert
-      } "$syncthing_dir/cert.pem"
+      } "${syncthing_dir}/cert.pem"
     ''}
     ${lib.optionalString (cfg.key != null) ''
       ${install} -Dm400 ${
         toString cfg.key
-      } "$syncthing_dir/key.pem"
+      } "${syncthing_dir}/key.pem"
     ''}
   '';
 
@@ -72,7 +77,7 @@ let
         while
             ! ${pkgs.libxml2}/bin/xmllint \
                 --xpath 'string(configuration/gui/apikey)' \
-                ''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing/config.xml \
+                "${syncthing_dir}/config.xml" \
                 >"$RUNTIME_DIRECTORY/api_key"
         do ${sleep} 1; done
         (${printf} "X-API-Key: "; ${cat} "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"

From 33ffe942525d57310ef64b34e95fb55c1535a7dc Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:36:07 +0200
Subject: [PATCH 378/546] move curl shell function into string variable

Allows us to reuse the function in different scripts.
---
 modules/services/syncthing.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 755695890..f4fe6acdd 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -66,12 +66,7 @@ let
     ''}
   '';
 
-  updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
-    set -efu
-
-    # be careful not to leak secrets in the filesystem or in process listings
-    umask 0077
-
+  curlShellFunction = ''
     curl() {
         # get the api key by parsing the config.xml
         while
@@ -85,6 +80,15 @@ let
             --retry 1000 --retry-delay 1 --retry-all-errors \
             "$@"
     }
+  '';
+
+  updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
+    set -efu
+
+    # be careful not to leak secrets in the filesystem or in process listings
+    umask 0077
+
+    ${curlShellFunction}
   '' +
 
     /* Syncthing's rest API for the folders and devices is almost identical.

From 26454abc03b7fbdeccd63f7696ebd451c74c4f7d Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:47:37 +0200
Subject: [PATCH 379/546] provide RUNTIME_DIRECTORY manually if not given by
 systemd

---
 modules/services/syncthing.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index f4fe6acdd..a39fe95fc 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -50,6 +50,7 @@ let
   cat = lib.getExe' pkgs.coreutils "cat";
   curl = lib.getExe pkgs.curl;
   install = lib.getExe' pkgs.coreutils "install";
+  mktemp = lib.getExe' pkgs.coreutils "mktemp";
   syncthing = lib.getExe cfg.package;
 
   copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" ''
@@ -67,6 +68,10 @@ let
   '';
 
   curlShellFunction = ''
+    # systemd sets and creates RUNTIME_DIRECTORY on Linux
+    # on Darwin, we create it manually via mktemp
+    RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:=$(${mktemp} -d)}"
+
     curl() {
         # get the api key by parsing the config.xml
         while

From 14223a82611b14ee9a98c7725e76b5e51629c11d Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 21:07:07 +0200
Subject: [PATCH 380/546] refactor launchd.agents.syncthing

Make launchd.agents an explicit attribute set, since we're going to add another agent.
---
 modules/services/syncthing.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index a39fe95fc..259aac592 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -687,15 +687,17 @@ in {
         };
       };
 
-      launchd.agents.syncthing = {
-        enable = true;
-        config = {
-          ProgramArguments = syncthingArgs;
-          KeepAlive = {
-            Crashed = true;
-            SuccessfulExit = false;
+      launchd.agents = {
+        syncthing = {
+          enable = true;
+          config = {
+            ProgramArguments = syncthingArgs;
+            KeepAlive = {
+              Crashed = true;
+              SuccessfulExit = false;
+            };
+            ProcessType = "Background";
           };
-          ProcessType = "Background";
         };
       };
     })

From 85e9d1cc8fa7be999c6fb05818154806e4e053c1 Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Thu, 29 Aug 2024 21:57:51 +0200
Subject: [PATCH 381/546] syncthing: expand declarative config to Darwin

This extends the recently merged PR #5616, which expanded the Synching config to allow declarative settings under Linux, such that it also works under Darwin.

Changes:
* Update the module's `syncthing` launchd agent to copy the synching key/certificate before starting syncthing, analogously to the systemd service from the above mentioned PR #5616.
* Adds an `syncthing-init`launchd agent (analogously to the systemd service `synching-init` from the above mentioned PR #5616) that updates the configuration files. Since this must be run after the syncthing service started, we use a `WatchPath` to coordinate both launchd agents.
---
 modules/services/syncthing.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 259aac592..062b5cafe 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -202,7 +202,6 @@ in {
     services.syncthing = {
       enable = mkEnableOption ''
         Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync.
-        Further declarative configuration options only supported on Linux devices.
       '';
 
       cert = mkOption {
@@ -687,11 +686,20 @@ in {
         };
       };
 
-      launchd.agents = {
+      launchd.agents = let
+        # agent `syncthing` uses `${syncthing_dir}/${watch_file}` to notify agent `syncthing-init`
+        watch_file = ".launchd_update_config";
+      in {
         syncthing = {
           enable = true;
           config = {
-            ProgramArguments = syncthingArgs;
+            ProgramArguments = [ "${
+              pkgs.writers.writeBash "syncthing-wrapper" ''
+                ${copyKeys}                               # simulate systemd's `syncthing-init.Service.ExecStartPre`
+                touch "${syncthing_dir}/${watch_file}"    # notify syncthing-init agent
+                exec ${lib.escapeShellArgs syncthingArgs}
+              ''
+            }" ];
             KeepAlive = {
               Crashed = true;
               SuccessfulExit = false;
@@ -699,6 +707,14 @@ in {
             ProcessType = "Background";
           };
         };
+
+        syncthing-init = {
+          enable = true;
+          config = {
+            ProgramArguments = [ "${updateConfig}" ];
+            WatchPaths = [ "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}" ];
+          };
+        };
       };
     })
 

From 45c07fcf7d28b5fb3ee189c260dee0a2e4d14317 Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:54:25 +0100
Subject: [PATCH 382/546] formatting according to HM's format tool

---
 modules/services/syncthing.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 062b5cafe..72c578ba1 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -13,9 +13,9 @@ let
 
   # syncthing's configuration directory (see https://docs.syncthing.net/users/config.html)
   syncthing_dir = if pkgs.stdenv.isDarwin then
-      "$HOME/Library/Application Support/Syncthing"
-    else
-      "\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing";
+    "$HOME/Library/Application Support/Syncthing"
+  else
+    "\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing";
 
   # Syncthing supports serving the GUI over Unix sockets. If that happens, the
   # API is served over the Unix socket as well.  This function returns the correct
@@ -56,14 +56,10 @@ let
   copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" ''
     ${install} -dm700 "${syncthing_dir}"
     ${lib.optionalString (cfg.cert != null) ''
-      ${install} -Dm400 ${
-        toString cfg.cert
-      } "${syncthing_dir}/cert.pem"
+      ${install} -Dm400 ${toString cfg.cert} "${syncthing_dir}/cert.pem"
     ''}
     ${lib.optionalString (cfg.key != null) ''
-      ${install} -Dm400 ${
-        toString cfg.key
-      } "${syncthing_dir}/key.pem"
+      ${install} -Dm400 ${toString cfg.key} "${syncthing_dir}/key.pem"
     ''}
   '';
 
@@ -647,7 +643,8 @@ in {
           };
 
           Service = {
-            ExecStartPre = lib.mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}";
+            ExecStartPre =
+              lib.mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}";
             ExecStart = lib.escapeShellArgs syncthingArgs;
             Restart = "on-failure";
             SuccessExitStatus = [ 3 4 ];
@@ -693,13 +690,13 @@ in {
         syncthing = {
           enable = true;
           config = {
-            ProgramArguments = [ "${
-              pkgs.writers.writeBash "syncthing-wrapper" ''
+            ProgramArguments = [
+              "${pkgs.writers.writeBash "syncthing-wrapper" ''
                 ${copyKeys}                               # simulate systemd's `syncthing-init.Service.ExecStartPre`
                 touch "${syncthing_dir}/${watch_file}"    # notify syncthing-init agent
                 exec ${lib.escapeShellArgs syncthingArgs}
-              ''
-            }" ];
+              ''}"
+            ];
             KeepAlive = {
               Crashed = true;
               SuccessfulExit = false;
@@ -712,7 +709,9 @@ in {
           enable = true;
           config = {
             ProgramArguments = [ "${updateConfig}" ];
-            WatchPaths = [ "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}" ];
+            WatchPaths = [
+              "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}"
+            ];
           };
         };
       };

From eb44c1601ed99896525e983bc9b15eb8b4d5879e Mon Sep 17 00:00:00 2001
From: Devin <90054389+justDeeevin@users.noreply.github.com>
Date: Sat, 15 Feb 2025 22:34:21 -0500
Subject: [PATCH 383/546] nixpkgs-disabled: fix `useGlobalPkgs` assertion
 (#6172)

This fixes the assertion that `config.nixpkgs` cannot be set if
`useGlobalPkgs` is enabled
---
 modules/misc/nixpkgs-disabled.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs-disabled.nix b/modules/misc/nixpkgs-disabled.nix
index ab0f35df7..09afc446e 100644
--- a/modules/misc/nixpkgs-disabled.nix
+++ b/modules/misc/nixpkgs-disabled.nix
@@ -64,7 +64,7 @@ in {
 
   config = {
     assertions = [{
-      assertion = cfg.config == null || cfg.overlays == null;
+      assertion = cfg.config == null && cfg.overlays == null;
       message = ''
         `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
       '';

From ec130e700959ee10b63eedbc87758d20264a9588 Mon Sep 17 00:00:00 2001
From: Kilian Mio <86004375+Mikilio@users.noreply.github.com>
Date: Sun, 16 Feb 2025 17:44:50 +0100
Subject: [PATCH 384/546] firefox: correct vendorPath of firefox forks (#6421)

The path for messaging hosts seems to have been
~/.mozilla/native-messaging-hosts/ and ~/Library/Application Support/Mozilla so vendorPath has been adjusted
---
 modules/programs/floorp.nix    | 7 +++++--
 modules/programs/librewolf.nix | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix
index 0f231bdf4..f96b4bd74 100644
--- a/modules/programs/floorp.nix
+++ b/modules/programs/floorp.nix
@@ -21,9 +21,12 @@ in {
 
       platforms.linux = {
         configPath = ".floorp";
-        vendorPath = ".floorp";
+        vendorPath = ".mozilla";
+      };
+      platforms.darwin = {
+        configPath = "Library/Application Support/Floorp";
+        vendorPath = "Library/Application Support/Mozilla";
       };
-      platforms.darwin = { configPath = "Library/Application Support/Floorp"; };
     })
   ];
 }
diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index 7363d9e53..0d2aec3b2 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -30,12 +30,12 @@ in {
       unwrappedPackageName = "librewolf-unwrapped";
 
       platforms.linux = {
-        vendorPath = ".librewolf";
         configPath = ".librewolf";
+        vendorPath = ".mozilla";
       };
       platforms.darwin = {
-        vendorPath = "Library/Application Support/LibreWolf";
         configPath = "Library/Application Support/LibreWolf";
+        vendorPath = "Library/Application Support/Mozilla";
       };
 
       enableBookmarks = false;

From e5bc9c2af1dca75271aeaeb39035ce7a6125c395 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 17 Feb 2025 03:55:03 +0800
Subject: [PATCH 385/546] git: reduce priority of signing.format (#6465)

---
 modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 6de8e812d..e5470ca3e 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -508,7 +508,7 @@ in {
           commit.gpgSign = mkDefault cfg.signing.signByDefault;
           tag.gpgSign = mkDefault cfg.signing.signByDefault;
           gpg = {
-            inherit format;
+            format = mkDefault format;
             ${format}.program = cfg.signing.signer;
           };
         };

From b15e9ec6769d770879759f086dd4e51fae7f2394 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 16 Feb 2025 19:57:15 +0000
Subject: [PATCH 386/546] flake-module: set _class (#6461)

This should *help* prevent bad imports.
---
 flake-module.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake-module.nix b/flake-module.nix
index 980fb31eb..59091dcde 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -18,6 +18,7 @@ in {
         type = types.lazyAttrsOf types.unspecified;
         default = { };
         apply = mapAttrs (k: v: {
+          _class = "homeManager";
           _file = "${toString moduleLocation}#homeManagerModules.${k}";
           imports = [ v ];
         });

From 25870c6600660c93c5aa10f0f328a5eecd60150b Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Mon, 17 Feb 2025 00:56:49 +0000
Subject: [PATCH 387/546] nixos/common: fix `options` reference (#6473)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was resolving to `lib.options.nix.enable.visible or true`,
which is always `true`, and therefore using `nix.enable` where it
shouldn’t be used. Oops…
---
 nixos/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/common.nix b/nixos/common.nix
index d7343fbc4..ddf9a9359 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -1,7 +1,7 @@
 # This module is the common base for the NixOS and nix-darwin modules.
 # For OS-specific configuration, please edit nixos/default.nix or nix-darwin/default.nix instead.
 
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 

From 662fa98bf488daa82ce8dc2bc443872952065ab9 Mon Sep 17 00:00:00 2001
From: bricked <git@bricked.dev>
Date: Mon, 17 Feb 2025 01:39:24 +0000
Subject: [PATCH 388/546] nixpkgs-disabled: warn instead of assert (#6466)

Temporarily fixes backwards compatibility as issued in #6172.
---
 modules/misc/nixpkgs-disabled.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/misc/nixpkgs-disabled.nix b/modules/misc/nixpkgs-disabled.nix
index 09afc446e..70574521a 100644
--- a/modules/misc/nixpkgs-disabled.nix
+++ b/modules/misc/nixpkgs-disabled.nix
@@ -63,11 +63,19 @@ in {
   };
 
   config = {
-    assertions = [{
-      assertion = cfg.config == null && cfg.overlays == null;
-      message = ''
-        `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
-      '';
-    }];
+    assertions = [
+      # TODO: Re-enable assertion after 25.05 (&&)
+      {
+        assertion = cfg.config == null || cfg.overlays == null;
+        message = ''
+          `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled.
+        '';
+      }
+    ];
+
+    warnings = optional ((cfg.config != null) || (cfg.overlays != null)) ''
+      You have set either `nixpkgs.config` or `nixpkgs.overlays` while using `home-manager.useGlobalPkgs`.
+      This will soon not be possible. Please remove all `nixpkgs` options when using `home-manager.useGlobalPkgs`.
+    '';
   };
 }

From 30b9cd6f1a69921e59e71df1214604be62636284 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 17 Feb 2025 10:28:26 +0100
Subject: [PATCH 389/546] mpv: drop old wrapMpv compatibility (#6024)

wrapMpv doesn't exist anymore for a while.
---
 modules/programs/mpv.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix
index e8bcc1446..b62208763 100644
--- a/modules/programs/mpv.nix
+++ b/modules/programs/mpv.nix
@@ -55,10 +55,8 @@ let
 
   mpvPackage = if cfg.scripts == [ ] then
     cfg.package
-  else if hasAttr "wrapMpv" pkgs then
-    pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; }
   else
-    pkgs.mpv.override { scripts = cfg.scripts; };
+    pkgs.mpv.override { inherit (cfg) scripts; };
 
 in {
   options = {
@@ -69,7 +67,7 @@ in {
         type = types.package;
         default = pkgs.mpv;
         example = literalExpression
-          "pkgs.wrapMpv (pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }) { youtubeSupport = true; }";
+          "pkgs.mpv-unwrapped.wrapper { mpv = pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }; youtubeSupport = true; }";
         description = ''
           Package providing mpv.
         '';

From 5c5697b82a8a34f9ce39dd18690c6ef623565fc4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 17 Feb 2025 03:00:03 -0800
Subject: [PATCH 390/546] git: support not configuring signing.format (#6478)

---
 modules/programs/git.nix                      | 52 +++++++++++--------
 .../programs/gh/credential-helper.git.conf    |  6 ---
 tests/modules/programs/git/default.nix        |  1 +
 .../programs/git/git-with-email-expected.conf |  8 +--
 tests/modules/programs/git/git-with-email.nix |  1 -
 .../programs/git/git-with-msmtp-expected.conf |  6 ---
 .../git-with-str-extra-config-expected.conf   |  6 ---
 .../programs/git/git-without-signing.conf     |  3 ++
 .../programs/git/git-without-signing.nix      | 16 ++++++
 9 files changed, 52 insertions(+), 47 deletions(-)
 create mode 100644 tests/modules/programs/git/git-without-signing.conf
 create mode 100644 tests/modules/programs/git/git-without-signing.nix

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index e5470ca3e..fa652258c 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -118,7 +118,7 @@ in {
         };
 
         format = mkOption {
-          type = types.enum [ "openpgp" "ssh" "x509" ];
+          type = types.nullOr (types.enum [ "openpgp" "ssh" "x509" ]);
           defaultText = literalExpression ''
             "openpgp" for state version < 25.05,
             undefined for state version ≥ 25.05
@@ -130,13 +130,13 @@ in {
         };
 
         signByDefault = mkOption {
-          type = types.bool;
-          default = false;
+          type = types.nullOr types.bool;
+          default = null;
           description = "Whether commits and tags should be signed by default.";
         };
 
         signer = mkOption {
-          type = types.str;
+          type = types.nullOr types.str;
           description = "Path to signer binary to use.";
         };
       };
@@ -493,25 +493,35 @@ in {
     (mkIf (cfg.signing != { }) {
       programs.git = {
         signing = {
-          format = mkIf (versionOlder config.home.stateVersion "25.05")
-            (mkOptionDefault "openpgp");
-          signer = mkIf (cfg.signing.format != null) (mkOptionDefault {
-            openpgp = getExe config.programs.gpg.package;
-            ssh = getExe' pkgs.openssh "ssh-keygen";
-            x509 = getExe' config.programs.gpg.package "gpgsm";
-          }.${cfg.signing.format});
+          format = if (versionOlder config.home.stateVersion "25.05") then
+            (mkOptionDefault "openpgp")
+          else
+            null;
+          signer = let
+            defaultSigners = {
+              openpgp = getExe config.programs.gpg.package;
+              ssh = getExe' pkgs.openssh "ssh-keygen";
+              x509 = getExe' config.programs.gpg.package "gpgsm";
+            };
+          in mkIf (cfg.signing.format != null)
+          (mkOptionDefault defaultSigners.${cfg.signing.format});
         };
 
-        iniContent = let inherit (cfg.signing) format;
-        in {
-          user.signingKey = mkIf (cfg.signing.key != null) cfg.signing.key;
-          commit.gpgSign = mkDefault cfg.signing.signByDefault;
-          tag.gpgSign = mkDefault cfg.signing.signByDefault;
-          gpg = {
-            format = mkDefault format;
-            ${format}.program = cfg.signing.signer;
-          };
-        };
+        iniContent = mkMerge [
+          (mkIf (cfg.signing.key != null) {
+            user.signingKey = mkDefault cfg.signing.key;
+          })
+          (mkIf (cfg.signing.signByDefault != null) {
+            commit.gpgSign = mkDefault cfg.signing.signByDefault;
+            tag.gpgSign = mkDefault cfg.signing.signByDefault;
+          })
+          (mkIf (cfg.signing.format != null) {
+            gpg = {
+              format = mkDefault cfg.signing.format;
+              ${cfg.signing.format}.program = mkDefault cfg.signing.signer;
+            };
+          })
+        ];
       };
     })
 
diff --git a/tests/modules/programs/gh/credential-helper.git.conf b/tests/modules/programs/gh/credential-helper.git.conf
index 8b712cd86..299441742 100644
--- a/tests/modules/programs/gh/credential-helper.git.conf
+++ b/tests/modules/programs/gh/credential-helper.git.conf
@@ -1,6 +1,3 @@
-[commit]
-	gpgSign = false
-
 [credential "https://github.com"]
 	helper = "@gh@/bin/gh auth git-credential"
 
@@ -12,6 +9,3 @@
 
 [gpg "openpgp"]
 	program = "path-to-gpg"
-
-[tag]
-	gpgSign = false
diff --git a/tests/modules/programs/git/default.nix b/tests/modules/programs/git/default.nix
index a1211f254..4c7baa6ab 100644
--- a/tests/modules/programs/git/default.nix
+++ b/tests/modules/programs/git/default.nix
@@ -6,5 +6,6 @@
   git-with-signing-key-id-legacy = ./git-with-signing-key-id-legacy.nix;
   git-with-signing-key-id = ./git-with-signing-key-id.nix;
   git-without-signing-key-id = ./git-without-signing-key-id.nix;
+  git-without-signing = ./git-without-signing.nix;
   git-with-hooks = ./git-with-hooks.nix;
 }
diff --git a/tests/modules/programs/git/git-with-email-expected.conf b/tests/modules/programs/git/git-with-email-expected.conf
index d7c40973a..5a0d9a6b5 100644
--- a/tests/modules/programs/git/git-with-email-expected.conf
+++ b/tests/modules/programs/git/git-with-email-expected.conf
@@ -1,11 +1,8 @@
-[commit]
-	gpgSign = false
-
 [gpg]
 	format = "openpgp"
 
 [gpg "openpgp"]
-	program = "path-to-gpg"
+	program = "@gnupg@/bin/gpg"
 
 [sendemail "hm-account"]
 	from = "H. M. Test Jr. <hm@example.org>"
@@ -21,9 +18,6 @@
 	smtpSslCertPath = "/etc/ssl/certs/ca-certificates.crt"
 	smtpUser = "home.manager"
 
-[tag]
-	gpgSign = false
-
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"
diff --git a/tests/modules/programs/git/git-with-email.nix b/tests/modules/programs/git/git-with-email.nix
index c1a375b9b..db6053a53 100644
--- a/tests/modules/programs/git/git-with-email.nix
+++ b/tests/modules/programs/git/git-with-email.nix
@@ -8,7 +8,6 @@
 
   programs.git = {
     enable = true;
-    signing.signer = "path-to-gpg";
     userEmail = "hm@example.com";
     userName = "H. M. Test";
   };
diff --git a/tests/modules/programs/git/git-with-msmtp-expected.conf b/tests/modules/programs/git/git-with-msmtp-expected.conf
index 8cf588c7a..3d636a8b0 100644
--- a/tests/modules/programs/git/git-with-msmtp-expected.conf
+++ b/tests/modules/programs/git/git-with-msmtp-expected.conf
@@ -1,6 +1,3 @@
-[commit]
-	gpgSign = false
-
 [gpg]
 	format = "openpgp"
 
@@ -19,9 +16,6 @@
 	from = "H. M. Test <hm@example.com>"
 	smtpServer = "@msmtp@/bin/msmtp"
 
-[tag]
-	gpgSign = false
-
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"
diff --git a/tests/modules/programs/git/git-with-str-extra-config-expected.conf b/tests/modules/programs/git/git-with-str-extra-config-expected.conf
index 2154bc580..8c9b7ee11 100644
--- a/tests/modules/programs/git/git-with-str-extra-config-expected.conf
+++ b/tests/modules/programs/git/git-with-str-extra-config-expected.conf
@@ -1,17 +1,11 @@
 This can be anything.
 
-[commit]
-	gpgSign = false
-
 [gpg]
 	format = "openpgp"
 
 [gpg "openpgp"]
 	program = "path-to-gpg"
 
-[tag]
-	gpgSign = false
-
 [user]
 	email = "user@example.org"
 	name = "John Doe"
diff --git a/tests/modules/programs/git/git-without-signing.conf b/tests/modules/programs/git/git-without-signing.conf
new file mode 100644
index 000000000..f05c7b6c7
--- /dev/null
+++ b/tests/modules/programs/git/git-without-signing.conf
@@ -0,0 +1,3 @@
+[user]
+	email = "user@example.org"
+	name = "John Doe"
diff --git a/tests/modules/programs/git/git-without-signing.nix b/tests/modules/programs/git/git-without-signing.nix
new file mode 100644
index 000000000..95a70b949
--- /dev/null
+++ b/tests/modules/programs/git/git-without-signing.nix
@@ -0,0 +1,16 @@
+{
+  programs.git = {
+    enable = true;
+    userName = "John Doe";
+    userEmail = "user@example.org";
+  };
+
+  home.stateVersion = "25.05";
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContent home-files/.config/git/config ${
+      ./git-without-signing.conf
+    }
+  '';
+}

From c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9 Mon Sep 17 00:00:00 2001
From: Weathercold <weathercold.scr@proton.me>
Date: Mon, 17 Feb 2025 06:00:43 -0500
Subject: [PATCH 391/546] nh: change flake option type to singleLineStr (#6468)

---
 modules/programs/nh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
index 23d1d67d7..cb3d85e50 100644
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@@ -13,7 +13,7 @@ in {
     package = lib.mkPackageOption pkgs "nh" { };
 
     flake = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
+      type = lib.types.nullOr lib.types.singleLineStr;
       default = null;
       description = ''
         The path that will be used for the {env}`FLAKE` environment variable.

From 9d0d48f4c3d2fb1a8c8607da143bb567a741d914 Mon Sep 17 00:00:00 2001
From: Anton Tetov <anton@tetov.se>
Date: Mon, 17 Feb 2025 15:36:35 +0100
Subject: [PATCH 392/546]  nh: fixes and addition to warnings/assertions
 (#6470)

* nh: fix auto clean

- ~Fix `PATH` variable~
- Remove flake path assertion
- Add warning when HM's `nix.gc.automatic` is enabled

* nh: simplify logic for warning related to cfg.clean

---------

Co-authored-by: Nikita Pedorich <pedorich.n@gmail.com>
---
 modules/programs/nh.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix
index cb3d85e50..7e6e993fd 100644
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@@ -52,15 +52,11 @@ in {
   };
 
   config = {
-    warnings = lib.optionals
-      (osConfig != null && !(cfg.clean.enable -> !osConfig.nix.gc.automatic)) [
-        "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict."
-      ];
-
-    assertions = [{
-      assertion = (cfg.flake != null) -> !(lib.hasSuffix ".nix" cfg.flake);
-      message = "nh.flake must be a directory, not a nix file";
-    }];
+    warnings = (lib.optional
+      (cfg.clean.enable && osConfig != null && osConfig.nix.gc.automatic)
+      "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict.")
+      ++ (lib.optional (cfg.clean.enable && config.nix.gc.automatic)
+        "programs.nh.clean.enable and nix.gc.automatic (Home-Manager) are both enabled. Please use one or the other to avoid conflict.");
 
     home = lib.mkIf cfg.enable {
       packages = [ cfg.package ];

From f4f6dd26985f1e44721325cb6d783d0cf4cd4dbc Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Mon, 17 Feb 2025 11:02:24 -0700
Subject: [PATCH 393/546] git: fix setting format on >=25.05 (#6480)

Signed-off-by: Sumner Evans <me@sumnerevans.com>
Co-authored-by: Immae <immae@users.noreply.github.com>
---
 modules/programs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index fa652258c..ee5980656 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -496,7 +496,7 @@ in {
           format = if (versionOlder config.home.stateVersion "25.05") then
             (mkOptionDefault "openpgp")
           else
-            null;
+            (mkOptionDefault null);
           signer = let
             defaultSigners = {
               openpgp = getExe config.programs.gpg.package;

From edad23ebc1bcc226ef5eb57c8d779b9b425adca1 Mon Sep 17 00:00:00 2001
From: Ilia <43654815+istudyatuni@users.noreply.github.com>
Date: Mon, 17 Feb 2025 22:10:04 +0300
Subject: [PATCH 394/546] mako: add max-history option (#6009)

---
 modules/services/mako.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/mako.nix b/modules/services/mako.nix
index e3298d837..df6532274 100644
--- a/modules/services/mako.nix
+++ b/modules/services/mako.nix
@@ -33,6 +33,15 @@ in {
         '';
       };
 
+      maxHistory = mkOption {
+        default = 5;
+        type = types.nullOr types.int;
+        description = ''
+          Set maximum number of expired notifications to keep in the history
+          buffer. Set 0 to disable history.
+        '';
+      };
+
       sort = mkOption {
         default = "-time";
         type =
@@ -315,6 +324,7 @@ in {
       '';
       text = ''
         ${optionalInteger "max-visible" cfg.maxVisible}
+        ${optionalInteger "max-history" cfg.maxHistory}
         ${optionalString "sort" cfg.sort}
         ${optionalString "output" cfg.output}
         ${optionalString "layer" cfg.layer}

From 3a0cf8f1aae507ec9bb8c141369458ca0244a01b Mon Sep 17 00:00:00 2001
From: HPsaucii <me@hpsaucii.dev>
Date: Fri, 31 Jan 2025 09:04:47 +0000
Subject: [PATCH 395/546] maintainers: add HPsaucii

---
 modules/lib/maintainers.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 7708248c7..52da8f0b0 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -5,7 +5,6 @@
 # are expected to be follow the same format as described in [1].
 #
 # [1] https://github.com/NixOS/nixpkgs/blob/fca0d6e093c82b31103dc0dacc48da2a9b06e24b/maintainers/maintainer-list.nix#LC1
-
 {
   aabccd021 = {
     name = "Muhamad Abdurahman";
@@ -658,4 +657,14 @@
     github = "ckgxrg-salt";
     githubId = 165614491;
   };
+  HPsaucii = {
+    name = "Holly Powell";
+    email = "me@hpsaucii.dev";
+    github = "HPsaucii";
+    githubId = 126502193;
+    keys = [{
+      longkeyid = "rsa4096/0xEDB2C634166AE6AD";
+      fingerprint = "AD32 73D4 5E0E 9478 E826  543F EDB2 C634 166A E6AD";
+    }];
+  };
 }

From 27ffa35178bc6f359293a8809d32c5da23aaabc7 Mon Sep 17 00:00:00 2001
From: HPsaucii <me@hpsaucii.dev>
Date: Fri, 31 Jan 2025 09:22:38 +0000
Subject: [PATCH 396/546] firefox: add support for configuring extensions

This commit refactors programs.firefox.profiles.<name>.extensions in
order to support both installation of extensions (addons) and their
configuration. It does this by setting the
`extensions.webextensions.ExtensionStorageIDB.enabled` user_pref to
false.

When this preference is set to false, support for storing extension
settings in sqlite databases, also known as IndexedDB or IDB, is
reverted back to the JSON format present in firefox versions prior to
version 63, as seen here:
https://blog.mozilla.org/addons/2018/08/03/new-backend-for-storage-local-api/

IndexedDB was made the default due to performance improvements, but had
the consequence of removing any possibility of declarative extension
configuration without the assistance of firefox's policy system. The
policy system is supported by a small amount of extensions, such as
uBlock Origin, but has to be explicitly supported. Even when supported,
it provides significantly less granular control when compared to the
JSON storage format.
---
 modules/programs/firefox.nix                  |   7 +-
 modules/programs/firefox/mkFirefoxModule.nix  | 229 ++++++++++++------
 .../firefox/profiles/extensions/default.nix   |  31 +++
 .../profiles/extensions/expected-storage.js   |   1 +
 4 files changed, 190 insertions(+), 78 deletions(-)
 create mode 100644 tests/modules/programs/firefox/profiles/extensions/default.nix
 create mode 100644 tests/modules/programs/firefox/profiles/extensions/expected-storage.js

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 2a2667c35..853c3385b 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -1,15 +1,11 @@
 { lib, ... }:
-
 with lib;
-
 let
-
   modulePath = [ "programs" "firefox" ];
 
   moduleName = concatStringsSep "." modulePath;
 
   mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
-
 in {
   meta.maintainers = [ maintainers.rycee hm.maintainers.bricked ];
 
@@ -32,14 +28,13 @@ in {
     })
 
     (mkRemovedOptionModule (modulePath ++ [ "extensions" ]) ''
-
       Extensions are now managed per-profile. That is, change from
 
         ${moduleName}.extensions = [ foo bar ];
 
       to
 
-        ${moduleName}.profiles.myprofile.extensions = [ foo bar ];'')
+        ${moduleName}.profiles.myprofile.extensions.packages = [ foo bar ];'')
     (mkRemovedOptionModule (modulePath ++ [ "enableAdobeFlash" ])
       "Support for this option has been removed.")
     (mkRemovedOptionModule (modulePath ++ [ "enableGoogleTalk" ])
diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 76954dd9c..115af89d9 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -1,13 +1,9 @@
 { modulePath, name, description ? null, wrappedPackageName ? null
 , unwrappedPackageName ? null, platforms, visible ? false
-, enableBookmarks ? true }:
-
+, enableBookmarks ? true, }:
 { config, lib, pkgs, ... }:
-
 with lib;
-
 let
-
   inherit (pkgs.stdenv.hostPlatform) isDarwin;
 
   appName = name;
@@ -77,11 +73,13 @@ let
     else
       builtins.toJSON pref);
 
-  mkUserJs = prePrefs: prefs: extraPrefs: bookmarks:
+  mkUserJs = prePrefs: prefs: extraPrefs: bookmarks: extensions:
     let
       prefs' = lib.optionalAttrs ([ ] != bookmarks) {
         "browser.bookmarks.file" = toString (browserBookmarksFile bookmarks);
         "browser.places.importBookmarksHTML" = true;
+      } // lib.optionalAttrs (extensions != { }) {
+        "extensions.webextensions.ExtensionStorageIDB.enabled" = false;
       } // prefs;
     in ''
       // Generated by Home Manager.
@@ -218,7 +216,6 @@ let
 
       # The configuration expected by the Firefox wrapper builder.
       bcfg = setAttrByPath [ browserName ] fcfg;
-
     in if package == null then
       null
     else if isDarwin then
@@ -230,7 +227,6 @@ let
       })
     else
       (pkgs.wrapFirefox.override { config = bcfg; }) package { };
-
 in {
   options = setAttrByPath modulePath {
     enable = mkOption {
@@ -242,7 +238,7 @@ in {
           optionalString (description != null) " ${description}"
         }
         ${optionalString (!visible)
-        "See `programs.firefox` for more configuration options."}
+        "See `${moduleName}` for more configuration options."}
       '';
     };
 
@@ -667,37 +663,114 @@ in {
               for more information.
             '';
           };
-
           extensions = mkOption {
-            type = types.listOf types.package;
-            default = [ ];
-            example = literalExpression ''
-              with pkgs.nur.repos.rycee.firefox-addons; [
-                privacy-badger
-              ]
-            '';
+            type = types.coercedTo (types.listOf types.package) (packages: {
+              packages = mkIf (builtins.length packages > 0) (warn ''
+                In order to support declarative extension configuration,
+                extension installation has been moved from
+                ${moduleName}.profiles.<profile>.extensions
+                to
+                ${moduleName}.profiles.<profile>.extensions.packages
+              '' packages);
+            }) (types.submodule {
+              options = {
+                packages = mkOption {
+                  type = types.listOf types.package;
+                  default = [ ];
+                  example = literalExpression ''
+                    with pkgs.nur.repos.rycee.firefox-addons; [
+                      privacy-badger
+                    ]
+                  '';
+                  description = ''
+                    List of ${name} add-on packages to install for this profile.
+                    Some pre-packaged add-ons are accessible from the Nix User Repository.
+                    Once you have NUR installed run
+
+                    ```console
+                    $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
+                    ```
+
+                    to list the available ${name} add-ons.
+
+                    Note that it is necessary to manually enable these extensions
+                    inside ${name} after the first installation.
+
+                    To automatically enable extensions add
+                    `"extensions.autoDisableScopes" = 0;`
+                    to
+                    [{option}`${moduleName}.profiles.<profile>.settings`](#opt-${moduleName}.profiles._name_.settings)
+                  '';
+                };
+
+                settings = mkOption {
+                  default = { };
+                  example = literalExpression ''
+                    {
+                      # Example with uBlock origin's extensionID
+                      "uBlock0@raymondhill.net".settings = {
+                        selectedFilterLists = [
+                          "ublock-filters"
+                          "ublock-badware"
+                          "ublock-privacy"
+                          "ublock-unbreak"
+                          "ublock-quick-fixes"
+                        ];
+                      };
+
+                      # Example with Stylus' UUID-form extensionID
+                      "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}".settings = {
+                        dbInChromeStorage = true; # required for Stylus
+                      }
+                    }
+                  '';
+                  description = ''
+                    Attribute set of options for each extension.
+                    The keys of the attribute set consist of the ID of the extension
+                    or its UUID wrapped in curly braces.
+                  '';
+                  type = types.attrsOf (types.submodule {
+                    options = {
+                      settings = mkOption {
+                        type = types.attrsOf jsonFormat.type;
+                        description =
+                          "Json formatted options for the specified extensionID";
+                      };
+                      force = mkOption {
+                        type = types.bool;
+                        default = false;
+                        example = true;
+                        description = ''
+                          Forcibly override any existing configuration for
+                          this extension.
+                        '';
+                      };
+                    };
+                  });
+                };
+              };
+            });
+            default = { };
             description = ''
-              List of ${appName} add-on packages to install for this profile.
-              Some pre-packaged add-ons are accessible from the
-              [Nix User Repository](https://github.com/nix-community/NUR).
-              Once you have NUR installed run
-
-              ```console
-              $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
-              ```
-
-              to list the available ${appName} add-ons.
-
-              Note that it is necessary to manually enable these extensions
-              inside ${appName} after the first installation.
-
-              To automatically enable extensions add
-              `"extensions.autoDisableScopes" = 0;`
-              to
-              [{option}`${moduleName}.profiles.<profile>.settings`](#opt-${moduleName}.profiles._name_.settings)
+              Submodule for installing and configuring extensions.
+            '';
+            example = literalExpression ''
+              {
+                packages = with pkgs.nur.repos.rycee.firefox-addons; [
+                  ublock-origin
+                ];
+                settings."uBlock0@raymondhill.net".settings = {
+                  selectedFilterLists = [
+                    "ublock-filters"
+                    "ublock-badware"
+                    "ublock-privacy"
+                    "ublock-unbreak"
+                    "ublock-quick-fixes"
+                  ];
+                };
+              }
             '';
           };
-
         };
       }));
       default = { };
@@ -748,7 +821,7 @@ in {
       {
         assertion = cfg.languagePacks == [ ] || cfg.package != null;
         message = ''
-          'programs.firefox.languagePacks' requires 'programs.firefox.package'
+          '${moduleName}.languagePacks' requires '${moduleName}.package'
           to be set to a non-null value.
         '';
       }
@@ -776,47 +849,59 @@ in {
           "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
         recursive = true;
       };
-    } ++ flip mapAttrsToList cfg.profiles (_: profile: {
-      "${profilesPath}/${profile.path}/.keep".text = "";
+    } ++ flip mapAttrsToList cfg.profiles (_: profile:
+      # Merge the regular profile settings with extension settings
+      mkMerge ([{
+        "${profilesPath}/${profile.path}/.keep".text = "";
 
-      "${profilesPath}/${profile.path}/chrome/userChrome.css" =
-        mkIf (profile.userChrome != "") { text = profile.userChrome; };
+        "${profilesPath}/${profile.path}/chrome/userChrome.css" =
+          mkIf (profile.userChrome != "") { text = profile.userChrome; };
 
-      "${profilesPath}/${profile.path}/chrome/userContent.css" =
-        mkIf (profile.userContent != "") { text = profile.userContent; };
+        "${profilesPath}/${profile.path}/chrome/userContent.css" =
+          mkIf (profile.userContent != "") { text = profile.userContent; };
 
-      "${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig != ""
-        || profile.settings != { } || profile.extraConfig != ""
-        || profile.bookmarks != [ ]) {
-          text = mkUserJs profile.preConfig profile.settings profile.extraConfig
-            profile.bookmarks;
-        };
+        "${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig
+          != "" || profile.settings != { } || profile.extraConfig != ""
+          || profile.bookmarks != [ ]) {
+            text =
+              mkUserJs profile.preConfig profile.settings profile.extraConfig
+              profile.bookmarks profile.extensions.settings;
+          };
 
-      "${profilesPath}/${profile.path}/containers.json" =
-        mkIf (profile.containers != { }) {
-          text = mkContainersJson profile.containers;
-          force = profile.containersForce;
-        };
+        "${profilesPath}/${profile.path}/containers.json" =
+          mkIf (profile.containers != { }) {
+            text = mkContainersJson profile.containers;
+            force = profile.containersForce;
+          };
 
-      "${profilesPath}/${profile.path}/search.json.mozlz4" =
-        mkIf (profile.search.enable) {
-          enable = profile.search.enable;
-          force = profile.search.force;
-          source = profile.search.file;
-        };
+        "${profilesPath}/${profile.path}/search.json.mozlz4" =
+          mkIf (profile.search.enable) {
+            enable = profile.search.enable;
+            force = profile.search.force;
+            source = profile.search.file;
+          };
 
-      "${profilesPath}/${profile.path}/extensions" =
-        mkIf (profile.extensions != [ ]) {
-          source = let
-            extensionsEnvPkg = pkgs.buildEnv {
-              name = "hm-firefox-extensions";
-              paths = profile.extensions;
-            };
-          in "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
-          recursive = true;
-          force = true;
-        };
-    }));
+        "${profilesPath}/${profile.path}/extensions" =
+          mkIf (profile.extensions.packages != [ ]) {
+            source = let
+              extensionsEnvPkg = pkgs.buildEnv {
+                name = "hm-firefox-extensions";
+                paths = profile.extensions.packages;
+              };
+            in "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
+            recursive = true;
+            force = true;
+          };
+      }] ++
+        # Add extension settings as separate attributes
+        optional (profile.extensions.settings != { }) (mkMerge (mapAttrsToList
+          (name: settingConfig: {
+            "${profilesPath}/${profile.path}/browser-extension-data/${name}/storage.js" =
+              {
+                force = settingConfig.force;
+                text = generators.toJSON { } settingConfig.settings;
+              };
+          }) profile.extensions.settings)))));
   } // setAttrByPath modulePath {
     finalPackage = wrapPackage cfg.package;
 
diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix
new file mode 100644
index 000000000..577518390
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/extensions/default.nix
@@ -0,0 +1,31 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.extensions = {
+      extensions.settings."uBlock0@raymondhill.net".settings = {
+        selectedFilterLists = [
+          "ublock-filters"
+          "ublock-badware"
+          "ublock-privacy"
+          "ublock-unbreak"
+          "ublock-quick-fixes"
+        ];
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileContent \
+        home-files/${cfg.configPath}/extensions/uBlock0@raymondhill.net/storage.js \
+        ${./expected-storage.js}
+    '';
+  });
+}
diff --git a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js
new file mode 100644
index 000000000..66c2a8d0f
--- /dev/null
+++ b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js
@@ -0,0 +1 @@
+{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]}

From 6c93eea85daddd0dc8d4a3a687473461f3122961 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 17 Feb 2025 13:24:01 -0600
Subject: [PATCH 397/546] firefox: add HPSaucii maintainer

---
 modules/programs/firefox.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 853c3385b..9379a2b9b 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -7,7 +7,8 @@ let
 
   mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
 in {
-  meta.maintainers = [ maintainers.rycee hm.maintainers.bricked ];
+  meta.maintainers =
+    [ maintainers.rycee hm.maintainers.bricked hm.maintainers.HPsaucii ];
 
   imports = [
     (mkFirefoxModule {

From 69dfc316c5b5f2de1d68e477393fecbf19a0cdba Mon Sep 17 00:00:00 2001
From: ljyoth <ljyoth@users.noreply.github.com>
Date: Mon, 17 Feb 2025 20:36:02 -0500
Subject: [PATCH 398/546] mise: enable nushell integration (#6363)

---
 modules/programs/mise.nix                     | 14 +++++++++++++
 tests/modules/programs/mise/default.nix       |  1 +
 .../programs/mise/nushell-integration.nix     | 21 +++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 tests/modules/programs/mise/nushell-integration.nix

diff --git a/modules/programs/mise.nix b/modules/programs/mise.nix
index e0d1b1c8b..67b0a4b57 100644
--- a/modules/programs/mise.nix
+++ b/modules/programs/mise.nix
@@ -21,6 +21,7 @@ in {
     "enableBashIntegration"
     "enableZshIntegration"
     "enableFishIntegration"
+    "enableNushellIntegration"
     "settings"
   ];
 
@@ -39,6 +40,9 @@ in {
       enableZshIntegration =
         lib.hm.shell.mkZshIntegrationOption { inherit config; };
 
+      enableNushellIntegration =
+        lib.hm.shell.mkNushellIntegrationOption { inherit config; };
+
       globalConfig = mkOption {
         type = tomlFormat.type;
         default = { };
@@ -103,6 +107,16 @@ in {
       fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
         ${getExe cfg.package} activate fish | source
       '';
+
+      nushell = mkIf cfg.enableNushellIntegration {
+        extraEnv = ''
+          let mise_path = $nu.default-config-dir | path join mise.nu
+          ^mise activate nu | save $mise_path --force
+        '';
+        extraConfig = ''
+          use ($nu.default-config-dir | path join mise.nu)
+        '';
+      };
     };
   };
 }
diff --git a/tests/modules/programs/mise/default.nix b/tests/modules/programs/mise/default.nix
index 511082a12..402e32639 100644
--- a/tests/modules/programs/mise/default.nix
+++ b/tests/modules/programs/mise/default.nix
@@ -4,4 +4,5 @@
   mise-bash-integration = ./bash-integration.nix;
   mise-zsh-integration = ./zsh-integration.nix;
   mise-fish-integration = ./fish-integration.nix;
+  mise-nushell-integration = ./nushell-integration.nix;
 }
diff --git a/tests/modules/programs/mise/nushell-integration.nix b/tests/modules/programs/mise/nushell-integration.nix
new file mode 100644
index 000000000..926df987e
--- /dev/null
+++ b/tests/modules/programs/mise/nushell-integration.nix
@@ -0,0 +1,21 @@
+{ config, ... }: {
+  programs = {
+    mise = {
+      package = config.lib.test.mkStubPackage { name = "mise"; };
+      enable = true;
+      enableNushellIntegration = true;
+    };
+
+    nushell.enable = true;
+  };
+
+  nmt.script = ''
+    assertFileContains home-files/.config/nushell/env.nu \
+      '
+      let mise_path = $nu.default-config-dir | path join mise.nu
+      ^mise activate nu | save $mise_path --force
+      '
+    assertFileContains home-files/.config/nushell/config.nu \
+      'use ($nu.default-config-dir | path join mise.nu)'
+  '';
+}

From 5cfbf5cc37a3bd1da07ae84eea1b828909c4456b Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 18 Feb 2025 02:20:42 +0000
Subject: [PATCH 399/546] flake: don't import modules (#6481)

since the `imports` attributes of modules allows for paths we can remove
the `import` making the consumption of nixosModules, darwinModules and
flakeModules cheaper
---
 flake.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4b797355e..fdded59de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,21 +6,21 @@
   outputs = { self, nixpkgs, ... }:
     {
       nixosModules = rec {
-        home-manager = import ./nixos;
+        home-manager = ./nixos;
         default = home-manager;
       };
       # deprecated in Nix 2.8
       nixosModule = self.nixosModules.default;
 
       darwinModules = rec {
-        home-manager = import ./nix-darwin;
+        home-manager = ./nix-darwin;
         default = home-manager;
       };
       # unofficial; deprecated in Nix 2.8
       darwinModule = self.darwinModules.default;
 
       flakeModules = rec {
-        home-manager = import ./flake-module.nix;
+        home-manager = ./flake-module.nix;
         default = home-manager;
       };
 

From a135aae1be749a10227413f9eb944a6f887dab86 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 18 Feb 2025 11:46:26 -0800
Subject: [PATCH 400/546] flake.nix: remove deprecations (#6485)

Multiple stable releases removed from inception. Don't need to keep it
around anymore.
---
 flake.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index fdded59de..918507dde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,15 +9,11 @@
         home-manager = ./nixos;
         default = home-manager;
       };
-      # deprecated in Nix 2.8
-      nixosModule = self.nixosModules.default;
 
       darwinModules = rec {
         home-manager = ./nix-darwin;
         default = home-manager;
       };
-      # unofficial; deprecated in Nix 2.8
-      darwinModule = self.darwinModules.default;
 
       flakeModules = rec {
         home-manager = ./flake-module.nix;
@@ -25,10 +21,7 @@
       };
 
       templates = {
-        standalone = {
-          path = ./templates/standalone;
-          description = "Standalone setup";
-        };
+        default = self.templates.standalone;
         nixos = {
           path = ./templates/nixos;
           description = "Home Manager as a NixOS module,";
@@ -37,10 +30,12 @@
           path = ./templates/nix-darwin;
           description = "Home Manager as a nix-darwin module,";
         };
+        standalone = {
+          path = ./templates/standalone;
+          description = "Standalone setup";
+        };
       };
 
-      defaultTemplate = self.templates.standalone;
-
       lib = import ./lib { inherit (nixpkgs) lib; };
     } // (let
       forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
@@ -69,7 +64,5 @@
           docs-json = docs.options.json;
           docs-manpages = docs.manPages;
         });
-
-      defaultPackage = forAllSystems (system: self.packages.${system}.default);
     });
 }

From 4044ad191fb07bf3b17714d6aedec1960bc079d4 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 18 Feb 2025 21:22:42 +0000
Subject: [PATCH 401/546] fish: accept multiple events (#6489)

---
 modules/programs/fish.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 02141042d..1fb313a86 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -66,7 +66,7 @@ let
       };
 
       onEvent = mkOption {
-        type = with types; nullOr str;
+        type = with types; nullOr (either str (listOf str));
         default = null;
         description = ''
           Tells fish to run this function when the specified named event is
@@ -511,7 +511,7 @@ in {
 
             mods = with def;
               modifierStr "description" description ++ modifierStr "wraps" wraps
-              ++ modifierStr "on-event" onEvent
+              ++ lib.concatMap (modifierStr "on-event") (lib.toList onEvent)
               ++ modifierStr "on-variable" onVariable
               ++ modifierStr "on-job-exit" onJobExit
               ++ modifierStr "on-process-exit" onProcessExit

From 97ac0801d187b2911e8caa45316399de12f6f199 Mon Sep 17 00:00:00 2001
From: bricked <git@bricked.dev>
Date: Tue, 18 Feb 2025 21:24:24 +0000
Subject: [PATCH 402/546] firefox: prevent extensions settings override (#6490)

Prevents extensions settings from accidentally being overriden when
using `profiles.<name>.extensions.settings`. Adds the
`profiles.<name>.extensions.force` option to acknowledge the risk.
---
 modules/programs/firefox/mkFirefoxModule.nix | 26 +++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 115af89d9..db787124c 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -703,6 +703,17 @@ in {
                   '';
                 };
 
+                force = mkOption {
+                  description = ''
+                    Whether to override all previous firefox settings.
+
+                    This is required when using `settings`.
+                  '';
+                  default = false;
+                  example = true;
+                  type = types.bool;
+                };
+
                 settings = mkOption {
                   default = { };
                   example = literalExpression ''
@@ -829,7 +840,20 @@ in {
       (mkNoDuplicateAssertion cfg.profiles "profile")
     ] ++ (mapAttrsToList
       (_: profile: mkNoDuplicateAssertion profile.containers "container")
-      cfg.profiles);
+      cfg.profiles) ++ (mapAttrsToList (profileName: profile: {
+        assertion = profile.extensions.settings == { }
+          || profile.extensions.force;
+        message = ''
+          Using '${
+            lib.showAttrPath
+            (modulePath ++ [ "profiles" profileName "extensions" "settings" ])
+          }' will override all previous extensions settings.
+          Enable '${
+            lib.showAttrPath
+            (modulePath ++ [ "profiles" profileName "extensions" "force" ])
+          }' to acknowledge this.
+        '';
+      }) cfg.profiles);
 
     warnings = optional (cfg.enableGnomeExtensions or false) ''
       Using '${moduleName}.enableGnomeExtensions' has been deprecated and

From 1c189f011447810af939a886ba7bee33532bb1f9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 19 Feb 2025 11:18:30 -0800
Subject: [PATCH 403/546] tests/home-cursor: init (#6496)

Working on module and needed test to verify expected behavior.
---
 tests/default.nix                             |  1 +
 tests/modules/config/home-cursor/default.nix  | 49 +++++++++++++++++++
 .../config/home-cursor/expected-index.theme   |  3 ++
 3 files changed, 53 insertions(+)
 create mode 100644 tests/modules/config/home-cursor/default.nix
 create mode 100644 tests/modules/config/home-cursor/expected-index.theme

diff --git a/tests/default.nix b/tests/default.nix
index 5fba00801..a3d5749df 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -266,6 +266,7 @@ in import nmtSrc {
     ./modules/services/yubikey-agent-darwin
     ./modules/targets-darwin
   ] ++ lib.optionals isLinux [
+    ./modules/config/home-cursor
     ./modules/config/i18n
     ./modules/i18n/input-method
     ./modules/misc/debug
diff --git a/tests/modules/config/home-cursor/default.nix b/tests/modules/config/home-cursor/default.nix
new file mode 100644
index 000000000..08cde5452
--- /dev/null
+++ b/tests/modules/config/home-cursor/default.nix
@@ -0,0 +1,49 @@
+{
+  # Ensure backwards compatibility with existing configs
+  home-cursor-legacy = { realPkgs, ... }: {
+    config = {
+      home.pointerCursor = {
+        package = realPkgs.catppuccin-cursors.macchiatoBlue;
+        name = "catppuccin-macchiato-blue-standard";
+        size = 64;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        x11.enable = true;
+      };
+
+      home.stateVersion = "24.11";
+
+      nmt.script = ''
+        assertFileContent \
+          home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \
+          ${./expected-index.theme}
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"'
+      '';
+    };
+  };
+
+  home-cursor-legacy-disabled = { ... }: {
+    config = {
+      home.pointerCursor = null;
+
+      home.stateVersion = "24.11";
+
+      nmt.script = ''
+        assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"'
+      '';
+    };
+  };
+}
diff --git a/tests/modules/config/home-cursor/expected-index.theme b/tests/modules/config/home-cursor/expected-index.theme
new file mode 100644
index 000000000..7ce17e0b2
--- /dev/null
+++ b/tests/modules/config/home-cursor/expected-index.theme
@@ -0,0 +1,3 @@
+[Icon Theme]
+Name=Catppuccin Macchiato Blue
+Comment=based on Volantes Cursors

From 0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 20 Feb 2025 14:12:30 +0000
Subject: [PATCH 404/546] flake-module: use raw for homeConfgurations and
 deferredModule for modules (#6504)

---
 flake-module.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake-module.nix b/flake-module.nix
index 59091dcde..269add846 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -4,7 +4,7 @@ in {
   options = {
     flake = flake-parts-lib.mkSubmoduleOptions {
       homeConfigurations = mkOption {
-        type = types.lazyAttrsOf types.deferredModule;
+        type = types.lazyAttrsOf types.raw;
         default = { };
         description = ''
           Instantiated Home Manager configurations.
@@ -15,7 +15,7 @@ in {
         '';
       };
       homeManagerModules = mkOption {
-        type = types.lazyAttrsOf types.unspecified;
+        type = types.lazyAttrsOf types.deferredModule;
         default = { };
         apply = mapAttrs (k: v: {
           _class = "homeManager";

From 3c82285348bc811b723014cf4dba2f87e7ffc885 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Fri, 21 Feb 2025 10:48:51 -0300
Subject: [PATCH 405/546] vinegar: add module (#6494)

---
 modules/modules.nix                           |  1 +
 modules/programs/vinegar.nix                  | 50 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/vinegar/default.nix    |  4 ++
 .../programs/vinegar/empty-settings.nix       |  7 +++
 .../vinegar/example-config-expected.toml      | 13 +++++
 .../programs/vinegar/example-settings.nix     | 28 +++++++++++
 7 files changed, 104 insertions(+)
 create mode 100644 modules/programs/vinegar.nix
 create mode 100644 tests/modules/programs/vinegar/default.nix
 create mode 100644 tests/modules/programs/vinegar/empty-settings.nix
 create mode 100644 tests/modules/programs/vinegar/example-config-expected.toml
 create mode 100644 tests/modules/programs/vinegar/example-settings.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 156094c85..70a48b853 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -259,6 +259,7 @@ let
     ./programs/vifm.nix
     ./programs/vim-vint.nix
     ./programs/vim.nix
+    ./programs/vinegar.nix
     ./programs/vscode.nix
     ./programs/vscode/haskell.nix
     ./programs/pywal.nix
diff --git a/modules/programs/vinegar.nix b/modules/programs/vinegar.nix
new file mode 100644
index 000000000..5cbf672e9
--- /dev/null
+++ b/modules/programs/vinegar.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+let toml = pkgs.formats.toml { };
+in {
+  meta.maintainers = with lib.maintainers; [ HeitorAugustoLN ];
+
+  options.programs.vinegar = {
+    enable = lib.mkEnableOption "Vinegar";
+
+    package = lib.mkPackageOption pkgs "vinegar" { };
+
+    settings = lib.mkOption {
+      type = lib.types.attrsOf toml.type;
+      default = { };
+      example = {
+        env.WINEFSYNC = "1";
+
+        studio = {
+          dxvk = false;
+          renderer = "Vulkan";
+
+          fflags.DFIntTaskSchedulerTargetFps = 144;
+
+          env = {
+            DXVK_HUD = "0";
+            MANGOHUD = "1";
+          };
+        };
+      };
+      description = ''
+        Configuration written to {file}`$XDG_CONFIG_HOME/vinegar/config.toml`.
+
+        See <https://vinegarhq.org/Configuration/> for more information.
+      '';
+    };
+  };
+
+  config = let cfg = config.programs.vinegar;
+  in lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "programs.vinegar" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."vinegar/config.toml" = lib.mkIf (cfg.settings != { }) {
+      source = toml.generate "vinegar-config.toml" cfg.settings;
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index a3d5749df..5dad7cef3 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -242,6 +242,7 @@ in import nmtSrc {
     ./modules/programs/translate-shell
     ./modules/programs/vifm
     ./modules/programs/vim-vint
+    ./modules/programs/vinegar
     ./modules/programs/vscode
     ./modules/programs/watson
     ./modules/programs/wezterm
diff --git a/tests/modules/programs/vinegar/default.nix b/tests/modules/programs/vinegar/default.nix
new file mode 100644
index 000000000..0916c04ae
--- /dev/null
+++ b/tests/modules/programs/vinegar/default.nix
@@ -0,0 +1,4 @@
+{
+  vinegar-empty-settings = ./empty-settings.nix;
+  vinegar-example-settings = ./example-settings.nix;
+}
diff --git a/tests/modules/programs/vinegar/empty-settings.nix b/tests/modules/programs/vinegar/empty-settings.nix
new file mode 100644
index 000000000..e7a480036
--- /dev/null
+++ b/tests/modules/programs/vinegar/empty-settings.nix
@@ -0,0 +1,7 @@
+{
+  programs.vinegar.enable = true;
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/vinegar/config.toml
+  '';
+}
diff --git a/tests/modules/programs/vinegar/example-config-expected.toml b/tests/modules/programs/vinegar/example-config-expected.toml
new file mode 100644
index 000000000..38878ce1c
--- /dev/null
+++ b/tests/modules/programs/vinegar/example-config-expected.toml
@@ -0,0 +1,13 @@
+[env]
+WINEFSYNC = "1"
+
+[studio]
+dxvk = false
+renderer = "Vulkan"
+
+[studio.env]
+DXVK_HUD = "0"
+MANGOHUD = "1"
+
+[studio.fflags]
+DFIntTaskSchedulerTargetFps = 144
diff --git a/tests/modules/programs/vinegar/example-settings.nix b/tests/modules/programs/vinegar/example-settings.nix
new file mode 100644
index 000000000..22ac75df5
--- /dev/null
+++ b/tests/modules/programs/vinegar/example-settings.nix
@@ -0,0 +1,28 @@
+{ config, ... }: {
+  programs.vinegar = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+
+    settings = {
+      env.WINEFSYNC = "1";
+
+      studio = {
+        dxvk = false;
+        renderer = "Vulkan";
+
+        fflags.DFIntTaskSchedulerTargetFps = 144;
+
+        env = {
+          DXVK_HUD = "0";
+          MANGOHUD = "1";
+        };
+      };
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/vinegar/config.toml \
+      ${./example-config-expected.toml}
+  '';
+}

From fadb9cba44957ed623ffc22bc87ddb73d86e6e66 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 15 Feb 2025 19:03:06 -0500
Subject: [PATCH 406/546] Reapply "thunderbird: add native host support
 (#6292)" (#6371)

This reverts commit 6fbbfb92409bf999fd80b78c7f7bc145d2d36f39.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 modules/programs/thunderbird.nix              | 49 ++++++++++++++++++-
 .../programs/thunderbird/thunderbird.nix      | 25 +++++++++-
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 84710207c..339bcb599 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -136,6 +136,24 @@ let
     '') prefs)}
     ${extraPrefs}
   '';
+
+  nativeMessagingHostsPath = if isDarwin then
+    "${cfg.vendorPath}/NativeMessagingHosts"
+  else
+    "${cfg.vendorPath}/native-messaging-hosts";
+
+  nativeMessagingHostsJoined = pkgs.symlinkJoin {
+    name = "th_native-messaging-hosts";
+    paths = [
+      # Link a .keep file to keep the directory around
+      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
+      # Link package configured native messaging hosts (entire mail app actually)
+      cfg.package
+    ]
+    # Link user configured native messaging hosts
+      ++ cfg.nativeMessagingHosts;
+  };
+
 in {
   meta.maintainers = with hm.maintainers; [ d-dervishi jkarlson ];
 
@@ -158,6 +176,29 @@ in {
         description = "profile version, set null for nix-darwin";
       };
 
+      vendorPath = mkOption {
+        internal = true;
+        type = with types; nullOr str;
+        # Thunderbird doesn't look in `Application Support` on macOS for user
+        # config (in contrast to global settings that are the same for Firefox
+        # and Thunderbird):
+        # https://developer.thunderbird.net/add-ons/mailextensions/supported-webextension-api
+        default = if isDarwin then "Library/Mozilla" else ".mozilla";
+        example = ".mozilla";
+        description =
+          "Directory containing the native messaging hosts directory.";
+      };
+
+      nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
+        visible = true;
+        type = types.listOf types.package;
+        default = [ ];
+        description = ''
+          Additional packages containing native messaging hosts that should be
+          made available to Thunderbird extensions.
+        '';
+      });
+
       profiles = mkOption {
         type = with types;
           attrsOf (submodule ({ config, name, ... }: {
@@ -403,7 +444,13 @@ in {
     home.file = mkMerge ([{
       "${thunderbirdConfigPath}/profiles.ini" =
         mkIf (cfg.profiles != { }) { text = generators.toINI { } profilesIni; };
-    }] ++ flip mapAttrsToList cfg.profiles (name: profile: {
+    }] ++ optional (cfg.vendorPath != null) {
+      "${nativeMessagingHostsPath}" = {
+        source =
+          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+        recursive = true;
+      };
+    } ++ flip mapAttrsToList cfg.profiles (name: profile: {
       "${thunderbirdProfilesPath}/${name}/chrome/userChrome.css" =
         mkIf (profile.userChrome != "") { text = profile.userChrome; };
 
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 4526d6686..a4d095e3a 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -1,6 +1,8 @@
-{ pkgs, ... }: {
+{ lib, realPkgs, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
+  _module.args.pkgs = lib.mkForce realPkgs;
+
   accounts.email.accounts = {
     "hm@example.com" = {
       thunderbird = {
@@ -41,6 +43,9 @@
     # Disable warning so that platforms' behavior is the same
     darwinSetupWarning = false;
 
+    # Darwin doesn't support wrapped Thunderbird, using unwrapped instead
+    package = realPkgs.thunderbird-unwrapped;
+
     profiles = {
       first = {
         isDefault = true;
@@ -62,6 +67,16 @@
       };
     };
 
+    nativeMessagingHosts = with realPkgs;
+      [
+        # NOTE: this is not a real Thunderbird native host module but Firefox; no
+        # native hosts are currently packaged for nixpkgs or elsewhere, so we
+        # have to improvise. Packaging wise, Firefox and Thunderbird native hosts
+        # are identical though. The test doesn't care if the host was meant for
+        # either as long as the right paths are present in the package.
+        browserpass
+      ];
+
     settings = {
       "general.useragent.override" = "";
       "privacy.donottrackheader.enabled" = true;
@@ -69,9 +84,13 @@
   };
 
   nmt.script = let
-    isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+    isDarwin = realPkgs.stdenv.hostPlatform.isDarwin;
     configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
     profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}";
+    nativeHostsDir = if isDarwin then
+      "Library/Mozilla/NativeMessagingHosts"
+    else
+      ".mozilla/native-messaging-hosts";
     platform = if isDarwin then "darwin" else "linux";
   in ''
     assertFileExists home-files/${configDir}/profiles.ini
@@ -93,5 +112,7 @@
     assertFileExists home-files/${profilesDir}/first/chrome/userContent.css
     assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \
       <(echo "* { color: red !important; }")
+
+    assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json
   '';
 }

From 7e81c581a51e8e4aa30002332385034437655860 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 15 Feb 2025 20:36:30 -0500
Subject: [PATCH 407/546] thunderbird, firefox: fix file conflict for native
 messaging hosts

On Linux, both Thunderbird and Firefox use the same directory to contain
native messaging host modules. On this platform, we have to merge both
directories with native hosts into one.

The patch introduces a separate helper module to manage native host
directory generation. Now program modules (firefox, thunderbird) declare
native hosts to initialize; while the new helper module determines
*where* and *how* to merge them on disc.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 modules/misc/mozilla-messaging-hosts.nix      | 89 +++++++++++++++++++
 modules/modules.nix                           |  1 +
 modules/programs/firefox/mkFirefoxModule.nix  | 29 ++----
 modules/programs/thunderbird.nix              | 47 ++--------
 .../programs/thunderbird/thunderbird.nix      |  8 +-
 5 files changed, 108 insertions(+), 66 deletions(-)
 create mode 100644 modules/misc/mozilla-messaging-hosts.nix

diff --git a/modules/misc/mozilla-messaging-hosts.nix b/modules/misc/mozilla-messaging-hosts.nix
new file mode 100644
index 000000000..45d1ce4ba
--- /dev/null
+++ b/modules/misc/mozilla-messaging-hosts.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  inherit (pkgs.stdenv) isDarwin;
+
+  cfg = config.mozilla;
+
+  defaultPaths = [
+    # Link a .keep file to keep the directory around
+    (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
+  ];
+
+  thunderbirdNativeMessagingHostsPath = if isDarwin then
+    "Library/Mozilla/NativeMessagingHosts"
+  else
+    ".mozilla/native-messaging-hosts";
+
+  firefoxNativeMessagingHostsPath = if isDarwin then
+    "Library/Application Support/Mozilla/NativeMessagingHosts"
+  else
+    ".mozilla/native-messaging-hosts";
+in {
+  meta.maintainers =
+    [ maintainers.booxter maintainers.rycee hm.maintainers.bricked ];
+
+  options.mozilla = {
+    firefoxNativeMessagingHosts = mkOption {
+      internal = true;
+      type = with types; listOf package;
+      default = [ ];
+      description = ''
+        List of Firefox native messaging hosts to configure.
+      '';
+    };
+
+    thunderbirdNativeMessagingHosts = mkOption {
+      internal = true;
+      type = with types; listOf package;
+      default = [ ];
+      description = ''
+        List of Thunderbird native messaging hosts to configure.
+      '';
+    };
+  };
+
+  config = mkIf (cfg.firefoxNativeMessagingHosts != [ ]
+    || cfg.thunderbirdNativeMessagingHosts != [ ]) {
+      home.file = if isDarwin then
+        let
+          firefoxNativeMessagingHostsJoined = pkgs.symlinkJoin {
+            name = "ff-native-messaging-hosts";
+            paths = defaultPaths ++ cfg.firefoxNativeMessagingHosts;
+          };
+          thunderbirdNativeMessagingHostsJoined = pkgs.symlinkJoin {
+            name = "th-native-messaging-hosts";
+            paths = defaultPaths ++ cfg.thunderbirdNativeMessagingHosts;
+          };
+        in {
+          "${thunderbirdNativeMessagingHostsPath}" = {
+            source =
+              "${thunderbirdNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+            recursive = true;
+          };
+
+          "${firefoxNativeMessagingHostsPath}" = {
+            source =
+              "${firefoxNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+            recursive = true;
+          };
+        }
+      else
+        let
+          nativeMessagingHostsJoined = pkgs.symlinkJoin {
+            name = "mozilla-native-messaging-hosts";
+            # on Linux, the directory is shared between Firefox and Thunderbird; merge both into one
+            paths = defaultPaths ++ cfg.firefoxNativeMessagingHosts
+              ++ cfg.thunderbirdNativeMessagingHosts;
+          };
+        in {
+          "${firefoxNativeMessagingHostsPath}" = {
+            source =
+              "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+            recursive = true;
+          };
+        };
+    };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index 70a48b853..e42be9710 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -30,6 +30,7 @@ let
     ./misc/fontconfig.nix
     ./misc/gtk.nix
     ./misc/lib.nix
+    ./misc/mozilla-messaging-hosts.nix
     ./misc/news.nix
     ./misc/nixgl.nix
     ./misc/numlock.nix
diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index db787124c..a36db370f 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -30,23 +30,6 @@ let
   profilesPath =
     if isDarwin then "${cfg.configPath}/Profiles" else cfg.configPath;
 
-  nativeMessagingHostsPath = if isDarwin then
-    "${cfg.vendorPath}/NativeMessagingHosts"
-  else
-    "${cfg.vendorPath}/native-messaging-hosts";
-
-  nativeMessagingHostsJoined = pkgs.symlinkJoin {
-    name = "ff_native-messaging-hosts";
-    paths = [
-      # Link a .keep file to keep the directory around
-      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
-      # Link package configured native messaging hosts (entire browser actually)
-      cfg.finalPackage
-    ]
-    # Link user configured native messaging hosts
-      ++ cfg.nativeMessagingHosts;
-  };
-
   # The extensions path shared by all profiles; will not be supported
   # by future browser versions.
   extensionPath = "extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
@@ -864,16 +847,14 @@ in {
 
     home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
 
+    mozilla.firefoxNativeMessagingHosts = [
+      cfg.finalPackage # package configured native messaging hosts (entire browser actually)
+    ] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts
+
     home.file = mkMerge ([{
       "${cfg.configPath}/profiles.ini" =
         mkIf (cfg.profiles != { }) { text = profilesIni; };
-    }] ++ optional (cfg.vendorPath != null) {
-      "${nativeMessagingHostsPath}" = {
-        source =
-          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
-        recursive = true;
-      };
-    } ++ flip mapAttrsToList cfg.profiles (_: profile:
+    }] ++ flip mapAttrsToList cfg.profiles (_: profile:
       # Merge the regular profile settings with extension settings
       mkMerge ([{
         "${profilesPath}/${profile.path}/.keep".text = "";
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 339bcb599..a61209fa4 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -136,24 +136,6 @@ let
     '') prefs)}
     ${extraPrefs}
   '';
-
-  nativeMessagingHostsPath = if isDarwin then
-    "${cfg.vendorPath}/NativeMessagingHosts"
-  else
-    "${cfg.vendorPath}/native-messaging-hosts";
-
-  nativeMessagingHostsJoined = pkgs.symlinkJoin {
-    name = "th_native-messaging-hosts";
-    paths = [
-      # Link a .keep file to keep the directory around
-      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
-      # Link package configured native messaging hosts (entire mail app actually)
-      cfg.package
-    ]
-    # Link user configured native messaging hosts
-      ++ cfg.nativeMessagingHosts;
-  };
-
 in {
   meta.maintainers = with hm.maintainers; [ d-dervishi jkarlson ];
 
@@ -176,20 +158,7 @@ in {
         description = "profile version, set null for nix-darwin";
       };
 
-      vendorPath = mkOption {
-        internal = true;
-        type = with types; nullOr str;
-        # Thunderbird doesn't look in `Application Support` on macOS for user
-        # config (in contrast to global settings that are the same for Firefox
-        # and Thunderbird):
-        # https://developer.thunderbird.net/add-ons/mailextensions/supported-webextension-api
-        default = if isDarwin then "Library/Mozilla" else ".mozilla";
-        example = ".mozilla";
-        description =
-          "Directory containing the native messaging hosts directory.";
-      };
-
-      nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
+      nativeMessagingHosts = mkOption {
         visible = true;
         type = types.listOf types.package;
         default = [ ];
@@ -197,7 +166,7 @@ in {
           Additional packages containing native messaging hosts that should be
           made available to Thunderbird extensions.
         '';
-      });
+      };
 
       profiles = mkOption {
         type = with types;
@@ -441,16 +410,14 @@ in {
       ++ optional (any (p: p.withExternalGnupg) (attrValues cfg.profiles))
       pkgs.gpgme;
 
+    mozilla.thunderbirdNativeMessagingHosts = [
+      cfg.package # package configured native messaging hosts (entire mail app actually)
+    ] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts
+
     home.file = mkMerge ([{
       "${thunderbirdConfigPath}/profiles.ini" =
         mkIf (cfg.profiles != { }) { text = generators.toINI { } profilesIni; };
-    }] ++ optional (cfg.vendorPath != null) {
-      "${nativeMessagingHostsPath}" = {
-        source =
-          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
-        recursive = true;
-      };
-    } ++ flip mapAttrsToList cfg.profiles (name: profile: {
+    }] ++ flip mapAttrsToList cfg.profiles (name: profile: {
       "${thunderbirdProfilesPath}/${name}/chrome/userChrome.css" =
         mkIf (profile.userChrome != "") { text = profile.userChrome; };
 
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index a4d095e3a..555ea35d6 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -37,14 +37,18 @@
     };
   };
 
+  # Confirm that both Firefox and Thunderbird can be configured at the same time.
+  programs.firefox = { enable = true; };
+
   programs.thunderbird = {
     enable = true;
 
     # Disable warning so that platforms' behavior is the same
     darwinSetupWarning = false;
 
-    # Darwin doesn't support wrapped Thunderbird, using unwrapped instead
-    package = realPkgs.thunderbird-unwrapped;
+    # Darwin doesn't support wrapped Thunderbird, using unwrapped instead;
+    # using -latest- because ESR is currently broken on Darwin
+    package = realPkgs.thunderbird-latest-unwrapped;
 
     profiles = {
       first = {

From e5e485e73c6e28ba54af4f45ed13f80e0706418f Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 17 Feb 2025 22:16:34 -0500
Subject: [PATCH 408/546] thunderbird: separate test case for
 firefox+thunderbird setup

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 tests/modules/programs/thunderbird/default.nix               | 5 ++++-
 .../programs/thunderbird/thunderbird-with-firefox.nix        | 5 +++++
 tests/modules/programs/thunderbird/thunderbird.nix           | 3 ---
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 tests/modules/programs/thunderbird/thunderbird-with-firefox.nix

diff --git a/tests/modules/programs/thunderbird/default.nix b/tests/modules/programs/thunderbird/default.nix
index 487297784..a17755e16 100644
--- a/tests/modules/programs/thunderbird/default.nix
+++ b/tests/modules/programs/thunderbird/default.nix
@@ -1 +1,4 @@
-{ thunderbird = ./thunderbird.nix; }
+{
+  thunderbird = ./thunderbird.nix;
+  thunderbird-with-firefox = ./thunderbird-with-firefox.nix;
+}
diff --git a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix
new file mode 100644
index 000000000..bd1744fa8
--- /dev/null
+++ b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix
@@ -0,0 +1,5 @@
+# Confirm that both Firefox and Thunderbird can be configured at the same time.
+{ lib, realPkgs, ... }:
+lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) {
+  programs.firefox.enable = true;
+}
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 555ea35d6..aa46b3b2d 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -37,9 +37,6 @@
     };
   };
 
-  # Confirm that both Firefox and Thunderbird can be configured at the same time.
-  programs.firefox = { enable = true; };
-
   programs.thunderbird = {
     enable = true;
 

From 4eef19791387f387c6be83663d67ab5d06187494 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 17 Feb 2025 22:21:26 -0500
Subject: [PATCH 409/546] thunderbird, firefox: don't create native host dirs
 when program is off

Before the patch, both directories for firefox and thunderbird were
created, even when only one of the programs was enabled.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 modules/misc/mozilla-messaging-hosts.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/misc/mozilla-messaging-hosts.nix b/modules/misc/mozilla-messaging-hosts.nix
index 45d1ce4ba..ec66aa69b 100644
--- a/modules/misc/mozilla-messaging-hosts.nix
+++ b/modules/misc/mozilla-messaging-hosts.nix
@@ -58,17 +58,19 @@ in {
             paths = defaultPaths ++ cfg.thunderbirdNativeMessagingHosts;
           };
         in {
-          "${thunderbirdNativeMessagingHostsPath}" = {
-            source =
-              "${thunderbirdNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
-            recursive = true;
-          };
+          "${thunderbirdNativeMessagingHostsPath}" =
+            mkIf (cfg.thunderbirdNativeMessagingHosts != [ ]) {
+              source =
+                "${thunderbirdNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+              recursive = true;
+            };
 
-          "${firefoxNativeMessagingHostsPath}" = {
-            source =
-              "${firefoxNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
-            recursive = true;
-          };
+          "${firefoxNativeMessagingHostsPath}" =
+            mkIf (cfg.firefoxNativeMessagingHosts != [ ]) {
+              source =
+                "${firefoxNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+              recursive = true;
+            };
         }
       else
         let

From 5f5ff39778171e3667ec3ea15bdacdce0edc1242 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 18 Feb 2025 15:46:33 -0500
Subject: [PATCH 410/546] firefox: remove with keyword use

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 modules/misc/mozilla-messaging-hosts.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/misc/mozilla-messaging-hosts.nix b/modules/misc/mozilla-messaging-hosts.nix
index ec66aa69b..09a4188f1 100644
--- a/modules/misc/mozilla-messaging-hosts.nix
+++ b/modules/misc/mozilla-messaging-hosts.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   inherit (pkgs.stdenv) isDarwin;
 
@@ -22,22 +20,25 @@ let
   else
     ".mozilla/native-messaging-hosts";
 in {
-  meta.maintainers =
-    [ maintainers.booxter maintainers.rycee hm.maintainers.bricked ];
+  meta.maintainers = with lib.maintainers; [
+    booxter
+    rycee
+    lib.hm.maintainers.bricked
+  ];
 
   options.mozilla = {
-    firefoxNativeMessagingHosts = mkOption {
+    firefoxNativeMessagingHosts = lib.mkOption {
       internal = true;
-      type = with types; listOf package;
+      type = with lib.types; listOf package;
       default = [ ];
       description = ''
         List of Firefox native messaging hosts to configure.
       '';
     };
 
-    thunderbirdNativeMessagingHosts = mkOption {
+    thunderbirdNativeMessagingHosts = lib.mkOption {
       internal = true;
-      type = with types; listOf package;
+      type = with lib.types; listOf package;
       default = [ ];
       description = ''
         List of Thunderbird native messaging hosts to configure.
@@ -45,7 +46,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.firefoxNativeMessagingHosts != [ ]
+  config = lib.mkIf (cfg.firefoxNativeMessagingHosts != [ ]
     || cfg.thunderbirdNativeMessagingHosts != [ ]) {
       home.file = if isDarwin then
         let
@@ -59,14 +60,14 @@ in {
           };
         in {
           "${thunderbirdNativeMessagingHostsPath}" =
-            mkIf (cfg.thunderbirdNativeMessagingHosts != [ ]) {
+            lib.mkIf (cfg.thunderbirdNativeMessagingHosts != [ ]) {
               source =
                 "${thunderbirdNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
               recursive = true;
             };
 
           "${firefoxNativeMessagingHostsPath}" =
-            mkIf (cfg.firefoxNativeMessagingHosts != [ ]) {
+            lib.mkIf (cfg.firefoxNativeMessagingHosts != [ ]) {
               source =
                 "${firefoxNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
               recursive = true;

From 63146593a928d3b77d0e92e82dbc6d959da8cd12 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Tue, 18 Feb 2025 15:54:31 -0500
Subject: [PATCH 411/546] tests: don't override scraping of nixpkgs for
 thunderbird suite

Instead, pick just the required packages to pass the tests.

Note: we have to refer to real derivations because symlinkJoin assumes
the passed derivation is a directory with files, otherwise it fails as:

@thunderbird@: No such file or directory

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 .../programs/thunderbird/thunderbird-with-firefox.nix       | 6 +++++-
 tests/modules/programs/thunderbird/thunderbird.nix          | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix
index bd1744fa8..0d23460d2 100644
--- a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix
+++ b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix
@@ -1,5 +1,9 @@
 # Confirm that both Firefox and Thunderbird can be configured at the same time.
 { lib, realPkgs, ... }:
 lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) {
-  programs.firefox.enable = true;
+  programs.firefox = {
+    enable = true;
+    # Darwin doesn't support wrapped Firefox, using unwrapped instead
+    package = realPkgs.firefox-unwrapped;
+  };
 }
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index aa46b3b2d..a5bb3148c 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -1,8 +1,6 @@
 { lib, realPkgs, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
-  _module.args.pkgs = lib.mkForce realPkgs;
-
   accounts.email.accounts = {
     "hm@example.com" = {
       thunderbird = {

From fad54a641a4419b6dbfabdcf33911bebc87f97f3 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 19 Feb 2025 18:25:12 -0500
Subject: [PATCH 412/546] tests: check thunderbird with and without native
 messaging hosts

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 .../modules/programs/thunderbird/default.nix  |  1 +
 .../thunderbird-native-messaging-host.nix     | 25 +++++++++++++++++++
 .../programs/thunderbird/thunderbird.nix      | 16 ------------
 3 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix

diff --git a/tests/modules/programs/thunderbird/default.nix b/tests/modules/programs/thunderbird/default.nix
index a17755e16..0fddeec16 100644
--- a/tests/modules/programs/thunderbird/default.nix
+++ b/tests/modules/programs/thunderbird/default.nix
@@ -1,4 +1,5 @@
 {
   thunderbird = ./thunderbird.nix;
   thunderbird-with-firefox = ./thunderbird-with-firefox.nix;
+  thunderbird-native-messaging-host = ./thunderbird-native-messaging-host.nix;
 }
diff --git a/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix
new file mode 100644
index 000000000..57bef0f13
--- /dev/null
+++ b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix
@@ -0,0 +1,25 @@
+# Confirm that both Firefox and Thunderbird can be configured at the same time.
+{ lib, realPkgs, ... }:
+lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) {
+  programs.thunderbird = {
+    nativeMessagingHosts = with realPkgs;
+      [
+        # NOTE: this is not a real Thunderbird native host module but Firefox; no
+        # native hosts are currently packaged for nixpkgs or elsewhere, so we
+        # have to improvise. Packaging wise, Firefox and Thunderbird native hosts
+        # are identical though. The test doesn't care if the host was meant for
+        # either as long as the right paths are present in the package.
+        browserpass
+      ];
+  };
+
+  nmt.script = let
+    isDarwin = realPkgs.stdenv.hostPlatform.isDarwin;
+    nativeHostsDir = if isDarwin then
+      "Library/Mozilla/NativeMessagingHosts"
+    else
+      ".mozilla/native-messaging-hosts";
+  in ''
+    assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json
+  '';
+}
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index a5bb3148c..75e83e675 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -66,16 +66,6 @@
       };
     };
 
-    nativeMessagingHosts = with realPkgs;
-      [
-        # NOTE: this is not a real Thunderbird native host module but Firefox; no
-        # native hosts are currently packaged for nixpkgs or elsewhere, so we
-        # have to improvise. Packaging wise, Firefox and Thunderbird native hosts
-        # are identical though. The test doesn't care if the host was meant for
-        # either as long as the right paths are present in the package.
-        browserpass
-      ];
-
     settings = {
       "general.useragent.override" = "";
       "privacy.donottrackheader.enabled" = true;
@@ -86,10 +76,6 @@
     isDarwin = realPkgs.stdenv.hostPlatform.isDarwin;
     configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird";
     profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}";
-    nativeHostsDir = if isDarwin then
-      "Library/Mozilla/NativeMessagingHosts"
-    else
-      ".mozilla/native-messaging-hosts";
     platform = if isDarwin then "darwin" else "linux";
   in ''
     assertFileExists home-files/${configDir}/profiles.ini
@@ -111,7 +97,5 @@
     assertFileExists home-files/${profilesDir}/first/chrome/userContent.css
     assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \
       <(echo "* { color: red !important; }")
-
-    assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json
   '';
 }

From 1a78a4c7fe9d484c1de9ff0e46007f1970fd0a73 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 19 Feb 2025 18:26:24 -0500
Subject: [PATCH 413/546] firefox: fix build failure when package is null

Native messaging hosts module assumed all hosts are packages, and we
were passing null before.

The patch also adds a test case for a null firefox package to avoid
regressions in the future for this common (on Darwin at least) scenario.

Note: Thunderbird doesn't need a similar change because it doesn't allow
a null package.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 modules/programs/firefox/mkFirefoxModule.nix    |  6 +++---
 tests/modules/programs/firefox/common.nix       |  1 +
 tests/modules/programs/firefox/null-package.nix | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 tests/modules/programs/firefox/null-package.nix

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index a36db370f..831f59ddb 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -847,9 +847,9 @@ in {
 
     home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
 
-    mozilla.firefoxNativeMessagingHosts = [
-      cfg.finalPackage # package configured native messaging hosts (entire browser actually)
-    ] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts
+    mozilla.firefoxNativeMessagingHosts = cfg.nativeMessagingHosts
+      # package configured native messaging hosts (entire browser actually)
+      ++ (lib.optional (cfg.finalPackage != null) cfg.finalPackage);
 
     home.file = mkMerge ([{
       "${cfg.configPath}/profiles.ini" =
diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index c92db1e4c..939eab949 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -1,6 +1,7 @@
 name:
 builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
+  "${name}-null-package" = ./null-package.nix;
   "${name}-final-package" = ./final-package.nix;
   "${name}-policies" = ./policies.nix;
   "${name}-profiles-bookmarks" = ./profiles/bookmarks;
diff --git a/tests/modules/programs/firefox/null-package.nix b/tests/modules/programs/firefox/null-package.nix
new file mode 100644
index 000000000..e5d1516dc
--- /dev/null
+++ b/tests/modules/programs/firefox/null-package.nix
@@ -0,0 +1,10 @@
+modulePath:
+{ config, lib, ... }:
+
+lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; }
+  // {
+    programs.firefox = {
+      enable = true;
+      package = null;
+    };
+  })

From bdf73272a8408fedc7ca86d5ea47192f6d2dad54 Mon Sep 17 00:00:00 2001
From: David Thievon <131907205+DOD-101@users.noreply.github.com>
Date: Fri, 21 Feb 2025 19:15:02 +0100
Subject: [PATCH 414/546] swayimg: add module (#6506)

---
 modules/misc/news.nix                         | 12 +++++
 modules/modules.nix                           |  1 +
 modules/programs/swayimg.nix                  | 53 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/swayimg/default.nix    |  4 ++
 .../programs/swayimg/empty-settings.nix       |  7 +++
 .../swayimg/example-settings-expected.ini     |  9 ++++
 .../programs/swayimg/example-settings.nix     | 23 ++++++++
 8 files changed, 110 insertions(+)
 create mode 100644 modules/programs/swayimg.nix
 create mode 100644 tests/modules/programs/swayimg/default.nix
 create mode 100644 tests/modules/programs/swayimg/empty-settings.nix
 create mode 100644 tests/modules/programs/swayimg/example-settings-expected.ini
 create mode 100644 tests/modules/programs/swayimg/example-settings.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 395a45d5f..4cc662afb 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2062,6 +2062,18 @@ in {
           See https://github.com/mateusauler/git-worktree-switcher for more.
         '';
       }
+
+      {
+        time = "2025-02-20T18:39:31+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'programs.swayimg'.
+
+          swayimg is a fully customizable and lightweight image viewer for
+          Wayland based display servers.
+          See https://github.com/artemsen/swayimg for more.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index e42be9710..70505ee83 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -237,6 +237,7 @@ let
     ./programs/sqls.nix
     ./programs/ssh.nix
     ./programs/starship.nix
+    ./programs/swayimg.nix
     ./programs/swaylock.nix
     ./programs/swayr.nix
     ./programs/taskwarrior.nix
diff --git a/modules/programs/swayimg.nix b/modules/programs/swayimg.nix
new file mode 100644
index 000000000..aac56ece3
--- /dev/null
+++ b/modules/programs/swayimg.nix
@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.programs.swayimg;
+  iniFormat = pkgs.formats.ini { };
+in {
+  meta.maintainers = with lib.maintainers; [ dod-101 ];
+
+  options.programs.swayimg = {
+    enable = lib.mkEnableOption "swayimg";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.swayimg;
+      defaultText = lib.literalExpression "pkgs.swayimg";
+      description = "The swayimg package to install";
+    };
+    settings = lib.mkOption {
+      type = iniFormat.type;
+      default = { };
+      description = ''
+        Configuration written to
+        {file}`$XDG_CONFIG_HOME/swayimg/config`. See <https://github.com/artemsen/swayimg/blob/master/extra/swayimgrc> for a list of available options.
+      '';
+      example = lib.literalExpression ''
+        {
+          viewer = {
+            window = "#10000010";
+            scale = "fill";
+          };
+          "info.viewer" = {
+            top_left = "+name,+format";
+          };
+          "keys.viewer" = {
+            "Shift+r" = "rand_file";
+          };
+        }
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "programs.swayimg" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."swayimg/config" = lib.mkIf (cfg.settings != { }) {
+      source = iniFormat.generate "config" cfg.settings;
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 5dad7cef3..459808b89 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -307,6 +307,7 @@ in import nmtSrc {
     ./modules/programs/rbw
     ./modules/programs/rofi
     ./modules/programs/rofi-pass
+    ./modules/programs/swayimg
     ./modules/programs/swaylock
     ./modules/programs/swayr
     ./modules/programs/terminator
diff --git a/tests/modules/programs/swayimg/default.nix b/tests/modules/programs/swayimg/default.nix
new file mode 100644
index 000000000..b2c3dfa9b
--- /dev/null
+++ b/tests/modules/programs/swayimg/default.nix
@@ -0,0 +1,4 @@
+{
+  swayimg-empty-settings = ./empty-settings.nix;
+  swayimg-example-settings = ./example-settings.nix;
+}
diff --git a/tests/modules/programs/swayimg/empty-settings.nix b/tests/modules/programs/swayimg/empty-settings.nix
new file mode 100644
index 000000000..3ea1c2347
--- /dev/null
+++ b/tests/modules/programs/swayimg/empty-settings.nix
@@ -0,0 +1,7 @@
+{
+  programs.swayimg.enable = true;
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/swayimg
+  '';
+}
diff --git a/tests/modules/programs/swayimg/example-settings-expected.ini b/tests/modules/programs/swayimg/example-settings-expected.ini
new file mode 100644
index 000000000..f844feb6c
--- /dev/null
+++ b/tests/modules/programs/swayimg/example-settings-expected.ini
@@ -0,0 +1,9 @@
+[info.viewer]
+top_left=+name,+format
+
+[keys.viewer]
+Shift+r=rand_file
+
+[viewer]
+scale=fill
+window=#10000010
diff --git a/tests/modules/programs/swayimg/example-settings.nix b/tests/modules/programs/swayimg/example-settings.nix
new file mode 100644
index 000000000..a1c4adfd2
--- /dev/null
+++ b/tests/modules/programs/swayimg/example-settings.nix
@@ -0,0 +1,23 @@
+{ config, ... }:
+
+{
+  programs.swayimg = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+
+    settings = {
+      viewer = {
+        window = "#10000010";
+        scale = "fill";
+      };
+      "info.viewer" = { top_left = "+name,+format"; };
+      "keys.viewer" = { "Shift+r" = "rand_file"; };
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/swayimg/config \
+      ${./example-settings-expected.ini}
+  '';
+}

From 148a6b55651ac794f5c20bbd76780b4d8fed4334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Mas=C3=B3=20Bonilla?=
 <alejandrobonilla2001@gmail.com>
Date: Wed, 19 Feb 2025 22:00:43 +0100
Subject: [PATCH 415/546] Translate using Weblate (Catalan)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (16 of 16 strings)

Co-authored-by: Alejandro Masó Bonilla <alejandrobonilla2001@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/ca/
Translation: Home Manager/Home Manager Modules
---
 modules/po/ca.po | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/po/ca.po b/modules/po/ca.po
index 80021463c..fde4fece4 100644
--- a/modules/po/ca.po
+++ b/modules/po/ca.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-12-10 15:58+0000\n"
-"Last-Translator: Nara Díaz Viñolas <rdvdev2@gmail.com>\n"
+"PO-Revision-Date: 2025-02-19 21:00+0000\n"
+"Last-Translator: Alejandro Masó Bonilla <alejandrobonilla2001@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/home-manager/"
 "modules/ca/>\n"
 "Language: ca\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.10.1-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "Netejant enllaços orfes de %s"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Creant una nova generació per al nou perfil"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "No hi ha canvis llavors s'utilitzarà la generació anterior"
 
 #: modules/home-environment.nix:643
 msgid ""
@@ -55,13 +55,13 @@ msgstr ""
 "Potser hi ha un conflicte amb un paquet instal·lat mitjançant\n"
 "\"%s\"? Prova d'executar\n"
 "\n"
-"    %s\n"
+". . . . %s\n"
 "\n"
 "i si hi ha un paquet conflictiu el pots eliminar amb\n"
 "\n"
-"    %s\n"
+". . . . %s\n"
 "\n"
-"i després provar d'activar la teva configuració de Home Manager de nou."
+"Després provar d'activar la teva configuració de Home Manager de nou."
 
 #: modules/home-environment.nix:676
 msgid "Activating %s"
@@ -86,7 +86,7 @@ msgstr "Error: HOME està configurat a \"%s\", però s'esperava \"%s\""
 
 #: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
-msgstr "Començant activació de Home Manager"
+msgstr "Començant l'activació de Home Manager"
 
 #: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
@@ -102,7 +102,7 @@ msgstr "Execució en viu"
 
 #: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
-msgstr "Utilitzant versió de Nix: %s"
+msgstr "Utilitzant la versió de Nix: %s"
 
 #: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"

From dde2fba628af2891e2e1ba8abb8be4e597edd49e Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 21 Feb 2025 22:16:56 +0000
Subject: [PATCH 416/546] home-cursor: add sway support (#6459)

---
 modules/config/home-cursor.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 42c259455..8c28d0fd1 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -56,6 +56,11 @@ let
           description = "The cursor size for hyprcursor.";
         };
       };
+
+      sway = {
+        enable = mkEnableOption
+          "sway config generation for {option}`home.pointerCursor`";
+      };
     };
   };
 
@@ -197,5 +202,18 @@ in {
           if cfg.hyprcursor.size != null then cfg.hyprcursor.size else cfg.size;
       };
     })
+
+    (mkIf cfg.sway.enable {
+      wayland.windowManager.sway = {
+        config = {
+          seat = {
+            "*" = {
+              xcursor_theme =
+                "${cfg.name} ${toString config.gtk.cursorTheme.size}";
+            };
+          };
+        };
+      };
+    })
   ]);
 }

From 6eed33a3acb933224917964879634826716a3e5d Mon Sep 17 00:00:00 2001
From: truelecter <andrew.panassiouk@gmail.com>
Date: Sat, 22 Feb 2025 00:34:36 +0200
Subject: [PATCH 417/546] jetbrains-remote: do not fail if files do not exist
 yet (#6502)

---
 modules/programs/jetbrains-remote.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/jetbrains-remote.nix b/modules/programs/jetbrains-remote.nix
index 4a9c045a9..917fe87cf 100644
--- a/modules/programs/jetbrains-remote.nix
+++ b/modules/programs/jetbrains-remote.nix
@@ -31,7 +31,7 @@ in {
         "${ide}/bin/${ide.meta.mainProgram}-remote-dev-server registerBackendLocationForGateway || true";
       lines = map mkLine cfg.ides;
       linesStr = ''
-        rm $HOME/.cache/JetBrains/RemoteDev/userProvidedDist/_nix_store*
+        rm $HOME/.cache/JetBrains/RemoteDev/userProvidedDist/_nix_store* || true
       '' + concatStringsSep "\n" lines;
     in hm.dag.entryAfter [ "writeBoundary" ] linesStr;
   };

From 9f74e14a2d9af4c6f2024cca7813b830b020f45e Mon Sep 17 00:00:00 2001
From: Chlorodose <chlorodose@chlorodose.me>
Date: Sat, 22 Feb 2025 06:37:07 +0800
Subject: [PATCH 418/546] fcitx5: make boot after graphical session (#6432)

---
 modules/i18n/input-method/fcitx5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 3e4e2f26d..4ec3b8fdd 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -54,6 +54,7 @@ in {
       Unit = {
         Description = "Fcitx5 input method editor";
         PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
       };
       Service.ExecStart = "${fcitx5Package}/bin/fcitx5";
       Install.WantedBy = [ "graphical-session.target" ];

From e512de4722831c850ec0681f69510fcba44f582d Mon Sep 17 00:00:00 2001
From: 1444 <54070204+0x5a4@users.noreply.github.com>
Date: Sat, 22 Feb 2025 01:24:26 +0100
Subject: [PATCH 419/546] wluma: init module (#6463)

---
 modules/misc/news.nix      |  10 ++++
 modules/modules.nix        |   1 +
 modules/services/wluma.nix | 103 +++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 modules/services/wluma.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 4cc662afb..a2614da83 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2074,6 +2074,16 @@ in {
           See https://github.com/artemsen/swayimg for more.
         '';
       }
+
+      {
+        time = "2025-02-16T17:00:00+00:00";
+        message = ''
+          A new module is available: 'services.wluma'.
+
+          Wluma is a tool for Wayland compositors to automatically adjust
+          screen brightness based on the screen contents and amount of ambient light around you.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 70505ee83..12b367510 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -420,6 +420,7 @@ let
     ./services/window-managers/wayfire.nix
     ./services/window-managers/xmonad.nix
     ./services/wlsunset.nix
+    ./services/wluma.nix
     ./services/wob.nix
     ./services/xcape.nix
     ./services/xembed-sni-proxy.nix
diff --git a/modules/services/wluma.nix b/modules/services/wluma.nix
new file mode 100644
index 000000000..1698b1387
--- /dev/null
+++ b/modules/services/wluma.nix
@@ -0,0 +1,103 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.wluma;
+  format = pkgs.formats.toml { };
+  configFile = format.generate "config.toml" cfg.settings;
+in {
+  meta.maintainers = with lib.maintainers; [ _0x5a4 ];
+
+  options.services.wluma = {
+    enable = lib.mkEnableOption
+      "Enable wluma, a service for automatic brightness adjustment";
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.wluma;
+      defaultText = lib.literalExpression "pkgs.wluma";
+      description = "Package providing {command}`wluma`.";
+    };
+
+    settings = lib.mkOption {
+      type = format.type;
+      default = { };
+      example = {
+        als.iio = {
+          path = "";
+          thresholds = {
+            "0" = "night";
+            "20" = "dark";
+            "80" = "dim";
+            "250" = "normal";
+            "500" = "bright";
+            "800" = "outdoors";
+          };
+        };
+      };
+      description = ''
+        Configuration to use for wluma. See
+        <https://github.com/maximbaz/wluma/blob/main/config.toml>
+        for available options.
+      '';
+    };
+
+    systemd.enable = lib.mkOption {
+      description = "Wluma systemd integration";
+      type = lib.types.bool;
+      default = true;
+    };
+
+    systemd.target = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = config.wayland.systemd.target;
+      defaultText = lib.literalExpression "config.wayland.systemd.target";
+      example = "sway-session.target";
+      description = ''
+        The systemd target that will automatically start the Wluma service.
+
+        When setting this value to `"sway-session.target"`,
+        make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
+        otherwise the service may never be started.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.wluma" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile = lib.mkIf (cfg.settings != { }) {
+      "wluma/config.toml".source = configFile;
+    };
+
+    systemd.user.services.wluma = lib.mkIf cfg.systemd.enable {
+      Unit = {
+        Description =
+          "Automatic brightness adjustment based on screen contents and ALS ";
+        After = [ cfg.systemd.target ];
+        PartOf = [ cfg.systemd.target ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
+        X-Restart-Triggers = lib.mkIf (cfg.settings != { }) [ "${configFile}" ];
+      };
+
+      Install.WantedBy = [ cfg.systemd.target ];
+
+      Service = {
+        ExecStart = lib.getExe cfg.package;
+        Restart = "always";
+
+        # Sandboxing.
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateUsers = true;
+        RestrictNamespaces = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = "@system-service";
+      };
+    };
+  };
+}

From f0837fa6730ad497f0329722263e2ef4683b09cf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 03:59:27 +0000
Subject: [PATCH 420/546] 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/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08)
  → 'github:NixOS/nixpkgs/d74a2335ac9c133d6bbec9fc98d91a77f1604c1f?narHash=sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb%2BP%2BR4S8Jsw%3D' (2025-02-16)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6ca2bd080..1fd6ae2ee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739020877,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "lastModified": 1739736696,
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
         "type": "github"
       },
       "original": {

From 62d038f499b94d406df790dec04e201d222e5098 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 21 Feb 2025 16:31:43 -0600
Subject: [PATCH 421/546] nushell: reenable test

---
 tests/modules/programs/nushell/example-settings.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix
index f93dd8ed4..cc9e8f8ec 100644
--- a/tests/modules/programs/nushell/example-settings.nix
+++ b/tests/modules/programs/nushell/example-settings.nix
@@ -1,7 +1,6 @@
 { pkgs, realPkgs, config, lib, ... }:
 
-# Temporarily broken due to Nixpkgs issue.
-lib.mkIf false {
+{
   programs.nushell = {
     enable = true;
     package = realPkgs.nushell;

From 765cb91e9d5ab06ed8c92c25fc0e51d6c11d43cb Mon Sep 17 00:00:00 2001
From: TheStachelfisch <contact@thestachelfisch.dev>
Date: Sat, 22 Feb 2025 02:33:49 +0100
Subject: [PATCH 422/546] psd: add missing module config options (#6230)

---
 modules/services/psd.nix | 42 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/modules/services/psd.nix b/modules/services/psd.nix
index 477176aa3..eed04f3fa 100644
--- a/modules/services/psd.nix
+++ b/modules/services/psd.nix
@@ -4,6 +4,14 @@ let
 
   cfg = config.services.psd;
 
+  configFile = ''
+    ${lib.optionalString (cfg.browsers != [ ]) ''
+      BROWSERS=(${lib.concatStringsSep " " cfg.browsers})
+    ''}
+
+    USE_BACKUP="${if cfg.useBackup then "yes" else "no"}"
+    BACKUP_LIMIT=${builtins.toString cfg.backupLimit}
+  '';
 in {
   meta.maintainers = [ lib.hm.maintainers.danjujan ];
 
@@ -22,6 +30,34 @@ in {
         defaults to seconds if omitted.
       '';
     };
+
+    browsers = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      example = [ "chromium" "google-chrome" "firefox" ];
+      description = ''
+        A list of browsers to sync. An empty list will enable all browsers to be managed by profile-sync-daemon.
+
+        Available choices are:
+        chromium chromium-dev conkeror.mozdev.org epiphany falkon firefox firefox-trunk google-chrome google-chrome-beta google-chrome-unstable heftig-aurora icecat inox luakit midori opera opera-beta opera-developer opera-legacy otter-browser qupzilla qutebrowser palemoon rekonq seamonkey surf vivaldi vivaldi-snapshot
+      '';
+    };
+
+    useBackup = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Whether to completly enable or disable the crash recovery feature.
+      '';
+    };
+
+    backupLimit = lib.mkOption {
+      type = lib.types.ints.unsigned;
+      default = 5;
+      description = ''
+        Maximum number of crash recovery snapshots to keep (the oldest ones are deleted first).
+      '';
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -38,6 +74,10 @@ in {
           rsync
           kmod
           gawk
+          gnugrep
+          gnused
+          coreutils
+          findutils
           nettools
           util-linux
           profile-sync-daemon
@@ -84,5 +124,7 @@ in {
         Timer = { OnUnitActiveSec = cfg.resyncTimer; };
       };
     };
+
+    xdg.configFile."psd/psd.conf".text = configFile;
   };
 }

From e495cd8c805a050d404abcb658cfe8cdaf589990 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 21 Feb 2025 20:41:22 -0800
Subject: [PATCH 423/546] tests/firefox: add profiles-extensions (#6510)

Wasn't actually running test because it wasn't included. Also had to fix
test after some of the recent changes.
---
 tests/modules/programs/firefox/common.nix     |  1 +
 .../firefox/profiles/extensions/default.nix   | 25 +++++++++++--------
 .../profiles/extensions/expected-storage.js   |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix
index 939eab949..7dca728a9 100644
--- a/tests/modules/programs/firefox/common.nix
+++ b/tests/modules/programs/firefox/common.nix
@@ -11,6 +11,7 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) {
   "${name}-profiles-containers-id-out-of-range" =
     ./profiles/containers/id-out-of-range.nix;
   "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profiles-extensions" = ./profiles/extensions;
   "${name}-profiles-overwrite" = ./profiles/overwrite;
   "${name}-profiles-search" = ./profiles/search;
   "${name}-profiles-settings" = ./profiles/settings;
diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix
index 577518390..7f181b4fd 100644
--- a/tests/modules/programs/firefox/profiles/extensions/default.nix
+++ b/tests/modules/programs/firefox/profiles/extensions/default.nix
@@ -1,5 +1,5 @@
 modulePath:
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 with lib;
 let
   cfg = getAttrFromPath modulePath config;
@@ -11,20 +11,25 @@ in {
   config = mkIf config.test.enableBig (setAttrByPath modulePath {
     enable = true;
     profiles.extensions = {
-      extensions.settings."uBlock0@raymondhill.net".settings = {
-        selectedFilterLists = [
-          "ublock-filters"
-          "ublock-badware"
-          "ublock-privacy"
-          "ublock-unbreak"
-          "ublock-quick-fixes"
-        ];
+      extensions = {
+        force = true;
+        settings = {
+          "uBlock0@raymondhill.net".settings = {
+            selectedFilterLists = [
+              "ublock-filters"
+              "ublock-badware"
+              "ublock-privacy"
+              "ublock-unbreak"
+              "ublock-quick-fixes"
+            ];
+          };
+        };
       };
     };
   } // {
     nmt.script = ''
       assertFileContent \
-        home-files/${cfg.configPath}/extensions/uBlock0@raymondhill.net/storage.js \
+        home-files/${cfg.configPath}/extensions/browser-extension-data/uBlock0@raymondhill.net/storage.js \
         ${./expected-storage.js}
     '';
   });
diff --git a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js
index 66c2a8d0f..225234411 100644
--- a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js
+++ b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js
@@ -1 +1 @@
-{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]}
+{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]}
\ No newline at end of file

From 439a125afef8c97308ec0c6db75d38e15d92208d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 21 Feb 2025 21:20:07 -0800
Subject: [PATCH 424/546] tests: remove with lib (#6511)

---
 tests/asserts.nix                             | 17 ++++++------
 .../standalone/kitty-theme-bad-home.nix       |  2 +-
 .../standalone/kitty-theme-good-home.nix      |  2 +-
 .../modules/accounts/email-test-accounts.nix  |  2 --
 tests/modules/files/disabled.nix              |  2 --
 tests/modules/files/executable.nix            |  2 --
 tests/modules/files/hidden-source.nix         |  2 --
 tests/modules/files/source-with-spaces.nix    |  2 --
 tests/modules/files/target-conflict.nix       |  2 --
 tests/modules/files/target-with-shellvar.nix  |  2 --
 tests/modules/files/text.nix                  |  2 --
 tests/modules/launchd/agents.nix              |  4 ---
 .../editorconfig-simple-config.nix            |  2 --
 .../fontconfig/multiple-font-packages.nix     |  6 +----
 tests/modules/misc/nix/example-registry.nix   |  2 --
 tests/modules/misc/pam/session-variables.nix  |  6 +----
 .../misc/specialisation/specialisation.nix    |  4 ---
 tests/modules/misc/xdg/default-locations.nix  |  6 +----
 tests/modules/misc/xdg/desktop-entries.nix    |  6 +----
 tests/modules/misc/xdg/file-gen.nix           |  6 +----
 tests/modules/misc/xdg/mime-apps-basics.nix   |  4 ---
 tests/modules/misc/xdg/mime-disabled.nix      |  2 +-
 tests/modules/misc/xsession/basic.nix         |  4 ---
 .../misc/xsession/keyboard-without-layout.nix |  4 ---
 tests/modules/programs/abook/no-settings.nix  |  4 ---
 .../modules/programs/abook/with-settings.nix  |  4 ---
 tests/modules/programs/aerc/assertion.nix     |  4 ---
 tests/modules/programs/aerc/noSettings.nix    |  4 ---
 tests/modules/programs/aerc/settings.nix      |  6 +----
 .../programs/atuin/example-settings.nix       |  2 --
 .../bash/bash-history-control-with-file.nix   |  4 ---
 .../programs/bottom/empty-settings.nix        |  6 +----
 .../programs/bottom/example-settings.nix      |  6 +----
 .../modules/programs/boxxy/empty-settings.nix |  4 ---
 .../programs/boxxy/example-settings.nix       |  4 ---
 tests/modules/programs/dircolors/settings.nix |  4 ---
 tests/modules/programs/eww/basic-config.nix   |  2 +-
 tests/modules/programs/eww/null-config.nix    |  2 +-
 .../firefox/deprecated-native-messenger.nix   |  9 ++-----
 tests/modules/programs/firefox/policies.nix   | 11 +++-----
 .../programs/firefox/state-version-19_09.nix  | 11 +++-----
 tests/modules/programs/fish/functions.nix     |  5 +---
 tests/modules/programs/fish/no-functions.nix  |  6 +----
 tests/modules/programs/fish/plugins.nix       |  5 +---
 tests/modules/programs/getmail/getmail.nix    |  4 ---
 .../programs/git-worktree-switcher/fish.nix   |  2 --
 .../programs/git-worktree-switcher/zsh.nix    |  2 --
 .../programs/gnome-shell/gnome-shell.nix      |  9 +++----
 .../programs/gpg/override-defaults.nix        |  6 +----
 .../programs/kitty/example-settings.nix       |  6 +----
 .../programs/kitty/null-shellIntegration.nix  |  4 ---
 tests/modules/programs/lieer/lieer.nix        |  6 +----
 .../looking-glass-client/empty-settings.nix   |  6 +----
 .../looking-glass-client/example-settings.nix |  6 +----
 tests/modules/programs/man/apropos.nix        |  4 ---
 tests/modules/programs/man/no-manpath.nix     |  4 ---
 .../programs/mujmap/mujmap-defaults.nix       |  6 +----
 .../mujmap-fqdn-and-session-url-specified.nix |  6 +----
 .../programs/readline/prefer-xdg-dirs.nix     |  2 --
 .../programs/readline/using-all-options.nix   |  4 ---
 tests/modules/programs/ssh/default-config.nix |  8 ++----
 ...ds-dynamic-bind-path-with-port-asserts.nix |  4 ---
 ...forwards-dynamic-valid-bind-no-asserts.nix |  8 ++----
 ...ards-local-bind-path-with-port-asserts.nix |  4 ---
 ...ards-local-host-path-with-port-asserts.nix |  4 ---
 ...rds-remote-bind-path-with-port-asserts.nix |  4 ---
 ...rds-remote-host-path-with-port-asserts.nix |  4 ---
 .../programs/ssh/match-blocks-attrs.nix       | 10 +++----
 .../ssh/match-blocks-match-and-hosts.nix      |  8 ++----
 .../programs/texlive/texlive-minimal.nix      |  8 ++----
 tests/modules/programs/tmux/default-shell.nix |  5 +---
 .../tmux/disable-confirmation-prompt.nix      |  4 ---
 .../programs/tmux/emacs-with-plugins.nix      |  6 +----
 tests/modules/programs/tmux/mouse-enabled.nix |  4 ---
 tests/modules/programs/tmux/not-enabled.nix   |  4 ---
 tests/modules/programs/tmux/prefix.nix        |  4 ---
 .../programs/tmux/secure-socket-enabled.nix   |  4 ---
 .../programs/tmux/shortcut-without-prefix.nix |  4 ---
 tests/modules/programs/tmux/vi-all-true.nix   |  4 ---
 .../programs/watson/empty-settings.nix        |  6 +----
 .../programs/watson/example-settings.nix      |  6 +----
 .../programs/wlogout/layout-multiple.nix      |  6 +----
 .../programs/wlogout/layout-single.nix        |  6 +----
 tests/modules/programs/wlogout/styling.nix    |  6 +----
 .../programs/xmobar/basic-configuration.nix   |  6 +----
 .../activitywatch/empty-server-settings.nix   |  2 --
 tests/modules/services/fluidsynth/service.nix |  2 --
 .../i3/i3-bar-focused-colors.nix              |  2 --
 .../window-managers/i3/i3-followmouse.nix     |  2 --
 .../i3/i3-fonts-deprecated.nix                |  2 --
 .../services/window-managers/i3/i3-fonts.nix  |  2 --
 .../window-managers/i3/i3-null-config.nix     |  2 --
 .../i3/i3-workspace-default.nix               |  2 --
 .../i3/i3-workspace-output.nix                |  2 --
 tests/modules/systemd/timers.nix              |  2 --
 tests/modules/targets-darwin/darwin.nix       |  7 +----
 tests/modules/targets-linux/generic-linux.nix |  8 ++----
 tests/modules/xresources/empty.nix            |  2 --
 tests/modules/xresources/xresources.nix       |  2 --
 tests/stubs.nix                               | 26 +++++++++----------
 100 files changed, 77 insertions(+), 398 deletions(-)

diff --git a/tests/asserts.nix b/tests/asserts.nix
index 1909f90b7..0d4f50307 100644
--- a/tests/asserts.nix
+++ b/tests/asserts.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }:
+let inherit (lib) concatStringsSep mkOption types;
+in {
   options.test.asserts = {
     warnings = {
       enable = mkOption {
@@ -37,8 +35,8 @@ with lib;
     };
   };
 
-  config = mkMerge [
-    (mkIf config.test.asserts.warnings.enable {
+  config = lib.mkMerge [
+    (lib.mkIf config.test.asserts.warnings.enable {
       home.file = {
         "asserts/warnings.actual".text = concatStringsSep ''
 
@@ -57,12 +55,13 @@ with lib;
       '';
     })
 
-    (mkIf config.test.asserts.assertions.enable {
+    (lib.mkIf config.test.asserts.assertions.enable {
       home.file = {
         "asserts/assertions.actual".text = concatStringsSep ''
 
           --
-        '' (map (x: x.message) (filter (x: !x.assertion) config.assertions));
+        ''
+          (map (x: x.message) (lib.filter (x: !x.assertion) config.assertions));
         "asserts/assertions.expected".text = concatStringsSep ''
 
           --
diff --git a/tests/integration/standalone/kitty-theme-bad-home.nix b/tests/integration/standalone/kitty-theme-bad-home.nix
index 4c4594173..ca1a1289f 100644
--- a/tests/integration/standalone/kitty-theme-bad-home.nix
+++ b/tests/integration/standalone/kitty-theme-bad-home.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   home.username = "alice";
   home.homeDirectory = "/home/alice";
   home.stateVersion = "24.11";
diff --git a/tests/integration/standalone/kitty-theme-good-home.nix b/tests/integration/standalone/kitty-theme-good-home.nix
index 606724bab..23eaacbfb 100644
--- a/tests/integration/standalone/kitty-theme-good-home.nix
+++ b/tests/integration/standalone/kitty-theme-good-home.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   home.username = "alice";
   home.homeDirectory = "/home/alice";
 
diff --git a/tests/modules/accounts/email-test-accounts.nix b/tests/modules/accounts/email-test-accounts.nix
index e66e58949..44614733e 100644
--- a/tests/modules/accounts/email-test-accounts.nix
+++ b/tests/modules/accounts/email-test-accounts.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   accounts.email = {
     maildirBasePath = "Mail";
diff --git a/tests/modules/files/disabled.nix b/tests/modules/files/disabled.nix
index b9ed858aa..d106f26bd 100644
--- a/tests/modules/files/disabled.nix
+++ b/tests/modules/files/disabled.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."disabled" = {
     enable = false;
diff --git a/tests/modules/files/executable.nix b/tests/modules/files/executable.nix
index 9ab8f3591..0e144ed48 100644
--- a/tests/modules/files/executable.nix
+++ b/tests/modules/files/executable.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."executable" = {
     text = "";
diff --git a/tests/modules/files/hidden-source.nix b/tests/modules/files/hidden-source.nix
index 380a2cb2d..6c205b481 100644
--- a/tests/modules/files/hidden-source.nix
+++ b/tests/modules/files/hidden-source.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file.".hidden".source = ./.hidden;
 
diff --git a/tests/modules/files/source-with-spaces.nix b/tests/modules/files/source-with-spaces.nix
index cd78664e5..a854caf64 100644
--- a/tests/modules/files/source-with-spaces.nix
+++ b/tests/modules/files/source-with-spaces.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."source with spaces!".source = ./. + "/source with spaces!";
 
diff --git a/tests/modules/files/target-conflict.nix b/tests/modules/files/target-conflict.nix
index 9677cf9de..34f1a34d2 100644
--- a/tests/modules/files/target-conflict.nix
+++ b/tests/modules/files/target-conflict.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file = {
     conflict1 = {
diff --git a/tests/modules/files/target-with-shellvar.nix b/tests/modules/files/target-with-shellvar.nix
index 59fc02fde..317db5b21 100644
--- a/tests/modules/files/target-with-shellvar.nix
+++ b/tests/modules/files/target-with-shellvar.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."$HOME/$FOO/bar baz".text = "blah";
 
diff --git a/tests/modules/files/text.nix b/tests/modules/files/text.nix
index c09c56c4a..70bbc438f 100644
--- a/tests/modules/files/text.nix
+++ b/tests/modules/files/text.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."using-text".text = ''
     This is the
diff --git a/tests/modules/launchd/agents.nix b/tests/modules/launchd/agents.nix
index ccf4f6e24..b47126ba9 100644
--- a/tests/modules/launchd/agents.nix
+++ b/tests/modules/launchd/agents.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     launchd.agents."test-service" = {
diff --git a/tests/modules/misc/editorconfig/editorconfig-simple-config.nix b/tests/modules/misc/editorconfig/editorconfig-simple-config.nix
index ca0581e5f..58cdbee29 100644
--- a/tests/modules/misc/editorconfig/editorconfig-simple-config.nix
+++ b/tests/modules/misc/editorconfig/editorconfig-simple-config.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   editorconfig = {
     enable = true;
diff --git a/tests/modules/misc/fontconfig/multiple-font-packages.nix b/tests/modules/misc/fontconfig/multiple-font-packages.nix
index 3845b4ba4..c32bfb3ea 100644
--- a/tests/modules/misc/fontconfig/multiple-font-packages.nix
+++ b/tests/modules/misc/fontconfig/multiple-font-packages.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     home.packages = [ pkgs.comic-relief pkgs.unifont ];
 
diff --git a/tests/modules/misc/nix/example-registry.nix b/tests/modules/misc/nix/example-registry.nix
index 99da470ef..70cb066b2 100644
--- a/tests/modules/misc/nix/example-registry.nix
+++ b/tests/modules/misc/nix/example-registry.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   nix = {
     registry = {
diff --git a/tests/modules/misc/pam/session-variables.nix b/tests/modules/misc/pam/session-variables.nix
index 4fbec4163..f2625da5f 100644
--- a/tests/modules/misc/pam/session-variables.nix
+++ b/tests/modules/misc/pam/session-variables.nix
@@ -1,8 +1,4 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     pam.sessionVariables = {
       V1 = "v1";
diff --git a/tests/modules/misc/specialisation/specialisation.nix b/tests/modules/misc/specialisation/specialisation.nix
index a8d417d48..daea6e2c7 100644
--- a/tests/modules/misc/specialisation/specialisation.nix
+++ b/tests/modules/misc/specialisation/specialisation.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   home.file.testfile.text = "not special";
   specialisation.test.configuration = {
diff --git a/tests/modules/misc/xdg/default-locations.nix b/tests/modules/misc/xdg/default-locations.nix
index 1f6b36cc8..10649fdf8 100644
--- a/tests/modules/misc/xdg/default-locations.nix
+++ b/tests/modules/misc/xdg/default-locations.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     # Test fallback behavior for stateVersion >= 20.09, which is pure.
     xdg.enable = lib.mkForce false;
diff --git a/tests/modules/misc/xdg/desktop-entries.nix b/tests/modules/misc/xdg/desktop-entries.nix
index 5f00029b6..9f52c550d 100644
--- a/tests/modules/misc/xdg/desktop-entries.nix
+++ b/tests/modules/misc/xdg/desktop-entries.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     xdg.desktopEntries = {
       full = { # full definition
diff --git a/tests/modules/misc/xdg/file-gen.nix b/tests/modules/misc/xdg/file-gen.nix
index 7514f414f..f06c6e520 100644
--- a/tests/modules/misc/xdg/file-gen.nix
+++ b/tests/modules/misc/xdg/file-gen.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     xdg.configHome = /. + "${config.home.homeDirectory}/.dummy-config";
     xdg.dataHome = /. + "${config.home.homeDirectory}/.dummy-data";
diff --git a/tests/modules/misc/xdg/mime-apps-basics.nix b/tests/modules/misc/xdg/mime-apps-basics.nix
index e181e8206..3688040e5 100644
--- a/tests/modules/misc/xdg/mime-apps-basics.nix
+++ b/tests/modules/misc/xdg/mime-apps-basics.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     xdg.mimeApps = {
diff --git a/tests/modules/misc/xdg/mime-disabled.nix b/tests/modules/misc/xdg/mime-disabled.nix
index a3df63091..43885528b 100644
--- a/tests/modules/misc/xdg/mime-disabled.nix
+++ b/tests/modules/misc/xdg/mime-disabled.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     xdg.mime.enable = false;
     nmt.script = ''
diff --git a/tests/modules/misc/xsession/basic.nix b/tests/modules/misc/xsession/basic.nix
index d6756291c..f212de19d 100644
--- a/tests/modules/misc/xsession/basic.nix
+++ b/tests/modules/misc/xsession/basic.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     xsession = {
diff --git a/tests/modules/misc/xsession/keyboard-without-layout.nix b/tests/modules/misc/xsession/keyboard-without-layout.nix
index 90038cfd0..d49d60e02 100644
--- a/tests/modules/misc/xsession/keyboard-without-layout.nix
+++ b/tests/modules/misc/xsession/keyboard-without-layout.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     home.stateVersion = "19.09";
diff --git a/tests/modules/programs/abook/no-settings.nix b/tests/modules/programs/abook/no-settings.nix
index a8e5de78c..942c19e50 100644
--- a/tests/modules/programs/abook/no-settings.nix
+++ b/tests/modules/programs/abook/no-settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.abook.enable = true;
diff --git a/tests/modules/programs/abook/with-settings.nix b/tests/modules/programs/abook/with-settings.nix
index 22703a172..a02c9d6fd 100644
--- a/tests/modules/programs/abook/with-settings.nix
+++ b/tests/modules/programs/abook/with-settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.abook = {
diff --git a/tests/modules/programs/aerc/assertion.nix b/tests/modules/programs/aerc/assertion.nix
index dfdbe3f7d..b1523bbc0 100644
--- a/tests/modules/programs/aerc/assertion.nix
+++ b/tests/modules/programs/aerc/assertion.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     test.asserts.assertions.expected = [''
diff --git a/tests/modules/programs/aerc/noSettings.nix b/tests/modules/programs/aerc/noSettings.nix
index fc4cb2dbb..46d146bf9 100644
--- a/tests/modules/programs/aerc/noSettings.nix
+++ b/tests/modules/programs/aerc/noSettings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     nmt.script = let dir = "home-files/.config/aerc";
diff --git a/tests/modules/programs/aerc/settings.nix b/tests/modules/programs/aerc/settings.nix
index 8d59f1e6c..306930985 100644
--- a/tests/modules/programs/aerc/settings.nix
+++ b/tests/modules/programs/aerc/settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   config = {
     nmt.script = let
       dir = if (pkgs.stdenv.isDarwin && !config.xdg.enable) then
diff --git a/tests/modules/programs/atuin/example-settings.nix b/tests/modules/programs/atuin/example-settings.nix
index dab1b9e3a..c23b84e3e 100644
--- a/tests/modules/programs/atuin/example-settings.nix
+++ b/tests/modules/programs/atuin/example-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.atuin = {
     enable = true;
diff --git a/tests/modules/programs/bash/bash-history-control-with-file.nix b/tests/modules/programs/bash/bash-history-control-with-file.nix
index 449da8860..d3193232a 100644
--- a/tests/modules/programs/bash/bash-history-control-with-file.nix
+++ b/tests/modules/programs/bash/bash-history-control-with-file.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.bash = {
diff --git a/tests/modules/programs/bottom/empty-settings.nix b/tests/modules/programs/bottom/empty-settings.nix
index 71799c831..3c5c8b72a 100644
--- a/tests/modules/programs/bottom/empty-settings.nix
+++ b/tests/modules/programs/bottom/empty-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.bottom = {
       enable = true;
diff --git a/tests/modules/programs/bottom/example-settings.nix b/tests/modules/programs/bottom/example-settings.nix
index a0ed11085..918969b1d 100644
--- a/tests/modules/programs/bottom/example-settings.nix
+++ b/tests/modules/programs/bottom/example-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.bottom = {
       enable = true;
diff --git a/tests/modules/programs/boxxy/empty-settings.nix b/tests/modules/programs/boxxy/empty-settings.nix
index 133d670f5..61692a237 100644
--- a/tests/modules/programs/boxxy/empty-settings.nix
+++ b/tests/modules/programs/boxxy/empty-settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.boxxy.enable = true;
diff --git a/tests/modules/programs/boxxy/example-settings.nix b/tests/modules/programs/boxxy/example-settings.nix
index 6f10a56c3..46003a0e7 100644
--- a/tests/modules/programs/boxxy/example-settings.nix
+++ b/tests/modules/programs/boxxy/example-settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.boxxy.enable = true;
diff --git a/tests/modules/programs/dircolors/settings.nix b/tests/modules/programs/dircolors/settings.nix
index 9ca676ef9..456392a2b 100644
--- a/tests/modules/programs/dircolors/settings.nix
+++ b/tests/modules/programs/dircolors/settings.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.dircolors = {
diff --git a/tests/modules/programs/eww/basic-config.nix b/tests/modules/programs/eww/basic-config.nix
index cc207e100..30059d4f1 100644
--- a/tests/modules/programs/eww/basic-config.nix
+++ b/tests/modules/programs/eww/basic-config.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     programs.eww = {
       enable = true;
diff --git a/tests/modules/programs/eww/null-config.nix b/tests/modules/programs/eww/null-config.nix
index 28cd6fc68..0ae1b903b 100644
--- a/tests/modules/programs/eww/null-config.nix
+++ b/tests/modules/programs/eww/null-config.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     programs.eww = { enable = true; };
 
diff --git a/tests/modules/programs/firefox/deprecated-native-messenger.nix b/tests/modules/programs/firefox/deprecated-native-messenger.nix
index 87423aba3..53309cee4 100644
--- a/tests/modules/programs/firefox/deprecated-native-messenger.nix
+++ b/tests/modules/programs/firefox/deprecated-native-messenger.nix
@@ -1,18 +1,13 @@
 modulePath:
 { config, lib, ... }:
-
-with lib;
-
 let
-
-  moduleName = concatStringsSep "." modulePath;
+  moduleName = lib.concatStringsSep "." modulePath;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     enableGnomeExtensions = true;
   } // {
diff --git a/tests/modules/programs/firefox/policies.nix b/tests/modules/programs/firefox/policies.nix
index 5cda1406a..4cf761a53 100644
--- a/tests/modules/programs/firefox/policies.nix
+++ b/tests/modules/programs/firefox/policies.nix
@@ -1,20 +1,15 @@
 modulePath:
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig ({
+  config = lib.mkIf config.test.enableBig ({
     home.stateVersion = "23.05";
-  } // setAttrByPath modulePath {
+  } // lib.setAttrByPath modulePath {
     enable = true;
     policies = { BlockAboutConfig = true; };
     package = pkgs.${cfg.wrappedPackageName}.override {
diff --git a/tests/modules/programs/firefox/state-version-19_09.nix b/tests/modules/programs/firefox/state-version-19_09.nix
index 475705c31..b12a4f6fc 100644
--- a/tests/modules/programs/firefox/state-version-19_09.nix
+++ b/tests/modules/programs/firefox/state-version-19_09.nix
@@ -1,20 +1,15 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ config, lib, ... }:
 let
-
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
   config = lib.mkIf config.test.enableBig ({
     home.stateVersion = "19.09";
-  } // setAttrByPath modulePath { enable = true; } // {
+  } // lib.setAttrByPath modulePath { enable = true; } // {
     nmt.script = ''
       assertFileRegex \
         home-path/bin/${cfg.wrappedPackageName} \
diff --git a/tests/modules/programs/fish/functions.nix b/tests/modules/programs/fish/functions.nix
index b8b5793a5..4bead25b0 100644
--- a/tests/modules/programs/fish/functions.nix
+++ b/tests/modules/programs/fish/functions.nix
@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
 
   func = pkgs.writeText "func.fish" ''
diff --git a/tests/modules/programs/fish/no-functions.nix b/tests/modules/programs/fish/no-functions.nix
index 125ed8841..3caddfd95 100644
--- a/tests/modules/programs/fish/no-functions.nix
+++ b/tests/modules/programs/fish/no-functions.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, ... }: {
   config = {
     programs.fish = {
       enable = true;
diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix
index 88684b3b4..3e655e33f 100644
--- a/tests/modules/programs/fish/plugins.nix
+++ b/tests/modules/programs/fish/plugins.nix
@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
 
   fooPluginSrc = pkgs.writeText "fooPluginSrc" "";
diff --git a/tests/modules/programs/getmail/getmail.nix b/tests/modules/programs/getmail/getmail.nix
index c460a37e7..8122d6529 100644
--- a/tests/modules/programs/getmail/getmail.nix
+++ b/tests/modules/programs/getmail/getmail.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
diff --git a/tests/modules/programs/git-worktree-switcher/fish.nix b/tests/modules/programs/git-worktree-switcher/fish.nix
index b6b29c2ae..946cfa754 100644
--- a/tests/modules/programs/git-worktree-switcher/fish.nix
+++ b/tests/modules/programs/git-worktree-switcher/fish.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     fish.enable = true;
diff --git a/tests/modules/programs/git-worktree-switcher/zsh.nix b/tests/modules/programs/git-worktree-switcher/zsh.nix
index 5e0672763..31028441d 100644
--- a/tests/modules/programs/git-worktree-switcher/zsh.nix
+++ b/tests/modules/programs/git-worktree-switcher/zsh.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     zsh.enable = true;
diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix
index b9cc327d9..b6f6c49f6 100644
--- a/tests/modules/programs/gnome-shell/gnome-shell.nix
+++ b/tests/modules/programs/gnome-shell/gnome-shell.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   dummy-gnome-shell-extensions = pkgs.runCommand "dummy-package" { } ''
     mkdir -p $out/share/gnome-shell/extensions/dummy-package
@@ -31,7 +28,7 @@ let
     "test-extension-uuid"
   ];
 
-  actualEnabledExtensions = catAttrs "value"
+  actualEnabledExtensions = lib.catAttrs "value"
     config.dconf.settings."org/gnome/shell".enabled-extensions.value;
 
 in {
@@ -62,8 +59,8 @@ in {
       message = "Expected disable-user-extensions to be false.";
     }
     {
-      assertion =
-        all (e: elem e actualEnabledExtensions) expectedEnabledExtensions;
+      assertion = lib.all (e: lib.elem e actualEnabledExtensions)
+        expectedEnabledExtensions;
       message = ''
         Expected enabled-extensions to contain all of:
           ${toString expectedEnabledExtensions}
diff --git a/tests/modules/programs/gpg/override-defaults.nix b/tests/modules/programs/gpg/override-defaults.nix
index e41043395..5e9275d83 100644
--- a/tests/modules/programs/gpg/override-defaults.nix
+++ b/tests/modules/programs/gpg/override-defaults.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.gpg = {
       enable = true;
diff --git a/tests/modules/programs/kitty/example-settings.nix b/tests/modules/programs/kitty/example-settings.nix
index d02c04c55..8b6c74ee7 100644
--- a/tests/modules/programs/kitty/example-settings.nix
+++ b/tests/modules/programs/kitty/example-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, pkgs, ... }: {
   config = {
     programs.kitty = {
       enable = true;
diff --git a/tests/modules/programs/kitty/null-shellIntegration.nix b/tests/modules/programs/kitty/null-shellIntegration.nix
index 293249d69..0346ee92b 100644
--- a/tests/modules/programs/kitty/null-shellIntegration.nix
+++ b/tests/modules/programs/kitty/null-shellIntegration.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.kitty = {
diff --git a/tests/modules/programs/lieer/lieer.nix b/tests/modules/programs/lieer/lieer.nix
index 5e7847464..e6786c92d 100644
--- a/tests/modules/programs/lieer/lieer.nix
+++ b/tests/modules/programs/lieer/lieer.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {
diff --git a/tests/modules/programs/looking-glass-client/empty-settings.nix b/tests/modules/programs/looking-glass-client/empty-settings.nix
index 10c177a9e..5b2a8b9c4 100644
--- a/tests/modules/programs/looking-glass-client/empty-settings.nix
+++ b/tests/modules/programs/looking-glass-client/empty-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.looking-glass-client = {
       enable = true;
diff --git a/tests/modules/programs/looking-glass-client/example-settings.nix b/tests/modules/programs/looking-glass-client/example-settings.nix
index 6ac8f0185..c85701580 100644
--- a/tests/modules/programs/looking-glass-client/example-settings.nix
+++ b/tests/modules/programs/looking-glass-client/example-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.looking-glass-client = {
       enable = true;
diff --git a/tests/modules/programs/man/apropos.nix b/tests/modules/programs/man/apropos.nix
index a8ec35ead..ee30f8f8c 100644
--- a/tests/modules/programs/man/apropos.nix
+++ b/tests/modules/programs/man/apropos.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.man = {
diff --git a/tests/modules/programs/man/no-manpath.nix b/tests/modules/programs/man/no-manpath.nix
index 1b8cfb40c..dc3a3a0cb 100644
--- a/tests/modules/programs/man/no-manpath.nix
+++ b/tests/modules/programs/man/no-manpath.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.man = { enable = true; };
diff --git a/tests/modules/programs/mujmap/mujmap-defaults.nix b/tests/modules/programs/mujmap/mujmap-defaults.nix
index 704978997..d1a71f180 100644
--- a/tests/modules/programs/mujmap/mujmap-defaults.nix
+++ b/tests/modules/programs/mujmap/mujmap-defaults.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {
diff --git a/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix b/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix
index 03c3f542e..6ae87f832 100644
--- a/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix
+++ b/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {
diff --git a/tests/modules/programs/readline/prefer-xdg-dirs.nix b/tests/modules/programs/readline/prefer-xdg-dirs.nix
index 869b8a2cb..b825b3bc2 100644
--- a/tests/modules/programs/readline/prefer-xdg-dirs.nix
+++ b/tests/modules/programs/readline/prefer-xdg-dirs.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.preferXdgDirectories = true;
 
diff --git a/tests/modules/programs/readline/using-all-options.nix b/tests/modules/programs/readline/using-all-options.nix
index 85c9fc140..a2ae4fafb 100644
--- a/tests/modules/programs/readline/using-all-options.nix
+++ b/tests/modules/programs/readline/using-all-options.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.readline = {
diff --git a/tests/modules/programs/ssh/default-config.nix b/tests/modules/programs/ssh/default-config.nix
index 6d7e5508a..60a966130 100644
--- a/tests/modules/programs/ssh/default-config.nix
+++ b/tests/modules/programs/ssh/default-config.nix
@@ -1,13 +1,9 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = { enable = true; };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config
diff --git a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
index e841b5bcd..ce83b2c13 100644
--- a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {
diff --git a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix b/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
index d0c3a7322..ae5c1fb9e 100644
--- a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -25,7 +21,7 @@ with lib;
     };
 
     home.file.result.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config
diff --git a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
index e7ac454e8..0c05bb108 100644
--- a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {
diff --git a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
index 890459c8a..9dca55abb 100644
--- a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {
diff --git a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
index ece7d7953..645876078 100644
--- a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {
diff --git a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
index b1228f4ef..c4f549e21 100644
--- a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
+++ b/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {
diff --git a/tests/modules/programs/ssh/match-blocks-attrs.nix b/tests/modules/programs/ssh/match-blocks-attrs.nix
index d8584e3a0..21deb7e27 100644
--- a/tests/modules/programs/ssh/match-blocks-attrs.nix
+++ b/tests/modules/programs/ssh/match-blocks-attrs.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -12,7 +8,7 @@ with lib;
           proxyJump = "jump-host";
         };
 
-        ordered = hm.dag.entryAfter [ "xyz" ] { port = 1; };
+        ordered = lib.hm.dag.entryAfter [ "xyz" ] { port = 1; };
 
         xyz = {
           identityFile = "file";
@@ -49,7 +45,7 @@ with lib;
     };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config
diff --git a/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix b/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix
index aa1e40d05..01e91c0b6 100644
--- a/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix
+++ b/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -19,7 +15,7 @@ with lib;
     };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config
diff --git a/tests/modules/programs/texlive/texlive-minimal.nix b/tests/modules/programs/texlive/texlive-minimal.nix
index 1b13936be..8db048e58 100644
--- a/tests/modules/programs/texlive/texlive-minimal.nix
+++ b/tests/modules/programs/texlive/texlive-minimal.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, pkgs, ... }: {
   config = {
     programs.texlive.enable = true;
 
@@ -14,7 +10,7 @@ with lib;
           combine = tpkgs:
             pkgs.symlinkJoin {
               name = "dummy-texlive-combine";
-              paths = attrValues tpkgs;
+              paths = lib.attrValues tpkgs;
             };
         };
       })
diff --git a/tests/modules/programs/tmux/default-shell.nix b/tests/modules/programs/tmux/default-shell.nix
index af05eb0e7..f0718b8ad 100644
--- a/tests/modules/programs/tmux/default-shell.nix
+++ b/tests/modules/programs/tmux/default-shell.nix
@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ pkgs, ... }:
 let
 
   substituteExpected = path:
diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.nix b/tests/modules/programs/tmux/disable-confirmation-prompt.nix
index aec1f66cf..7bcc08e16 100644
--- a/tests/modules/programs/tmux/disable-confirmation-prompt.nix
+++ b/tests/modules/programs/tmux/disable-confirmation-prompt.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/tmux/emacs-with-plugins.nix b/tests/modules/programs/tmux/emacs-with-plugins.nix
index 4a0382d8d..146c5fa8e 100644
--- a/tests/modules/programs/tmux/emacs-with-plugins.nix
+++ b/tests/modules/programs/tmux/emacs-with-plugins.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     programs.tmux = {
       aggressiveResize = true;
diff --git a/tests/modules/programs/tmux/mouse-enabled.nix b/tests/modules/programs/tmux/mouse-enabled.nix
index 6fc5b526e..5e674e21c 100644
--- a/tests/modules/programs/tmux/mouse-enabled.nix
+++ b/tests/modules/programs/tmux/mouse-enabled.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/tmux/not-enabled.nix b/tests/modules/programs/tmux/not-enabled.nix
index d5f08b36f..556aaef9e 100644
--- a/tests/modules/programs/tmux/not-enabled.nix
+++ b/tests/modules/programs/tmux/not-enabled.nix
@@ -1,7 +1,3 @@
-{ config, lib, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = { enable = false; };
diff --git a/tests/modules/programs/tmux/prefix.nix b/tests/modules/programs/tmux/prefix.nix
index 9f97940e7..7777ad6df 100644
--- a/tests/modules/programs/tmux/prefix.nix
+++ b/tests/modules/programs/tmux/prefix.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/tmux/secure-socket-enabled.nix b/tests/modules/programs/tmux/secure-socket-enabled.nix
index 60b3f7087..eeb708f7c 100644
--- a/tests/modules/programs/tmux/secure-socket-enabled.nix
+++ b/tests/modules/programs/tmux/secure-socket-enabled.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/tmux/shortcut-without-prefix.nix b/tests/modules/programs/tmux/shortcut-without-prefix.nix
index 5c294ef97..635a9e10b 100644
--- a/tests/modules/programs/tmux/shortcut-without-prefix.nix
+++ b/tests/modules/programs/tmux/shortcut-without-prefix.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/tmux/vi-all-true.nix b/tests/modules/programs/tmux/vi-all-true.nix
index 8b9cf1a36..e04ea922e 100644
--- a/tests/modules/programs/tmux/vi-all-true.nix
+++ b/tests/modules/programs/tmux/vi-all-true.nix
@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {
diff --git a/tests/modules/programs/watson/empty-settings.nix b/tests/modules/programs/watson/empty-settings.nix
index 8e0474665..3dec3b76e 100644
--- a/tests/modules/programs/watson/empty-settings.nix
+++ b/tests/modules/programs/watson/empty-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   programs.watson = {
     enable = true;
     package = config.lib.test.mkStubPackage { };
diff --git a/tests/modules/programs/watson/example-settings.nix b/tests/modules/programs/watson/example-settings.nix
index f81f1ac85..11fd988aa 100644
--- a/tests/modules/programs/watson/example-settings.nix
+++ b/tests/modules/programs/watson/example-settings.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   programs.watson = {
     enable = true;
     package = config.lib.test.mkStubPackage { };
diff --git a/tests/modules/programs/wlogout/layout-multiple.nix b/tests/modules/programs/wlogout/layout-multiple.nix
index 108961aae..8e7e06a80 100644
--- a/tests/modules/programs/wlogout/layout-multiple.nix
+++ b/tests/modules/programs/wlogout/layout-multiple.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 
diff --git a/tests/modules/programs/wlogout/layout-single.nix b/tests/modules/programs/wlogout/layout-single.nix
index bbb5d61e6..9bcac8211 100644
--- a/tests/modules/programs/wlogout/layout-single.nix
+++ b/tests/modules/programs/wlogout/layout-single.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 
diff --git a/tests/modules/programs/wlogout/styling.nix b/tests/modules/programs/wlogout/styling.nix
index 6df6290fd..8233d25b6 100644
--- a/tests/modules/programs/wlogout/styling.nix
+++ b/tests/modules/programs/wlogout/styling.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 
diff --git a/tests/modules/programs/xmobar/basic-configuration.nix b/tests/modules/programs/xmobar/basic-configuration.nix
index bbd9420ea..897094417 100644
--- a/tests/modules/programs/xmobar/basic-configuration.nix
+++ b/tests/modules/programs/xmobar/basic-configuration.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.xmobar = {
       enable = true;
diff --git a/tests/modules/services/activitywatch/empty-server-settings.nix b/tests/modules/services/activitywatch/empty-server-settings.nix
index 290c1fb0a..3b0c50051 100644
--- a/tests/modules/services/activitywatch/empty-server-settings.nix
+++ b/tests/modules/services/activitywatch/empty-server-settings.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.activitywatch.enable = true;
 
diff --git a/tests/modules/services/fluidsynth/service.nix b/tests/modules/services/fluidsynth/service.nix
index 97ca0a4b4..2cefeabb1 100644
--- a/tests/modules/services/fluidsynth/service.nix
+++ b/tests/modules/services/fluidsynth/service.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.fluidsynth.enable = true;
   services.fluidsynth.soundService = "pipewire-pulse";
diff --git a/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix b/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix
index abb4112a7..7524fbee8 100644
--- a/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix
+++ b/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 
diff --git a/tests/modules/services/window-managers/i3/i3-followmouse.nix b/tests/modules/services/window-managers/i3/i3-followmouse.nix
index db84abd1f..9477d89d1 100644
--- a/tests/modules/services/window-managers/i3/i3-followmouse.nix
+++ b/tests/modules/services/window-managers/i3/i3-followmouse.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xsession.windowManager.i3 = {
     enable = true;
diff --git a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
index fefff9904..1aa0c9bcc 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 
diff --git a/tests/modules/services/window-managers/i3/i3-fonts.nix b/tests/modules/services/window-managers/i3/i3-fonts.nix
index 061f7a0bd..1f3ae01c1 100644
--- a/tests/modules/services/window-managers/i3/i3-fonts.nix
+++ b/tests/modules/services/window-managers/i3/i3-fonts.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 
diff --git a/tests/modules/services/window-managers/i3/i3-null-config.nix b/tests/modules/services/window-managers/i3/i3-null-config.nix
index 8433b0c7f..d0be9a60b 100644
--- a/tests/modules/services/window-managers/i3/i3-null-config.nix
+++ b/tests/modules/services/window-managers/i3/i3-null-config.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 
diff --git a/tests/modules/services/window-managers/i3/i3-workspace-default.nix b/tests/modules/services/window-managers/i3/i3-workspace-default.nix
index 733d619fd..f9fd598df 100644
--- a/tests/modules/services/window-managers/i3/i3-workspace-default.nix
+++ b/tests/modules/services/window-managers/i3/i3-workspace-default.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 
diff --git a/tests/modules/services/window-managers/i3/i3-workspace-output.nix b/tests/modules/services/window-managers/i3/i3-workspace-output.nix
index 4e31acdef..028e891b1 100644
--- a/tests/modules/services/window-managers/i3/i3-workspace-output.nix
+++ b/tests/modules/services/window-managers/i3/i3-workspace-output.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 let
   i3 = {
     ws1 = "1";
diff --git a/tests/modules/systemd/timers.nix b/tests/modules/systemd/timers.nix
index b9d167e3b..2d48e9fde 100644
--- a/tests/modules/systemd/timers.nix
+++ b/tests/modules/systemd/timers.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   systemd.user.timers.test-timer = {
     Unit = { Description = "A basic test timer"; };
diff --git a/tests/modules/targets-darwin/darwin.nix b/tests/modules/targets-darwin/darwin.nix
index 511ae87fd..640b17783 100644
--- a/tests/modules/targets-darwin/darwin.nix
+++ b/tests/modules/targets-darwin/darwin.nix
@@ -1,14 +1,9 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ pkgs, ... }:
 let
-
   darwinTestApp = pkgs.runCommandLocal "target-darwin-example-app" { } ''
     mkdir -p $out/Applications
     touch $out/Applications/example-app
   '';
-
 in {
   config = {
     home.packages = [ darwinTestApp ];
diff --git a/tests/modules/targets-linux/generic-linux.nix b/tests/modules/targets-linux/generic-linux.nix
index 88cec8a00..aba0e39d0 100644
--- a/tests/modules/targets-linux/generic-linux.nix
+++ b/tests/modules/targets-linux/generic-linux.nix
@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
-  expectedXdgDataDirs = concatStringsSep ":" [
+  expectedXdgDataDirs = lib.concatStringsSep ":" [
     "\${NIX_STATE_DIR:-/nix/var/nix}/profiles/default/share"
     "/home/hm-user/.nix-profile/share"
     "/usr/share/ubuntu"
@@ -12,7 +9,6 @@ let
     "/var/lib/snapd/desktop"
     "/foo"
   ];
-
 in {
   config = {
     targets.genericLinux.enable = true;
diff --git a/tests/modules/xresources/empty.nix b/tests/modules/xresources/empty.nix
index e02e0fbfe..3c4102781 100644
--- a/tests/modules/xresources/empty.nix
+++ b/tests/modules/xresources/empty.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xresources.properties = { };
 
diff --git a/tests/modules/xresources/xresources.nix b/tests/modules/xresources/xresources.nix
index 3f8a83678..5fead37da 100644
--- a/tests/modules/xresources/xresources.nix
+++ b/tests/modules/xresources/xresources.nix
@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xresources = {
     properties = {
diff --git a/tests/stubs.nix b/tests/stubs.nix
index 25863143d..66d7265e6 100644
--- a/tests/stubs.nix
+++ b/tests/stubs.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   stubType = types.submodule ({ name, ... }: {
     options = {
@@ -15,13 +13,13 @@ let
       outPath = mkOption {
         type = types.nullOr types.str;
         default = "@${name}@";
-        defaultText = literalExpression ''"@''${name}@"'';
+        defaultText = lib.literalExpression ''"@''${name}@"'';
       };
 
       version = mkOption {
         type = types.nullOr types.str;
         default = null;
-        defaultText = literalExpression "pkgs.\${name}.version or null";
+        defaultText = lib.literalExpression "pkgs.\${name}.version or null";
       };
 
       buildScript = mkOption {
@@ -52,7 +50,7 @@ let
           meta.mainProgram = name;
         } buildScript;
 
-      stubbedPkg = pkg // optionalAttrs (outPath != null) {
+      stubbedPkg = pkg // lib.optionalAttrs (outPath != null) {
         inherit outPath;
 
         # Prevent getOutput from descending into outputs
@@ -63,7 +61,8 @@ let
           buildHost = pkg;
           hostTarget = pkg;
         };
-      } // optionalAttrs (version != null) { inherit version; } // extraAttrs;
+      } // lib.optionalAttrs (version != null) { inherit version; }
+        // extraAttrs;
     in stubbedPkg;
 
 in {
@@ -90,11 +89,12 @@ in {
   config = {
     lib.test.mkStubPackage = mkStubPackage;
 
-    test.stubOverlays = [ ] ++ optional (config.test.stubs != { }) (self: super:
-      mapAttrs (n: v:
-        builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v
-          // optionalAttrs (v.version == null) {
-            version = super.${n}.version or null;
-          }))) config.test.stubs) ++ config.test.unstubs;
+    test.stubOverlays = [ ] ++ lib.optional (config.test.stubs != { })
+      (self: super:
+        lib.mapAttrs (n: v:
+          builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v
+            // lib.optionalAttrs (v.version == null) {
+              version = super.${n}.version or null;
+            }))) config.test.stubs) ++ config.test.unstubs;
   };
 }

From f0f0d1ade22b51eaaf4d16e6b3f4990d8c348f3e Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Sat, 22 Feb 2025 07:55:13 +0100
Subject: [PATCH 425/546] docs: update copyright year


From c31b4e330e40a4fbf55ceb59741bd75bbb9c622c Mon Sep 17 00:00:00 2001
From: eum3l <dev@eum3l.mozmail.com>
Date: Sat, 22 Feb 2025 07:03:07 +0000
Subject: [PATCH 426/546] accounts/email: provide realName option for alias
 (#6106)

---
 modules/accounts/email.nix       | 20 ++++++++++++++++++--
 modules/programs/mu.nix          |  3 ++-
 modules/programs/notmuch.nix     |  5 +++--
 modules/programs/thunderbird.nix | 25 ++++++++++++++++---------
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix
index e8cc708ed..437c8d558 100644
--- a/modules/accounts/email.nix
+++ b/modules/accounts/email.nix
@@ -268,10 +268,26 @@ let
       };
 
       aliases = mkOption {
-        type = types.listOf (types.strMatching ".*@.*");
+        description = "Alternative identities of this account.";
         default = [ ];
         example = [ "webmaster@example.org" "admin@example.org" ];
-        description = "Alternative email addresses of this account.";
+        type = types.listOf (types.oneOf [
+          (types.strMatching ".*@.*")
+          (types.submodule {
+            options = {
+              realName = mkOption {
+                type = types.str;
+                example = "Jane Doe";
+                description = "Name displayed when sending mails.";
+              };
+              address = mkOption {
+                type = types.strMatching ".*@.*";
+                example = "jane.doe@example.org";
+                description = "The email address of this identity.";
+              };
+            };
+          })
+        ]);
       };
 
       realName = mkOption {
diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix
index f5ef51b0a..fdb85f85a 100644
--- a/modules/programs/mu.nix
+++ b/modules/programs/mu.nix
@@ -16,7 +16,8 @@ let
       filter (a: a.mu.enable) (attrValues config.accounts.email.accounts);
     addrs = map (a: a.address) muAccounts;
     # Construct list of lists containing email aliases, and flatten
-    aliases = flatten (map (a: a.aliases) muAccounts);
+    aliases = map (alias: alias.address or alias)
+      (flatten (map (a: a.aliases) muAccounts));
     # Sort the list
   in sort lessThan (addrs ++ aliases);
 
diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix
index a3d679b23..071f08558 100644
--- a/modules/programs/notmuch.nix
+++ b/modules/programs/notmuch.nix
@@ -37,8 +37,9 @@ let
     in {
       name = catAttrs "realName" primary;
       primary_email = catAttrs "address" primary;
-      other_email = catAttrs "aliases" primary ++ catAttrs "address" secondaries
-        ++ catAttrs "aliases" secondaries;
+      other_email = map (email: email.address or email) (flatten
+        (catAttrs "aliases" primary ++ catAttrs "address" secondaries
+          ++ catAttrs "aliases" secondaries));
     };
 
     search = { exclude_tags = cfg.search.excludeTags; };
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index a61209fa4..3cc0539af 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -49,16 +49,25 @@ let
     };
   }));
 
+  getId = account: address:
+    if address == account.address then
+      account.id
+    else
+      (builtins.hashString "sha256" (if (builtins.isString address) then
+        address
+      else
+        (address.address + address.realName)));
+
   toThunderbirdIdentity = account: address:
     # For backwards compatibility, the primary address reuses the account ID.
     let
-      id = if address == account.address then
-        account.id
-      else
-        builtins.hashString "sha256" address;
+      id = getId account address;
+      addressIsString = builtins.isString address;
     in {
-      "mail.identity.id_${id}.fullName" = account.realName;
-      "mail.identity.id_${id}.useremail" = address;
+      "mail.identity.id_${id}.fullName" =
+        if addressIsString then account.realName else address.realName;
+      "mail.identity.id_${id}.useremail" =
+        if addressIsString then address else address.address;
       "mail.identity.id_${id}.valid" = true;
       "mail.identity.id_${id}.htmlSigText" =
         if account.signature.showSignature == "none" then
@@ -87,9 +96,7 @@ let
       addresses = [ account.address ] ++ account.aliases;
     in {
       "mail.account.account_${id}.identities" = concatStringsSep ","
-        ([ "id_${id}" ]
-          ++ map (address: "id_${builtins.hashString "sha256" address}")
-          account.aliases);
+        (map (address: "id_${getId account address}") addresses);
       "mail.account.account_${id}.server" = "server_${id}";
     } // optionalAttrs account.primary {
       "mail.accountmanager.defaultaccount" = "account_${id}";

From 2b382e499aa2fa7ac78bdf1cee079d45fb3a0334 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Sat, 22 Feb 2025 07:04:35 +0000
Subject: [PATCH 427/546] earthly: init module (#6265)

Earthly is a build configuration framework utilizing buildkit and
Dockerfile-like syntax for simplicity and fast builds.
---
 modules/lib/maintainers.nix                   |  6 +++
 modules/misc/news.nix                         | 10 +++++
 modules/modules.nix                           |  1 +
 modules/programs/earthly.nix                  | 40 +++++++++++++++++++
 tests/default.nix                             |  1 +
 tests/modules/programs/earthly/default.nix    |  1 +
 .../programs/earthly/earthly-settings.nix     | 21 ++++++++++
 .../programs/earthly/earthly-settings.yml     |  6 +++
 8 files changed, 86 insertions(+)
 create mode 100644 modules/programs/earthly.nix
 create mode 100644 tests/modules/programs/earthly/default.nix
 create mode 100644 tests/modules/programs/earthly/earthly-settings.nix
 create mode 100644 tests/modules/programs/earthly/earthly-settings.yml

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 52da8f0b0..428d30e3b 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -667,4 +667,10 @@
       fingerprint = "AD32 73D4 5E0E 9478 E826  543F EDB2 C634 166A E6AD";
     }];
   };
+  folliehiyuki = {
+    name = "Hoang Nguyen";
+    email = "folliekazetani@protonmail.com";
+    github = "folliehiyuki";
+    githubId = 67634026;
+  };
 }
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index a2614da83..d33279785 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2084,6 +2084,16 @@ in {
           screen brightness based on the screen contents and amount of ambient light around you.
         '';
       }
+
+      {
+        time = "2025-02-21T16:53:20+00:00";
+        message = ''
+          A new module is available: 'programs.earthly'.
+
+          Earthly is a build configuration framework utilizing buildkit and
+          Dockerfile-like syntax for fast builds and simplicity.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 12b367510..e88176f6f 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -90,6 +90,7 @@ let
     ./programs/dircolors.nix
     ./programs/direnv.nix
     ./programs/discocss.nix
+    ./programs/earthly.nix
     ./programs/eclipse.nix
     ./programs/emacs.nix
     ./programs/eww.nix
diff --git a/modules/programs/earthly.nix b/modules/programs/earthly.nix
new file mode 100644
index 000000000..e4e2a19f0
--- /dev/null
+++ b/modules/programs/earthly.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  cfg = config.programs.earthly;
+
+  yamlFormat = pkgs.formats.yaml { };
+
+in {
+  meta.maintainers = [ lib.hm.maintainers.folliehiyuki ];
+
+  options.programs.earthly = {
+    enable = lib.mkEnableOption "earthly";
+
+    package = lib.mkPackageOption pkgs "earthly" { };
+
+    settings = lib.mkOption {
+      type = yamlFormat.type;
+      default = { };
+      description = ''
+        Configuration written to ~/.earthly/config.yml file.
+        See https://docs.earthly.dev/docs/earthly-config for supported values.
+      '';
+      example = lib.literalExpression ''
+        global = {
+          disable_analytics = true;
+          disable_log_sharing = true;
+        };
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    home.file.".earthly/config.yml" = lib.mkIf (cfg.settings != { }) {
+      source = yamlFormat.generate "earthly-config" cfg.settings;
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 459808b89..8a9a5120b 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -146,6 +146,7 @@ in import nmtSrc {
     ./modules/programs/darcs
     ./modules/programs/dircolors
     ./modules/programs/direnv
+    ./modules/programs/earthly
     ./modules/programs/emacs
     ./modules/programs/fastfetch
     ./modules/programs/feh
diff --git a/tests/modules/programs/earthly/default.nix b/tests/modules/programs/earthly/default.nix
new file mode 100644
index 000000000..5606289c1
--- /dev/null
+++ b/tests/modules/programs/earthly/default.nix
@@ -0,0 +1 @@
+{ earthly-settings = ./earthly-settings.nix; }
diff --git a/tests/modules/programs/earthly/earthly-settings.nix b/tests/modules/programs/earthly/earthly-settings.nix
new file mode 100644
index 000000000..1710e5a4c
--- /dev/null
+++ b/tests/modules/programs/earthly/earthly-settings.nix
@@ -0,0 +1,21 @@
+{
+  programs.earthly = {
+    enable = true;
+
+    settings = {
+      global.disable_analytics = true;
+
+      git."github.com" = {
+        auth = "ssh";
+        user = "username";
+      };
+    };
+  };
+
+  test.stubs.earthly = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.earthly/config.yml
+    assertFileContent home-files/.earthly/config.yml ${./earthly-settings.yml}
+  '';
+}
diff --git a/tests/modules/programs/earthly/earthly-settings.yml b/tests/modules/programs/earthly/earthly-settings.yml
new file mode 100644
index 000000000..182f011b2
--- /dev/null
+++ b/tests/modules/programs/earthly/earthly-settings.yml
@@ -0,0 +1,6 @@
+git:
+  github.com:
+    auth: ssh
+    user: username
+global:
+  disable_analytics: true

From f4a07823a298deff0efb0db30f9318511de7c232 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sat, 22 Feb 2025 04:10:22 -0300
Subject: [PATCH 428/546] chromium: add nativeMessagingHosts option (#6019)

---
 modules/programs/chromium.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/modules/programs/chromium.nix b/modules/programs/chromium.nix
index 0a02311b7..2f3b55179 100644
--- a/modules/programs/chromium.nix
+++ b/modules/programs/chromium.nix
@@ -137,6 +137,18 @@ let
           List of ${name} dictionaries to install.
         '';
       };
+      nativeMessagingHosts = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        example = literalExpression ''
+          [
+            pkgs.kdePackages.plasma-browser-integration
+          ]
+        '';
+        description = ''
+          List of ${name} native messaging hosts to install.
+        '';
+      };
     };
 
   browserConfig = cfg:
@@ -178,6 +190,11 @@ let
         value.source = pkg;
       };
 
+      nativeMessagingHostsJoined = pkgs.symlinkJoin {
+        name = "${drvName}-native-messaging-hosts";
+        paths = cfg.nativeMessagingHosts;
+      };
+
       package = if cfg.commandLineArgs != [ ] then
         cfg.package.override {
           commandLineArgs = concatStringsSep " " cfg.commandLineArgs;
@@ -189,7 +206,13 @@ let
       home.packages = [ package ];
       home.file = optionalAttrs (!isProprietaryChrome) (listToAttrs
         ((map extensionJson cfg.extensions)
-          ++ (map dictionary cfg.dictionaries)));
+          ++ (map dictionary cfg.dictionaries)) // {
+            "${configDir}/NativeMessagingHosts" = {
+              source =
+                "${nativeMessagingHostsJoined}/etc/chromium/native-messaging-hosts";
+              recursive = true;
+            };
+          });
     };
 
 in {

From dd21b9afd5fefb0c80c3962869703acb3c56a5f2 Mon Sep 17 00:00:00 2001
From: Coutinho de Souza <dev@onemoresuza.com>
Date: Wed, 29 Jan 2025 10:29:02 -0300
Subject: [PATCH 429/546] imapnotify: add extraArgs option to
 imapnotify-accounts

`wait` is no longer a part of the goimapnotify's config, but one of its
cli options.
---
 modules/services/imapnotify-accounts.nix             | 8 +++++++-
 modules/services/imapnotify.nix                      | 5 ++++-
 tests/modules/services/imapnotify/imapnotify.nix     | 1 +
 tests/modules/services/imapnotify/imapnotify.service | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/services/imapnotify-accounts.nix b/modules/services/imapnotify-accounts.nix
index e437f94e3..359a65b1f 100644
--- a/modules/services/imapnotify-accounts.nix
+++ b/modules/services/imapnotify-accounts.nix
@@ -30,10 +30,16 @@ with lib;
       description = "IMAP folders to watch.";
     };
 
+    extraArgs = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      example = [ "-wait 1" ];
+      description = "Extra arguments to pass to goimapnotify.";
+    };
+
     extraConfig = mkOption {
       type = let jsonFormat = pkgs.formats.json { }; in jsonFormat.type;
       default = { };
-      example = { wait = 10; };
       description = "Additional configuration to add for this account.";
     };
   };
diff --git a/modules/services/imapnotify.nix b/modules/services/imapnotify.nix
index a52b86e97..bf8fefd39 100644
--- a/modules/services/imapnotify.nix
+++ b/modules/services/imapnotify.nix
@@ -23,7 +23,10 @@ let
         Service = {
           # Use the nix store path for config to ensure service restarts when it changes
           ExecStart =
-            "${getExe cfg.package} -conf '${genAccountConfig account}'";
+            "${getExe cfg.package} -conf '${genAccountConfig account}'" + " ${
+               lib.optionalString (account.imapnotify.extraArgs != [ ])
+               (toString account.imapnotify.extraArgs)
+             }";
           Restart = "always";
           RestartSec = 30;
           Type = "simple";
diff --git a/tests/modules/services/imapnotify/imapnotify.nix b/tests/modules/services/imapnotify/imapnotify.nix
index 82d6f433b..680405fa5 100644
--- a/tests/modules/services/imapnotify/imapnotify.nix
+++ b/tests/modules/services/imapnotify/imapnotify.nix
@@ -11,6 +11,7 @@
       imapnotify = {
         enable = true;
         boxes = [ "Inbox" ];
+        extraArgs = [ "--wait 1" ];
         onNotify = ''
           ${pkgs.notmuch}/bin/notmuch new
         '';
diff --git a/tests/modules/services/imapnotify/imapnotify.service b/tests/modules/services/imapnotify/imapnotify.service
index cc1ba77b8..8168e501e 100644
--- a/tests/modules/services/imapnotify/imapnotify.service
+++ b/tests/modules/services/imapnotify/imapnotify.service
@@ -4,7 +4,7 @@ WantedBy=default.target
 [Service]
 Environment=PATH=
 Environment=NOTMUCH_CONFIG=/home/hm-user/.config/notmuch/default/config
-ExecStart=@goimapnotify@/bin/goimapnotify -conf '/nix/store/00000000000000000000000000000000-imapnotify-hm-example.com-config.json'
+ExecStart=@goimapnotify@/bin/goimapnotify -conf '/nix/store/00000000000000000000000000000000-imapnotify-hm-example.com-config.json' --wait 1
 Restart=always
 RestartSec=30
 Type=simple

From 34d524f3edcf3a04c00ad2c09c24ec9d35d937f9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Feb 2025 00:38:09 -0600
Subject: [PATCH 430/546] imapnotify-accounts: remove with lib

---
 modules/services/imapnotify-accounts.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/services/imapnotify-accounts.nix b/modules/services/imapnotify-accounts.nix
index 359a65b1f..1a6fbf58a 100644
--- a/modules/services/imapnotify-accounts.nix
+++ b/modules/services/imapnotify-accounts.nix
@@ -1,10 +1,8 @@
 { pkgs, lib, ... }:
-
-with lib;
-
-{
+let inherit (lib) mkOption types;
+in {
   options.imapnotify = {
-    enable = mkEnableOption "imapnotify";
+    enable = lib.mkEnableOption "imapnotify";
 
     onNotify = mkOption {
       type = with types; either str (attrsOf str);

From a51e94e51c7df10f078a2530ce125df7410b4f33 Mon Sep 17 00:00:00 2001
From: DSOverlord <78819443+DSOverlord@users.noreply.github.com>
Date: Sat, 22 Feb 2025 17:40:15 +0200
Subject: [PATCH 431/546] clipse: add module (#5777)

clipse is a configurable, TUI-based clipboard manager application written in Go with minimal dependency. Though the app is optimized for a Linux OS using a dedicated window manager, clipse can also be used on any Unix-based system.
---
 modules/lib/maintainers.nix                   |   6 +
 modules/modules.nix                           |   1 +
 modules/services/clipse.nix                   | 106 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../clipse/clipse-sway-session-target.nix     |  17 +++
 tests/modules/services/clipse/default.nix     |   1 +
 6 files changed, 132 insertions(+)
 create mode 100644 modules/services/clipse.nix
 create mode 100644 tests/modules/services/clipse/clipse-sway-session-target.nix
 create mode 100644 tests/modules/services/clipse/default.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 428d30e3b..f4f67d36a 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -112,6 +112,12 @@
     github = "diniamo";
     githubId = 55629891;
   };
+  dsoverlord = {
+    name = "Kirill Zakharov";
+    email = "dsoverlord@vk.com";
+    github = "dsoverlord";
+    githubId = 78819443;
+  };
   dwagenk = {
     email = "dwagenk@mailbox.org";
     github = "dwagenk";
diff --git a/modules/modules.nix b/modules/modules.nix
index e88176f6f..3d0789423 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -305,6 +305,7 @@ let
     ./services/cliphist.nix
     ./services/clipman.nix
     ./services/clipmenu.nix
+    ./services/clipse.nix
     ./services/comodoro.nix
     ./services/conky.nix
     ./services/copyq.nix
diff --git a/modules/services/clipse.nix b/modules/services/clipse.nix
new file mode 100644
index 000000000..e7c1c62f6
--- /dev/null
+++ b/modules/services/clipse.nix
@@ -0,0 +1,106 @@
+{ pkgs, config, lib, ... }:
+let
+  cfg = config.services.clipse;
+  jsonFormat = pkgs.formats.json { };
+in {
+  meta.maintainers = [ lib.hm.maintainers.dsoverlord ];
+
+  options.services.clipse = {
+    enable = lib.mkEnableOption "Enable clipse clipboard manager";
+
+    package = lib.mkPackageOption pkgs "clipse" { };
+
+    systemdTarget = lib.mkOption {
+      type = lib.types.str;
+      default = "graphical-session.target";
+      example = "sway-session.target";
+      description = ''
+        The systemd target that will automatically start the clipse service.
+
+        When setting this value to `"sway-session.target"`,
+        make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
+        otherwise the service may never be started.
+      '';
+    };
+
+    allowDuplicates = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Allow duplicates";
+    };
+
+    historySize = lib.mkOption {
+      type = lib.types.int;
+      default = 100;
+      description = "Number of history lines to keep.";
+    };
+
+    theme = lib.mkOption {
+      type = jsonFormat.type;
+
+      default = { useCustomTheme = false; };
+
+      example = lib.literalExpression ''
+        {
+          useCustomTheme = true;
+          DimmedDesc = "#ffffff";
+          DimmedTitle = "#ffffff";
+          FilteredMatch = "#ffffff";
+          NormalDesc = "#ffffff";
+          NormalTitle = "#ffffff";
+          SelectedDesc = "#ffffff";
+          SelectedTitle = "#ffffff";
+          SelectedBorder = "#ffffff";
+          SelectedDescBorder = "#ffffff";
+          TitleFore = "#ffffff";
+          Titleback = "#434C5E";
+          StatusMsg = "#ffffff";
+          PinIndicatorColor = "#ff0000";
+        };
+      '';
+
+      description = ''
+        Configuration written to
+        {file}`$XDG_CONFIG_HOME/clipse/custom_theme.json`.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.clipse" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."clipse/config.json".source =
+      jsonFormat.generate "settings" {
+        allowDuplicates = cfg.allowDuplicates;
+        historyFile = "clipboard_history.json";
+        maxHistory = cfg.historySize;
+        logFile = "clipse.log";
+        themeFile = "custom_theme.json";
+        tempDir = "tmp_files";
+      };
+
+    xdg.configFile."clipse/custom_theme.json".source =
+      jsonFormat.generate "theme" cfg.theme;
+
+    systemd.user.services.clipse = lib.mkIf pkgs.stdenv.isLinux {
+      Unit = {
+        Description = "Clipse listener";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${cfg.package}/bin/clipse -listen";
+      };
+
+      Install = { WantedBy = [ cfg.systemdTarget ]; };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 8a9a5120b..b11e19ca9 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -328,6 +328,7 @@ in import nmtSrc {
     ./modules/services/cachix-agent
     ./modules/services/cliphist
     ./modules/services/clipman
+    ./modules/services/clipse
     ./modules/services/comodoro
     ./modules/services/copyq
     ./modules/services/conky
diff --git a/tests/modules/services/clipse/clipse-sway-session-target.nix b/tests/modules/services/clipse/clipse-sway-session-target.nix
new file mode 100644
index 000000000..d3223cf6f
--- /dev/null
+++ b/tests/modules/services/clipse/clipse-sway-session-target.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  services.clipse = {
+    enable = true;
+    systemdTarget = "sway-session.target";
+  };
+
+  test.stubs = {
+    clipse = { };
+    wl-clipboard = { };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/systemd/user/clipse.service
+  '';
+}
diff --git a/tests/modules/services/clipse/default.nix b/tests/modules/services/clipse/default.nix
new file mode 100644
index 000000000..f92f1b679
--- /dev/null
+++ b/tests/modules/services/clipse/default.nix
@@ -0,0 +1 @@
+{ clipse-sway-session-target = ./clipse-sway-session-target.nix; }

From 4949081d1ee37ebb1ca9fbef289955d85aace405 Mon Sep 17 00:00:00 2001
From: Feliche-Demian Netliukh <demyan310505@gmail.com>
Date: Sat, 22 Feb 2025 16:23:01 +0000
Subject: [PATCH 432/546] jqp: add module (#5716)

---
 modules/misc/news.nix                         |  9 +++++
 modules/modules.nix                           |  1 +
 modules/programs/jqp.nix                      | 33 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../programs/jqp/basic-configuration.nix      | 14 ++++++++
 .../programs/jqp/basic-configuration.yaml     |  2 ++
 tests/modules/programs/jqp/default.nix        |  1 +
 7 files changed, 61 insertions(+)
 create mode 100644 modules/programs/jqp.nix
 create mode 100644 tests/modules/programs/jqp/basic-configuration.nix
 create mode 100644 tests/modules/programs/jqp/basic-configuration.yaml
 create mode 100644 tests/modules/programs/jqp/default.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index d33279785..0f89efb5f 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2094,6 +2094,15 @@ in {
           Dockerfile-like syntax for fast builds and simplicity.
         '';
       }
+
+      {
+        time = "2025-02-22T16:53:20+00:00";
+        message = ''
+          A new module is available: 'programs.jqp'.
+
+          A TUI playground for experimentingn with `jq`.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 3d0789423..761589449 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -140,6 +140,7 @@ let
     ./programs/java.nix
     ./programs/jetbrains-remote.nix
     ./programs/jq.nix
+    ./programs/jqp.nix
     ./programs/jujutsu.nix
     ./programs/joshuto.nix
     ./programs/joplin-desktop.nix
diff --git a/modules/programs/jqp.nix b/modules/programs/jqp.nix
new file mode 100644
index 000000000..94fc83573
--- /dev/null
+++ b/modules/programs/jqp.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.programs.jqp;
+
+  yamlFormat = pkgs.formats.yaml { };
+in {
+  options.programs.jqp = {
+    enable = lib.mkEnableOption "jqp, jq playground";
+
+    package = lib.mkPackageOption pkgs "jqp" { };
+
+    settings = lib.mkOption {
+      type = yamlFormat.type;
+      default = { };
+      example = {
+        theme = {
+          name = "monokai";
+          chromaStyleOverrides = { kc = "#009900 underline"; };
+        };
+      };
+      description = "Jqp configuration";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home = {
+      packages = [ cfg.package ];
+
+      file.".jqp.yaml" = lib.mkIf (cfg.settings != { }) {
+        source = yamlFormat.generate "jqp-config" cfg.settings;
+      };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index b11e19ca9..6d3dbfd99 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -171,6 +171,7 @@ in import nmtSrc {
     ./modules/programs/irssi
     ./modules/programs/jujutsu
     ./modules/programs/joplin-desktop
+    ./modules/programs/jqp
     ./modules/programs/k9s
     ./modules/programs/kakoune
     ./modules/programs/khal
diff --git a/tests/modules/programs/jqp/basic-configuration.nix b/tests/modules/programs/jqp/basic-configuration.nix
new file mode 100644
index 000000000..23b79310a
--- /dev/null
+++ b/tests/modules/programs/jqp/basic-configuration.nix
@@ -0,0 +1,14 @@
+{
+  programs = {
+    jqp = {
+      enable = true;
+      settings = { theme.name = "catppuccin-frappe"; };
+    };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.jqp.yaml
+    assertFileContent home-files/.jqp.yaml \
+        ${./basic-configuration.yaml}
+  '';
+}
diff --git a/tests/modules/programs/jqp/basic-configuration.yaml b/tests/modules/programs/jqp/basic-configuration.yaml
new file mode 100644
index 000000000..57f744234
--- /dev/null
+++ b/tests/modules/programs/jqp/basic-configuration.yaml
@@ -0,0 +1,2 @@
+theme:
+  name: catppuccin-frappe
diff --git a/tests/modules/programs/jqp/default.nix b/tests/modules/programs/jqp/default.nix
new file mode 100644
index 000000000..3ab8e24cb
--- /dev/null
+++ b/tests/modules/programs/jqp/default.nix
@@ -0,0 +1 @@
+{ jqp-basic-configuration = ./basic-configuration.nix; }

From e860bd49eaa577089de22d370f6126ee4f6e7914 Mon Sep 17 00:00:00 2001
From: Reputable2772 <153411261+Reputable2772@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:28:27 +0530
Subject: [PATCH 433/546] vscode: add profiles support (#5640)

Adds support for VSCode Profiles configuration. Allowing you to define custom extensions and settings per profile.
---
 modules/programs/vscode.nix                   | 320 ++++++++++++------
 modules/programs/vscode/haskell.nix           |   4 +-
 tests/modules/programs/vscode/keybindings.nix |  53 ++-
 tests/modules/programs/vscode/snippets.nix    |  61 +++-
 tests/modules/programs/vscode/tasks.nix       |  32 +-
 .../modules/programs/vscode/update-checks.nix |  11 +-
 6 files changed, 337 insertions(+), 144 deletions(-)

diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index fec69aac5..da8032a40 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -32,66 +32,45 @@ let
   else
     "${config.xdg.configHome}/${configDir}/User";
 
-  configFilePath = "${userDir}/settings.json";
-  tasksFilePath = "${userDir}/tasks.json";
-  keybindingsFilePath = "${userDir}/keybindings.json";
+  configFilePath = name:
+    "${userDir}/${
+      optionalString (name != "default") "profiles/${name}/"
+    }settings.json";
+  tasksFilePath = name:
+    "${userDir}/${
+      optionalString (name != "default") "profiles/${name}/"
+    }tasks.json";
+  keybindingsFilePath = name:
+    "${userDir}/${
+      optionalString (name != "default") "profiles/${name}/"
+    }keybindings.json";
 
-  snippetDir = "${userDir}/snippets";
+  snippetDir = name:
+    "${userDir}/${
+      optionalString (name != "default") "profiles/${name}/"
+    }snippets";
 
   # TODO: On Darwin where are the extensions?
   extensionPath = ".${extensionDir}/extensions";
 
-  extensionJson = pkgs.vscode-utils.toExtensionJson cfg.extensions;
-  extensionJsonFile = pkgs.writeTextFile {
-    name = "extensions-json";
-    destination = "/share/vscode/extensions/extensions.json";
-    text = extensionJson;
-  };
+  extensionJson = ext: pkgs.vscode-utils.toExtensionJson ext;
+  extensionJsonFile = name: text:
+    pkgs.writeTextFile {
+      inherit text;
+      name = "extensions-json-${name}";
+      destination = "/share/vscode/extensions/extensions.json";
+    };
 
-  mergedUserSettings = cfg.userSettings
-    // optionalAttrs (!cfg.enableUpdateCheck) { "update.mode" = "none"; }
-    // optionalAttrs (!cfg.enableExtensionUpdateCheck) {
+  mergedUserSettings =
+    userSettings: enableUpdateCheck: enableExtensionUpdateCheck:
+    userSettings
+    // optionalAttrs (enableUpdateCheck == false) { "update.mode" = "none"; }
+    // optionalAttrs (enableExtensionUpdateCheck == false) {
       "extensions.autoCheckUpdates" = false;
     };
-in {
-  imports = [
-    (mkChangedOptionModule [ "programs" "vscode" "immutableExtensionsDir" ] [
-      "programs"
-      "vscode"
-      "mutableExtensionsDir"
-    ] (config: !config.programs.vscode.immutableExtensionsDir))
-  ];
-
-  options = {
-    programs.vscode = {
-      enable = mkEnableOption "Visual Studio Code";
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.vscode;
-        defaultText = literalExpression "pkgs.vscode";
-        example = literalExpression "pkgs.vscodium";
-        description = ''
-          Version of Visual Studio Code to install.
-        '';
-      };
-
-      enableUpdateCheck = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to enable update checks/notifications.
-        '';
-      };
-
-      enableExtensionUpdateCheck = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to enable update notifications for extensions.
-        '';
-      };
 
+  profileType = types.submodule {
+    options = {
       userSettings = mkOption {
         type = jsonFormat.type;
         default = { };
@@ -184,16 +163,6 @@ in {
         '';
       };
 
-      mutableExtensionsDir = mkOption {
-        type = types.bool;
-        default = true;
-        example = false;
-        description = ''
-          Whether extensions can be installed or updated manually
-          or by Visual Studio Code.
-        '';
-      };
-
       languageSnippets = mkOption {
         type = jsonFormat.type;
         default = { };
@@ -221,45 +190,207 @@ in {
         };
         description = "Defines global user snippets.";
       };
+
+      enableUpdateCheck = mkOption {
+        type = types.nullOr types.bool;
+        default = null;
+        description = ''
+          Whether to enable update checks/notifications.
+          Can only be set for the default profile, but
+          it applies to all profiles.
+        '';
+      };
+
+      enableExtensionUpdateCheck = mkOption {
+        type = types.nullOr types.bool;
+        default = null;
+        description = ''
+          Whether to enable update notifications for extensions.
+          Can only be set for the default profile, but
+          it applies to all profiles.
+        '';
+      };
+    };
+  };
+  defaultProfile = if cfg.profiles ? default then cfg.profiles.default else { };
+  allProfilesExceptDefault = removeAttrs cfg.profiles [ "default" ];
+in {
+  imports = [
+    (mkChangedOptionModule [ "programs" "vscode" "immutableExtensionsDir" ] [
+      "programs"
+      "vscode"
+      "mutableExtensionsDir"
+    ] (config: !config.programs.vscode.immutableExtensionsDir))
+  ] ++ map (v:
+    mkRenamedOptionModule [ "programs" "vscode" v ] [
+      "programs"
+      "vscode"
+      "profiles"
+      "default"
+      v
+    ]) [
+      "enableUpdateCheck"
+      "enableExtensionUpdateCheck"
+      "userSettings"
+      "userTasks"
+      "keybindings"
+      "extensions"
+      "languageSnippets"
+      "globalSnippets"
+    ];
+
+  options.programs.vscode = {
+    enable = mkEnableOption "Visual Studio Code";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.vscode;
+      defaultText = literalExpression "pkgs.vscode";
+      example = literalExpression "pkgs.vscodium";
+      description = ''
+        Version of Visual Studio Code to install.
+      '';
+    };
+
+    mutableExtensionsDir = mkOption {
+      type = types.bool;
+      default = allProfilesExceptDefault == { };
+      example = false;
+      description = ''
+        Whether extensions can be installed or updated manually
+        or by Visual Studio Code. Mutually exclusive to
+        programs.vscode.profiles.
+      '';
+    };
+
+    profiles = mkOption {
+      type = types.attrsOf profileType;
+      default = { };
+      description = ''
+        A list of all VSCode profiles. Mutually exclusive
+        to programs.vscode.mutableExtensionsDir
+      '';
     };
   };
 
   config = mkIf cfg.enable {
+    warnings = [
+      (mkIf (allProfilesExceptDefault != { } && cfg.mutableExtensionsDir)
+        "programs.vscode.mutableExtensionsDir can be used only if no profiles apart from default are set.")
+      (mkIf ((filterAttrs (n: v:
+        (v ? enableExtensionUpdateCheck || v ? enableUpdateCheck)
+        && (v.enableExtensionUpdateCheck != null || v.enableUpdateCheck
+          != null)) allProfilesExceptDefault) != { })
+        "The option programs.vscode.profiles.*.enableExtensionUpdateCheck and option programs.vscode.profiles.*.enableUpdateCheck is invalid for all profiles except default.")
+    ];
+
     home.packages = [ cfg.package ];
 
-    home.file = mkMerge [
-      (mkIf (mergedUserSettings != { }) {
-        "${configFilePath}".source =
-          jsonFormat.generate "vscode-user-settings" mergedUserSettings;
-      })
-      (mkIf (cfg.userTasks != { }) {
-        "${tasksFilePath}".source =
-          jsonFormat.generate "vscode-user-tasks" cfg.userTasks;
-      })
-      (mkIf (cfg.keybindings != [ ])
-        (let dropNullFields = filterAttrs (_: v: v != null);
-        in {
-          "${keybindingsFilePath}".source =
-            jsonFormat.generate "vscode-keybindings"
-            (map dropNullFields cfg.keybindings);
-        }))
-      (mkIf (cfg.extensions != [ ]) (let
-        subDir = "share/vscode/extensions";
+    # The file `${userDir}/globalStorage/storage.json` needs to be writable by VSCode,
+    # since it contains other data, such as theme backgrounds, recently opened folders, etc.
 
+    # A caveat of adding profiles this way is, VSCode has to be closed
+    # when this file is being written, since the file is loaded into RAM
+    # and overwritten on closing VSCode.
+    home.activation.vscodeProfiles = hm.dag.entryAfter [ "writeBoundary" ] (let
+      modifyGlobalStorage =
+        pkgs.writeShellScript "vscode-global-storage-modify" ''
+          PATH=${makeBinPath [ pkgs.jq ]}''${PATH:+:}$PATH
+          file="${userDir}/globalStorage/storage.json"
+
+          if [ -f "$file" ]; then
+            existing_profiles=$(jq '.userDataProfiles // [] | map({ (.name): .location }) | add // {}' "$file")
+            file_write=""
+            profiles=(${
+              escapeShellArgs
+              (flatten (mapAttrsToList (n: v: n) allProfilesExceptDefault))
+            })
+
+            for profile in "''${profiles[@]}"; do
+              if [[ "$(echo $existing_profiles | jq --arg profile $profile 'has ($profile)')" != "true" ]] || [[ "$(echo $existing_profiles | jq --arg profile $profile 'has ($profile)')" == "true" && "$(echo $existing_profiles | jq --arg profile $profile '.[$profile]')" != "\"$profile\"" ]]; then
+                file_write="$file_write$([ "$file_write" != "" ] && echo "...")$profile"
+              fi
+            done
+          else
+            for profile in "''${profiles[@]}"; do
+              file_write="$file_write$([ "$file_write" != "" ] && echo "...")$profile"
+            done
+
+            echo "{}" > "$file"
+          fi
+
+          if [ "$file_write" != "" ]; then
+            userDataProfiles=$(jq ".userDataProfiles += $(echo $file_write | jq -R 'split("...") | map({ name: ., location: . })')" "$file")
+            echo $userDataProfiles > "$file"
+          fi
+        '';
+    in modifyGlobalStorage.outPath);
+
+    home.file = mkMerge (flatten [
+      (mapAttrsToList (n: v: [
+        (mkIf ((mergedUserSettings v.userSettings v.enableUpdateCheck
+          v.enableExtensionUpdateCheck) != { }) {
+            "${configFilePath n}".source =
+              jsonFormat.generate "vscode-user-settings"
+              (mergedUserSettings v.userSettings v.enableUpdateCheck
+                v.enableExtensionUpdateCheck);
+          })
+
+        (mkIf (v.userTasks != { }) {
+          "${tasksFilePath n}".source =
+            jsonFormat.generate "vscode-user-tasks" v.userTasks;
+        })
+
+        (mkIf (v.keybindings != [ ]) {
+          "${keybindingsFilePath n}".source =
+            jsonFormat.generate "vscode-keybindings"
+            (map (filterAttrs (_: v: v != null)) v.keybindings);
+        })
+
+        (mkIf (v.languageSnippets != { }) (mapAttrs' (language: snippet:
+          nameValuePair "${snippetDir n}/${language}.json" {
+            source =
+              jsonFormat.generate "user-snippet-${language}.json" snippet;
+          }) v.languageSnippets))
+
+        (mkIf (v.globalSnippets != { }) {
+          "${snippetDir n}/global.code-snippets".source =
+            jsonFormat.generate "user-snippet-global.code-snippets"
+            v.globalSnippets;
+        })
+      ]) cfg.profiles)
+
+      # We write extensions.json for all profiles, except the default profile,
+      # since that is handled by code below.
+      (mkIf (allProfilesExceptDefault != { }) (mapAttrs' (n: v:
+        nameValuePair "${userDir}/profiles/${n}/extensions.json" {
+          source = "${
+              extensionJsonFile n (extensionJson v.extensions)
+            }/share/vscode/extensions/extensions.json";
+        }) allProfilesExceptDefault))
+
+      (mkIf (cfg.profiles != { }) (let
         # Adapted from https://discourse.nixos.org/t/vscode-extensions-setup/1801/2
+        subDir = "share/vscode/extensions";
         toPaths = ext:
           map (k: { "${extensionPath}/${k}".source = "${ext}/${subDir}/${k}"; })
           (if ext ? vscodeExtUniqueId then
             [ ext.vscodeExtUniqueId ]
           else
             builtins.attrNames (builtins.readDir (ext + "/${subDir}")));
-      in if cfg.mutableExtensionsDir then
-        mkMerge (concatMap toPaths cfg.extensions
-          ++ lib.optional (lib.versionAtLeast vscodeVersion "1.74.0") {
+      in if (cfg.mutableExtensionsDir && allProfilesExceptDefault == { }) then
+      # Mutable extensions dir can only occur when only default profile is set.
+      # Force regenerating extensions.json using the below method,
+      # causes VSCode to create the extensions.json with all the extensions
+      # in the extension directory, which includes extensions from other profiles.
+        mkMerge (concatMap toPaths
+          (flatten (mapAttrsToList (n: v: v.extensions) cfg.profiles))
+          ++ optional
+          (versionAtLeast vscodeVersion "1.74.0" && defaultProfile != { }) {
             # Whenever our immutable extensions.json changes, force VSCode to regenerate
             # extensions.json with both mutable and immutable extensions.
             "${extensionPath}/.extensions-immutable.json" = {
-              text = extensionJson;
+              text = extensionJson defaultProfile.extensions;
               onChange = ''
                 run rm $VERBOSE_ARG -f ${extensionPath}/{extensions.json,.init-default-profile-extensions}
                 verboseEcho "Regenerating VSCode extensions.json"
@@ -271,25 +402,14 @@ in {
         "${extensionPath}".source = let
           combinedExtensionsDrv = pkgs.buildEnv {
             name = "vscode-extensions";
-            paths = cfg.extensions
-              ++ lib.optional (lib.versionAtLeast vscodeVersion "1.74.0")
-              extensionJsonFile;
+            paths = (flatten (mapAttrsToList (n: v: v.extensions) cfg.profiles))
+              ++ optional
+              (versionAtLeast vscodeVersion "1.74.0" && defaultProfile != { })
+              (extensionJsonFile "default"
+                (extensionJson defaultProfile.extensions));
           };
         in "${combinedExtensionsDrv}/${subDir}";
       }))
-
-      (mkIf (cfg.globalSnippets != { })
-        (let globalSnippets = "${snippetDir}/global.code-snippets";
-        in {
-          "${globalSnippets}".source =
-            jsonFormat.generate "user-snippet-global.code-snippets"
-            cfg.globalSnippets;
-        }))
-
-      (lib.mapAttrs' (language: snippet:
-        lib.nameValuePair "${snippetDir}/${language}.json" {
-          source = jsonFormat.generate "user-snippet-${language}.json" snippet;
-        }) cfg.languageSnippets)
-    ];
+    ]);
   };
 }
diff --git a/modules/programs/vscode/haskell.nix b/modules/programs/vscode/haskell.nix
index 63ecd18e2..450c748e4 100644
--- a/modules/programs/vscode/haskell.nix
+++ b/modules/programs/vscode/haskell.nix
@@ -52,12 +52,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.vscode.userSettings = mkIf cfg.hie.enable {
+    programs.vscode.profiles.default.userSettings = mkIf cfg.hie.enable {
       "languageServerHaskell.enableHIE" = true;
       "languageServerHaskell.hieExecutablePath" = cfg.hie.executablePath;
     };
 
-    programs.vscode.extensions =
+    programs.vscode.profiles.default.extensions =
       [ pkgs.vscode-extensions.justusadam.language-haskell ]
       ++ lib.optional cfg.hie.enable
       pkgs.vscode-extensions.alanz.vscode-hie-server;
diff --git a/tests/modules/programs/vscode/keybindings.nix b/tests/modules/programs/vscode/keybindings.nix
index 64212e29a..a0d3ea93f 100644
--- a/tests/modules/programs/vscode/keybindings.nix
+++ b/tests/modules/programs/vscode/keybindings.nix
@@ -1,5 +1,5 @@
 # Test that keybindings.json is created correctly.
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
   bindings = [
@@ -25,15 +25,25 @@ let
     }
   ];
 
-  keybindingsPath = if pkgs.stdenv.hostPlatform.isDarwin then
-    "Library/Application Support/Code/User/keybindings.json"
-  else
-    ".config/Code/User/keybindings.json";
+  keybindingsPath = name:
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "Library/Application Support/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }keybindings.json"
+    else
+      ".config/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }keybindings.json";
 
-  settingsPath = if pkgs.stdenv.hostPlatform.isDarwin then
-    "Library/Application Support/Code/User/settings.json"
-  else
-    ".config/Code/User/settings.json";
+  settingsPath = name:
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "Library/Application Support/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }settings.json"
+    else
+      ".config/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }settings.json";
 
   expectedKeybindings = pkgs.writeText "expected.json" ''
     [
@@ -65,14 +75,29 @@ let
 in {
   programs.vscode = {
     enable = true;
-    keybindings = bindings;
-    package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; };
+    profiles = {
+      default.keybindings = bindings;
+      test.keybindings = bindings;
+    };
+    package = pkgs.writeScriptBin "vscode" "" // {
+      pname = "vscode";
+      version = "1.75.0";
+    };
   };
 
   nmt.script = ''
-    assertFileExists "home-files/${keybindingsPath}"
-    assertFileContent "home-files/${keybindingsPath}" "${expectedKeybindings}"
+    assertFileExists "home-files/${keybindingsPath "default"}"
+    assertFileContent "home-files/${
+      keybindingsPath "default"
+    }" "${expectedKeybindings}"
 
-    assertPathNotExists "home-files/${settingsPath}"
+    assertPathNotExists "home-files/${settingsPath "default"}"
+
+    assertFileExists "home-files/${keybindingsPath "test"}"
+    assertFileContent "home-files/${
+      keybindingsPath "test"
+    }" "${expectedKeybindings}"
+
+    assertPathNotExists "home-files/${settingsPath "test"}"
   '';
 }
diff --git a/tests/modules/programs/vscode/snippets.nix b/tests/modules/programs/vscode/snippets.nix
index a7ea44f76..7d024fed3 100644
--- a/tests/modules/programs/vscode/snippets.nix
+++ b/tests/modules/programs/vscode/snippets.nix
@@ -1,13 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
 
-  snippetsDir = if pkgs.stdenv.hostPlatform.isDarwin then
-    "Library/Application Support/Code/User/snippets"
-  else
-    ".config/Code/User/snippets";
+  snippetsDir = name:
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "Library/Application Support/Code/User${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }/snippets"
+    else
+      ".config/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }snippets";
 
-  globalSnippetsPath = "${snippetsDir}/global.code-snippets";
+  globalSnippetsPath = name: "${snippetsDir name}/global.code-snippets";
 
   globalSnippetsExpectedContent = pkgs.writeText "global.code-snippet" ''
     {
@@ -23,7 +28,7 @@ let
     }
   '';
 
-  haskellSnippetsPath = "${snippetsDir}/haskell.json";
+  haskellSnippetsPath = name: "${snippetsDir name}/haskell.json";
 
   haskellSnippetsExpectedContent = pkgs.writeText "haskell.json" ''
     {
@@ -39,10 +44,7 @@ let
     }
   '';
 
-in {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; };
+  snippets = {
     globalSnippets = {
       fixme = {
         prefix = [ "fixme" ];
@@ -61,11 +63,38 @@ in {
     };
   };
 
-  nmt.script = ''
-    assertFileExists "home-files/${globalSnippetsPath}"
-    assertFileContent "home-files/${globalSnippetsPath}" "${globalSnippetsExpectedContent}"
+in {
+  programs.vscode = {
+    enable = true;
+    package = pkgs.writeScriptBin "vscode" "" // {
+      pname = "vscode";
+      version = "1.75.0";
+    };
+    profiles = {
+      default = snippets;
+      test = snippets;
+    };
+  };
 
-    assertFileExists "home-files/${haskellSnippetsPath}"
-    assertFileContent "home-files/${haskellSnippetsPath}" "${haskellSnippetsExpectedContent}"
+  nmt.script = ''
+    assertFileExists "home-files/${globalSnippetsPath "default"}"
+    assertFileContent "home-files/${
+      globalSnippetsPath "default"
+    }" "${globalSnippetsExpectedContent}"
+
+    assertFileExists "home-files/${globalSnippetsPath "test"}"
+    assertFileContent "home-files/${
+      globalSnippetsPath "test"
+    }" "${globalSnippetsExpectedContent}"
+
+    assertFileExists "home-files/${haskellSnippetsPath "default"}"
+    assertFileContent "home-files/${
+      haskellSnippetsPath "default"
+    }" "${haskellSnippetsExpectedContent}"
+
+    assertFileExists "home-files/${haskellSnippetsPath "test"}"
+    assertFileContent "home-files/${
+      haskellSnippetsPath "test"
+    }" "${haskellSnippetsExpectedContent}"
   '';
 }
diff --git a/tests/modules/programs/vscode/tasks.nix b/tests/modules/programs/vscode/tasks.nix
index ea85b3d6c..f7b266a33 100644
--- a/tests/modules/programs/vscode/tasks.nix
+++ b/tests/modules/programs/vscode/tasks.nix
@@ -1,11 +1,16 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 let
 
-  tasksFilePath = if pkgs.stdenv.hostPlatform.isDarwin then
-    "Library/Application Support/Code/User/tasks.json"
-  else
-    ".config/Code/User/tasks.json";
+  tasksFilePath = name:
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "Library/Application Support/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }tasks.json"
+    else
+      ".config/Code/User/${
+        lib.optionalString (name != "default") "profiles/${name}/"
+      }tasks.json";
 
   tasks = {
     version = "2.0.0";
@@ -32,12 +37,21 @@ let
 in {
   programs.vscode = {
     enable = true;
-    package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; };
-    userTasks = tasks;
+    package = pkgs.writeScriptBin "vscode" "" // {
+      pname = "vscode";
+      version = "1.75.0";
+    };
+    profiles = {
+      default.userTasks = tasks;
+      test.userTasks = tasks;
+    };
   };
 
   nmt.script = ''
-    assertFileExists "home-files/${tasksFilePath}"
-    assertFileContent "home-files/${tasksFilePath}" "${expectedTasks}"
+    assertFileExists "home-files/${tasksFilePath "default"}"
+    assertFileContent "home-files/${tasksFilePath "default"}" "${expectedTasks}"
+
+    assertFileExists "home-files/${tasksFilePath "test"}"
+    assertFileContent "home-files/${tasksFilePath "test"}" "${expectedTasks}"
   '';
 }
diff --git a/tests/modules/programs/vscode/update-checks.nix b/tests/modules/programs/vscode/update-checks.nix
index 1547bd36a..b75cda566 100644
--- a/tests/modules/programs/vscode/update-checks.nix
+++ b/tests/modules/programs/vscode/update-checks.nix
@@ -17,9 +17,14 @@ let
 in {
   programs.vscode = {
     enable = true;
-    package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; };
-    enableUpdateCheck = false;
-    enableExtensionUpdateCheck = false;
+    package = pkgs.writeScriptBin "vscode" "" // {
+      pname = "vscode";
+      version = "1.75.0";
+    };
+    profiles.default = {
+      enableUpdateCheck = false;
+      enableExtensionUpdateCheck = false;
+    };
   };
 
   nmt.script = ''

From 7ceacd98a9fc99743ae7d9a5c0a4ea7c72314da6 Mon Sep 17 00:00:00 2001
From: eulalia <179992797+3ulalia@users.noreply.github.com>
Date: Sat, 22 Feb 2025 12:32:15 -0500
Subject: [PATCH 434/546] wpaperd: add systemd service; move to services/ from
 programs/ (#6302)

This commit adds a systemd service to run it, and accordingly moves it to services.wpaperd.

In addition, the existing tests have been migrated to services, and an entry in the newslist has been created alerting users to this change.
---
 modules/lib/maintainers.nix                   |  6 ++
 modules/misc/news.nix                         | 13 ++-
 modules/modules.nix                           |  2 +-
 modules/programs/wpaperd.nix                  | 49 -----------
 modules/services/wpaperd.nix                  | 84 +++++++++++++++++++
 tests/default.nix                             |  2 +-
 .../wpaperd/default.nix                       |  0
 .../wpaperd/wpaperd-example-settings.nix      |  3 +-
 .../wpaperd/wpaperd-expected-settings.toml    |  0
 9 files changed, 106 insertions(+), 53 deletions(-)
 delete mode 100644 modules/programs/wpaperd.nix
 create mode 100644 modules/services/wpaperd.nix
 rename tests/modules/{programs => services}/wpaperd/default.nix (100%)
 rename tests/modules/{programs => services}/wpaperd/wpaperd-example-settings.nix (94%)
 rename tests/modules/{programs => services}/wpaperd/wpaperd-expected-settings.toml (100%)

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index f4f67d36a..2fbbfe370 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -679,4 +679,10 @@
     github = "folliehiyuki";
     githubId = 67634026;
   };
+  "3ulalia" = {
+    name = "Eulalia del Sol";
+    email = "3ulalia@proton.me";
+    github = "3ulalia";
+    githubId = "179992797";
+  };
 }
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 0f89efb5f..37d3c65d8 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2100,7 +2100,18 @@ in {
         message = ''
           A new module is available: 'programs.jqp'.
 
-          A TUI playground for experimentingn with `jq`.
+          A TUI playground for experimenting with `jq`.
+        '';
+      }
+
+      {
+        time = "2025-02-22T16:46:56+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.wpaperd'.
+
+          This replaces the existing module, 'programs.wpaperd', and adds a
+          systemd service to ensure its execution.
         '';
       }
     ];
diff --git a/modules/modules.nix b/modules/modules.nix
index 761589449..ef357bd3a 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -273,7 +273,6 @@ let
     ./programs/wezterm.nix
     ./programs/wlogout.nix
     ./programs/wofi.nix
-    ./programs/wpaperd.nix
     ./programs/xmobar.nix
     ./programs/xplr.nix
     ./programs/yambar.nix
@@ -425,6 +424,7 @@ let
     ./services/wlsunset.nix
     ./services/wluma.nix
     ./services/wob.nix
+    ./services/wpaperd.nix
     ./services/xcape.nix
     ./services/xembed-sni-proxy.nix
     ./services/xidlehook.nix
diff --git a/modules/programs/wpaperd.nix b/modules/programs/wpaperd.nix
deleted file mode 100644
index 655024a06..000000000
--- a/modules/programs/wpaperd.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.wpaperd;
-  tomlFormat = pkgs.formats.toml { };
-in {
-  meta.maintainers = [ hm.maintainers.Avimitin ];
-
-  options.programs.wpaperd = {
-    enable = mkEnableOption "wpaperd";
-
-    package = mkPackageOption pkgs "wpaperd" { };
-
-    settings = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      example = literalExpression ''
-        {
-          eDP-1 = {
-            path = "/home/foo/Pictures/Wallpaper";
-            apply-shadow = true;
-          };
-          DP-2 = {
-            path = "/home/foo/Pictures/Anime";
-            sorting = "descending";
-          };
-        }
-      '';
-      description = ''
-        Configuration written to
-        {file}`$XDG_CONFIG_HOME/wpaperd/wallpaper.toml`.
-        See <https://github.com/danyspin97/wpaperd#wallpaper-configuration>
-        for the full list of options.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-
-    xdg.configFile = {
-      "wpaperd/wallpaper.toml" = mkIf (cfg.settings != { }) {
-        source = tomlFormat.generate "wpaperd-wallpaper" cfg.settings;
-      };
-    };
-  };
-}
diff --git a/modules/services/wpaperd.nix b/modules/services/wpaperd.nix
new file mode 100644
index 000000000..120cb370c
--- /dev/null
+++ b/modules/services/wpaperd.nix
@@ -0,0 +1,84 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.wpaperd;
+  tomlFormat = pkgs.formats.toml { };
+  inherit (lib) mkRenamedOptionModule mkIf;
+in {
+  meta.maintainers = [ lib.hm.maintainers."3ulalia" ];
+
+  imports = [
+    (mkRenamedOptionModule # \
+      [ "programs" "wpaperd" "enable" ] # \
+      [ "services" "wpaperd" "enable" ])
+    (mkRenamedOptionModule # \
+      [ "programs" "wpaperd" "package" ] # \
+      [ "services" "wpaperd" "package" ])
+    (mkRenamedOptionModule # \
+      [ "programs" "wpaperd" "settings" ] # \
+      [ "services" "wpaperd" "settings" ])
+  ];
+
+  options.services.wpaperd = {
+    enable = lib.mkEnableOption "wpaperd";
+
+    package = lib.mkPackageOption pkgs "wpaperd" { };
+
+    settings = lib.mkOption {
+      type = tomlFormat.type;
+      default = { };
+      example = lib.literalExpression ''
+        {
+          eDP-1 = {
+            path = "/home/foo/Pictures/Wallpaper";
+            apply-shadow = true;
+          };
+          DP-2 = {
+            path = "/home/foo/Pictures/Anime";
+            sorting = "descending";
+          };
+        }
+      '';
+      description = ''
+        Configuration written to
+        {file}`$XDG_CONFIG_HOME/wpaperd/wallpaper.toml`.
+        See <https://github.com/danyspin97/wpaperd#wallpaper-configuration>
+        for the full list of options.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.wpaperd" pkgs
+        lib.platforms.linux)
+    ];
+
+    home.packages = [ cfg.package ];
+
+    xdg.configFile = {
+      "wpaperd/wallpaper.toml" = mkIf (cfg.settings != { }) {
+        source = tomlFormat.generate "wpaperd-wallpaper" cfg.settings;
+      };
+    };
+
+    systemd.user.services.wpaperd = {
+      Install = { WantedBy = [ config.wayland.systemd.target ]; };
+
+      Unit = {
+        ConditionEnvironment = "WAYLAND_DISPLAY";
+        Description = "wpaperd";
+        PartOf = [ config.wayland.systemd.target ];
+        After = [ config.wayland.systemd.target ];
+        X-Restart-Triggers =
+          [ "${config.xdg.configFile."wpaperd/wallpaper.toml".source}" ];
+      };
+
+      Service = {
+        ExecStart = "${lib.getExe cfg.package}";
+        Restart = "always";
+        RestartSec = "10";
+      };
+    };
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 6d3dbfd99..d9686209f 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -317,7 +317,6 @@ in import nmtSrc {
     ./modules/programs/waybar
     ./modules/programs/wlogout
     ./modules/programs/wofi
-    ./modules/programs/wpaperd
     ./modules/programs/xmobar
     ./modules/programs/yambar
     ./modules/programs/yt-dlp
@@ -395,6 +394,7 @@ in import nmtSrc {
     ./modules/services/window-managers/wayfire
     ./modules/services/wlsunset
     ./modules/services/wob
+    ./modules/services/wpaperd
     ./modules/services/xsettingsd
     ./modules/services/yubikey-agent
     ./modules/systemd
diff --git a/tests/modules/programs/wpaperd/default.nix b/tests/modules/services/wpaperd/default.nix
similarity index 100%
rename from tests/modules/programs/wpaperd/default.nix
rename to tests/modules/services/wpaperd/default.nix
diff --git a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix b/tests/modules/services/wpaperd/wpaperd-example-settings.nix
similarity index 94%
rename from tests/modules/programs/wpaperd/wpaperd-example-settings.nix
rename to tests/modules/services/wpaperd/wpaperd-example-settings.nix
index a10a2eac3..30cb0ffc3 100644
--- a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix
+++ b/tests/modules/services/wpaperd/wpaperd-example-settings.nix
@@ -1,5 +1,5 @@
 {
-  programs.wpaperd = {
+  services.wpaperd = {
     enable = true;
     settings = {
       eDP-1 = {
@@ -9,6 +9,7 @@
       DP-2 = {
         path = "/home/foo/Pictures/Anime";
         sorting = "descending";
+
       };
     };
   };
diff --git a/tests/modules/programs/wpaperd/wpaperd-expected-settings.toml b/tests/modules/services/wpaperd/wpaperd-expected-settings.toml
similarity index 100%
rename from tests/modules/programs/wpaperd/wpaperd-expected-settings.toml
rename to tests/modules/services/wpaperd/wpaperd-expected-settings.toml

From 90504b9a893b64c308640c3b7475a480d113fb2b Mon Sep 17 00:00:00 2001
From: Artem Starikov <contact@snejugal.ru>
Date: Sat, 22 Feb 2025 21:33:41 +0300
Subject: [PATCH 435/546] thunderbird: allow managing feed accounts (#5613)

---
 modules/programs/thunderbird.nix              | 44 +++++++++++++++++--
 .../thunderbird-expected-first-linux.js       |  8 +++-
 .../programs/thunderbird/thunderbird.nix      |  2 +
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 3cc0539af..8d9460996 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -135,6 +135,18 @@ let
     (builtins.map (address: toThunderbirdIdentity account address) addresses)
     // account.thunderbird.settings id;
 
+  toThunderbirdFeed = feed: profile:
+    let id = feed.id;
+    in {
+      "mail.account.account_${id}.server" = "server_${id}";
+      "mail.server.server_${id}.name" = feed.name;
+      "mail.server.server_${id}.type" = "rss";
+      "mail.server.server_${id}.directory" =
+        "${thunderbirdProfilesPath}/${profile.name}/Mail/Feeds-${id}";
+      "mail.server.server_${id}.directory-rel" = "[ProfD]Mail/Feeds-${id}";
+      "mail.server.server_${id}.hostname" = "Feeds-${id}";
+    };
+
   mkUserJs = prefs: extraPrefs: ''
     // Generated by Home Manager.
 
@@ -196,6 +208,25 @@ in {
                 '';
               };
 
+              feedAccounts = mkOption {
+                type = types.attrsOf (submodule ({ config, name, ... }: {
+                  options = {
+                    name = mkOption {
+                      type = types.str;
+                      default = name;
+                      readOnly = true;
+                      description = "This feed account's name.";
+                    };
+                  };
+                }));
+                default = { };
+                description = ''
+                  Attribute set of feed accounts. Feeds themselves have to be
+                  managed through Thunderbird's settings. This option allows
+                  feeds to coexist with declaratively managed email accounts.
+                '';
+              };
+
               settings = mkOption {
                 type = thunderbirdJson;
                 default = { };
@@ -432,11 +463,17 @@ in {
         mkIf (profile.userContent != "") { text = profile.userContent; };
 
       "${thunderbirdProfilesPath}/${name}/user.js" = let
-        accounts = filter (a:
+        emailAccounts = filter (a:
           a.thunderbird.profiles == [ ]
           || any (p: p == name) a.thunderbird.profiles) enabledAccountsWithId;
 
-        smtp = filter (a: a.smtp != null) accounts;
+        smtp = filter (a: a.smtp != null) emailAccounts;
+
+        feedAccounts =
+          map (f: f // { id = builtins.hashString "sha256" f.name; })
+          (attrValues profile.feedAccounts);
+
+        accounts = emailAccounts ++ feedAccounts;
       in {
         text = mkUserJs (builtins.foldl' (a: b: a // b) { } ([
           cfg.settings
@@ -454,7 +491,8 @@ in {
           { "mail.openpgp.allow_external_gnupg" = profile.withExternalGnupg; }
 
           profile.settings
-        ] ++ (map (a: toThunderbirdAccount a profile) accounts)))
+        ] ++ (map (a: toThunderbirdAccount a profile) emailAccounts)
+          ++ (map (f: toThunderbirdFeed f profile) feedAccounts)))
           profile.extraConfig;
       };
 
diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js
index 8499ef89e..6d5f57274 100644
--- a/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js
@@ -3,9 +3,10 @@
 user_pref("general.useragent.override", "");
 user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
 user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.account.account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.server", "server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
 user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.identities", "id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562");
 user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.server", "server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
-user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
 user_pref("mail.accountmanager.defaultaccount", "account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.attachPgpKey", false);
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.autoEncryptDrafts", true);
@@ -52,6 +53,11 @@ user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da50
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3);
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap");
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory", ".thunderbird/first/Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory-rel", "[ProfD]Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.hostname", "Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.name", "rss");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.type", "rss");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory", ".thunderbird/first/ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory-rel", "[ProfD]ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "imap.example.com");
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 75e83e675..961b91359 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -58,6 +58,8 @@
         extraConfig = ''
           user_pref("mail.html_compose", false);
         '';
+
+        feedAccounts.rss = { };
       };
 
       second.settings = {

From 61d8fc9af0f8568ffaff93e4001cb607f88790f9 Mon Sep 17 00:00:00 2001
From: Brieuc Dubois <github.it@bhasher.com>
Date: Sat, 22 Feb 2025 19:51:06 +0100
Subject: [PATCH 436/546] firefox: Allow to add PKCS11 modules (#5608)

---
 modules/programs/firefox/mkFirefoxModule.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 831f59ddb..784114aac 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -207,6 +207,7 @@ let
       package.override (old: {
         cfg = old.cfg or { } // fcfg;
         extraPolicies = (old.extraPolicies or { }) // cfg.policies;
+        pkcs11Modules = (old.pkcs11Modules or [ ]) ++ cfg.pkcs11Modules;
       })
     else
       (pkgs.wrapFirefox.override { config = bcfg; }) package { };
@@ -782,6 +783,14 @@ in {
         `true`.
       '';
     };
+
+    pkcs11Modules = mkOption {
+      type = types.listOf types.package;
+      default = [ ];
+      description = ''
+        Additional packages to be loaded as PKCS #11 modules in Firefox.
+      '';
+    };
   };
 
   config = mkIf cfg.enable ({

From 413e9b35f17b2f24fd3a7ecbfc1237d9c3d502fd Mon Sep 17 00:00:00 2001
From: Shaw Vrana <shaw@vranix.com>
Date: Wed, 10 Jul 2024 16:29:41 -0700
Subject: [PATCH 437/546] dircolors: respect preferXdgDirectories if set

---
 modules/programs/dircolors.nix | 316 ++++++++++++++++++---------------
 1 file changed, 169 insertions(+), 147 deletions(-)

diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix
index 91aaff41f..7c97a2b18 100644
--- a/modules/programs/dircolors.nix
+++ b/modules/programs/dircolors.nix
@@ -54,155 +54,177 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
-    # Add default settings from `dircolors --print-database`.
-    programs.dircolors.settings = {
-      RESET = mkDefault "0";
-      DIR = mkDefault "01;34";
-      LINK = mkDefault "01;36";
-      MULTIHARDLINK = mkDefault "00";
-      FIFO = mkDefault "40;33";
-      SOCK = mkDefault "01;35";
-      DOOR = mkDefault "01;35";
-      BLK = mkDefault "40;33;01";
-      CHR = mkDefault "40;33;01";
-      ORPHAN = mkDefault "40;31;01";
-      MISSING = mkDefault "00";
-      SETUID = mkDefault "37;41";
-      SETGID = mkDefault "30;43";
-      CAPABILITY = mkDefault "30;41";
-      STICKY_OTHER_WRITABLE = mkDefault "30;42";
-      OTHER_WRITABLE = mkDefault "34;42";
-      STICKY = mkDefault "37;44";
-      EXEC = mkDefault "01;32";
-      ".tar" = mkDefault "01;31";
-      ".tgz" = mkDefault "01;31";
-      ".arc" = mkDefault "01;31";
-      ".arj" = mkDefault "01;31";
-      ".taz" = mkDefault "01;31";
-      ".lha" = mkDefault "01;31";
-      ".lz4" = mkDefault "01;31";
-      ".lzh" = mkDefault "01;31";
-      ".lzma" = mkDefault "01;31";
-      ".tlz" = mkDefault "01;31";
-      ".txz" = mkDefault "01;31";
-      ".tzo" = mkDefault "01;31";
-      ".t7z" = mkDefault "01;31";
-      ".zip" = mkDefault "01;31";
-      ".z" = mkDefault "01;31";
-      ".dz" = mkDefault "01;31";
-      ".gz" = mkDefault "01;31";
-      ".lrz" = mkDefault "01;31";
-      ".lz" = mkDefault "01;31";
-      ".lzo" = mkDefault "01;31";
-      ".xz" = mkDefault "01;31";
-      ".zst" = mkDefault "01;31";
-      ".tzst" = mkDefault "01;31";
-      ".bz2" = mkDefault "01;31";
-      ".bz" = mkDefault "01;31";
-      ".tbz" = mkDefault "01;31";
-      ".tbz2" = mkDefault "01;31";
-      ".tz" = mkDefault "01;31";
-      ".deb" = mkDefault "01;31";
-      ".rpm" = mkDefault "01;31";
-      ".jar" = mkDefault "01;31";
-      ".war" = mkDefault "01;31";
-      ".ear" = mkDefault "01;31";
-      ".sar" = mkDefault "01;31";
-      ".rar" = mkDefault "01;31";
-      ".alz" = mkDefault "01;31";
-      ".ace" = mkDefault "01;31";
-      ".zoo" = mkDefault "01;31";
-      ".cpio" = mkDefault "01;31";
-      ".7z" = mkDefault "01;31";
-      ".rz" = mkDefault "01;31";
-      ".cab" = mkDefault "01;31";
-      ".wim" = mkDefault "01;31";
-      ".swm" = mkDefault "01;31";
-      ".dwm" = mkDefault "01;31";
-      ".esd" = mkDefault "01;31";
-      ".jpg" = mkDefault "01;35";
-      ".jpeg" = mkDefault "01;35";
-      ".mjpg" = mkDefault "01;35";
-      ".mjpeg" = mkDefault "01;35";
-      ".gif" = mkDefault "01;35";
-      ".bmp" = mkDefault "01;35";
-      ".pbm" = mkDefault "01;35";
-      ".pgm" = mkDefault "01;35";
-      ".ppm" = mkDefault "01;35";
-      ".tga" = mkDefault "01;35";
-      ".xbm" = mkDefault "01;35";
-      ".xpm" = mkDefault "01;35";
-      ".tif" = mkDefault "01;35";
-      ".tiff" = mkDefault "01;35";
-      ".png" = mkDefault "01;35";
-      ".svg" = mkDefault "01;35";
-      ".svgz" = mkDefault "01;35";
-      ".mng" = mkDefault "01;35";
-      ".pcx" = mkDefault "01;35";
-      ".mov" = mkDefault "01;35";
-      ".mpg" = mkDefault "01;35";
-      ".mpeg" = mkDefault "01;35";
-      ".m2v" = mkDefault "01;35";
-      ".mkv" = mkDefault "01;35";
-      ".webm" = mkDefault "01;35";
-      ".ogm" = mkDefault "01;35";
-      ".mp4" = mkDefault "01;35";
-      ".m4v" = mkDefault "01;35";
-      ".mp4v" = mkDefault "01;35";
-      ".vob" = mkDefault "01;35";
-      ".qt" = mkDefault "01;35";
-      ".nuv" = mkDefault "01;35";
-      ".wmv" = mkDefault "01;35";
-      ".asf" = mkDefault "01;35";
-      ".rm" = mkDefault "01;35";
-      ".rmvb" = mkDefault "01;35";
-      ".flc" = mkDefault "01;35";
-      ".avi" = mkDefault "01;35";
-      ".fli" = mkDefault "01;35";
-      ".flv" = mkDefault "01;35";
-      ".gl" = mkDefault "01;35";
-      ".dl" = mkDefault "01;35";
-      ".xcf" = mkDefault "01;35";
-      ".xwd" = mkDefault "01;35";
-      ".yuv" = mkDefault "01;35";
-      ".cgm" = mkDefault "01;35";
-      ".emf" = mkDefault "01;35";
-      ".ogv" = mkDefault "01;35";
-      ".ogx" = mkDefault "01;35";
-      ".aac" = mkDefault "00;36";
-      ".au" = mkDefault "00;36";
-      ".flac" = mkDefault "00;36";
-      ".m4a" = mkDefault "00;36";
-      ".mid" = mkDefault "00;36";
-      ".midi" = mkDefault "00;36";
-      ".mka" = mkDefault "00;36";
-      ".mp3" = mkDefault "00;36";
-      ".mpc" = mkDefault "00;36";
-      ".ogg" = mkDefault "00;36";
-      ".ra" = mkDefault "00;36";
-      ".wav" = mkDefault "00;36";
-      ".oga" = mkDefault "00;36";
-      ".opus" = mkDefault "00;36";
-      ".spx" = mkDefault "00;36";
-      ".xspf" = mkDefault "00;36";
-    };
+  config = mkIf cfg.enable (mkMerge [
+    {
+      # Add default settings from `dircolors --print-database`.
+      programs.dircolors.settings = {
+        RESET = mkDefault "0";
+        DIR = mkDefault "01;34";
+        LINK = mkDefault "01;36";
+        MULTIHARDLINK = mkDefault "00";
+        FIFO = mkDefault "40;33";
+        SOCK = mkDefault "01;35";
+        DOOR = mkDefault "01;35";
+        BLK = mkDefault "40;33;01";
+        CHR = mkDefault "40;33;01";
+        ORPHAN = mkDefault "40;31;01";
+        MISSING = mkDefault "00";
+        SETUID = mkDefault "37;41";
+        SETGID = mkDefault "30;43";
+        CAPABILITY = mkDefault "30;41";
+        STICKY_OTHER_WRITABLE = mkDefault "30;42";
+        OTHER_WRITABLE = mkDefault "34;42";
+        STICKY = mkDefault "37;44";
+        EXEC = mkDefault "01;32";
+        ".tar" = mkDefault "01;31";
+        ".tgz" = mkDefault "01;31";
+        ".arc" = mkDefault "01;31";
+        ".arj" = mkDefault "01;31";
+        ".taz" = mkDefault "01;31";
+        ".lha" = mkDefault "01;31";
+        ".lz4" = mkDefault "01;31";
+        ".lzh" = mkDefault "01;31";
+        ".lzma" = mkDefault "01;31";
+        ".tlz" = mkDefault "01;31";
+        ".txz" = mkDefault "01;31";
+        ".tzo" = mkDefault "01;31";
+        ".t7z" = mkDefault "01;31";
+        ".zip" = mkDefault "01;31";
+        ".z" = mkDefault "01;31";
+        ".dz" = mkDefault "01;31";
+        ".gz" = mkDefault "01;31";
+        ".lrz" = mkDefault "01;31";
+        ".lz" = mkDefault "01;31";
+        ".lzo" = mkDefault "01;31";
+        ".xz" = mkDefault "01;31";
+        ".zst" = mkDefault "01;31";
+        ".tzst" = mkDefault "01;31";
+        ".bz2" = mkDefault "01;31";
+        ".bz" = mkDefault "01;31";
+        ".tbz" = mkDefault "01;31";
+        ".tbz2" = mkDefault "01;31";
+        ".tz" = mkDefault "01;31";
+        ".deb" = mkDefault "01;31";
+        ".rpm" = mkDefault "01;31";
+        ".jar" = mkDefault "01;31";
+        ".war" = mkDefault "01;31";
+        ".ear" = mkDefault "01;31";
+        ".sar" = mkDefault "01;31";
+        ".rar" = mkDefault "01;31";
+        ".alz" = mkDefault "01;31";
+        ".ace" = mkDefault "01;31";
+        ".zoo" = mkDefault "01;31";
+        ".cpio" = mkDefault "01;31";
+        ".7z" = mkDefault "01;31";
+        ".rz" = mkDefault "01;31";
+        ".cab" = mkDefault "01;31";
+        ".wim" = mkDefault "01;31";
+        ".swm" = mkDefault "01;31";
+        ".dwm" = mkDefault "01;31";
+        ".esd" = mkDefault "01;31";
+        ".jpg" = mkDefault "01;35";
+        ".jpeg" = mkDefault "01;35";
+        ".mjpg" = mkDefault "01;35";
+        ".mjpeg" = mkDefault "01;35";
+        ".gif" = mkDefault "01;35";
+        ".bmp" = mkDefault "01;35";
+        ".pbm" = mkDefault "01;35";
+        ".pgm" = mkDefault "01;35";
+        ".ppm" = mkDefault "01;35";
+        ".tga" = mkDefault "01;35";
+        ".xbm" = mkDefault "01;35";
+        ".xpm" = mkDefault "01;35";
+        ".tif" = mkDefault "01;35";
+        ".tiff" = mkDefault "01;35";
+        ".png" = mkDefault "01;35";
+        ".svg" = mkDefault "01;35";
+        ".svgz" = mkDefault "01;35";
+        ".mng" = mkDefault "01;35";
+        ".pcx" = mkDefault "01;35";
+        ".mov" = mkDefault "01;35";
+        ".mpg" = mkDefault "01;35";
+        ".mpeg" = mkDefault "01;35";
+        ".m2v" = mkDefault "01;35";
+        ".mkv" = mkDefault "01;35";
+        ".webm" = mkDefault "01;35";
+        ".ogm" = mkDefault "01;35";
+        ".mp4" = mkDefault "01;35";
+        ".m4v" = mkDefault "01;35";
+        ".mp4v" = mkDefault "01;35";
+        ".vob" = mkDefault "01;35";
+        ".qt" = mkDefault "01;35";
+        ".nuv" = mkDefault "01;35";
+        ".wmv" = mkDefault "01;35";
+        ".asf" = mkDefault "01;35";
+        ".rm" = mkDefault "01;35";
+        ".rmvb" = mkDefault "01;35";
+        ".flc" = mkDefault "01;35";
+        ".avi" = mkDefault "01;35";
+        ".fli" = mkDefault "01;35";
+        ".flv" = mkDefault "01;35";
+        ".gl" = mkDefault "01;35";
+        ".dl" = mkDefault "01;35";
+        ".xcf" = mkDefault "01;35";
+        ".xwd" = mkDefault "01;35";
+        ".yuv" = mkDefault "01;35";
+        ".cgm" = mkDefault "01;35";
+        ".emf" = mkDefault "01;35";
+        ".ogv" = mkDefault "01;35";
+        ".ogx" = mkDefault "01;35";
+        ".aac" = mkDefault "00;36";
+        ".au" = mkDefault "00;36";
+        ".flac" = mkDefault "00;36";
+        ".m4a" = mkDefault "00;36";
+        ".mid" = mkDefault "00;36";
+        ".midi" = mkDefault "00;36";
+        ".mka" = mkDefault "00;36";
+        ".mp3" = mkDefault "00;36";
+        ".mpc" = mkDefault "00;36";
+        ".ogg" = mkDefault "00;36";
+        ".ra" = mkDefault "00;36";
+        ".wav" = mkDefault "00;36";
+        ".oga" = mkDefault "00;36";
+        ".opus" = mkDefault "00;36";
+        ".spx" = mkDefault "00;36";
+        ".xspf" = mkDefault "00;36";
+      };
+    }
 
-    home.file.".dir_colors".text = concatStringsSep "\n" ([ ]
-      ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
-      ++ optional (cfg.extraConfig != "") cfg.extraConfig);
+    (mkIf (!config.home.preferXdgDirectories) {
+      home.file.".dir_colors".text = concatStringsSep "\n" ([ ]
+        ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
+        ++ optional (cfg.extraConfig != "") cfg.extraConfig);
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-      eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
-    '';
+      programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+        eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
+      '';
 
-    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-      eval (${pkgs.coreutils}/bin/dircolors -c ~/.dir_colors)
-    '';
+      programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+        eval (${pkgs.coreutils}/bin/dircolors -c ~/.dir_colors)
+      '';
 
-    # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
-    programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
-      eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
-    '';
-  };
+      # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
+      programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
+        eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
+      '';
+    })
+    (mkIf config.home.preferXdgDirectories {
+      xdg.configFile.dir_colors.text = concatStringsSep "\n" ([ ]
+        ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
+        ++ optional (cfg.extraConfig != "") cfg.extraConfig);
+
+      programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+        eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
+      '';
+
+      programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
+        eval (${pkgs.coreutils}/bin/dircolors -c ${config.xdg.configHome}/dir_colors)
+      '';
+
+      # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
+      programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
+        eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
+      '';
+    })
+  ]);
 }

From c327afbfd859fee74162e22a4275888f5deb89e3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Feb 2025 13:14:55 -0600
Subject: [PATCH 438/546] dircolors: refactor preferXdgDirectories

Store the paths in variables to deduplicate.
---
 modules/programs/dircolors.nix | 43 ++++++++++++++--------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix
index 7c97a2b18..240be4a27 100644
--- a/modules/programs/dircolors.nix
+++ b/modules/programs/dircolors.nix
@@ -54,7 +54,16 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config = let
+    dircolorsPath = if config.home.preferXdgDirectories then
+      "${config.xdg.configHome}/dir_colors"
+    else
+      "~/.dir_colors";
+
+    dircolorsConfig = concatStringsSep "\n" ([ ]
+      ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
+      ++ optional (cfg.extraConfig != "") cfg.extraConfig);
+  in mkIf cfg.enable (mkMerge [
     {
       # Add default settings from `dircolors --print-database`.
       programs.dircolors.settings = {
@@ -188,43 +197,25 @@ in {
         ".spx" = mkDefault "00;36";
         ".xspf" = mkDefault "00;36";
       };
-    }
-
-    (mkIf (!config.home.preferXdgDirectories) {
-      home.file.".dir_colors".text = concatStringsSep "\n" ([ ]
-        ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
-        ++ optional (cfg.extraConfig != "") cfg.extraConfig);
 
       programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-        eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
+        eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath})
       '';
 
       programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-        eval (${pkgs.coreutils}/bin/dircolors -c ~/.dir_colors)
+        eval (${pkgs.coreutils}/bin/dircolors -c ${dircolorsPath})
       '';
 
       # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
       programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
-        eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)
+        eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath})
       '';
+    }
+    (mkIf (!config.home.preferXdgDirectories) {
+      home.file.".dir_colors".text = dircolorsConfig;
     })
     (mkIf config.home.preferXdgDirectories {
-      xdg.configFile.dir_colors.text = concatStringsSep "\n" ([ ]
-        ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
-        ++ optional (cfg.extraConfig != "") cfg.extraConfig);
-
-      programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-        eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
-      '';
-
-      programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-        eval (${pkgs.coreutils}/bin/dircolors -c ${config.xdg.configHome}/dir_colors)
-      '';
-
-      # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
-      programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
-        eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
-      '';
+      xdg.configFile.dir_colors.text = dircolorsConfig;
     })
   ]);
 }

From 89b89340556e6347f494ff45fd8f136f2741b4a4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Feb 2025 13:15:07 -0600
Subject: [PATCH 439/546] tests/dircolors: add xdg config test

---
 tests/modules/programs/dircolors/default.nix  |  5 ++-
 .../dircolors/xdg-config-settings.nix         | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 tests/modules/programs/dircolors/xdg-config-settings.nix

diff --git a/tests/modules/programs/dircolors/default.nix b/tests/modules/programs/dircolors/default.nix
index a82e2b859..39d44858f 100644
--- a/tests/modules/programs/dircolors/default.nix
+++ b/tests/modules/programs/dircolors/default.nix
@@ -1 +1,4 @@
-{ dircolors-settings = ./settings.nix; }
+{
+  dircolors-settings = ./settings.nix;
+  dircolors-xdg-config-settings = ./xdg-config-settings.nix;
+}
diff --git a/tests/modules/programs/dircolors/xdg-config-settings.nix b/tests/modules/programs/dircolors/xdg-config-settings.nix
new file mode 100644
index 000000000..dd48dd8c1
--- /dev/null
+++ b/tests/modules/programs/dircolors/xdg-config-settings.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, ... }: {
+  config = {
+    home.preferXdgDirectories = true;
+
+    programs.zsh.enable = true;
+
+    programs.dircolors = {
+      enable = true;
+
+      settings = {
+        OTHER_WRITABLE = "30;46";
+        ".sh" = "01;32";
+        ".csh" = "01;32";
+      };
+
+      extraConfig = ''
+        # Extra dircolors configuration.
+      '';
+    };
+
+    nmt.script = ''
+      assertFileContent \
+        home-files/.config/dir_colors \
+        ${./settings-expected.conf}
+
+      assertFileRegex  \
+        home-files/.zshrc \
+        "eval \$(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)"
+    '';
+  };
+}

From 546949fea16cf75b4f670c75a5251afee3e5b20f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Feb 2025 13:16:58 -0600
Subject: [PATCH 440/546] tests/dircolors: test zsh path

---
 tests/modules/programs/dircolors/settings.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/modules/programs/dircolors/settings.nix b/tests/modules/programs/dircolors/settings.nix
index 456392a2b..f2802aaa0 100644
--- a/tests/modules/programs/dircolors/settings.nix
+++ b/tests/modules/programs/dircolors/settings.nix
@@ -1,5 +1,7 @@
-{
+{ pkgs, ... }: {
   config = {
+    programs.zsh.enable = true;
+
     programs.dircolors = {
       enable = true;
 
@@ -18,6 +20,11 @@
       assertFileContent \
         home-files/.dir_colors \
         ${./settings-expected.conf}
+
+
+      assertFileRegex  \
+        home-files/.zshrc \
+        "eval \$(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)"
     '';
   };
 }

From 61d8f8366fc327a42cc212d62dfff06ae0c3f195 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Wed, 19 Jun 2024 16:55:37 +0300
Subject: [PATCH 441/546] htop: export defaultFields into lib

---
 modules/programs/htop.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix
index b4004942c..7bb8b11d5 100644
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@@ -166,7 +166,8 @@ in {
 
   config = mkIf cfg.enable {
     lib.htop = {
-      inherit fields modes leftMeters rightMeters bar text graph led blank;
+      inherit fields defaultFields modes leftMeters rightMeters bar text graph
+        led blank;
     };
 
     home.packages = [ cfg.package ];

From cb3f6e9b59d3a5e51ef9f7da2b8418d5c72aaef8 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Wed, 19 Jun 2024 17:05:27 +0300
Subject: [PATCH 442/546] htop: write-protect entire configuration directory

Fixes #4947
---
 modules/programs/htop.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix
index 7bb8b11d5..28699e4a1 100644
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@@ -172,7 +172,7 @@ in {
 
     home.packages = [ cfg.package ];
 
-    xdg.configFile."htop/htoprc" = let
+    xdg.configFile."htop" = let
       defaults = {
         fields = if isDarwin then
           remove fields.M_SHARE defaultFields
@@ -189,9 +189,9 @@ in {
       formatOptions = mapAttrsToList formatOption;
 
     in mkIf (cfg.settings != { }) {
-      text =
-        concatStringsSep "\n" (formatOptions before ++ formatOptions settings)
-        + "\n";
+      source = pkgs.writeTextDir "htoprc"
+        (concatStringsSep "\n" (formatOptions before ++ formatOptions settings)
+          + "\n");
     };
   };
 }

From fb568d75cf6c81f30d49eeb73787e9b56454ba16 Mon Sep 17 00:00:00 2001
From: moni <lythe1107@gmail.com>
Date: Sat, 22 Feb 2025 15:00:52 -0800
Subject: [PATCH 443/546] targets/darwin: allow configuring application linking
 (#4809)

Darwin users can disable application linking or change the path where applications are linked.
---
 modules/targets/darwin/linkapps.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/targets/darwin/linkapps.nix b/modules/targets/darwin/linkapps.nix
index 0d434234b..caa461f45 100644
--- a/modules/targets/darwin/linkapps.nix
+++ b/modules/targets/darwin/linkapps.nix
@@ -1,9 +1,24 @@
 { config, lib, pkgs, ... }:
 
-{
-  config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
+let cfg = config.targets.darwin;
+in {
+  options.targets.darwin.linkApps = {
+    enable =
+      lib.mkEnableOption "linking macOS applications to the user environment"
+      // {
+        default = true;
+      };
+
+    directory = lib.mkOption {
+      type = lib.types.str;
+      default = "Applications/Home Manager Apps";
+      description = "Path to link apps relative to the home directory.";
+    };
+  };
+
+  config = lib.mkIf (pkgs.stdenv.hostPlatform.isDarwin && cfg.linkApps.enable) {
     # Install MacOS applications to the user environment.
-    home.file."Applications/Home Manager Apps".source = let
+    home.file.${cfg.linkApps.directory}.source = let
       apps = pkgs.buildEnv {
         name = "home-manager-applications";
         paths = config.home.packages;

From 7f9ba30a28f02e51c4785b2cc32bf573f8eac021 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 21 Feb 2025 19:47:08 -0500
Subject: [PATCH 444/546] tests: check that all firefox derivatives can be
 installed

The issue itself was resolved with:
https://github.com/nix-community/home-manager/pull/6460

This patch only adds a test case to make sure we don't ever regress by
installing firefox and librewolf and floorp at the same time.

Closes: #6467

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 tests/default.nix                                |  1 +
 tests/modules/programs/firefox/default.nix       |  1 +
 .../programs/firefox/multiple-derivatives.nix    | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 tests/modules/programs/firefox/default.nix
 create mode 100644 tests/modules/programs/firefox/multiple-derivatives.nix

diff --git a/tests/default.nix b/tests/default.nix
index d9686209f..e277e0b2e 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -288,6 +288,7 @@ in import nmtSrc {
     ./modules/programs/boxxy
     ./modules/programs/cavalier
     ./modules/programs/eww
+    ./modules/programs/firefox
     ./modules/programs/firefox/firefox.nix
     ./modules/programs/firefox/floorp.nix
     ./modules/programs/foot
diff --git a/tests/modules/programs/firefox/default.nix b/tests/modules/programs/firefox/default.nix
new file mode 100644
index 000000000..4e7b93c69
--- /dev/null
+++ b/tests/modules/programs/firefox/default.nix
@@ -0,0 +1 @@
+{ "firefox-multiple-derivatives" = ./multiple-derivatives.nix; }
diff --git a/tests/modules/programs/firefox/multiple-derivatives.nix b/tests/modules/programs/firefox/multiple-derivatives.nix
new file mode 100644
index 000000000..12a35de70
--- /dev/null
+++ b/tests/modules/programs/firefox/multiple-derivatives.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+
+lib.mkIf config.test.enableBig {
+  programs.firefox = {
+    enable = true;
+    package = null;
+  };
+  programs.floorp = {
+    enable = true;
+    package = null;
+  };
+  programs.librewolf = {
+    enable = true;
+    package = null;
+  };
+}

From 6b7cd50812e884a559481c7905317005a968ec08 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 22 Feb 2025 09:15:44 -0500
Subject: [PATCH 445/546] tests: test librewolf the same way firefox is tested

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 tests/default.nix                            | 1 +
 tests/modules/programs/firefox/librewolf.nix | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 tests/modules/programs/firefox/librewolf.nix

diff --git a/tests/default.nix b/tests/default.nix
index e277e0b2e..0a96feb08 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -291,6 +291,7 @@ in import nmtSrc {
     ./modules/programs/firefox
     ./modules/programs/firefox/firefox.nix
     ./modules/programs/firefox/floorp.nix
+    ./modules/programs/firefox/librewolf.nix
     ./modules/programs/foot
     ./modules/programs/freetube
     ./modules/programs/fuzzel
diff --git a/tests/modules/programs/firefox/librewolf.nix b/tests/modules/programs/firefox/librewolf.nix
new file mode 100644
index 000000000..3a77e0f1d
--- /dev/null
+++ b/tests/modules/programs/firefox/librewolf.nix
@@ -0,0 +1 @@
+import ./common.nix "librewolf"

From 3b6550f710e754bc9f58c09583f2fa51d9fd14ed Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 22 Feb 2025 20:43:56 -0500
Subject: [PATCH 446/546] git: add option to use riff as diff tool (#5748)

https://github.com/walles/riff
---
 modules/programs/git.nix | 44 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index ee5980656..76b1b9441 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -411,6 +411,29 @@ in {
           '';
         };
       };
+
+      riff = {
+        enable = mkEnableOption "" // {
+          description = ''
+            Enable the <command>riff</command> diff highlighter.
+            See <link xlink:href="https://github.com/walles/riff" />.
+          '';
+        };
+
+        package = mkPackageOption pkgs "riffdiff" { };
+
+        commandLineOptions = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          example = literalExpression ''[ "--no-adds-only-special" ]'';
+          apply = concatStringsSep " ";
+          description = ''
+            Command line arguments to include in the <command>RIFF</command> environment variable.
+
+            Run <command>riff --help</command> for a full list of options
+          '';
+        };
+      };
     };
   };
 
@@ -434,6 +457,7 @@ in {
             cfg.diff-so-fancy.enable
             cfg.difftastic.enable
             cfg.diff-highlight.enable
+            cfg.riff.enable
           ];
         in count id enabled <= 1;
         message =
@@ -678,5 +702,25 @@ in {
           };
         };
     })
+
+    (let riffExe = baseNameOf (getExe cfg.riff.package);
+    in mkIf cfg.riff.enable {
+      home.packages = [ cfg.riff.package ];
+
+      # https://github.com/walles/riff/blob/b17e6f17ce807c8652bc59cd46758661d23ce358/README.md#usage
+      programs.git.iniContent = {
+        pager = {
+          diff = riffExe;
+          log = riffExe;
+          show = riffExe;
+        };
+
+        interactive.diffFilter = "${riffExe} --color=on";
+      };
+    })
+
+    (mkIf (cfg.riff.enable && cfg.riff.commandLineOptions != "") {
+      home.sessionVariables.RIFF = cfg.riff.commandLineOptions;
+    })
   ]);
 }

From ed030a787938cae01d693ebaad52bbb672a4a69d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Feb 2025 19:58:48 -0800
Subject: [PATCH 447/546] chromium: optional nativeMessagingHosts (#6515)

Should only be generating when provided
---
 modules/programs/chromium.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/programs/chromium.nix b/modules/programs/chromium.nix
index 2f3b55179..ffb488fc9 100644
--- a/modules/programs/chromium.nix
+++ b/modules/programs/chromium.nix
@@ -207,11 +207,12 @@ let
       home.file = optionalAttrs (!isProprietaryChrome) (listToAttrs
         ((map extensionJson cfg.extensions)
           ++ (map dictionary cfg.dictionaries)) // {
-            "${configDir}/NativeMessagingHosts" = {
-              source =
-                "${nativeMessagingHostsJoined}/etc/chromium/native-messaging-hosts";
-              recursive = true;
-            };
+            "${configDir}/NativeMessagingHosts" =
+              lib.mkIf (cfg.nativeMessagingHosts != [ ]) {
+                source =
+                  "${nativeMessagingHostsJoined}/etc/chromium/native-messaging-hosts";
+                recursive = true;
+              };
           });
     };
 

From b5ab2c7fdaa807cf425066ab7cd34b073946b1ca Mon Sep 17 00:00:00 2001
From: Silence Tai <silence.m@hotmail.com>
Date: Sun, 23 Feb 2025 21:45:42 +0800
Subject: [PATCH 448/546] waybar: support enable inspect from service (#5922)

---
 modules/programs/waybar.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 48a7fa5f7..0d7294d03 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -211,6 +211,17 @@ in {
       '';
     };
 
+    systemd.enableInspect = mkOption {
+      type = bool;
+      default = false;
+      example = true;
+      description = ''
+        Inspect objects and find their CSS classes, experiment with live CSS styles, and lookup the current value of CSS properties.
+
+        See <https://developer.gnome.org/documentation/tools/inspector.html>
+      '';
+    };
+
     style = mkOption {
       type = nullOr (either path lines);
       default = null;
@@ -324,6 +335,8 @@ in {
           ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
           Restart = "on-failure";
           KillMode = "mixed";
+        } // optionalAttrs cfg.systemd.enableInspect {
+          Environment = [ "GTK_DEBUG=interactive" ];
         };
 
         Install.WantedBy =

From 3002f1aedfde6d4d8112491ead088897a77ae661 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 23 Feb 2025 14:35:40 -0600
Subject: [PATCH 449/546] tests/mpd: bash -> bash-interactive

---
 tests/modules/services/mpd/basic-configuration.service | 2 +-
 tests/modules/services/mpd/start-when-needed.service   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/modules/services/mpd/basic-configuration.service b/tests/modules/services/mpd/basic-configuration.service
index 05ec03846..3ea4d8218 100644
--- a/tests/modules/services/mpd/basic-configuration.service
+++ b/tests/modules/services/mpd/basic-configuration.service
@@ -4,7 +4,7 @@ WantedBy=default.target
 [Service]
 Environment=PATH=/home/hm-user/.nix-profile/bin
 ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose
-ExecStartPre=@bash@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
+ExecStartPre=@bash-interactive@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
 Type=notify
 
 [Unit]
diff --git a/tests/modules/services/mpd/start-when-needed.service b/tests/modules/services/mpd/start-when-needed.service
index 91ce3890c..fd5d83fbd 100644
--- a/tests/modules/services/mpd/start-when-needed.service
+++ b/tests/modules/services/mpd/start-when-needed.service
@@ -1,7 +1,7 @@
 [Service]
 Environment=PATH=/home/hm-user/.nix-profile/bin
 ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose
-ExecStartPre=@bash@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
+ExecStartPre=@bash-interactive@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'"
 Type=notify
 
 [Unit]

From 6a2af4ffb26f812c353415c7316dff0a8b52b525 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 23 Feb 2025 14:35:53 -0600
Subject: [PATCH 450/546] tests/swayidle: bash -> bash-interactive

---
 tests/modules/services/swayidle/basic-configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/services/swayidle/basic-configuration.nix b/tests/modules/services/swayidle/basic-configuration.nix
index 697c1de46..51a254ff9 100644
--- a/tests/modules/services/swayidle/basic-configuration.nix
+++ b/tests/modules/services/swayidle/basic-configuration.nix
@@ -44,7 +44,7 @@
         WantedBy=graphical-session.target
 
         [Service]
-        Environment=PATH=@bash@/bin
+        Environment=PATH=@bash-interactive@/bin
         ExecStart=@swayidle@/bin/dummy -w timeout 50 'notify-send -t 10000 -- "Screen lock in 10 seconds"' timeout 60 'swaylock -fF' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -fF' lock 'swaylock -fF'
         Restart=always
         Type=simple

From 12e26a74e5eb1a31e13daaa08858689e25ebd449 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 23 Feb 2025 13:53:17 -0800
Subject: [PATCH 451/546] tests/neovim: resolve deprecation (#6522)

Assigning a plain list to extraLuaPackages is deprecated.
                           Please assign a function taking a package set
as argument, so
                             extraLuaPackages = [ pkgs.lua51Packages.xxx
];
                           should become
                             extraLuaPackages = ps: [ ps.xxx ];
---
 tests/modules/programs/neovim/plugin-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix
index 0e014bc79..4b8c3abdc 100644
--- a/tests/modules/programs/neovim/plugin-config.nix
+++ b/tests/modules/programs/neovim/plugin-config.nix
@@ -15,7 +15,7 @@ lib.mkIf config.test.enableBig {
         '';
       }
     ];
-    extraLuaPackages = [ pkgs.lua51Packages.luautf8 ];
+    extraLuaPackages = ps: [ ps.luautf8 ];
   };
 
   _module.args.pkgs = lib.mkForce realPkgs;

From c12dcc9b61429b2ad437a7d4974399ad8f910319 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 24 Feb 2025 21:32:28 +0000
Subject: [PATCH 452/546] xdg: create '$XDG_STATE_HOME' (#6526)

Some programs (e.g: `less`) will not make use of `$XDG_STATE_HOME` if
the directory does not exist.
---
 modules/misc/xdg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index b916e88fb..e68e16a8b 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -143,6 +143,7 @@ in {
         (mapAttrs' (name: file: nameValuePair "${cfg.stateHome}/${name}" file)
           cfg.stateFile)
         { "${cfg.cacheHome}/.keep".text = ""; }
+        { "${cfg.stateHome}/.keep".text = ""; }
       ];
     }
   ];

From 74f0a8546e3f2458c870cf90fc4b38ac1f498b17 Mon Sep 17 00:00:00 2001
From: DSOverlord <78819443+DSOverlord@users.noreply.github.com>
Date: Tue, 25 Feb 2025 16:39:21 +0200
Subject: [PATCH 453/546] clipse: add additional options (#6525)

---
 modules/services/clipse.nix | 60 +++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/modules/services/clipse.nix b/modules/services/clipse.nix
index e7c1c62f6..f00359c85 100644
--- a/modules/services/clipse.nix
+++ b/modules/services/clipse.nix
@@ -35,6 +35,64 @@ in {
       description = "Number of history lines to keep.";
     };
 
+    imageDisplay = {
+      type = lib.mkOption {
+        type = lib.types.enum [ "basic" "kitty" "sixel" ];
+        default = "basic";
+        description = "Preview image method";
+      };
+
+      scaleX = lib.mkOption {
+        type = lib.types.int;
+        default = 9;
+        description = "Image scaling factor X";
+      };
+
+      scaleY = lib.mkOption {
+        type = lib.types.int;
+        default = 9;
+        description = "Image scaling factor Y";
+      };
+
+      heightCut = lib.mkOption {
+        type = lib.types.int;
+        default = 2;
+        description = "Height cut";
+      };
+    };
+
+    keyBindings = lib.mkOption {
+      type = jsonFormat.type;
+
+      default = { };
+
+      example = lib.literalExpression ''
+         {
+           "choose": "enter",
+           "clearSelected": "S",
+           "down": "down",
+           "end": "end",
+           "filter": "/",
+           "home": "home",
+           "more": "?",
+           "nextPage": "right",
+           "prevPage": "left",
+           "preview": "t",
+           "quit": "q",
+           "remove": "x",
+           "selectDown": "ctrl+down",
+           "selectSingle": "s",
+           "selectUp": "ctrl+up",
+           "togglePin": "p",
+           "togglePinned": "tab",
+           "up": "up",
+           "yankFilter": "ctrl+s"
+        }
+      '';
+
+      description = "Custom key bindings";
+    };
+
     theme = lib.mkOption {
       type = jsonFormat.type;
 
@@ -82,6 +140,8 @@ in {
         logFile = "clipse.log";
         themeFile = "custom_theme.json";
         tempDir = "tmp_files";
+        keyBindings = cfg.keyBindings;
+        imageDisplay = cfg.imageDisplay;
       };
 
     xdg.configFile."clipse/custom_theme.json".source =

From 18e74c2e0225189858cd29890eb68212844efccc Mon Sep 17 00:00:00 2001
From: eulalia <179992797+3ulalia@users.noreply.github.com>
Date: Wed, 26 Feb 2025 08:59:40 -0500
Subject: [PATCH 454/546] aerc-accounts: improve logic for parsing XOAUTH2 URL
 params (#6530)

This commit fixes an issue in aerc-accounts that prevents oauth2
accounts from being generated from given parameters. It also allows
users to add XOAUTH2 credentials without having to add all four of
client_id, client_secret, token_endpoint, and scope. It further adds
tests for the XOAUTH2 config generation.
---
 modules/programs/aerc-accounts.nix         |  5 +--
 tests/modules/programs/aerc/default.nix    |  1 +
 tests/modules/programs/aerc/oauth.expected |  9 +++++
 tests/modules/programs/aerc/oauth.nix      | 39 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/programs/aerc/oauth.expected
 create mode 100644 tests/modules/programs/aerc/oauth.nix

diff --git a/modules/programs/aerc-accounts.nix b/modules/programs/aerc-accounts.nix
index 04f0165a0..8ebfef0bb 100644
--- a/modules/programs/aerc-accounts.nix
+++ b/modules/programs/aerc-accounts.nix
@@ -134,8 +134,9 @@ in {
 
       oauthParams = { auth, params }:
         if useOauth auth && params != null && params != { } then
-          "?" + builtins.concatStringsSep "&" lib.attrsets.mapAttrsToList
-          (k: v: k + "=" + lib.strings.escapeURL v) params
+          "?" + builtins.concatStringsSep "&"
+          (lib.attrsets.mapAttrsToList (k: v: k + "=" + lib.strings.escapeURL v)
+            (lib.attrsets.filterAttrs (k: v: v != null) params))
         else
           "";
 
diff --git a/tests/modules/programs/aerc/default.nix b/tests/modules/programs/aerc/default.nix
index 9417a2197..80b7e9efc 100644
--- a/tests/modules/programs/aerc/default.nix
+++ b/tests/modules/programs/aerc/default.nix
@@ -2,4 +2,5 @@
   aerc-noSettings = ./noSettings.nix;
   aerc-settings = ./settings.nix;
   aerc-assertion = ./assertion.nix;
+  aerc-oauth = ./oauth.nix;
 }
diff --git a/tests/modules/programs/aerc/oauth.expected b/tests/modules/programs/aerc/oauth.expected
new file mode 100644
index 000000000..6824d1fed
--- /dev/null
+++ b/tests/modules/programs/aerc/oauth.expected
@@ -0,0 +1,9 @@
+# Generated by Home Manager.
+
+[basic]
+copy-to = Sent
+default = Inbox
+from = Annie X. Hacker <anniex@mail.invalid>
+outgoing = smtp+xoauth2://anniex@smtp.office365.com:587?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https%3A%2F%2Flogin.microsoftonline.com%2Fcommon%2Foauth2%2Fv2.0%2Ftoken
+postpone = Drafts
+source = imaps+xoauth2://anniex@outlook.office365.com:993?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https%3A%2F%2Flogin.microsoftonline.com%2Fcommon%2Foauth2%2Fv2.0%2Ftoken
diff --git a/tests/modules/programs/aerc/oauth.nix b/tests/modules/programs/aerc/oauth.nix
new file mode 100644
index 000000000..e91d25203
--- /dev/null
+++ b/tests/modules/programs/aerc/oauth.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, ... }: {
+  config = {
+    nmt.script = let
+      dir = if (pkgs.stdenv.isDarwin && !config.xdg.enable) then
+        "home-files/Library/Preferences/aerc"
+      else
+        "home-files/.config/aerc";
+    in ''
+      assertFileContent ${dir}/accounts.conf ${./oauth.expected}
+    '';
+    programs.aerc = {
+      enable = true;
+      extraConfig.general.unsafe-accounts-conf = true;
+    };
+
+    accounts.email.accounts = {
+      basic = {
+        realName = "Annie X. Hacker";
+        userName = "anniex";
+        address = "anniex@mail.invalid";
+        primary = true;
+        flavor = "outlook.office365.com";
+
+        aerc = rec {
+          enable = true;
+          imapAuth = "xoauth2";
+          smtpAuth = imapAuth;
+          imapOauth2Params = {
+            client_id = "9e5f94bc-e8a4-4e73-b8be-63364c29d753";
+            token_endpoint =
+              "https://login.microsoftonline.com/common/oauth2/v2.0/token";
+          };
+          smtpOauth2Params = imapOauth2Params;
+        };
+      };
+    };
+  };
+}
+

From 87743e9383d4cbf4138dc65dd644822fc38e7bbf Mon Sep 17 00:00:00 2001
From: Kilian Mio <86004375+Mikilio@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:20:52 +0100
Subject: [PATCH 455/546] firefox: deprecate vendorPath (#6519)

This is a reaction to PR #6460
---
 modules/programs/firefox.nix                 |  6 +-----
 modules/programs/firefox/mkFirefoxModule.nix | 13 ++++++-------
 modules/programs/floorp.nix                  | 10 ++--------
 modules/programs/librewolf.nix               |  6 +-----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 9379a2b9b..01cab9bd8 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -18,12 +18,8 @@ in {
       unwrappedPackageName = "firefox-unwrapped";
       visible = true;
 
-      platforms.linux = rec {
-        vendorPath = ".mozilla";
-        configPath = "${vendorPath}/firefox";
-      };
+      platforms.linux = rec { configPath = ".mozilla/firefox"; };
       platforms.darwin = {
-        vendorPath = "Library/Application Support/Mozilla";
         configPath = "Library/Application Support/Firefox";
       };
     })
diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 784114aac..ce690801e 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -280,11 +280,7 @@ in {
     vendorPath = mkOption {
       internal = true;
       type = with types; nullOr str;
-      default = with platforms;
-        if isDarwin then
-          darwin.vendorPath or null
-        else
-          linux.vendorPath or null;
+      default = null;
       example = ".mozilla";
       description =
         "Directory containing the native messaging hosts directory.";
@@ -299,7 +295,7 @@ in {
       description = "Directory containing the ${appName} configuration files.";
     };
 
-    nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
+    nativeMessagingHosts = mkOption {
       inherit visible;
       type = types.listOf types.package;
       default = [ ];
@@ -307,7 +303,7 @@ in {
         Additional packages containing native messaging hosts that should be
         made available to ${appName} extensions.
       '';
-    });
+    };
 
     finalPackage = mkOption {
       inherit visible;
@@ -852,6 +848,9 @@ in {
       will be removed in the future. Please change to overriding the package
       configuration using '${moduleName}.package' instead. You can refer to
       its example for how to do this.
+    '' ++ optional (cfg.vendorPath != null) ''
+      Using '${moduleName}.vendorPath' has been deprecated and
+      will be removed in the future. Native messaging hosts will function normally without specifying this path.
     '';
 
     home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix
index f96b4bd74..75616b7ee 100644
--- a/modules/programs/floorp.nix
+++ b/modules/programs/floorp.nix
@@ -19,14 +19,8 @@ in {
       unwrappedPackageName = "floorp-unwrapped";
       visible = true;
 
-      platforms.linux = {
-        configPath = ".floorp";
-        vendorPath = ".mozilla";
-      };
-      platforms.darwin = {
-        configPath = "Library/Application Support/Floorp";
-        vendorPath = "Library/Application Support/Mozilla";
-      };
+      platforms.linux = { configPath = ".floorp"; };
+      platforms.darwin = { configPath = "Library/Application Support/Floorp"; };
     })
   ];
 }
diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index 0d2aec3b2..6b5e20894 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -29,13 +29,9 @@ in {
       wrappedPackageName = "librewolf";
       unwrappedPackageName = "librewolf-unwrapped";
 
-      platforms.linux = {
-        configPath = ".librewolf";
-        vendorPath = ".mozilla";
-      };
+      platforms.linux = { configPath = ".librewolf"; };
       platforms.darwin = {
         configPath = "Library/Application Support/LibreWolf";
-        vendorPath = "Library/Application Support/Mozilla";
       };
 
       enableBookmarks = false;

From 53c587d263f94aaf6a281745923c76bbec62bcf3 Mon Sep 17 00:00:00 2001
From: Thomas Zeger <thomaszeger@gmail.com>
Date: Wed, 26 Feb 2025 09:21:11 -0500
Subject: [PATCH 456/546] tmux: fix shell example (#5361)

---
 modules/programs/tmux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 85052c9fd..ff3a3322f 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -284,7 +284,7 @@ in {
 
       shell = mkOption {
         default = defaultShell;
-        example = "\${pkgs.zsh}/bin/zsh";
+        example = literalExpression "${pkgs.zsh}/bin/zsh";
         type = with types; nullOr str;
         description = "Set the default-shell tmux variable.";
       };

From 44b86a72e73a7c3040ac54ed1c5eab5f156929bd Mon Sep 17 00:00:00 2001
From: Even Brenden <2512008+evenbrenden@users.noreply.github.com>
Date: Wed, 26 Feb 2025 22:41:15 +0100
Subject: [PATCH 457/546] xidlehook: set Restart=always (#6533)

---
 modules/services/xidlehook.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook.nix
index 2ce64e691..8c8c874a4 100644
--- a/modules/services/xidlehook.nix
+++ b/modules/services/xidlehook.nix
@@ -153,6 +153,6 @@ in {
         ExecStart = "${script}";
       };
       Install.WantedBy = [ "graphical-session.target" ];
-    };
+    } // pkgs.lib.optionalAttrs (!cfg.once) { Restart = "always"; };
   };
 }

From 6be185eb76295e7562f5bf2da42afe374b8beb15 Mon Sep 17 00:00:00 2001
From: Even Brenden <2512008+evenbrenden@users.noreply.github.com>
Date: Wed, 26 Feb 2025 22:41:55 +0100
Subject: [PATCH 458/546] screen-locker: set Restart=always for all services
 (#6534)

---
 modules/services/screen-locker.nix                           | 2 ++
 tests/modules/services/screen-locker/basic-configuration.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index 085573f8a..b552e1ba4 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -127,6 +127,7 @@ in {
           ExecStart = concatStringsSep " "
             ([ "${cfg.xss-lock.package}/bin/xss-lock" "-s \${XDG_SESSION_ID}" ]
               ++ cfg.xss-lock.extraOptions ++ [ "-- ${cfg.lockCmd}" ]);
+          Restart = "always";
         };
       };
     }
@@ -153,6 +154,7 @@ in {
             "-locker '${pkgs.systemd}/bin/loginctl lock-session \${XDG_SESSION_ID}'"
           ] ++ optional cfg.xautolock.detectSleep "-detectsleep"
             ++ cfg.xautolock.extraOptions);
+          Restart = "always";
         };
       };
     })
diff --git a/tests/modules/services/screen-locker/basic-configuration.nix b/tests/modules/services/screen-locker/basic-configuration.nix
index 855370d2b..e92a4a9f1 100644
--- a/tests/modules/services/screen-locker/basic-configuration.nix
+++ b/tests/modules/services/screen-locker/basic-configuration.nix
@@ -19,7 +19,9 @@
 
     assertFileExists $xssService
     assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
+    assertFileRegex $xssService 'Restart=always'
     assertFileExists $xautolockService
     assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*'
+    assertFileRegex $xautolockService 'Restart=always'
   '';
 }

From b8869e4ead721bbd4f0d6b927e8395705d4f16e6 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 27 Feb 2025 03:53:00 +0100
Subject: [PATCH 459/546] mpd: Add support for darwin (#6517)

---
 modules/services/mpd.nix                      | 23 +++++++++++++------
 .../services/mpd/basic-configuration.conf     |  1 +
 tests/modules/services/mpd/xdg-music-dir.conf |  1 +
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 8787ad667..5e0756203 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -14,6 +14,9 @@ let
     ${lib.optionalString (cfg.dbFile != null) ''
       db_file             "${cfg.dbFile}"
     ''}
+    ${lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
+      log_file             "${config.home.homeDirectory}/Library/Logs/mpd/log.txt"
+    ''}
     state_file          "${cfg.dataDir}/state"
     sticker_file        "${cfg.dataDir}/sticker.sql"
 
@@ -114,7 +117,7 @@ in {
           type = types.bool;
           default = false;
           description = ''
-            Enable systemd socket activation.
+            Enable systemd socket activation. This is only supported on Linux.
           '';
         };
 
@@ -155,10 +158,6 @@ in {
   ###### implementation
 
   config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.mpd" pkgs lib.platforms.linux)
-    ];
-
     services.mpd = mkMerge [
       (mkIf (versionAtLeast config.home.stateVersion "22.11"
         && config.xdg.userDirs.enable) {
@@ -170,7 +169,7 @@ in {
       })
     ];
 
-    systemd.user.services.mpd = {
+    systemd.user.services.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
       Unit = mkMerge [
         {
           Description = "Music Player Daemon";
@@ -214,7 +213,17 @@ in {
       Install = { WantedBy = [ "sockets.target" ]; };
     };
 
+    launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
+      enable = true;
+      config = {
+        ProgramArguments =
+          [ (lib.getExe cfg.package) "--no-daemon" "${mpdConf}" ]
+          ++ cfg.extraArgs;
+        KeepAlive = true;
+        ProcessType = "Interactive";
+      };
+    };
+
     home.packages = [ cfg.package ];
   };
-
 }
diff --git a/tests/modules/services/mpd/basic-configuration.conf b/tests/modules/services/mpd/basic-configuration.conf
index 59b3568b3..4c266a02c 100644
--- a/tests/modules/services/mpd/basic-configuration.conf
+++ b/tests/modules/services/mpd/basic-configuration.conf
@@ -2,6 +2,7 @@ music_directory     "/my/music/dir"
 playlist_directory  "/home/hm-user/.local/share/mpd/playlists"
 db_file             "/home/hm-user/.local/share/mpd/tag_cache"
 
+
 state_file          "/home/hm-user/.local/share/mpd/state"
 sticker_file        "/home/hm-user/.local/share/mpd/sticker.sql"
 
diff --git a/tests/modules/services/mpd/xdg-music-dir.conf b/tests/modules/services/mpd/xdg-music-dir.conf
index 56fe71b49..6a0e7c21e 100644
--- a/tests/modules/services/mpd/xdg-music-dir.conf
+++ b/tests/modules/services/mpd/xdg-music-dir.conf
@@ -2,6 +2,7 @@ music_directory     "/home/hm-user/Music"
 playlist_directory  "/home/hm-user/.local/share/mpd/playlists"
 db_file             "/home/hm-user/.local/share/mpd/tag_cache"
 
+
 state_file          "/home/hm-user/.local/share/mpd/state"
 sticker_file        "/home/hm-user/.local/share/mpd/sticker.sql"
 

From 11e6d20803cb660094a7657b8f1653d96d61b527 Mon Sep 17 00:00:00 2001
From: Emanuel <152207479+eeyieryi@users.noreply.github.com>
Date: Thu, 27 Feb 2025 20:32:19 +0400
Subject: [PATCH 460/546] ghostty: fix typo (#6541)

---
 modules/programs/ghostty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index c0fe86208..383472efc 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -31,7 +31,7 @@ in {
     package = lib.mkPackageOption pkgs "ghostty" {
       nullable = true;
       extraDescription =
-        "Set programs.ghostty.package to null on platfroms where ghostty is not available or marked broken";
+        "Set programs.ghostty.package to null on platforms where ghostty is not available or marked broken";
     };
 
     settings = lib.mkOption {

From cf3bf4f1b72077e287c36152b9fcead0cfa672d5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 11:56:56 -0500
Subject: [PATCH 461/546] mpd: refactor implementation (#6537)

Remove with lib, reorganize, cleanup conditionals, hide options that are
linux only from darwin.
---
 modules/services/mpd.nix                      | 151 ++++++++----------
 .../services/mpd/basic-configuration.conf     |   7 +-
 tests/modules/services/mpd/xdg-music-dir.conf |   7 +-
 3 files changed, 73 insertions(+), 92 deletions(-)

diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index 5e0756203..a1df5640a 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -1,41 +1,11 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
-  name = "mpd";
+  inherit (lib) mkIf mkOption types;
 
   cfg = config.services.mpd;
-
-  mpdConf = pkgs.writeText "mpd.conf" ''
-    music_directory     "${cfg.musicDirectory}"
-    playlist_directory  "${cfg.playlistDirectory}"
-    ${lib.optionalString (cfg.dbFile != null) ''
-      db_file             "${cfg.dbFile}"
-    ''}
-    ${lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
-      log_file             "${config.home.homeDirectory}/Library/Logs/mpd/log.txt"
-    ''}
-    state_file          "${cfg.dataDir}/state"
-    sticker_file        "${cfg.dataDir}/sticker.sql"
-
-    ${optionalString (cfg.network.listenAddress != "any")
-    ''bind_to_address "${cfg.network.listenAddress}"''}
-    ${optionalString (cfg.network.port != 6600)
-    ''port "${toString cfg.network.port}"''}
-
-    ${cfg.extraConfig}
-  '';
-
 in {
-
-  ###### interface
-
   options = {
-
     services.mpd = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -55,7 +25,7 @@ in {
 
       musicDirectory = mkOption {
         type = with types; either path str;
-        defaultText = literalExpression ''
+        defaultText = lib.literalExpression ''
           ''${home.homeDirectory}/music    if state version < 22.11
           ''${xdg.userDirs.music}          if xdg.userDirs.enable == true
           undefined                      otherwise
@@ -103,7 +73,7 @@ in {
 
       dataDir = mkOption {
         type = types.path;
-        default = "${config.xdg.dataHome}/${name}";
+        default = "${config.xdg.dataHome}/mpd";
         defaultText = "$XDG_DATA_HOME/mpd";
         apply = toString; # Prevent copies to Nix store.
         description = ''
@@ -116,6 +86,8 @@ in {
         startWhenNeeded = mkOption {
           type = types.bool;
           default = false;
+          visible = pkgs.stdenv.hostPlatform.isLinux;
+          readOnly = pkgs.stdenv.hostPlatform.isDarwin;
           description = ''
             Enable systemd socket activation. This is only supported on Linux.
           '';
@@ -152,67 +124,88 @@ in {
         '';
       };
     };
-
   };
 
-  ###### implementation
+  config = let
+    mpdConf = pkgs.writeText "mpd.conf" (''
+      music_directory     "${cfg.musicDirectory}"
+      playlist_directory  "${cfg.playlistDirectory}"
+    '' + lib.optionalString (cfg.dbFile != null) ''
+      db_file             "${cfg.dbFile}"
+    '' + lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
+      log_file            "${config.home.homeDirectory}/Library/Logs/mpd/log.txt"
+    '' + ''
+      state_file          "${cfg.dataDir}/state"
+      sticker_file        "${cfg.dataDir}/sticker.sql"
 
-  config = mkIf cfg.enable {
-    services.mpd = mkMerge [
-      (mkIf (versionAtLeast config.home.stateVersion "22.11"
+    '' + lib.optionalString (cfg.network.listenAddress != "any") ''
+      bind_to_address     "${cfg.network.listenAddress}"
+    '' + lib.optionalString (cfg.network.port != 6600) ''
+      port                "${toString cfg.network.port}"
+    '' + lib.optionalString (cfg.extraConfig != "") ''
+      ${cfg.extraConfig}
+    '');
+  in mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    services.mpd = lib.mkMerge [
+      (mkIf (lib.versionAtLeast config.home.stateVersion "22.11"
         && config.xdg.userDirs.enable) {
-          musicDirectory = mkOptionDefault config.xdg.userDirs.music;
+          musicDirectory = lib.mkOptionDefault config.xdg.userDirs.music;
         })
 
-      (mkIf (versionOlder config.home.stateVersion "22.11") {
-        musicDirectory = mkOptionDefault "${config.home.homeDirectory}/music";
+      (mkIf (lib.versionOlder config.home.stateVersion "22.11") {
+        musicDirectory =
+          lib.mkOptionDefault "${config.home.homeDirectory}/music";
       })
     ];
 
-    systemd.user.services.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
-      Unit = mkMerge [
-        {
-          Description = "Music Player Daemon";
-          After = [ "network.target" "sound.target" ];
-        }
+    systemd.user = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
+      services.mpd = {
+        Unit = lib.mkMerge [
+          {
+            Description = "Music Player Daemon";
+            After = [ "network.target" "sound.target" ];
+          }
 
-        (mkIf cfg.network.startWhenNeeded {
-          Requires = [ "mpd.socket" ];
-          After = [ "mpd.socket" ];
-        })
-      ];
+          (mkIf cfg.network.startWhenNeeded {
+            Requires = [ "mpd.socket" ];
+            After = [ "mpd.socket" ];
+          })
+        ];
 
-      Install = mkIf (!cfg.network.startWhenNeeded) {
-        WantedBy = [ "default.target" ];
+        Install = mkIf (!cfg.network.startWhenNeeded) {
+          WantedBy = [ "default.target" ];
+        };
+
+        Service = {
+          Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
+          ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${
+              lib.escapeShellArgs cfg.extraArgs
+            }";
+          Type = "notify";
+          ExecStartPre = ''
+            ${pkgs.bash}/bin/bash -c "${pkgs.coreutils}/bin/mkdir -p '${cfg.dataDir}' '${cfg.playlistDirectory}'"'';
+        };
       };
 
-      Service = {
-        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
-        ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${
-            escapeShellArgs cfg.extraArgs
-          }";
-        Type = "notify";
-        ExecStartPre = ''
-          ${pkgs.bash}/bin/bash -c "${pkgs.coreutils}/bin/mkdir -p '${cfg.dataDir}' '${cfg.playlistDirectory}'"'';
+      sockets.mpd = mkIf cfg.network.startWhenNeeded {
+        Socket = {
+          ListenStream = let
+            listen = if cfg.network.listenAddress == "any" then
+              toString cfg.network.port
+            else
+              "${cfg.network.listenAddress}:${toString cfg.network.port}";
+          in [ listen "%t/mpd/socket" ];
+
+          Backlog = 5;
+          KeepAlive = true;
+        };
+
+        Install = { WantedBy = [ "sockets.target" ]; };
       };
     };
 
-    systemd.user.sockets.mpd = mkIf cfg.network.startWhenNeeded {
-      Socket = {
-        ListenStream = let
-          listen = if cfg.network.listenAddress == "any" then
-            toString cfg.network.port
-          else
-            "${cfg.network.listenAddress}:${toString cfg.network.port}";
-        in [ listen "%t/mpd/socket" ];
-
-        Backlog = 5;
-        KeepAlive = true;
-      };
-
-      Install = { WantedBy = [ "sockets.target" ]; };
-    };
-
     launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
       enable = true;
       config = {
@@ -223,7 +216,5 @@ in {
         ProcessType = "Interactive";
       };
     };
-
-    home.packages = [ cfg.package ];
   };
 }
diff --git a/tests/modules/services/mpd/basic-configuration.conf b/tests/modules/services/mpd/basic-configuration.conf
index 4c266a02c..810f2b736 100644
--- a/tests/modules/services/mpd/basic-configuration.conf
+++ b/tests/modules/services/mpd/basic-configuration.conf
@@ -1,12 +1,7 @@
 music_directory     "/my/music/dir"
 playlist_directory  "/home/hm-user/.local/share/mpd/playlists"
 db_file             "/home/hm-user/.local/share/mpd/tag_cache"
-
-
 state_file          "/home/hm-user/.local/share/mpd/state"
 sticker_file        "/home/hm-user/.local/share/mpd/sticker.sql"
 
-bind_to_address "127.0.0.1"
-
-
-
+bind_to_address     "127.0.0.1"
diff --git a/tests/modules/services/mpd/xdg-music-dir.conf b/tests/modules/services/mpd/xdg-music-dir.conf
index 6a0e7c21e..22157d844 100644
--- a/tests/modules/services/mpd/xdg-music-dir.conf
+++ b/tests/modules/services/mpd/xdg-music-dir.conf
@@ -1,12 +1,7 @@
 music_directory     "/home/hm-user/Music"
 playlist_directory  "/home/hm-user/.local/share/mpd/playlists"
 db_file             "/home/hm-user/.local/share/mpd/tag_cache"
-
-
 state_file          "/home/hm-user/.local/share/mpd/state"
 sticker_file        "/home/hm-user/.local/share/mpd/sticker.sql"
 
-bind_to_address "127.0.0.1"
-
-
-
+bind_to_address     "127.0.0.1"

From 0208592b59424449de69619d37f93f735de0fc33 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 12:32:59 -0500
Subject: [PATCH 462/546] idlehook: fix service.restart merge (#6544)

---
 modules/services/xidlehook.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook.nix
index 8c8c874a4..77b4c1dfe 100644
--- a/modules/services/xidlehook.nix
+++ b/modules/services/xidlehook.nix
@@ -151,8 +151,8 @@ in {
       Service = {
         Type = if cfg.once then "oneshot" else "simple";
         ExecStart = "${script}";
-      };
+      } // lib.optionalAttrs (!cfg.once) { Restart = "always"; };
       Install.WantedBy = [ "graphical-session.target" ];
-    } // pkgs.lib.optionalAttrs (!cfg.once) { Restart = "always"; };
+    };
   };
 }

From 343646e092696d94b6f22b6875ae685756fd4cf0 Mon Sep 17 00:00:00 2001
From: gmvar <gmvar@users.noreply.github.com>
Date: Thu, 27 Feb 2025 10:12:56 -0800
Subject: [PATCH 463/546] kitty: add action aliases config (#6538)

---
 modules/programs/kitty.nix                      | 17 +++++++++++++++++
 .../kitty/example-settings-expected.conf        |  3 +++
 .../modules/programs/kitty/example-settings.nix |  5 +++++
 .../kitty/null-shellIntegration-expected.conf   |  1 +
 4 files changed, 26 insertions(+)

diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index 04dada1fa..cc7e7b4dc 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -22,6 +22,10 @@ let
     mkKeyValue = key: command: "map ${key} ${command}";
   };
 
+  toKittyActionAliases = lib.generators.toKeyValue {
+    mkKeyValue = alias_name: action: "action_alias ${alias_name} ${action}";
+  };
+
   toKittyEnv = lib.generators.toKeyValue {
     mkKeyValue = name: value: "env ${name}=${value}";
   };
@@ -143,6 +147,18 @@ in {
       description = "The font to use.";
     };
 
+    actionAliases = mkOption {
+      type = types.attrsOf types.str;
+      default = { };
+      description = "Define action aliases.";
+      example = literalExpression ''
+        {
+          "launch_tab" = "launch --cwd=current --type=tab";
+          "launch_window" = "launch --cwd=current --type=os-window";
+        }
+      '';
+    };
+
     keybindings = mkOption {
       type = types.attrsOf types.str;
       default = { };
@@ -234,6 +250,7 @@ in {
           shell_integration ${cfg.shellIntegration.mode}
         '')
         (toKittyConfig cfg.settings)
+        (toKittyActionAliases cfg.actionAliases)
         (toKittyKeybindings cfg.keybindings)
         (toKittyEnv cfg.environment)
         cfg.extraConfig
diff --git a/tests/modules/programs/kitty/example-settings-expected.conf b/tests/modules/programs/kitty/example-settings-expected.conf
index 41a9cb772..b52d34d44 100644
--- a/tests/modules/programs/kitty/example-settings-expected.conf
+++ b/tests/modules/programs/kitty/example-settings-expected.conf
@@ -12,6 +12,9 @@ enable_audio_bell no
 scrollback_lines 10000
 update_check_interval 0
 
+action_alias launch_tab launch --cwd=current --type=tab
+action_alias launch_window launch --cwd=current --type=os-window
+
 map ctrl+c copy_or_interrupt
 map ctrl+f>2 set_font_size 20
 
diff --git a/tests/modules/programs/kitty/example-settings.nix b/tests/modules/programs/kitty/example-settings.nix
index 8b6c74ee7..cd7a9a327 100644
--- a/tests/modules/programs/kitty/example-settings.nix
+++ b/tests/modules/programs/kitty/example-settings.nix
@@ -24,6 +24,11 @@
         "ctrl+f>2" = "set_font_size 20";
       };
 
+      actionAliases = {
+        "launch_tab" = "launch --cwd=current --type=tab";
+        "launch_window" = "launch --cwd=current --type=os-window";
+      };
+
       environment = { LS_COLORS = "1"; };
     };
 
diff --git a/tests/modules/programs/kitty/null-shellIntegration-expected.conf b/tests/modules/programs/kitty/null-shellIntegration-expected.conf
index df3ae5984..75386d91e 100644
--- a/tests/modules/programs/kitty/null-shellIntegration-expected.conf
+++ b/tests/modules/programs/kitty/null-shellIntegration-expected.conf
@@ -6,3 +6,4 @@
 
 
 
+

From b71edac7a3167026aabea82a54d08b1794088c21 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 18:38:18 -0500
Subject: [PATCH 464/546] launchd: sync up with changes from nix-darwin (#6508)

We haven't updated to match changes done upstream in a while. Updating
to reflect changes for expanding support / proper types.
---
 modules/launchd/launchd.nix | 176 ++++++++++++++++++------------------
 modules/launchd/types.nix   | 121 +++++++++++++++++++++++++
 2 files changed, 208 insertions(+), 89 deletions(-)
 create mode 100644 modules/launchd/types.nix

diff --git a/modules/launchd/launchd.nix b/modules/launchd/launchd.nix
index 9c9b54452..98024c584 100644
--- a/modules/launchd/launchd.nix
+++ b/modules/launchd/launchd.nix
@@ -25,9 +25,11 @@
 
 { config, lib, ... }:
 
-with lib;
+let
+  inherit (lib) types mkOption; # added by Home Manager
 
-{
+  launchdTypes = import ./types.nix { inherit config lib; };
+in {
   freeformType = with types; attrsOf anything; # added by Home Manager
 
   options = {
@@ -118,7 +120,7 @@ with lib;
     };
 
     LimitLoadToSessionType = mkOption {
-      type = types.nullOr types.str;
+      type = types.nullOr (types.oneOf [ types.str (types.listOf types.str) ]);
       default = null;
       description = ''
         This configuration file only applies to sessions of the type specified. This key is used in concert
@@ -369,60 +371,26 @@ with lib;
 
     StartCalendarInterval = mkOption {
       default = null;
-      example = {
+      example = [{
         Hour = 2;
         Minute = 30;
-      };
+      }];
       description = ''
-        This optional key causes the job to be started every calendar interval as specified. Missing arguments
-        are considered to be wildcard. The semantics are much like `crontab(5)`.  Unlike cron which skips job
-        invocations when the computer is asleep, launchd will start the job the next time the computer wakes
+        This optional key causes the job to be started every calendar interval as specified. The semantics are
+        much like {manpage}`crontab(5)`: Missing attributes are considered to be wildcard. Unlike cron which skips
+        job invocations when the computer is asleep, launchd will start the job the next time the computer wakes
         up.  If multiple intervals transpire before the computer is woken, those events will be coalesced into
-        one event upon wake from sleep.
+        one event upon waking from sleep.
+
+        ::: {.important}
+        The list must not be empty and must not contain duplicate entries (attrsets which compare equally).
+        :::
+
+        ::: {.caution}
+        Since missing attrs become wildcards, an empty attrset effectively means "every minute".
+        :::
       '';
-      type = types.nullOr (types.listOf (types.submodule {
-        options = {
-          Minute = mkOption {
-            type = types.nullOr types.int;
-            default = null;
-            description = ''
-              The minute on which this job will be run.
-            '';
-          };
-
-          Hour = mkOption {
-            type = types.nullOr types.int;
-            default = null;
-            description = ''
-              The hour on which this job will be run.
-            '';
-          };
-
-          Day = mkOption {
-            type = types.nullOr types.int;
-            default = null;
-            description = ''
-              The day on which this job will be run.
-            '';
-          };
-
-          Weekday = mkOption {
-            type = types.nullOr types.int;
-            default = null;
-            description = ''
-              The weekday on which this job will be run (0 and 7 are Sunday).
-            '';
-          };
-
-          Month = mkOption {
-            type = types.nullOr types.int;
-            default = null;
-            description = ''
-              The month on which this job will be run.
-            '';
-          };
-        };
-      }));
+      type = types.nullOr launchdTypes.StartCalendarInterval;
     };
 
     StandardInPath = mkOption {
@@ -669,22 +637,22 @@ with lib;
         resource limits based on what kind of job it is. If left unspecified, the system will apply light
         resource limits to the job, throttling its CPU usage and I/O bandwidth. The following are valid values:
 
-           Background
-           : Background jobs are generally processes that do work that was not directly requested by the user.
-             The resource limits applied to Background jobs are intended to prevent them from disrupting the
-             user experience.
+        Background
+        : Background jobs are generally processes that do work that was not directly requested by the user.
+          The resource limits applied to Background jobs are intended to prevent them from disrupting the
+          user experience.
 
-           Standard
-           :  Standard jobs are equivalent to no ProcessType being set.
+        Standard
+        : Standard jobs are equivalent to no ProcessType being set.
 
-           Adaptive
-           :  Adaptive jobs move between the Background and Interactive classifications based on activity over
-              XPC connections. See {manpage}`xpc_transaction_begin(3)` for details.
+        Adaptive
+        : Adaptive jobs move between the Background and Interactive classifications based on activity over
+          XPC connections. See `xpc_transaction_begin(3)` for details.
 
-           Interactive
-           :  Interactive jobs run with the same resource limitations as apps, that is to say, none. Interactive
-              jobs are critical to maintaining a responsive user experience, and this key should only be
-              used if an app's ability to be responsive depends on it, and cannot be made Adaptive.
+        Interactive
+        : Interactive jobs run with the same resource limitations as apps, that is to say, none. Interactive
+          jobs are critical to maintaining a responsive user experience, and this key should only be
+          used if an app's ability to be responsive depends on it, and cannot be made Adaptive.
       '';
     };
 
@@ -706,6 +674,15 @@ with lib;
       '';
     };
 
+    LowPriorityBackgroundIO = mkOption {
+      type = types.nullOr types.bool;
+      default = null;
+      description = ''
+        This optional key specifies whether the kernel should consider this daemon to be low priority when
+        doing file system I/O when the process is throttled with the Darwin-background classification.
+      '';
+    };
+
     LaunchOnlyOnce = mkOption {
       type = types.nullOr types.bool;
       default = null;
@@ -717,7 +694,7 @@ with lib;
 
     MachServices = mkOption {
       default = null;
-      example = { ResetAtClose = true; };
+      example = { "org.nixos.service" = { ResetAtClose = true; }; };
       description = ''
         This optional key is used to specify Mach services to be registered with the Mach bootstrap sub-system.
         Each key in this dictionary should be the name of service to be advertised. The value of the key must
@@ -726,31 +703,32 @@ with lib;
         Finally, for the job itself, the values will be replaced with Mach ports at the time of check-in with
         launchd.
       '';
-      type = types.nullOr (types.submodule {
-        options = {
-          ResetAtClose = mkOption {
-            type = types.nullOr types.bool;
-            default = null;
-            description = ''
-              If this boolean is false, the port is recycled, thus leaving clients to remain oblivious to the
-              demand nature of job. If the value is set to true, clients receive port death notifications when
-              the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up()
-              calls, so that clients can trust that after receiving a port death notification,
-              the new port will have already been recreated. Setting the value to true should be done with
-              care. Not all clients may be able to handle this behavior. The default value is false.
-            '';
-          };
+      type = types.nullOr (types.attrsOf (types.either types.bool
+        (types.submodule {
+          options = {
+            ResetAtClose = mkOption {
+              type = types.nullOr types.bool;
+              default = null;
+              description = ''
+                If this boolean is false, the port is recycled, thus leaving clients to remain oblivious to the
+                demand nature of job. If the value is set to true, clients receive port death notifications when
+                the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up()
+                calls, so that clients can trust that after receiving a port death notification,
+                the new port will have already been recreated. Setting the value to true should be done with
+                care. Not all clients may be able to handle this behavior. The default value is false.
+              '';
+            };
 
-          HideUntilCheckIn = mkOption {
-            type = types.nullOr types.bool;
-            default = null;
-            description = ''
-              Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has
-              checked in with launchd.
-            '';
+            HideUntilCheckIn = mkOption {
+              type = types.nullOr types.bool;
+              default = null;
+              description = ''
+                Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has
+                checked in with launchd.
+              '';
+            };
           };
-        };
-      });
+        })));
     };
 
     LaunchEvents = mkOption {
@@ -778,6 +756,26 @@ with lib;
       };
     };
 
+    ServiceIPC = mkOption {
+      type = types.nullOr types.bool;
+      default = null;
+      description = ''
+        This optional key specifies whether the job participates in advanced
+        communication with launchd. The default is false. This flag is
+        incompatible with the inetdCompatibility key.
+      '';
+    };
+
+    SessionCreate = mkOption {
+      type = types.nullOr types.bool;
+      default = null;
+      description = ''
+        This key specifies that the job should be spawned into a new security
+        audit session rather than the default session for the context is belongs
+        to. See auditon(2) for details.
+      '';
+    };
+
     Sockets = mkOption {
       default = null;
       description = ''
diff --git a/modules/launchd/types.nix b/modules/launchd/types.nix
new file mode 100644
index 000000000..fadf46cb5
--- /dev/null
+++ b/modules/launchd/types.nix
@@ -0,0 +1,121 @@
+# launchd option type from nix-darwin
+#
+# Original code from https://github.com/LnL7/nix-darwin/commit/861af0fc94df9454f4e92d6892f75588763164bb
+
+{ lib, ... }:
+
+let
+  inherit (lib) imap1 types mkOption showOption mergeDefinitions;
+  inherit (builtins) map filter length deepSeq throw toString concatLists;
+  inherit (lib.options) showDefs;
+  wildcardText = lib.literalMD "`*`";
+
+  /* *
+     A type of list which does not allow duplicate elements. The base/inner
+     list type to use (e.g. `types.listOf` or `types.nonEmptyListOf`) is passed
+     via argument `listType`, which must be the final type and not a function.
+
+     NOTE: The extra check for duplicates is quadratic and strict, so use this
+     type sparingly and only:
+
+       * when needed, and
+       * when the list is expected to be recursively short (e.g. < 10 elements)
+         and shallow (i.e. strict evaluation of the list won't take too long)
+
+     The implementation of this function is similar to that of
+     `types.nonEmptyListOf`.
+  */
+  types'.uniqueList = listType:
+    listType // {
+      description = "unique ${
+          types.optionDescriptionPhrase (class: class == "noun") listType
+        }";
+      substSubModules = m: types'.uniqueList (listType.substSubModules m);
+      # This has been taken from the implementation of `types.listOf`, but has
+      # been modified to throw on duplicates. This check cannot be done in the
+      # `check` fn as this check is deep/strict, and because `check` runs
+      # prior to merging.
+      merge = loc: defs:
+        let
+          # Each element of `dupes` is a list. When there are duplicates,
+          # later lists will be duplicates of earlier lists, so just throw on
+          # the first set of duplicates found so that we don't have duplicate
+          # error msgs.
+          checked = filter (li:
+            if length li > 1 then
+              throw ''
+                The option `${
+                  showOption loc
+                }' contains duplicate entries after merging:
+                ${showDefs li}''
+            else
+              false) dupes;
+          dupes =
+            map (def: filter (def': def'.value == def.value) merged) merged;
+          merged = filter (x: x ? value) (concatLists (imap1 (n: def:
+            imap1 (m: el:
+              let
+                inherit (def) file;
+                loc' = loc
+                  ++ [ "[definition ${toString n}-entry ${toString m}]" ];
+              in (mergeDefinitions loc' listType.nestedTypes.elemType [{
+                inherit file;
+                value = el;
+              }]).optionalValue // {
+                inherit loc' file;
+              }) def.value) defs));
+        in deepSeq checked (map (x: x.value) merged);
+    };
+in {
+  StartCalendarInterval = let
+    CalendarIntervalEntry = types.submodule {
+      options = {
+        Minute = mkOption {
+          type = types.nullOr (types.ints.between 0 59);
+          default = null;
+          defaultText = wildcardText;
+          description = ''
+            The minute on which this job will be run.
+          '';
+        };
+
+        Hour = mkOption {
+          type = types.nullOr (types.ints.between 0 23);
+          default = null;
+          defaultText = wildcardText;
+          description = ''
+            The hour on which this job will be run.
+          '';
+        };
+
+        Day = mkOption {
+          type = types.nullOr (types.ints.between 1 31);
+          default = null;
+          defaultText = wildcardText;
+          description = ''
+            The day on which this job will be run.
+          '';
+        };
+
+        Weekday = mkOption {
+          type = types.nullOr (types.ints.between 0 7);
+          default = null;
+          defaultText = wildcardText;
+          description = ''
+            The weekday on which this job will be run (0 and 7 are Sunday).
+          '';
+        };
+
+        Month = mkOption {
+          type = types.nullOr (types.ints.between 1 12);
+          default = null;
+          defaultText = wildcardText;
+          description = ''
+            The month on which this job will be run.
+          '';
+        };
+      };
+    };
+  in types.either CalendarIntervalEntry
+  (types'.uniqueList (types.nonEmptyListOf CalendarIntervalEntry));
+}

From f0b5e7e8a75abdea32bbff09ddd7b6eeb4b9b445 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Fri, 28 Feb 2025 21:36:56 -0500
Subject: [PATCH 465/546] xdg: add option 'xdg.cacheFile' (#6548)

Allow declarative configuration of files in configured xdg cache home.
---
 modules/misc/xdg.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index e68e16a8b..777ef4f85 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -24,6 +24,15 @@ in {
   options.xdg = {
     enable = mkEnableOption "management of XDG base directories";
 
+    cacheFile = mkOption {
+      type = fileType "xdg.cacheFile" "{var}`xdg.cacheHome`" cfg.cacheHome;
+      default = { };
+      description = ''
+        Attribute set of files to link into the user's XDG
+        cache home.
+      '';
+    };
+
     cacheHome = mkOption {
       type = types.path;
       defaultText = "~/.cache";
@@ -136,6 +145,8 @@ in {
 
     {
       home.file = mkMerge [
+        (mapAttrs' (name: file: nameValuePair "${cfg.cacheHome}/${name}" file)
+          cfg.cacheFile)
         (mapAttrs' (name: file: nameValuePair "${cfg.configHome}/${name}" file)
           cfg.configFile)
         (mapAttrs' (name: file: nameValuePair "${cfg.dataHome}/${name}" file)

From 4f05ef6a8adb5c2e9de83fee6d316ce168daf705 Mon Sep 17 00:00:00 2001
From: Zeremonienmeister Berber <git@zmberber.com>
Date: Sat, 1 Mar 2025 14:47:21 +0000
Subject: [PATCH 466/546] firefox: fix wrong syntax grammar for search setting
 isAppProvided (#6556)

The or operator is left associative, and since there is another
argument after the first term, the interpreter tries to apply whatever
the or-expression evaluates to.  If the first operand is unset, it
evaluates to removeAttrs, and everything is fine, but if it is set to
a boolean (which is what it should be set to), then it tries to apply
a boolean to arguments, and we get a type error.  Bracketing
explicitly with parentheses fixes this.

It presumably went unnoticed because not many people have tried
setting the option
`programs.firefox.profiles.<profile>.search.engines.<engine>.isAppProvided`.
---
 modules/programs/firefox/profiles/search.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/firefox/profiles/search.nix b/modules/programs/firefox/profiles/search.nix
index 99a226744..f0d5f5a30 100644
--- a/modules/programs/firefox/profiles/search.nix
+++ b/modules/programs/firefox/profiles/search.nix
@@ -48,8 +48,8 @@ let
     let
       requiredInput = {
         inherit name;
-        isAppProvided = input.isAppProvided or removeAttrs input [ "metaData" ]
-          == { };
+        isAppProvided =
+          input.isAppProvided or (removeAttrs input [ "metaData" ] == { });
         metaData = input.metaData or { };
       };
     in if requiredInput.isAppProvided then

From 30da4310935450ea38931abf775ffe1dfab15355 Mon Sep 17 00:00:00 2001
From: Alice Carroll <github@alice-carroll.pet>
Date: Sat, 1 Mar 2025 17:55:01 +0300
Subject: [PATCH 467/546] librewolf: support darwin (#6561)

Remove linux platform assertion.
---
 modules/programs/librewolf.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index 6b5e20894..86f640c81 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -57,11 +57,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "programs.librewolf" pkgs
-        lib.platforms.linux)
-    ];
-
     home.file.".librewolf/librewolf.overrides.cfg" =
       lib.mkIf (cfg.settings != { }) { text = mkOverridesFile cfg.settings; };
   };

From 17fd27a8ea2d38c52f66c7685e766113ca4b2982 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 28 Feb 2025 22:12:53 -0500
Subject: [PATCH 468/546] tests: use mkDefault with enable

We shouldn't need to mkForce every tests attempt to configure this
value.
---
 tests/default.nix                               | 2 +-
 tests/modules/misc/xdg/default-locations.nix    | 2 +-
 tests/modules/programs/k9s/empty-settings.nix   | 2 +-
 tests/modules/programs/k9s/example-settings.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index 0a96feb08..682921e97 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -92,7 +92,7 @@ let
 
       # Fix impurities. Without these some of the user's environment
       # will leak into the tests through `builtins.getEnv`.
-      xdg.enable = true;
+      xdg.enable = lib.mkDefault true;
       home = {
         username = "hm-user";
         homeDirectory = "/home/hm-user";
diff --git a/tests/modules/misc/xdg/default-locations.nix b/tests/modules/misc/xdg/default-locations.nix
index 10649fdf8..79f1f5321 100644
--- a/tests/modules/misc/xdg/default-locations.nix
+++ b/tests/modules/misc/xdg/default-locations.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }: {
   config = {
     # Test fallback behavior for stateVersion >= 20.09, which is pure.
-    xdg.enable = lib.mkForce false;
+    xdg.enable = false;
     home.stateVersion = "20.09";
 
     xdg.configFile.test.text = "config";
diff --git a/tests/modules/programs/k9s/empty-settings.nix b/tests/modules/programs/k9s/empty-settings.nix
index 6ff4276f7..05f859ee2 100644
--- a/tests/modules/programs/k9s/empty-settings.nix
+++ b/tests/modules/programs/k9s/empty-settings.nix
@@ -3,7 +3,7 @@
 {
   programs.k9s.enable = true;
 
-  xdg.enable = lib.mkIf pkgs.stdenv.isDarwin (lib.mkForce false);
+  xdg.enable = lib.mkIf pkgs.stdenv.isDarwin false;
 
   nmt.script = let
     configDir = if !pkgs.stdenv.isDarwin then
diff --git a/tests/modules/programs/k9s/example-settings.nix b/tests/modules/programs/k9s/example-settings.nix
index 0000d81da..65d624e93 100644
--- a/tests/modules/programs/k9s/example-settings.nix
+++ b/tests/modules/programs/k9s/example-settings.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  xdg.enable = lib.mkIf pkgs.stdenv.isDarwin (lib.mkForce false);
+  xdg.enable = lib.mkIf pkgs.stdenv.isDarwin false;
 
   programs.k9s = {
     enable = true;

From 47c694963e86b3e0f5d387506642a830871f331e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 28 Feb 2025 22:21:33 -0500
Subject: [PATCH 469/546] tests: move xdg to cross platform tests

Has cross platform functionality, gate linux only behind separate test
path.
---
 tests/default.nix                  | 3 ++-
 tests/modules/misc/xdg/default.nix | 7 -------
 tests/modules/misc/xdg/linux.nix   | 9 +++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 tests/modules/misc/xdg/linux.nix

diff --git a/tests/default.nix b/tests/default.nix
index 682921e97..5d5bec386 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -124,6 +124,7 @@ in import nmtSrc {
     ./modules/misc/manual
     ./modules/misc/nix
     ./modules/misc/specialisation
+    ./modules/misc/xdg
     ./modules/programs/aerc
     ./modules/programs/alacritty
     ./modules/programs/alot
@@ -269,6 +270,7 @@ in import nmtSrc {
     ./modules/services/yubikey-agent-darwin
     ./modules/targets-darwin
   ] ++ lib.optionals isLinux [
+    ./modules/misc/xdg/linux.nix
     ./modules/config/home-cursor
     ./modules/config/i18n
     ./modules/i18n/input-method
@@ -278,7 +280,6 @@ in import nmtSrc {
     ./modules/misc/numlock
     ./modules/misc/pam
     ./modules/misc/qt
-    ./modules/misc/xdg
     ./modules/misc/xsession
     ./modules/programs/abook
     ./modules/programs/autorandr
diff --git a/tests/modules/misc/xdg/default.nix b/tests/modules/misc/xdg/default.nix
index dde36f97e..13ebb7e10 100644
--- a/tests/modules/misc/xdg/default.nix
+++ b/tests/modules/misc/xdg/default.nix
@@ -1,13 +1,6 @@
 {
-  xdg-mime-apps-basics = ./mime-apps-basics.nix;
-  xdg-system-dirs = ./system-dirs.nix;
-  xdg-desktop-entries = ./desktop-entries.nix;
   xdg-file-gen = ./file-gen.nix;
   xdg-default-locations = ./default-locations.nix;
-  xdg-user-dirs-null = ./user-dirs-null.nix;
-  xdg-portal = ./portal.nix;
-  xdg-mime = ./mime.nix;
   xdg-mime-disabled = ./mime-disabled.nix;
-  xdg-mime-package = ./mime-packages.nix;
   xdg-autostart = ./autostart.nix;
 }
diff --git a/tests/modules/misc/xdg/linux.nix b/tests/modules/misc/xdg/linux.nix
new file mode 100644
index 000000000..b0a6bb043
--- /dev/null
+++ b/tests/modules/misc/xdg/linux.nix
@@ -0,0 +1,9 @@
+{
+  xdg-mime-apps-basics = ./mime-apps-basics.nix;
+  xdg-system-dirs = ./system-dirs.nix;
+  xdg-desktop-entries = ./desktop-entries.nix;
+  xdg-user-dirs-null = ./user-dirs-null.nix;
+  xdg-portal = ./portal.nix;
+  xdg-mime = ./mime.nix;
+  xdg-mime-package = ./mime-packages.nix;
+}

From 66505b851b160a6937053a73b9b9808659df8c56 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 28 Feb 2025 23:35:52 -0500
Subject: [PATCH 470/546] xdg: add missing stateHome default for legacy

Erroring in some tests because stateHome isn't set for the legacy state
version.
---
 modules/misc/xdg.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index 777ef4f85..b6f3905e2 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -133,6 +133,8 @@ in {
       xdg.configHome =
         mkDefault (getEnvFallback "XDG_CONFIG_HOME" defaultConfigHome);
       xdg.dataHome = mkDefault (getEnvFallback "XDG_DATA_HOME" defaultDataHome);
+      xdg.stateHome =
+        mkDefault (getEnvFallback "XDG_STATE_HOME" defaultStateHome);
     })
 
     # "Modern" deterministic setup.

From fcac3d6d88302a5e64f6cb8014ac785e08874c8d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 1 Mar 2025 00:14:41 -0500
Subject: [PATCH 471/546] xdg: use mkOptionDefault

These are supposed to be option defaults configured in the config
section.
---
 modules/misc/xdg.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index b6f3905e2..a554659e2 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -116,10 +116,10 @@ in {
         XDG_STATE_HOME = cfg.stateHome;
       };
     in mkIf cfg.enable {
-      xdg.cacheHome = mkDefault defaultCacheHome;
-      xdg.configHome = mkDefault defaultConfigHome;
-      xdg.dataHome = mkDefault defaultDataHome;
-      xdg.stateHome = mkDefault defaultStateHome;
+      xdg.cacheHome = mkOptionDefault defaultCacheHome;
+      xdg.configHome = mkOptionDefault defaultConfigHome;
+      xdg.dataHome = mkOptionDefault defaultDataHome;
+      xdg.stateHome = mkOptionDefault defaultStateHome;
 
       home.sessionVariables = variables;
       systemd.user.sessionVariables =
@@ -129,20 +129,21 @@ in {
     # Legacy non-deterministic setup.
     (mkIf (!cfg.enable && versionOlder config.home.stateVersion "20.09") {
       xdg.cacheHome =
-        mkDefault (getEnvFallback "XDG_CACHE_HOME" defaultCacheHome);
+        mkOptionDefault (getEnvFallback "XDG_CACHE_HOME" defaultCacheHome);
       xdg.configHome =
-        mkDefault (getEnvFallback "XDG_CONFIG_HOME" defaultConfigHome);
-      xdg.dataHome = mkDefault (getEnvFallback "XDG_DATA_HOME" defaultDataHome);
+        mkOptionDefault (getEnvFallback "XDG_CONFIG_HOME" defaultConfigHome);
+      xdg.dataHome =
+        mkOptionDefault (getEnvFallback "XDG_DATA_HOME" defaultDataHome);
       xdg.stateHome =
-        mkDefault (getEnvFallback "XDG_STATE_HOME" defaultStateHome);
+        mkOptionDefault (getEnvFallback "XDG_STATE_HOME" defaultStateHome);
     })
 
     # "Modern" deterministic setup.
     (mkIf (!cfg.enable && versionAtLeast config.home.stateVersion "20.09") {
-      xdg.cacheHome = mkDefault defaultCacheHome;
-      xdg.configHome = mkDefault defaultConfigHome;
-      xdg.dataHome = mkDefault defaultDataHome;
-      xdg.stateHome = mkDefault defaultStateHome;
+      xdg.cacheHome = mkOptionDefault defaultCacheHome;
+      xdg.configHome = mkOptionDefault defaultConfigHome;
+      xdg.dataHome = mkOptionDefault defaultDataHome;
+      xdg.stateHome = mkOptionDefault defaultStateHome;
     })
 
     {

From 70fbbf05a5594b0a72124ab211bff1d502c89e3f Mon Sep 17 00:00:00 2001
From: HPsaucii <126502193+HPsaucii@users.noreply.github.com>
Date: Tue, 4 Mar 2025 02:44:45 +0000
Subject: [PATCH 472/546] Firefox: Apply global extension force setting to
 declarative extensions (#6567)

Respect the parent force option for the extension settings storage.js
---
 modules/programs/firefox/mkFirefoxModule.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index ce690801e..1e6c87b11 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -911,7 +911,7 @@ in {
           (name: settingConfig: {
             "${profilesPath}/${profile.path}/browser-extension-data/${name}/storage.js" =
               {
-                force = settingConfig.force;
+                force = settingConfig.force || profile.extensions.force;
                 text = generators.toJSON { } settingConfig.settings;
               };
           }) profile.extensions.settings)))));

From 3f08cd8ef77dcd7586075a460a61c8432baf25a9 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Tue, 4 Mar 2025 22:14:44 +0100
Subject: [PATCH 473/546] ci: add labels for firefox (#6520)

---
 .github/labeler.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index cab1b5438..e41e05a14 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -25,6 +25,15 @@
     - modules/programs/neovim.nix
     - tests/modules/programs/neovim/**/*
 
+"program: firefox":
+  - changed-files:
+    - any-glob-to-any-file:
+      - modules/programs/firefox/**/*
+      - tests/modules/programs/firefox/**/*
+      - modules/misc/mozilla-messaging-hosts.nix
+      - modules/programs/floorp.nix
+      - modules/programs/librewolf.nix
+
 "shell":
 - changed-files:
   - any-glob-to-any-file:

From 6f71acf71bd6a8a6f3152769737a53af6da6ae63 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Wed, 5 Mar 2025 05:46:31 +0800
Subject: [PATCH 474/546] git: apply sendmailCmd instead of smtpServer (#6399)

In manpage of git-send-email --smtp-server,

    For backward compatibility, this option can also specify
    full pathname of a sendmail-like program instead; the program
    must support the -i option. This method does not support
    passing arguments or using plain command names. For those use
    cases, consider using --sendmail-cmd instead.
---
 modules/programs/git.nix                                | 2 +-
 tests/modules/programs/git/git-with-msmtp-expected.conf | 2 +-
 tests/modules/programs/git/git-with-msmtp.nix           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 76b1b9441..16fc6a0fa 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -489,7 +489,7 @@ in {
         genIdentity = name: account:
           with account;
           nameValuePair "sendemail.${name}" (if account.msmtp.enable then {
-            smtpServer = "${pkgs.msmtp}/bin/msmtp";
+            sendmailCmd = "${pkgs.msmtp}/bin/msmtp";
             envelopeSender = "auto";
             from = "${realName} <${address}>";
           } else
diff --git a/tests/modules/programs/git/git-with-msmtp-expected.conf b/tests/modules/programs/git/git-with-msmtp-expected.conf
index 3d636a8b0..9525d14b2 100644
--- a/tests/modules/programs/git/git-with-msmtp-expected.conf
+++ b/tests/modules/programs/git/git-with-msmtp-expected.conf
@@ -14,7 +14,7 @@
 [sendemail "hm@example.com"]
 	envelopeSender = "auto"
 	from = "H. M. Test <hm@example.com>"
-	smtpServer = "@msmtp@/bin/msmtp"
+	sendmailCmd = "@msmtp@/bin/msmtp"
 
 [user]
 	email = "hm@example.com"
diff --git a/tests/modules/programs/git/git-with-msmtp.nix b/tests/modules/programs/git/git-with-msmtp.nix
index 5b5416189..eec269c76 100644
--- a/tests/modules/programs/git/git-with-msmtp.nix
+++ b/tests/modules/programs/git/git-with-msmtp.nix
@@ -31,7 +31,7 @@
 
     assertGitConfig "sendemail.hm@example.com.from" "H. M. Test <hm@example.com>"
     assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. <hm@example.org>"
-    assertGitConfig "sendemail.hm@example.com.smtpServer" "${pkgs.msmtp}/bin/msmtp"
+    assertGitConfig "sendemail.hm@example.com.sendmailCmd" "${pkgs.msmtp}/bin/msmtp"
     assertGitConfig "sendemail.hm@example.com.envelopeSender" "auto"
   '';
 }

From b1b964ea9348aef08cab514fa88e9c99def6fd63 Mon Sep 17 00:00:00 2001
From: Karl H <34152449+KarlJoad@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:51:00 -0600
Subject: [PATCH 475/546] mbsync: support maildir paths containing spaces

HM would previously create several folders instead of just one with the space escaped.
Fixes https://github.com/nix-community/home-manager/issues/6569
---
 modules/programs/mbsync.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix
index 00371b7f1..f9dffd2f4 100644
--- a/modules/programs/mbsync.nix
+++ b/modules/programs/mbsync.nix
@@ -288,7 +288,8 @@ in {
         createMaildir =
           hm.dag.entryBetween [ "linkGeneration" ] [ "writeBoundary" ] ''
             run mkdir -m700 -p $VERBOSE_ARG ${
-              concatMapStringsSep " " (a: a.maildir.absPath) mbsyncAccounts
+              concatMapStringsSep " " (a: escapeShellArg a.maildir.absPath)
+              mbsyncAccounts
             }
           '';
       };

From def0dbbcea715d4514ca343ab4d6d7f3a1742da0 Mon Sep 17 00:00:00 2001
From: HyunggyuJang <murasakipurplez5@gmail.com>
Date: Wed, 5 Mar 2025 20:39:42 +0900
Subject: [PATCH 476/546] vscode: Support Cursor AI (#6417)

Co-authored-by: Hyunggyu Jang <hyunggyu.jang@42dot.ai>
---
 modules/programs/vscode.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index da8032a40..d90c5dd14 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -17,6 +17,7 @@ let
     "vscodium" = "VSCodium";
     "openvscode-server" = "OpenVSCode Server";
     "windsurf" = "Windsurf";
+    "cursor" = "Cursor";
   }.${vscodePname};
 
   extensionDir = {
@@ -25,6 +26,7 @@ let
     "vscodium" = "vscode-oss";
     "openvscode-server" = "openvscode-server";
     "windsurf" = "windsurf";
+    "cursor" = "cursor";
   }.${vscodePname};
 
   userDir = if pkgs.stdenv.hostPlatform.isDarwin then

From f6ac8a3414181cb7e97fb76973a14bd661e9492f Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Thu, 6 Mar 2025 00:17:22 +0100
Subject: [PATCH 477/546] 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/d74a2335ac9c133d6bbec9fc98d91a77f1604c1f?narHash=sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb%2BP%2BR4S8Jsw%3D' (2025-02-16)
  → 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246?narHash=sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM%3D' (2025-03-03)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1fd6ae2ee..c621a5289 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739736696,
-        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
+        "lastModified": 1741010256,
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
         "type": "github"
       },
       "original": {

From 486b066025dccd8af7fbe5dd2cc79e46b88c80da Mon Sep 17 00:00:00 2001
From: toborwinner <102221758+ToborWinner@users.noreply.github.com>
Date: Sun, 9 Feb 2025 21:32:30 +0100
Subject: [PATCH 478/546] specialisation: escape specialisation name

The specialisation name is included in home.extraBuilderCommands
without being properly escaped and checked. This commit fixes that.
---
 modules/misc/specialisation.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/misc/specialisation.nix b/modules/misc/specialisation.nix
index dc5f78e14..01e889426 100644
--- a/modules/misc/specialisation.nix
+++ b/modules/misc/specialisation.nix
@@ -71,10 +71,16 @@ with lib;
   };
 
   config = mkIf (config.specialisation != { }) {
+    assertions = map (n: {
+      assertion = !lib.hasInfix "/" n;
+      message =
+        "<name> in specialisation.<name> cannot contain a forward slash.";
+    }) (attrNames config.specialisation);
+
     home.extraBuilderCommands = let
       link = n: v:
         let pkg = v.configuration.home.activationPackage;
-        in "ln -s ${pkg} $out/specialisation/${n}";
+        in "ln -s ${pkg} $out/specialisation/${escapeShellArg n}";
     in ''
       mkdir $out/specialisation
       ${concatStringsSep "\n" (mapAttrsToList link config.specialisation)}

From 04c915bcf1a1eac3519372ff3185beef053fba7c Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 7 Mar 2025 06:11:10 -0500
Subject: [PATCH 479/546] firefox: Support paths for userChrome & userContent
 (#3856)

A path may be preferred for some uses, and allowing it avoids the user
needing to `builtins.readFile`, thus creating duplicates and making it
more difficult to determine the actual store path.
---
 modules/programs/firefox/mkFirefoxModule.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 1e6c87b11..733c8ec94 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -401,7 +401,7 @@ in {
           };
 
           userChrome = mkOption {
-            type = types.lines;
+            type = types.oneOf [ types.lines types.path ];
             default = "";
             description = "Custom ${appName} user chrome CSS.";
             example = ''
@@ -420,7 +420,7 @@ in {
           };
 
           userContent = mkOption {
-            type = types.lines;
+            type = types.oneOf [ types.lines types.path ];
             default = "";
             description = "Custom ${appName} user content CSS.";
             example = ''
@@ -868,10 +868,18 @@ in {
         "${profilesPath}/${profile.path}/.keep".text = "";
 
         "${profilesPath}/${profile.path}/chrome/userChrome.css" =
-          mkIf (profile.userChrome != "") { text = profile.userChrome; };
+          mkIf (profile.userChrome != "") (let
+            key =
+              if builtins.isString profile.userChrome then "text" else "source";
+          in { "${key}" = profile.userChrome; });
 
         "${profilesPath}/${profile.path}/chrome/userContent.css" =
-          mkIf (profile.userContent != "") { text = profile.userContent; };
+          mkIf (profile.userContent != "") (let
+            key = if builtins.isString profile.userContent then
+              "text"
+            else
+              "source";
+          in { "${key}" = profile.userContent; });
 
         "${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig
           != "" || profile.settings != { } || profile.extraConfig != ""

From 83f4629364b6e627ce25d7d246058e48ffa4b111 Mon Sep 17 00:00:00 2001
From: Raine Godmaire <its@raine.ing>
Date: Fri, 7 Mar 2025 14:29:16 -0500
Subject: [PATCH 480/546] granted: support fish shell (#6549)

Due to fish being a non-POSIX shell, granted provides a separate wrapper
to be used by fish.
---
 modules/programs/granted.nix                          |  9 +++++++++
 tests/modules/programs/granted/default.nix            |  6 ++++--
 .../programs/granted/fish-integration-disabled.nix    | 11 +++++++++++
 .../programs/granted/fish-integration-enabled.nix     | 10 ++++++++++
 ...tion-disabled.nix => zsh-integration-disabled.nix} |  0
 ...ration-enabled.nix => zsh-integration-enabled.nix} |  0
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 tests/modules/programs/granted/fish-integration-disabled.nix
 create mode 100644 tests/modules/programs/granted/fish-integration-enabled.nix
 rename tests/modules/programs/granted/{integration-disabled.nix => zsh-integration-disabled.nix} (100%)
 rename tests/modules/programs/granted/{integration-enabled.nix => zsh-integration-enabled.nix} (100%)

diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix
index d3a7e5e00..b20312069 100644
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@@ -15,6 +15,9 @@ in {
 
     enableZshIntegration =
       lib.hm.shell.mkZshIntegrationOption { inherit config; };
+
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
   };
 
   config = mkIf cfg.enable {
@@ -27,5 +30,11 @@ in {
         unset GRANTED_ALIAS_CONFIGURED
       }
     '';
+
+    programs.fish.functions.assume = mkIf cfg.enableFishIntegration ''
+      set -x GRANTED_ALIAS_CONFIGURED "true"
+      source ${package}/share/assume.fish
+      set -e GRANTED_ALIAS_CONFIGURED
+    '';
   };
 }
diff --git a/tests/modules/programs/granted/default.nix b/tests/modules/programs/granted/default.nix
index da462752b..a4e79212b 100644
--- a/tests/modules/programs/granted/default.nix
+++ b/tests/modules/programs/granted/default.nix
@@ -1,4 +1,6 @@
 {
-  granted-integration-enabled = ./integration-enabled.nix;
-  granted-integration-disabled = ./integration-disabled.nix;
+  granted-zsh-integration-enabled = ./zsh-integration-enabled.nix;
+  granted-zsh-integration-disabled = ./zsh-integration-disabled.nix;
+  granted-fish-integration-enabled = ./fish-integration-enabled.nix;
+  granted-fish-integration-disabled = ./fish-integration-disabled.nix;
 }
diff --git a/tests/modules/programs/granted/fish-integration-disabled.nix b/tests/modules/programs/granted/fish-integration-disabled.nix
new file mode 100644
index 000000000..9518c8934
--- /dev/null
+++ b/tests/modules/programs/granted/fish-integration-disabled.nix
@@ -0,0 +1,11 @@
+{
+  programs = {
+    granted.enable = true;
+    granted.enableFishIntegration = false;
+    fish.enable = true;
+  };
+
+  nmt.script = ''
+    assertPathNotExists home-files/.config/fish/functions/assume.fish
+  '';
+}
diff --git a/tests/modules/programs/granted/fish-integration-enabled.nix b/tests/modules/programs/granted/fish-integration-enabled.nix
new file mode 100644
index 000000000..80e30873a
--- /dev/null
+++ b/tests/modules/programs/granted/fish-integration-enabled.nix
@@ -0,0 +1,10 @@
+{
+  programs = {
+    granted.enable = true;
+    fish.enable = true;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/fish/functions/assume.fish
+  '';
+}
diff --git a/tests/modules/programs/granted/integration-disabled.nix b/tests/modules/programs/granted/zsh-integration-disabled.nix
similarity index 100%
rename from tests/modules/programs/granted/integration-disabled.nix
rename to tests/modules/programs/granted/zsh-integration-disabled.nix
diff --git a/tests/modules/programs/granted/integration-enabled.nix b/tests/modules/programs/granted/zsh-integration-enabled.nix
similarity index 100%
rename from tests/modules/programs/granted/integration-enabled.nix
rename to tests/modules/programs/granted/zsh-integration-enabled.nix

From 95711f926676018d279ba09fe7530d03b5d5b3e2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Mar 2025 14:16:46 -0600
Subject: [PATCH 481/546] treewide: remove with lib (#6512)

* nixos: remove with lib
* nix-darwin: remove with lib
* home-manager: remove with lib
* modules/accounts: remove with lib
* modules/config: remove with lib
* modules/i18n: remove with lib
* modules/misc: remove with lib
* modules: remove with lib
* modules/targets: remove with lib
* tests/modules/firefox: remove with lib
* tests/modules/services: remove with lib
---
 home-manager/default.nix                      |   8 +-
 modules/accounts/calendar.nix                 |  22 ++--
 modules/accounts/contacts.nix                 |   9 +-
 modules/accounts/email.nix                    |  28 ++---
 modules/config/home-cursor.nix                |  37 +++----
 modules/config/i18n.nix                       |  18 ++--
 modules/default.nix                           |  12 +--
 modules/files.nix                             |  66 ++++++------
 modules/home-environment.nix                  |  49 +++++----
 modules/i18n/input-method/default.nix         |  18 ++--
 modules/i18n/input-method/fcitx5.nix          |  20 ++--
 modules/i18n/input-method/hime.nix            |   4 +-
 modules/i18n/input-method/nabi.nix            |   4 +-
 modules/i18n/input-method/uim.nix             |   9 +-
 modules/manual.nix                            |  22 ++--
 modules/misc/dconf.nix                        | 101 +++++++++---------
 modules/misc/debug.nix                        |   8 +-
 modules/misc/editorconfig.nix                 |  14 ++-
 modules/misc/fontconfig.nix                   |  34 +++---
 modules/misc/gtk.nix                          |  49 ++++-----
 modules/misc/news.nix                         |  16 +--
 modules/misc/nixpkgs-disabled.nix             |  28 +++--
 modules/misc/nixpkgs.nix                      |  34 +++---
 modules/misc/numlock.nix                      |  11 +-
 modules/misc/pam.nix                          |  32 +++---
 modules/misc/specialisation.nix               |  23 ++--
 modules/misc/submodule-support.nix            |  18 ++--
 modules/misc/tmpfiles.nix                     |  16 ++-
 modules/misc/uninstall.nix                    |   2 +-
 modules/misc/version.nix                      |  24 +++--
 modules/misc/vte.nix                          |  18 ++--
 modules/misc/xdg-desktop-entries.nix          |  27 ++---
 modules/misc/xdg-mime-apps.nix                |  37 +++----
 modules/misc/xdg-mime.nix                     |  20 ++--
 modules/misc/xdg-system-dirs.nix              |  28 ++---
 modules/misc/xdg-user-dirs.nix                |  35 +++---
 modules/misc/xdg.nix                          |  27 ++---
 modules/misc/xfconf.nix                       |  24 ++---
 modules/modules.nix                           |  16 ++-
 modules/targets/darwin/fonts.nix              |   8 +-
 modules/targets/darwin/keybindings.nix        |  14 ++-
 modules/targets/darwin/search.nix             |  14 ++-
 .../targets/darwin/user-defaults/default.nix  |  47 ++++----
 .../darwin/user-defaults/opts-allhosts.nix    |   8 +-
 .../darwin/user-defaults/opts-currenthost.nix |   2 +-
 modules/targets/generic-linux.nix             |  24 ++---
 modules/xresources.nix                        |  27 +++--
 modules/xsession.nix                          |  34 +++---
 nix-darwin/default.nix                        |  10 +-
 nixos/common.nix                              |  19 ++--
 nixos/default.nix                             |  17 ++-
 .../firefox/profiles/bookmarks/default.nix    |   6 +-
 .../firefox/profiles/containers/default.nix   |   9 +-
 .../profiles/containers/duplicate-ids.nix     |   8 +-
 .../profiles/containers/id-out-of-range.nix   |   6 +-
 .../firefox/profiles/duplicate-ids.nix        |   8 +-
 .../firefox/profiles/extensions/default.nix   |   6 +-
 .../firefox/profiles/overwrite/default.nix    |   8 +-
 .../firefox/profiles/search/default.nix       |   6 +-
 .../firefox/profiles/settings/default.nix     |   8 +-
 .../programs/firefox/profiles/shared-path.nix |   4 +-
 .../services/screen-locker/moved-options.nix  |  23 ++--
 62 files changed, 618 insertions(+), 666 deletions(-)

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 50fda77e5..6b594c4fd 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -16,12 +16,12 @@ let
 in runCommand "home-manager" {
   preferLocalBuild = true;
   nativeBuildInputs = [ gettext ];
-  meta = with lib; {
+  meta = {
     mainProgram = "home-manager";
     description = "A user environment configurator";
-    maintainers = [ maintainers.rycee ];
-    platforms = platforms.unix;
-    license = licenses.mit;
+    maintainers = [ lib.maintainers.rycee ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
   };
 } ''
   install -v -D -m755  ${./home-manager} $out/bin/home-manager
diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix
index 86f1b38c5..d71d4dff3 100644
--- a/modules/accounts/calendar.nix
+++ b/modules/accounts/calendar.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ config, lib, ... }:
 let
+  inherit (lib) mkOption types;
 
   cfg = config.accounts.calendar;
 
@@ -70,7 +68,7 @@ let
     };
   };
 
-  calendarOpts = { name, config, ... }: {
+  calendarOpts = { name, ... }: {
     options = {
       name = mkOption {
         type = types.str;
@@ -125,7 +123,7 @@ in {
       type = types.str;
       example = ".calendar";
       apply = p:
-        if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
+        if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
       description = ''
         The base directory in which to save calendars. May be a
         relative path, in which case it is relative the home
@@ -144,15 +142,15 @@ in {
       description = "List of calendars.";
     };
   };
-  config = mkIf (cfg.accounts != { }) {
+  config = lib.mkIf (cfg.accounts != { }) {
     assertions = let
-      primaries =
-        catAttrs "name" (filter (a: a.primary) (attrValues cfg.accounts));
+      primaries = lib.catAttrs "name"
+        (lib.filter (a: a.primary) (lib.attrValues cfg.accounts));
     in [{
-      assertion = length primaries <= 1;
+      assertion = lib.length primaries <= 1;
       message = "Must have at most one primary calendar account but found "
-        + toString (length primaries) + ", namely "
-        + concatStringsSep ", " primaries;
+        + toString (lib.length primaries) + ", namely "
+        + lib.concatStringsSep ", " primaries;
     }];
   };
 }
diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix
index d00f5d071..b5d93f21f 100644
--- a/modules/accounts/contacts.nix
+++ b/modules/accounts/contacts.nix
@@ -1,8 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
+  inherit (lib) mkOption types;
 
   cfg = config.accounts.contact;
 
@@ -78,7 +77,7 @@ let
     };
   };
 
-  contactOpts = { name, config, ... }: {
+  contactOpts = { name, ... }: {
     options = {
       name = mkOption {
         type = types.str;
@@ -114,7 +113,7 @@ in {
     basePath = mkOption {
       type = types.str;
       apply = p:
-        if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
+        if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
       description = ''
         The base directory in which to save contacts. May be a
         relative path, in which case it is relative the home
diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix
index 437c8d558..2395f7e39 100644
--- a/modules/accounts/email.nix
+++ b/modules/accounts/email.nix
@@ -1,8 +1,7 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
+  inherit (lib) mkDefault mkIf mkOption types;
 
   cfg = config.accounts.email;
 
@@ -49,7 +48,7 @@ let
         default = ''
           --
         '';
-        example = literalExpression ''
+        example = lib.literalExpression ''
           ~*~*~*~*~*~*~*~*~*~*~*~
         '';
         description = ''
@@ -60,7 +59,7 @@ let
       command = mkOption {
         type = with types; nullOr path;
         default = null;
-        example = literalExpression ''
+        example = lib.literalExpression ''
           pkgs.writeScript "signature" "echo This is my signature"
         '';
         description = "A command that generates a signature.";
@@ -308,7 +307,7 @@ let
       passwordCommand = mkOption {
         type = types.nullOr (types.either types.str (types.listOf types.str));
         default = null;
-        apply = p: if isString p then splitString " " p else p;
+        apply = p: if lib.isString p then lib.splitString " " p else p;
         example = "secret-tool lookup email me@example.org";
         description = ''
           A command, which when run writes the account password on
@@ -407,10 +406,10 @@ let
       };
     };
 
-    config = mkMerge [
+    config = lib.mkMerge [
       {
         name = name;
-        maildir = mkOptionDefault { path = "${name}"; };
+        maildir = lib.mkOptionDefault { path = "${name}"; };
       }
 
       (mkIf (config.flavor == "yandex.com") {
@@ -526,7 +525,7 @@ in {
       default = "${config.home.homeDirectory}/Maildir";
       defaultText = "Maildir";
       apply = p:
-        if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
+        if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
       description = ''
         The base directory for account maildir directories. May be a
         relative path (e.g. the user setting this value as "MyMaildir"),
@@ -545,13 +544,14 @@ in {
   config = mkIf (cfg.accounts != { }) {
     assertions = [
       (let
-        primaries =
-          catAttrs "name" (filter (a: a.primary) (attrValues cfg.accounts));
+        primaries = lib.catAttrs "name"
+          (lib.filter (a: a.primary) (lib.attrValues cfg.accounts));
       in {
-        assertion = length primaries == 1;
+        assertion = lib.length primaries == 1;
         message = "Must have exactly one primary mail account but found "
-          + toString (length primaries) + optionalString (length primaries > 1)
-          (", namely " + concatStringsSep ", " primaries);
+          + toString (lib.length primaries)
+          + lib.optionalString (lib.length primaries > 1)
+          (", namely " + lib.concatStringsSep ", " primaries);
       })
     ];
   };
diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 8c28d0fd1..c7699bb37 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -1,8 +1,7 @@
 { config, options, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkDefault mkEnableOption mkOption types;
 
   cfg = config.home.pointerCursor;
 
@@ -10,7 +9,7 @@ let
     options = {
       package = mkOption {
         type = types.package;
-        example = literalExpression "pkgs.vanilla-dmz";
+        example = lib.literalExpression "pkgs.vanilla-dmz";
         description = "Package providing the cursor theme.";
       };
 
@@ -64,8 +63,9 @@ let
     };
   };
 
-  cursorPath = "${cfg.package}/share/icons/${escapeShellArg cfg.name}/cursors/${
-      escapeShellArg cfg.x11.defaultCursor
+  cursorPath =
+    "${cfg.package}/share/icons/${lib.escapeShellArg cfg.name}/cursors/${
+      lib.escapeShellArg cfg.x11.defaultCursor
     }";
 
   defaultIndexThemePackage = pkgs.writeTextFile {
@@ -83,25 +83,25 @@ let
   };
 
 in {
-  meta.maintainers = [ maintainers.league ];
+  meta.maintainers = [ lib.maintainers.league ];
 
   imports = [
-    (mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
+    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
       "home"
       "pointerCursor"
       "package"
     ])
-    (mkAliasOptionModule [ "xsession" "pointerCursor" "name" ] [
+    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "name" ] [
       "home"
       "pointerCursor"
       "name"
     ])
-    (mkAliasOptionModule [ "xsession" "pointerCursor" "size" ] [
+    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "size" ] [
       "home"
       "pointerCursor"
       "size"
     ])
-    (mkAliasOptionModule [ "xsession" "pointerCursor" "defaultCursor" ] [
+    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "defaultCursor" ] [
       "home"
       "pointerCursor"
       "x11"
@@ -109,8 +109,8 @@ in {
     ])
 
     ({ ... }: {
-      warnings = optional (any (x:
-        getAttrFromPath
+      warnings = lib.optional (lib.any (x:
+        lib.getAttrFromPath
         ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ])
         options) [ "package" "name" "size" "defaultCursor" ]) ''
           The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed
@@ -144,10 +144,11 @@ in {
     };
   };
 
-  config = mkIf (cfg != null) (mkMerge [
+  config = lib.mkIf (cfg != null) (lib.mkMerge [
     {
       assertions = [
-        (hm.assertions.assertPlatform "home.pointerCursor" pkgs platforms.linux)
+        (lib.hm.assertions.assertPlatform "home.pointerCursor" pkgs
+          lib.platforms.linux)
       ];
 
       home.packages = [ cfg.package defaultIndexThemePackage ];
@@ -178,7 +179,7 @@ in {
         "${cfg.package}/share/icons/${cfg.name}";
     }
 
-    (mkIf cfg.x11.enable {
+    (lib.mkIf cfg.x11.enable {
       xsession.profileExtra = ''
         ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${
           toString cfg.size
@@ -191,11 +192,11 @@ in {
       };
     })
 
-    (mkIf cfg.gtk.enable {
+    (lib.mkIf cfg.gtk.enable {
       gtk.cursorTheme = mkDefault { inherit (cfg) package name size; };
     })
 
-    (mkIf cfg.hyprcursor.enable {
+    (lib.mkIf cfg.hyprcursor.enable {
       home.sessionVariables = {
         HYPRCURSOR_THEME = cfg.name;
         HYPRCURSOR_SIZE =
@@ -203,7 +204,7 @@ in {
       };
     })
 
-    (mkIf cfg.sway.enable {
+    (lib.mkIf cfg.sway.enable {
       wayland.windowManager.sway = {
         config = {
           seat = {
diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 2efb53d62..409227236 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -17,8 +17,6 @@
 
 { lib, pkgs, config, ... }:
 
-with lib;
-
 let
   inherit (config.i18n) glibcLocales;
 
@@ -27,19 +25,19 @@ let
   archivePath = "${glibcLocales}/lib/locale/locale-archive";
 
   # lookup the version of glibcLocales and set the appropriate environment vars
-  localeVars = if versionAtLeast version "2.27" then {
+  localeVars = if lib.versionAtLeast version "2.27" then {
     LOCALE_ARCHIVE_2_27 = archivePath;
-  } else if versionAtLeast version "2.11" then {
+  } else if lib.versionAtLeast version "2.11" then {
     LOCALE_ARCHIVE_2_11 = archivePath;
   } else
     { };
 
 in {
-  meta.maintainers = with maintainers; [ midchildan ];
+  meta.maintainers = with lib.maintainers; [ midchildan ];
 
   options = {
-    i18n.glibcLocales = mkOption {
-      type = types.path;
+    i18n.glibcLocales = lib.mkOption {
+      type = lib.types.path;
       description = ''
         Customized `glibcLocales` package providing
         the `LOCALE_ARCHIVE_*` environment variable.
@@ -50,7 +48,7 @@ in {
         will be set to {var}`i18n.glibcLocales` from the
         system configuration.
       '';
-      example = literalExpression ''
+      example = lib.literalExpression ''
         pkgs.glibcLocales.override {
           allLocales = false;
           locales = [ "en_US.UTF-8/UTF-8" ];
@@ -58,11 +56,11 @@ in {
       '';
       # NB. See nixos/default.nix for NixOS default.
       default = pkgs.glibcLocales;
-      defaultText = literalExpression "pkgs.glibcLocales";
+      defaultText = lib.literalExpression "pkgs.glibcLocales";
     };
   };
 
-  config = mkIf pkgs.stdenv.hostPlatform.isLinux {
+  config = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
     # For shell sessions.
     home.sessionVariables = localeVars;
 
diff --git a/modules/default.nix b/modules/default.nix
index 6c54148ab..05d2a504c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,16 +5,14 @@
   # Extra arguments passed to specialArgs.
 , extraSpecialArgs ? { } }:
 
-with lib;
-
 let
 
   collectFailed = cfg:
-    map (x: x.message) (filter (x: !x.assertion) cfg.assertions);
+    map (x: x.message) (lib.filter (x: !x.assertion) cfg.assertions);
 
   showWarnings = res:
     let f = w: x: builtins.trace "warning: ${w}" x;
-    in fold f res res.config.warnings;
+    in lib.fold f res res.config.warnings;
 
   extendedLib = import ./lib/stdlib-extended.nix lib;
 
@@ -32,7 +30,7 @@ let
   moduleChecks = raw:
     showWarnings (let
       failed = collectFailed raw.config;
-      failedStr = concatStringsSep "\n" (map (x: "- ${x}") failed);
+      failedStr = lib.concatStringsSep "\n" (map (x: "- ${x}") failed);
     in if failed == [ ] then
       raw
     else
@@ -52,8 +50,8 @@ let
       activation-script = module.config.home.activationPackage;
 
       newsDisplay = rawModule.config.news.display;
-      newsEntries = sort (a: b: a.time > b.time)
-        (filter (a: a.condition) rawModule.config.news.entries);
+      newsEntries = lib.sort (a: b: a.time > b.time)
+        (lib.filter (a: a.condition) rawModule.config.news.entries);
 
       inherit (module._module.args) pkgs;
 
diff --git a/modules/files.nix b/modules/files.nix
index 8c047bbeb..d359979db 100644
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -1,10 +1,8 @@
 { pkgs, config, lib, ... }:
 
-with lib;
-
 let
 
-  cfg = filterAttrs (n: f: f.enable) config.home.file;
+  cfg = lib.filterAttrs (n: f: f.enable) config.home.file;
 
   homeDirectory = config.home.homeDirectory;
 
@@ -25,14 +23,14 @@ in
 
 {
   options = {
-    home.file = mkOption {
+    home.file = lib.mkOption {
       description = "Attribute set of files to link into the user home.";
       default = {};
       type = fileType "home.file" "{env}`HOME`" homeDirectory;
     };
 
-    home-files = mkOption {
-      type = types.package;
+    home-files = lib.mkOption {
+      type = lib.types.package;
       internal = true;
       description = "Package to contain all home files";
     };
@@ -42,11 +40,11 @@ in
     assertions = [(
       let
         dups =
-          attrNames
-            (filterAttrs (n: v: v > 1)
-            (foldAttrs (acc: v: acc + v) 0
-            (mapAttrsToList (n: v: { ${v.target} = 1; }) cfg)));
-        dupsStr = concatStringsSep ", " dups;
+          lib.attrNames
+            (lib.filterAttrs (n: v: v > 1)
+            (lib.foldAttrs (acc: v: acc + v) 0
+            (lib.mapAttrsToList (n: v: { ${v.target} = 1; }) cfg)));
+        dupsStr = lib.concatStringsSep ", " dups;
       in {
         assertion = dups == [];
         message = ''
@@ -64,22 +62,22 @@ in
     lib.file.mkOutOfStoreSymlink = path:
       let
         pathStr = toString path;
-        name = hm.strings.storeFileName (baseNameOf pathStr);
+        name = lib.hm.strings.storeFileName (baseNameOf pathStr);
       in
-        pkgs.runCommandLocal name {} ''ln -s ${escapeShellArg pathStr} $out'';
+        pkgs.runCommandLocal name {} ''ln -s ${lib.escapeShellArg pathStr} $out'';
 
     # This verifies that the links we are about to create will not
     # overwrite an existing file.
-    home.activation.checkLinkTargets = hm.dag.entryBefore ["writeBoundary"] (
+    home.activation.checkLinkTargets = lib.hm.dag.entryBefore ["writeBoundary"] (
       let
         # Paths that should be forcibly overwritten by Home Manager.
         # Caveat emptor!
         forcedPaths =
-          concatMapStringsSep " " (p: ''"$HOME"/${escapeShellArg p}'')
-            (mapAttrsToList (n: v: v.target)
-            (filterAttrs (n: v: v.force) cfg));
+          lib.concatMapStringsSep " " (p: ''"$HOME"/${lib.escapeShellArg p}'')
+            (lib.mapAttrsToList (n: v: v.target)
+            (lib.filterAttrs (n: v: v.force) cfg));
 
-        storeDir = escapeShellArg builtins.storeDir;
+        storeDir = lib.escapeShellArg builtins.storeDir;
 
         check = pkgs.substituteAll {
           src = ./files/check-link-targets.sh;
@@ -118,7 +116,7 @@ in
     # and a failure during the intermediate state FA ∩ FB will not
     # result in lost links because this set of links are in both the
     # source and target generation.
-    home.activation.linkGeneration = hm.dag.entryAfter ["writeBoundary"] (
+    home.activation.linkGeneration = lib.hm.dag.entryAfter ["writeBoundary"] (
       let
         link = pkgs.writeShellScript "link" ''
           ${config.lib.bash.initHomeManagerLib}
@@ -151,7 +149,7 @@ in
 
           # A symbolic link whose target path matches this pattern will be
           # considered part of a Home Manager generation.
-          homeFilePattern="$(readlink -e ${escapeShellArg builtins.storeDir})/*-home-manager-files/*"
+          homeFilePattern="$(readlink -e ${lib.escapeShellArg builtins.storeDir})/*-home-manager-files/*"
 
           newGenFiles="$1"
           shift 1
@@ -216,9 +214,9 @@ in
         ''
     );
 
-    home.activation.checkFilesChanged = hm.dag.entryBefore ["linkGeneration"] (
+    home.activation.checkFilesChanged = lib.hm.dag.entryBefore ["linkGeneration"] (
       let
-        homeDirArg = escapeShellArg homeDirectory;
+        homeDirArg = lib.escapeShellArg homeDirectory;
       in ''
         function _cmp() {
           if [[ -d $1 && -d $2 ]]; then
@@ -228,31 +226,31 @@ in
           fi
         }
         declare -A changedFiles
-      '' + concatMapStrings (v:
+      '' + lib.concatMapStrings (v:
         let
-          sourceArg = escapeShellArg (sourceStorePath v);
-          targetArg = escapeShellArg v.target;
+          sourceArg = lib.escapeShellArg (sourceStorePath v);
+          targetArg = lib.escapeShellArg v.target;
         in ''
           _cmp ${sourceArg} ${homeDirArg}/${targetArg} \
             && changedFiles[${targetArg}]=0 \
             || changedFiles[${targetArg}]=1
-        '') (filter (v: v.onChange != "") (attrValues cfg))
+        '') (lib.filter (v: v.onChange != "") (lib.attrValues cfg))
       + ''
         unset -f _cmp
       ''
     );
 
-    home.activation.onFilesChange = hm.dag.entryAfter ["linkGeneration"] (
-      concatMapStrings (v: ''
-        if (( ''${changedFiles[${escapeShellArg v.target}]} == 1 )); then
+    home.activation.onFilesChange = lib.hm.dag.entryAfter ["linkGeneration"] (
+      lib.concatMapStrings (v: ''
+        if (( ''${changedFiles[${lib.escapeShellArg v.target}]} == 1 )); then
           if [[ -v DRY_RUN || -v VERBOSE ]]; then
-            echo "Running onChange hook for" ${escapeShellArg v.target}
+            echo "Running onChange hook for" ${lib.escapeShellArg v.target}
           fi
           if [[ ! -v DRY_RUN ]]; then
             ${v.onChange}
           fi
         fi
-      '') (filter (v: v.onChange != "") (attrValues cfg))
+      '') (lib.filter (v: v.onChange != "") (lib.attrValues cfg))
     );
 
     # Symlink directories and files that have the right execute bit.
@@ -324,10 +322,10 @@ in
             fi
           fi
         }
-      '' + concatStrings (
-        mapAttrsToList (n: v: ''
+      '' + lib.concatStrings (
+        lib.mapAttrsToList (n: v: ''
           insertFile ${
-            escapeShellArgs [
+            lib.escapeShellArgs [
               (sourceStorePath v)
               v.target
               (if v.executable == null
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index fffb3b1cf..0e3bef900 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) literalExpression mkOption types;
 
   inherit (config.home) stateVersion;
 
@@ -114,7 +113,7 @@ let
       layout = mkOption {
         type = with types; nullOr str;
         default =
-          if versionAtLeast config.home.stateVersion "19.09"
+          if lib.versionAtLeast config.home.stateVersion "19.09"
           then null
           else "us";
         defaultText = literalExpression "null";
@@ -148,7 +147,7 @@ let
       variant = mkOption {
         type = with types; nullOr str;
         default =
-          if versionAtLeast config.home.stateVersion "19.09"
+          if lib.versionAtLeast config.home.stateVersion "19.09"
           then null
           else "";
         defaultText = literalExpression "null";
@@ -167,10 +166,10 @@ let
 in
 
 {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   imports = [
-    (mkRemovedOptionModule [ "home" "sessionVariableSetter" ] ''
+    (lib.mkRemovedOptionModule [ "home" "sessionVariableSetter" ] ''
       Session variables are now always set through the shell. This is
       done automatically if the shell configuration is managed by Home
       Manager. If not, then you must source the
@@ -223,7 +222,7 @@ in
 
     home.keyboard = mkOption {
       type = types.nullOr keyboardSubModule;
-      default = if versionAtLeast stateVersion "21.11" then null else { };
+      default = if lib.versionAtLeast stateVersion "21.11" then null else { };
       defaultText = literalExpression ''
         "{ }"  for state version < 21.11,
         "null" for state version ≥ 21.11
@@ -355,7 +354,7 @@ in
     home.emptyActivationPath = mkOption {
       internal = true;
       type = types.bool;
-      default = versionAtLeast stateVersion "22.11";
+      default = lib.versionAtLeast stateVersion "22.11";
       defaultText = literalExpression ''
         false   for state version < 22.11,
         true    for state version ≥ 22.11
@@ -370,7 +369,7 @@ in
     };
 
     home.activation = mkOption {
-      type = hm.types.dagOf types.str;
+      type = lib.hm.types.dagOf types.str;
       default = {};
       example = literalExpression ''
         {
@@ -475,7 +474,7 @@ in
       '';
     };
 
-    home.preferXdgDirectories = mkEnableOption "" // {
+    home.preferXdgDirectories = lib.mkEnableOption "" // {
       description = ''
         Whether to make programs use XDG directories whenever supported.
       '';
@@ -502,7 +501,7 @@ in
           config.home.enableNixpkgsReleaseCheck
           && hmRelease != nixpkgsRelease;
       in
-        optional releaseMismatch ''
+        lib.optional releaseMismatch ''
           You are using
 
             Home Manager version ${hmRelease} and
@@ -520,11 +519,11 @@ in
         '';
 
     home.username =
-      mkIf (versionOlder config.home.stateVersion "20.09")
-        (mkDefault (builtins.getEnv "USER"));
+      lib.mkIf (lib.versionOlder config.home.stateVersion "20.09")
+        (lib.mkDefault (builtins.getEnv "USER"));
     home.homeDirectory =
-      mkIf (versionOlder config.home.stateVersion "20.09")
-        (mkDefault (builtins.getEnv "HOME"));
+      lib.mkIf (lib.versionOlder config.home.stateVersion "20.09")
+        (lib.mkDefault (builtins.getEnv "HOME"));
 
     home.profileDirectory =
       if config.submoduleSupport.enable
@@ -540,7 +539,7 @@ in
 
     home.sessionVariables =
       let
-        maybeSet = n: v: optionalAttrs (v != null) { ${n} = v; };
+        maybeSet = n: v: lib.optionalAttrs (v != null) { ${n} = v; };
       in
         (maybeSet "LANG" cfg.language.base)
         //
@@ -577,7 +576,7 @@ in
 
         ${config.lib.shell.exportAll cfg.sessionVariables}
       '' + lib.optionalString (cfg.sessionPath != [ ]) ''
-        export PATH="$PATH''${PATH:+:}${concatStringsSep ":" cfg.sessionPath}"
+        export PATH="$PATH''${PATH:+:}${lib.concatStringsSep ":" cfg.sessionPath}"
       '' + cfg.sessionVariablesExtra;
     };
 
@@ -586,7 +585,7 @@ in
     # The entry acting as a boundary between the activation script's "check" and
     # the "write" phases. This is where we commit to attempting to actually
     # activate the configuration.
-    home.activation.writeBoundary = hm.dag.entryAnywhere ''
+    home.activation.writeBoundary = lib.hm.dag.entryAnywhere ''
       if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then
         _i "Creating new profile generation"
         run nix-env $VERBOSE_ARG --profile "$genProfilePath" --set "$newGenPath"
@@ -610,7 +609,7 @@ in
     # In case the user has moved from a user-install of Home Manager
     # to a submodule managed one we attempt to uninstall the
     # `home-manager-path` package if it is installed.
-    home.activation.installPackages = hm.dag.entryAfter ["writeBoundary"] (
+    home.activation.installPackages = lib.hm.dag.entryAfter ["writeBoundary"] (
       if config.submoduleSupport.externalPackageInstall
       then
         ''
@@ -676,10 +675,10 @@ in
             _iNote "Activating %s" "${res.name}"
             ${res.data}
           '';
-        sortedCommands = hm.dag.topoSort cfg.activation;
+        sortedCommands = lib.hm.dag.topoSort cfg.activation;
         activationCmds =
           if sortedCommands ? result then
-            concatStringsSep "\n" (map mkCmd sortedCommands.result)
+            lib.concatStringsSep "\n" (map mkCmd sortedCommands.result)
           else
             abort ("Dependency cycle in activation script: "
               + builtins.toJSON sortedCommands);
@@ -708,7 +707,7 @@ in
           else
             ":$(${pkgs.coreutils}/bin/dirname $(${pkgs.coreutils}/bin/readlink -m $(type -p nix-env)))"
         )
-        + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
+        + lib.optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
 
         activationScript = pkgs.writeShellScript "activation-script" ''
           set -eu
@@ -722,8 +721,8 @@ in
           ${builtins.readFile ./lib-bash/activation-init.sh}
 
           if [[ ! -v SKIP_SANITY_CHECKS ]]; then
-            checkUsername ${escapeShellArg config.home.username}
-            checkHomeDirectory ${escapeShellArg config.home.homeDirectory}
+            checkUsername ${lib.escapeShellArg config.home.username}
+            checkHomeDirectory ${lib.escapeShellArg config.home.homeDirectory}
           fi
 
           # Create a temporary GC root to prevent collection during activation.
@@ -732,7 +731,7 @@ in
 
           ${activationCmds}
 
-          ${optionalString (!config.uninstall) ''
+          ${lib.optionalString (!config.uninstall) ''
             # Create the "current generation" GC root.
             run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath"
 
diff --git a/modules/i18n/input-method/default.nix b/modules/i18n/input-method/default.nix
index 5e3a89b33..d6a1beb8e 100644
--- a/modules/i18n/input-method/default.nix
+++ b/modules/i18n/input-method/default.nix
@@ -1,6 +1,5 @@
 { config, pkgs, lib, ... }:
 
-with lib;
 let
 
   cfg = config.i18n.inputMethod;
@@ -26,9 +25,9 @@ in {
 
   options.i18n = {
     inputMethod = {
-      enabled = mkOption {
-        type = types.nullOr
-          (types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]);
+      enabled = lib.mkOption {
+        type = lib.types.nullOr
+          (lib.types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]);
         default = null;
         example = "fcitx5";
         description = ''
@@ -61,9 +60,9 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = lib.mkOption {
         internal = true;
-        type = types.nullOr types.path;
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The input method method package.
@@ -72,9 +71,10 @@ in {
     };
   };
 
-  config = mkIf (cfg.enabled != null) {
+  config = lib.mkIf (cfg.enabled != null) {
     assertions = [
-      (hm.assertions.assertPlatform "i18n.inputMethod" pkgs platforms.linux)
+      (lib.hm.assertions.assertPlatform "i18n.inputMethod" pkgs
+        lib.platforms.linux)
       {
         assertion = cfg.enabled != "fcitx";
         message = "fcitx has been removed, please use fcitx5 instead";
@@ -84,5 +84,5 @@ in {
     home.packages = [ cfg.package gtk2Cache gtk3Cache ];
   };
 
-  meta.maintainers = with lib; [ hm.maintainers.kranzes ];
+  meta.maintainers = [ lib.hm.maintainers.kranzes ];
 }
diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 4ec3b8fdd..78b6f909e 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let
   im = config.i18n.inputMethod;
   cfg = im.fcitx5;
@@ -9,25 +7,25 @@ let
 in {
   options = {
     i18n.inputMethod.fcitx5 = {
-      fcitx5-with-addons = mkOption {
-        type = types.package;
+      fcitx5-with-addons = lib.mkOption {
+        type = lib.types.package;
         default = pkgs.libsForQt5.fcitx5-with-addons;
-        example = literalExpression "pkgs.kdePackages.fcitx5-with-addons";
+        example = lib.literalExpression "pkgs.kdePackages.fcitx5-with-addons";
         description = ''
           The fcitx5 package to use.
         '';
       };
-      addons = mkOption {
-        type = with types; listOf package;
+      addons = lib.mkOption {
+        type = with lib.types; listOf package;
         default = [ ];
-        example = literalExpression "with pkgs; [ fcitx5-rime ]";
+        example = lib.literalExpression "with pkgs; [ fcitx5-rime ]";
         description = ''
           Enabled Fcitx5 addons.
         '';
       };
 
-      waylandFrontend = mkOption {
-        type = types.bool;
+      waylandFrontend = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Use the Wayland input method frontend.
@@ -37,7 +35,7 @@ in {
     };
   };
 
-  config = mkIf (im.enabled == "fcitx5") {
+  config = lib.mkIf (im.enabled == "fcitx5") {
     i18n.inputMethod.package = fcitx5Package;
 
     home.sessionVariables = {
diff --git a/modules/i18n/input-method/hime.nix b/modules/i18n/input-method/hime.nix
index 7b5700a9d..2d6f4d500 100644
--- a/modules/i18n/input-method/hime.nix
+++ b/modules/i18n/input-method/hime.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
-with lib; {
-  config = mkIf (config.i18n.inputMethod.enabled == "hime") {
+{
+  config = lib.mkIf (config.i18n.inputMethod.enabled == "hime") {
     i18n.inputMethod.package = pkgs.hime;
 
     home.sessionVariables = {
diff --git a/modules/i18n/input-method/nabi.nix b/modules/i18n/input-method/nabi.nix
index 01f9f7911..a060f4800 100644
--- a/modules/i18n/input-method/nabi.nix
+++ b/modules/i18n/input-method/nabi.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
-with lib; {
-  config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
+{
+  config = lib.mkIf (config.i18n.inputMethod.enabled == "nabi") {
     i18n.inputMethod.package = pkgs.nabi;
 
     home.sessionVariables = {
diff --git a/modules/i18n/input-method/uim.nix b/modules/i18n/input-method/uim.nix
index e7890352c..8dcfe3238 100644
--- a/modules/i18n/input-method/uim.nix
+++ b/modules/i18n/input-method/uim.nix
@@ -1,14 +1,13 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let cfg = config.i18n.inputMethod.uim;
 in {
   options = {
 
     i18n.inputMethod.uim = {
-      toolbar = mkOption {
-        type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
+      toolbar = lib.mkOption {
+        type =
+          lib.types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
         default = "gtk";
         example = "gtk-systray";
         description = ''
@@ -19,7 +18,7 @@ in {
 
   };
 
-  config = mkIf (config.i18n.inputMethod.enabled == "uim") {
+  config = lib.mkIf (config.i18n.inputMethod.enabled == "uim") {
     i18n.inputMethod.package = pkgs.uim;
 
     home.sessionVariables = {
diff --git a/modules/manual.nix b/modules/manual.nix
index 23963c3c0..02a5c2c77 100644
--- a/modules/manual.nix
+++ b/modules/manual.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.manual;
@@ -13,8 +11,8 @@ let
 
 in {
   options = {
-    manual.html.enable = mkOption {
-      type = types.bool;
+    manual.html.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether to install the HTML manual. This also installs the
@@ -23,8 +21,8 @@ in {
       '';
     };
 
-    manual.manpages.enable = mkOption {
-      type = types.bool;
+    manual.manpages.enable = lib.mkOption {
+      type = lib.types.bool;
       default = true;
       example = false;
       description = ''
@@ -37,8 +35,8 @@ in {
       '';
     };
 
-    manual.json.enable = mkOption {
-      type = types.bool;
+    manual.json.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       example = true;
       description = ''
@@ -52,10 +50,10 @@ in {
   };
 
   config = {
-    home.packages = mkMerge [
-      (mkIf cfg.html.enable [ docs.manual.html docs.manual.htmlOpenTool ])
-      (mkIf cfg.manpages.enable [ docs.manPages ])
-      (mkIf cfg.json.enable [ docs.options.json ])
+    home.packages = lib.mkMerge [
+      (lib.mkIf cfg.html.enable [ docs.manual.html docs.manual.htmlOpenTool ])
+      (lib.mkIf cfg.manpages.enable [ docs.manPages ])
+      (lib.mkIf cfg.json.enable [ docs.options.json ])
     ];
   };
 
diff --git a/modules/misc/dconf.nix b/modules/misc/dconf.nix
index b4863a139..39eceb42e 100644
--- a/modules/misc/dconf.nix
+++ b/modules/misc/dconf.nix
@@ -1,29 +1,29 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) types;
 
   cfg = config.dconf;
 
-  toDconfIni = generators.toINI { mkKeyValue = mkIniKeyValue; };
+  toDconfIni = lib.generators.toINI { mkKeyValue = mkIniKeyValue; };
 
-  mkIniKeyValue = key: value: "${key}=${toString (hm.gvariant.mkValue value)}";
+  mkIniKeyValue = key: value:
+    "${key}=${toString (lib.hm.gvariant.mkValue value)}";
 
   # The dconf keys managed by this configuration. We store this as part of the
   # generation state to be able to reset keys that become unmanaged during
   # switch.
   stateDconfKeys = pkgs.writeText "dconf-keys.json" (builtins.toJSON
-    (concatLists (mapAttrsToList
-      (dir: entries: mapAttrsToList (key: _: "/${dir}/${key}") entries)
+    (lib.concatLists (lib.mapAttrsToList
+      (dir: entries: lib.mapAttrsToList (key: _: "/${dir}/${key}") entries)
       cfg.settings)));
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options = {
     dconf = {
-      enable = mkOption {
+      enable = lib.mkOption {
         type = types.bool;
         # While technically dconf on darwin could work, our activation step
         # requires dbus, which only *lightly* supports Darwin in general, and
@@ -43,10 +43,10 @@ in {
         '';
       };
 
-      settings = mkOption {
-        type = with types; attrsOf (attrsOf hm.types.gvariant);
+      settings = lib.mkOption {
+        type = with types; attrsOf (attrsOf lib.hm.types.gvariant);
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             "org/gnome/calculator" = {
               button-mode = "programming";
@@ -75,7 +75,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable && cfg.settings != { }) {
+  config = lib.mkIf (cfg.enable && cfg.settings != { }) {
     # Make sure the dconf directory exists.
     xdg.configFile."dconf/.keep".source = builtins.toFile "keep" "";
 
@@ -84,53 +84,54 @@ in {
       ln -s ${stateDconfKeys} $out/state/${stateDconfKeys.name}
     '';
 
-    home.activation.dconfSettings = hm.dag.entryAfter [ "installPackages" ] (let
-      iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings);
+    home.activation.dconfSettings = lib.hm.dag.entryAfter [ "installPackages" ]
+      (let
+        iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings);
 
-      statePath = "state/${stateDconfKeys.name}";
+        statePath = "state/${stateDconfKeys.name}";
 
-      cleanup = pkgs.writeShellScript "dconf-cleanup" ''
-        set -euo pipefail
+        cleanup = pkgs.writeShellScript "dconf-cleanup" ''
+          set -euo pipefail
 
-        ${config.lib.bash.initHomeManagerLib}
+          ${config.lib.bash.initHomeManagerLib}
 
-        PATH=${makeBinPath [ pkgs.dconf pkgs.jq ]}''${PATH:+:}$PATH
+          PATH=${lib.makeBinPath [ pkgs.dconf pkgs.jq ]}''${PATH:+:}$PATH
 
-        oldState="$1"
-        newState="$2"
+          oldState="$1"
+          newState="$2"
 
-        # Can't do cleanup if we don't know the old state.
-        if [[ ! -f $oldState ]]; then
-          exit 0
+          # Can't do cleanup if we don't know the old state.
+          if [[ ! -f $oldState ]]; then
+            exit 0
+          fi
+
+          # Reset all keys that are present in the old generation but not the new
+          # one.
+          jq -r -n \
+              --slurpfile old "$oldState" \
+              --slurpfile new "$newState" \
+              '($old[] - $new[])[]' \
+            | while read -r key; do
+                verboseEcho "Resetting dconf key \"$key\""
+                run $DCONF_DBUS_RUN_SESSION dconf reset "$key"
+              done
+        '';
+      in ''
+        if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
+          export DCONF_DBUS_RUN_SESSION=""
+        else
+          export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon"
         fi
 
-        # Reset all keys that are present in the old generation but not the new
-        # one.
-        jq -r -n \
-            --slurpfile old "$oldState" \
-            --slurpfile new "$newState" \
-            '($old[] - $new[])[]' \
-          | while read -r key; do
-              verboseEcho "Resetting dconf key \"$key\""
-              run $DCONF_DBUS_RUN_SESSION dconf reset "$key"
-            done
-      '';
-    in ''
-      if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
-        export DCONF_DBUS_RUN_SESSION=""
-      else
-        export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon"
-      fi
+        if [[ -v oldGenPath ]]; then
+          ${cleanup} \
+            "$oldGenPath/${statePath}" \
+            "$newGenPath/${statePath}"
+        fi
 
-      if [[ -v oldGenPath ]]; then
-        ${cleanup} \
-          "$oldGenPath/${statePath}" \
-          "$newGenPath/${statePath}"
-      fi
+        run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile}
 
-      run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile}
-
-      unset DCONF_DBUS_RUN_SESSION
-    '');
+        unset DCONF_DBUS_RUN_SESSION
+      '');
   };
 }
diff --git a/modules/misc/debug.nix b/modules/misc/debug.nix
index fc0d8946a..3745232c3 100644
--- a/modules/misc/debug.nix
+++ b/modules/misc/debug.nix
@@ -1,10 +1,8 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 {
   options.home = {
-    enableDebugInfo = mkEnableOption "" // {
+    enableDebugInfo = lib.mkEnableOption "" // {
       description = ''
         Some Nix packages provide debug symbols for
         {command}`gdb` in the `debug` output.
@@ -15,7 +13,7 @@ with lib;
     };
   };
 
-  config = mkIf config.home.enableDebugInfo {
+  config = lib.mkIf config.home.enableDebugInfo {
     home.extraOutputsToInstall = [ "debug" ];
 
     home.sessionVariables = {
diff --git a/modules/misc/editorconfig.nix b/modules/misc/editorconfig.nix
index a6dfb570a..56505850a 100644
--- a/modules/misc/editorconfig.nix
+++ b/modules/misc/editorconfig.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.editorconfig;
@@ -9,12 +7,12 @@ let
   iniFormat = pkgs.formats.ini { };
 
 in {
-  meta.maintainers = with maintainers; [ loicreynier ];
+  meta.maintainers = with lib.maintainers; [ loicreynier ];
 
   options.editorconfig = {
-    enable = mkEnableOption "EditorConfig home configuration file";
+    enable = lib.mkEnableOption "EditorConfig home configuration file";
 
-    settings = mkOption {
+    settings = lib.mkOption {
       type = iniFormat.type;
       default = { };
       description = ''
@@ -23,7 +21,7 @@ in {
         it must not be added here.
         See <https://editorconfig.org> for documentation.
       '';
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           "*" = {
             charset = "utf-8";
@@ -39,9 +37,9 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable && cfg.settings != { }) {
+  config = lib.mkIf (cfg.enable && cfg.settings != { }) {
     home.file.".editorconfig".text = let
-      renderedSettings = generators.toINIWithGlobalSection { } {
+      renderedSettings = lib.generators.toINIWithGlobalSection { } {
         globalSection = { root = true; };
         sections = cfg.settings;
       };
diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix
index 9bc6ac47b..09906a440 100644
--- a/modules/misc/fontconfig.nix
+++ b/modules/misc/fontconfig.nix
@@ -4,8 +4,6 @@
 
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.fonts.fontconfig;
@@ -13,10 +11,10 @@ let
   profileDirectory = config.home.profileDirectory;
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   imports = [
-    (mkRenamedOptionModule [ "fonts" "fontconfig" "enableProfileFonts" ] [
+    (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "enableProfileFonts" ] [
       "fonts"
       "fontconfig"
       "enable"
@@ -25,8 +23,8 @@ in {
 
   options = {
     fonts.fontconfig = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable fontconfig configuration. This will, for
@@ -38,8 +36,8 @@ in {
       };
 
       defaultFonts = {
-        monospace = mkOption {
-          type = with types; listOf str;
+        monospace = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = ''
             Per-user default monospace font(s). Multiple fonts may be listed in
@@ -47,8 +45,8 @@ in {
           '';
         };
 
-        sansSerif = mkOption {
-          type = with types; listOf str;
+        sansSerif = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = ''
             Per-user default sans serif font(s). Multiple fonts may be listed
@@ -56,8 +54,8 @@ in {
           '';
         };
 
-        serif = mkOption {
-          type = with types; listOf str;
+        serif = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = ''
             Per-user default serif font(s). Multiple fonts may be listed in
@@ -65,8 +63,8 @@ in {
           '';
         };
 
-        emoji = mkOption {
-          type = with types; listOf str;
+        emoji = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = ''
             Per-user default emoji font(s). Multiple fonts may be listed in
@@ -83,7 +81,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [
       # Make sure that buildEnv creates a real directory path so that we avoid
       # trying to write to a read-only location.
@@ -105,7 +103,7 @@ in {
       </fontconfig>
       EOF
 
-        ${getBin pkgs.fontconfig}/bin/fc-cache -f
+        ${lib.getBin pkgs.fontconfig}/bin/fc-cache -f
         rm -f $out/lib/fontconfig/cache/CACHEDIR.TAG
         rmdir --ignore-fail-on-non-empty -p $out/lib/fontconfig/cache
 
@@ -147,12 +145,12 @@ in {
 
       "fontconfig/conf.d/52-hm-default-fonts.conf".text = let
         genDefault = fonts: name:
-          optionalString (fonts != [ ]) ''
+          lib.optionalString (fonts != [ ]) ''
             <alias binding="same">
               <family>${name}</family>
               <prefer>
               ${
-                concatStringsSep "" (map (font: ''
+                lib.concatStringsSep "" (map (font: ''
                   <family>${font}</family>
                 '') fonts)
               }
diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index 65ed1de2f..f6ee95a19 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -1,29 +1,30 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
+  inherit (lib) literalExpression mkOption optionalAttrs types;
 
   cfg = config.gtk;
   cfg2 = config.gtk.gtk2;
   cfg3 = config.gtk.gtk3;
   cfg4 = config.gtk.gtk4;
 
-  toGtk3Ini = generators.toINI {
+  toGtk3Ini = lib.generators.toINI {
     mkKeyValue = key: value:
-      let value' = if isBool value then boolToString value else toString value;
-      in "${escape [ "=" ] key}=${value'}";
+      let
+        value' =
+          if lib.isBool value then lib.boolToString value else toString value;
+      in "${lib.escape [ "=" ] key}=${value'}";
   };
 
   formatGtk2Option = n: v:
     let
-      v' = if isBool v then
-        boolToString value
-      else if isString v then
+      v' = if lib.isBool v then
+        lib.boolToString lib.value
+      else if lib.isString v then
         ''"${v}"''
       else
         toString v;
-    in "${escape [ "=" ] n} = ${v'}";
+    in "${lib.escape [ "=" ] n} = ${v'}";
 
   themeType = types.submodule {
     options = {
@@ -100,20 +101,20 @@ let
   };
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   imports = [
-    (mkRemovedOptionModule [ "gtk" "gtk3" "waylandSupport" ] ''
+    (lib.mkRemovedOptionModule [ "gtk" "gtk3" "waylandSupport" ] ''
       This options is not longer needed and can be removed.
     '')
   ];
 
   options = {
     gtk = {
-      enable = mkEnableOption "GTK 2/3 configuration";
+      enable = lib.mkEnableOption "GTK 2/3 configuration";
 
       font = mkOption {
-        type = types.nullOr hm.types.fontType;
+        type = types.nullOr lib.hm.types.fontType;
         default = null;
         description = ''
           The font to use in GTK+ 2/3 applications.
@@ -219,7 +220,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (let
+  config = lib.mkIf cfg.enable (let
     gtkIni = optionalAttrs (cfg.font != null) {
       gtk-font-name =
         let fontSize = if cfg.font.size != null then cfg.font.size else 10;
@@ -258,18 +259,17 @@ in {
       };
 
     optionalPackage = opt:
-      optional (opt != null && opt.package != null) opt.package;
+      lib.optional (opt != null && opt.package != null) opt.package;
   in {
-    home.packages = concatMap optionalPackage [
+    home.packages = lib.concatMap optionalPackage [
       cfg.font
       cfg.theme
       cfg.iconTheme
       cfg.cursorTheme
     ];
 
-    home.file.${cfg2.configLocation}.text =
-      concatMapStrings (l: l + "\n") (mapAttrsToList formatGtk2Option gtkIni)
-      + cfg2.extraConfig + "\n";
+    home.file.${cfg2.configLocation}.text = lib.concatMapStrings (l: l + "\n")
+      (lib.mapAttrsToList formatGtk2Option gtkIni) + cfg2.extraConfig + "\n";
 
     home.sessionVariables.GTK2_RC_FILES = cfg2.configLocation;
 
@@ -277,16 +277,17 @@ in {
       toGtk3Ini { Settings = gtkIni // cfg3.extraConfig; };
 
     xdg.configFile."gtk-3.0/gtk.css" =
-      mkIf (cfg3.extraCss != "") { text = cfg3.extraCss; };
+      lib.mkIf (cfg3.extraCss != "") { text = cfg3.extraCss; };
 
-    xdg.configFile."gtk-3.0/bookmarks" = mkIf (cfg3.bookmarks != [ ]) {
-      text = concatMapStrings (l: l + "\n") cfg3.bookmarks;
+    xdg.configFile."gtk-3.0/bookmarks" = lib.mkIf (cfg3.bookmarks != [ ]) {
+      text = lib.concatMapStrings (l: l + "\n") cfg3.bookmarks;
     };
 
     xdg.configFile."gtk-4.0/settings.ini".text =
       toGtk3Ini { Settings = gtkIni // cfg4.extraConfig; };
 
-    xdg.configFile."gtk-4.0/gtk.css" = mkIf (gtk4Css != "") { text = gtk4Css; };
+    xdg.configFile."gtk-4.0/gtk.css" =
+      lib.mkIf (gtk4Css != "") { text = gtk4Css; };
 
     dconf.settings."org/gnome/desktop/interface" = dconfIni;
   });
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 37d3c65d8..995aeba1b 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1,6 +1,8 @@
-{ config, lib, options, pkgs, ... }:
-with lib;
+{ config, lib, pkgs, ... }:
+
 let
+  inherit (lib) mkOption types;
+
   cfg = config.news;
 
   hostPlatform = pkgs.stdenv.hostPlatform;
@@ -39,10 +41,12 @@ let
       };
     };
 
-    config = { id = mkDefault (builtins.hashString "sha256" config.message); };
+    config = {
+      id = lib.mkDefault (builtins.hashString "sha256" config.message);
+    };
   });
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options = {
     news = {
@@ -1891,8 +1895,8 @@ in {
       {
         time = "2024-12-08T17:22:13+00:00";
         condition = let
-          usingMbsync = any (a: a.mbsync.enable)
-            (attrValues config.accounts.email.accounts);
+          usingMbsync = lib.any (a: a.mbsync.enable)
+            (lib.attrValues config.accounts.email.accounts);
         in usingMbsync;
         message = ''
           isync/mbsync 1.5.0 has changed several things.
diff --git a/modules/misc/nixpkgs-disabled.nix b/modules/misc/nixpkgs-disabled.nix
index 70574521a..b7e143d97 100644
--- a/modules/misc/nixpkgs-disabled.nix
+++ b/modules/misc/nixpkgs-disabled.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.nixpkgs;
@@ -17,28 +15,28 @@ let
     let
       lhs = optCall lhs_ { inherit pkgs; };
       rhs = optCall rhs_ { inherit pkgs; };
-    in lhs // rhs // optionalAttrs (lhs ? packageOverrides) {
+    in lhs // rhs // lib.optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:
         optCall lhs.packageOverrides pkgs
-        // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs;
-    } // optionalAttrs (lhs ? perlPackageOverrides) {
+        // optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs;
+    } // lib.optionalAttrs (lhs ? perlPackageOverrides) {
       perlPackageOverrides = pkgs:
         optCall lhs.perlPackageOverrides pkgs
-        // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs;
+        // optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs;
     };
 
   # Copied from nixpkgs.nix.
-  configType = mkOptionType {
+  configType = lib.mkOptionType {
     name = "nixpkgs-config";
     description = "nixpkgs config";
     check = x:
       let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
       in traceXIfNot isConfig;
-    merge = args: fold (def: mergeConfig def.value) { };
+    merge = args: lib.fold (def: mergeConfig def.value) { };
   };
 
   # Copied from nixpkgs.nix.
-  overlayType = mkOptionType {
+  overlayType = lib.mkOptionType {
     name = "nixpkgs-overlay";
     description = "nixpkgs overlay";
     check = builtins.isFunction;
@@ -46,18 +44,18 @@ let
   };
 
 in {
-  meta.maintainers = with maintainers; [ thiagokokada ];
+  meta.maintainers = with lib.maintainers; [ thiagokokada ];
 
   options.nixpkgs = {
-    config = mkOption {
+    config = lib.mkOption {
       default = null;
-      type = types.nullOr configType;
+      type = lib.types.nullOr configType;
       visible = false;
     };
 
-    overlays = mkOption {
+    overlays = lib.mkOption {
       default = null;
-      type = types.nullOr (types.listOf overlayType);
+      type = lib.types.nullOr (lib.types.listOf overlayType);
       visible = false;
     };
   };
@@ -73,7 +71,7 @@ in {
       }
     ];
 
-    warnings = optional ((cfg.config != null) || (cfg.overlays != null)) ''
+    warnings = lib.optional ((cfg.config != null) || (cfg.overlays != null)) ''
       You have set either `nixpkgs.config` or `nixpkgs.overlays` while using `home-manager.useGlobalPkgs`.
       This will soon not be possible. Please remove all `nixpkgs` options when using `home-manager.useGlobalPkgs`.
     '';
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 971491af4..b21e97db9 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -2,8 +2,6 @@
 
 { config, lib, pkgs, pkgsPath, ... }:
 
-with lib;
-
 let
 
   isConfig = x: builtins.isAttrs x || builtins.isFunction x;
@@ -14,40 +12,40 @@ let
     let
       lhs = optCall lhs_ { inherit pkgs; };
       rhs = optCall rhs_ { inherit pkgs; };
-    in lhs // rhs // optionalAttrs (lhs ? packageOverrides) {
+    in lhs // rhs // lib.optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:
         optCall lhs.packageOverrides pkgs
-        // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs;
-    } // optionalAttrs (lhs ? perlPackageOverrides) {
+        // optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs;
+    } // lib.optionalAttrs (lhs ? perlPackageOverrides) {
       perlPackageOverrides = pkgs:
         optCall lhs.perlPackageOverrides pkgs
-        // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs;
+        // optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs;
     };
 
-  configType = mkOptionType {
+  configType = lib.mkOptionType {
     name = "nixpkgs-config";
     description = "nixpkgs config";
     check = x:
       let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
       in traceXIfNot isConfig;
-    merge = args: fold (def: mergeConfig def.value) { };
+    merge = args: lib.fold (def: mergeConfig def.value) { };
   };
 
-  overlayType = mkOptionType {
+  overlayType = lib.mkOptionType {
     name = "nixpkgs-overlay";
     description = "nixpkgs overlay";
     check = lib.isFunction;
     merge = lib.mergeOneOption;
   };
 
-  _pkgs = import pkgsPath (filterAttrs (n: v: v != null) config.nixpkgs);
+  _pkgs = import pkgsPath (lib.filterAttrs (n: v: v != null) config.nixpkgs);
 
 in {
   options.nixpkgs = {
-    config = mkOption {
+    config = lib.mkOption {
       default = null;
       example = { allowBroken = true; };
-      type = types.nullOr configType;
+      type = lib.types.nullOr configType;
       description = ''
         The configuration of the Nix Packages collection. (For
         details, see the Nixpkgs documentation.) It allows you to set
@@ -72,9 +70,9 @@ in {
       '';
     };
 
-    overlays = mkOption {
+    overlays = lib.mkOption {
       default = null;
-      example = literalExpression ''
+      example = lib.literalExpression ''
         [
           (final: prev: {
             openssh = prev.openssh.override {
@@ -85,7 +83,7 @@ in {
           })
         ]
       '';
-      type = types.nullOr (types.listOf overlayType);
+      type = lib.types.nullOr (lib.types.listOf overlayType);
       description = ''
         List of overlays to use with the Nix Packages collection. (For
         details, see the Nixpkgs documentation.) It allows you to
@@ -105,8 +103,8 @@ in {
       '';
     };
 
-    system = mkOption {
-      type = types.str;
+    system = lib.mkOption {
+      type = lib.types.str;
       example = "i686-linux";
       internal = true;
       description = ''
@@ -123,7 +121,7 @@ in {
     _module.args = {
       # We use a no-op override to make sure that the option can be merged without evaluating
       # `_pkgs`, see https://github.com/nix-community/home-manager/pull/993
-      pkgs = mkOverride modules.defaultOverridePriority _pkgs;
+      pkgs = lib.mkOverride lib.modules.defaultOverridePriority _pkgs;
       pkgs_i686 =
         if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then
           _pkgs.pkgsi686Linux
diff --git a/modules/misc/numlock.nix b/modules/misc/numlock.nix
index 88032417f..903ab449a 100644
--- a/modules/misc/numlock.nix
+++ b/modules/misc/numlock.nix
@@ -1,19 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.xsession.numlock;
 
 in {
-  meta.maintainers = [ maintainers.evanjs ];
+  meta.maintainers = [ lib.maintainers.evanjs ];
 
-  options = { xsession.numlock.enable = mkEnableOption "Num Lock"; };
+  options = { xsession.numlock.enable = lib.mkEnableOption "Num Lock"; };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
-      (hm.assertions.assertPlatform "xsession.numlock" pkgs platforms.linux)
+      (lib.hm.assertions.assertPlatform "xsession.numlock" pkgs
+        lib.platforms.linux)
     ];
 
     systemd.user.services.numlockx = {
diff --git a/modules/misc/pam.nix b/modules/misc/pam.nix
index 22a5daf0d..bf0af355f 100644
--- a/modules/misc/pam.nix
+++ b/modules/misc/pam.nix
@@ -1,18 +1,16 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
 
   cfg = config.pam;
 
 in {
-  meta.maintainers = with maintainers; [ rycee veehaitch ];
+  meta.maintainers = with lib.maintainers; [ rycee veehaitch ];
 
   options = {
-    pam.sessionVariables = mkOption {
+    pam.sessionVariables = lib.mkOption {
       default = { };
-      type = types.attrs;
+      type = lib.types.attrs;
       example = { EDITOR = "vim"; };
       description = ''
         Environment variables that will be set for the PAM session.
@@ -25,10 +23,10 @@ in {
     };
 
     pam.yubico.authorizedYubiKeys = {
-      ids = mkOption {
-        type = with types;
+      ids = lib.mkOption {
+        type = with lib.types;
           let
-            yubiKeyId = addCheck str (s: stringLength s == 12) // {
+            yubiKeyId = addCheck str (s: lib.stringLength s == 12) // {
               name = "yubiKeyId";
               description = "string of length 12";
             };
@@ -41,8 +39,8 @@ in {
         '';
       };
 
-      path = mkOption {
-        type = types.str;
+      path = lib.mkOption {
+        type = lib.types.str;
         default = ".yubico/authorized_yubikeys";
         description = ''
           File path to write the authorized YubiKeys,
@@ -52,16 +50,16 @@ in {
     };
   };
 
-  config = mkMerge [
-    (mkIf (cfg.sessionVariables != { }) {
-      home.file.".pam_environment".text = concatStringsSep "\n"
-        (mapAttrsToList (n: v: ''${n} OVERRIDE="${toString v}"'')
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.sessionVariables != { }) {
+      home.file.".pam_environment".text = lib.concatStringsSep "\n"
+        (lib.mapAttrsToList (n: v: ''${n} OVERRIDE="${toString v}"'')
           cfg.sessionVariables) + "\n";
     })
 
-    (mkIf (cfg.yubico.authorizedYubiKeys.ids != [ ]) {
+    (lib.mkIf (cfg.yubico.authorizedYubiKeys.ids != [ ]) {
       home.file.${cfg.yubico.authorizedYubiKeys.path}.text =
-        concatStringsSep ":"
+        lib.concatStringsSep ":"
         ([ config.home.username ] ++ cfg.yubico.authorizedYubiKeys.ids);
     })
   ];
diff --git a/modules/misc/specialisation.nix b/modules/misc/specialisation.nix
index 01e889426..95adc998f 100644
--- a/modules/misc/specialisation.nix
+++ b/modules/misc/specialisation.nix
@@ -1,27 +1,25 @@
 { config, name, extendModules, lib, ... }:
 
-with lib;
-
 {
   imports =
-    [ (mkRenamedOptionModule [ "specialization" ] [ "specialisation" ]) ];
+    [ (lib.mkRenamedOptionModule [ "specialization" ] [ "specialisation" ]) ];
 
-  options.specialisation = mkOption {
-    type = types.attrsOf (types.submodule {
+  options.specialisation = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.submodule {
       options = {
-        configuration = mkOption {
+        configuration = lib.mkOption {
           type = let
             extended = extendModules {
               modules = [{
                 # Prevent infinite recursion
-                specialisation = mkOverride 0 { };
+                specialisation = lib.mkOverride 0 { };
 
                 # If used inside the NixOS/nix-darwin module, we get conflicting definitions
                 # of `name` inside the specialisation: one is the user name coming from the
                 # NixOS module definition and the other is `configuration`, the name of this
                 # option. Thus we need to explicitly wire the former into the module arguments.
                 # See discussion at https://github.com/nix-community/home-manager/issues/3716
-                _module.args.name = mkForce name;
+                _module.args.name = lib.mkForce name;
               }];
             };
           in extended.type;
@@ -70,20 +68,21 @@ with lib;
     '';
   };
 
-  config = mkIf (config.specialisation != { }) {
+  config = lib.mkIf (config.specialisation != { }) {
     assertions = map (n: {
       assertion = !lib.hasInfix "/" n;
       message =
         "<name> in specialisation.<name> cannot contain a forward slash.";
-    }) (attrNames config.specialisation);
+    }) (lib.attrNames config.specialisation);
 
     home.extraBuilderCommands = let
       link = n: v:
         let pkg = v.configuration.home.activationPackage;
-        in "ln -s ${pkg} $out/specialisation/${escapeShellArg n}";
+        in "ln -s ${pkg} $out/specialisation/${lib.escapeShellArg n}";
     in ''
       mkdir $out/specialisation
-      ${concatStringsSep "\n" (mapAttrsToList link config.specialisation)}
+      ${lib.concatStringsSep "\n"
+      (lib.mapAttrsToList link config.specialisation)}
     '';
   };
 }
diff --git a/modules/misc/submodule-support.nix b/modules/misc/submodule-support.nix
index 82fbc0a30..b42bc4870 100644
--- a/modules/misc/submodule-support.nix
+++ b/modules/misc/submodule-support.nix
@@ -1,13 +1,11 @@
 { lib, ... }:
 
-with lib;
-
 {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options.submoduleSupport = {
-    enable = mkOption {
-      type = types.bool;
+    enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       internal = true;
       description = ''
@@ -16,8 +14,8 @@ with lib;
       '';
     };
 
-    externalPackageInstall = mkOption {
-      type = types.bool;
+    externalPackageInstall = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       internal = true;
       description = ''
@@ -39,9 +37,9 @@ with lib;
     # module system can not inform modules about their non-existence; see
     # https://github.com/NixOS/nixpkgs/issues/311709#issuecomment-2110861842
     _module.args = {
-      osConfig = mkDefault null;
-      nixosConfig = mkDefault null;
-      darwinConfig = mkDefault null;
+      osConfig = lib.mkDefault null;
+      nixosConfig = lib.mkDefault null;
+      darwinConfig = lib.mkDefault null;
     };
   };
 }
diff --git a/modules/misc/tmpfiles.nix b/modules/misc/tmpfiles.nix
index 9fa072b89..f9debf543 100644
--- a/modules/misc/tmpfiles.nix
+++ b/modules/misc/tmpfiles.nix
@@ -1,16 +1,14 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.systemd.user.tmpfiles;
 
 in {
-  meta.maintainers = [ maintainers.dawidsowa ];
+  meta.maintainers = [ lib.maintainers.dawidsowa ];
 
-  options.systemd.user.tmpfiles.rules = mkOption {
-    type = types.listOf types.str;
+  options.systemd.user.tmpfiles.rules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
     default = [ ];
     example = [ "L /home/user/Documents - - - - /mnt/data/Documents" ];
     description = ''
@@ -21,10 +19,10 @@ in {
     '';
   };
 
-  config = mkIf (cfg.rules != [ ]) {
+  config = lib.mkIf (cfg.rules != [ ]) {
     assertions = [
-      (hm.assertions.assertPlatform "systemd.user.tmpfiles" pkgs
-        platforms.linux)
+      (lib.hm.assertions.assertPlatform "systemd.user.tmpfiles" pkgs
+        lib.platforms.linux)
     ];
 
     xdg.configFile = {
@@ -32,7 +30,7 @@ in {
         text = ''
           # This file is created automatically and should not be modified.
           # Please change the option ‘systemd.user.tmpfiles.rules’ instead.
-          ${concatStringsSep "\n" cfg.rules}
+          ${lib.concatStringsSep "\n" cfg.rules}
         '';
         onChange = "${pkgs.systemd}/bin/systemd-tmpfiles --user --create";
       };
diff --git a/modules/misc/uninstall.nix b/modules/misc/uninstall.nix
index 3086d21b8..4fe26326e 100644
--- a/modules/misc/uninstall.nix
+++ b/modules/misc/uninstall.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
 
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 176901f3e..3c7317360 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -1,12 +1,13 @@
 { config, lib, ... }:
 
-with lib;
+let
+  inherit (lib) types;
 
-let releaseInfo = lib.importJSON ../../release.json;
+  releaseInfo = lib.importJSON ../../release.json;
 
 in {
   options = {
-    home.stateVersion = mkOption {
+    home.stateVersion = lib.mkOption {
       type = types.enum [
         "18.09"
         "19.03"
@@ -39,20 +40,20 @@ in {
     };
 
     home.version = {
-      full = mkOption {
+      full = lib.mkOption {
         internal = true;
         readOnly = true;
         type = types.str;
         default = let
           inherit (config.home.version) release revision;
-          suffix =
-            optionalString (revision != null) "+${substring 0 8 revision}";
+          suffix = lib.optionalString (revision != null)
+            "+${lib.substring 0 8 revision}";
         in "${release}${suffix}";
         example = "22.11+213a0629";
         description = "The full Home Manager version.";
       };
 
-      release = mkOption {
+      release = lib.mkOption {
         internal = true;
         readOnly = true;
         type = types.str;
@@ -61,7 +62,7 @@ in {
         description = "The Home Manager release.";
       };
 
-      isReleaseBranch = mkOption {
+      isReleaseBranch = lib.mkOption {
         internal = true;
         readOnly = true;
         type = types.bool;
@@ -72,11 +73,14 @@ in {
         '';
       };
 
-      revision = mkOption {
+      revision = lib.mkOption {
         internal = true;
         type = types.nullOr types.str;
         default = let gitRepo = "${toString ./../..}/.git";
-        in if pathIsGitRepo gitRepo then commitIdFromGitRepo gitRepo else null;
+        in if lib.pathIsGitRepo gitRepo then
+          lib.commitIdFromGitRepo gitRepo
+        else
+          null;
         description = ''
           The Git revision from which this Home Manager configuration was built.
         '';
diff --git a/modules/misc/vte.nix b/modules/misc/vte.nix
index fbe38c016..c734fd448 100644
--- a/modules/misc/vte.nix
+++ b/modules/misc/vte.nix
@@ -1,9 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options.programs = let
     description = ''
@@ -12,13 +10,17 @@ with lib;
       directory.
     '';
   in {
-    bash.enableVteIntegration = mkEnableOption "" // { inherit description; };
+    bash.enableVteIntegration = lib.mkEnableOption "" // {
+      inherit description;
+    };
 
-    zsh.enableVteIntegration = mkEnableOption "" // { inherit description; };
+    zsh.enableVteIntegration = lib.mkEnableOption "" // {
+      inherit description;
+    };
   };
 
-  config = mkMerge [
-    (mkIf config.programs.bash.enableVteIntegration {
+  config = lib.mkMerge [
+    (lib.mkIf config.programs.bash.enableVteIntegration {
       # Unfortunately we have to do a little dance here to fix two
       # problems with the upstream vte.sh file:
       #
@@ -42,7 +44,7 @@ with lib;
       '';
     })
 
-    (mkIf config.programs.zsh.enableVteIntegration {
+    (lib.mkIf config.programs.zsh.enableVteIntegration {
       programs.zsh.initExtra = ''
         . ${pkgs.vte}/etc/profile.d/vte.sh
       '';
diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix
index 1aab6ffe7..1bc3ef6b5 100644
--- a/modules/misc/xdg-desktop-entries.nix
+++ b/modules/misc/xdg-desktop-entries.nix
@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) literalExpression mkOption types;
+
   desktopEntry = {
     imports = [
-      (mkRemovedOptionModule [ "extraConfig" ]
+      (lib.mkRemovedOptionModule [ "extraConfig" ]
         "The `extraConfig` option of `xdg.desktopEntries` has been removed following a change in Nixpkgs.")
-      (mkRemovedOptionModule [ "fileValidation" ]
+      (lib.mkRemovedOptionModule [ "fileValidation" ]
         "Validation of the desktop file is always enabled.")
     ];
     options = {
@@ -172,12 +172,12 @@ let
         type exec icon comment terminal genericName startupNotify noDisplay
         prefersNonDefaultGPU actions;
       desktopName = config.name;
-      mimeTypes = optionals (config.mimeType != null) config.mimeType;
-      categories = optionals (config.categories != null) config.categories;
+      mimeTypes = lib.optionals (config.mimeType != null) config.mimeType;
+      categories = lib.optionals (config.categories != null) config.categories;
       extraConfig = config.settings;
     };
 in {
-  meta.maintainers = [ hm.maintainers.cwyc ];
+  meta.maintainers = [ lib.hm.maintainers.cwyc ];
 
   options.xdg.desktopEntries = mkOption {
     description = ''
@@ -203,13 +203,16 @@ in {
     '';
   };
 
-  config = mkIf (config.xdg.desktopEntries != { }) {
+  config = lib.mkIf (config.xdg.desktopEntries != { }) {
     assertions = [
-      (hm.assertions.assertPlatform "xdg.desktopEntries" pkgs platforms.linux)
-    ] ++ flatten (catAttrs "assertions" (attrValues config.xdg.desktopEntries));
+      (lib.hm.assertions.assertPlatform "xdg.desktopEntries" pkgs
+        lib.platforms.linux)
+    ] ++ lib.flatten
+      (lib.catAttrs "assertions" (lib.attrValues config.xdg.desktopEntries));
 
-    home.packages = (map hiPrio # we need hiPrio to override existing entries
-      (attrsets.mapAttrsToList makeFile config.xdg.desktopEntries));
+    home.packages =
+      (map lib.hiPrio # we need hiPrio to override existing entries
+        (lib.attrsets.mapAttrsToList makeFile config.xdg.desktopEntries));
   };
 
 }
diff --git a/modules/misc/xdg-mime-apps.nix b/modules/misc/xdg-mime-apps.nix
index 39eea478e..6efa43b11 100644
--- a/modules/misc/xdg-mime-apps.nix
+++ b/modules/misc/xdg-mime-apps.nix
@@ -1,16 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   cfg = config.xdg.mimeApps;
 
   strListOrSingleton = with types;
-    coercedTo (either (listOf str) str) toList (listOf str);
+    coercedTo (either (listOf str) str) lib.toList (listOf str);
 
 in {
-  meta.maintainers = with maintainers; [ euxane ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 
   options.xdg.mimeApps = {
     enable = mkOption {
@@ -29,7 +28,7 @@ in {
     associations.added = mkOption {
       type = types.attrsOf strListOrSingleton;
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           "mimetype1" = [ "foo1.desktop" "foo2.desktop" "foo3.desktop" ];
           "mimetype2" = "foo4.desktop";
@@ -56,7 +55,7 @@ in {
     defaultApplications = mkOption {
       type = types.attrsOf strListOrSingleton;
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           "mimetype1" = [ "default1.desktop" "default2.desktop" ];
         }
@@ -71,22 +70,22 @@ in {
     };
   };
 
-  config = mkMerge [
+  config = lib.mkMerge [
     {
       # Given a package that installs .desktop files in the usual location,
       # return a mapping from mime types to lists of desktop file names. This is
       # suitable for use with `xdg.mimeApps.defaultApplications`.
       lib.xdg.mimeAssociations = let
         processLines = str:
-          zipAttrs
-          (filter (e: e != null) (map processLine (splitString "\n" str)));
+          lib.zipAttrs (lib.filter (e: e != null)
+            (map processLine (lib.splitString "\n" str)));
 
         processLine = str:
           let
-            entry = splitString ";" str;
-            k = elemAt entry 0;
-            v = elemAt entry 1;
-          in if length entry == 2 then { ${k} = v; } else null;
+            entry = lib.splitString ";" str;
+            k = lib.elemAt entry 0;
+            v = lib.elemAt entry 1;
+          in if lib.length entry == 2 then { ${k} = v; } else null;
 
         associations = ps:
           pkgs.runCommand "mime-assoc" { inherit ps; } ''
@@ -100,17 +99,19 @@ in {
       in p: processLines (builtins.readFile (associations p));
     }
 
-    (mkIf cfg.enable {
-      assertions =
-        [ (hm.assertions.assertPlatform "xdg.mimeApps" pkgs platforms.linux) ];
+    (lib.mkIf cfg.enable {
+      assertions = [
+        (lib.hm.assertions.assertPlatform "xdg.mimeApps" pkgs
+          lib.platforms.linux)
+      ];
 
       # Deprecated but still used by some applications.
       xdg.dataFile."applications/mimeapps.list".source =
         config.xdg.configFile."mimeapps.list".source;
 
       xdg.configFile."mimeapps.list".text =
-        let joinValues = mapAttrs (n: concatStringsSep ";");
-        in generators.toINI { } {
+        let joinValues = lib.mapAttrs (n: lib.concatStringsSep ";");
+        in lib.generators.toINI { } {
           "Added Associations" = joinValues cfg.associations.added;
           "Removed Associations" = joinValues cfg.associations.removed;
           "Default Applications" = joinValues cfg.defaultApplications;
diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg-mime.nix
index 78b569fa5..6563b9360 100644
--- a/modules/misc/xdg-mime.nix
+++ b/modules/misc/xdg-mime.nix
@@ -1,11 +1,10 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.xdg.mime;
-  inherit (lib) getExe getExe';
+
+  inherit (lib) getExe getExe' mkOption types;
 
 in {
   options = {
@@ -13,8 +12,8 @@ in {
       enable = mkOption {
         type = types.bool;
         default = pkgs.stdenv.hostPlatform.isLinux;
-        defaultText =
-          literalExpression "true if host platform is Linux, false otherwise";
+        defaultText = lib.literalExpression
+          "true if host platform is Linux, false otherwise";
         description = ''
           Whether to install programs and files to support the
           XDG Shared MIME-info specification and XDG MIME Applications
@@ -29,22 +28,23 @@ in {
       sharedMimeInfoPackage = mkOption {
         type = types.package;
         default = pkgs.shared-mime-info;
-        defaultText = literalExpression "pkgs.shared-mime-info";
+        defaultText = lib.literalExpression "pkgs.shared-mime-info";
         description = "The package to use when running update-mime-database.";
       };
 
       desktopFileUtilsPackage = mkOption {
         type = types.package;
         default = pkgs.desktop-file-utils;
-        defaultText = literalExpression "pkgs.desktop-file-utils";
+        defaultText = lib.literalExpression "pkgs.desktop-file-utils";
         description =
           "The package to use when running update-desktop-database.";
       };
     };
   };
-  config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xdg.mime" pkgs platforms.linux) ];
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "xdg.mime" pkgs lib.platforms.linux)
+    ];
 
     home.packages = [
       # Explicitly install package to provide basic mime types.
diff --git a/modules/misc/xdg-system-dirs.nix b/modules/misc/xdg-system-dirs.nix
index 0be5e26d2..d02cff71d 100644
--- a/modules/misc/xdg-system-dirs.nix
+++ b/modules/misc/xdg-system-dirs.nix
@@ -1,33 +1,32 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) types;
 
   cfg = config.xdg.systemDirs;
 
-  configDirs = concatStringsSep ":" cfg.config;
+  configDirs = lib.concatStringsSep ":" cfg.config;
 
-  dataDirs = concatStringsSep ":" cfg.data;
+  dataDirs = lib.concatStringsSep ":" cfg.data;
 
 in {
-  meta.maintainers = with maintainers; [ tadfisher ];
+  meta.maintainers = with lib.maintainers; [ tadfisher ];
 
   options.xdg.systemDirs = {
-    config = mkOption {
+    config = lib.mkOption {
       type = types.listOf types.str;
       default = [ ];
-      example = literalExpression ''[ "/etc/xdg" ]'';
+      example = lib.literalExpression ''[ "/etc/xdg" ]'';
       description = ''
         Directory names to add to {env}`XDG_CONFIG_DIRS`
         in the user session.
       '';
     };
 
-    data = mkOption {
+    data = lib.mkOption {
       type = types.listOf types.str;
       default = [ ];
-      example = literalExpression ''[ "/usr/share" "/usr/local/share" ]'';
+      example = lib.literalExpression ''[ "/usr/share" "/usr/local/share" ]'';
       description = ''
         Directory names to add to {env}`XDG_DATA_DIRS`
         in the user session.
@@ -35,14 +34,15 @@ in {
     };
   };
 
-  config = mkMerge [
-    (mkIf (cfg.config != [ ] || cfg.data != [ ]) {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.config != [ ] || cfg.data != [ ]) {
       assertions = [
-        (hm.assertions.assertPlatform "xdg.systemDirs" pkgs platforms.linux)
+        (lib.hm.assertions.assertPlatform "xdg.systemDirs" pkgs
+          lib.platforms.linux)
       ];
     })
 
-    (mkIf (cfg.config != [ ]) {
+    (lib.mkIf (cfg.config != [ ]) {
       home.sessionVariables.XDG_CONFIG_DIRS =
         "${configDirs}\${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}";
 
@@ -50,7 +50,7 @@ in {
         "${configDirs}\${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}";
     })
 
-    (mkIf (cfg.data != [ ]) {
+    (lib.mkIf (cfg.data != [ ]) {
       home.sessionVariables.XDG_DATA_DIRS =
         "${dataDirs}\${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}";
 
diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg-user-dirs.nix
index 5281203b9..b693118ad 100644
--- a/modules/misc/xdg-user-dirs.nix
+++ b/modules/misc/xdg-user-dirs.nix
@@ -1,16 +1,15 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) literalExpression mkOption types;
 
   cfg = config.xdg.userDirs;
 
 in {
-  meta.maintainers = with maintainers; [ euxane ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 
   imports = [
-    (mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [
+    (lib.mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [
       "xdg"
       "userDirs"
       "publicShare"
@@ -108,11 +107,11 @@ in {
     };
 
     createDirectories =
-      mkEnableOption "automatic creation of the XDG user directories";
+      lib.mkEnableOption "automatic creation of the XDG user directories";
   };
 
   config = let
-    directories = (filterAttrs (n: v: !isNull v) {
+    directories = (lib.filterAttrs (n: v: !isNull v) {
       XDG_DESKTOP_DIR = cfg.desktop;
       XDG_DOCUMENTS_DIR = cfg.documents;
       XDG_DOWNLOAD_DIR = cfg.download;
@@ -122,24 +121,26 @@ in {
       XDG_TEMPLATES_DIR = cfg.templates;
       XDG_VIDEOS_DIR = cfg.videos;
     }) // cfg.extraConfig;
-  in mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xdg.userDirs" pkgs platforms.linux) ];
+  in lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "xdg.userDirs" pkgs lib.platforms.linux)
+    ];
 
     xdg.configFile."user-dirs.dirs".text = let
       # For some reason, these need to be wrapped with quotes to be valid.
-      wrapped = mapAttrs (_: value: ''"${value}"'') directories;
-    in generators.toKeyValue { } wrapped;
+      wrapped = lib.mapAttrs (_: value: ''"${value}"'') directories;
+    in lib.generators.toKeyValue { } wrapped;
 
     xdg.configFile."user-dirs.conf".text = "enabled=False";
 
     home.sessionVariables = directories;
 
-    home.activation.createXdgUserDirectories = mkIf cfg.createDirectories (let
-      directoriesList = attrValues directories;
-      mkdir =
-        (dir: ''[[ -L "${dir}" ]] || run mkdir -p $VERBOSE_ARG "${dir}"'');
-    in lib.hm.dag.entryAfter [ "linkGeneration" ]
-    (strings.concatMapStringsSep "\n" mkdir directoriesList));
+    home.activation.createXdgUserDirectories = lib.mkIf cfg.createDirectories
+      (let
+        directoriesList = lib.attrValues directories;
+        mkdir =
+          (dir: ''[[ -L "${dir}" ]] || run mkdir -p $VERBOSE_ARG "${dir}"'');
+      in lib.hm.dag.entryAfter [ "linkGeneration" ]
+      (lib.strings.concatMapStringsSep "\n" mkdir directoriesList));
   };
 }
diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index a554659e2..e309462e7 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -1,8 +1,7 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, pkgs, ... }:
 
 let
+  inherit (lib) mkOptionDefault mkIf mkOption types;
 
   cfg = config.xdg;
 
@@ -22,7 +21,7 @@ let
 
 in {
   options.xdg = {
-    enable = mkEnableOption "management of XDG base directories";
+    enable = lib.mkEnableOption "management of XDG base directories";
 
     cacheFile = mkOption {
       type = fileType "xdg.cacheFile" "{var}`xdg.cacheHome`" cfg.cacheHome;
@@ -107,7 +106,7 @@ in {
     };
   };
 
-  config = mkMerge [
+  config = lib.mkMerge [
     (let
       variables = {
         XDG_CACHE_HOME = cfg.cacheHome;
@@ -127,7 +126,7 @@ in {
     })
 
     # Legacy non-deterministic setup.
-    (mkIf (!cfg.enable && versionOlder config.home.stateVersion "20.09") {
+    (mkIf (!cfg.enable && lib.versionOlder config.home.stateVersion "20.09") {
       xdg.cacheHome =
         mkOptionDefault (getEnvFallback "XDG_CACHE_HOME" defaultCacheHome);
       xdg.configHome =
@@ -139,7 +138,7 @@ in {
     })
 
     # "Modern" deterministic setup.
-    (mkIf (!cfg.enable && versionAtLeast config.home.stateVersion "20.09") {
+    (mkIf (!cfg.enable && lib.versionAtLeast config.home.stateVersion "20.09") {
       xdg.cacheHome = mkOptionDefault defaultCacheHome;
       xdg.configHome = mkOptionDefault defaultConfigHome;
       xdg.dataHome = mkOptionDefault defaultDataHome;
@@ -147,14 +146,18 @@ in {
     })
 
     {
-      home.file = mkMerge [
-        (mapAttrs' (name: file: nameValuePair "${cfg.cacheHome}/${name}" file)
+      home.file = lib.mkMerge [
+        (lib.mapAttrs'
+          (name: file: lib.nameValuePair "${cfg.cacheHome}/${name}" file)
           cfg.cacheFile)
-        (mapAttrs' (name: file: nameValuePair "${cfg.configHome}/${name}" file)
+        (lib.mapAttrs'
+          (name: file: lib.nameValuePair "${cfg.configHome}/${name}" file)
           cfg.configFile)
-        (mapAttrs' (name: file: nameValuePair "${cfg.dataHome}/${name}" file)
+        (lib.mapAttrs'
+          (name: file: lib.nameValuePair "${cfg.dataHome}/${name}" file)
           cfg.dataFile)
-        (mapAttrs' (name: file: nameValuePair "${cfg.stateHome}/${name}" file)
+        (lib.mapAttrs'
+          (name: file: lib.nameValuePair "${cfg.stateHome}/${name}" file)
           cfg.stateFile)
         { "${cfg.cacheHome}/.keep".text = ""; }
         { "${cfg.stateHome}/.keep".text = ""; }
diff --git a/modules/misc/xfconf.nix b/modules/misc/xfconf.nix
index 087040085..b95413676 100644
--- a/modules/misc/xfconf.nix
+++ b/modules/misc/xfconf.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   cfg = config.xfconf;
 
@@ -51,12 +50,12 @@ let
       "-s"
       v
     ] else if builtins.isList v then
-      [ "-a" ] ++ concatMap withType v
+      [ "-a" ] ++ lib.concatMap withType v
     else
       throw "unexpected xfconf type: ${builtins.typeOf v}";
 
 in {
-  meta.maintainers = [ maintainers.chuangzhu ];
+  meta.maintainers = [ lib.maintainers.chuangzhu ];
 
   options.xfconf = {
     enable = mkOption {
@@ -81,7 +80,7 @@ in {
           description = "xfconf settings";
         };
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           xfce4-session = {
             "startup/ssh-agent/enabled" = false;
@@ -99,16 +98,16 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable && cfg.settings != { }) {
+  config = lib.mkIf (cfg.enable && cfg.settings != { }) {
     assertions =
-      [ (hm.assertions.assertPlatform "xfconf" pkgs platforms.linux) ];
+      [ (lib.hm.assertions.assertPlatform "xfconf" pkgs lib.platforms.linux) ];
 
-    home.activation.xfconfSettings = hm.dag.entryAfter [ "installPackages" ]
+    home.activation.xfconfSettings = lib.hm.dag.entryAfter [ "installPackages" ]
       (let
         mkCommand = channel: property: value: ''
           run ${pkgs.xfce.xfconf}/bin/xfconf-query \
             ${
-              escapeShellArgs ([ "-c" channel "-p" "/${property}" ]
+              lib.escapeShellArgs ([ "-c" channel "-p" "/${property}" ]
                 ++ (if value == null then
                   [ "-r" ]
                 else
@@ -116,13 +115,12 @@ in {
             }
         '';
 
-        commands = mapAttrsToList
-          (channel: properties: mapAttrsToList (mkCommand channel) properties)
-          cfg.settings;
+        commands = lib.mapAttrsToList (channel: properties:
+          lib.mapAttrsToList (mkCommand channel) properties) cfg.settings;
 
         load = pkgs.writeShellScript "load-xfconf" ''
           ${config.lib.bash.initHomeManagerLib}
-          ${concatMapStrings concatStrings commands}
+          ${lib.concatMapStrings lib.concatStrings commands}
         '';
       in ''
         if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
diff --git a/modules/modules.nix b/modules/modules.nix
index ef357bd3a..5f150f02d 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -9,8 +9,6 @@
   # If disabled, the pkgs attribute passed to this function is used instead.
 , useNixpkgsModule ? true }:
 
-with lib;
-
 let
 
   modules = [
@@ -442,28 +440,28 @@ let
     (pkgs.path + "/nixos/modules/misc/assertions.nix")
     (pkgs.path + "/nixos/modules/misc/meta.nix")
 
-    (mkRemovedOptionModule [ "services" "password-store-sync" ] ''
+    (lib.mkRemovedOptionModule [ "services" "password-store-sync" ] ''
       Use services.git-sync instead.
     '')
-    (mkRemovedOptionModule [ "services" "keepassx" ] ''
+    (lib.mkRemovedOptionModule [ "services" "keepassx" ] ''
       KeePassX is no longer maintained.
     '')
-  ] ++ optional useNixpkgsModule ./misc/nixpkgs.nix
-    ++ optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix;
+  ] ++ lib.optional useNixpkgsModule ./misc/nixpkgs.nix
+    ++ lib.optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix;
 
   pkgsModule = { config, ... }: {
     config = {
       _module.args.baseModules = modules;
       _module.args.pkgsPath = lib.mkDefault
-        (if versionAtLeast config.home.stateVersion "20.09" then
+        (if lib.versionAtLeast config.home.stateVersion "20.09" then
           pkgs.path
         else
           <nixpkgs>);
       _module.args.pkgs = lib.mkDefault pkgs;
       _module.check = check;
       lib = lib.hm;
-    } // optionalAttrs useNixpkgsModule {
-      nixpkgs.system = mkDefault pkgs.stdenv.hostPlatform.system;
+    } // lib.optionalAttrs useNixpkgsModule {
+      nixpkgs.system = lib.mkDefault pkgs.stdenv.hostPlatform.system;
     };
   };
 
diff --git a/modules/targets/darwin/fonts.nix b/modules/targets/darwin/fonts.nix
index 988c5edc9..4c98f94d9 100644
--- a/modules/targets/darwin/fonts.nix
+++ b/modules/targets/darwin/fonts.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   homeDir = config.home.homeDirectory;
   fontsEnv = pkgs.buildEnv {
@@ -13,13 +11,13 @@ let
   installDir = "${homeDir}/Library/Fonts/HomeManager";
 in {
   # macOS won't recognize symlinked fonts
-  config = mkIf pkgs.stdenv.hostPlatform.isDarwin {
+  config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
     home.file."Library/Fonts/.home-manager-fonts-version" = {
       text = "${fontsEnv}";
       onChange = ''
-        run mkdir -p ${escapeShellArg installDir}
+        run mkdir -p ${lib.escapeShellArg installDir}
         run ${pkgs.rsync}/bin/rsync $VERBOSE_ARG -acL --chmod=u+w --delete \
-          ${escapeShellArgs [ "${fonts}/" installDir ]}
+          ${lib.escapeShellArgs [ "${fonts}/" installDir ]}
       '';
     };
   };
diff --git a/modules/targets/darwin/keybindings.nix b/modules/targets/darwin/keybindings.nix
index 96800073c..9d2c064c2 100644
--- a/modules/targets/darwin/keybindings.nix
+++ b/modules/targets/darwin/keybindings.nix
@@ -1,15 +1,13 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.targets.darwin;
   homeDir = config.home.homeDirectory;
   confFile = pkgs.writeText "DefaultKeybinding.dict"
     (lib.generators.toPlist { } cfg.keybindings);
 in {
-  options.targets.darwin.keybindings = mkOption {
-    type = with types; attrsOf anything;
+  options.targets.darwin.keybindings = lib.mkOption {
+    type = with lib.types; attrsOf anything;
     default = { };
     example = {
       "^u" = "deleteToBeginningOfLine:";
@@ -28,15 +26,15 @@ in {
     '';
   };
 
-  config = mkIf (cfg.keybindings != { }) {
+  config = lib.mkIf (cfg.keybindings != { }) {
     assertions = [
-      (hm.assertions.assertPlatform "targets.darwin.keybindings" pkgs
-        platforms.darwin)
+      (lib.hm.assertions.assertPlatform "targets.darwin.keybindings" pkgs
+        lib.platforms.darwin)
     ];
 
     # NOTE: just copy the files because symlinks won't be recognized by macOS
     home.activation.setCocoaKeybindings =
-      hm.dag.entryAfter [ "writeBoundary" ] ''
+      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
         verboseEcho "Configuring keybindings for the Cocoa Text System"
         run install -Dm644 $VERBOSE_ARG \
           "${confFile}" "${homeDir}/Library/KeyBindings/DefaultKeyBinding.dict"
diff --git a/modules/targets/darwin/search.nix b/modules/targets/darwin/search.nix
index 8e0df3b20..9d82801bc 100644
--- a/modules/targets/darwin/search.nix
+++ b/modules/targets/darwin/search.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.targets.darwin;
   searchEngines = {
@@ -11,18 +9,18 @@ let
     Google = "com.google.www";
     Yahoo = "com.yahoo.www";
   };
-  searchId = getAttr cfg.search searchEngines;
+  searchId = lib.getAttr cfg.search searchEngines;
 in {
-  options.targets.darwin.search = mkOption {
-    type = with types; nullOr (enum (attrNames searchEngines));
+  options.targets.darwin.search = lib.mkOption {
+    type = with lib.types; nullOr (enum (lib.attrNames searchEngines));
     default = null;
     description = "Default search engine.";
   };
 
-  config = mkIf (cfg.search != null) {
+  config = lib.mkIf (cfg.search != null) {
     assertions = [
-      (hm.assertions.assertPlatform "targets.darwin.search" pkgs
-        platforms.darwin)
+      (lib.hm.assertions.assertPlatform "targets.darwin.search" pkgs
+        lib.platforms.darwin)
     ];
 
     targets.darwin.defaults = {
diff --git a/modules/targets/darwin/user-defaults/default.nix b/modules/targets/darwin/user-defaults/default.nix
index 97342d36b..9f1d35e6c 100644
--- a/modules/targets/darwin/user-defaults/default.nix
+++ b/modules/targets/darwin/user-defaults/default.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.targets.darwin;
 
@@ -13,27 +11,27 @@ let
       cliFlags = lib.optionalString isLocal "-currentHost";
 
       toActivationCmd = domain: attrs:
-        "run /usr/bin/defaults ${cliFlags} import ${escapeShellArg domain} ${
-          toDefaultsFile domain attrs
-        }";
+        "run /usr/bin/defaults ${cliFlags} import ${
+          lib.escapeShellArg domain
+        } ${toDefaultsFile domain attrs}";
 
       nonNullDefaults =
-        mapAttrs (domain: attrs: (filterAttrs (n: v: v != null) attrs))
+        lib.mapAttrs (domain: attrs: (lib.filterAttrs (n: v: v != null) attrs))
         settings;
 
       writableDefaults =
-        filterAttrs (domain: attrs: attrs != { }) nonNullDefaults;
-    in mapAttrsToList toActivationCmd writableDefaults;
+        lib.filterAttrs (domain: attrs: attrs != { }) nonNullDefaults;
+    in lib.mapAttrsToList toActivationCmd writableDefaults;
 
   defaultsCmds = mkActivationCmds false cfg.defaults;
   currentHostDefaultsCmds = mkActivationCmds true cfg.currentHostDefaults;
 
   activationCmds = defaultsCmds ++ currentHostDefaultsCmds;
 in {
-  meta.maintainers = [ maintainers.midchildan ];
+  meta.maintainers = [ lib.maintainers.midchildan ];
 
-  options.targets.darwin.defaults = mkOption {
-    type = types.submodule ./opts-allhosts.nix;
+  options.targets.darwin.defaults = lib.mkOption {
+    type = lib.types.submodule ./opts-allhosts.nix;
     default = { };
     example = {
       "com.apple.desktopservices" = {
@@ -56,8 +54,8 @@ in {
     '';
   };
 
-  options.targets.darwin.currentHostDefaults = mkOption {
-    type = types.submodule ./opts-currenthost.nix;
+  options.targets.darwin.currentHostDefaults = lib.mkOption {
+    type = lib.types.submodule ./opts-currenthost.nix;
     default = { };
     example = {
       "com.apple.controlcenter" = { BatteryShowPercentage = true; };
@@ -75,33 +73,34 @@ in {
     '';
   };
 
-  config = mkIf (activationCmds != [ ]) {
+  config = lib.mkIf (activationCmds != [ ]) {
     assertions = [
-      (hm.assertions.assertPlatform "targets.darwin.defaults" pkgs
-        platforms.darwin)
+      (lib.hm.assertions.assertPlatform "targets.darwin.defaults" pkgs
+        lib.platforms.darwin)
     ];
 
     warnings = let
       batteryOptionName = ''
         targets.darwin.currentHostDefaults."com.apple.controlcenter".BatteryShowPercentage'';
       batteryPercentage =
-        attrByPath [ "com.apple.menuextra.battery" "ShowPercent" ] null
+        lib.attrByPath [ "com.apple.menuextra.battery" "ShowPercent" ] null
         cfg.defaults;
-      webkitDevExtras = attrByPath [
+      webkitDevExtras = lib.attrByPath [
         "com.apple.Safari"
         "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled"
       ] null cfg.defaults;
-    in optional (batteryPercentage != null) ''
+    in lib.optional (batteryPercentage != null) ''
       The option 'com.apple.menuextra.battery.ShowPercent' no longer works on
       macOS 11 and later. Instead, use '${batteryOptionName}'.
-    '' ++ optional (webkitDevExtras != null) ''
+    '' ++ lib.optional (webkitDevExtras != null) ''
       The option 'com.apple.Safari.com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled'
       is no longer present in recent versions of Safari.
     '';
 
-    home.activation.setDarwinDefaults = hm.dag.entryAfter [ "writeBoundary" ] ''
-      verboseEcho "Configuring macOS user defaults"
-      ${concatStringsSep "\n" activationCmds}
-    '';
+    home.activation.setDarwinDefaults =
+      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        verboseEcho "Configuring macOS user defaults"
+        ${lib.concatStringsSep "\n" activationCmds}
+      '';
   };
 }
diff --git a/modules/targets/darwin/user-defaults/opts-allhosts.nix b/modules/targets/darwin/user-defaults/opts-allhosts.nix
index 4a4f10671..6d4307747 100644
--- a/modules/targets/darwin/user-defaults/opts-allhosts.nix
+++ b/modules/targets/darwin/user-defaults/opts-allhosts.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 
-with lib;
-
 let
+  inherit (lib) types;
+
   mkNullableOption = args:
     lib.mkOption (args // {
       type = types.nullOr args.type;
@@ -284,12 +284,12 @@ in {
   };
 
   config = {
-    "com.apple.Safari" = mkIf (safari.IncludeDevelopMenu != null) {
+    "com.apple.Safari" = lib.mkIf (safari.IncludeDevelopMenu != null) {
       WebKitDeveloperExtrasEnabledPreferenceKey = safari.IncludeDevelopMenu;
       "WebKitPreferences.developerExtrasEnabled" = safari.IncludeDevelopMenu;
     };
     "com.apple.Safari.SandboxBroker" =
-      mkIf (safari.IncludeDevelopMenu != null) {
+      lib.mkIf (safari.IncludeDevelopMenu != null) {
         ShowDevelopMenu = safari.IncludeDevelopMenu;
       };
   };
diff --git a/modules/targets/darwin/user-defaults/opts-currenthost.nix b/modules/targets/darwin/user-defaults/opts-currenthost.nix
index 129f91487..61c2f8b3a 100644
--- a/modules/targets/darwin/user-defaults/opts-currenthost.nix
+++ b/modules/targets/darwin/user-defaults/opts-currenthost.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 let
   mkNullableOption = args:
diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix
index 9dce9f5c8..45762ac5e 100644
--- a/modules/targets/generic-linux.nix
+++ b/modules/targets/generic-linux.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.targets.genericLinux;
@@ -12,7 +10,7 @@ let
 
 in {
   imports = [
-    (mkRenamedOptionModule [ "targets" "genericLinux" "extraXdgDataDirs" ] [
+    (lib.mkRenamedOptionModule [ "targets" "genericLinux" "extraXdgDataDirs" ] [
       "xdg"
       "systemDirs"
       "data"
@@ -20,7 +18,7 @@ in {
   ];
 
   options.targets.genericLinux = {
-    enable = mkEnableOption "" // {
+    enable = lib.mkEnableOption "" // {
       description = ''
         Whether to enable settings that make Home Manager work better on
         GNU/Linux distributions other than NixOS.
@@ -28,9 +26,10 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
-      (hm.assertions.assertPlatform "targets.genericLinux" pkgs platforms.linux)
+      (lib.hm.assertions.assertPlatform "targets.genericLinux" pkgs
+        lib.platforms.linux)
     ];
 
     xdg.systemDirs.data = [
@@ -49,11 +48,12 @@ in {
     # resolving to the Nix store.
     # https://github.com/nix-community/home-manager/pull/2891#issuecomment-1101064521
     home.sessionVariables = {
-      XCURSOR_PATH = "$XCURSOR_PATH\${XCURSOR_PATH:+:}" + concatStringsSep ":" [
-        "${config.home.profileDirectory}/share/icons"
-        "/usr/share/icons"
-        "/usr/share/pixmaps"
-      ];
+      XCURSOR_PATH = "$XCURSOR_PATH\${XCURSOR_PATH:+:}"
+        + lib.concatStringsSep ":" [
+          "${config.home.profileDirectory}/share/icons"
+          "/usr/share/icons"
+          "/usr/share/pixmaps"
+        ];
     };
 
     home.sessionVariablesExtra = ''
@@ -93,7 +93,7 @@ in {
       # https://salsa.debian.org/debian/ncurses/-/blob/master/debian/rules
       # https://src.fedoraproject.org/rpms/ncurses/blob/main/f/ncurses.spec
       # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-libs/ncurses/ncurses-6.2-r1.ebuild
-      distroTerminfoDirs = concatStringsSep ":" [
+      distroTerminfoDirs = lib.concatStringsSep ":" [
         "/etc/terminfo" # debian, fedora, gentoo
         "/lib/terminfo" # debian
         "/usr/share/terminfo" # package default, all distros
diff --git a/modules/xresources.nix b/modules/xresources.nix
index a2396e236..91a872eb5 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -1,24 +1,23 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   cfg = config.xresources;
 
   formatLine = n: v:
     let
       formatList = x:
-        if isList x then
+        if lib.isList x then
           throw "can not convert 2-dimensional lists to Xresources format"
         else
           formatValue x;
 
       formatValue = v:
-        if isBool v then
+        if lib.isBool v then
           (if v then "true" else "false")
-        else if isList v then
-          concatMapStringsSep ", " formatList v
+        else if lib.isList v then
+          lib.concatMapStringsSep ", " formatList v
         else
           toString v;
     in "${n}: ${formatValue v}";
@@ -26,7 +25,7 @@ let
   xrdbMerge = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${cfg.path}";
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options = {
     xresources.properties = mkOption {
@@ -36,7 +35,7 @@ in {
           entry = either prim (listOf prim);
         in nullOr (attrsOf entry);
       default = null;
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           "Emacs*toolBar" = 0;
           "XTerm*faceName" = "dejavu sans mono";
@@ -58,7 +57,7 @@ in {
     xresources.extraConfig = mkOption {
       type = types.lines;
       default = "";
-      example = literalExpression ''
+      example = lib.literalExpression ''
         builtins.readFile (
             pkgs.fetchFromGitHub {
                 owner = "solarized";
@@ -85,13 +84,13 @@ in {
     };
   };
 
-  config = mkIf ((cfg.properties != null && cfg.properties != { })
+  config = lib.mkIf ((cfg.properties != null && cfg.properties != { })
     || cfg.extraConfig != "") {
       home.file.${cfg.path} = {
-        text = concatStringsSep "\n" ([ ]
-          ++ optional (cfg.extraConfig != "") cfg.extraConfig
-          ++ optionals (cfg.properties != null)
-          (mapAttrsToList formatLine cfg.properties)) + "\n";
+        text = lib.concatStringsSep "\n" ([ ]
+          ++ lib.optional (cfg.extraConfig != "") cfg.extraConfig
+          ++ lib.optionals (cfg.properties != null)
+          (lib.mapAttrsToList formatLine cfg.properties)) + "\n";
         onChange = ''
           if [[ -v DISPLAY ]]; then
             ${xrdbMerge}
diff --git a/modules/xsession.nix b/modules/xsession.nix
index edb99300e..6f13a854e 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -1,17 +1,16 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   cfg = config.xsession;
 
 in {
-  meta.maintainers = [ maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee ];
 
   options = {
     xsession = {
-      enable = mkEnableOption "X Session";
+      enable = lib.mkEnableOption "X Session";
 
       trayTarget = mkOption {
         readOnly = true;
@@ -49,7 +48,7 @@ in {
 
       windowManager.command = mkOption {
         type = types.str;
-        example = literalExpression ''
+        example = lib.literalExpression ''
           let
             xmonad = pkgs.xmonad-with-packages.override {
               packages = self: [ self.xmonad-contrib self.taffybar ];
@@ -92,7 +91,7 @@ in {
 
       importedVariables = mkOption {
         type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*");
-        apply = unique;
+        apply = lib.unique;
         example = [ "GDK_PIXBUF_ICON_LOADER" ];
         visible = false;
         description = ''
@@ -104,9 +103,10 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
-    assertions =
-      [ (hm.assertions.assertPlatform "xsession" pkgs platforms.linux) ];
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "xsession" pkgs lib.platforms.linux)
+    ];
 
     xsession.importedVariables = [
       "DBUS_SESSION_BUS_ADDRESS"
@@ -119,7 +119,7 @@ in {
     ];
 
     systemd.user = {
-      services = mkIf (config.home.keyboard != null) {
+      services = lib.mkIf (config.home.keyboard != null) {
         setxkbmap = {
           Unit = {
             Description = "Set up keyboard in X";
@@ -134,9 +134,9 @@ in {
             RemainAfterExit = true;
             ExecStart = with config.home.keyboard;
               let
-                args = optional (layout != null) "-layout '${layout}'"
-                  ++ optional (variant != null) "-variant '${variant}'"
-                  ++ optional (model != null) "-model '${model}'"
+                args = lib.optional (layout != null) "-layout '${layout}'"
+                  ++ lib.optional (variant != null) "-variant '${variant}'"
+                  ++ lib.optional (model != null) "-model '${model}'"
                   ++ [ "-option ''" ] ++ map (v: "-option '${v}'") options;
               in "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";
           };
@@ -193,9 +193,9 @@ in {
       # script starts up graphical-session.target.
       systemctl --user stop graphical-session.target graphical-session-pre.target
 
-      ${optionalString (cfg.importedVariables != [ ])
+      ${lib.optionalString (cfg.importedVariables != [ ])
       ("systemctl --user import-environment "
-        + escapeShellArgs cfg.importedVariables)}
+        + lib.escapeShellArgs cfg.importedVariables)}
 
       ${cfg.profileExtra}
 
@@ -224,9 +224,9 @@ in {
           sleep 0.5
         done
 
-        ${optionalString (cfg.importedVariables != [ ])
+        ${lib.optionalString (cfg.importedVariables != [ ])
         ("systemctl --user unset-environment "
-          + escapeShellArgs cfg.importedVariables)}
+          + lib.escapeShellArgs cfg.importedVariables)}
       '';
     };
   };
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index 018e9bab6..75011da46 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
   cfg = config.home-manager;
@@ -9,11 +7,11 @@ let
 in {
   imports = [ ../nixos/common.nix ];
 
-  config = mkMerge [
+  config = lib.mkMerge [
     { home-manager.extraSpecialArgs.darwinConfig = config; }
-    (mkIf (cfg.users != { }) {
-      system.activationScripts.postActivation.text = concatStringsSep "\n"
-        (mapAttrsToList (username: usercfg: ''
+    (lib.mkIf (cfg.users != { }) {
+      system.activationScripts.postActivation.text = lib.concatStringsSep "\n"
+        (lib.mapAttrsToList (username: usercfg: ''
           echo Activating home-manager configuration for ${username}
           sudo -u ${username} --set-home ${
             pkgs.writeShellScript "activation-${username}" ''
diff --git a/nixos/common.nix b/nixos/common.nix
index ddf9a9359..05931ad60 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -3,9 +3,8 @@
 
 { options, config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) flip mkOption mkEnableOption mkIf types;
 
   cfg = config.home-manager;
 
@@ -74,7 +73,7 @@ in {
     extraSpecialArgs = mkOption {
       type = types.attrs;
       default = { };
-      example = literalExpression "{ inherit emacs-overlay; }";
+      example = lib.literalExpression "{ inherit emacs-overlay; }";
       description = ''
         Extra `specialArgs` passed to Home Manager. This
         option can be used to pass additional arguments to all modules.
@@ -84,7 +83,8 @@ in {
     sharedModules = mkOption {
       type = with types; listOf raw;
       default = [ ];
-      example = literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]";
+      example =
+        lib.literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]";
       description = ''
         Extra modules added to all users.
       '';
@@ -103,19 +103,18 @@ in {
     };
   };
 
-  config = (mkMerge [
+  config = (lib.mkMerge [
     # Fix potential recursion when configuring home-manager users based on values in users.users #594
     (mkIf (cfg.useUserPackages && cfg.users != { }) {
-      users.users =
-        (mapAttrs (username: usercfg: { packages = [ usercfg.home.path ]; })
-          cfg.users);
+      users.users = (lib.mapAttrs
+        (_username: usercfg: { packages = [ usercfg.home.path ]; }) cfg.users);
       environment.pathsToLink = [ "/etc/profile.d" ];
     })
     (mkIf (cfg.users != { }) {
-      warnings = flatten (flip mapAttrsToList cfg.users (user: config:
+      warnings = lib.flatten (flip lib.mapAttrsToList cfg.users (user: config:
         flip map config.warnings (warning: "${user} profile: ${warning}")));
 
-      assertions = flatten (flip mapAttrsToList cfg.users (user: config:
+      assertions = lib.flatten (flip lib.mapAttrsToList cfg.users (user: config:
         flip map config.assertions (assertion: {
           inherit (assertion) assertion;
           message = "${user} profile: ${assertion.message}";
diff --git a/nixos/default.nix b/nixos/default.nix
index 4484d28f8..ee973146c 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,19 +1,17 @@
 { config, lib, pkgs, utils, ... }:
 
-with lib;
-
 let
 
   cfg = config.home-manager;
 
-  serviceEnvironment = optionalAttrs (cfg.backupFileExtension != null) {
+  serviceEnvironment = lib.optionalAttrs (cfg.backupFileExtension != null) {
     HOME_MANAGER_BACKUP_EXT = cfg.backupFileExtension;
-  } // optionalAttrs cfg.verbose { VERBOSE = "1"; };
+  } // lib.optionalAttrs cfg.verbose { VERBOSE = "1"; };
 
 in {
   imports = [ ./common.nix ];
 
-  config = mkMerge [
+  config = lib.mkMerge [
     {
       home-manager = {
         extraSpecialArgs.nixosConfig = config;
@@ -33,10 +31,11 @@ in {
         }];
       };
     }
-    (mkIf (cfg.users != { }) {
-      systemd.services = mapAttrs' (_: usercfg:
+    (lib.mkIf (cfg.users != { }) {
+      systemd.services = lib.mapAttrs' (_: usercfg:
         let username = usercfg.home.username;
-        in nameValuePair ("home-manager-${utils.escapeSystemdPath username}") {
+        in lib.nameValuePair
+        "home-manager-${utils.escapeSystemdPath username}" {
           description = "Home Manager environment for ${username}";
           wantedBy = [ "multi-user.target" ];
           wants = [ "nix-daemon.socket" ];
@@ -61,7 +60,7 @@ in {
 
               sed = "${pkgs.gnused}/bin/sed";
 
-              exportedSystemdVariables = concatStringsSep "|" [
+              exportedSystemdVariables = lib.concatStringsSep "|" [
                 "DBUS_SESSION_BUS_ADDRESS"
                 "DISPLAY"
                 "WAYLAND_DISPLAY"
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
index dfbcfbd92..81766719e 100644
--- a/tests/modules/programs/firefox/profiles/bookmarks/default.nix
+++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -1,11 +1,9 @@
 modulePath:
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
@@ -18,7 +16,7 @@ let
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles.bookmarks = {
       settings = { "general.smoothScroll" = false; };
diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix
index 6a0d9e93f..e0e917773 100644
--- a/tests/modules/programs/firefox/profiles/containers/default.nix
+++ b/tests/modules/programs/firefox/profiles/containers/default.nix
@@ -1,18 +1,15 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ config, lib, ... }:
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles.containers = {
       containers = {
diff --git a/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
index a60522165..0c9d2e666 100644
--- a/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
+++ b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix
@@ -1,22 +1,20 @@
 modulePath:
 { config, lib, ... }:
 
-with lib;
-
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig ({
+  config = lib.mkIf config.test.enableBig ({
     test.asserts.assertions.expected = [''
       Must not have a ${cfg.name} container with an existing ID but
         - ID 9 is used by dangerous, shopping''];
-  } // setAttrByPath modulePath {
+  } // lib.setAttrByPath modulePath {
     enable = true;
 
     profiles = {
diff --git a/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
index f39666723..d2c273f9b 100644
--- a/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
+++ b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix
@@ -1,8 +1,6 @@
 modulePath:
 { config, lib, ... }:
 
-with lib;
-
 let
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
@@ -10,10 +8,10 @@ let
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig ({
+  config = lib.mkIf config.test.enableBig ({
     test.asserts.assertions.expected =
       [ "Container id must be smaller than 4294967294 (2^32 - 2)" ];
-  } // setAttrByPath modulePath {
+  } // lib.setAttrByPath modulePath {
     enable = true;
 
     profiles.my-profile = {
diff --git a/tests/modules/programs/firefox/profiles/duplicate-ids.nix b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
index dc5557b47..255715f4a 100644
--- a/tests/modules/programs/firefox/profiles/duplicate-ids.nix
+++ b/tests/modules/programs/firefox/profiles/duplicate-ids.nix
@@ -1,22 +1,20 @@
 modulePath:
 { config, lib, ... }:
 
-with lib;
-
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig ({
+  config = lib.mkIf config.test.enableBig ({
     test.asserts.assertions.expected = [''
       Must not have a ${cfg.name} profile with an existing ID but
         - ID 1 is used by first, second''];
-  } // setAttrByPath modulePath {
+  } // lib.setAttrByPath modulePath {
     enable = true;
 
     profiles = {
diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix
index 7f181b4fd..77fbe33b0 100644
--- a/tests/modules/programs/firefox/profiles/extensions/default.nix
+++ b/tests/modules/programs/firefox/profiles/extensions/default.nix
@@ -1,14 +1,14 @@
 modulePath:
 { config, lib, ... }:
-with lib;
+
 let
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles.extensions = {
       extensions = {
diff --git a/tests/modules/programs/firefox/profiles/overwrite/default.nix b/tests/modules/programs/firefox/profiles/overwrite/default.nix
index a0881032a..02ec789d6 100644
--- a/tests/modules/programs/firefox/profiles/overwrite/default.nix
+++ b/tests/modules/programs/firefox/profiles/overwrite/default.nix
@@ -1,18 +1,16 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles = {
       basic.isDefault = true;
diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix
index 76acfcd3a..689c58439 100644
--- a/tests/modules/programs/firefox/profiles/search/default.nix
+++ b/tests/modules/programs/firefox/profiles/search/default.nix
@@ -1,11 +1,9 @@
 modulePath:
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
@@ -18,7 +16,7 @@ let
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles = {
       search = {
diff --git a/tests/modules/programs/firefox/profiles/settings/default.nix b/tests/modules/programs/firefox/profiles/settings/default.nix
index 39d329ece..9c27a3515 100644
--- a/tests/modules/programs/firefox/profiles/settings/default.nix
+++ b/tests/modules/programs/firefox/profiles/settings/default.nix
@@ -1,18 +1,16 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, ... }:
 
 let
 
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     profiles = {
       basic.isDefault = true;
diff --git a/tests/modules/programs/firefox/profiles/shared-path.nix b/tests/modules/programs/firefox/profiles/shared-path.nix
index e6d4a06d4..b0936bfaa 100644
--- a/tests/modules/programs/firefox/profiles/shared-path.nix
+++ b/tests/modules/programs/firefox/profiles/shared-path.nix
@@ -1,13 +1,11 @@
 modulePath:
 { config, lib, ... }:
 
-with lib;
-
 let firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
 
     profiles = {
diff --git a/tests/modules/services/screen-locker/moved-options.nix b/tests/modules/services/screen-locker/moved-options.nix
index 9e0ca0da4..0f252a1d3 100644
--- a/tests/modules/services/screen-locker/moved-options.nix
+++ b/tests/modules/services/screen-locker/moved-options.nix
@@ -15,16 +15,15 @@
   nmt.script =
     (import ./basic-configuration.nix { inherit config pkgs; }).nmt.script;
 
-  test.asserts.warnings.expected = with lib;
-    let
-      renamed = {
-        xssLockExtraOptions = "xss-lock.extraOptions";
-        xautolockExtraOptions = "xautolock.extraOptions";
-        enableDetectSleep = "xautolock.detectSleep";
-      };
-    in mapAttrsToList (old: new:
-      builtins.replaceStrings [ "\n" ] [ " " ] ''
-        The option `services.screen-locker.${old}' defined in
-        ${showFiles options.services.screen-locker.${old}.files}
-        has been renamed to `services.screen-locker.${new}'.'') renamed;
+  test.asserts.warnings.expected = let
+    renamed = {
+      xssLockExtraOptions = "xss-lock.extraOptions";
+      xautolockExtraOptions = "xautolock.extraOptions";
+      enableDetectSleep = "xautolock.detectSleep";
+    };
+  in lib.mapAttrsToList (old: new:
+    builtins.replaceStrings [ "\n" ] [ " " ] ''
+      The option `services.screen-locker.${old}' defined in
+      ${lib.showFiles options.services.screen-locker.${old}.files}
+      has been renamed to `services.screen-locker.${new}'.'') renamed;
 }

From 6c2b79403e9ae852fbf1d55b29f2ea4d2aa43255 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 8 Mar 2025 01:09:12 +0100
Subject: [PATCH 482/546] treewide: use graphical-session.target for GUI
 services (#5785)

As per systemd.special(7)[0] graphical-session-pre.target is strictly
for units that set up things for a graphical session. Most notably,
these are usually started *before* the compositor/session is actually
ready.

While Home Manager's current implementation of graphical-session.target
allows these units to work regardless of what systemd.special(7)
specifies, other setups like ones with uwsm[1] do not allow these units
to start properly.

[0]: https://www.freedesktop.org/software/systemd/man/latest/systemd.special.html#graphical-session-pre.target
[1]: https://github.com/Vladimir-csp/uwsm
---
 modules/misc/numlock.nix                                      | 2 +-
 modules/services/amberol.nix                                  | 2 +-
 modules/services/autorandr.nix                                | 2 +-
 modules/services/barrier.nix                                  | 2 +-
 modules/services/batsignal.nix                                | 2 +-
 modules/services/blanket.nix                                  | 2 +-
 modules/services/blueman-applet.nix                           | 2 +-
 modules/services/cbatticon.nix                                | 2 +-
 modules/services/devilspie2.nix                               | 2 +-
 modules/services/easyeffects.nix                              | 2 +-
 modules/services/flameshot.nix                                | 2 +-
 modules/services/fusuma.nix                                   | 2 +-
 modules/services/grobi.nix                                    | 2 +-
 modules/services/gromit-mpx.nix                               | 2 +-
 modules/services/kdeconnect.nix                               | 4 ++--
 modules/services/keynav.nix                                   | 2 +-
 modules/services/mpd-discord-rpc.nix                          | 2 +-
 modules/services/network-manager-applet.nix                   | 2 +-
 modules/services/nextcloud-client.nix                         | 2 +-
 modules/services/notify-osd.nix                               | 2 +-
 modules/services/opensnitch-ui.nix                            | 2 +-
 modules/services/owncloud-client.nix                          | 2 +-
 modules/services/parcellite.nix                               | 2 +-
 modules/services/pasystray.nix                                | 2 +-
 modules/services/pbgopy.nix                                   | 2 +-
 modules/services/picom.nix                                    | 2 +-
 modules/services/plex-mpv-shim.nix                            | 2 +-
 modules/services/poweralertd.nix                              | 2 +-
 modules/services/pulseeffects.nix                             | 2 +-
 modules/services/random-background.nix                        | 2 +-
 modules/services/redshift-gammastep/lib/options.nix           | 2 +-
 modules/services/remmina.nix                                  | 2 +-
 modules/services/rsibreak.nix                                 | 2 +-
 modules/services/screen-locker.nix                            | 4 ++--
 modules/services/sctd.nix                                     | 2 +-
 modules/services/syncthing.nix                                | 4 ++--
 modules/services/trayscale.nix                                | 2 +-
 modules/services/twmn.nix                                     | 2 +-
 modules/services/udiskie.nix                                  | 2 +-
 modules/services/unclutter.nix                                | 2 +-
 modules/services/wlsunset.nix                                 | 1 +
 modules/services/xcape.nix                                    | 4 ++--
 modules/services/xembed-sni-proxy.nix                         | 2 +-
 modules/services/xscreensaver.nix                             | 2 +-
 modules/services/xsuspender.nix                               | 2 +-
 tests/modules/services/blanket/basic-configuration.nix        | 2 +-
 tests/modules/services/fusuma/expected-service.service        | 2 +-
 tests/modules/services/parcellite/parcellite-expected.service | 2 +-
 tests/modules/services/pasystray/expected.service             | 2 +-
 .../services/picom/picom-basic-configuration-expected.service | 2 +-
 .../gammastep-basic-configuration-expected.service            | 2 +-
 .../redshift-basic-configuration-expected.service             | 2 +-
 .../services/wlsunset/wlsunset-service-expected.service       | 1 +
 53 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/modules/misc/numlock.nix b/modules/misc/numlock.nix
index 903ab449a..e453a0951 100644
--- a/modules/misc/numlock.nix
+++ b/modules/misc/numlock.nix
@@ -18,7 +18,7 @@ in {
     systemd.user.services.numlockx = {
       Unit = {
         Description = "NumLockX";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/amberol.nix b/modules/services/amberol.nix
index a63012447..7aa169db4 100644
--- a/modules/services/amberol.nix
+++ b/modules/services/amberol.nix
@@ -54,7 +54,7 @@ in {
       Unit = {
         Description = "Amberol music player daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/autorandr.nix b/modules/services/autorandr.nix
index 64e6008e8..89ee612b2 100644
--- a/modules/services/autorandr.nix
+++ b/modules/services/autorandr.nix
@@ -36,7 +36,7 @@ in {
     systemd.user.services.autorandr = {
       Unit = {
         Description = "autorandr";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix
index 513a7e749..59c4cbf75 100644
--- a/modules/services/barrier.nix
+++ b/modules/services/barrier.nix
@@ -63,7 +63,7 @@ in {
     systemd.user.services.barrierc = {
       Unit = {
         Description = "Barrier Client daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install.WantedBy = [ "graphical-session.target" ];
diff --git a/modules/services/batsignal.nix b/modules/services/batsignal.nix
index 4f209f1e0..be5cf5347 100644
--- a/modules/services/batsignal.nix
+++ b/modules/services/batsignal.nix
@@ -32,7 +32,7 @@ in {
     systemd.user.services.batsignal = {
       Unit = {
         Description = "batsignal - battery monitor daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/blanket.nix b/modules/services/blanket.nix
index 5eeb2ab1e..bcc08ac85 100644
--- a/modules/services/blanket.nix
+++ b/modules/services/blanket.nix
@@ -24,7 +24,7 @@ in {
       Unit = {
         Description = "Blanket daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pipewire.service" ];
       };
 
diff --git a/modules/services/blueman-applet.nix b/modules/services/blueman-applet.nix
index 5211534c4..47f81b48c 100644
--- a/modules/services/blueman-applet.nix
+++ b/modules/services/blueman-applet.nix
@@ -30,7 +30,7 @@ with lib;
       Unit = {
         Description = "Blueman applet";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/cbatticon.nix b/modules/services/cbatticon.nix
index 1616b2dcd..eebb5bdbc 100644
--- a/modules/services/cbatticon.nix
+++ b/modules/services/cbatticon.nix
@@ -118,7 +118,7 @@ in {
       Unit = {
         Description = "cbatticon system tray battery icon";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/devilspie2.nix b/modules/services/devilspie2.nix
index fa77153e7..ab61e9778 100644
--- a/modules/services/devilspie2.nix
+++ b/modules/services/devilspie2.nix
@@ -36,7 +36,7 @@ in {
       Service.ExecStart = "${pkgs.devilspie2}/bin/devilspie2";
       Unit = {
         Description = "devilspie2";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install.WantedBy = [ "graphical-session.target" ];
diff --git a/modules/services/easyeffects.nix b/modules/services/easyeffects.nix
index fd5e4b404..b71ec8d83 100644
--- a/modules/services/easyeffects.nix
+++ b/modules/services/easyeffects.nix
@@ -51,7 +51,7 @@ in {
       Unit = {
         Description = "Easyeffects daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pipewire.service" ];
       };
 
diff --git a/modules/services/flameshot.nix b/modules/services/flameshot.nix
index ebdfd0067..b35f518b3 100644
--- a/modules/services/flameshot.nix
+++ b/modules/services/flameshot.nix
@@ -56,7 +56,7 @@ in {
       Unit = {
         Description = "Flameshot screenshot tool";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers = mkIf (cfg.settings != { }) [ "${iniFile}" ];
       };
diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix
index 17d8b1431..aa81320b1 100644
--- a/modules/services/fusuma.nix
+++ b/modules/services/fusuma.nix
@@ -119,7 +119,7 @@ in {
     systemd.user.services.fusuma = {
       Unit = {
         Description = "Fusuma services";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix
index 9031089c9..c8a3b1412 100644
--- a/modules/services/grobi.nix
+++ b/modules/services/grobi.nix
@@ -79,7 +79,7 @@ in {
     systemd.user.services.grobi = {
       Unit = {
         Description = "grobi display auto config daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/gromit-mpx.nix b/modules/services/gromit-mpx.nix
index f46eddb39..142c49814 100644
--- a/modules/services/gromit-mpx.nix
+++ b/modules/services/gromit-mpx.nix
@@ -215,7 +215,7 @@ in {
     systemd.user.services.gromit-mpx = {
       Unit = {
         Description = "Gromit-MPX";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers = [
           "${config.xdg.configFile."gromit-mpx.cfg".source}"
diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix
index f30d79fc5..3e6822744 100644
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@@ -40,7 +40,7 @@ in {
         Unit = {
           Description =
             "Adds communication between your desktop and your smartphone";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
@@ -69,7 +69,7 @@ in {
         Unit = {
           Description = "kdeconnect-indicator";
           After = [
-            "graphical-session-pre.target"
+            "graphical-session.target"
             "polybar.service"
             "taffybar.service"
             "stalonetray.service"
diff --git a/modules/services/keynav.nix b/modules/services/keynav.nix
index d83252e53..7ba5ce2e0 100644
--- a/modules/services/keynav.nix
+++ b/modules/services/keynav.nix
@@ -18,7 +18,7 @@ in {
     systemd.user.services.keynav = {
       Unit = {
         Description = "keynav";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc.nix
index 8996051a5..dfe408921 100644
--- a/modules/services/mpd-discord-rpc.nix
+++ b/modules/services/mpd-discord-rpc.nix
@@ -50,7 +50,7 @@ in {
       Unit = {
         Description = "Discord Rich Presence for MPD";
         Documentation = "https://github.com/JakeStanger/mpd-discord-rpc";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Service = {
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index 8d15aa293..8738cae66 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -28,7 +28,7 @@ in {
       Unit = {
         Description = "Network Manager applet";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client.nix
index 24b3c99dd..7a3ceacb1 100644
--- a/modules/services/nextcloud-client.nix
+++ b/modules/services/nextcloud-client.nix
@@ -36,7 +36,7 @@ in {
     systemd.user.services.nextcloud-client = {
       Unit = {
         Description = "Nextcloud Client";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/notify-osd.nix b/modules/services/notify-osd.nix
index 4faf83643..b118a275e 100644
--- a/modules/services/notify-osd.nix
+++ b/modules/services/notify-osd.nix
@@ -33,7 +33,7 @@ in {
     systemd.user.services.notify-osd = {
       Unit = {
         Description = "notify-osd";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/opensnitch-ui.nix b/modules/services/opensnitch-ui.nix
index f45ee9cdb..a6df254f5 100644
--- a/modules/services/opensnitch-ui.nix
+++ b/modules/services/opensnitch-ui.nix
@@ -23,7 +23,7 @@ in {
     systemd.user.services.opensnitch-ui = {
       Unit = {
         Description = "Opensnitch ui";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client.nix
index 3235dac9c..aad2d487c 100644
--- a/modules/services/owncloud-client.nix
+++ b/modules/services/owncloud-client.nix
@@ -24,7 +24,7 @@ in {
     systemd.user.services.owncloud-client = {
       Unit = {
         Description = "Owncloud Client";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/parcellite.nix b/modules/services/parcellite.nix
index 39b81e869..dc6b84c41 100644
--- a/modules/services/parcellite.nix
+++ b/modules/services/parcellite.nix
@@ -42,7 +42,7 @@ in {
       Unit = {
         Description = "Lightweight GTK+ clipboard manager";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix
index 4ea340d21..62e203584 100644
--- a/modules/services/pasystray.nix
+++ b/modules/services/pasystray.nix
@@ -30,7 +30,7 @@ in {
       Unit = {
         Description = "PulseAudio system tray";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pbgopy.nix b/modules/services/pbgopy.nix
index 3a3499e52..48556a5ba 100644
--- a/modules/services/pbgopy.nix
+++ b/modules/services/pbgopy.nix
@@ -60,7 +60,7 @@ in {
     systemd.user.services.pbgopy = {
       Unit = {
         Description = "pbgopy server for sharing the clipboard between devices";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Service = {
diff --git a/modules/services/picom.nix b/modules/services/picom.nix
index 1d9b7bb55..59e373a62 100644
--- a/modules/services/picom.nix
+++ b/modules/services/picom.nix
@@ -310,7 +310,7 @@ in {
     systemd.user.services.picom = {
       Unit = {
         Description = "Picom X11 compositor";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim.nix
index 940e57184..795827c40 100644
--- a/modules/services/plex-mpv-shim.nix
+++ b/modules/services/plex-mpv-shim.nix
@@ -58,7 +58,7 @@ in {
     systemd.user.services.plex-mpv-shim = {
       Unit = {
         Description = "Plex mpv shim";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/poweralertd.nix b/modules/services/poweralertd.nix
index 9c59ad3f0..20481e905 100644
--- a/modules/services/poweralertd.nix
+++ b/modules/services/poweralertd.nix
@@ -44,7 +44,7 @@ in {
       Unit = {
         Description = "UPower-powered power alerter";
         Documentation = "man:poweralertd(1)";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects.nix
index 3edc53499..c4a150c17 100644
--- a/modules/services/pulseeffects.nix
+++ b/modules/services/pulseeffects.nix
@@ -52,7 +52,7 @@ in {
       Unit = {
         Description = "Pulseeffects daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pulseaudio.service" ];
       };
 
diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix
index 7e887f32e..499dc4e3b 100644
--- a/modules/services/random-background.nix
+++ b/modules/services/random-background.nix
@@ -76,7 +76,7 @@ in {
       systemd.user.services.random-background = {
         Unit = {
           Description = "Set random desktop background using feh";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
diff --git a/modules/services/redshift-gammastep/lib/options.nix b/modules/services/redshift-gammastep/lib/options.nix
index 81347e643..476f8baa3 100644
--- a/modules/services/redshift-gammastep/lib/options.nix
+++ b/modules/services/redshift-gammastep/lib/options.nix
@@ -189,7 +189,7 @@ in {
       in {
         Description = "${programName} colour temperature adjuster";
         Documentation = serviceDocumentation;
-        After = [ "graphical-session-pre.target" ] ++ geoclueAgentService;
+        After = [ "graphical-session.target" ] ++ geoclueAgentService;
         Wants = geoclueAgentService;
         PartOf = [ "graphical-session.target" ];
       };
diff --git a/modules/services/remmina.nix b/modules/services/remmina.nix
index dac0471db..de86fe215 100644
--- a/modules/services/remmina.nix
+++ b/modules/services/remmina.nix
@@ -39,7 +39,7 @@ in {
         Unit = {
           Description = "Remmina remote desktop client";
           Documentation = "man:remmina(1)";
-          Requires = [ "graphical-session-pre.target" ];
+          Requires = [ "graphical-session.target" ];
         };
 
         Service = {
diff --git a/modules/services/rsibreak.nix b/modules/services/rsibreak.nix
index d587c2daf..e3743090f 100644
--- a/modules/services/rsibreak.nix
+++ b/modules/services/rsibreak.nix
@@ -23,7 +23,7 @@ in {
     systemd.user.services.rsibreak = {
       Unit = {
         Description = "RSI break timer";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index b552e1ba4..0ec9ba528 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -117,7 +117,7 @@ in {
       systemd.user.services.xss-lock = {
         Unit = {
           Description = "xss-lock, session locker service";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
@@ -141,7 +141,7 @@ in {
       systemd.user.services.xautolock-session = {
         Unit = {
           Description = "xautolock, session locker service";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
diff --git a/modules/services/sctd.nix b/modules/services/sctd.nix
index 44c770264..4e9671747 100644
--- a/modules/services/sctd.nix
+++ b/modules/services/sctd.nix
@@ -30,7 +30,7 @@ with lib;
       Unit = {
         Description =
           "Dynamically adjust the screen color temperature twice every minute";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 72c578ba1..0370dceae 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -728,7 +728,7 @@ in {
           Unit = {
             Description = cfg.tray.package.pname;
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [ "graphical-session.target" "tray.target" ];
             PartOf = [ "graphical-session.target" ];
           };
 
@@ -753,7 +753,7 @@ in {
           Unit = {
             Description = "syncthingtray";
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [ "graphical-session.target" "tray.target" ];
             PartOf = [ "graphical-session.target" ];
           };
 
diff --git a/modules/services/trayscale.nix b/modules/services/trayscale.nix
index d9853d7aa..0760448c6 100644
--- a/modules/services/trayscale.nix
+++ b/modules/services/trayscale.nix
@@ -28,7 +28,7 @@ in {
         Description =
           "An unofficial GUI wrapper around the Tailscale CLI client";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install = { WantedBy = [ "graphical-session.target" ]; };
diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix
index c29ff621b..e4d9f67b9 100644
--- a/modules/services/twmn.nix
+++ b/modules/services/twmn.nix
@@ -361,7 +361,7 @@ in {
     systemd.user.services.twmnd = {
       Unit = {
         Description = "twmn daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."twmn/twmn.conf".source}" ];
diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index 2572b3594..c6165ecf5 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -116,7 +116,7 @@ in {
       Unit = {
         Description = "udiskie mount daemon";
         Requires = lib.optional (cfg.tray != "never") "tray.target";
-        After = [ "graphical-session-pre.target" ]
+        After = [ "graphical-session.target" ]
           ++ lib.optional (cfg.tray != "never") "tray.target";
         PartOf = [ "graphical-session.target" ];
       };
diff --git a/modules/services/unclutter.nix b/modules/services/unclutter.nix
index e08c23eb3..d0327b5e1 100644
--- a/modules/services/unclutter.nix
+++ b/modules/services/unclutter.nix
@@ -45,7 +45,7 @@ in {
     systemd.user.services.unclutter = {
       Unit = {
         Description = "unclutter";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix
index f3352750c..4bbd98e0b 100644
--- a/modules/services/wlsunset.nix
+++ b/modules/services/wlsunset.nix
@@ -128,6 +128,7 @@ in {
     systemd.user.services.wlsunset = {
       Unit = {
         Description = "Day/night gamma adjustments for Wayland compositors.";
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/xcape.nix b/modules/services/xcape.nix
index 130db65b5..fa80607ce 100644
--- a/modules/services/xcape.nix
+++ b/modules/services/xcape.nix
@@ -60,11 +60,11 @@ in {
       Unit = mkMerge [
         {
           Description = "xcape";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         }
         (mkIf (config.home.keyboard != null && config.home.keyboard != { }) {
-          After = [ "graphical-session-pre.target" "setxkbmap.service" ];
+          After = [ "graphical-session.target" "setxkbmap.service" ];
         })
       ];
 
diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy.nix
index 4273e81a3..4a6fd1fad 100644
--- a/modules/services/xembed-sni-proxy.nix
+++ b/modules/services/xembed-sni-proxy.nix
@@ -34,7 +34,7 @@ in {
     systemd.user.services.xembed-sni-proxy = {
       Unit = {
         Description = "XEmbed SNI Proxy";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix
index c5d6126be..0931f3d8a 100644
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@@ -50,7 +50,7 @@ in {
     systemd.user.services.xscreensaver = {
       Unit = {
         Description = "XScreenSaver";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
 
         # Make sure the service is restarted if the settings change.
diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender.nix
index 058f15471..412f374c4 100644
--- a/modules/services/xsuspender.nix
+++ b/modules/services/xsuspender.nix
@@ -183,7 +183,7 @@ in {
     systemd.user.services.xsuspender = {
       Unit = {
         Description = "XSuspender";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."xsuspender.conf".source}" ];
diff --git a/tests/modules/services/blanket/basic-configuration.nix b/tests/modules/services/blanket/basic-configuration.nix
index f51d5ac0a..f4ded9e9c 100644
--- a/tests/modules/services/blanket/basic-configuration.nix
+++ b/tests/modules/services/blanket/basic-configuration.nix
@@ -16,7 +16,7 @@
         RestartSec=5
 
         [Unit]
-        After=graphical-session-pre.target
+        After=graphical-session.target
         Description=Blanket daemon
         PartOf=graphical-session.target
         PartOf=pipewire.service
diff --git a/tests/modules/services/fusuma/expected-service.service b/tests/modules/services/fusuma/expected-service.service
index 585d8a85e..e84077daf 100644
--- a/tests/modules/services/fusuma/expected-service.service
+++ b/tests/modules/services/fusuma/expected-service.service
@@ -6,6 +6,6 @@ Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
 ExecStart=@fusuma@/bin/fusuma
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Fusuma services
 PartOf=graphical-session.target
diff --git a/tests/modules/services/parcellite/parcellite-expected.service b/tests/modules/services/parcellite/parcellite-expected.service
index f1e7e2333..7e0865aa7 100644
--- a/tests/modules/services/parcellite/parcellite-expected.service
+++ b/tests/modules/services/parcellite/parcellite-expected.service
@@ -6,7 +6,7 @@ ExecStart=@parcellite@/bin/parcellite --no-icon
 Restart=on-abort
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 After=tray.target
 Description=Lightweight GTK+ clipboard manager
 PartOf=graphical-session.target
diff --git a/tests/modules/services/pasystray/expected.service b/tests/modules/services/pasystray/expected.service
index 7bea7f215..871f01255 100644
--- a/tests/modules/services/pasystray/expected.service
+++ b/tests/modules/services/pasystray/expected.service
@@ -6,7 +6,7 @@ Environment=PATH=@paprefs@/bin:@pavucontrol@/bin
 ExecStart=@pasystray@/bin/pasystray -g
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 After=tray.target
 Description=PulseAudio system tray
 PartOf=graphical-session.target
diff --git a/tests/modules/services/picom/picom-basic-configuration-expected.service b/tests/modules/services/picom/picom-basic-configuration-expected.service
index 6aeef2249..c0463eeff 100644
--- a/tests/modules/services/picom/picom-basic-configuration-expected.service
+++ b/tests/modules/services/picom/picom-basic-configuration-expected.service
@@ -7,6 +7,6 @@ Restart=always
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Picom X11 compositor
 PartOf=graphical-session.target
diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
index 35eaf519f..a877b60f8 100644
--- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
+++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
@@ -7,7 +7,7 @@ Restart=on-failure
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Gammastep colour temperature adjuster
 Documentation=https://gitlab.com/chinstrap/gammastep/
 PartOf=graphical-session.target
diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
index 5dce5dc19..7177fab8f 100644
--- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
+++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
@@ -7,7 +7,7 @@ Restart=on-failure
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Redshift colour temperature adjuster
 Documentation=http://jonls.dk/redshift/
 PartOf=graphical-session.target
diff --git a/tests/modules/services/wlsunset/wlsunset-service-expected.service b/tests/modules/services/wlsunset/wlsunset-service-expected.service
index fecd05b9f..d4006618f 100644
--- a/tests/modules/services/wlsunset/wlsunset-service-expected.service
+++ b/tests/modules/services/wlsunset/wlsunset-service-expected.service
@@ -5,5 +5,6 @@ WantedBy=test.target
 ExecStart=@wlsunset@/bin/wlsunset -L 128.8 -T 6000 -g 0.6 -l 12.3 -t 3500
 
 [Unit]
+After=graphical-session.target
 Description=Day/night gamma adjustments for Wayland compositors.
 PartOf=graphical-session.target

From d2c014e1c73195d1958abec0c5ca6112b07b79da Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Mar 2025 18:17:52 -0600
Subject: [PATCH 483/546] treewide: null package support (#6582)

Can generate the config without installing application through home-manager. Helpful when a package is broken (or not provided) on a specific platform through nixpkgs and needs to be installed through other means but you still can benefit from the declarative configuration.
---
 modules/programs/aerc.nix                     |  4 +--
 modules/programs/aerospace.nix                |  4 +--
 modules/programs/alot.nix                     |  4 +--
 modules/programs/bacon.nix                    |  4 +--
 modules/programs/bash.nix                     |  7 +++--
 modules/programs/bemenu.nix                   |  4 +--
 modules/programs/borgmatic.nix                |  4 +--
 modules/programs/boxxy.nix                    |  4 +--
 modules/programs/btop.nix                     |  4 +--
 modules/programs/bun.nix                      | 22 ++++++++-----
 modules/programs/cava.nix                     |  4 +--
 modules/programs/cavalier.nix                 |  4 +--
 modules/programs/comodoro.nix                 |  4 +--
 modules/programs/darcs.nix                    |  4 +--
 modules/programs/discocss.nix                 |  8 ++---
 modules/programs/earthly.nix                  |  4 +--
 modules/programs/eza.nix                      |  4 +--
 modules/programs/fastfetch.nix                |  4 +--
 modules/programs/fd.nix                       |  4 +--
 modules/programs/feh.nix                      |  4 +--
 modules/programs/freetube.nix                 |  4 +--
 modules/programs/fuzzel.nix                   |  4 +--
 modules/programs/gallery-dl.nix               |  4 +--
 modules/programs/gh-dash.nix                  |  6 ++--
 modules/programs/git-cliff.nix                |  4 +--
 modules/programs/gradle.nix                   |  7 +++--
 modules/programs/havoc.nix                    |  4 +--
 modules/programs/himalaya.nix                 | 27 ++++++++--------
 modules/programs/hyprlock.nix                 |  4 +--
 modules/programs/i3status.nix                 |  4 +--
 modules/programs/imv.nix                      |  4 +--
 modules/programs/jqp.nix                      |  4 +--
 modules/programs/jujutsu.nix                  |  4 +--
 modules/programs/k9s.nix                      |  4 +--
 modules/programs/kakoune.nix                  | 12 +++++--
 modules/programs/khal.nix                     |  4 +--
 modules/programs/kubecolor.nix                | 13 ++++++--
 modules/programs/lapce.nix                    |  4 +--
 modules/programs/lazygit.nix                  |  4 +--
 modules/programs/ledger.nix                   |  4 +--
 modules/programs/looking-glass-client.nix     |  4 +--
 modules/programs/micro.nix                    |  4 +--
 modules/programs/mise.nix                     | 12 +++++--
 modules/programs/mr.nix                       |  4 +--
 modules/programs/neovide.nix                  |  4 +--
 modules/programs/nheko.nix                    |  4 +--
 modules/programs/nushell.nix                  | 12 +++++--
 modules/programs/openstackclient.nix          |  4 +--
 modules/programs/papis.nix                    |  4 +--
 modules/programs/poetry.nix                   |  3 +-
 modules/programs/rio.nix                      |  4 +--
 modules/programs/ripgrep.nix                  | 11 +++----
 modules/programs/rofi-pass.nix                |  8 +++--
 modules/programs/ruff.nix                     |  4 +--
 modules/programs/sagemath.nix                 | 13 ++++----
 modules/programs/sapling.nix                  |  4 +--
 modules/programs/sftpman.nix                  |  4 +--
 modules/programs/sm64ex.nix                   |  8 ++---
 modules/programs/spotify-player.nix           |  4 +--
 modules/programs/swaylock.nix                 |  4 +--
 modules/programs/taskwarrior.nix              | 16 +++++-----
 modules/programs/tofi.nix                     |  4 +--
 modules/programs/vifm.nix                     |  4 +--
 modules/programs/vim-vint.nix                 |  4 +--
 modules/programs/vinegar.nix                  |  4 +--
 modules/programs/wlogout.nix                  |  4 +--
 modules/programs/wofi.nix                     |  4 +--
 modules/programs/xplr.nix                     |  8 ++---
 modules/programs/yambar.nix                   |  4 +--
 modules/programs/yazi.nix                     |  4 +--
 modules/programs/zk.nix                       |  4 +--
 modules/services/clipse.nix                   | 31 ++++++++++---------
 modules/services/darkman.nix                  |  6 ++--
 modules/services/glance.nix                   |  4 +--
 modules/services/hypridle.nix                 |  4 +--
 modules/services/hyprpaper.nix                |  4 +--
 modules/services/listenbrainz-mpd.nix         |  4 +--
 modules/services/pueue.nix                    |  6 ++--
 modules/services/swaync.nix                   |  5 +--
 modules/services/window-managers/fluxbox.nix  |  4 +--
 .../services/window-managers/i3-sway/i3.nix   |  4 +--
 modules/services/wob.nix                      |  4 +--
 modules/services/wpaperd.nix                  |  6 ++--
 83 files changed, 269 insertions(+), 222 deletions(-)

diff --git a/modules/programs/aerc.nix b/modules/programs/aerc.nix
index 7a48d91a5..477bfddfd 100644
--- a/modules/programs/aerc.nix
+++ b/modules/programs/aerc.nix
@@ -38,7 +38,7 @@ in {
 
     enable = mkEnableOption "aerc";
 
-    package = mkPackageOption pkgs "aerc" { };
+    package = mkPackageOption pkgs "aerc" { nullable = true; };
 
     extraAccounts = mkOption {
       type = sectionsOrLines;
@@ -193,7 +193,7 @@ in {
       '';
     }];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file = {
       "${configDir}/accounts.conf" = mkIf genAccountsConf {
diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
index 62f33752f..bb66fee4d 100644
--- a/modules/programs/aerospace.nix
+++ b/modules/programs/aerospace.nix
@@ -29,7 +29,7 @@ in {
   options.programs.aerospace = {
     enable = lib.mkEnableOption "AeroSpace window manager";
 
-    package = lib.mkPackageOption pkgs "aerospace" { };
+    package = lib.mkPackageOption pkgs "aerospace" { nullable = true; };
 
     userSettings = mkOption {
       type = types.submodule {
@@ -232,7 +232,7 @@ in {
     ];
 
     home = {
-      packages = [ cfg.package ];
+      packages = lib.mkIf (cfg.package != null) [ cfg.package ];
       file.".config/aerospace/aerospace.toml".source =
         tomlFormat.generate "aerospace" (filterNulls cfg.userSettings);
     };
diff --git a/modules/programs/alot.nix b/modules/programs/alot.nix
index 10dec7c0c..243215746 100644
--- a/modules/programs/alot.nix
+++ b/modules/programs/alot.nix
@@ -132,7 +132,7 @@ in {
         '';
       };
 
-      package = mkPackageOption pkgs "alot" { };
+      package = mkPackageOption pkgs "alot" { nullable = true; };
 
       hooks = mkOption {
         type = types.lines;
@@ -231,7 +231,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."alot/config".text = configFile;
 
diff --git a/modules/programs/bacon.nix b/modules/programs/bacon.nix
index ad2e9b5b8..528be2a06 100644
--- a/modules/programs/bacon.nix
+++ b/modules/programs/bacon.nix
@@ -19,7 +19,7 @@ in {
   options.programs.bacon = {
     enable = mkEnableOption "bacon, a background rust code checker";
 
-    package = mkPackageOption pkgs "bacon" { };
+    package = mkPackageOption pkgs "bacon" { nullable = true; };
 
     settings = mkOption {
       type = settingsFormat.type;
@@ -38,7 +38,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${configDir}/prefs.toml" = mkIf (cfg.settings != { }) {
       source = settingsFormat.generate "prefs.toml" cfg.settings;
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 0c99da3ed..e9cf983dd 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -29,7 +29,10 @@ in {
     programs.bash = {
       enable = mkEnableOption "GNU Bourne-Again SHell";
 
-      package = mkPackageOption pkgs "bash" { default = "bashInteractive"; };
+      package = mkPackageOption pkgs "bash" {
+        nullable = true;
+        default = "bashInteractive";
+      };
 
       enableCompletion = mkOption {
         type = types.bool;
@@ -195,7 +198,7 @@ in {
         }) ++ optional (cfg.historyFile != null)
         ''mkdir -p "$(dirname "$HISTFILE")"''));
   in mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file.".bash_profile".source = writeBashScript "bash_profile" ''
       # include .profile if it exists
diff --git a/modules/programs/bemenu.nix b/modules/programs/bemenu.nix
index f90067216..6c6e793ff 100644
--- a/modules/programs/bemenu.nix
+++ b/modules/programs/bemenu.nix
@@ -12,7 +12,7 @@ in {
   options.programs.bemenu = {
     enable = mkEnableOption "bemenu";
 
-    package = mkPackageOption pkgs "bemenu" { };
+    package = mkPackageOption pkgs "bemenu" { nullable = true; };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ str number bool ]);
@@ -44,7 +44,7 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "programs.bemenu" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.sessionVariables = mkIf (cfg.settings != { }) {
       BEMENU_OPTS = cli.toGNUCommandLineShell { } cfg.settings;
diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix
index 97a1d54ce..92f171c27 100644
--- a/modules/programs/borgmatic.nix
+++ b/modules/programs/borgmatic.nix
@@ -243,7 +243,7 @@ in {
     programs.borgmatic = {
       enable = mkEnableOption "Borgmatic";
 
-      package = mkPackageOption pkgs "borgmatic" { };
+      package = mkPackageOption pkgs "borgmatic" { nullable = true; };
 
       backups = mkOption {
         type = types.attrsOf configModule;
@@ -292,6 +292,6 @@ in {
           text = writeConfig config;
         }) cfg.backups;
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
   };
 }
diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy.nix
index 566a11e7e..dc6c1cbdc 100644
--- a/modules/programs/boxxy.nix
+++ b/modules/programs/boxxy.nix
@@ -84,7 +84,7 @@ in {
   options.programs.boxxy = {
     enable = mkEnableOption "boxxy: Boxes in badly behaving applications";
 
-    package = mkPackageOption pkgs "boxxy" { };
+    package = mkPackageOption pkgs "boxxy" { nullable = true; };
 
     rules = mkOption {
       type = types.listOf boxxyRulesOpts;
@@ -102,7 +102,7 @@ in {
         settingsFormat.generate "boxxy-config.yaml" { rules = cfg.rules; };
     };
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
   };
 
   meta.maintainers = with lib.hm.maintainers; [ nikp123 ];
diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix
index b05e78995..61c7f795a 100644
--- a/modules/programs/btop.nix
+++ b/modules/programs/btop.nix
@@ -25,7 +25,7 @@ in {
   options.programs.btop = {
     enable = lib.mkEnableOption "btop";
 
-    package = lib.mkPackageOption pkgs "btop" { };
+    package = lib.mkPackageOption pkgs "btop" { nullable = true; };
 
     settings = lib.mkOption {
       type = with lib.types; attrsOf (oneOf [ bool float int str ]);
@@ -51,7 +51,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."btop/btop.conf" =
       lib.mkIf (cfg.settings != { }) { text = finalConfig; };
diff --git a/modules/programs/bun.nix b/modules/programs/bun.nix
index f186982e2..ffc9167ef 100644
--- a/modules/programs/bun.nix
+++ b/modules/programs/bun.nix
@@ -9,7 +9,7 @@ in {
   options.programs.bun = {
     enable = lib.mkEnableOption "Bun JavaScript runtime";
 
-    package = lib.mkPackageOption pkgs "bun" { };
+    package = lib.mkPackageOption pkgs "bun" { nullable = true; };
 
     settings = lib.mkOption {
       type = tomlFormat.type;
@@ -42,7 +42,13 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    warnings = lib.optional (cfg.package == null && cfg.enableGitIntegration) ''
+      You have enabled git integration for `bun` but have not set `package`.
+
+      Git integration will not be configured.
+    '';
+
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile.".bunfig.toml" = lib.mkIf (cfg.settings != { }) {
       source = tomlFormat.generate "bun-config" cfg.settings;
@@ -50,10 +56,12 @@ in {
 
     # https://bun.sh/docs/install/lockfile#how-do-i-git-diff-bun-s-lockfile
     programs.git.attributes =
-      lib.mkIf cfg.enableGitIntegration [ "*.lockb binary diff=lockb" ];
-    programs.git.extraConfig.diff.lockb = lib.mkIf cfg.enableGitIntegration {
-      textconv = lib.getExe cfg.package;
-      binary = true;
-    };
+      lib.mkIf (cfg.enableGitIntegration && (cfg.package != null))
+      [ "*.lockb binary diff=lockb" ];
+    programs.git.extraConfig.diff.lockb =
+      lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) {
+        textconv = lib.getExe cfg.package;
+        binary = true;
+      };
   };
 }
diff --git a/modules/programs/cava.nix b/modules/programs/cava.nix
index 63173248f..946656b06 100644
--- a/modules/programs/cava.nix
+++ b/modules/programs/cava.nix
@@ -14,7 +14,7 @@ in {
   options.programs.cava = {
     enable = mkEnableOption "Cava audio visualizer";
 
-    package = mkPackageOption pkgs "cava" { };
+    package = mkPackageOption pkgs "cava" { nullable = true; };
 
     settings = mkOption {
       type = iniFmt.type;
@@ -39,7 +39,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."cava/config" = mkIf (cfg.settings != { }) {
       text = ''
diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier.nix
index 0b57cf8e2..8ba05de93 100644
--- a/modules/programs/cavalier.nix
+++ b/modules/programs/cavalier.nix
@@ -16,7 +16,7 @@ in {
   options.programs.cavalier = {
     enable = mkEnableOption "Cava audio visualizer GUI";
 
-    package = mkPackageOption pkgs "cavalier" { };
+    package = mkPackageOption pkgs "cavalier" { nullable = true; };
 
     settings = {
       general = mkOption {
@@ -81,7 +81,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "Nickvision Cavalier/config.json" = mkIf (cfg.settings.general != { }) {
diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro.nix
index fba0bce86..af59261ef 100644
--- a/modules/programs/comodoro.nix
+++ b/modules/programs/comodoro.nix
@@ -10,7 +10,7 @@ in {
   options.programs.comodoro = {
     enable = lib.mkEnableOption "Comodoro, a CLI to manage your time";
 
-    package = lib.mkPackageOption pkgs "comodoro" { };
+    package = lib.mkPackageOption pkgs "comodoro" { nullable = true; };
 
     settings = lib.mkOption {
       type = lib.types.submodule { freeformType = tomlFormat.type; };
@@ -23,7 +23,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."comodoro/config.toml".source =
       tomlFormat.generate "comodoro-config.toml" cfg.settings;
diff --git a/modules/programs/darcs.nix b/modules/programs/darcs.nix
index a2a45cba4..263d668fe 100644
--- a/modules/programs/darcs.nix
+++ b/modules/programs/darcs.nix
@@ -13,7 +13,7 @@ in {
     programs.darcs = {
       enable = mkEnableOption "darcs";
 
-      package = mkPackageOption pkgs "darcs" { };
+      package = mkPackageOption pkgs "darcs" { nullable = true; };
 
       author = mkOption {
         type = types.listOf types.str;
@@ -36,7 +36,7 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
-    { home.packages = [ cfg.package ]; }
+    { home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; }
 
     (mkIf (cfg.author != [ ]) {
       home.file.".darcs/author".text =
diff --git a/modules/programs/discocss.nix b/modules/programs/discocss.nix
index 5a35f187f..7fa2c7965 100644
--- a/modules/programs/discocss.nix
+++ b/modules/programs/discocss.nix
@@ -11,9 +11,9 @@ in {
       enable = mkEnableOption
         "discocss, a tiny Discord CSS injector for Linux and MacOS";
 
-      package = mkPackageOption pkgs "discocss" { };
+      package = mkPackageOption pkgs "discocss" { nullable = true; };
 
-      discordPackage = mkPackageOption pkgs "discord" { };
+      discordPackage = mkPackageOption pkgs "discord" { nullable = true; };
 
       discordAlias = mkOption {
         type = types.bool;
@@ -37,10 +37,10 @@ in {
         "To use discocss with discordAlias you have to remove discord from home.packages, or set discordAlias to false.";
     }];
 
-    home.packages = [
+    home.packages = lib.mkIf (cfg.package != null) [
       (cfg.package.override {
         discordAlias = cfg.discordAlias;
-        discord = cfg.discordPackage;
+        discord = lib.mkIf (cfg.discordPackage != null) cfg.discordPackage;
       })
     ];
 
diff --git a/modules/programs/earthly.nix b/modules/programs/earthly.nix
index e4e2a19f0..a2b2a44c1 100644
--- a/modules/programs/earthly.nix
+++ b/modules/programs/earthly.nix
@@ -12,7 +12,7 @@ in {
   options.programs.earthly = {
     enable = lib.mkEnableOption "earthly";
 
-    package = lib.mkPackageOption pkgs "earthly" { };
+    package = lib.mkPackageOption pkgs "earthly" { nullable = true; };
 
     settings = lib.mkOption {
       type = yamlFormat.type;
@@ -31,7 +31,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file.".earthly/config.yml" = lib.mkIf (cfg.settings != { }) {
       source = yamlFormat.generate "earthly-config" cfg.settings;
diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix
index 55a4a1001..14547d730 100644
--- a/modules/programs/eza.nix
+++ b/modules/programs/eza.nix
@@ -72,7 +72,7 @@ with lib;
       '';
     };
 
-    package = mkPackageOption pkgs "eza" { };
+    package = mkPackageOption pkgs "eza" { nullable = true; };
   };
 
   config = let
@@ -105,7 +105,7 @@ with lib;
 
         programs.eza.icons = ${if cfg.icons then ''"auto"'' else "null"}'';
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     programs.bash.shellAliases = optionsAlias
       // optionalAttrs cfg.enableBashIntegration aliases;
diff --git a/modules/programs/fastfetch.nix b/modules/programs/fastfetch.nix
index 246e200f4..abc4d7cda 100644
--- a/modules/programs/fastfetch.nix
+++ b/modules/programs/fastfetch.nix
@@ -13,7 +13,7 @@ in {
   options.programs.fastfetch = {
     enable = mkEnableOption "Fastfetch";
 
-    package = mkPackageOption pkgs "fastfetch" { };
+    package = mkPackageOption pkgs "fastfetch" { nullable = true; };
 
     settings = mkOption {
       type = jsonFormat.type;
@@ -59,7 +59,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."fastfetch/config.jsonc" = mkIf (cfg.settings != { }) {
       source = jsonFormat.generate "config.jsonc" cfg.settings;
diff --git a/modules/programs/fd.nix b/modules/programs/fd.nix
index f8f59eb54..17911ebed 100644
--- a/modules/programs/fd.nix
+++ b/modules/programs/fd.nix
@@ -30,7 +30,7 @@ with lib; {
       '';
     };
 
-    package = mkPackageOption pkgs "fd" { };
+    package = mkPackageOption pkgs "fd" { nullable = true; };
   };
 
   config = let
@@ -40,7 +40,7 @@ with lib; {
 
     optionsAlias = optionalAttrs (args != "") { fd = "fd ${args}"; };
   in mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     programs.bash.shellAliases = optionsAlias;
 
diff --git a/modules/programs/feh.nix b/modules/programs/feh.nix
index bef9caac3..b96c9a27a 100644
--- a/modules/programs/feh.nix
+++ b/modules/programs/feh.nix
@@ -33,7 +33,7 @@ in {
   options.programs.feh = {
     enable = mkEnableOption "feh - a fast and light image viewer";
 
-    package = mkPackageOption pkgs "feh" { };
+    package = mkPackageOption pkgs "feh" { nullable = true; };
 
     buttons = mkOption {
       default = { };
@@ -104,7 +104,7 @@ in {
         "To disable a keybinding, use `null` instead of an empty string.";
     }];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."feh/buttons" =
       mkIf (cfg.buttons != { }) { text = renderBindings cfg.buttons + "\n"; };
diff --git a/modules/programs/freetube.nix b/modules/programs/freetube.nix
index 77700fe55..c2df1163a 100644
--- a/modules/programs/freetube.nix
+++ b/modules/programs/freetube.nix
@@ -21,7 +21,7 @@ in {
   options.programs.freetube = {
     enable = mkEnableOption "FreeTube, a YT client for Windows, Mac, and Linux";
 
-    package = mkPackageOption pkgs "freetube" { };
+    package = mkPackageOption pkgs "freetube" { nullable = true; };
 
     settings = mkOption {
       type = lib.types.attrs;
@@ -44,7 +44,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."FreeTube/hm_settings.db" = {
       source = pkgs.writeText "hm_settings.db" (settings cfg.settings);
diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix
index 5057c36d6..95c12c836 100644
--- a/modules/programs/fuzzel.nix
+++ b/modules/programs/fuzzel.nix
@@ -14,7 +14,7 @@ in {
   options.programs.fuzzel = {
     enable = mkEnableOption "fuzzel";
 
-    package = mkPackageOption pkgs "fuzzel" { };
+    package = mkPackageOption pkgs "fuzzel" { nullable = true; };
 
     settings = mkOption {
       type = iniFormat.type;
@@ -42,7 +42,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."fuzzel/fuzzel.ini" = mkIf (cfg.settings != { }) {
       source = iniFormat.generate "fuzzel.ini" cfg.settings;
diff --git a/modules/programs/gallery-dl.nix b/modules/programs/gallery-dl.nix
index 4f566e18b..7665d5c08 100644
--- a/modules/programs/gallery-dl.nix
+++ b/modules/programs/gallery-dl.nix
@@ -14,7 +14,7 @@ in {
   options.programs.gallery-dl = {
     enable = mkEnableOption "gallery-dl";
 
-    package = mkPackageOption pkgs "gallery-dl" { };
+    package = mkPackageOption pkgs "gallery-dl" { nullable = true; };
 
     settings = mkOption {
       type = jsonFormat.type;
@@ -34,7 +34,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."gallery-dl/config.json" = mkIf (cfg.settings != { }) {
       source = jsonFormat.generate "gallery-dl-settings" cfg.settings;
diff --git a/modules/programs/gh-dash.nix b/modules/programs/gh-dash.nix
index b351bb33a..324d0e81c 100644
--- a/modules/programs/gh-dash.nix
+++ b/modules/programs/gh-dash.nix
@@ -12,7 +12,7 @@ in {
   options.programs.gh-dash = {
     enable = lib.mkEnableOption "GitHub CLI dashboard plugin";
 
-    package = lib.mkPackageOption pkgs "gh-dash" { };
+    package = lib.mkPackageOption pkgs "gh-dash" { nullable = true; };
 
     settings = lib.mkOption {
       type = yamlFormat.type;
@@ -32,9 +32,9 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-    programs.gh.extensions = [ cfg.package ];
+    programs.gh.extensions = (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."gh-dash/config.yml".source =
       yamlFormat.generate "gh-dash-config.yml" cfg.settings;
diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff.nix
index cd7fb529d..ce9e26f39 100644
--- a/modules/programs/git-cliff.nix
+++ b/modules/programs/git-cliff.nix
@@ -13,7 +13,7 @@ in {
   options.programs.git-cliff = {
     enable = mkEnableOption "git-cliff changelog generator";
 
-    package = mkPackageOption pkgs "git-cliff" { };
+    package = mkPackageOption pkgs "git-cliff" { nullable = true; };
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -34,7 +34,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "git-cliff/cliff.toml" = mkIf (cfg.settings != { }) {
diff --git a/modules/programs/gradle.nix b/modules/programs/gradle.nix
index 8bf5d7898..f8bba3e46 100644
--- a/modules/programs/gradle.nix
+++ b/modules/programs/gradle.nix
@@ -50,7 +50,10 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "gradle" { example = "pkgs.gradle_7"; };
+    package = mkPackageOption pkgs "gradle" {
+      nullable = true;
+      example = "pkgs.gradle_7";
+    };
 
     settings = mkOption {
       type = types.submodule { freeformType = settingsFormat.type; };
@@ -95,7 +98,7 @@ in {
 
   config = let gradleHome = "${config.home.homeDirectory}/${cfg.home}";
   in mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file = mkMerge ([{
       "${cfg.home}/gradle.properties" = mkIf (cfg.settings != { }) {
diff --git a/modules/programs/havoc.nix b/modules/programs/havoc.nix
index c83a1c39a..5d48fbac1 100644
--- a/modules/programs/havoc.nix
+++ b/modules/programs/havoc.nix
@@ -13,7 +13,7 @@ in {
   options.programs.havoc = {
     enable = mkEnableOption "Havoc terminal";
 
-    package = mkPackageOption pkgs "havoc" { };
+    package = mkPackageOption pkgs "havoc" { nullable = true; };
 
     settings = mkOption {
       type = iniFormat.type;
@@ -54,7 +54,7 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "programs.havoc" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."havoc.cfg" = mkIf (cfg.settings != { }) {
       source = iniFormat.generate "havoc.cfg" cfg.settings;
diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 2348e0f93..5cba5a2f1 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -122,7 +122,7 @@ in {
   options = {
     programs.himalaya = {
       enable = mkEnableOption "the email client Himalaya CLI";
-      package = mkPackageOption pkgs "himalaya" { };
+      package = mkPackageOption pkgs "himalaya" { nullable = true; };
       settings = mkOption {
         type = types.submodule { freeformType = tomlFormat.type; };
         default = { };
@@ -153,7 +153,7 @@ in {
   };
 
   config = mkIf himalaya.enable {
-    home.packages = [ himalaya.package ];
+    home.packages = lib.mkIf (himalaya.package != null) [ himalaya.package ];
 
     xdg = {
       configFile."himalaya/config.toml".source = let
@@ -164,17 +164,18 @@ in {
         allConfig = globalConfig // { accounts = accountsConfig; };
       in tomlFormat.generate "himalaya.config.toml" allConfig;
 
-      desktopEntries.himalaya = mkIf pkgs.stdenv.hostPlatform.isLinux {
-        type = "Application";
-        name = "himalaya";
-        genericName = "Email Client";
-        comment = "CLI to manage emails";
-        terminal = true;
-        exec = "himalaya %u";
-        categories = [ "Network" ];
-        mimeType = [ "x-scheme-handler/mailto" "message/rfc822" ];
-        settings = { Keywords = "email"; };
-      };
+      desktopEntries.himalaya =
+        mkIf (pkgs.stdenv.hostPlatform.isLinux && (himalaya.package != null)) {
+          type = "Application";
+          name = "himalaya";
+          genericName = "Email Client";
+          comment = "CLI to manage emails";
+          terminal = true;
+          exec = "himalaya %u";
+          categories = [ "Network" ];
+          mimeType = [ "x-scheme-handler/mailto" "message/rfc822" ];
+          settings = { Keywords = "email"; };
+        };
     };
   };
 }
diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock.nix
index fe1014554..a59c133be 100644
--- a/modules/programs/hyprlock.nix
+++ b/modules/programs/hyprlock.nix
@@ -25,7 +25,7 @@ in {
       '';
     };
 
-    package = lib.mkPackageOption pkgs "hyprlock" { };
+    package = lib.mkPackageOption pkgs "hyprlock" { nullable = true; };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -110,7 +110,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."hypr/hyprlock.conf" =
       let shouldGenerate = cfg.extraConfig != "" || cfg.settings != { };
diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix
index 17b1162e8..343418dc6 100644
--- a/modules/programs/i3status.nix
+++ b/modules/programs/i3status.nix
@@ -130,7 +130,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "i3status" { };
+    package = mkPackageOption pkgs "i3status" { nullable = true; };
   };
 
   config = mkIf cfg.enable {
@@ -190,7 +190,7 @@ in {
       };
     };
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."i3status/config".text = concatStringsSep "\n" ([ ]
       ++ optional (cfg.general != { }) (formatModule "general" cfg.general)
diff --git a/modules/programs/imv.nix b/modules/programs/imv.nix
index 583c2c57c..2cad38134 100644
--- a/modules/programs/imv.nix
+++ b/modules/programs/imv.nix
@@ -16,7 +16,7 @@ in {
     enable = mkEnableOption
       "imv: a command line image viewer intended for use with tiling window managers";
 
-    package = mkPackageOption pkgs "imv" { };
+    package = mkPackageOption pkgs "imv" { nullable = true; };
 
     settings = mkOption {
       default = { };
@@ -38,7 +38,7 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "programs.imv" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile =
       mkIf (cfg.settings != { }) { "imv/config".text = toConfig cfg.settings; };
diff --git a/modules/programs/jqp.nix b/modules/programs/jqp.nix
index 94fc83573..e82bccb27 100644
--- a/modules/programs/jqp.nix
+++ b/modules/programs/jqp.nix
@@ -7,7 +7,7 @@ in {
   options.programs.jqp = {
     enable = lib.mkEnableOption "jqp, jq playground";
 
-    package = lib.mkPackageOption pkgs "jqp" { };
+    package = lib.mkPackageOption pkgs "jqp" { nullable = true; };
 
     settings = lib.mkOption {
       type = yamlFormat.type;
@@ -23,7 +23,7 @@ in {
   };
   config = lib.mkIf cfg.enable {
     home = {
-      packages = [ cfg.package ];
+      packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
       file.".jqp.yaml" = lib.mkIf (cfg.settings != { }) {
         source = yamlFormat.generate "jqp-config" cfg.settings;
diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix
index f0e1b4250..7ba71acbc 100644
--- a/modules/programs/jujutsu.nix
+++ b/modules/programs/jujutsu.nix
@@ -25,7 +25,7 @@ in {
     enable =
       mkEnableOption "a Git-compatible DVCS that is both simple and powerful";
 
-    package = mkPackageOption pkgs "jujutsu" { };
+    package = mkPackageOption pkgs "jujutsu" { nullable = true; };
 
     ediff = mkOption {
       type = types.bool;
@@ -54,7 +54,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${configDir}/jj/config.toml" = mkIf (cfg.settings != { }) {
       source = tomlFormat.generate "jujutsu-config" (cfg.settings
diff --git a/modules/programs/k9s.nix b/modules/programs/k9s.nix
index 0dd107883..b0d669822 100644
--- a/modules/programs/k9s.nix
+++ b/modules/programs/k9s.nix
@@ -24,7 +24,7 @@ in {
     enable =
       mkEnableOption "k9s - Kubernetes CLI To Manage Your Clusters In Style";
 
-    package = mkPackageOption pkgs "k9s" { };
+    package = mkPackageOption pkgs "k9s" { nullable = true; };
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -182,7 +182,7 @@ in {
     enableXdgConfig = !isDarwin || config.xdg.enable;
 
   in mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = mkIf enableXdgConfig ({
       "k9s/config.yaml" = mkIf (cfg.settings != { }) {
diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index 5e40952b9..7aed4125a 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -622,7 +622,7 @@ in {
     programs.kakoune = {
       enable = mkEnableOption "the kakoune text editor";
 
-      package = mkPackageOption pkgs "kakoune-unwrapped" { };
+      package = mkPackageOption pkgs "kakoune-unwrapped" { nullable = true; };
 
       config = mkOption {
         type = types.nullOr configModule;
@@ -656,6 +656,8 @@ in {
           List of kakoune plugins to install. To get a list of
           supported plugins run:
           {command}`nix-env -f '<nixpkgs>' -qaP -A kakounePlugins`.
+
+          Requires `package` to not be set to have effect.
         '';
       };
 
@@ -674,7 +676,13 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ kakouneWithPlugins ];
+    warnings = optional (cfg.package == null && cfg.plugins != [ ]) ''
+      You have configured `plugins` for `kakoune` but have not set `package`.
+
+      The listed plugins will not be installed.
+    '';
+
+    home.packages = lib.mkIf (cfg.package != null) [ kakouneWithPlugins ];
     home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "kak"; };
     xdg.configFile = mkMerge [
       { "kak/kakrc".source = configFile; }
diff --git a/modules/programs/khal.nix b/modules/programs/khal.nix
index a2e28e018..96879c52e 100644
--- a/modules/programs/khal.nix
+++ b/modules/programs/khal.nix
@@ -168,7 +168,7 @@ in {
   options.programs.khal = {
     enable = mkEnableOption "khal, a CLI calendar application";
 
-    package = mkPackageOption pkgs "khal" { };
+    package = mkPackageOption pkgs "khal" { nullable = true; };
 
     locale = mkOption {
       type = lib.types.submodule { options = localeOptions; };
@@ -199,7 +199,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."khal/config".text = concatStringsSep "\n" ([ "[calendars]" ]
       ++ mapAttrsToList genCalendarStr khalAccounts ++ [
diff --git a/modules/programs/kubecolor.nix b/modules/programs/kubecolor.nix
index d187c34d0..bf22232f1 100644
--- a/modules/programs/kubecolor.nix
+++ b/modules/programs/kubecolor.nix
@@ -55,7 +55,13 @@ in {
       "kube/color.yaml";
 
   in mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    warnings = optional (cfg.package == null && cfg.plugins != [ ]) ''
+      You have configured `enableAlias` for `kubecolor` but have not set `package`.
+
+      The alias will not be created.
+    '';
+
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.sessionVariables = if preferXdgDirectories then {
       KUBECOLOR_CONFIG = "${config.xdg.configHome}/${configPathSuffix}";
@@ -81,7 +87,8 @@ in {
       };
     };
 
-    home.shellAliases =
-      lib.mkIf cfg.enableAlias { kubectl = lib.getExe cfg.package; };
+    home.shellAliases = lib.mkIf (cfg.enableAlias && (cfg.package != null)) {
+      kubectl = lib.getExe cfg.package;
+    };
   };
 }
diff --git a/modules/programs/lapce.nix b/modules/programs/lapce.nix
index f3fd24f28..baf6f2404 100644
--- a/modules/programs/lapce.nix
+++ b/modules/programs/lapce.nix
@@ -7,7 +7,7 @@ let
 
   options = {
     enable = mkEnableOption "lapce";
-    package = mkPackageOption pkgs "lapce" { };
+    package = mkPackageOption pkgs "lapce" { nullable = true; };
     channel = mkOption {
       type = types.enum [ "stable" "nightly" ];
       default = "stable";
@@ -171,7 +171,7 @@ in {
   options.programs.lapce = options;
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg = let dir = "lapce-${cfg.channel}";
     in {
diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix
index b7761b557..0c355c6dc 100644
--- a/modules/programs/lazygit.nix
+++ b/modules/programs/lazygit.nix
@@ -16,7 +16,7 @@ in {
   options.programs.lazygit = {
     enable = mkEnableOption "lazygit, a simple terminal UI for git commands";
 
-    package = mkPackageOption pkgs "lazygit" { };
+    package = mkPackageOption pkgs "lazygit" { nullable = true; };
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -45,7 +45,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."Library/Application Support/lazygit/config.yml" =
       mkIf (cfg.settings != { } && (isDarwin && !config.xdg.enable)) {
diff --git a/modules/programs/ledger.nix b/modules/programs/ledger.nix
index 1b9178d15..441fc1574 100644
--- a/modules/programs/ledger.nix
+++ b/modules/programs/ledger.nix
@@ -21,7 +21,7 @@ in {
   options.programs.ledger = {
     enable = mkEnableOption "ledger, a double-entry accounting system";
 
-    package = mkPackageOption pkgs "ledger" { };
+    package = mkPackageOption pkgs "ledger" { nullable = true; };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
@@ -59,7 +59,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."ledger/ledgerrc" =
       mkIf (cfg.settings != { } || cfg.extraConfig != "") {
diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client.nix
index 1c14282b9..c17802441 100644
--- a/modules/programs/looking-glass-client.nix
+++ b/modules/programs/looking-glass-client.nix
@@ -11,7 +11,7 @@ in {
   options.programs.looking-glass-client = {
     enable = mkEnableOption "looking-glass-client";
 
-    package = mkPackageOption pkgs "looking-glass-client" { };
+    package = mkPackageOption pkgs "looking-glass-client" { nullable = true; };
 
     settings = mkOption {
       type = settingsFormat.type;
@@ -50,7 +50,7 @@ in {
         platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."looking-glass/client.ini" = mkIf (cfg.settings != { }) {
       source =
diff --git a/modules/programs/micro.nix b/modules/programs/micro.nix
index bf34f8e62..acd768679 100644
--- a/modules/programs/micro.nix
+++ b/modules/programs/micro.nix
@@ -15,7 +15,7 @@ in {
     programs.micro = {
       enable = mkEnableOption "micro, a terminal-based text editor";
 
-      package = mkPackageOption pkgs "micro" { };
+      package = mkPackageOption pkgs "micro" { nullable = true; };
 
       settings = mkOption {
         type = jsonFormat.type;
@@ -37,7 +37,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."micro/settings.json".source =
       jsonFormat.generate "micro-settings" cfg.settings;
diff --git a/modules/programs/mise.nix b/modules/programs/mise.nix
index 67b0a4b57..3ab263526 100644
--- a/modules/programs/mise.nix
+++ b/modules/programs/mise.nix
@@ -29,7 +29,7 @@ in {
     programs.mise = {
       enable = mkEnableOption "mise";
 
-      package = mkPackageOption pkgs "mise" { };
+      package = mkPackageOption pkgs "mise" { nullable = true; };
 
       enableBashIntegration =
         lib.hm.shell.mkBashIntegrationOption { inherit config; };
@@ -83,7 +83,15 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    warnings = optional (cfg.package == null && (cfg.enableBashIntegration
+      || cfg.enableZshIntegration || cfg.enableFishIntegration
+      || cfg.enableNushellIntegration)) ''
+        You have enabled shell integration for `mise` but have not set `package`.
+
+        The shell integration will not be added.
+      '';
+
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "mise/config.toml" = mkIf (cfg.globalConfig != { }) {
diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix
index 507189769..140aff32d 100644
--- a/modules/programs/mr.nix
+++ b/modules/programs/mr.nix
@@ -17,7 +17,7 @@ in {
     enable = mkEnableOption
       "mr, a tool to manage all your version control repositories";
 
-    package = mkPackageOption pkgs "mr" { };
+    package = mkPackageOption pkgs "mr" { nullable = true; };
 
     settings = mkOption {
       type = iniFormat.type;
@@ -42,7 +42,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
     home.file.".mrconfig".source = iniFormat.generate ".mrconfig" cfg.settings;
   };
 }
diff --git a/modules/programs/neovide.nix b/modules/programs/neovide.nix
index 3b40fb3eb..74d1a8e7b 100644
--- a/modules/programs/neovide.nix
+++ b/modules/programs/neovide.nix
@@ -11,7 +11,7 @@ in {
   options.programs.neovide = {
     enable = lib.mkEnableOption "Neovide, No Nonsense Neovim Client in Rust";
 
-    package = lib.mkPackageOption pkgs "neovide" { };
+    package = lib.mkPackageOption pkgs "neovide" { nullable = true; };
 
     settings = lib.mkOption {
       type = settingsFormat.type;
@@ -45,7 +45,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
     xdg.configFile."neovide/config.toml".source =
       settingsFormat.generate "config.toml" cfg.settings;
   };
diff --git a/modules/programs/nheko.nix b/modules/programs/nheko.nix
index 1bf1ae706..0e858b30e 100644
--- a/modules/programs/nheko.nix
+++ b/modules/programs/nheko.nix
@@ -24,7 +24,7 @@ in {
   options.programs.nheko = {
     enable = mkEnableOption "Qt desktop client for Matrix";
 
-    package = mkPackageOption pkgs "nheko" { };
+    package = mkPackageOption pkgs "nheko" { nullable = true; };
 
     settings = mkOption {
       type = iniFmt.type;
@@ -64,7 +64,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${configDir}/nheko/nheko.conf" = mkIf (cfg.settings != { }) {
       text = ''
diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index a4e767c8a..f18f6abff 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -46,7 +46,7 @@ in {
   options.programs.nushell = {
     enable = lib.mkEnableOption "nushell";
 
-    package = lib.mkPackageOption pkgs "nushell" { };
+    package = lib.mkPackageOption pkgs "nushell" { nullable = true; };
 
     configFile = lib.mkOption {
       type = types.nullOr (linesOrSource "config.nu");
@@ -197,7 +197,13 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    warnings = lib.optional (cfg.package == null && cfg.plugins != [ ]) ''
+      You have configured `plugins` for `nushell` but have not set `package`.
+
+      The listed plugins will not be installed.
+    '';
+
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file = lib.mkMerge [
       (let
@@ -261,7 +267,7 @@ in {
               (map (plugin: "plugin add ${lib.getExe plugin}") cfg.plugins)
             }'
         '';
-      in lib.mkIf (cfg.plugins != [ ]) {
+      in lib.mkIf ((cfg.package != null) && (cfg.plugins != [ ])) {
         "${configDir}/plugin.msgpackz".source = "${msgPackz}/plugin.msgpackz";
       })
     ];
diff --git a/modules/programs/openstackclient.nix b/modules/programs/openstackclient.nix
index 98d68a2f2..c7ee7d636 100644
--- a/modules/programs/openstackclient.nix
+++ b/modules/programs/openstackclient.nix
@@ -9,7 +9,7 @@ in {
   options.programs.openstackclient = {
     enable = lib.mkEnableOption "OpenStack command-line client";
 
-    package = lib.mkPackageOption pkgs "openstackclient" { };
+    package = lib.mkPackageOption pkgs "openstackclient" { nullable = true; };
 
     clouds = lib.mkOption {
       type = lib.types.submodule { freeformType = yamlFormat.type; };
@@ -58,7 +58,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."openstack/clouds.yaml".source = yamlFormat.generate
       "openstackclient-clouds-yaml-${config.home.username}" {
diff --git a/modules/programs/papis.nix b/modules/programs/papis.nix
index 837bfc274..1b8ae1377 100644
--- a/modules/programs/papis.nix
+++ b/modules/programs/papis.nix
@@ -19,7 +19,7 @@ in {
   options.programs.papis = {
     enable = mkEnableOption "papis";
 
-    package = mkPackageOption pkgs "papis" { };
+    package = mkPackageOption pkgs "papis" { nullable = true; };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str ]);
@@ -86,7 +86,7 @@ in {
         (", namely " + concatStringsSep "," defaultLibraries);
     }];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."papis/config" =
       mkIf (cfg.libraries != { }) { text = generators.toINI { } settingsIni; };
diff --git a/modules/programs/poetry.nix b/modules/programs/poetry.nix
index d297f0c78..54fa2abb3 100644
--- a/modules/programs/poetry.nix
+++ b/modules/programs/poetry.nix
@@ -20,6 +20,7 @@ in {
     enable = mkEnableOption "poetry";
 
     package = mkPackageOption pkgs "poetry" {
+      nullable = true;
       example = "pkgs.poetry.withPlugins (ps: with ps; [ poetry-plugin-up ])";
       extraDescription = "May be used to install custom poetry plugins.";
     };
@@ -45,7 +46,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${configDir}/pypoetry/config.toml" =
       lib.mkIf (cfg.settings != { }) {
diff --git a/modules/programs/rio.nix b/modules/programs/rio.nix
index 5a5ce6fa3..927cb406b 100644
--- a/modules/programs/rio.nix
+++ b/modules/programs/rio.nix
@@ -12,7 +12,7 @@ in {
       '';
     };
 
-    package = lib.mkPackageOption pkgs "rio" { };
+    package = lib.mkPackageOption pkgs "rio" { nullable = true; };
 
     settings = lib.mkOption {
       type = settingsFormat.type;
@@ -27,7 +27,7 @@ in {
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
-      home.packages = [ cfg.package ];
+      home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
     }
 
     # Only manage configuration if not empty
diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep.nix
index 58faa520a..3154a770d 100644
--- a/modules/programs/ripgrep.nix
+++ b/modules/programs/ripgrep.nix
@@ -2,9 +2,7 @@
 
 with lib;
 
-let
-  cfg = config.programs.ripgrep;
-  configPath = "${config.xdg.configHome}/ripgrep/ripgreprc";
+let cfg = config.programs.ripgrep;
 in {
   meta.maintainers =
     [ lib.maintainers.khaneliman lib.hm.maintainers.pedorich-n ];
@@ -13,7 +11,7 @@ in {
     programs.ripgrep = {
       enable = mkEnableOption "Ripgrep";
 
-      package = mkPackageOption pkgs "ripgrep" { };
+      package = mkPackageOption pkgs "ripgrep" { nullable = true; };
 
       arguments = mkOption {
         type = with types; listOf str;
@@ -31,8 +29,9 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home = mkMerge [
-      { packages = [ cfg.package ]; }
+    home = let configPath = "${config.xdg.configHome}/ripgrep/ripgreprc";
+    in mkMerge [
+      { packages = lib.mkIf (cfg.package != null) [ cfg.package ]; }
       (mkIf (cfg.arguments != [ ]) {
         file."${configPath}".text = lib.concatLines cfg.arguments;
 
diff --git a/modules/programs/rofi-pass.nix b/modules/programs/rofi-pass.nix
index f1de580fb..d5208d504 100644
--- a/modules/programs/rofi-pass.nix
+++ b/modules/programs/rofi-pass.nix
@@ -12,8 +12,10 @@ in {
   options.programs.rofi.pass = {
     enable = mkEnableOption "rofi integration with password-store";
 
-    package =
-      mkPackageOption pkgs "rofi-pass" { example = "pkgs.rofi-pass-wayland"; };
+    package = mkPackageOption pkgs "rofi-pass" {
+      nullable = true;
+      example = "pkgs.rofi-pass-wayland";
+    };
 
     stores = mkOption {
       type = types.listOf types.str;
@@ -40,7 +42,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."rofi-pass/config".text = optionalString (cfg.stores != [ ])
       ("root=" + (concatStringsSep ":" cfg.stores) + "\n") + cfg.extraConfig
diff --git a/modules/programs/ruff.nix b/modules/programs/ruff.nix
index e1490089a..4ae80ebda 100644
--- a/modules/programs/ruff.nix
+++ b/modules/programs/ruff.nix
@@ -15,7 +15,7 @@ in {
     enable = mkEnableOption
       "ruff, an extremely fast Python linter and code formatter, written in Rust";
 
-    package = mkPackageOption pkgs "ruff" { };
+    package = mkPackageOption pkgs "ruff" { nullable = true; };
 
     settings = mkOption {
       type = settingsFormat.type;
@@ -37,7 +37,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."ruff/ruff.toml".source =
       settingsFormat.generate "ruff.toml" cfg.settings;
diff --git a/modules/programs/sagemath.nix b/modules/programs/sagemath.nix
index 70efaca56..7d34adc49 100644
--- a/modules/programs/sagemath.nix
+++ b/modules/programs/sagemath.nix
@@ -12,11 +12,11 @@ in {
   options.programs.sagemath = {
     enable = mkEnableOption "SageMath, a mathematics software system";
 
-    package = mkOption {
-      type = types.package;
-      default = pkgs.sage;
-      defaultText = literalExpression "pkgs.sage";
-      description = "The SageMath package to use.";
+    package = lib.mkPackageOption pkgs "sage" {
+      nullable = true;
+      extraDescription = ''
+        The SageMath package to use.
+      '';
     };
 
     configDir = mkOption {
@@ -52,9 +52,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${cfg.configDir}/init.sage".text = cfg.initScript;
+
     home.sessionVariables = {
       DOT_SAGE = cfg.dataDir;
       SAGE_STARTUP_FILE = "${cfg.configDir}/init.sage";
diff --git a/modules/programs/sapling.nix b/modules/programs/sapling.nix
index d2a4b4319..4e27aaa82 100644
--- a/modules/programs/sapling.nix
+++ b/modules/programs/sapling.nix
@@ -15,7 +15,7 @@ in {
     programs.sapling = {
       enable = mkEnableOption "Sapling";
 
-      package = mkPackageOption pkgs "sapling" { };
+      package = mkPackageOption pkgs "sapling" { nullable = true; };
 
       userName = mkOption {
         type = types.str;
@@ -48,7 +48,7 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     {
-      home.packages = [ cfg.package ];
+      home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
       programs.sapling.iniContent.ui = {
         username = cfg.userName + " <" + cfg.userEmail + ">";
diff --git a/modules/programs/sftpman.nix b/modules/programs/sftpman.nix
index c6978f80a..3a8ba5ee6 100644
--- a/modules/programs/sftpman.nix
+++ b/modules/programs/sftpman.nix
@@ -73,7 +73,7 @@ in {
     enable = mkEnableOption
       "sftpman, an application that handles sshfs/sftp file systems mounting";
 
-    package = mkPackageOption pkgs "sftpman" { };
+    package = mkPackageOption pkgs "sftpman" { nullable = true; };
 
     defaultSshKey = mkOption {
       type = types.nullOr types.str;
@@ -107,7 +107,7 @@ in {
       })
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = mapAttrs' (name: value:
       nameValuePair "sftpman/mounts/${name}.json" {
diff --git a/modules/programs/sm64ex.nix b/modules/programs/sm64ex.nix
index 23b75808f..a005484c2 100644
--- a/modules/programs/sm64ex.nix
+++ b/modules/programs/sm64ex.nix
@@ -34,11 +34,7 @@ in {
   options.programs.sm64ex = {
     enable = mkEnableOption "sm64ex";
 
-    package = mkOption {
-      type = types.package;
-      default = pkgs.sm64ex;
-      description = "The sm64ex package to use.";
-    };
+    package = lib.mkPackageOption pkgs "sm64ex" { nullable = true; };
 
     region = mkOption {
       type = types.nullOr (types.enum [ "us" "eu" "jp" ]);
@@ -120,7 +116,7 @@ in {
     configFile = optionals (cfg.settings != null)
       (concatStringsSep "\n" ((mapAttrsToList mkConfig cfg.settings)));
   in mkIf cfg.enable {
-    home.packages = [ package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.dataFile."sm64pc/sm64config.txt" =
       mkIf (cfg.settings != null) { text = configFile; };
diff --git a/modules/programs/spotify-player.nix b/modules/programs/spotify-player.nix
index 35d3933bc..bc401fda6 100644
--- a/modules/programs/spotify-player.nix
+++ b/modules/programs/spotify-player.nix
@@ -13,7 +13,7 @@ in {
   options.programs.spotify-player = {
     enable = mkEnableOption "spotify-player";
 
-    package = mkPackageOption pkgs "spotify-player" { };
+    package = mkPackageOption pkgs "spotify-player" { nullable = true; };
 
     settings = mkOption {
       type = tomlType;
@@ -162,7 +162,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "spotify-player/app.toml" = mkIf (cfg.settings != { }) {
diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock.nix
index be577ea80..227cd4554 100644
--- a/modules/programs/swaylock.nix
+++ b/modules/programs/swaylock.nix
@@ -33,7 +33,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "swaylock" { };
+    package = mkPackageOption pkgs "swaylock" { nullable = true; };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
@@ -59,7 +59,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."swaylock/config" = mkIf (cfg.settings != { }) {
       text = concatStrings (mapAttrsToList (n: v:
diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix
index 9b5af43ee..8efeb1366 100644
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@@ -23,9 +23,6 @@ let
 
   formatPair = key: value:
     if isAttrs value then formatSet key value else formatLine key value;
-
-  homeConf = "${config.xdg.configHome}/task/home-manager-taskrc";
-  userConf = "${config.xdg.configHome}/task/taskrc";
 in {
   options = {
     programs.taskwarrior = {
@@ -85,13 +82,18 @@ in {
         '';
       };
 
-      package =
-        mkPackageOption pkgs "taskwarrior" { example = "pkgs.taskwarrior3"; };
+      package = mkPackageOption pkgs "taskwarrior" {
+        nullable = true;
+        example = "pkgs.taskwarrior3";
+      };
     };
   };
 
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+  config = let
+    homeConf = "${config.xdg.configHome}/task/home-manager-taskrc";
+    userConf = "${config.xdg.configHome}/task/taskrc";
+  in mkIf cfg.enable {
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file."${homeConf}".text = ''
       data.location=${cfg.dataLocation}
diff --git a/modules/programs/tofi.nix b/modules/programs/tofi.nix
index acc1a994d..b6e46a6cb 100644
--- a/modules/programs/tofi.nix
+++ b/modules/programs/tofi.nix
@@ -12,7 +12,7 @@ in {
   options.programs.tofi = {
     enable = mkEnableOption "Tofi, a tiny dynamic menu for Wayland";
 
-    package = mkPackageOption pkgs "tofi" { };
+    package = mkPackageOption pkgs "tofi" { nullable = true; };
 
     settings = mkOption {
       type = with types;
@@ -46,7 +46,7 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "programs.tofi" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."tofi/config" = mkIf (cfg.settings != { }) {
       text = let
diff --git a/modules/programs/vifm.nix b/modules/programs/vifm.nix
index 2bf31d52d..aef2c1f16 100644
--- a/modules/programs/vifm.nix
+++ b/modules/programs/vifm.nix
@@ -12,7 +12,7 @@ in {
   options.programs.vifm = {
     enable = lib.mkEnableOption "vifm, a Vim-like file manager";
 
-    package = lib.mkPackageOption pkgs "vifm" { };
+    package = lib.mkPackageOption pkgs "vifm" { nullable = true; };
 
     extraConfig = mkOption {
       type = types.lines;
@@ -25,7 +25,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."vifm/vifmrc" =
       mkIf (cfg.extraConfig != "") { text = cfg.extraConfig; };
diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint.nix
index 9565a8cb3..655c00937 100644
--- a/modules/programs/vim-vint.nix
+++ b/modules/programs/vim-vint.nix
@@ -14,7 +14,7 @@ in {
   options = {
     programs.vim-vint = {
       enable = mkEnableOption "the Vint linter for Vimscript";
-      package = mkPackageOption pkgs "vim-vint" { };
+      package = mkPackageOption pkgs "vim-vint" { nullable = true; };
 
       settings = mkOption {
         type = yamlFormat.type;
@@ -28,7 +28,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile.".vintrc.yaml".source =
       yamlFormat.generate "vim-vint-config" cfg.settings;
diff --git a/modules/programs/vinegar.nix b/modules/programs/vinegar.nix
index 5cbf672e9..cb088d89c 100644
--- a/modules/programs/vinegar.nix
+++ b/modules/programs/vinegar.nix
@@ -6,7 +6,7 @@ in {
   options.programs.vinegar = {
     enable = lib.mkEnableOption "Vinegar";
 
-    package = lib.mkPackageOption pkgs "vinegar" { };
+    package = lib.mkPackageOption pkgs "vinegar" { nullable = true; };
 
     settings = lib.mkOption {
       type = lib.types.attrsOf toml.type;
@@ -41,7 +41,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."vinegar/config.toml" = lib.mkIf (cfg.settings != { }) {
       source = toml.generate "vinegar-config.toml" cfg.settings;
diff --git a/modules/programs/wlogout.nix b/modules/programs/wlogout.nix
index b01f8a0ae..6b318e109 100644
--- a/modules/programs/wlogout.nix
+++ b/modules/programs/wlogout.nix
@@ -72,7 +72,7 @@ in {
   options.programs.wlogout = with lib.types; {
     enable = mkEnableOption "wlogout";
 
-    package = mkPackageOption pkgs "wlogout" { };
+    package = mkPackageOption pkgs "wlogout" { nullable = true; };
 
     layout = mkOption {
       type = listOf wlogoutLayoutConfig;
@@ -132,7 +132,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."wlogout/layout" = mkIf (cfg.layout != [ ]) {
       source = pkgs.writeText "wlogout/layout" layoutContent;
diff --git a/modules/programs/wofi.nix b/modules/programs/wofi.nix
index 1317716ed..c2ea4e4d6 100644
--- a/modules/programs/wofi.nix
+++ b/modules/programs/wofi.nix
@@ -17,7 +17,7 @@ in {
     enable = mkEnableOption
       "wofi: a launcher/menu program for wlroots based wayland compositors such as sway";
 
-    package = mkPackageOption pkgs "wofi" { };
+    package = mkPackageOption pkgs "wofi" { nullable = true; };
 
     settings = mkOption {
       default = { };
@@ -58,7 +58,7 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "programs.wofi" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = mkMerge [
       (mkIf (cfg.settings != { }) {
diff --git a/modules/programs/xplr.nix b/modules/programs/xplr.nix
index bd9222954..ddbbc1133 100644
--- a/modules/programs/xplr.nix
+++ b/modules/programs/xplr.nix
@@ -9,7 +9,7 @@ let
     version = '${cfg.package.version}'
   '';
 
-  # If `value` is a Nix store path, create the symlink `/nix/store/newhash/${name}/*` 
+  # If `value` is a Nix store path, create the symlink `/nix/store/newhash/${name}/*`
   # to `/nix/store/oldhash/*` and returns `/nix/store/newhash`.
   wrapPlugin = name: value:
     if lib.isStorePath value then
@@ -49,7 +49,7 @@ in {
   options.programs.xplr = {
     enable = mkEnableOption "xplr, terminal UI based file explorer";
 
-    package = mkPackageOption pkgs "xplr" { };
+    package = mkPackageOption pkgs "xplr" { nullable = true; };
 
     plugins = mkOption {
       type = with types; nullOr (attrsOf (either package str));
@@ -58,7 +58,7 @@ in {
       description = ''
         An attribute set of plugin paths to be added to the [package.path]<https://www.lua.org/manual/5.4/manual.html#pdf-package.path> of the {file}`~/config/xplr/init.lua` configuration file.
 
-        Must be a package or string representing the plugin directory's path. 
+        Must be a package or string representing the plugin directory's path.
         If the path string is not absolute, it will be relative to {file}`$XDG_CONFIG_HOME/xplr/init.lua`.
       '';
       example = literalExpression ''
@@ -91,7 +91,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."xplr/init.lua".source =
       pkgs.writeText "init.lua" configFile;
diff --git a/modules/programs/yambar.nix b/modules/programs/yambar.nix
index f4e0a434a..efda8f19e 100644
--- a/modules/programs/yambar.nix
+++ b/modules/programs/yambar.nix
@@ -11,7 +11,7 @@ in {
   options.programs.yambar = {
     enable = lib.mkEnableOption "Yambar";
 
-    package = lib.mkPackageOption pkgs "yambar" { };
+    package = lib.mkPackageOption pkgs "yambar" { nullable = true; };
 
     settings = lib.mkOption {
       type = yamlFormat.type;
@@ -46,7 +46,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."yambar/config.yml" = lib.mkIf (cfg.settings != { }) {
       source = yamlFormat.generate "config.yml" cfg.settings;
diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index 67fa6d291..be77188b9 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -12,7 +12,7 @@ in {
   options.programs.yazi = {
     enable = mkEnableOption "yazi";
 
-    package = lib.mkPackageOption pkgs "yazi" { };
+    package = lib.mkPackageOption pkgs "yazi" { nullable = true; };
 
     shellWrapperName = lib.mkOption {
       type = types.str;
@@ -159,7 +159,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     programs = let
       bashIntegration = ''
diff --git a/modules/programs/zk.nix b/modules/programs/zk.nix
index d4abfe279..cffce3738 100644
--- a/modules/programs/zk.nix
+++ b/modules/programs/zk.nix
@@ -11,7 +11,7 @@ in {
   options.programs.zk = {
     enable = lib.mkEnableOption "zk";
 
-    package = lib.mkPackageOption pkgs "zk" { };
+    package = lib.mkPackageOption pkgs "zk" { nullable = true; };
 
     settings = lib.mkOption {
       type = tomlFormat.type;
@@ -43,7 +43,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."zk/config.toml" = lib.mkIf (cfg.settings != { }) {
       source = tomlFormat.generate "config.toml" cfg.settings;
diff --git a/modules/services/clipse.nix b/modules/services/clipse.nix
index f00359c85..1d0ee95fd 100644
--- a/modules/services/clipse.nix
+++ b/modules/services/clipse.nix
@@ -8,7 +8,7 @@ in {
   options.services.clipse = {
     enable = lib.mkEnableOption "Enable clipse clipboard manager";
 
-    package = lib.mkPackageOption pkgs "clipse" { };
+    package = lib.mkPackageOption pkgs "clipse" { nullable = true; };
 
     systemdTarget = lib.mkOption {
       type = lib.types.str;
@@ -130,7 +130,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."clipse/config.json".source =
       jsonFormat.generate "settings" {
@@ -147,20 +147,21 @@ in {
     xdg.configFile."clipse/custom_theme.json".source =
       jsonFormat.generate "theme" cfg.theme;
 
-    systemd.user.services.clipse = lib.mkIf pkgs.stdenv.isLinux {
-      Unit = {
-        Description = "Clipse listener";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-      };
+    systemd.user.services.clipse =
+      lib.mkIf (pkgs.stdenv.isLinux && (cfg.package != null)) {
+        Unit = {
+          Description = "Clipse listener";
+          PartOf = [ "graphical-session.target" ];
+          After = [ "graphical-session.target" ];
+        };
 
-      Service = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${cfg.package}/bin/clipse -listen";
-      };
+        Service = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${cfg.package}/bin/clipse -listen";
+        };
 
-      Install = { WantedBy = [ cfg.systemdTarget ]; };
-    };
+        Install = { WantedBy = [ cfg.systemdTarget ]; };
+      };
   };
 }
diff --git a/modules/services/darkman.nix b/modules/services/darkman.nix
index b399dad86..93aafda98 100644
--- a/modules/services/darkman.nix
+++ b/modules/services/darkman.nix
@@ -48,7 +48,7 @@ in {
       darkman, a tool that automatically switches dark-mode on and off based on
       the time of the day'';
 
-    package = mkPackageOption pkgs "darkman" { };
+    package = mkPackageOption pkgs "darkman" { nullable = true; };
 
     settings = mkOption {
       type = types.submodule { freeformType = yamlFormat.type; };
@@ -76,7 +76,7 @@ in {
       (hm.assertions.assertPlatform "services.darkman" pkgs platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "darkman/config.yaml" = mkIf (cfg.settings != { }) {
@@ -91,7 +91,7 @@ in {
         (generateScripts "light-mode.d" cfg.lightModeScripts))
     ];
 
-    systemd.user.services.darkman = {
+    systemd.user.services.darkman = lib.mkIf (cfg.package != null) {
       Unit = {
         Description = "Darkman system service";
         Documentation = "man:darkman(1)";
diff --git a/modules/services/glance.nix b/modules/services/glance.nix
index fa4f1a8d7..7abe17e2c 100644
--- a/modules/services/glance.nix
+++ b/modules/services/glance.nix
@@ -59,11 +59,11 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."glance/glance.yml".source = settingsFile;
 
-    systemd.user.services.glance = {
+    systemd.user.services.glance = lib.mkIf (cfg.package != null) {
       Unit = {
         Description = "Glance feed dashboard server";
         PartOf = [ "graphical-session.target" ];
diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix
index 155f4ac36..2778bff66 100644
--- a/modules/services/hypridle.nix
+++ b/modules/services/hypridle.nix
@@ -6,7 +6,7 @@ in {
   options.services.hypridle = {
     enable = lib.mkEnableOption "Hypridle, Hyprland's idle daemon";
 
-    package = lib.mkPackageOption pkgs "hypridle" { };
+    package = lib.mkPackageOption pkgs "hypridle" { nullable = true; };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -70,7 +70,7 @@ in {
       };
     };
 
-    systemd.user.services.hypridle = {
+    systemd.user.services.hypridle = lib.mkIf (cfg.package != null) {
       Install = { WantedBy = [ config.wayland.systemd.target ]; };
 
       Unit = {
diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix
index 03eabf94c..ba64e2372 100644
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -6,7 +6,7 @@ in {
   options.services.hyprpaper = {
     enable = lib.mkEnableOption "Hyprpaper, Hyprland's wallpaper daemon";
 
-    package = lib.mkPackageOption pkgs "hyprpaper" { };
+    package = lib.mkPackageOption pkgs "hyprpaper" { nullable = true; };
 
     settings = lib.mkOption {
       type = with lib.types;
@@ -64,7 +64,7 @@ in {
       };
     };
 
-    systemd.user.services.hyprpaper = {
+    systemd.user.services.hyprpaper = lib.mkIf (cfg.package != null) {
       Install = { WantedBy = [ config.wayland.systemd.target ]; };
 
       Unit = {
diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd.nix
index 3cc242216..3ccb75411 100644
--- a/modules/services/listenbrainz-mpd.nix
+++ b/modules/services/listenbrainz-mpd.nix
@@ -15,7 +15,7 @@ in {
   options.services.listenbrainz-mpd = {
     enable = mkEnableOption "listenbrainz-mpd";
 
-    package = mkPackageOption pkgs "listenbrainz-mpd" { };
+    package = mkPackageOption pkgs "listenbrainz-mpd" { nullable = true; };
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -29,7 +29,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.user.services."listenbrainz-mpd" = {
+    systemd.user.services."listenbrainz-mpd" = lib.mkIf (cfg.package != null) {
       Unit = {
         Description = "ListenBrainz submission client for MPD";
         Documentation = "https://codeberg.org/elomatreb/listenbrainz-mpd";
diff --git a/modules/services/pueue.nix b/modules/services/pueue.nix
index f0603bb47..1e35f0614 100644
--- a/modules/services/pueue.nix
+++ b/modules/services/pueue.nix
@@ -15,7 +15,7 @@ in {
   options.services.pueue = {
     enable = mkEnableOption "Pueue, CLI process scheduler and manager";
 
-    package = mkPackageOption pkgs "pueue" { };
+    package = mkPackageOption pkgs "pueue" { nullable = true; };
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -38,11 +38,11 @@ in {
     assertions =
       [ (hm.assertions.assertPlatform "services.pueue" pkgs platforms.linux) ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."pueue/pueue.yml".source = configFile;
 
-    systemd.user = {
+    systemd.user = lib.mkIf (cfg.package != null) {
       services.pueued = {
         Unit = {
           Description = "Pueue Daemon - CLI process scheduler and manager";
diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix
index c637a3338..fddf074f8 100644
--- a/modules/services/swaync.nix
+++ b/modules/services/swaync.nix
@@ -79,7 +79,8 @@ in {
   config = lib.mkIf cfg.enable {
     # at-spi2-core is to minimize journalctl noise of:
     # "AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files"
-    home.packages = [ cfg.package pkgs.at-spi2-core ];
+    home.packages =
+      lib.mkIf (cfg.package != null) [ cfg.package pkgs.at-spi2-core ];
 
     xdg.configFile = {
       "swaync/config.json".source =
@@ -92,7 +93,7 @@ in {
       };
     };
 
-    systemd.user.services.swaync = {
+    systemd.user.services.swaync = lib.mkIf (cfg.package != null) {
       Unit = {
         Description = "Swaync notification daemon";
         Documentation = "https://github.com/ErikReider/SwayNotificationCenter";
diff --git a/modules/services/window-managers/fluxbox.nix b/modules/services/window-managers/fluxbox.nix
index c06b14d60..f84714742 100644
--- a/modules/services/window-managers/fluxbox.nix
+++ b/modules/services/window-managers/fluxbox.nix
@@ -13,7 +13,7 @@ in {
     xsession.windowManager.fluxbox = {
       enable = mkEnableOption "Fluxbox window manager";
 
-      package = mkPackageOption pkgs "fluxbox" { };
+      package = mkPackageOption pkgs "fluxbox" { nullable = true; };
 
       init = mkOption {
         type = types.lines;
@@ -95,7 +95,7 @@ in {
         platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     home.file = {
       ".fluxbox/init" = mkIf (cfg.init != "") { text = cfg.init; };
diff --git a/modules/services/window-managers/i3-sway/i3.nix b/modules/services/window-managers/i3-sway/i3.nix
index 8c64aee44..eac5ef42e 100644
--- a/modules/services/window-managers/i3-sway/i3.nix
+++ b/modules/services/window-managers/i3-sway/i3.nix
@@ -208,7 +208,7 @@ in {
     xsession.windowManager.i3 = {
       enable = mkEnableOption "i3 window manager";
 
-      package = mkPackageOption pkgs "i3" { };
+      package = mkPackageOption pkgs "i3" { nullable = true; };
 
       config = mkOption {
         type = types.nullOr configModule;
@@ -232,7 +232,7 @@ in {
           platforms.linux)
       ];
 
-      home.packages = [ cfg.package ];
+      home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
       xsession.windowManager.command = "${cfg.package}/bin/i3";
 
diff --git a/modules/services/wob.nix b/modules/services/wob.nix
index d36565a00..d79338071 100644
--- a/modules/services/wob.nix
+++ b/modules/services/wob.nix
@@ -14,7 +14,7 @@ in {
 
   options.services.wob = {
     enable = mkEnableOption "wob";
-    package = mkPackageOption pkgs "wob" { };
+    package = mkPackageOption pkgs "wob" { nullable = true; };
 
     settings = mkOption {
       type = settingsFormat.type;
@@ -44,7 +44,7 @@ in {
       (lib.hm.assertions.assertPlatform "services.wob" pkgs lib.platforms.linux)
     ];
 
-    systemd.user = mkIf cfg.systemd {
+    systemd.user = mkIf (cfg.systemd && (cfg.package != null)) {
       services.wob = {
         Unit = {
           Description =
diff --git a/modules/services/wpaperd.nix b/modules/services/wpaperd.nix
index 120cb370c..983687e6b 100644
--- a/modules/services/wpaperd.nix
+++ b/modules/services/wpaperd.nix
@@ -22,7 +22,7 @@ in {
   options.services.wpaperd = {
     enable = lib.mkEnableOption "wpaperd";
 
-    package = lib.mkPackageOption pkgs "wpaperd" { };
+    package = lib.mkPackageOption pkgs "wpaperd" { nullable = true; };
 
     settings = lib.mkOption {
       type = tomlFormat.type;
@@ -54,7 +54,7 @@ in {
         lib.platforms.linux)
     ];
 
-    home.packages = [ cfg.package ];
+    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile = {
       "wpaperd/wallpaper.toml" = mkIf (cfg.settings != { }) {
@@ -62,7 +62,7 @@ in {
       };
     };
 
-    systemd.user.services.wpaperd = {
+    systemd.user.services.wpaperd = lib.mkIf (cfg.package != null) {
       Install = { WantedBy = [ config.wayland.systemd.target ]; };
 
       Unit = {

From 3ade65425772e5ee25989726b41074fcb4a9a372 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Mar 2025 13:50:10 -0600
Subject: [PATCH 484/546] tests/neovide: fix deprecation

---
 tests/modules/programs/neovim/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/modules/programs/neovim/runtime.nix b/tests/modules/programs/neovim/runtime.nix
index 61ec8b9b6..088f75ace 100644
--- a/tests/modules/programs/neovim/runtime.nix
+++ b/tests/modules/programs/neovim/runtime.nix
@@ -34,8 +34,8 @@ lib.mkIf config.test.enableBig {
       extraLuaPackages = ps: with ps; [ luacheck ];
     }
     {
-      extraPython3Packages = with pkgs.python3Packages; [ jedi pynvim ];
-      extraLuaPackages = with pkgs.lua51Packages; [ luacheck ];
+      extraPython3Packages = ps: with ps; [ jedi pynvim ];
+      extraLuaPackages = ps: with ps; [ luacheck ];
     }
   ];
 

From 1347b0b468ddf355657d58e50811238cfff517cb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 1 Mar 2025 23:30:02 -0500
Subject: [PATCH 485/546] tests: move vinegar to linux only

---
 tests/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/default.nix b/tests/default.nix
index 5d5bec386..fe7527fdb 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -245,7 +245,6 @@ in import nmtSrc {
     ./modules/programs/translate-shell
     ./modules/programs/vifm
     ./modules/programs/vim-vint
-    ./modules/programs/vinegar
     ./modules/programs/vscode
     ./modules/programs/watson
     ./modules/programs/wezterm
@@ -317,6 +316,7 @@ in import nmtSrc {
     ./modules/programs/swayr
     ./modules/programs/terminator
     ./modules/programs/tofi
+    ./modules/programs/vinegar
     ./modules/programs/waybar
     ./modules/programs/wlogout
     ./modules/programs/wofi

From 5ab4305f345ccf628fbcaa7a2dfd3696accd907b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 00:05:57 -0600
Subject: [PATCH 486/546] gh-dash: fix

Missing mkIf
---
 modules/programs/gh-dash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/gh-dash.nix b/modules/programs/gh-dash.nix
index 324d0e81c..e1d4aa7ca 100644
--- a/modules/programs/gh-dash.nix
+++ b/modules/programs/gh-dash.nix
@@ -34,7 +34,7 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-    programs.gh.extensions = (cfg.package != null) [ cfg.package ];
+    programs.gh.extensions = lib.mkIf (cfg.package != null) [ cfg.package ];
 
     xdg.configFile."gh-dash/config.yml".source =
       yamlFormat.generate "gh-dash-config.yml" cfg.settings;

From 26f6b862645ff281f3bada5d406e8c20de8d837c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 00:19:22 -0600
Subject: [PATCH 487/546] tests/gh-dash: enable gh to test extension adding

---
 tests/modules/programs/gh-dash/config.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/modules/programs/gh-dash/config.nix b/tests/modules/programs/gh-dash/config.nix
index cb07d13aa..cec1b8b3e 100644
--- a/tests/modules/programs/gh-dash/config.nix
+++ b/tests/modules/programs/gh-dash/config.nix
@@ -1,11 +1,14 @@
 {
-  programs.gh-dash = {
-    enable = true;
-    settings = {
-      prSections = [{
-        title = "My Pull Requests";
-        filters = "is:open author:@me";
-      }];
+  programs = {
+    gh.enable = true;
+    gh-dash = {
+      enable = true;
+      settings = {
+        prSections = [{
+          title = "My Pull Requests";
+          filters = "is:open author:@me";
+        }];
+      };
     };
   };
 

From c040d1c556476d9b82c7f3f1a0ce0906fcdf7108 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 10:48:18 -0600
Subject: [PATCH 488/546] xembed-sni-proxy: change default package (#6587)

Use new `kdePackages` version by default. Users can pass the legacy
package, if they wish.
---
 modules/services/xembed-sni-proxy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy.nix
index 4a6fd1fad..dca6cebca 100644
--- a/modules/services/xembed-sni-proxy.nix
+++ b/modules/services/xembed-sni-proxy.nix
@@ -15,8 +15,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.plasma-workspace;
-        defaultText = literalExpression "pkgs.plasma-workspace";
+        default = pkgs.kdePackages.plasma-workspace;
+        defaultText = literalExpression "pkgs.kdePackages.plasma-workspace";
         description = ''
           Package containing the {command}`xembedsniproxy`
           program.

From 2c87a6475fba12c9eb04ccb7375da0e32da48dc1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 12:14:01 -0600
Subject: [PATCH 489/546] flake-module: rename `homeManagerModules` to
 `homeModules` (#6406)

This reverts commit 066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe. After
further discussion, we want to maintain this as the naming scheme going
forward to be similar to standards that have been trying to be
implemented in naming configurations and modules.
---
 docs/manual/nix-flakes/flake-parts.md | 6 +++---
 flake-module.nix                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md
index 6b05c77f2..b314bef3c 100644
--- a/docs/manual/nix-flakes/flake-parts.md
+++ b/docs/manual/nix-flakes/flake-parts.md
@@ -22,7 +22,7 @@ you may wish to import Home Manager's flake module,
         inputs.home-manager.flakeModules.home-manager
       ];
       flake = {
-        # Define `homeManagerModules`, `homeConfigurations`,
+        # Define `homeModules`, `homeConfigurations`,
         # `nixosConfigurations`, etc here
       };
       # See flake.parts for more features, such as `perSystem`
@@ -30,10 +30,10 @@ you may wish to import Home Manager's flake module,
 }
 ```
 
-The flake module defines the `flake.homeManagerModules` and `flake.homeConfigurations`
+The flake module defines the `flake.homeModules` and `flake.homeConfigurations`
 options, allowing them to be properly merged if they are defined in multiple
 modules.
 
-If you are only defining `homeManagerModules` and/or `homeConfigurations` once in a
+If you are only defining `homeModules` and/or `homeConfigurations` once in a
 single module, flake-parts should work fine without importing
 `flakeModules.home-manager`.
diff --git a/flake-module.nix b/flake-module.nix
index 269add846..cc5f1551a 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -14,12 +14,12 @@ in {
           that you can reference them in this or another flake's `homeConfigurations`.
         '';
       };
-      homeManagerModules = mkOption {
+      homeModules = mkOption {
         type = types.lazyAttrsOf types.deferredModule;
         default = { };
         apply = mapAttrs (k: v: {
           _class = "homeManager";
-          _file = "${toString moduleLocation}#homeManagerModules.${k}";
+          _file = "${toString moduleLocation}#homeModules.${k}";
           imports = [ v ];
         });
         description = ''

From b2314312f2ee6893c83d0b5af74d949bc8530409 Mon Sep 17 00:00:00 2001
From: Mahmoud Ayman <mahmoudk1000@gmail.com>
Date: Sat, 8 Mar 2025 20:37:10 +0200
Subject: [PATCH 490/546] zsh: correct syntax option to syntax-highlighting
 (#5792)

The current syntax of highlighting style is outdated and not working as well. So this pr aims to update it so follow `zsh-syntax-highlight`` new syntax [example](https://github.com/zsh-users/zsh-syntax-highlighting/blob/e0165eaa730dd0fa321a6a6de74f092fe87630b0/highlighters/main/main-highlighter.zsh#L32).
---
 modules/programs/zsh.nix                           | 2 +-
 tests/modules/programs/zsh/syntax-highlighting.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 25adab2d2..e4399d2d7 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -738,7 +738,7 @@ in
           ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)})
           ${lib.concatStringsSep "\n" (
               lib.mapAttrsToList
-                (name: value: "ZSH_HIGHLIGHT_STYLES+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})")
+		(name: value: "ZSH_HIGHLIGHT_STYLES[${lib.escapeShellArg name}]=${lib.escapeShellArg value}")
                 cfg.syntaxHighlighting.styles
           )}
           ${lib.concatStringsSep "\n" (
diff --git a/tests/modules/programs/zsh/syntax-highlighting.nix b/tests/modules/programs/zsh/syntax-highlighting.nix
index 27970a123..ed7626fcb 100644
--- a/tests/modules/programs/zsh/syntax-highlighting.nix
+++ b/tests/modules/programs/zsh/syntax-highlighting.nix
@@ -15,6 +15,6 @@
   nmt.script = ''
     assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
     assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)"
-    assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=(comment 'fg=#6c6c6c')"
+    assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES[comment]='fg=#6c6c6c'"
   '';
 }

From 20a6b3631bb9b9308a3ed2348e261c9029b5f7eb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 12:56:34 -0600
Subject: [PATCH 491/546] navi: handle xdg directory on darwin (#6589)

When xdg is enabled, use the xdg config home on darwin.
---
 modules/programs/navi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix
index 23fb04864..e8399fd1c 100644
--- a/modules/programs/navi.nix
+++ b/modules/programs/navi.nix
@@ -7,7 +7,7 @@ let
 
   yamlFormat = pkgs.formats.yaml { };
 
-  configDir = if pkgs.stdenv.isDarwin then
+  configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then
     "Library/Application Support"
   else
     config.xdg.configHome;

From 65d6043d32db2bf7fa22abd274443485cecef053 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sat, 8 Mar 2025 20:19:43 +0100
Subject: [PATCH 492/546] flake.lock: Update (#6588)
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/ba487dbc9d04e0634c64e3b1f0d25839a0a68246?narHash=sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM%3D' (2025-03-03)
  → 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index c621a5289..336261aa9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741010256,
-        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
+        "lastModified": 1741246872,
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {

From 7f4c60a3d6e548dbc13666565c22cb3f8dcdad44 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sat, 8 Mar 2025 19:22:11 +0000
Subject: [PATCH 493/546] podman: fix podman-user-wait-network-online (#6586)

Adding coreutils to path for podman to fix issues when not available in environment path already.
---
 modules/services/podman-linux/services.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/podman-linux/services.nix b/modules/services/podman-linux/services.nix
index 87ff83ad8..5d31485f4 100644
--- a/modules/services/podman-linux/services.nix
+++ b/modules/services/podman-linux/services.nix
@@ -65,7 +65,9 @@ in {
       xdg.configFile."systemd/user/podman-user-wait-network-online.service.d/50-exec-search-path.conf".text =
         ''
           [Service]
-          ExecSearchPath=${pkgs.bashInteractive}/bin:${pkgs.systemd}/bin:/bin
+          ExecSearchPath=${
+            makeBinPath (with pkgs; [ bashInteractive systemd coreutils ])
+          }:/bin
         '';
     })
   ]);

From b23c4d4cbe931240fad25bba01509edc03c3aac6 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Sun, 9 Mar 2025 06:32:21 +0100
Subject: [PATCH 494/546] flake.lock: Update (#6591)
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/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06)
  → 'github:NixOS/nixpkgs/36fd87baa9083f34f7f5027900b62ee6d09b1f2f?narHash=sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw%3D' (2025-03-07)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 336261aa9..8c618e88b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741246872,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "lastModified": 1741379970,
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
         "type": "github"
       },
       "original": {

From 72580374c81ad8803675ee0dc829a60773d24401 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Sun, 9 Mar 2025 07:41:38 +0100
Subject: [PATCH 495/546] Translate using Weblate (Chinese (Traditional Han
 script)) (#6581)

Currently translated at 100.0% (16 of 16 strings)

Translate using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (37 of 37 strings)


Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/zh_Hant/
Translate-URL: https://hosted.weblate.org/projects/home-manager/modules/zh_Hant/
Translation: Home Manager/Home Manager CLI
Translation: Home Manager/Home Manager Modules

Co-authored-by: 807 <s10855168@gmail.com>
---
 home-manager/po/zh_Hant.po | 45 +++++++++++++++++++++++++++-----------
 modules/po/zh_Hant.po      | 22 +++++++++----------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/home-manager/po/zh_Hant.po b/home-manager/po/zh_Hant.po
index bf113567a..60520bcda 100644
--- a/home-manager/po/zh_Hant.po
+++ b/home-manager/po/zh_Hant.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2024-02-16 22:01+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
-"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
-"home-manager/cli/zh_Hant/>\n"
+"PO-Revision-Date: 2025-03-07 18:58+0000\n"
+"Last-Translator: 807 <s10855168@gmail.com>\n"
+"Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/"
+"projects/home-manager/cli/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.4\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: 缺少參數 %s"
 
 #: home-manager/home-manager:69
 msgid "No configuration file found at %s"
@@ -36,6 +36,8 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
+"保持你的 Home Manager 在 %s 中，%s 已被拋棄，\n"
+"請將它移動到 %s"
 
 #: home-manager/home-manager:97
 msgid "No configuration file found. Please create one at %s"
@@ -43,14 +45,14 @@ msgstr "未找到配置檔案。請在 %s 處建立一份"
 
 #: home-manager/home-manager:112
 msgid "Home Manager not found at %s."
-msgstr ""
+msgstr "在 %s 中找不到 Home Manager。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:120
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
-msgstr ""
+msgstr "備用的 Home Manager 路徑 %s 已被拋棄，但一個檔案/資料夾在這被找到。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:123
@@ -73,6 +75,23 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
+"要消除這個警告，請做以下其中一步。\n"
+"\n"
+"1. 告訴Home Manager去使用路徑，例如加入\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   到你的配置中。\n"
+"\n"
+"   如果你想要直接引入Home Manager， 請你使用 `path` 參數r\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   當呼叫 Home Manager 模組。\n"
+"\n"
+"2. 刪除無效的路徑\n"
+"\n"
+"     $ rm -r \"%s\""
 
 #: home-manager/home-manager:151
 msgid "Sanity checking Nix"
@@ -80,7 +99,7 @@ msgstr "正在進行 Nix 完整性檢查"
 
 #: home-manager/home-manager:171
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr ""
+msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:226
@@ -98,11 +117,11 @@ msgstr "執行 ‘%s --help’ 獲取用法幫助"
 
 #: home-manager/home-manager:332 home-manager/home-manager:437
 msgid "The file %s already exists, leaving it unchanged..."
-msgstr ""
+msgstr "檔案 %s 已經存在，不更改它..."
 
 #: home-manager/home-manager:334 home-manager/home-manager:439
 msgid "Creating %s..."
-msgstr ""
+msgstr "創建 %s 中..."
 
 #: home-manager/home-manager:481
 msgid "Creating initial Home Manager generation..."
@@ -163,11 +182,11 @@ msgstr "未知的 “news.display” 設定項 “%s”。"
 #: home-manager/home-manager:600
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "請設定 $EDITOR 或 $VISUAL 環境變數"
 
 #: home-manager/home-manager:618
 msgid "Cannot run build in read-only directory"
-msgstr "無法在只讀目錄中執行構建"
+msgstr "無法在唯讀目錄中執行構建"
 
 #: home-manager/home-manager:699
 msgid "No generation with ID %s"
diff --git a/modules/po/zh_Hant.po b/modules/po/zh_Hant.po
index 7c8e14619..dab8fd3c8 100644
--- a/modules/po/zh_Hant.po
+++ b/modules/po/zh_Hant.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-01-03 09:09+0100\n"
-"PO-Revision-Date: 2023-01-08 11:50+0000\n"
-"Last-Translator: Eric Ho <eric913@gmail.com>\n"
-"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
-"home-manager/modules/zh_Hant/>\n"
+"PO-Revision-Date: 2025-03-07 18:58+0000\n"
+"Last-Translator: 807 <s10855168@gmail.com>\n"
+"Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/"
+"projects/home-manager/modules/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.15.1-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 #: modules/files.nix:188
 msgid "Creating home file links in %s"
@@ -29,11 +29,11 @@ msgstr "正在從 %s 清理孤立連結"
 
 #: modules/home-environment.nix:591
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "正在建立新一代的配置文件中"
 
 #: modules/home-environment.nix:594
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "為發生改變，請重新使用新一代的配置文件"
 
 #: modules/home-environment.nix:643
 msgid ""
@@ -69,19 +69,19 @@ msgstr "正在啟用 %s"
 
 #: modules/lib-bash/activation-init.sh:22
 msgid "Migrating profile from %s to %s"
-msgstr ""
+msgstr "正在從 %S 配置文件轉移到 %s 中"
 
 #: modules/lib-bash/activation-init.sh:54
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr ""
+msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s"
 
 #: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
-msgstr ""
+msgstr "錯誤：USER 被設定為 「%s」但我們希望是 「%s」"
 
 #: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
-msgstr ""
+msgstr "錯誤：HOME 被設定為 「%s」但我們預期得到 「%s」"
 
 #: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"

From b74402e4e8f8cebbec860f0ba8fef2f703ad79f0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Mar 2025 00:11:21 -0600
Subject: [PATCH 496/546] tests: expose scrubDerivation

Will use it with darwin scrubbing
---
 tests/default.nix | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index fe7527fdb..a7d571e3d 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -14,35 +14,33 @@ let
   # `"@package-name@"`. This allows the tests to refer to derivations through
   # their values without establishing an actual dependency on the derivation
   # output.
-  scrubDerivations = attrs:
+  scrubDerivation = name: value:
     let
-      scrubDerivation = name: value:
-        let
-          scrubbedValue = scrubDerivations value;
+      scrubbedValue = scrubDerivations value;
 
-          newDrvAttrs = {
-            buildScript = abort "no build allowed";
+      newDrvAttrs = {
+        buildScript = abort "no build allowed";
 
-            outPath = builtins.traceVerbose ("${name} - got out path")
-              "@${lib.getName value}@";
+        outPath = builtins.traceVerbose "${name} - got out path"
+          "@${lib.getName value}@";
 
-            # Prevent getOutput from descending into outputs
-            outputSpecified = true;
+        # Prevent getOutput from descending into outputs
+        outputSpecified = true;
 
-            # Allow the original package to be used in derivation inputs
-            __spliced = {
-              buildHost = value;
-              hostTarget = value;
-            };
-          };
-        in if lib.isAttrs value then
-          if lib.isDerivation value then
-            scrubbedValue // newDrvAttrs
-          else
-            scrubbedValue
-        else
-          value;
-    in lib.mapAttrs scrubDerivation attrs;
+        # Allow the original package to be used in derivation inputs
+        __spliced = {
+          buildHost = value;
+          hostTarget = value;
+        };
+      };
+    in if lib.isAttrs value then
+      if lib.isDerivation value then
+        scrubbedValue // newDrvAttrs
+      else
+        scrubbedValue
+    else
+      value;
+  scrubDerivations = attrs: let in lib.mapAttrs scrubDerivation attrs;
 
   # Globally unscrub a few selected packages that are used by a wide selection of tests.
   whitelist = let

From b3e11ed4a99bca48e47d7d7df6535c80dc73c79e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 21:03:30 -0500
Subject: [PATCH 497/546] tests: central darwin stubbing

Until we can figure out how to resolve issue with stdenv.
Makes it easier to revert when automatic stubbing is fixed for darwin
stdenv
---
 tests/default.nix | 67 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index a7d571e3d..b15491421 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -61,10 +61,71 @@ let
       };
   in outer;
 
+  darwinBlacklist = let
+    # List of packages that need to be scrubbed on Darwin
+    # Packages are scrubbed in linux and expected in test output
+    packagesToScrub = [
+      "alot"
+      "antidote"
+      "atuin"
+      "bash-completion"
+      "carapace"
+      "delta"
+      "direnv"
+      "espanso"
+      "gh"
+      "ghostty"
+      "gnupg"
+      "granted"
+      "i3status"
+      "kitty"
+      "lesspipe"
+      "mu"
+      "msmtp"
+      "nheko"
+      "nix"
+      "nix-index"
+      "nix-your-shell"
+      "ollama"
+      "openstackclient"
+      "papis"
+      "pay-respects"
+      "pls"
+      "pyenv"
+      "sagemath"
+      "scmpuff"
+      "sm64ex"
+      "thefuck"
+      "wezterm"
+      "yubikey-agent"
+      "zellij"
+      "zplug"
+    ];
+
+    inner = self: super:
+      lib.mapAttrs (name: value:
+        if lib.elem name packagesToScrub then
+        # Apply scrubbing to this specific package
+          scrubDerivation name value
+        else
+          value) super;
+
+    outer = self: super:
+      inner self super // {
+        buildPackages = super.buildPackages.extend inner;
+      };
+  in outer;
+
   scrubbedPkgs =
-    let rawScrubbedPkgs = lib.makeExtensible (final: scrubDerivations pkgs);
-    in builtins.traceVerbose "eval scrubbed nixpkgs"
-    (rawScrubbedPkgs.extend whitelist);
+    # TODO: fix darwin stdenv stubbing
+    if isDarwin then
+      let rawPkgs = lib.makeExtensible (final: pkgs);
+      in builtins.traceVerbose "eval scrubbed darwin nixpkgs"
+      (rawPkgs.extend darwinBlacklist)
+    else
+      let rawScrubbedPkgs = lib.makeExtensible (final: scrubDerivations pkgs);
+      in builtins.traceVerbose "eval scrubbed nixpkgs"
+      (rawScrubbedPkgs.extend whitelist);
 
   modules = import ../modules/modules.nix {
     inherit lib pkgs;

From 91f88408ccb7649dc6feec5ba565aee4e2097510 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 21:03:44 -0500
Subject: [PATCH 498/546] .github/workflows/test.yml: enable darwin tests

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index db71dca7b..e4189723a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,5 @@ jobs:
     - run: nix-shell --show-trace . -A install
     - run: yes | home-manager -I home-manager=. uninstall
     - run: nix-shell -j auto --show-trace --arg enableBig false --pure tests -A run.all
-      # Somebody please help us fix the macos tests.
-      if: matrix.os != 'macos-latest'
       env:
         GC_INITIAL_HEAP_SIZE: 4294967296

From 1909541fc7e844266df393a25c386cb4ca14f6e3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 27 Feb 2025 20:54:49 -0500
Subject: [PATCH 499/546] tests/targets-darwin: fix user-defaults test

Update to represent the new output generated by the module.
---
 tests/modules/targets-darwin/user-defaults.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/modules/targets-darwin/user-defaults.nix b/tests/modules/targets-darwin/user-defaults.nix
index bb23f718d..a99baf6d0 100644
--- a/tests/modules/targets-darwin/user-defaults.nix
+++ b/tests/modules/targets-darwin/user-defaults.nix
@@ -1,5 +1,3 @@
-{ lib, ... }:
-
 {
   config = {
     targets.darwin = {
@@ -10,9 +8,9 @@
 
     nmt.script = ''
       assertFileRegex activate \
-        "/usr/bin/defaults  import 'com.apple.desktopservices' /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.desktopservices\\.plist"
+        "/usr/bin/defaults  import com.apple.desktopservices /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.desktopservices\\.plist"
       assertFileRegex activate \
-        "/usr/bin/defaults -currentHost import 'com.apple.controlcenter' /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.controlcenter\\.plist"
+        "/usr/bin/defaults -currentHost import com.apple.controlcenter /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.controlcenter\\.plist"
     '';
   };
 }

From 15498b94ec2c7aa857864af105b72cb41def0b00 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 20:19:44 -0600
Subject: [PATCH 500/546] tests/syncthing: fix extra-options on darwin

Need to stub the return from the writeBash used to populate the plist
file for darwin. Also the arguments were moved inside the wrapper.
---
 .../modules/services/syncthing/common/expected-agent.plist | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/modules/services/syncthing/common/expected-agent.plist b/tests/modules/services/syncthing/common/expected-agent.plist
index 3b9a28ff2..72ec9d0dd 100644
--- a/tests/modules/services/syncthing/common/expected-agent.plist
+++ b/tests/modules/services/syncthing/common/expected-agent.plist
@@ -15,12 +15,7 @@
 	<string>Background</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>@syncthing@/bin/syncthing</string>
-		<string>-no-browser</string>
-		<string>-no-restart</string>
-		<string>-logflags=0</string>
-		<string>-foo</string>
-		<string>-bar "baz"</string>
+		<string>@syncthing-wrapper@</string>
 	</array>
 </dict>
 </plist>
\ No newline at end of file

From 68540fb7755d3be96c71cfc5a6f43a3d615d9de7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 21:30:15 -0600
Subject: [PATCH 501/546] tests/syncthing: syncthing wrapper stubbing for
 darwin

---
 tests/modules/services/syncthing/common/extra-options.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/modules/services/syncthing/common/extra-options.nix b/tests/modules/services/syncthing/common/extra-options.nix
index 9db9f5940..226a5906b 100644
--- a/tests/modules/services/syncthing/common/extra-options.nix
+++ b/tests/modules/services/syncthing/common/extra-options.nix
@@ -2,6 +2,10 @@
 
 lib.mkMerge [
   {
+    test.stubs.writers = {
+      extraAttrs.writeBash = (name: fn: "@syncthing-wrapper@");
+    };
+
     services.syncthing = {
       enable = true;
       extraOptions = [ "-foo" ''-bar "baz"'' ];

From 4c9643363a0f218a3d473149f6a024c8a66d0f62 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 21:28:07 -0600
Subject: [PATCH 502/546] tests/ollama: fix darwin test

---
 tests/modules/services/ollama/darwin/expected-agent.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/services/ollama/darwin/expected-agent.plist b/tests/modules/services/ollama/darwin/expected-agent.plist
index a159fd980..97ed3c8ae 100644
--- a/tests/modules/services/ollama/darwin/expected-agent.plist
+++ b/tests/modules/services/ollama/darwin/expected-agent.plist
@@ -28,4 +28,4 @@
 		<string>serve</string>
 	</array>
 </dict>
-</plist>
+</plist>
\ No newline at end of file

From 4f2c4612861405d40bc81fa8a8575d15bee6e8d2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 22:10:10 -0600
Subject: [PATCH 503/546] tests/yubikey-agent-darwin: fix test

---
 tests/modules/services/yubikey-agent-darwin/service.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/modules/services/yubikey-agent-darwin/service.nix b/tests/modules/services/yubikey-agent-darwin/service.nix
index aa09695d0..99b68dc6f 100644
--- a/tests/modules/services/yubikey-agent-darwin/service.nix
+++ b/tests/modules/services/yubikey-agent-darwin/service.nix
@@ -28,7 +28,7 @@
         	<string>Background</string>
         	<key>ProgramArguments</key>
         	<array>
-                        <string>@yubikey-agent@/bin/yubikey-agent</string>
+        		<string>@yubikey-agent@/bin/yubikey-agent</string>
         		<string>-l</string>
         		<string>/tmp/yubikey-agent.sock</string>
         	</array>
@@ -43,8 +43,7 @@
         		</dict>
         	</dict>
         </dict>
-        </plist>
-      ''
+        </plist>''
     }
   '';
 }

From 8d2a05810834119b96531745de7943cc8ba5bb79 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 22:02:13 -0600
Subject: [PATCH 504/546] tests/thunderbird: fix darwin test

---
 .../thunderbird/thunderbird-expected-first-darwin.js      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
index 34f7f4eff..2fe2fa39f 100644
--- a/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
+++ b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js
@@ -3,9 +3,10 @@
 user_pref("general.useragent.override", "");
 user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
 user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc");
+user_pref("mail.account.account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.server", "server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
 user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.identities", "id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562");
 user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.server", "server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
-user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
+user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
 user_pref("mail.accountmanager.defaultaccount", "account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.attachPgpKey", false);
 user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.autoEncryptDrafts", true);
@@ -52,6 +53,11 @@ user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da50
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3);
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap");
 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory", "Library/Thunderbird/Profiles/first/Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory-rel", "[ProfD]Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.hostname", "Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.name", "rss");
+user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.type", "rss");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory", "Library/Thunderbird/Profiles/first/ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory-rel", "[ProfD]ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f");
 user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "imap.example.com");

From 1fd39a105575ea997b32a043a0dd2c49294add5b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 23:04:56 -0600
Subject: [PATCH 505/546] tests/vscode: fix darwin snippets test

---
 tests/modules/programs/vscode/snippets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/modules/programs/vscode/snippets.nix b/tests/modules/programs/vscode/snippets.nix
index 7d024fed3..eafa69186 100644
--- a/tests/modules/programs/vscode/snippets.nix
+++ b/tests/modules/programs/vscode/snippets.nix
@@ -4,7 +4,7 @@ let
 
   snippetsDir = name:
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "Library/Application Support/Code/User${
+      "Library/Application Support/Code/User/${
         lib.optionalString (name != "default") "profiles/${name}/"
       }/snippets"
     else

From 07f505f91e0c7112550845425222f41865c4260a Mon Sep 17 00:00:00 2001
From: Ilise Leary <coder.nova99@mailbox.org>
Date: Sun, 9 Mar 2025 08:15:02 -0500
Subject: [PATCH 506/546] qt: add "kde6" to qt.platformTheme (#6493)

---
 modules/misc/qt.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix
index 3152e0091..c1c413046 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt.nix
@@ -13,6 +13,11 @@ let
       libsForQt5.plasma-integration
       libsForQt5.systemsettings
     ];
+    kde6 = [
+      kdePackages.kio
+      kdePackages.plasma-integration
+      kdePackages.systemsettings
+    ];
     lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ];
     qtct = [ libsForQt5.qt5ct qt6Packages.qt6ct ];
   };
@@ -75,6 +80,8 @@ in {
               [ "libsForQt5" "qt5ct" ]
               [ "libsForQt5" "qtstyleplugins" ]
               [ "libsForQt5" "systemsettings" ]
+              [ "kdePackages" "plasma-integration" ]
+              [ "kdePackages" "systemsettings" ]
               [ "lxqt" "lxqt-config" ]
               [ "lxqt" "lxqt-qtplugin" ]
               [ "qt6Packages" "qt6ct" ]
@@ -114,7 +121,10 @@ in {
                 applications
 
               `kde`
-              : Use Qt settings from Plasma
+              : Use Qt settings from Plasma 5
+
+              `kde6`
+              : Use Qt settings from Plasma 6
             '';
           };
           package = lib.mkOption {
@@ -131,8 +141,8 @@ in {
         };
       in lib.mkOption {
         type = with lib.types;
-          nullOr
-          (either (enum [ "gtk" "gtk3" "gnome" "adwaita" "lxqt" "qtct" "kde" ])
+          nullOr (either
+            (enum [ "gtk" "gtk3" "gnome" "adwaita" "lxqt" "qtct" "kde" "kde6" ])
             (lib.types.submodule { options = newOption; }));
         default = null;
         description = ''

From 277eea1cc7a5c37ea0b9aa8198cd1f2db3d6715c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:47:25 +0000
Subject: [PATCH 507/546] home-environment: add home.sessionSearchVariables

This commit introduces `home.sessionSearchVariables` option, that is
created to be a "generic" version of `home.sessionPath` for any
environment variables that is similar to PATH (e.g.: MANPATH). This
allows composition of those variables between multiple modules, avoiding
issues like this one:

https://github.com/nix-community/home-manager/pull/4579/files#r1364374048

This commit also reimplements `home.sessionPath` as terms of
`home.sessionSearchVariables`, to reduce code duplication and show that
the code is correct.

The behavior is to prepend the new search paths. This will allow
the user to override the defaults easily by setting it later in the
configuration.
---
 modules/home-environment.nix                  | 36 ++++++++++++++++---
 modules/lib/shell.nix                         |  8 +++++
 tests/modules/home-environment/default.nix    |  3 +-
 .../modules/home-environment/session-path.nix |  4 +--
 .../session-search-variables.nix              | 15 ++++++++
 5 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 tests/modules/home-environment/session-search-variables.nix

diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 0e3bef900..652ac086c 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -309,7 +309,7 @@ in
         ".git/safe/../../bin"
       ];
       description = ''
-        Extra directories to add to {env}`PATH`.
+        Extra directories to prepend to {env}`PATH`.
 
         These directories are added to the {env}`PATH` variable in a
         double-quoted context, so expressions like `$HOME` are
@@ -319,6 +319,27 @@ in
       '';
     };
 
+    home.sessionSearchVariables = mkOption {
+      default = { };
+      type = with types; attrsOf (listOf str);
+      example = {
+        MANPATH = [
+          "$HOME/.npm-packages/man"
+          "\${xdg.configHome}/.local/share/man"
+        ];
+      };
+      description = ''
+        Extra directories to prepend to arbitrary PATH-like
+        environment variables (e.g.: {env}`MANPATH`). The values
+        will be concatenated by `:`.
+        These directories are added to the environment variable in a
+        double-quoted context, so expressions like `$HOME` are
+        expanded by the shell. However, since expressions like `~` or
+        `*` are escaped, they will end up in the environment
+        verbatim.
+      '';
+    };
+
     home.sessionVariablesExtra = mkOption {
       type = types.lines;
       default = "";
@@ -575,11 +596,18 @@ in
         export __HM_SESS_VARS_SOURCED=1
 
         ${config.lib.shell.exportAll cfg.sessionVariables}
-      '' + lib.optionalString (cfg.sessionPath != [ ]) ''
-        export PATH="$PATH''${PATH:+:}${lib.concatStringsSep ":" cfg.sessionPath}"
-      '' + cfg.sessionVariablesExtra;
+      '' + lib.concatStringsSep "\n"
+        (lib.mapAttrsToList
+          (env: values: config.lib.shell.export
+            env
+            (config.lib.shell.prependToVar ":" env values))
+          cfg.sessionSearchVariables)
+        + cfg.sessionVariablesExtra;
     };
 
+    home.sessionSearchVariables.PATH =
+      lib.mkIf (cfg.sessionPath != [ ]) cfg.sessionPath;
+
     home.packages = [ config.home.sessionVariablesPackage ];
 
     # The entry acting as a boundary between the activation script's "check" and
diff --git a/modules/lib/shell.nix b/modules/lib/shell.nix
index ae30e0b0f..04f9135cf 100644
--- a/modules/lib/shell.nix
+++ b/modules/lib/shell.nix
@@ -17,6 +17,14 @@ let
     };
 
 in rec {
+  # Produces a Bourne shell like statement that prepend new values to
+  # an possibly existing variable, using sep(arator).
+  # Example:
+  #   prependToVar ":" "PATH" [ "$HOME/bin" "$HOME/.local/bin" ]
+  #   => "$HOME/bin:$HOME/.local/bin:${PATH:+:}\$PATH"
+  prependToVar = sep: n: v:
+    "${lib.concatStringsSep sep v}\${${n}:+${sep}}\$${n}";
+
   # Produces a Bourne shell like variable export statement.
   export = n: v: ''export ${n}="${toString v}"'';
 
diff --git a/tests/modules/home-environment/default.nix b/tests/modules/home-environment/default.nix
index e76e248a1..c38ad5ce5 100644
--- a/tests/modules/home-environment/default.nix
+++ b/tests/modules/home-environment/default.nix
@@ -1,4 +1,5 @@
 {
-  home-session-variables = ./session-variables.nix;
   home-session-path = ./session-path.nix;
+  home-session-search-variables = ./session-search-variables.nix;
+  home-session-variables = ./session-variables.nix;
 }
diff --git a/tests/modules/home-environment/session-path.nix b/tests/modules/home-environment/session-path.nix
index 57cfeceda..907d6c398 100644
--- a/tests/modules/home-environment/session-path.nix
+++ b/tests/modules/home-environment/session-path.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
@@ -10,6 +10,6 @@
     hmSessVars=home-path/etc/profile.d/hm-session-vars.sh
     assertFileExists $hmSessVars
     assertFileContains $hmSessVars \
-      'export PATH="$PATH''${PATH:+:}bar:baz:foo"'
+      'export PATH="bar:baz:foo''${PATH:+:}$PATH"'
   '';
 }
diff --git a/tests/modules/home-environment/session-search-variables.nix b/tests/modules/home-environment/session-search-variables.nix
new file mode 100644
index 000000000..b12009f2b
--- /dev/null
+++ b/tests/modules/home-environment/session-search-variables.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  imports = [
+    ({ ... }: { config.home.sessionSearchVariables.TEST = [ "foo" ]; })
+    ({ ... }: { config.home.sessionSearchVariables.TEST = [ "bar" "baz" ]; })
+  ];
+
+  nmt.script = ''
+    hmSessVars=home-path/etc/profile.d/hm-session-vars.sh
+    assertFileExists $hmSessVars
+    assertFileContains $hmSessVars \
+      'export TEST="bar:baz:foo''${TEST:+:}$TEST"'
+  '';
+}

From 601f8d073c0b2f1fb4601b4727fb43ba6412685b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:50:04 +0000
Subject: [PATCH 508/546] im/fcitx5: use home.sessionSearchVariables for
 QT_PLUGIN_PATH

---
 modules/i18n/input-method/fcitx5.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 78b6f909e..be239b30f 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -38,14 +38,17 @@ in {
   config = lib.mkIf (im.enabled == "fcitx5") {
     i18n.inputMethod.package = fcitx5Package;
 
-    home.sessionVariables = {
-      GLFW_IM_MODULE = "ibus"; # IME support in kitty
-      XMODIFIERS = "@im=fcitx";
-      QT_PLUGIN_PATH =
-        "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}";
-    } // lib.optionalAttrs (!cfg.waylandFrontend) {
-      GTK_IM_MODULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
+    home = {
+      sessionVariables = {
+        GLFW_IM_MODULE = "ibus"; # IME support in kitty
+        XMODIFIERS = "@im=fcitx";
+      } // lib.optionalAttrs (!cfg.waylandFrontend) {
+        GTK_IM_MODULE = "fcitx";
+        QT_IM_MODULE = "fcitx";
+      };
+
+      sessionSearchVariables.QT_PLUGIN_PATH =
+        [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
     };
 
     systemd.user.services.fcitx5-daemon = {

From daab32302b0bdd9bfff9e75d32375353d95b9c4f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:50:54 +0000
Subject: [PATCH 509/546] debug: use home.sessionSearchVariables for
 NIX_DEBUG_INFO_DIRS

---
 modules/misc/debug.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/debug.nix b/modules/misc/debug.nix
index 3745232c3..12ba8d88c 100644
--- a/modules/misc/debug.nix
+++ b/modules/misc/debug.nix
@@ -16,7 +16,7 @@
   config = lib.mkIf config.home.enableDebugInfo {
     home.extraOutputsToInstall = [ "debug" ];
 
-    home.sessionVariables = {
+    home.sessionSearchVariables = {
       NIX_DEBUG_INFO_DIRS =
         "$NIX_DEBUG_INFO_DIRS\${NIX_DEBUG_INFO_DIRS:+:}${config.home.profileDirectory}/lib/debug";
     };

From 5094e32ccea3168a5cb9ee6e3b7e74aaf4d866a9 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:52:07 +0000
Subject: [PATCH 510/546] home-cursor: use home.sessionSearchVariables for
 XCURSOR_PATH

---
 modules/config/home-cursor.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index c7699bb37..5babbca78 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -153,16 +153,17 @@ in {
 
       home.packages = [ cfg.package defaultIndexThemePackage ];
 
+      home.sessionVariables = {
+        XCURSOR_SIZE = mkDefault cfg.size;
+        XCURSOR_THEME = mkDefault cfg.name;
+      };
+
       # Set directory to look for cursors in, needed for some applications
       # that are unable to find cursors otherwise. See:
       # https://github.com/nix-community/home-manager/issues/2812
       # https://wiki.archlinux.org/title/Cursor_themes#Environment_variable
-      home.sessionVariables = {
-        XCURSOR_PATH = mkDefault ("$XCURSOR_PATH\${XCURSOR_PATH:+:}"
-          + "${config.home.profileDirectory}/share/icons");
-        XCURSOR_SIZE = mkDefault cfg.size;
-        XCURSOR_THEME = mkDefault cfg.name;
-      };
+      home.sessionSearchVariables.XCURSOR_PATH =
+        [ "${config.home.profileDirectory}/share/icons" ];
 
       # Add symlink of cursor icon directory to $HOME/.icons, needed for
       # backwards compatibility with some applications. See:

From ab56fd8db811581323bb7aecd9c47c5956b3b17c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:53:57 +0000
Subject: [PATCH 511/546] targets/generic-linux: use
 home.sessionSearchVariables for XCURSOR_PATH

---
 modules/targets/generic-linux.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix
index 45762ac5e..8503f58e8 100644
--- a/modules/targets/generic-linux.nix
+++ b/modules/targets/generic-linux.nix
@@ -47,13 +47,12 @@ in {
     # We need to append system-wide FHS directories due to the default prefix
     # resolving to the Nix store.
     # https://github.com/nix-community/home-manager/pull/2891#issuecomment-1101064521
-    home.sessionVariables = {
-      XCURSOR_PATH = "$XCURSOR_PATH\${XCURSOR_PATH:+:}"
-        + lib.concatStringsSep ":" [
-          "${config.home.profileDirectory}/share/icons"
-          "/usr/share/icons"
-          "/usr/share/pixmaps"
-        ];
+    home.sessionSearchVariables = {
+      XCURSOR_PATH = [
+        "${config.home.profileDirectory}/share/icons"
+        "/usr/share/icons"
+        "/usr/share/pixmaps"
+      ];
     };
 
     home.sessionVariablesExtra = ''

From cf47e7ea2182c5638fdd1b42de329cc7d185cf8b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 12:55:55 +0000
Subject: [PATCH 512/546] qt: use home.sessionSearchVariables

---
 modules/misc/qt.nix | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix
index c1c413046..9457970c0 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt.nix
@@ -228,13 +228,10 @@ in {
       inherit (config.home) profileDirectory;
       qtVersions = with pkgs; [ qt5 qt6 ];
       makeQtPath = prefix:
-        lib.concatStringsSep ":"
         (map (qt: "${profileDirectory}/${qt.qtbase.${prefix}}") qtVersions);
     in {
-      QT_PLUGIN_PATH = "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}"
-        + (makeQtPath "qtPluginPrefix");
-      QML2_IMPORT_PATH = "$QML2_IMPORT_PATH\${QML2_IMPORT_PATH:+:}"
-        + (makeQtPath "qtQmlPrefix");
+      QT_PLUGIN_PATH = makeQtPath "qtPluginPrefix";
+      QML2_IMPORT_PATH = makeQtPath "qtQmlPrefix";
     };
 
   in lib.mkIf cfg.enable {
@@ -258,19 +255,14 @@ in {
 
     home = {
       sessionVariables = envVars;
-      # home.sessionVariables does not support setting the same environment
-      # variable to different values.
-      # Since some other modules may set the QT_PLUGIN_PATH or QML2_IMPORT_PATH
-      # to their own value, e.g.: fcitx5, we avoid conflicts by setting
-      # the values in home.sessionVariablesExtra instead.
-      sessionVariablesExtra = ''
-        export QT_PLUGIN_PATH=${envVarsExtra.QT_PLUGIN_PATH}
-        export QML2_IMPORT_PATH=${envVarsExtra.QML2_IMPORT_PATH}
-      '';
+      sessionSearchVariables = envVarsExtra;
     };
 
     # Apply theming also to apps started by systemd.
-    systemd.user.sessionVariables = envVars // envVarsExtra;
+    systemd.user.sessionVariables = envVars // {
+      QT_PLUGIN_PATH = lib.concatStringsSep ":" envVarsExtra.QT_PLUGIN_PATH;
+      QML2_IMPORT_PATH = lib.concatStringsSep ":" envVarsExtra.QML2_IMPORT_PATH;
+    };
 
     home.packages = (lib.findFirst (x: x != [ ]) [ ] [
       (lib.optionals (platformTheme.package != null)

From 2967de4d1146f1b6aa820eed85b823ea2ebfd0fa Mon Sep 17 00:00:00 2001
From: Brian Leung <29217594+leungbk@users.noreply.github.com>
Date: Sun, 9 Mar 2025 10:20:08 -0700
Subject: [PATCH 513/546] debug: make NIX_DEBUG_INFO_DIRS a list of strings
 (#6595)

Fixup of daab32302b0bdd9bfff9e75d32375353d95b9c4f.
---
 modules/misc/debug.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/misc/debug.nix b/modules/misc/debug.nix
index 12ba8d88c..eb9d85655 100644
--- a/modules/misc/debug.nix
+++ b/modules/misc/debug.nix
@@ -17,8 +17,7 @@
     home.extraOutputsToInstall = [ "debug" ];
 
     home.sessionSearchVariables = {
-      NIX_DEBUG_INFO_DIRS =
-        "$NIX_DEBUG_INFO_DIRS\${NIX_DEBUG_INFO_DIRS:+:}${config.home.profileDirectory}/lib/debug";
+      NIX_DEBUG_INFO_DIRS = [ "${config.home.profileDirectory}/lib/debug" ];
     };
   };
 }

From db4386d686fb0b2788e7422e6a2299deace9c4b1 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 9 Mar 2025 17:57:44 +0000
Subject: [PATCH 514/546] home-environment: add line-break after
 sessionSearchVariables (#6596)

PR #6593 broke activation when `sessionVariablesExtra` is used, e.g.:
`services.ssh-agent` because it concatenate the strings without a line
break, so the resulting `hm-session-vars.sh` file became:

```bash
export XCURSOR_PATH="/etc/profiles/per-user/thiagoko/share/icons${XCURSOR_PATH:+:}$XCURSOR_PATH"if [ -z "$SSH_AUTH_SOCK" ]; then
  export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
fi
```

This commit fixes it by enforcing a line break between
`sessionSearchVariables` and `sessionVariablesExtra`.
---
 modules/home-environment.nix                         | 2 +-
 tests/modules/home-environment/session-variables.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 652ac086c..9d792ca31 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -601,7 +601,7 @@ in
           (env: values: config.lib.shell.export
             env
             (config.lib.shell.prependToVar ":" env values))
-          cfg.sessionSearchVariables)
+          cfg.sessionSearchVariables) + "\n"
         + cfg.sessionVariablesExtra;
     };
 
diff --git a/tests/modules/home-environment/session-variables.nix b/tests/modules/home-environment/session-variables.nix
index e1c8bedf8..0234c4cf8 100644
--- a/tests/modules/home-environment/session-variables.nix
+++ b/tests/modules/home-environment/session-variables.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 let
 
@@ -16,6 +16,7 @@ let
     export XDG_CONFIG_HOME="/home/hm-user/.config"
     export XDG_DATA_HOME="/home/hm-user/.local/share"
     export XDG_STATE_HOME="/home/hm-user/.local/state"
+
   '';
 
   darwinExpected = ''
@@ -29,6 +30,7 @@ let
     export XDG_CONFIG_HOME="/home/hm-user/.config"
     export XDG_DATA_HOME="/home/hm-user/.local/share"
     export XDG_STATE_HOME="/home/hm-user/.local/state"
+
   '';
 
   expected = pkgs.writeText "expected"

From 597f9c2f06af8791b31c48ad05471ac5afbd0f0a Mon Sep 17 00:00:00 2001
From: Jono <jono@foodnotblogs.com>
Date: Sun, 9 Mar 2025 16:38:46 -0700
Subject: [PATCH 515/546] thunderbird: set additional gmail server settings
 (#6579)

When email account is gmail in thunderbird, set additional server
settings.
As of March 2025, gmail only allows ssl/oauth0 authentication, so here I
set the authMethod accordingly.

Also setting 'is_gmail' to true in thunderbird settings such that labels
and trash work out of the box when the email account flavor is "gmail".
This brings in the gmail configs for how it handles folders, labels, and
archiving messages.
---
 modules/programs/thunderbird.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 8d9460996..48587c308 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -358,7 +358,17 @@ in {
 
     accounts.email.accounts = mkOption {
       type = with types;
-        attrsOf (submodule {
+        attrsOf (submodule ({ config, ... }: {
+          config.thunderbird = {
+            settings = lib.mkIf (config.flavor == "gmail.com") (id: {
+              "mail.server.server_${id}.authMethod" =
+                mkOptionDefault 10; # 10 = OAuth2
+              "mail.server.server_${id}.socketType" =
+                mkOptionDefault 3; # SSL/TLS
+              "mail.server.server_${id}.is_gmail" =
+                mkOptionDefault true; # handle labels, trash, etc
+            });
+          };
           options.thunderbird = {
             enable =
               mkEnableOption "the Thunderbird mail client for this account";
@@ -409,7 +419,7 @@ in {
               '';
             };
           };
-        });
+        }));
     };
   };
 

From f8bb0ba6de361c43c1c1e9756375f23ffadac1f9 Mon Sep 17 00:00:00 2001
From: carschandler <92899389+carschandler@users.noreply.github.com>
Date: Mon, 10 Mar 2025 03:50:41 +0000
Subject: [PATCH 516/546] zoxide: update mkOrder to place bash configuration at
 end of bashrc (#6572)

I updated my flake a few weeks back and `zoxide` has been giving me an error recently:

```
zoxide: detected a possible configuration issue.
Please ensure that zoxide is initialized right at the end of your shell configuration file (usually ~/.bashrc).

If the issue persists, consider filing an issue at:
https://github.com/ajeetdsouza/zoxide/issues

Disable this message by setting _ZO_DOCTOR=0.
```

To be fair, I haven't noticed any issues with `zoxide` apart from this error message.

The `zoxide` eval statement in my `.bashrc` is not "right at the end" of the file as mentioned in the message which isn't surprising given that it is given a `mkOrder 150`. In my own config, I increased this to `2000` (to ensure it comes after any `mkAfter`s which are `mkOrder 1500` to ensure it happens at the end of the script. After doing so, it appears at the end of my `bashrc` and I no longer get the error message.
---
 modules/programs/zoxide.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index 23a18a357..95364f04b 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -48,7 +48,7 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 150 ''
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 2000 ''
       eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
     '');
 

From ce9cb2496c48ebb33e42ee0ab82267f67b82f71e Mon Sep 17 00:00:00 2001
From: bamhm182 <dylan@bytepen.com>
Date: Mon, 10 Mar 2025 00:02:05 -0400
Subject: [PATCH 517/546] podman: added volume, image, and build quadlets
 (#6137)

Added support for build, image, and volume quadlets
Resolved test failures due to podman 5.3.0 upgrade
Replaced several instances of pkgs.podman with services.podman.package
---
 modules/services/podman-linux/activation.nix  |  27 +--
 modules/services/podman-linux/builds.nix      | 168 ++++++++++++++++
 modules/services/podman-linux/containers.nix  |  75 +++++--
 modules/services/podman-linux/default.nix     |  11 +-
 modules/services/podman-linux/images.nix      | 162 +++++++++++++++
 .../services/podman-linux/install-quadlet.nix |   2 +-
 modules/services/podman-linux/networks.nix    |  12 +-
 modules/services/podman-linux/podman-lib.nix  |  29 ++-
 modules/services/podman-linux/services.nix    |   4 +-
 modules/services/podman-linux/volumes.nix     | 186 ++++++++++++++++++
 .../podman-linux/build-expected.service       |  30 +++
 tests/modules/services/podman-linux/build.nix |  44 +++++
 .../podman-linux/container-expected.service   |   1 -
 .../modules/services/podman-linux/default.nix |   3 +
 .../podman-linux/image-expected.service       |  28 +++
 tests/modules/services/podman-linux/image.nix |  18 ++
 .../integration-build-expected.service        |  30 +++
 ...integration-container-bld-expected.service |  38 ++++
 .../integration-container-expected.service    |   8 +-
 .../integration-image-expected.service        |  28 +++
 .../integration-volume-expected.service       |  33 ++++
 .../services/podman-linux/integration.nix     |  46 ++++-
 .../podman-linux/volume-expected.service      |  36 ++++
 .../modules/services/podman-linux/volume.nix  |  35 ++++
 24 files changed, 1000 insertions(+), 54 deletions(-)
 create mode 100644 modules/services/podman-linux/builds.nix
 create mode 100644 modules/services/podman-linux/images.nix
 create mode 100644 modules/services/podman-linux/volumes.nix
 create mode 100644 tests/modules/services/podman-linux/build-expected.service
 create mode 100644 tests/modules/services/podman-linux/build.nix
 create mode 100644 tests/modules/services/podman-linux/image-expected.service
 create mode 100644 tests/modules/services/podman-linux/image.nix
 create mode 100644 tests/modules/services/podman-linux/integration-build-expected.service
 create mode 100644 tests/modules/services/podman-linux/integration-container-bld-expected.service
 create mode 100644 tests/modules/services/podman-linux/integration-image-expected.service
 create mode 100644 tests/modules/services/podman-linux/integration-volume-expected.service
 create mode 100644 tests/modules/services/podman-linux/volume-expected.service
 create mode 100644 tests/modules/services/podman-linux/volume.nix

diff --git a/modules/services/podman-linux/activation.nix b/modules/services/podman-linux/activation.nix
index 5791f19b0..205b6651e 100644
--- a/modules/services/podman-linux/activation.nix
+++ b/modules/services/podman-linux/activation.nix
@@ -18,6 +18,7 @@
       local manifestFile="${config.xdg.configHome}/podman/$2"
       local extraListCommands="''${3:-}"
       [[ $resourceType = "container" ]] && extraListCommands+=" -a"
+      [[ $resourceType = "volume" ]] && extraListCommands+=" --filter label=nix.home-manager.preserve=false"
 
       [ ! -f "$manifestFile" ] && VERBOSE_ENABLED && echo "Manifest does not exist: $manifestFile" && return 0
 
@@ -27,6 +28,7 @@
 
       formatString="{{.Name}}"
       [[ $resourceType = "container" ]] && formatString="{{.Names}}"
+      [[ $resourceType = "image" ]] && formatString="{{.Repository}}"
 
       local listOutput=$(${config.services.podman.package}/bin/podman $resourceType ls $extraListCommands --filter 'label=nix.home-manager.managed=true' --format "$formatString")
 
@@ -36,12 +38,12 @@
         VERBOSE_ENABLED && echo "No ''${resourceType}s available to process." || true
       else
         for resource in "''${podmanResources[@]}"; do
-            if ! isResourceInManifest "$resource"; then
-              removeResource "$resourceType" "$resource"
-            else
-              VERBOSE_ENABLED && echo "Keeping managed $resourceType: $resource" || true
-            fi
-          done
+          if ! isResourceInManifest "$resource"; then
+            removeResource "$resourceType" "$resource"
+          else
+            VERBOSE_ENABLED && echo "Keeping managed $resourceType: $resource" || true
+          fi
+        done
       fi
     }
 
@@ -69,19 +71,20 @@
       commands=()
       case "$resourceType" in
         "container")
-          commands+="${config.services.podman.package}/bin/podman $resourceType stop $resource"
-          commands+="${config.services.podman.package}/bin/podman $resourceType rm -f $resource"
+          commands+=("${config.services.podman.package}/bin/podman $resourceType stop $resource")
+          commands+=("${config.services.podman.package}/bin/podman $resourceType rm -f $resource")
           ;;
-        "network")
-          commands+="${config.services.podman.package}/bin/podman $resourceType rm $resource"
+        "image" | "network" | "volume")
+          commands+=("${config.services.podman.package}/bin/podman $resourceType rm $resource")
           ;;
       esac
       for command in "''${commands[@]}"; do
         command=$(echo $command | tr -d ';&|`')
         DRYRUN_ENABLED && echo "Would run: $command" && continue || true
         VERBOSE_ENABLED && echo "Running: $command" || true
-        if [[ "$(eval "$command")" != "$resource" ]]; then
+        if [[ "$(eval "$command")" != *"$resource" ]]; then
           echo -e "\tCommand failed: ''${command}"
+          [ "$resourceType" == "image" ] && resourceType="ancestor"
           usedByContainers=$(${config.services.podman.package}/bin/podman container ls -a --filter "$resourceType=$resource" --format "{{.Names}}")
           echo -e "\t$resource in use by containers: $usedByContainers"
         fi
@@ -92,7 +95,7 @@
     [[ "$@" == *"--verbose"* ]] && VERBOSE="true"
     [[ "$@" == *"--dry-run"* ]] && DRY_RUN="true"
 
-    for type in "container" "network"; do
+    for type in "container" "image" "network" "volume"; do
       cleanup "$type" "''${type}s.manifest"
     done
   '';
diff --git a/modules/services/podman-linux/builds.nix b/modules/services/podman-linux/builds.nix
new file mode 100644
index 000000000..937a206b0
--- /dev/null
+++ b/modules/services/podman-linux/builds.nix
@@ -0,0 +1,168 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
+
+  createQuadletSource = name: buildDef:
+    let
+      buildConfig = podman-lib.deepMerge {
+        Build = {
+          AuthFile = buildDef.authFile;
+          Environment = buildDef.environment;
+          File = buildDef.file;
+          ImageTag = [ "homemanager/${name}" ] ++ buildDef.tags;
+          Label = buildDef.labels // { "nix.home-manager.managed" = true; };
+          PodmanArgs = buildDef.extraPodmanArgs;
+          SetWorkingDirectory = buildDef.workingDirectory;
+          TLSVerify = buildDef.tlsVerify;
+        };
+        Install = {
+          WantedBy = optionals buildDef.autoStart [
+            "default.target"
+            "multi-user.target"
+          ];
+        };
+        Service = {
+          TimeoutStartSec = 300;
+          RemainAfterExit = "yes";
+        };
+        Unit = { Description = buildDef.description; };
+      } buildDef.extraConfig;
+    in ''
+      # Automatically generated by home-manager for podman build configuration
+      # DO NOT EDIT THIS FILE DIRECTLY
+      #
+      # ${name}.build
+      ${podman-lib.toQuadletIni buildConfig}
+    '';
+
+  toQuadletInternal = name: buildDef: {
+    assertions = podman-lib.buildConfigAsserts name buildDef.extraConfig;
+    serviceName =
+      "podman-${name}"; # quadlet service name: 'podman-<name>-build.service
+    source = podman-lib.removeBlankLines (createQuadletSource name buildDef);
+    resourceType = "build";
+  };
+in let
+  buildDefinitionType = types.submodule ({ name, ... }: {
+    options = {
+
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          "Whether to start the build on boot. Requires user lingering.";
+      };
+
+      authFile = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description = "Path of the authentication file.";
+      };
+
+      description = mkOption {
+        type = with types; nullOr str;
+        default = "Service for build ${name}";
+        defaultText = "Service for build \${name}";
+        example = "My Build";
+        description = "The description of the build.";
+      };
+
+      environment = mkOption {
+        type = podman-lib.primitiveAttrs;
+        default = { };
+        example = literalExpression ''
+          {
+            VAR1 = "0:100";
+            VAR2 = true;
+            VAR3 = 5;
+          }
+        '';
+        description = "Environment variables to set in the build.";
+      };
+
+      extraConfig = mkOption {
+        type = podman-lib.extraConfigType;
+        default = { };
+        example = literalExpression ''
+          {
+            Build = {
+              Arch = "aarch64";
+            };
+            Service = {
+              TimeoutStartSec = 15;
+            };
+          }
+        '';
+        description = "INI sections and values to populate the Build Quadlet.";
+      };
+
+      extraPodmanArgs = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "--retries 5" ];
+        description = "Extra arguments to pass to the podman build command.";
+      };
+
+      file = mkOption {
+        type = types.str;
+        example = literalExpression ''
+          `"xdg.configFile."containerfiles/my-img/Containerfile"`
+          or
+          `"https://github.com/.../my-img/Containerfile"`
+        '';
+        description =
+          "Path to a Containerfile which contains instructions to build the image.";
+      };
+
+      tags = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        description = ''
+          Name associated with the build.
+          First tag will always be "homemanager/<name>".
+        '';
+      };
+
+      labels = mkOption {
+        type = with types; attrsOf str;
+        default = { };
+        example = {
+          app = "myapp";
+          some-label = "somelabel";
+        };
+        description = "The labels to apply to the build.";
+      };
+
+      tlsVerify = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          "Require HTTPS and verification of certificates when contacting registries.";
+      };
+
+      workingDirectory = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description = "WorkingDirectory of the systemd unit file.";
+      };
+    };
+  });
+in {
+  options.services.podman.builds = mkOption {
+    type = types.attrsOf buildDefinitionType;
+    default = { };
+    description = "Defines Podman build quadlet configurations.";
+  };
+
+  config = let buildQuadlets = mapAttrsToList toQuadletInternal cfg.builds;
+  in mkIf cfg.enable {
+    services.podman.internal.quadletDefinitions = buildQuadlets;
+    assertions = flatten (map (build: build.assertions) buildQuadlets);
+
+    xdg.configFile."podman/images.manifest".text =
+      podman-lib.generateManifestText buildQuadlets;
+  };
+}
diff --git a/modules/services/podman-linux/containers.nix b/modules/services/podman-linux/containers.nix
index 41ab29130..d5836119a 100644
--- a/modules/services/podman-linux/containers.nix
+++ b/modules/services/podman-linux/containers.nix
@@ -5,24 +5,60 @@ with lib;
 let
   cfg = config.services.podman;
 
-  podman-lib = import ./podman-lib.nix { inherit lib config; };
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
 
   createQuadletSource = name: containerDef:
     let
-      mapHmNetworks = network:
-        if builtins.hasAttr network cfg.networks then
-          "podman-${network}-network.service"
-        else
-          null;
+      formatServiceNameForType = type: name:
+        {
+          image = "podman-${name}-image.service";
+          build = "podman-${name}-build.service";
+          network = "podman-${name}-network.service";
+          volume = "podman-${name}-volume.service";
+        }."${type}";
 
-      finalConfig = let
-        managedNetworks = if lib.isList containerDef.network then
-          map mapHmNetworks containerDef.network
-        else if containerDef.network != null then
-          map mapHmNetworks [ containerDef.network ]
+      dependencyByHomeManagerQuadlet = type: name:
+        let
+          definitionsOfType =
+            filter (q: q.resourceType == type) cfg.internal.quadletDefinitions;
+          matchingName =
+            filter (q: q.serviceName == "podman-${name}") definitionsOfType;
+        in if ((length matchingName) == 1) then
+          [ (formatServiceNameForType type name) ]
         else
           [ ];
-      in (podman-lib.deepMerge {
+
+      forEachValue = type: value:
+        let resolve = v: dependencyByHomeManagerQuadlet type v;
+        in if isList value then
+          concatLists (map resolve value)
+        else
+          resolve value;
+
+      withResolverFor = type: value:
+        {
+          "image" = forEachValue "image" value;
+          "build" = forEachValue "build" value;
+          "network" = forEachValue "network" value;
+          "volume" = let
+            a = if isList value then value else [ value ];
+            volumes = map (v: elemAt (splitString ":" v) 0) a;
+          in forEachValue "volume" volumes;
+        }.${type};
+
+      dependencyServices = (withResolverFor "image" containerDef.image)
+        ++ (withResolverFor "build" containerDef.image)
+        ++ (withResolverFor "network" containerDef.network)
+        ++ (withResolverFor "volume" containerDef.volumes);
+
+      resolvedImage = if (builtins.hasAttr containerDef.image cfg.images) then
+        cfg.images."${containerDef.image}".image
+      else if (builtins.hasAttr containerDef.image cfg.builds) then
+        "localhost/homemanager/${containerDef.image}"
+      else
+        containerDef.image;
+
+      quadlet = (podman-lib.deepMerge {
         Container = {
           AddCapability = containerDef.addCapabilities;
           AddDevice = containerDef.devices;
@@ -34,7 +70,7 @@ let
           EnvironmentFile = containerDef.environmentFile;
           Exec = containerDef.exec;
           Group = containerDef.group;
-          Image = containerDef.image;
+          Image = resolvedImage;
           IP = containerDef.ip4;
           IP6 = containerDef.ip6;
           Label =
@@ -48,11 +84,10 @@ let
           Volume = containerDef.volumes;
         };
         Install = {
-          WantedBy = (if containerDef.autoStart then [
+          WantedBy = optionals containerDef.autoStart [
             "default.target"
             "multi-user.target"
-          ] else
-            [ ]);
+          ];
         };
         Service = {
           Environment = {
@@ -66,8 +101,8 @@ let
           TimeoutStopSec = 30;
         };
         Unit = {
-          After = [ "network.target" ] ++ managedNetworks;
-          Requires = managedNetworks;
+          After = dependencyServices;
+          Requires = dependencyServices;
           Description = (if (builtins.isString containerDef.description) then
             containerDef.description
           else
@@ -79,7 +114,7 @@ let
       # DO NOT EDIT THIS FILE DIRECTLY
       #
       # ${name}.container
-      ${podman-lib.toQuadletIni finalConfig}
+      ${podman-lib.toQuadletIni quadlet}
     '';
 
   toQuadletInternal = name: containerDef: {
@@ -307,7 +342,7 @@ in {
         flatten (map (container: container.assertions) containerQuadlets);
 
       # manifest file
-      home.file."${config.xdg.configHome}/podman/containers.manifest".text =
+      xdg.configFile."podman/containers.manifest".text =
         podman-lib.generateManifestText containerQuadlets;
     };
 }
diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix
index 459762d46..a08541a6d 100644
--- a/modules/services/podman-linux/default.nix
+++ b/modules/services/podman-linux/default.nix
@@ -5,8 +5,15 @@ let
 in {
   meta.maintainers = with lib.hm.maintainers; [ bamhm182 n-hass ];
 
-  imports =
-    [ ./containers.nix ./install-quadlet.nix ./networks.nix ./services.nix ];
+  imports = [
+    ./builds.nix
+    ./containers.nix
+    ./images.nix
+    ./install-quadlet.nix
+    ./networks.nix
+    ./services.nix
+    ./volumes.nix
+  ];
 
   options.services.podman = {
     enable = lib.mkEnableOption "Podman, a daemonless container engine";
diff --git a/modules/services/podman-linux/images.nix b/modules/services/podman-linux/images.nix
new file mode 100644
index 000000000..51aa9f1be
--- /dev/null
+++ b/modules/services/podman-linux/images.nix
@@ -0,0 +1,162 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
+
+  createQuadletSource = name: imageDef:
+    let
+      credsString =
+        (if imageDef.username != null then imageDef.username else "")
+        + (if imageDef.password != null then ":${imageDef.password}" else "");
+
+      imageConfig = podman-lib.deepMerge {
+        Image = {
+          AuthFile = imageDef.authFile;
+          CertDir = imageDef.certDir;
+          Creds = (if credsString != "" then credsString else null);
+          DecryptionKey = imageDef.decryptionKeyFile;
+          Image = imageDef.image;
+          ImageTag = imageDef.tag;
+          PodmanArgs = imageDef.extraPodmanArgs;
+          TLSVerify = imageDef.tlsVerify;
+        };
+        Install = {
+          WantedBy = optionals imageDef.autoStart [
+            "default.target"
+            "multi-user.target"
+          ];
+        };
+        Service = {
+          ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ];
+          TimeoutStartSec = 300;
+          RemainAfterExit = "yes";
+        };
+        Unit = { Description = imageDef.description; };
+      } imageDef.extraConfig;
+    in ''
+      # Automatically generated by home-manager for podman image configuration
+      # DO NOT EDIT THIS FILE DIRECTLY
+      #
+      # ${name}.image
+      ${podman-lib.toQuadletIni imageConfig}
+    '';
+
+  toQuadletInternal = name: imageDef: {
+    assertions = podman-lib.buildConfigAsserts name imageDef.extraConfig;
+    serviceName =
+      "podman-${name}"; # quadlet service name: 'podman-<name>-image.service
+    source = podman-lib.removeBlankLines (createQuadletSource name imageDef);
+    resourceType = "image";
+  };
+in let
+  imageDefinitionType = types.submodule ({ name, ... }: {
+    options = {
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          "Whether to pull the image on boot. Requires user lingering.";
+      };
+
+      authFile = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description =
+          "Path of the authentication file used to connect to registry.";
+      };
+
+      certDir = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description =
+          "Path of certificates (*.{crt,cert,key}) used to connect to registry.";
+      };
+
+      decryptionKeyFile = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description = "Path to key used for decrpytion of images.";
+      };
+
+      description = mkOption {
+        type = with types; nullOr str;
+        default = "Service for image ${name}";
+        defaultText = "Service for image \${name}";
+        example = "My Image";
+        description = "The description of the image.";
+      };
+
+      extraConfig = mkOption {
+        type = podman-lib.extraConfigType;
+        default = { };
+        example = literalExpression ''
+          {
+            Image = {
+              ContainersConfModule = "/etc/nvd.conf";
+            };
+          }
+        '';
+        description = "INI sections and values to populate the Image Quadlet.";
+      };
+
+      extraPodmanArgs = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "--os=linux" ];
+        description =
+          "Extra arguments to pass to the podman image pull command.";
+      };
+
+      image = mkOption {
+        type = types.str;
+        example = "quay.io/centos/centos:latest";
+        description = "Image to pull.";
+      };
+
+      password = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "P@ssw0rd";
+        description =
+          "Password used to connect to registry. (Will be visible in nix store)";
+      };
+
+      tag = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "quay.io/centos/centos:latest";
+        description =
+          "FQIN of referenced Image when source is a file or directory archive.";
+      };
+
+      tlsVerify = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          "Require HTTPS and verification of certificates when contacting registries.";
+      };
+
+      username = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "bob";
+        description = "Username used to connect to registry.";
+      };
+
+    };
+  });
+in {
+  options.services.podman.images = mkOption {
+    type = types.attrsOf imageDefinitionType;
+    default = { };
+    description = "Defines Podman image quadlet configurations.";
+  };
+
+  config = let imageQuadlets = mapAttrsToList toQuadletInternal cfg.images;
+  in mkIf cfg.enable {
+    services.podman.internal.quadletDefinitions = imageQuadlets;
+    assertions = flatten (map (image: image.assertions) imageQuadlets);
+  };
+}
diff --git a/modules/services/podman-linux/install-quadlet.nix b/modules/services/podman-linux/install-quadlet.nix
index 8ce6a33e8..d0157020c 100644
--- a/modules/services/podman-linux/install-quadlet.nix
+++ b/modules/services/podman-linux/install-quadlet.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.services.podman;
 
-  podman-lib = import ./podman-lib.nix { inherit lib config; };
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
   activation = import ./activation.nix { inherit config podman-lib; };
 
   activationCleanupScript = activation.cleanup;
diff --git a/modules/services/podman-linux/networks.nix b/modules/services/podman-linux/networks.nix
index bb4ac5915..8fee143e4 100644
--- a/modules/services/podman-linux/networks.nix
+++ b/modules/services/podman-linux/networks.nix
@@ -5,13 +5,7 @@ with lib;
 let
   cfg = config.services.podman;
 
-  podman-lib = import ./podman-lib.nix { inherit lib config; };
-
-  awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" ''
-    until ${cfg.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do
-      sleep 1;
-    done
-  '';
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
 
   createQuadletSource = name: networkDef:
     let
@@ -39,7 +33,7 @@ let
               "${makeBinPath [ pkgs.su pkgs.coreutils ]}"
             ]);
           };
-          ExecStartPre = [ "${awaitPodmanUnshare}" ];
+          ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ];
           TimeoutStartSec = 15;
           RemainAfterExit = "yes";
         };
@@ -162,7 +156,7 @@ in {
     services.podman.internal.quadletDefinitions = networkQuadlets;
     assertions = flatten (map (network: network.assertions) networkQuadlets);
 
-    home.file."${config.xdg.configHome}/podman/networks.manifest".text =
+    xdg.configFile."podman/networks.manifest".text =
       podman-lib.generateManifestText networkQuadlets;
   };
 }
diff --git a/modules/services/podman-linux/podman-lib.nix b/modules/services/podman-linux/podman-lib.nix
index 1acc930fc..30ffcc836 100644
--- a/modules/services/podman-linux/podman-lib.nix
+++ b/modules/services/podman-linux/podman-lib.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ pkgs, lib, config, ... }:
 
 with lib;
 
@@ -63,8 +63,10 @@ in {
   buildConfigAsserts = quadletName: extraConfig:
     let
       configRules = {
+        Build = { ImageTag = (with types; listOf str); };
         Container = { ContainerName = types.enum [ quadletName ]; };
         Network = { NetworkName = types.enum [ quadletName ]; };
+        Volume = { VolumeName = types.enum [ quadletName ]; };
       };
 
       # Function to build assertions for a specific section and its attributes.
@@ -83,8 +85,23 @@ in {
         else
           [ ];
 
+      checkImageTag = extraConfig:
+        let
+          imageTags = (extraConfig.Build or { }).ImageTag or [ ];
+          containsRequiredTag =
+            builtins.elem "homemanager/${quadletName}" imageTags;
+          imageTagsStr = concatMapStringsSep ''" "'' toString imageTags;
+        in [{
+          assertion = imageTags == [ ] || containsRequiredTag;
+          message = ''
+            In '${quadletName}' config. Build.ImageTag: '[ "${imageTagsStr}" ]' does not contain 'homemanager/${quadletName}'.'';
+        }];
+
       # Flatten assertions from all sections in `extraConfig`.
-    in flatten (mapAttrsToList buildSectionAsserts extraConfig);
+    in flatten (concatLists [
+      (mapAttrsToList buildSectionAsserts extraConfig)
+      (checkImageTag extraConfig)
+    ]);
 
   extraConfigType = with types;
     attrsOf (attrsOf (oneOf [ primitiveAttrs primitiveList primitive ]));
@@ -107,8 +124,10 @@ in {
           # specific logic for writing the unit name goes here. It should be
           #   identical to what `podman <resource> ls` shows
         in {
+          "build" = "localhost/homemanager/${strippedName}";
           "container" = strippedName;
           "network" = strippedName;
+          "volume" = strippedName;
         }."${quadlet.resourceType}";
     in if allQuadletsSameType then ''
       ${concatStringsSep "\n"
@@ -133,4 +152,10 @@ in {
       lines = splitString "\n" text;
       nonEmptyLines = filter (line: line != "") lines;
     in concatStringsSep "\n" nonEmptyLines;
+
+  awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" ''
+    until ${config.services.podman.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do
+      ${pkgs.coreutils}/bin/sleep 1
+    done
+  '';
 }
diff --git a/modules/services/podman-linux/services.nix b/modules/services/podman-linux/services.nix
index 5d31485f4..4a22b703f 100644
--- a/modules/services/podman-linux/services.nix
+++ b/modules/services/podman-linux/services.nix
@@ -42,8 +42,8 @@ in {
                 "${config.home.homeDirectory}/.nix-profile/bin"
               ]
             }";
-          ExecStart = "${pkgs.podman}/bin/podman auto-update";
-          ExecStartPost = "${pkgs.podman}/bin/podman image prune -f";
+          ExecStart = "${cfg.package}/bin/podman auto-update";
+          ExecStartPost = "${cfg.package}/bin/podman image prune -f";
           TimeoutStartSec = "300s";
           TimeoutStopSec = "10s";
         };
diff --git a/modules/services/podman-linux/volumes.nix b/modules/services/podman-linux/volumes.nix
new file mode 100644
index 000000000..10f7cd927
--- /dev/null
+++ b/modules/services/podman-linux/volumes.nix
@@ -0,0 +1,186 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.podman;
+
+  podman-lib = import ./podman-lib.nix { inherit pkgs lib config; };
+
+  createQuadletSource = name: volumeDef:
+    let
+      volumeConfig = podman-lib.deepMerge {
+        Install = {
+          WantedBy = optionals volumeDef.autoStart [
+            "default.target"
+            "multi-user.target"
+          ];
+        };
+        Service = {
+          Environment = {
+            PATH = (builtins.concatStringsSep ":" [
+              "${podman-lib.newuidmapPaths}"
+              "${makeBinPath [ pkgs.su pkgs.coreutils ]}"
+            ]);
+          };
+          ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ];
+          TimeoutStartSec = 15;
+          RemainAfterExit = "yes";
+        };
+        Unit = { Description = volumeDef.description; };
+        Volume = {
+          Copy = volumeDef.copy;
+          Device = volumeDef.device;
+          Driver = volumeDef.driver;
+          Group = volumeDef.group;
+          Image = volumeDef.image;
+          Label = volumeDef.labels // {
+            "nix.home-manager.managed" = true;
+            "nix.home-manager.preserve" = volumeDef.preserve;
+          };
+          PodmanArgs = volumeDef.extraPodmanArgs;
+          Type = volumeDef.type;
+          User = volumeDef.user;
+          VolumeName = name;
+        };
+      } volumeDef.extraConfig;
+    in ''
+      # Automatically generated by home-manager for podman volume configuration
+      # DO NOT EDIT THIS FILE DIRECTLY
+      #
+      # ${name}.volume
+      ${podman-lib.toQuadletIni volumeConfig}
+    '';
+
+  toQuadletInternal = name: volumeDef: {
+    assertions = podman-lib.buildConfigAsserts name volumeDef.extraConfig;
+    serviceName =
+      "podman-${name}"; # quadlet service name: 'podman-<name>-volume.service'
+    source = podman-lib.removeBlankLines (createQuadletSource name volumeDef);
+    resourceType = "volume";
+  };
+
+in let
+  volumeDefinitionType = types.submodule ({ name, ... }: {
+    options = {
+
+      autoStart = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to create the volume on boot.";
+      };
+
+      copy = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          "Copy content of the image located at the mountpoint of the volume on first run.";
+      };
+
+      description = mkOption {
+        type = with types; nullOr str;
+        default = "Service for volume ${name}";
+        defaultText = "Service for volume \${name}";
+        example = "My Volume";
+        description = "The description of the volume.";
+      };
+
+      device = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "tmpfs";
+        description = "The path of a device which is mounted for the volume.";
+      };
+
+      driver = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "image";
+        description = "The volume driver to use.";
+      };
+
+      extraConfig = mkOption {
+        type = podman-lib.extraConfigType;
+        default = { };
+        example = literalExpression ''
+          {
+            Volume = {
+              ContainerConfModule = "/etc/nvd.conf";
+            };
+          }
+        '';
+        description = "INI sections and values to populate the Volume Quadlet.";
+      };
+
+      extraPodmanArgs = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "--opt copy" ];
+        description =
+          "Extra arguments to pass to the podman volume create command.";
+      };
+
+      group = mkOption {
+        type = with types; nullOr (either int str);
+        default = null;
+        description = "The group ID owning the volume inside the container.";
+      };
+
+      image = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "quay.io/centos/centos:latest";
+        description =
+          "Specifies the image the volume is based on when Driver is set to the image.";
+      };
+
+      labels = mkOption {
+        type = with types; attrsOf str;
+        default = { };
+        example = {
+          app = "myapp";
+          some-label = "somelabel";
+        };
+        description = "The labels to apply to the volume.";
+      };
+
+      preserve = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether the volume should be preserved if it is removed from the configuration.
+          Setting this to false will cause the volume to be deleted if the volume is removed from the configuration
+        '';
+      };
+
+      type = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "tmpfs";
+        description =
+          "Filesystem type of Device. (used as -t in mount commands)";
+      };
+
+      user = mkOption {
+        type = with types; nullOr (either int str);
+        default = null;
+        description = "The user ID owning the volume inside the container.";
+      };
+    };
+  });
+in {
+  options.services.podman.volumes = mkOption {
+    type = types.attrsOf volumeDefinitionType;
+    default = { };
+    description = "Defines Podman volume quadlet configurations.";
+  };
+
+  config = let volumeQuadlets = mapAttrsToList toQuadletInternal cfg.volumes;
+  in mkIf cfg.enable {
+    services.podman.internal.quadletDefinitions = volumeQuadlets;
+    assertions = flatten (map (volume: volume.assertions) volumeQuadlets);
+
+    xdg.configFile."podman/volumes.manifest".text =
+      podman-lib.generateManifestText volumeQuadlets;
+  };
+}
diff --git a/tests/modules/services/podman-linux/build-expected.service b/tests/modules/services/podman-linux/build-expected.service
new file mode 100644
index 000000000..ab4064c22
--- /dev/null
+++ b/tests/modules/services/podman-linux/build-expected.service
@@ -0,0 +1,30 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman build configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-bld.build
+[X-Build]
+Environment=
+File=/nix/store/00000000000000000000000000000000-Containerfile
+ImageTag=homemanager/my-bld
+Label=nix.home-manager.managed=true
+TLSVerify=true
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+RemainAfterExit=yes
+TimeoutStartSec=300
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman build --tls-verify --tag homemanager/my-bld --label nix.home-manager.managed=true --file /nix/store/00000000000000000000000000000000-Containerfile
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for build my-bld
+RequiresMountsFor=%t/containers
+SourcePath=/nix/store/00000000000000000000000000000000-home-build-podman-my-bld/quadlets/podman-my-bld.build
diff --git a/tests/modules/services/podman-linux/build.nix b/tests/modules/services/podman-linux/build.nix
new file mode 100644
index 000000000..27052c6a4
--- /dev/null
+++ b/tests/modules/services/podman-linux/build.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ./podman-stubs.nix ];
+
+  services.podman = {
+    enable = true;
+    builds = {
+      "my-bld" = {
+        file = let
+          containerFile = pkgs.writeTextFile {
+            name = "Containerfile";
+            text = ''
+              FROM docker.io/alpine:latest
+            '';
+          };
+        in "${containerFile}";
+      };
+
+      "my-bld-2" = {
+        file = "https://www.github.com/././Containerfile";
+        extraConfig = {
+          Build.ImageTag = [ "locahost/somethingelse" "localhost/anothertag" ];
+        };
+      };
+    };
+  };
+
+  test.asserts.assertions.expected = [
+    ''
+      In 'my-bld-2' config. Build.ImageTag: '[ "locahost/somethingelse" "localhost/anothertag" ]' does not contain 'homemanager/my-bld-2'.''
+  ];
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    buildFile=$configPath/podman-my-bld-build.service
+
+    assertFileExists $buildFile
+
+    buildFile=$(normalizeStorePaths $buildFile)
+
+    assertFileContent $buildFile ${./build-expected.service}
+  '';
+}
diff --git a/tests/modules/services/podman-linux/container-expected.service b/tests/modules/services/podman-linux/container-expected.service
index d40e24bec..df5bcb2a0 100644
--- a/tests/modules/services/podman-linux/container-expected.service
+++ b/tests/modules/services/podman-linux/container-expected.service
@@ -43,7 +43,6 @@ ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --na
 [Unit]
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
-After=network.target
 Before=fake.target
 Description=home-manager test
 SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container
diff --git a/tests/modules/services/podman-linux/default.nix b/tests/modules/services/podman-linux/default.nix
index a5ba9467e..c7f04bdaf 100644
--- a/tests/modules/services/podman-linux/default.nix
+++ b/tests/modules/services/podman-linux/default.nix
@@ -1,7 +1,10 @@
 {
   podman-configuration = ./configuration.nix;
   podman-container = ./container.nix;
+  podman-build = ./build.nix;
+  podman-image = ./image.nix;
   podman-integration = ./integration.nix;
   podman-manifest = ./manifest.nix;
   podman-network = ./network.nix;
+  podman-volume = ./volume.nix;
 }
diff --git a/tests/modules/services/podman-linux/image-expected.service b/tests/modules/services/podman-linux/image-expected.service
new file mode 100644
index 000000000..2a2e688e3
--- /dev/null
+++ b/tests/modules/services/podman-linux/image-expected.service
@@ -0,0 +1,28 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman image configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-img.image
+[X-Image]
+Image=docker.io/alpine:latest
+TLSVerify=true
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=300
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman image pull --tls-verify docker.io/alpine:latest
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for image my-img
+SourcePath=/nix/store/00000000000000000000000000000000-home-image-podman-my-img/quadlets/podman-my-img.image
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/image.nix b/tests/modules/services/podman-linux/image.nix
new file mode 100644
index 000000000..98560e34d
--- /dev/null
+++ b/tests/modules/services/podman-linux/image.nix
@@ -0,0 +1,18 @@
+{
+  imports = [ ./podman-stubs.nix ];
+
+  services.podman = {
+    enable = true;
+    images = { "my-img" = { image = "docker.io/alpine:latest"; }; };
+  };
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    imageFile=$configPath/podman-my-img-image.service
+    assertFileExists $imageFile
+
+    imageFile=$(normalizeStorePaths $imageFile)
+
+    assertFileContent $imageFile ${./image-expected.service}
+  '';
+}
diff --git a/tests/modules/services/podman-linux/integration-build-expected.service b/tests/modules/services/podman-linux/integration-build-expected.service
new file mode 100644
index 000000000..ab4064c22
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-build-expected.service
@@ -0,0 +1,30 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman build configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-bld.build
+[X-Build]
+Environment=
+File=/nix/store/00000000000000000000000000000000-Containerfile
+ImageTag=homemanager/my-bld
+Label=nix.home-manager.managed=true
+TLSVerify=true
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+RemainAfterExit=yes
+TimeoutStartSec=300
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman build --tls-verify --tag homemanager/my-bld --label nix.home-manager.managed=true --file /nix/store/00000000000000000000000000000000-Containerfile
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for build my-bld
+RequiresMountsFor=%t/containers
+SourcePath=/nix/store/00000000000000000000000000000000-home-build-podman-my-bld/quadlets/podman-my-bld.build
diff --git a/tests/modules/services/podman-linux/integration-container-bld-expected.service b/tests/modules/services/podman-linux/integration-container-bld-expected.service
new file mode 100644
index 000000000..7201fea35
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-container-bld-expected.service
@@ -0,0 +1,38 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager podman container configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-container-bld.container
+[X-Container]
+ContainerName=my-container-bld
+Environment=
+Image=localhost/homemanager/my-bld
+Label=nix.home-manager.managed=true
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin
+Restart=always
+TimeoutStopSec=30
+Environment=PODMAN_SYSTEMD_UNIT=%n
+KillMode=mixed
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+Delegate=yes
+Type=notify
+NotifyAccess=all
+SyslogIdentifier=%N
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container-bld --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon -d --label nix.home-manager.managed=true localhost/homemanager/my-bld
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+After=podman-my-bld-build.service
+Description=Service for container my-container-bld
+Requires=podman-my-bld-build.service
+SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container-bld/quadlets/podman-my-container-bld.container
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/integration-container-expected.service b/tests/modules/services/podman-linux/integration-container-expected.service
index 528d9c18e..ca92559d4 100644
--- a/tests/modules/services/podman-linux/integration-container-expected.service
+++ b/tests/modules/services/podman-linux/integration-container-expected.service
@@ -11,6 +11,7 @@ Image=docker.io/alpine:latest
 Label=nix.home-manager.managed=true
 Network=my-net
 Network=externalnet
+Volume=my-vol:/data
 
 [Install]
 WantedBy=default.target
@@ -28,14 +29,17 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-net --network externalnet --sdnotify=conmon -d --label nix.home-manager.managed=true docker.io/alpine:latest
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-net --network externalnet --sdnotify=conmon -d -v my-vol:/data --label nix.home-manager.managed=true docker.io/alpine:latest
 
 [Unit]
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
-After=network.target
+After=podman-my-img-image.service
 After=podman-my-net-network.service
+After=podman-my-vol-volume.service
 Description=Service for container my-container
+Requires=podman-my-img-image.service
 Requires=podman-my-net-network.service
+Requires=podman-my-vol-volume.service
 SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container
 RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/integration-image-expected.service b/tests/modules/services/podman-linux/integration-image-expected.service
new file mode 100644
index 000000000..2a2e688e3
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-image-expected.service
@@ -0,0 +1,28 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman image configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-img.image
+[X-Image]
+Image=docker.io/alpine:latest
+TLSVerify=true
+
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=300
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman image pull --tls-verify docker.io/alpine:latest
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for image my-img
+SourcePath=/nix/store/00000000000000000000000000000000-home-image-podman-my-img/quadlets/podman-my-img.image
+RequiresMountsFor=%t/containers
diff --git a/tests/modules/services/podman-linux/integration-volume-expected.service b/tests/modules/services/podman-linux/integration-volume-expected.service
new file mode 100644
index 000000000..da5d36968
--- /dev/null
+++ b/tests/modules/services/podman-linux/integration-volume-expected.service
@@ -0,0 +1,33 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman volume configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-vol.volume
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=15
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman volume create --ignore --opt copy --opt device=tmpfs --opt type=tmpfs --label nix.home-manager.managed=true --label nix.home-manager.preserve=false my-vol
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for volume my-vol
+SourcePath=/nix/store/00000000000000000000000000000000-home-volume-podman-my-vol/quadlets/podman-my-vol.volume
+RequiresMountsFor=%t/containers
+
+[X-Volume]
+Copy=true
+Device=tmpfs
+Label=nix.home-manager.managed=true
+Label=nix.home-manager.preserve=false
+Type=tmpfs
+VolumeName=my-vol
diff --git a/tests/modules/services/podman-linux/integration.nix b/tests/modules/services/podman-linux/integration.nix
index 6b28fcd7a..26aef7019 100644
--- a/tests/modules/services/podman-linux/integration.nix
+++ b/tests/modules/services/podman-linux/integration.nix
@@ -1,29 +1,69 @@
+{ pkgs, ... }:
+
 {
   imports = [ ./podman-stubs.nix ];
 
   services.podman = {
     enable = true;
-    containers."my-container" = {
-      image = "docker.io/alpine:latest";
-      network = [ "my-net" "externalnet" ];
+    builds."my-bld" = {
+      file = let
+        containerFile = pkgs.writeTextFile {
+          name = "Containerfile";
+          text = ''
+            FROM docker.io/alpine:latest
+          '';
+        };
+      in "${containerFile}";
     };
+    containers = {
+      "my-container" = {
+        image = "my-img";
+        network = [ "my-net" "externalnet" ];
+        volumes = [ "my-vol:/data" ];
+      };
+      "my-container-bld" = { image = "my-bld"; };
+    };
+    images."my-img" = { image = "docker.io/alpine:latest"; };
     networks."my-net" = {
       gateway = "192.168.123.1";
       subnet = "192.168.123.0/24";
     };
+    volumes."my-vol" = {
+      device = "tmpfs";
+      preserve = false;
+      type = "tmpfs";
+    };
   };
 
   nmt.script = ''
     configPath=home-files/.config/systemd/user
+    buildFile=$configPath/podman-my-bld-build.service
     containerFile=$configPath/podman-my-container.service
+    containerBldFile=$configPath/podman-my-container-bld.service
+    imageFile=$configPath/podman-my-img-image.service
     networkFile=$configPath/podman-my-net-network.service
+    volumeFile=$configPath/podman-my-vol-volume.service
+    assertFileExists $buildFile
     assertFileExists $containerFile
+    assertFileExists $containerBldFile
+    assertFileExists $imageFile
     assertFileExists $networkFile
+    assertFileExists $volumeFile
 
+    buildFile=$(normalizeStorePaths $buildFile)
     containerFile=$(normalizeStorePaths $containerFile)
+    containerBldFile=$(normalizeStorePaths $containerBldFile)
+    imageFile=$(normalizeStorePaths $imageFile)
     networkFile=$(normalizeStorePaths $networkFile)
+    volumeFile=$(normalizeStorePaths $volumeFile)
 
+    assertFileContent $buildFile ${./integration-build-expected.service}
     assertFileContent $containerFile ${./integration-container-expected.service}
+    assertFileContent $containerBldFile ${
+      ./integration-container-bld-expected.service
+    }
+    assertFileContent $imageFile ${./integration-image-expected.service}
     assertFileContent $networkFile ${./integration-network-expected.service}
+    assertFileContent $volumeFile ${./integration-volume-expected.service}
   '';
 }
diff --git a/tests/modules/services/podman-linux/volume-expected.service b/tests/modules/services/podman-linux/volume-expected.service
new file mode 100644
index 000000000..73d4c049f
--- /dev/null
+++ b/tests/modules/services/podman-linux/volume-expected.service
@@ -0,0 +1,36 @@
+# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator
+# 
+# Automatically generated by home-manager for podman volume configuration
+# DO NOT EDIT THIS FILE DIRECTLY
+#
+# my-vol.volume
+[Install]
+WantedBy=default.target
+WantedBy=multi-user.target
+
+[Service]
+Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin
+ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare
+RemainAfterExit=yes
+TimeoutStartSec=15
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman volume create --ignore --opt copy --opt device=tmpfs --opt type=tmpfs --opt o=uid=1000,gid=1000 --label nix.home-manager.managed=true --label nix.home-manager.preserve=true --module=/etc/nvd.conf my-vol
+SyslogIdentifier=%N
+Type=oneshot
+
+[Unit]
+Wants=podman-user-wait-network-online.service
+After=podman-user-wait-network-online.service
+Description=Service for volume my-vol
+SourcePath=/nix/store/00000000000000000000000000000000-home-volume-podman-my-vol/quadlets/podman-my-vol.volume
+RequiresMountsFor=%t/containers
+
+[X-Volume]
+Copy=true
+Device=tmpfs
+Group=1000
+Label=nix.home-manager.managed=true
+Label=nix.home-manager.preserve=true
+PodmanArgs=--module=/etc/nvd.conf
+Type=tmpfs
+User=1000
+VolumeName=my-vol
diff --git a/tests/modules/services/podman-linux/volume.nix b/tests/modules/services/podman-linux/volume.nix
new file mode 100644
index 000000000..885662b2f
--- /dev/null
+++ b/tests/modules/services/podman-linux/volume.nix
@@ -0,0 +1,35 @@
+{
+  imports = [ ./podman-stubs.nix ];
+
+  services.podman = {
+    enable = true;
+    volumes = {
+      "my-vol" = {
+        device = "tmpfs";
+        extraConfig = { Volume = { User = 1000; }; };
+        extraPodmanArgs = [ "--module=/etc/nvd.conf" ];
+        group = 1000;
+        type = "tmpfs";
+      };
+
+      "my-vol-2" = {
+        extraConfig = { Volume = { VolumeName = "some-other-volume-name"; }; };
+      };
+    };
+  };
+
+  test.asserts.assertions.expected = [
+    ''
+      In 'my-vol-2' config. Volume.VolumeName: 'some-other-volume-name' does not match expected type: value "my-vol-2" (singular enum)''
+  ];
+
+  nmt.script = ''
+    configPath=home-files/.config/systemd/user
+    volumeFile=$configPath/podman-my-vol-volume.service
+    assertFileExists $volumeFile
+
+    volumeFile=$(normalizeStorePaths $volumeFile)
+
+    assertFileContent $volumeFile ${./volume-expected.service}
+  '';
+}

From 744f749dd6fbc1489591ea370b95156858629cb9 Mon Sep 17 00:00:00 2001
From: Ilya Savitsky <ipsavitsky234@gmail.com>
Date: Mon, 10 Mar 2025 04:05:08 +0000
Subject: [PATCH 518/546] mods: add a mods module (#6339)

---
 modules/lib/maintainers.nix                   |  6 ++
 modules/misc/news.nix                         | 11 +++
 modules/modules.nix                           |  1 +
 modules/programs/mods.nix                     | 77 +++++++++++++++++++
 tests/default.nix                             |  1 +
 .../programs/mods/basic-configuration.nix     | 22 ++++++
 .../programs/mods/basic-configuration.yml     |  7 ++
 tests/modules/programs/mods/default.nix       |  1 +
 8 files changed, 126 insertions(+)
 create mode 100644 modules/programs/mods.nix
 create mode 100644 tests/modules/programs/mods/basic-configuration.nix
 create mode 100644 tests/modules/programs/mods/basic-configuration.yml
 create mode 100644 tests/modules/programs/mods/default.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 2fbbfe370..e70fcce1d 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -685,4 +685,10 @@
     github = "3ulalia";
     githubId = "179992797";
   };
+  ipsavitsky = {
+    name = "Ilya Savitsky";
+    email = "ipsavitsky234@gmail.com";
+    github = "ipsavitsky";
+    githubId = 33558632;
+  };
 }
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 995aeba1b..f088f2909 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2118,6 +2118,17 @@ in {
           systemd service to ensure its execution.
         '';
       }
+
+      {
+        time = "2025-01-26T16:40:00+00:00";
+        message = ''
+          A new module is available: 'programs.mods'
+
+          mods is a command line AI tool that is highly configurable and allows
+          querying AI models hosted locally or by other services (OpenAI,
+          Cohere, Groq).
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 5f150f02d..7d3b54043 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -169,6 +169,7 @@ let
     ./programs/mercurial.nix
     ./programs/micro.nix
     ./programs/mise.nix
+    ./programs/mods.nix
     ./programs/mpv.nix
     ./programs/mr.nix
     ./programs/msmtp.nix
diff --git a/modules/programs/mods.nix b/modules/programs/mods.nix
new file mode 100644
index 000000000..95e5559bc
--- /dev/null
+++ b/modules/programs/mods.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.programs.mods;
+  yamlFormat = pkgs.formats.yaml { };
+in {
+  meta.maintainers = [ hm.maintainers.ipsavitsky ];
+
+  options.programs.mods = {
+    enable = mkEnableOption "mods";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.mods;
+      defaultText = literalExpression "pkgs.mods";
+      description = "The mods package to install";
+    };
+
+    settings = mkOption {
+      type = yamlFormat.type;
+      default = { };
+      example = ''
+        {
+          default-model = "llama3.2";
+          apis = {
+            ollama = {
+              base-url = "http://localhost:11434/api";
+              models = {
+                "llama3.2" = {
+                  max-input-chars = 650000;
+                };
+              };
+            };
+          };
+        }
+      '';
+      description = ''
+        Configuration written to
+        {file}`$XDG_CONFIG_HOME/mods/mods.yml`.
+
+        See <https://github.com/charmbracelet/mods/blob/main/config_template.yml> for the full
+        list of options.
+      '';
+    };
+
+    enableBashIntegration =
+      lib.hm.shell.mkBashIntegrationOption { inherit config; };
+
+    enableZshIntegration =
+      lib.hm.shell.mkZshIntegrationOption { inherit config; };
+
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption { inherit config; };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."mods/mods.yml" = mkIf (cfg.settings != { }) {
+      source = yamlFormat.generate "mods.yml" cfg.settings;
+    };
+
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 200 ''
+      source <(${cfg.package}/bin/mods completion bash)
+    '');
+
+    programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 ''
+      source <(${cfg.package}/bin/mods completion zsh)
+    '');
+
+    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration
+      (mkOrder 200 ''
+        ${cfg.package}/bin/mods completion fish | source
+      '');
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index b15491421..94a993da4 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -249,6 +249,7 @@ in import nmtSrc {
     ./modules/programs/mbsync
     ./modules/programs/micro
     ./modules/programs/mise
+    ./modules/programs/mods
     ./modules/programs/mpv
     ./modules/programs/mu
     ./modules/programs/mujmap
diff --git a/tests/modules/programs/mods/basic-configuration.nix b/tests/modules/programs/mods/basic-configuration.nix
new file mode 100644
index 000000000..31b97276a
--- /dev/null
+++ b/tests/modules/programs/mods/basic-configuration.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }: {
+  config = {
+    programs.mods = {
+      enable = true;
+      package = pkgs.writeScriptBin "dummy-mods" "";
+      settings = {
+        default-model = "llama3.2";
+        apis = {
+          ollama = {
+            base-url = "http://localhost:11434/api";
+            models = { "llama3.2" = { max-input-chars = 650000; }; };
+          };
+        };
+      };
+    };
+    nmt.script = ''
+      assertFileExists home-files/.config/mods/mods.yml
+      assertFileContent home-files/.config/mods/mods.yml \
+          ${./basic-configuration.yml}
+    '';
+  };
+}
diff --git a/tests/modules/programs/mods/basic-configuration.yml b/tests/modules/programs/mods/basic-configuration.yml
new file mode 100644
index 000000000..aec63e220
--- /dev/null
+++ b/tests/modules/programs/mods/basic-configuration.yml
@@ -0,0 +1,7 @@
+apis:
+  ollama:
+    base-url: http://localhost:11434/api
+    models:
+      llama3.2:
+        max-input-chars: 650000
+default-model: llama3.2
diff --git a/tests/modules/programs/mods/default.nix b/tests/modules/programs/mods/default.nix
new file mode 100644
index 000000000..cf9909b1b
--- /dev/null
+++ b/tests/modules/programs/mods/default.nix
@@ -0,0 +1 @@
+{ mods-basic-configuration = ./basic-configuration.nix; }

From 3593ee59a44974b8518829a5239b2f77222e3c81 Mon Sep 17 00:00:00 2001
From: Leandro Emmanuel Reina Kiperman <leandro@kip93.net>
Date: Mon, 10 Mar 2025 14:32:06 +0100
Subject: [PATCH 519/546] xdg-mime: Fix cross compilation (#6500)

---
 modules/misc/xdg-mime.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg-mime.nix
index 6563b9360..fa22f96df 100644
--- a/modules/misc/xdg-mime.nix
+++ b/modules/misc/xdg-mime.nix
@@ -63,15 +63,19 @@ in {
       if [[ -w $out/share/mime && -w $out/share/mime/packages && -d $out/share/mime/packages ]]; then
         XDG_DATA_DIRS=$out/share \
         PKGSYSTEM_ENABLE_FSYNC=0 \
-        ${getExe cfg.sharedMimeInfoPackage} \
-          -V $out/share/mime > /dev/null
+        ${
+          getExe
+          (cfg.sharedMimeInfoPackage.__spliced.buildHost or cfg.sharedMimeInfoPackage)
+        } -V $out/share/mime > /dev/null
       fi
 
       if [[ -w $out/share/applications ]]; then
-        ${getExe' cfg.desktopFileUtilsPackage "update-desktop-database"} \
-          $out/share/applications
+        ${
+          getExe'
+          (cfg.desktopFileUtilsPackage.__spliced.buildHost or cfg.desktopFileUtilsPackage)
+          "update-desktop-database"
+        } $out/share/applications
       fi
     '';
   };
-
 }

From 7fb8678716c158642ac42f9ff7a18c0800fea551 Mon Sep 17 00:00:00 2001
From: Ilise Leary <coder.nova99@mailbox.org>
Date: Mon, 10 Mar 2025 14:35:47 -0500
Subject: [PATCH 520/546] Fix missing styleName for kde6 (#6597)

---
 modules/misc/qt.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix
index 9457970c0..41cd660fc 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt.nix
@@ -26,6 +26,7 @@ let
   styleNames = {
     gtk = "gtk2";
     qtct = "qt5ct";
+    kde6 = "kde";
   };
 
   # Maps known lowercase style names to style packages. Non-exhaustive.

From 7fd6dc2b94f10b0229f5e6b8fd5ed49636f895e1 Mon Sep 17 00:00:00 2001
From: Raine Godmaire <its@raine.ing>
Date: Tue, 11 Mar 2025 09:28:43 -0400
Subject: [PATCH 521/546] granted: fix fish shell integration (#6602)

Without `$argv` the function will not pass any flags or arguments to the
`assume.fish` script.  These are necessary to use assume to access the
AWS console or use IAM role chaining.
---
 modules/programs/granted.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix
index b20312069..802cffea1 100644
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@@ -33,7 +33,7 @@ in {
 
     programs.fish.functions.assume = mkIf cfg.enableFishIntegration ''
       set -x GRANTED_ALIAS_CONFIGURED "true"
-      source ${package}/share/assume.fish
+      source ${package}/share/assume.fish $argv
       set -e GRANTED_ALIAS_CONFIGURED
     '';
   };

From c630dfa8abcc65984cc1e47fb25d4552c81dd37e Mon Sep 17 00:00:00 2001
From: Lynn <github@lynn.is>
Date: Tue, 11 Mar 2025 14:53:55 +0100
Subject: [PATCH 522/546] nix-darwin: respect username setting of home-manager
 in activation script (#5881)

---
 nix-darwin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index 75011da46..7dae50a5c 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -12,9 +12,9 @@ in {
     (lib.mkIf (cfg.users != { }) {
       system.activationScripts.postActivation.text = lib.concatStringsSep "\n"
         (lib.mapAttrsToList (username: usercfg: ''
-          echo Activating home-manager configuration for ${username}
-          sudo -u ${username} --set-home ${
-            pkgs.writeShellScript "activation-${username}" ''
+          echo Activating home-manager configuration for ${usercfg.home.username}
+          sudo -u ${usercfg.home.username} --set-home ${
+            pkgs.writeShellScript "activation-${usercfg.home.username}" ''
               ${lib.optionalString (cfg.backupFileExtension != null)
               "export HOME_MANAGER_BACKUP_EXT=${
                 lib.escapeShellArg cfg.backupFileExtension

From 5871e21c1145f3f5e278545d1c09539b52183ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?=
 <marijan.petricevic94@gmail.com>
Date: Wed, 12 Mar 2025 19:31:54 +0700
Subject: [PATCH 523/546] screen-locker: add lockCmdEnv option (#6592)

---
 modules/services/screen-locker.nix                       | 9 +++++++++
 .../services/screen-locker/basic-configuration.nix       | 3 +++
 tests/modules/services/screen-locker/moved-options.nix   | 1 +
 3 files changed, 13 insertions(+)

diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index 0ec9ba528..3e2b14b11 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -31,6 +31,14 @@ in {
       example = "\${pkgs.i3lock}/bin/i3lock -n -c 000000";
     };
 
+    lockCmdEnv = lib.mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      example = [ "XSECURELOCK_PAM_SERVICE=xsecurelock" ];
+      description =
+        "Environment variables to source a with the locker command (lockCmd).";
+    };
+
     inactiveInterval = mkOption {
       type = types.int;
       default = 10;
@@ -127,6 +135,7 @@ in {
           ExecStart = concatStringsSep " "
             ([ "${cfg.xss-lock.package}/bin/xss-lock" "-s \${XDG_SESSION_ID}" ]
               ++ cfg.xss-lock.extraOptions ++ [ "-- ${cfg.lockCmd}" ]);
+          Environment = cfg.lockCmdEnv;
           Restart = "always";
         };
       };
diff --git a/tests/modules/services/screen-locker/basic-configuration.nix b/tests/modules/services/screen-locker/basic-configuration.nix
index e92a4a9f1..1cf4fabe2 100644
--- a/tests/modules/services/screen-locker/basic-configuration.nix
+++ b/tests/modules/services/screen-locker/basic-configuration.nix
@@ -5,6 +5,7 @@
     enable = true;
     inactiveInterval = 5;
     lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
+    lockCmdEnv = [ "DISPLAY=:0" "XAUTHORITY=/custom/path/.Xauthority" ];
     xss-lock = { extraOptions = [ "-test" ]; };
     xautolock = {
       enable = true;
@@ -19,6 +20,8 @@
 
     assertFileExists $xssService
     assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
+    assertFileRegex $xssService 'Environment=DISPLAY=:0'
+    assertFileRegex $xssService 'Environment=XAUTHORITY=/custom/path/.Xauthority'
     assertFileRegex $xssService 'Restart=always'
     assertFileExists $xautolockService
     assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*'
diff --git a/tests/modules/services/screen-locker/moved-options.nix b/tests/modules/services/screen-locker/moved-options.nix
index 0f252a1d3..bb49b0489 100644
--- a/tests/modules/services/screen-locker/moved-options.nix
+++ b/tests/modules/services/screen-locker/moved-options.nix
@@ -5,6 +5,7 @@
     enable = true;
     inactiveInterval = 5;
     lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000";
+    lockCmdEnv = [ "DISPLAY=:0" "XAUTHORITY=/custom/path/.Xauthority" ];
     xssLockExtraOptions = [ "-test" ];
     xautolockExtraOptions = [ "-test" ];
     enableDetectSleep = true;

From dd41a39055d7eb54330b5cd0611467e5d687d022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:19:52 +0100
Subject: [PATCH 524/546] swaylock: accept path type for settings values
 (#6607)

Allows setting images to file paths.
---
 modules/programs/swaylock.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock.nix
index 227cd4554..dcfd30c7e 100644
--- a/modules/programs/swaylock.nix
+++ b/modules/programs/swaylock.nix
@@ -36,7 +36,7 @@ in {
     package = mkPackageOption pkgs "swaylock" { nullable = true; };
 
     settings = mkOption {
-      type = with types; attrsOf (oneOf [ bool float int str ]);
+      type = with types; attrsOf (oneOf [ bool float int path str ]);
       default = { };
       description = ''
         Default arguments to {command}`swaylock`. An empty set

From 144f13f535be35c906241043f6bfcf21c1c419a0 Mon Sep 17 00:00:00 2001
From: home-manager-bot <106474382+home-manager-bot@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:20:12 +0100
Subject: [PATCH 525/546] flake.lock: Update (#6606)
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/36fd87baa9083f34f7f5027900b62ee6d09b1f2f?narHash=sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw%3D' (2025-03-07)
  → 'github:NixOS/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1?narHash=sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk%3D' (2025-03-09)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c618e88b..dd029164e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741379970,
-        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "type": "github"
       },
       "original": {

From 32531e457215000b739da6cd40acfb080823f396 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 18 Feb 2025 22:35:53 +0000
Subject: [PATCH 526/546] home-cursor: explicit lib usage

---
 modules/config/home-cursor.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 5babbca78..bd73887f6 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -1,7 +1,9 @@
 { config, options, lib, pkgs, ... }:
 
 let
-  inherit (lib) mkDefault mkEnableOption mkOption types;
+  inherit (lib)
+    mkEnableOption mkOption mkIf mkMerge mkDefault mkAliasOptionModule types
+    literalExpression escapeShellArg hm getAttrFromPath any optional;
 
   cfg = config.home.pointerCursor;
 
@@ -9,7 +11,7 @@ let
     options = {
       package = mkOption {
         type = types.package;
-        example = lib.literalExpression "pkgs.vanilla-dmz";
+        example = literalExpression "pkgs.vanilla-dmz";
         description = "Package providing the cursor theme.";
       };
 
@@ -64,8 +66,8 @@ let
   };
 
   cursorPath =
-    "${cfg.package}/share/icons/${lib.escapeShellArg cfg.name}/cursors/${
-      lib.escapeShellArg cfg.x11.defaultCursor
+    "${cfg.package}/share/icons/${escapeShellArg cfg.name}/cursors/${
+      escapeShellArg cfg.x11.defaultCursor
     }";
 
   defaultIndexThemePackage = pkgs.writeTextFile {
@@ -86,22 +88,22 @@ in {
   meta.maintainers = [ lib.maintainers.league ];
 
   imports = [
-    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
       "home"
       "pointerCursor"
       "package"
     ])
-    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "name" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "name" ] [
       "home"
       "pointerCursor"
       "name"
     ])
-    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "size" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "size" ] [
       "home"
       "pointerCursor"
       "size"
     ])
-    (lib.mkAliasOptionModule [ "xsession" "pointerCursor" "defaultCursor" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "defaultCursor" ] [
       "home"
       "pointerCursor"
       "x11"

From 00712ac0fb87bbfa13e892603863469ac4fd96a0 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 18 Feb 2025 22:36:56 +0000
Subject: [PATCH 527/546] home-cursor: use .enable pattern

---
 modules/config/home-cursor.nix | 175 +++++++++++++++++++--------------
 1 file changed, 99 insertions(+), 76 deletions(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index bd73887f6..7ae819532 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -7,8 +7,19 @@ let
 
   cfg = config.home.pointerCursor;
 
+  enable = if (lib.versionOlder config.home.stateVersion "25.05") then
+  # respect .enable if it is declared
+    if (any (x: x ? enable) options.home.pointerCursor.definitions) then
+      cfg.enable
+    else
+      cfg != null
+  else
+    (cfg ? enable) && cfg.enable;
+
   pointerCursorModule = types.submodule {
     options = {
+      enable = mkEnableOption "cursor config generation";
+
       package = mkOption {
         type = types.package;
         example = literalExpression "pkgs.vanilla-dmz";
@@ -65,8 +76,7 @@ let
     };
   };
 
-  cursorPath =
-    "${cfg.package}/share/icons/${escapeShellArg cfg.name}/cursors/${
+  cursorPath = "${cfg.package}/share/icons/${escapeShellArg cfg.name}/cursors/${
       escapeShellArg cfg.x11.defaultCursor
     }";
 
@@ -109,25 +119,17 @@ in {
       "x11"
       "defaultCursor"
     ])
-
-    ({ ... }: {
-      warnings = lib.optional (lib.any (x:
-        lib.getAttrFromPath
-        ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ])
-        options) [ "package" "name" "size" "defaultCursor" ]) ''
-          The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed
-          in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x11.enable`
-          to generate x11 specific cursor configurations. You can refer to the documentation for more details.
-        '';
-    })
   ];
 
   options = {
     home.pointerCursor = mkOption {
       type = types.nullOr pointerCursorModule;
-      default = null;
+      default = if (lib.versionOlder config.home.stateVersion "25.05") then
+        null
+      else
+        { };
       description = ''
-        Cursor configuration. Set to `null` to disable.
+        Cursor configuration.
 
         Top-level options declared under this submodule are backend independent
         options. Options declared under namespaces such as `x11`
@@ -146,78 +148,99 @@ in {
     };
   };
 
-  config = lib.mkIf (cfg != null) (lib.mkMerge [
-    {
-      assertions = [
-        (lib.hm.assertions.assertPlatform "home.pointerCursor" pkgs
-          lib.platforms.linux)
-      ];
+  config = mkMerge [
+    (mkIf enable (mkMerge [
+      {
+        assertions = [
+          (hm.assertions.assertPlatform "home.pointerCursor" pkgs
+            lib.platforms.linux)
+        ];
 
-      home.packages = [ cfg.package defaultIndexThemePackage ];
+        home.packages = [ cfg.package defaultIndexThemePackage ];
 
-      home.sessionVariables = {
-        XCURSOR_SIZE = mkDefault cfg.size;
-        XCURSOR_THEME = mkDefault cfg.name;
-      };
+        home.sessionVariables = {
+          XCURSOR_SIZE = mkDefault cfg.size;
+          XCURSOR_THEME = mkDefault cfg.name;
+        };
 
-      # Set directory to look for cursors in, needed for some applications
-      # that are unable to find cursors otherwise. See:
-      # https://github.com/nix-community/home-manager/issues/2812
-      # https://wiki.archlinux.org/title/Cursor_themes#Environment_variable
-      home.sessionSearchVariables.XCURSOR_PATH =
-        [ "${config.home.profileDirectory}/share/icons" ];
+        # Set directory to look for cursors in, needed for some applications
+        # that are unable to find cursors otherwise. See:
+        # https://github.com/nix-community/home-manager/issues/2812
+        # https://wiki.archlinux.org/title/Cursor_themes#Environment_variable
+        home.sessionSearchVariables.XCURSOR_PATH =
+          [ "${config.home.profileDirectory}/share/icons" ];
 
-      # Add symlink of cursor icon directory to $HOME/.icons, needed for
-      # backwards compatibility with some applications. See:
-      # https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html
-      home.file.".icons/default/index.theme".source =
-        "${defaultIndexThemePackage}/share/icons/default/index.theme";
-      home.file.".icons/${cfg.name}".source =
-        "${cfg.package}/share/icons/${cfg.name}";
+        # Add cursor icon link to $XDG_DATA_HOME/icons as well for redundancy.
+        xdg.dataFile."icons/default/index.theme".source =
+          "${defaultIndexThemePackage}/share/icons/default/index.theme";
+        xdg.dataFile."icons/${cfg.name}".source =
+          "${cfg.package}/share/icons/${cfg.name}";
 
-      # Add cursor icon link to $XDG_DATA_HOME/icons as well for redundancy.
-      xdg.dataFile."icons/default/index.theme".source =
-        "${defaultIndexThemePackage}/share/icons/default/index.theme";
-      xdg.dataFile."icons/${cfg.name}".source =
-        "${cfg.package}/share/icons/${cfg.name}";
-    }
+        # Add symlink of cursor icon directory to $HOME/.icons, needed for
+        # backwards compatibility with some applications. See:
+        # https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html
+        home.file.".icons/default/index.theme".source =
+          "${defaultIndexThemePackage}/share/icons/default/index.theme";
+        home.file.".icons/${cfg.name}".source =
+          "${cfg.package}/share/icons/${cfg.name}";
+      }
 
-    (lib.mkIf cfg.x11.enable {
-      xsession.profileExtra = ''
-        ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${
-          toString cfg.size
-        }
-      '';
+      (mkIf cfg.x11.enable {
+        xsession.profileExtra = ''
+          ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${
+            toString cfg.size
+          }
+        '';
 
-      xresources.properties = {
-        "Xcursor.theme" = cfg.name;
-        "Xcursor.size" = cfg.size;
-      };
-    })
+        xresources.properties = {
+          "Xcursor.theme" = cfg.name;
+          "Xcursor.size" = cfg.size;
+        };
+      })
 
-    (lib.mkIf cfg.gtk.enable {
-      gtk.cursorTheme = mkDefault { inherit (cfg) package name size; };
-    })
+      (mkIf cfg.gtk.enable {
+        gtk.cursorTheme = mkDefault { inherit (cfg) package name size; };
+      })
 
-    (lib.mkIf cfg.hyprcursor.enable {
-      home.sessionVariables = {
-        HYPRCURSOR_THEME = cfg.name;
-        HYPRCURSOR_SIZE =
-          if cfg.hyprcursor.size != null then cfg.hyprcursor.size else cfg.size;
-      };
-    })
+      (mkIf cfg.hyprcursor.enable {
+        home.sessionVariables = {
+          HYPRCURSOR_THEME = cfg.name;
+          HYPRCURSOR_SIZE = if cfg.hyprcursor.size != null then
+            cfg.hyprcursor.size
+          else
+            cfg.size;
+        };
+      })
 
-    (lib.mkIf cfg.sway.enable {
-      wayland.windowManager.sway = {
-        config = {
-          seat = {
-            "*" = {
-              xcursor_theme =
-                "${cfg.name} ${toString config.gtk.cursorTheme.size}";
+      (mkIf cfg.sway.enable {
+        wayland.windowManager.sway = {
+          config = {
+            seat = {
+              "*" = {
+                xcursor_theme =
+                  "${cfg.name} ${toString config.gtk.cursorTheme.size}";
+              };
             };
           };
         };
-      };
-    })
-  ]);
+      })
+    ]))
+
+    {
+      warnings = (optional (any (x:
+        getAttrFromPath
+        ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ])
+        options) [ "package" "name" "size" "defaultCursor" ]) ''
+          The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed
+          in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x10.enable`
+          to generate x10 specific cursor configurations. You can refer to the documentation for more details.
+        '') ++ (optional ((lib.versionAtLeast config.home.stateVersion "25.05")
+          && (cfg == null)) ''
+            Setting home.pointerCursor to null is deprecated.
+            Please update your configuration so that
+
+              home.pointerCursor.enable = false;
+          '');
+    }
+  ];
 }

From dcc20acf93f338a47468996a0055cda1112c051c Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 18 Feb 2025 22:37:18 +0000
Subject: [PATCH 528/546] home-cursor: add doticons option

---
 modules/config/home-cursor.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 7ae819532..66871e698 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -58,6 +58,14 @@ let
         '';
       };
 
+      dotIcons = {
+        enable = mkEnableOption ''
+          `.icons` config generation for {option}`home.pointerCursor`
+        '' // {
+          default = true;
+        };
+      };
+
       hyprcursor = {
         enable = mkEnableOption "hyprcursor config generation";
 
@@ -175,7 +183,9 @@ in {
           "${defaultIndexThemePackage}/share/icons/default/index.theme";
         xdg.dataFile."icons/${cfg.name}".source =
           "${cfg.package}/share/icons/${cfg.name}";
+      }
 
+      (mkIf cfg.dotIcons.enable {
         # Add symlink of cursor icon directory to $HOME/.icons, needed for
         # backwards compatibility with some applications. See:
         # https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html
@@ -183,7 +193,7 @@ in {
           "${defaultIndexThemePackage}/share/icons/default/index.theme";
         home.file.".icons/${cfg.name}".source =
           "${cfg.package}/share/icons/${cfg.name}";
-      }
+      })
 
       (mkIf cfg.x11.enable {
         xsession.profileExtra = ''

From 74f2ed6a64a087fadb39a4af84c5ecc8083b686d Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 19 Feb 2025 22:35:36 +0000
Subject: [PATCH 529/546] test/home-cursor: add new .enable check

---
 tests/modules/config/home-cursor/default.nix | 120 +++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/tests/modules/config/home-cursor/default.nix b/tests/modules/config/home-cursor/default.nix
index 08cde5452..f27e2a44d 100644
--- a/tests/modules/config/home-cursor/default.nix
+++ b/tests/modules/config/home-cursor/default.nix
@@ -32,6 +32,40 @@
     config = {
       home.pointerCursor = null;
 
+      home.stateVersion = "25.05";
+
+      test.asserts.warnings.expected = [''
+        Setting home.pointerCursor to null is deprecated.
+        Please update your configuration so that
+
+          home.pointerCursor.enable = false;
+      ''];
+
+      nmt.script = ''
+        assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"'
+      '';
+    };
+  };
+
+  home-cursor-legacy-disabled-with-enable = { realPkgs, ... }: {
+    config = {
+      home.pointerCursor = {
+        enable = false;
+        package = realPkgs.catppuccin-cursors.macchiatoBlue;
+        name = "catppuccin-macchiato-blue-standard";
+        size = 64;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        x11.enable = true;
+      };
+
       home.stateVersion = "24.11";
 
       nmt.script = ''
@@ -46,4 +80,90 @@
       '';
     };
   };
+
+  home-cursor-legacy-enabled-with-enable = { realPkgs, ... }: {
+    config = {
+      home.pointerCursor = {
+        enable = true;
+        package = realPkgs.catppuccin-cursors.macchiatoBlue;
+        name = "catppuccin-macchiato-blue-standard";
+        size = 64;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        x11.enable = true;
+      };
+
+      home.stateVersion = "24.11";
+
+      nmt.script = ''
+        assertFileContent \
+          home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \
+          ${./expected-index.theme}
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"'
+      '';
+
+    };
+  };
+
+  home-cursor = { realPkgs, ... }: {
+    config = {
+      home.pointerCursor = {
+        enable = true;
+        package = realPkgs.catppuccin-cursors.macchiatoBlue;
+        name = "catppuccin-macchiato-blue-standard";
+        size = 64;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        x11.enable = true;
+      };
+
+      home.stateVersion = "25.05";
+
+      nmt.script = ''
+        assertFileContent \
+          home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \
+          ${./expected-index.theme}
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"'
+      '';
+    };
+  };
+
+  home-cursor-disabled = { realPkgs, ... }: {
+    config = {
+      home.pointerCursor = {
+        enable = false;
+        package = realPkgs.catppuccin-cursors.macchiatoBlue;
+        name = "catppuccin-macchiato-blue-standard";
+        size = 64;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        x11.enable = true;
+      };
+
+      home.stateVersion = "25.05";
+
+      nmt.script = ''
+        assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme
+
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileExists $hmEnvFile
+        assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"'
+      '';
+    };
+  };
 }

From 18780912345970e5b546b1b085385789b6935a83 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 12 Mar 2025 08:53:16 -0500
Subject: [PATCH 530/546] home-cursor: louder deprecation

Check if a user explicitly set option to null and warn that they should
just disable instead.
---
 modules/config/home-cursor.nix               | 33 +++++++++-----------
 tests/modules/config/home-cursor/default.nix |  4 +--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 66871e698..ee8edbbb6 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -6,15 +6,7 @@ let
     literalExpression escapeShellArg hm getAttrFromPath any optional;
 
   cfg = config.home.pointerCursor;
-
-  enable = if (lib.versionOlder config.home.stateVersion "25.05") then
-  # respect .enable if it is declared
-    if (any (x: x ? enable) options.home.pointerCursor.definitions) then
-      cfg.enable
-    else
-      cfg != null
-  else
-    (cfg ? enable) && cfg.enable;
+  opts = options.home.pointerCursor;
 
   pointerCursorModule = types.submodule {
     options = {
@@ -132,10 +124,7 @@ in {
   options = {
     home.pointerCursor = mkOption {
       type = types.nullOr pointerCursorModule;
-      default = if (lib.versionOlder config.home.stateVersion "25.05") then
-        null
-      else
-        { };
+      default = null;
       description = ''
         Cursor configuration.
 
@@ -156,7 +145,13 @@ in {
     };
   };
 
-  config = mkMerge [
+  config = let
+    # Check if enable option was explicitly defined by the user
+    enableDefined = any (x: x ? enable) opts.definitions;
+
+    # Determine if cursor configuration should be enabled
+    enable = if enableDefined then cfg.enable else cfg != null;
+  in mkMerge [
     (mkIf enable (mkMerge [
       {
         assertions = [
@@ -242,12 +237,12 @@ in {
         ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ])
         options) [ "package" "name" "size" "defaultCursor" ]) ''
           The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed
-          in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x10.enable`
-          to generate x10 specific cursor configurations. You can refer to the documentation for more details.
-        '') ++ (optional ((lib.versionAtLeast config.home.stateVersion "25.05")
-          && (cfg == null)) ''
+          in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x11.enable`
+          to generate x11 specific cursor configurations. You can refer to the documentation for more details.
+        '') ++ (optional (opts.highestPrio != (lib.mkOptionDefault { }).priority
+          && cfg == null) ''
             Setting home.pointerCursor to null is deprecated.
-            Please update your configuration so that
+            Please update your configuration to explicitly set:
 
               home.pointerCursor.enable = false;
           '');
diff --git a/tests/modules/config/home-cursor/default.nix b/tests/modules/config/home-cursor/default.nix
index f27e2a44d..7cef6bae6 100644
--- a/tests/modules/config/home-cursor/default.nix
+++ b/tests/modules/config/home-cursor/default.nix
@@ -32,11 +32,11 @@
     config = {
       home.pointerCursor = null;
 
-      home.stateVersion = "25.05";
+      home.stateVersion = "24.11";
 
       test.asserts.warnings.expected = [''
         Setting home.pointerCursor to null is deprecated.
-        Please update your configuration so that
+        Please update your configuration to explicitly set:
 
           home.pointerCursor.enable = false;
       ''];

From 7832b5aa95f68a421dc9b4b3c17dcf942ac6145b Mon Sep 17 00:00:00 2001
From: Qiming Chu <1346550347@qq.com>
Date: Thu, 13 Mar 2025 21:37:11 +0800
Subject: [PATCH 531/546] zsh: refactor zsh configuration for better order
 control over `.zshrc` (#6479)

* zsh: add initContent option for custom .zshrc content insertion

- Users can add content anywhere by using `lib.mkOrder`, `lib.mkBefore`
and `lib.mkAfter` custom configurations.
- Add test cases to verify the insertion of content before and after
existing configurations in `.zshrc`.
consolidate zshrc content tests into a single priorities test
---
 modules/misc/news.nix                         |  11 +
 modules/programs/zsh.nix                      | 246 +++++++++---------
 tests/modules/programs/zsh/default.nix        |   1 +
 .../programs/zsh/zshrc-content-priorities.nix |  36 +++
 4 files changed, 177 insertions(+), 117 deletions(-)
 create mode 100644 tests/modules/programs/zsh/zshrc-content-priorities.nix

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index f088f2909..a3fb800f0 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2129,6 +2129,17 @@ in {
           Cohere, Groq).
         '';
       }
+
+      {
+        time = "2025-03-11T02:34:43+00:00";
+        condition = config.programs.zsh.enable;
+        message = ''
+          A new module is available: 'programs.zsh.initContent'.
+
+          initContent option allows you to set the content of the zshrc file,
+          you can use `lib.mkOrder` to specify the order of the content you want to insert.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index e4399d2d7..67e95d4e0 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -471,6 +471,15 @@ in
         description = "Environment variables that will be set for zsh session.";
       };
 
+      initContent = mkOption {
+        default = "";
+        type = types.lines;
+        example = lib.mkOrder 1000 ''
+          echo "Hello, initContent!"
+        '';
+        description = "Content to be added to {file}`.zshrc`. To specify the order, use `lib.mkOrder`.";
+      };
+
       initExtraBeforeCompInit = mkOption {
         default = "";
         type = types.lines;
@@ -616,158 +625,161 @@ in
         ++ optional cfg.enableCompletion pkgs.nix-zsh-completions
         ++ optional cfg.oh-my-zsh.enable cfg.oh-my-zsh.package;
 
-      home.file."${relToDotDir ".zshrc"}".text = concatStringsSep "\n" ([
+      programs.zsh.initContent = mkMerge [
         # zprof must be loaded before everything else, since it
         # benchmarks the shell initialization.
-        (optionalString cfg.zprof.enable ''
+        (mkOrder 400 (optionalString cfg.zprof.enable ''
           zmodload zsh/zprof
-        '')
+        ''))
 
-        cfg.initExtraFirst
-        "typeset -U path cdpath fpath manpath"
+        (mkOrder 550 cfg.initExtraFirst)
+        (mkOrder 600 "typeset -U path cdpath fpath manpath")
 
-        (optionalString (cfg.cdpath != []) ''
+        (mkOrder 650 (optionalString (cfg.cdpath != [ ]) ''
           cdpath+=(${concatStringsSep " " cfg.cdpath})
+        ''))
+        (mkOrder 700 ''
+          for profile in ''${(z)NIX_PROFILES}; do
+            fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions)
+          done
+
+          HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help"
         '')
 
-        ''
-        for profile in ''${(z)NIX_PROFILES}; do
-          fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions)
-        done
-
-        HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help"
-        ''
-
-        (optionalString (cfg.defaultKeymap != null) ''
+        (mkOrder 750 (optionalString (cfg.defaultKeymap != null) ''
           # Use ${cfg.defaultKeymap} keymap as the default.
           ${getAttr cfg.defaultKeymap bindkeyCommands}
-        '')
-        localVarsStr
+        ''))
 
-        cfg.initExtraBeforeCompInit
+        (mkOrder 800 localVarsStr)
+        (mkOrder 850 cfg.initExtraBeforeCompInit)
 
-        (concatStrings (map (plugin: ''
+        (mkOrder 900 (concatStrings (map (plugin: ''
           path+="$HOME/${pluginsDir}/${plugin.name}"
           fpath+="$HOME/${pluginsDir}/${plugin.name}"
-        '') cfg.plugins))
+        '') cfg.plugins)))
 
-        ''
-        # Oh-My-Zsh/Prezto calls compinit during initialization,
-        # calling it twice causes slight start up slowdown
-        # as all $fpath entries will be traversed again.
-        ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
-          cfg.completionInit
-        }''
+        (mkOrder 950 ''
+          # Oh-My-Zsh/Prezto calls compinit during initialization,
+          # calling it twice causes slight start up slowdown
+          # as all $fpath entries will be traversed again.
+          ${optionalString
+          (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
+          cfg.completionInit}'')
 
-        (optionalString cfg.autosuggestion.enable ''
+        (mkOrder 1000 (optionalString cfg.autosuggestion.enable ''
           source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-          ${optionalString (cfg.autosuggestion.strategy != []) ''
-            ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy})
-          ''
-          }
-        '')
-        (optionalString (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
-          ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"
+          ${optionalString (cfg.autosuggestion.strategy != [ ]) ''
+            ZSH_AUTOSUGGEST_STRATEGY=(${
+              concatStringsSep " " cfg.autosuggestion.strategy
+            })
+          ''}
+        ''))
+        (mkOrder 1050 (optionalString
+          (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
+            ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"
+          ''))
+
+        (mkOrder 1100 (optionalString cfg.oh-my-zsh.enable ''
+          # oh-my-zsh extra settings for plugins
+          ${cfg.oh-my-zsh.extraConfig}
+          # oh-my-zsh configuration generated by NixOS
+          ${optionalString (cfg.oh-my-zsh.plugins != [ ])
+          "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"}
+          ${optionalString (cfg.oh-my-zsh.custom != "")
+          ''ZSH_CUSTOM="${cfg.oh-my-zsh.custom}"''}
+          ${optionalString (cfg.oh-my-zsh.theme != "")
+          ''ZSH_THEME="${cfg.oh-my-zsh.theme}"''}
+          source $ZSH/oh-my-zsh.sh
+        ''))
+        (mkOrder 1150 ''
+          ${optionalString cfg.prezto.enable (builtins.readFile
+            "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")}
+
+          ${concatStrings (map (plugin: ''
+            if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
+              source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"
+            fi
+          '') cfg.plugins)}
+
+          # History options should be set in .zshrc and after oh-my-zsh sourcing.
+          # See https://github.com/nix-community/home-manager/issues/177.
+          HISTSIZE="${toString cfg.history.size}"
+          SAVEHIST="${toString cfg.history.save}"
+          ${optionalString (cfg.history.ignorePatterns != [ ])
+          "HISTORY_IGNORE=${
+            lib.escapeShellArg
+            "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"
+          }"}
+          ${if versionAtLeast config.home.stateVersion "20.03" then
+            ''HISTFILE="${cfg.history.path}"''
+          else
+            ''HISTFILE="$HOME/${cfg.history.path}"''}
+          mkdir -p "$(dirname "$HISTFILE")"
+
+          setopt HIST_FCNTL_LOCK
+          ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY
+          ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
+          ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS
+          ${if cfg.history.saveNoDups then "setopt" else "unsetopt"} HIST_SAVE_NO_DUPS
+          ${if cfg.history.findNoDups then "setopt" else "unsetopt"} HIST_FIND_NO_DUPS
+          ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE
+          ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST
+          ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY
+          ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY
+          ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""}
         '')
 
-        (optionalString cfg.oh-my-zsh.enable ''
-            # oh-my-zsh extra settings for plugins
-            ${cfg.oh-my-zsh.extraConfig}
-            # oh-my-zsh configuration generated by NixOS
-            ${optionalString (cfg.oh-my-zsh.plugins != [])
-              "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"
-            }
-            ${optionalString (cfg.oh-my-zsh.custom != "")
-              "ZSH_CUSTOM=\"${cfg.oh-my-zsh.custom}\""
-            }
-            ${optionalString (cfg.oh-my-zsh.theme != "")
-              "ZSH_THEME=\"${cfg.oh-my-zsh.theme}\""
-            }
-            source $ZSH/oh-my-zsh.sh
-        '')
-
-        ''
-        ${optionalString cfg.prezto.enable
-            (builtins.readFile "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")}
-
-        ${concatStrings (map (plugin: ''
-          if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
-            source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"
-          fi
-        '') cfg.plugins)}
-
-        # History options should be set in .zshrc and after oh-my-zsh sourcing.
-        # See https://github.com/nix-community/home-manager/issues/177.
-        HISTSIZE="${toString cfg.history.size}"
-        SAVEHIST="${toString cfg.history.save}"
-        ${optionalString (cfg.history.ignorePatterns != []) "HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"}"}
-        ${if versionAtLeast config.home.stateVersion "20.03"
-          then ''HISTFILE="${cfg.history.path}"''
-          else ''HISTFILE="$HOME/${cfg.history.path}"''}
-        mkdir -p "$(dirname "$HISTFILE")"
-
-        setopt HIST_FCNTL_LOCK
-        ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY
-        ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
-        ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS
-        ${if cfg.history.saveNoDups then "setopt" else "unsetopt"} HIST_SAVE_NO_DUPS
-        ${if cfg.history.findNoDups then "setopt" else "unsetopt"} HIST_FIND_NO_DUPS
-        ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE
-        ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST
-        ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY
-        ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY
-        ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""}
-
-        ${cfg.initExtra}
+        (mkOrder 1200 cfg.initExtra)
 
         # Aliases
-        ${aliasesStr}
-        ''
-      ]
-      ++ (mapAttrsToList (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellGlobalAliases)
-      ++ [ (''
-        # Named Directory Hashes
-        ${dirHashesStr}
+        (mkOrder 1250 aliasesStr)
+        (mkOrder 1250 (concatStringsSep "\n" (mapAttrsToList
+          (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
+          cfg.shellGlobalAliases)))
+        (mkOrder 1300 ''
+          # Named Directory Hashes
+          ${dirHashesStr}
         '')
 
-        (optionalString cfg.syntaxHighlighting.enable
+        (mkOrder 1350 (optionalString cfg.syntaxHighlighting.enable
           # Load zsh-syntax-highlighting after all custom widgets have been created
           # https://github.com/zsh-users/zsh-syntax-highlighting#faq
-        ''
-          source ${cfg.syntaxHighlighting.package}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-          ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)})
-          ${lib.concatStringsSep "\n" (
+          ''
+            source ${cfg.syntaxHighlighting.package}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+            ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)})
+            ${lib.concatStringsSep "\n" (
               lib.mapAttrsToList
-		(name: value: "ZSH_HIGHLIGHT_STYLES[${lib.escapeShellArg name}]=${lib.escapeShellArg value}")
+              (name: value: "ZSH_HIGHLIGHT_STYLES[${lib.escapeShellArg name}]=${lib.escapeShellArg value}")
                 cfg.syntaxHighlighting.styles
-          )}
-          ${lib.concatStringsSep "\n" (
+            )}
+            ${lib.concatStringsSep "\n" (
               lib.mapAttrsToList
                 (name: value: "ZSH_HIGHLIGHT_PATTERNS+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})")
                 cfg.syntaxHighlighting.patterns
-          )}
-        '')
+            )}
+          ''))
 
-        (optionalString (cfg.historySubstringSearch.enable or false)
+        (mkOrder 1400 (optionalString
+          (cfg.historySubstringSearch.enable or false)
           # Load zsh-history-substring-search after zsh-syntax-highlighting
           # https://github.com/zsh-users/zsh-history-substring-search#usage
-        ''
-          source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
-          ${lib.concatMapStringsSep "\n"
-            (upKey: "bindkey \"${upKey}\" history-substring-search-up")
-            (lib.toList cfg.historySubstringSearch.searchUpKey)
-          }
-          ${lib.concatMapStringsSep "\n"
-            (downKey: "bindkey \"${downKey}\" history-substring-search-down")
-            (lib.toList cfg.historySubstringSearch.searchDownKey)
-          }
-        '')
+          ''
+            source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
+            ${lib.concatMapStringsSep "\n"
+            (upKey: ''bindkey "${upKey}" history-substring-search-up'')
+            (lib.toList cfg.historySubstringSearch.searchUpKey)}
+            ${lib.concatMapStringsSep "\n"
+            (downKey: ''bindkey "${downKey}" history-substring-search-down'')
+            (lib.toList cfg.historySubstringSearch.searchDownKey)}
+          ''))
 
-        (optionalString cfg.zprof.enable
-        ''
+        (mkOrder 1450 (optionalString cfg.zprof.enable ''
           zprof
-        '')
-      ]);
+        ''))
+      ];
+
+      home.file."${relToDotDir ".zshrc"}".text = cfg.initContent;
     }
 
     (mkIf cfg.oh-my-zsh.enable {
diff --git a/tests/modules/programs/zsh/default.nix b/tests/modules/programs/zsh/default.nix
index 25aa3b470..38e704aac 100644
--- a/tests/modules/programs/zsh/default.nix
+++ b/tests/modules/programs/zsh/default.nix
@@ -9,4 +9,5 @@
   zsh-prezto = ./prezto.nix;
   zsh-syntax-highlighting = ./syntax-highlighting.nix;
   zsh-abbr = ./zsh-abbr.nix;
+  zshrc-contents-priorities = ./zshrc-content-priorities.nix;
 }
diff --git a/tests/modules/programs/zsh/zshrc-content-priorities.nix b/tests/modules/programs/zsh/zshrc-content-priorities.nix
new file mode 100644
index 000000000..5245bef58
--- /dev/null
+++ b/tests/modules/programs/zsh/zshrc-content-priorities.nix
@@ -0,0 +1,36 @@
+{ lib, ... }: {
+  programs.zsh = {
+    enable = true;
+
+    initContent = lib.mkMerge [
+      (lib.mkBefore ''
+        # High priority (mkBefore)
+        echo "High priority content"
+      '')
+
+      (lib.mkAfter ''
+        # Low priority (mkAfter)
+        echo "Low priority content"
+      '')
+
+      ''
+        # Default priority
+        echo "Default priority content"
+      ''
+    ];
+
+    zprof.enable = true;
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.zshrc
+
+    assertFileContains home-files/.zshrc "zmodload zsh/zprof"
+    assertFileContains home-files/.zshrc "High priority content"
+    assertFileContains home-files/.zshrc "Default priority content"
+    assertFileContains home-files/.zshrc "Low priority content"
+
+    assertFileRegex home-files/.zshrc '^zmodload zsh/zprof'
+    assertFileRegex home-files/.zshrc 'echo "Low priority content"$'
+  '';
+}

From ef257da52a299a47cc7235da270ab3b427a4ea5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Garniaux?= <jeremy@mapper.fr>
Date: Thu, 13 Mar 2025 14:50:10 +0100
Subject: [PATCH 532/546] docs: enhance comment for home.stateVersion option
 (#6116)

Enhance comment for home.stateVersion option (see issue #5794)
---
 docs/manual/installation/nixos.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/manual/installation/nixos.md b/docs/manual/installation/nixos.md
index 6c9807ee8..6ec201638 100644
--- a/docs/manual/installation/nixos.md
+++ b/docs/manual/installation/nixos.md
@@ -42,9 +42,15 @@ home-manager.users.eve = { pkgs, ... }: {
   home.packages = [ pkgs.atool pkgs.httpie ];
   programs.bash.enable = true;
 
-  # The state version is required and should stay at the version you
-  # originally installed.
-  home.stateVersion = "24.11";
+  # This value determines the Home Manager release that your configuration is 
+  # compatible with. This helps avoid breakage when a new Home Manager release 
+  # introduces backwards incompatible changes. 
+  #
+  # You should not change this value, even if you update Home Manager. If you do 
+  # want to update the value, then make sure to first check the Home Manager 
+  # release notes. 
+  home.stateVersion = "24.05"; # Please read the comment before changing. 
+
 };
 ```
 

From 6576167e6b3f2b5c60e48b62f792410bd3b4824c Mon Sep 17 00:00:00 2001
From: Stanislav Alekseev <43210583+WeetHet@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:02:04 +0200
Subject: [PATCH 533/546] macos-remap-keys: add (#6605)

A module to remap keys using macos native tool (hidutil)
---
 modules/modules.nix                           |   1 +
 modules/services/macos-remap-keys/default.nix |  72 +++++++++
 .../services/macos-remap-keys/keytables.nix   | 139 ++++++++++++++++++
 tests/default.nix                             |   1 +
 .../macos-remap-keys/basic-agent.plist        |  22 +++
 .../macos-remap-keys/basic-configuration.nix  |  12 ++
 .../services/macos-remap-keys/default.nix     |   1 +
 7 files changed, 248 insertions(+)
 create mode 100644 modules/services/macos-remap-keys/default.nix
 create mode 100644 modules/services/macos-remap-keys/keytables.nix
 create mode 100644 tests/modules/services/macos-remap-keys/basic-agent.plist
 create mode 100644 tests/modules/services/macos-remap-keys/basic-configuration.nix
 create mode 100644 tests/modules/services/macos-remap-keys/default.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 7d3b54043..9226ed63b 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -342,6 +342,7 @@ let
     ./services/linux-wallpaperengine.nix
     ./services/listenbrainz-mpd.nix
     ./services/lorri.nix
+    ./services/macos-remap-keys
     ./services/mako.nix
     ./services/mbsync.nix
     ./services/megasync.nix
diff --git a/modules/services/macos-remap-keys/default.nix b/modules/services/macos-remap-keys/default.nix
new file mode 100644
index 000000000..0c0d2575d
--- /dev/null
+++ b/modules/services/macos-remap-keys/default.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.macos-remap-keys;
+  keytables = import ./keytables.nix { inherit lib; };
+
+  keyToHIDCode = table: key: keytables.${table}.${key};
+
+  # Note: hidutil requires HIDKeyboardModifierMapping values to be in hexadecimal
+  # format rather than decimal JSON. Using hex strings instead of numbers will
+  # crash macOS.
+  makeMapping = table: from: to:
+    ''
+      { "HIDKeyboardModifierMappingSrc": ${
+        keyToHIDCode table from
+      }, "HIDKeyboardModifierMappingDst": ${keyToHIDCode table to} }'';
+
+  makeMappingsList = table: mappings:
+    lib.mapAttrsToList (from: to: makeMapping table from to) mappings;
+
+  allMappings = (makeMappingsList "keyboard" (cfg.keyboard or { }))
+    ++ (makeMappingsList "keypad" (cfg.keypad or { }));
+
+  allMappingsString = lib.concatStringsSep ", " allMappings;
+  propertyString = ''{ "UserKeyMapping": [ ${allMappingsString} ] }'';
+in {
+  meta.maintainers = [ lib.maintainers.WeetHet ];
+
+  options.services.macos-remap-keys = {
+    enable = lib.mkEnableOption "macOS key remapping service";
+
+    keyboard = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      example = {
+        Capslock = "Escape";
+        SquareBracketOpen = "SquareBracketClose";
+      };
+      description = "Mapping of keyboard keys to remap";
+    };
+
+    keypad = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      example = {
+        Enter = "Equal";
+        Plus = "Minus";
+      };
+      description = "Mapping of keypad keys to remap";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.macos-remap-keys" pkgs
+        lib.platforms.darwin)
+    ];
+    home.activation.macosRemapKeys =
+      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        run --silence /usr/bin/hidutil property --set '${propertyString}'
+      '';
+
+    launchd.agents.remap-keys = {
+      enable = true;
+      config = {
+        ProgramArguments =
+          [ "/usr/bin/hidutil" "property" "--set" propertyString ];
+        KeepAlive.SuccessfulExit = false;
+        RunAtLoad = true;
+      };
+    };
+  };
+}
diff --git a/modules/services/macos-remap-keys/keytables.nix b/modules/services/macos-remap-keys/keytables.nix
new file mode 100644
index 000000000..a44bb4ece
--- /dev/null
+++ b/modules/services/macos-remap-keys/keytables.nix
@@ -0,0 +1,139 @@
+{ lib }:
+let
+  letters = let
+    alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    lettersList = lib.stringToCharacters alphabet;
+    indices = builtins.genList (i: i + 4) 26;
+  in lib.listToAttrs (lib.zipListsWith (letter: index: {
+    name = letter;
+    value = "0x${lib.toHexString index}";
+  }) lettersList indices);
+
+  numbers = {
+    One = "0x1E";
+    Two = "0x1F";
+    Three = "0x20";
+    Four = "0x21";
+    Five = "0x22";
+    Six = "0x23";
+    Seven = "0x24";
+    Eight = "0x25";
+    Nine = "0x26";
+    Zero = "0x27";
+  };
+
+  specialKeys = {
+    Enter = "0x28";
+    Escape = "0x29";
+    Backspace = "0x2A";
+    Tab = "0x2B";
+    Spacebar = "0x2C";
+    Minus = "0x2D";
+    Equal = "0x2E";
+    SquareBracketOpen = "0x2F";
+    SquareBracketClose = "0x30";
+    Backslash = "0x31";
+    Hash = "0x32";
+    Semicolon = "0x33";
+    SingleQuote = "0x34";
+    GraveAccent = "0x35";
+    Comma = "0x36";
+    Dot = "0x37";
+    Slash = "0x38";
+    Capslock = "0x39";
+  };
+
+  fKeys1To12 = {
+    F1 = "0x3A";
+    F2 = "0x3B";
+    F3 = "0x3C";
+    F4 = "0x3D";
+    F5 = "0x3E";
+    F6 = "0x3F";
+    F7 = "0x40";
+    F8 = "0x41";
+    F9 = "0x42";
+    F10 = "0x43";
+    F11 = "0x44";
+    F12 = "0x45";
+  };
+
+  fKeys13To24 = {
+    F13 = "0x68";
+    F14 = "0x69";
+    F15 = "0x6A";
+    F16 = "0x6B";
+    F17 = "0x6C";
+    F18 = "0x6D";
+    F19 = "0x6E";
+    F20 = "0x6F";
+    F21 = "0x70";
+    F22 = "0x71";
+    F23 = "0x72";
+    F24 = "0x73";
+  };
+
+  navigationKeys = {
+    PrintScreen = "0x46";
+    ScrollLock = "0x47";
+    Pause = "0x48";
+    Insert = "0x49";
+    Home = "0x4A";
+    PageUp = "0x4B";
+    ForwardDelete = "0x4C";
+    End = "0x4D";
+    PageDown = "0x4E";
+    RightArrow = "0x4F";
+    LeftArrow = "0x50";
+    DownArrow = "0x51";
+    UpArrow = "0x52";
+    NumLock = "0x53";
+  };
+
+  modifierKeys = {
+    Control = "0xE0";
+    Shift = "0xE1";
+    Option = "0xE2";
+    Command = "0xE3";
+    RightControl = "0xE4";
+    RightShift = "0xE5";
+    RightOption = "0xE6";
+    RightCommand = "0xE7";
+  };
+
+  keypadKeys = {
+    Slash = "0x54";
+    Asterisk = "0x55";
+    Minus = "0x56";
+    Plus = "0x57";
+    Enter = "0x58";
+    One = "0x59";
+    Two = "0x5A";
+    Three = "0x5B";
+    Four = "0x5C";
+    Five = "0x5D";
+    Six = "0x5E";
+    Seven = "0x5F";
+    Eight = "0x60";
+    Nine = "0x61";
+    Zero = "0x62";
+    Dot = "0x63";
+    BashSlash = "0x64";
+    Application = "0x65";
+    Power = "0x66";
+    Equal = "0x67";
+  };
+
+  mapToInt = keyPage: attrs:
+    lib.mapAttrs (name: value:
+      let keycode = lib.fromHexString (lib.removePrefix "0x" value);
+      in "0x${lib.toHexString (keyPage + keycode)}") attrs;
+
+  page7Keys = mapToInt (lib.fromHexString "700000000") (letters // numbers
+    // specialKeys // fKeys1To12 // fKeys13To24 // navigationKeys
+    // modifierKeys);
+  pageFFKeys = mapToInt (lib.fromHexString "FF00000000") { Fn = "0x3"; };
+in {
+  keyboard = page7Keys // pageFFKeys;
+  keypad = mapToInt keypadKeys;
+}
diff --git a/tests/default.nix b/tests/default.nix
index 94a993da4..05036d6a7 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -325,6 +325,7 @@ in import nmtSrc {
     ./modules/services/git-sync-darwin
     ./modules/services/imapnotify-darwin
     ./modules/services/nix-gc-darwin
+    ./modules/services/macos-remap-keys
     ./modules/services/ollama/darwin
     ./modules/services/yubikey-agent-darwin
     ./modules/targets-darwin
diff --git a/tests/modules/services/macos-remap-keys/basic-agent.plist b/tests/modules/services/macos-remap-keys/basic-agent.plist
new file mode 100644
index 000000000..b59f97d99
--- /dev/null
+++ b/tests/modules/services/macos-remap-keys/basic-agent.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>KeepAlive</key>
+	<dict>
+		<key>SuccessfulExit</key>
+		<false/>
+	</dict>
+	<key>Label</key>
+	<string>org.nix-community.home.remap-keys</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/usr/bin/hidutil</string>
+		<string>property</string>
+		<string>--set</string>
+		<string>{ "UserKeyMapping": [ { "HIDKeyboardModifierMappingSrc": 0x700000039, "HIDKeyboardModifierMappingDst": 0x70000002A } ] }</string>
+	</array>
+	<key>RunAtLoad</key>
+	<true/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/tests/modules/services/macos-remap-keys/basic-configuration.nix b/tests/modules/services/macos-remap-keys/basic-configuration.nix
new file mode 100644
index 000000000..7cc0b9018
--- /dev/null
+++ b/tests/modules/services/macos-remap-keys/basic-configuration.nix
@@ -0,0 +1,12 @@
+{
+  services.macos-remap-keys = {
+    enable = true;
+    keyboard = { Capslock = "Backspace"; };
+  };
+
+  nmt.script = ''
+    launchAgent=LaunchAgents/org.nix-community.home.remap-keys.plist
+    assertFileExists "$launchAgent"
+    assertFileContent "$launchAgent" ${./basic-agent.plist}
+  '';
+}
diff --git a/tests/modules/services/macos-remap-keys/default.nix b/tests/modules/services/macos-remap-keys/default.nix
new file mode 100644
index 000000000..796110f76
--- /dev/null
+++ b/tests/modules/services/macos-remap-keys/default.nix
@@ -0,0 +1 @@
+{ macos-remap-keys-basic-configuration = ./basic-configuration.nix; }

From d30c1d30bfbc287883c3d9e2ee811e2ac22ff879 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:22:18 -0500
Subject: [PATCH 534/546] zoxide: move to bottom of zsh content

Follow up to https://github.com/nix-community/home-manager/pull/6572,
possible to fix now with
https://github.com/nix-community/home-manager/pull/6479
---
 modules/programs/zoxide.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index 95364f04b..085583e1b 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -52,9 +52,9 @@ in {
       eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
     '');
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 2000 ''
       eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
-    '';
+    '');
 
     programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
       ${cfg.package}/bin/zoxide init fish ${cfgOptions} | source

From 56374cc64d58451b359bb4e8502387d3a96e7c7b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:25:14 -0500
Subject: [PATCH 535/546] zoxide: remove with lib

---
 modules/programs/zoxide.nix | 39 +++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index 085583e1b..8509a3dc6 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -1,30 +1,25 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
   cfg = config.programs.zoxide;
 
-  cfgOptions = concatStringsSep " " cfg.options;
-
+  cfgOptions = lib.concatStringsSep " " cfg.options;
 in {
   meta.maintainers = [ ];
 
   options.programs.zoxide = {
-    enable = mkEnableOption "zoxide";
+    enable = lib.mkEnableOption "zoxide";
 
-    package = mkOption {
-      type = types.package;
+    package = lib.mkOption {
+      type = lib.types.package;
       default = pkgs.zoxide;
-      defaultText = literalExpression "pkgs.zoxide";
+      defaultText = lib.literalExpression "pkgs.zoxide";
       description = ''
         Zoxide package to install.
       '';
     };
 
-    options = mkOption {
-      type = types.listOf types.str;
+    options = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [ "--no-cmd" ];
       description = ''
@@ -45,22 +40,24 @@ in {
       lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 2000 ''
-      eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
-    '');
+    programs.bash.initExtra = lib.mkIf cfg.enableBashIntegration
+      (lib.mkOrder 2000 ''
+        eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
+      '');
 
-    programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 2000 ''
-      eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
-    '');
+    programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration
+      (lib.mkOrder 2000 ''
+        eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
+      '');
 
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+    programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
       ${cfg.package}/bin/zoxide init fish ${cfgOptions} | source
     '';
 
-    programs.nushell = mkIf cfg.enableNushellIntegration {
+    programs.nushell = lib.mkIf cfg.enableNushellIntegration {
       extraEnv = ''
         let zoxide_cache = "${config.xdg.cacheHome}/zoxide"
         if not ($zoxide_cache | path exists) {

From b5142d46a3f912ef99e9cec3e51d757fbeaf14ea Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:29:46 -0500
Subject: [PATCH 536/546] zsh: remove with lib

---
 modules/programs/zsh.nix | 48 +++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 67e95d4e0..0d97b4311 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib) concatStringsSep literalExpression mkEnableOption mkIf mkOption mkOrder optionalString types;
 
   cfg = config.programs.zsh;
 
@@ -15,11 +13,11 @@ let
   localVarsStr = config.lib.zsh.defineAll cfg.localVariables;
 
   aliasesStr = concatStringsSep "\n" (
-    mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases
+    lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases
   );
 
   dirHashesStr = concatStringsSep "\n" (
-    mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes
+    lib.mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes
   );
 
   zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir;
@@ -64,7 +62,7 @@ let
 
       path = mkOption {
         type = types.str;
-        default = if versionAtLeast stateVersion "20.03"
+        default = if lib.versionAtLeast stateVersion "20.03"
           then "$HOME/.zsh_history"
           else relToDotDir ".zsh_history";
         defaultText = literalExpression ''
@@ -177,14 +175,14 @@ let
       };
     };
 
-    config.file = mkDefault "${config.name}.plugin.zsh";
+    config.file = lib.mkDefault "${config.name}.plugin.zsh";
   });
 
   ohMyZshModule = types.submodule {
     options = {
       enable = mkEnableOption "oh-my-zsh";
 
-      package = mkPackageOption pkgs "oh-my-zsh" { };
+      package = lib.mkPackageOption pkgs "oh-my-zsh" { };
 
       plugins = mkOption {
         default = [];
@@ -256,7 +254,7 @@ let
     options = {
       enable = mkEnableOption "zsh syntax highlighting";
 
-      package = mkPackageOption pkgs "zsh-syntax-highlighting" { };
+      package = lib.mkPackageOption pkgs "zsh-syntax-highlighting" { };
 
       highlighters = mkOption {
         type = types.listOf types.str;
@@ -294,16 +292,16 @@ in
 
 {
   imports = [
-    (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
-    (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
-    (mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
+    (lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
+    (lib.mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
+    (lib.mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
   ];
 
   options = {
     programs.zsh = {
       enable = mkEnableOption "Z shell (Zsh)";
 
-      package = mkPackageOption pkgs "zsh" { };
+      package = lib.mkPackageOption pkgs "zsh" { };
 
       autocd = mkOption {
         default = null;
@@ -458,7 +456,7 @@ in
       };
 
       defaultKeymap = mkOption {
-        type = types.nullOr (types.enum (attrNames bindkeyCommands));
+        type = types.nullOr (types.enum (lib.attrNames bindkeyCommands));
         default = null;
         example = "emacs";
         description = "The default base keymap to use.";
@@ -569,7 +567,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config = mkIf cfg.enable (lib.mkMerge [
     (mkIf (cfg.envExtra != "") {
       home.file."${relToDotDir ".zshenv"}".text = cfg.envExtra;
     })
@@ -622,10 +620,10 @@ in
 
     {
       home.packages = [ cfg.package ]
-        ++ optional cfg.enableCompletion pkgs.nix-zsh-completions
-        ++ optional cfg.oh-my-zsh.enable cfg.oh-my-zsh.package;
+        ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions
+        ++ lib.optional cfg.oh-my-zsh.enable cfg.oh-my-zsh.package;
 
-      programs.zsh.initContent = mkMerge [
+      programs.zsh.initContent = lib.mkMerge [
         # zprof must be loaded before everything else, since it
         # benchmarks the shell initialization.
         (mkOrder 400 (optionalString cfg.zprof.enable ''
@@ -648,13 +646,13 @@ in
 
         (mkOrder 750 (optionalString (cfg.defaultKeymap != null) ''
           # Use ${cfg.defaultKeymap} keymap as the default.
-          ${getAttr cfg.defaultKeymap bindkeyCommands}
+          ${lib.getAttr cfg.defaultKeymap bindkeyCommands}
         ''))
 
         (mkOrder 800 localVarsStr)
         (mkOrder 850 cfg.initExtraBeforeCompInit)
 
-        (mkOrder 900 (concatStrings (map (plugin: ''
+        (mkOrder 900 (lib.concatStrings (map (plugin: ''
           path+="$HOME/${pluginsDir}/${plugin.name}"
           fpath+="$HOME/${pluginsDir}/${plugin.name}"
         '') cfg.plugins)))
@@ -696,7 +694,7 @@ in
           ${optionalString cfg.prezto.enable (builtins.readFile
             "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")}
 
-          ${concatStrings (map (plugin: ''
+          ${lib.concatStrings (map (plugin: ''
             if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
               source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"
             fi
@@ -711,7 +709,7 @@ in
             lib.escapeShellArg
             "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"
           }"}
-          ${if versionAtLeast config.home.stateVersion "20.03" then
+          ${if lib.versionAtLeast config.home.stateVersion "20.03" then
             ''HISTFILE="${cfg.history.path}"''
           else
             ''HISTFILE="$HOME/${cfg.history.path}"''}
@@ -734,7 +732,7 @@ in
 
         # Aliases
         (mkOrder 1250 aliasesStr)
-        (mkOrder 1250 (concatStringsSep "\n" (mapAttrsToList
+        (mkOrder 1250 (concatStringsSep "\n" (lib.mapAttrsToList
           (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
           cfg.shellGlobalAliases)))
         (mkOrder 1300 ''
@@ -791,10 +789,10 @@ in
     (mkIf (cfg.plugins != []) {
       # Many plugins require compinit to be called
       # but allow the user to opt out.
-      programs.zsh.enableCompletion = mkDefault true;
+      programs.zsh.enableCompletion = lib.mkDefault true;
 
       home.file =
-        foldl' (a: b: a // b) {}
+        lib.foldl' (a: b: a // b) {}
         (map (plugin: { "${pluginsDir}/${plugin.name}".source = plugin.src; })
         cfg.plugins);
     })

From ad487d3863e94ac839b2e1e451197ab5a4aafd1b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:33:28 -0500
Subject: [PATCH 537/546] zsh: move config variables closer to usage

---
 modules/programs/zsh.nix | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 0d97b4311..a9d485ab0 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -6,22 +6,6 @@ let
 
   relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
 
-  pluginsDir = if cfg.dotDir != null then
-    relToDotDir "plugins" else ".zsh/plugins";
-
-  envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables;
-  localVarsStr = config.lib.zsh.defineAll cfg.localVariables;
-
-  aliasesStr = concatStringsSep "\n" (
-    lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases
-  );
-
-  dirHashesStr = concatStringsSep "\n" (
-    lib.mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes
-  );
-
-  zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir;
-
   bindkeyCommands = {
     emacs = "bindkey -e";
     viins = "bindkey -v";
@@ -287,9 +271,7 @@ let
       };
     };
   };
-
 in
-
 {
   imports = [
     (lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
@@ -567,7 +549,25 @@ in
     };
   };
 
-  config = mkIf cfg.enable (lib.mkMerge [
+  config =
+    let
+      pluginsDir = if cfg.dotDir != null then
+        relToDotDir "plugins" else ".zsh/plugins";
+
+      envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables;
+      localVarsStr = config.lib.zsh.defineAll cfg.localVariables;
+
+      aliasesStr = concatStringsSep "\n" (
+        lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases
+      );
+
+      dirHashesStr = concatStringsSep "\n" (
+        lib.mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes
+      );
+
+      zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir;
+    in
+    mkIf cfg.enable (lib.mkMerge [
     (mkIf (cfg.envExtra != "") {
       home.file."${relToDotDir ".zshenv"}".text = cfg.envExtra;
     })

From 1b0efe3d335f452595512c7b275e5dddfbfb28a5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:35:23 -0500
Subject: [PATCH 538/546] zsh: move option variables closer to usage

---
 modules/programs/zsh.nix | 525 ++++++++++++++++++++-------------------
 1 file changed, 263 insertions(+), 262 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index a9d485ab0..141b6f12d 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -6,271 +6,13 @@ let
 
   relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
 
+  stateVersion = config.home.stateVersion;
+
   bindkeyCommands = {
     emacs = "bindkey -e";
     viins = "bindkey -v";
     vicmd = "bindkey -a";
   };
-
-  stateVersion = config.home.stateVersion;
-
-  historyModule = types.submodule ({ config, ... }: {
-    options = {
-      append = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If set, zsh sessions will append their history list to the history
-          file, rather than replace it. Thus, multiple parallel zsh sessions
-          will all have the new entries from their history lists added to the
-          history file, in the order that they exit.
-
-          This file will still be periodically re-written to trim it when the
-          number of lines grows 20% beyond the value specified by
-          `programs.zsh.history.save`.
-        '';
-      };
-
-      size = mkOption {
-        type = types.int;
-        default = 10000;
-        description = "Number of history lines to keep.";
-      };
-
-      save = mkOption {
-        type = types.int;
-        defaultText = 10000;
-        default = config.size;
-        description = "Number of history lines to save.";
-      };
-
-      path = mkOption {
-        type = types.str;
-        default = if lib.versionAtLeast stateVersion "20.03"
-          then "$HOME/.zsh_history"
-          else relToDotDir ".zsh_history";
-        defaultText = literalExpression ''
-          "$HOME/.zsh_history" if state version ≥ 20.03,
-          "$ZDOTDIR/.zsh_history" otherwise
-        '';
-        example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"'';
-        description = "History file location";
-      };
-
-      ignorePatterns = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = literalExpression ''[ "rm *" "pkill *" ]'';
-        description = ''
-          Do not enter command lines into the history list
-          if they match any one of the given shell patterns.
-        '';
-      };
-
-      ignoreDups = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Do not enter command lines into the history list
-          if they are duplicates of the previous event.
-        '';
-      };
-
-      ignoreAllDups = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If a new command line being added to the history list
-          duplicates an older one, the older command is removed
-          from the list (even if it is not the previous event).
-        '';
-      };
-
-      saveNoDups = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Do not write duplicate entries into the history file.
-        '';
-      };
-
-      findNoDups = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Do not display a line previously found in the history
-          file.
-        '';
-      };
-
-      ignoreSpace = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Do not enter command lines into the history list
-          if the first character is a space.
-        '';
-      };
-
-      expireDuplicatesFirst = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Expire duplicates first.";
-      };
-
-      extended = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Save timestamp into the history file.";
-      };
-
-      share = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Share command history between zsh sessions.";
-      };
-    };
-  });
-
-  pluginModule = types.submodule ({ config, ... }: {
-    options = {
-      src = mkOption {
-        type = types.path;
-        description = ''
-          Path to the plugin folder.
-
-          Will be added to {env}`fpath` and {env}`PATH`.
-        '';
-      };
-
-      name = mkOption {
-        type = types.str;
-        description = ''
-          The name of the plugin.
-
-          Don't forget to add {option}`file`
-          if the script name does not follow convention.
-        '';
-      };
-
-      file = mkOption {
-        type = types.str;
-        description = "The plugin script to source.";
-      };
-    };
-
-    config.file = lib.mkDefault "${config.name}.plugin.zsh";
-  });
-
-  ohMyZshModule = types.submodule {
-    options = {
-      enable = mkEnableOption "oh-my-zsh";
-
-      package = lib.mkPackageOption pkgs "oh-my-zsh" { };
-
-      plugins = mkOption {
-        default = [];
-        example = [ "git" "sudo" ];
-        type = types.listOf types.str;
-        description = ''
-          List of oh-my-zsh plugins
-        '';
-      };
-
-      custom = mkOption {
-        default = "";
-        type = types.str;
-        example = "$HOME/my_customizations";
-        description = ''
-          Path to a custom oh-my-zsh package to override config of
-          oh-my-zsh. See <https://github.com/robbyrussell/oh-my-zsh/wiki/Customization>
-          for more information.
-        '';
-      };
-
-      theme = mkOption {
-        default = "";
-        example = "robbyrussell";
-        type = types.str;
-        description = ''
-          Name of the theme to be used by oh-my-zsh.
-        '';
-      };
-
-      extraConfig = mkOption {
-        default = "";
-        example = ''
-          zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
-        '';
-        type = types.lines;
-        description = ''
-          Extra settings for plugins.
-        '';
-      };
-    };
-  };
-
-  historySubstringSearchModule = types.submodule {
-    options = {
-      enable = mkEnableOption "history substring search";
-      searchUpKey = mkOption {
-        type = with types; either (listOf str) str ;
-        default = [ "^[[A" ];
-        description = ''
-          The key codes to be used when searching up.
-          The default of `^[[A` may correspond to the UP key -- if not, try
-          `$terminfo[kcuu1]`.
-        '';
-      };
-      searchDownKey = mkOption {
-        type = with types; either (listOf str) str ;
-        default = [ "^[[B" ];
-        description = ''
-          The key codes to be used when searching down.
-          The default of `^[[B` may correspond to the DOWN key -- if not, try
-          `$terminfo[kcud1]`.
-        '';
-      };
-    };
-  };
-
-  syntaxHighlightingModule = types.submodule {
-    options = {
-      enable = mkEnableOption "zsh syntax highlighting";
-
-      package = lib.mkPackageOption pkgs "zsh-syntax-highlighting" { };
-
-      highlighters = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "brackets" ];
-        description = ''
-          Highlighters to enable
-          See the list of highlighters: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md>
-        '';
-      };
-
-      patterns = mkOption {
-        type = types.attrsOf types.str;
-        default = {};
-        example = { "rm -rf *" = "fg=white,bold,bg=red"; };
-        description = ''
-          Custom syntax highlighting for user-defined patterns.
-          Reference: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md>
-        '';
-      };
-
-      styles = mkOption {
-        type = types.attrsOf types.str;
-        default = {};
-        example = { comment = "fg=black,bold"; };
-        description = ''
-          Custom styles for syntax highlighting.
-          See each highlighter style option: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md>
-        '';
-      };
-    };
-  };
 in
 {
   imports = [
@@ -279,7 +21,266 @@ in
     (lib.mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
   ];
 
-  options = {
+  options =
+    let
+      historyModule = types.submodule ({ config, ... }: {
+        options = {
+          append = mkOption {
+            type = types.bool;
+            default = false;
+            description = ''
+              If set, zsh sessions will append their history list to the history
+              file, rather than replace it. Thus, multiple parallel zsh sessions
+              will all have the new entries from their history lists added to the
+              history file, in the order that they exit.
+
+              This file will still be periodically re-written to trim it when the
+              number of lines grows 20% beyond the value specified by
+              `programs.zsh.history.save`.
+            '';
+          };
+
+          size = mkOption {
+            type = types.int;
+            default = 10000;
+            description = "Number of history lines to keep.";
+          };
+
+          save = mkOption {
+            type = types.int;
+            defaultText = 10000;
+            default = config.size;
+            description = "Number of history lines to save.";
+          };
+
+          path = mkOption {
+            type = types.str;
+            default = if lib.versionAtLeast stateVersion "20.03"
+              then "$HOME/.zsh_history"
+              else relToDotDir ".zsh_history";
+            defaultText = literalExpression ''
+              "$HOME/.zsh_history" if state version ≥ 20.03,
+              "$ZDOTDIR/.zsh_history" otherwise
+            '';
+            example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"'';
+            description = "History file location";
+          };
+
+          ignorePatterns = mkOption {
+            type = types.listOf types.str;
+            default = [];
+            example = literalExpression ''[ "rm *" "pkill *" ]'';
+            description = ''
+              Do not enter command lines into the history list
+              if they match any one of the given shell patterns.
+            '';
+          };
+
+          ignoreDups = mkOption {
+            type = types.bool;
+            default = true;
+            description = ''
+              Do not enter command lines into the history list
+              if they are duplicates of the previous event.
+            '';
+          };
+
+          ignoreAllDups = mkOption {
+            type = types.bool;
+            default = false;
+            description = ''
+              If a new command line being added to the history list
+              duplicates an older one, the older command is removed
+              from the list (even if it is not the previous event).
+            '';
+          };
+
+          saveNoDups = mkOption {
+            type = types.bool;
+            default = false;
+            description = ''
+              Do not write duplicate entries into the history file.
+            '';
+          };
+
+          findNoDups = mkOption {
+            type = types.bool;
+            default = false;
+            description = ''
+              Do not display a line previously found in the history
+              file.
+            '';
+          };
+
+          ignoreSpace = mkOption {
+            type = types.bool;
+            default = true;
+            description = ''
+              Do not enter command lines into the history list
+              if the first character is a space.
+            '';
+          };
+
+          expireDuplicatesFirst = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Expire duplicates first.";
+          };
+
+          extended = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Save timestamp into the history file.";
+          };
+
+          share = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Share command history between zsh sessions.";
+          };
+        };
+      });
+
+      pluginModule = types.submodule ({ config, ... }: {
+        options = {
+          src = mkOption {
+            type = types.path;
+            description = ''
+              Path to the plugin folder.
+
+              Will be added to {env}`fpath` and {env}`PATH`.
+            '';
+          };
+
+          name = mkOption {
+            type = types.str;
+            description = ''
+              The name of the plugin.
+
+              Don't forget to add {option}`file`
+              if the script name does not follow convention.
+            '';
+          };
+
+          file = mkOption {
+            type = types.str;
+            description = "The plugin script to source.";
+          };
+        };
+
+        config.file = lib.mkDefault "${config.name}.plugin.zsh";
+      });
+
+      ohMyZshModule = types.submodule {
+        options = {
+          enable = mkEnableOption "oh-my-zsh";
+
+          package = lib.mkPackageOption pkgs "oh-my-zsh" { };
+
+          plugins = mkOption {
+            default = [];
+            example = [ "git" "sudo" ];
+            type = types.listOf types.str;
+            description = ''
+              List of oh-my-zsh plugins
+            '';
+          };
+
+          custom = mkOption {
+            default = "";
+            type = types.str;
+            example = "$HOME/my_customizations";
+            description = ''
+              Path to a custom oh-my-zsh package to override config of
+              oh-my-zsh. See <https://github.com/robbyrussell/oh-my-zsh/wiki/Customization>
+              for more information.
+            '';
+          };
+
+          theme = mkOption {
+            default = "";
+            example = "robbyrussell";
+            type = types.str;
+            description = ''
+              Name of the theme to be used by oh-my-zsh.
+            '';
+          };
+
+          extraConfig = mkOption {
+            default = "";
+            example = ''
+              zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
+            '';
+            type = types.lines;
+            description = ''
+              Extra settings for plugins.
+            '';
+          };
+        };
+      };
+
+      historySubstringSearchModule = types.submodule {
+        options = {
+          enable = mkEnableOption "history substring search";
+          searchUpKey = mkOption {
+            type = with types; either (listOf str) str ;
+            default = [ "^[[A" ];
+            description = ''
+              The key codes to be used when searching up.
+              The default of `^[[A` may correspond to the UP key -- if not, try
+              `$terminfo[kcuu1]`.
+            '';
+          };
+          searchDownKey = mkOption {
+            type = with types; either (listOf str) str ;
+            default = [ "^[[B" ];
+            description = ''
+              The key codes to be used when searching down.
+              The default of `^[[B` may correspond to the DOWN key -- if not, try
+              `$terminfo[kcud1]`.
+            '';
+          };
+        };
+      };
+
+      syntaxHighlightingModule = types.submodule {
+        options = {
+          enable = mkEnableOption "zsh syntax highlighting";
+
+          package = lib.mkPackageOption pkgs "zsh-syntax-highlighting" { };
+
+          highlighters = mkOption {
+            type = types.listOf types.str;
+            default = [ ];
+            example = [ "brackets" ];
+            description = ''
+              Highlighters to enable
+              See the list of highlighters: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md>
+            '';
+          };
+
+          patterns = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            example = { "rm -rf *" = "fg=white,bold,bg=red"; };
+            description = ''
+              Custom syntax highlighting for user-defined patterns.
+              Reference: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md>
+            '';
+          };
+
+          styles = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            example = { comment = "fg=black,bold"; };
+            description = ''
+              Custom styles for syntax highlighting.
+              See each highlighter style option: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md>
+            '';
+          };
+        };
+      };
+    in {
     programs.zsh = {
       enable = mkEnableOption "Z shell (Zsh)";
 
@@ -709,7 +710,7 @@ in
             lib.escapeShellArg
             "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"
           }"}
-          ${if lib.versionAtLeast config.home.stateVersion "20.03" then
+          ${if lib.versionAtLeast stateVersion "20.03" then
             ''HISTFILE="${cfg.history.path}"''
           else
             ''HISTFILE="$HOME/${cfg.history.path}"''}

From 5d5116286269c4e11976f6450afde1b30c3834c0 Mon Sep 17 00:00:00 2001
From: Jdogzz <2792697+Jdogzz@users.noreply.github.com>
Date: Thu, 13 Mar 2025 11:28:47 -0700
Subject: [PATCH 539/546] syncthing: have tray wait in submodule (#6617)

Add --wait flag to tray to avoid loading before bar.
---
 modules/services/syncthing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 0370dceae..bab71518a 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -608,8 +608,8 @@ in {
 
               command = mkOption {
                 type = str;
-                default = "syncthingtray";
-                defaultText = literalExpression "syncthingtray";
+                default = "syncthingtray --wait";
+                defaultText = literalExpression "syncthingtray --wait";
                 example = literalExpression "qsyncthingtray";
                 description = "Syncthing tray command to use.";
               };

From 0e46e84279d3d8eb7dcb044cb8aa9baa93298e66 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 11:10:14 -0500
Subject: [PATCH 540/546] zsh: cleanup empty / wrong generated lines

We currently just insert a ton of empty lines when not using certain
options. We also incorrectly generate some notes for options not being
used.
---
 modules/programs/zsh.nix | 80 +++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 141b6f12d..9d2631ace 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -627,16 +627,18 @@ in
       programs.zsh.initContent = lib.mkMerge [
         # zprof must be loaded before everything else, since it
         # benchmarks the shell initialization.
-        (mkOrder 400 (optionalString cfg.zprof.enable ''
+        (lib.mkIf cfg.zprof.enable (mkOrder 400 ''
           zmodload zsh/zprof
         ''))
 
-        (mkOrder 550 cfg.initExtraFirst)
+        (lib.mkIf (cfg.initExtraFirst != "") (mkOrder 550 cfg.initExtraFirst))
+
         (mkOrder 600 "typeset -U path cdpath fpath manpath")
 
-        (mkOrder 650 (optionalString (cfg.cdpath != [ ]) ''
+        (lib.mkIf (cfg.cdpath != [ ]) (mkOrder 650 ''
           cdpath+=(${concatStringsSep " " cfg.cdpath})
         ''))
+
         (mkOrder 700 ''
           for profile in ''${(z)NIX_PROFILES}; do
             fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions)
@@ -645,41 +647,38 @@ in
           HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help"
         '')
 
-        (mkOrder 750 (optionalString (cfg.defaultKeymap != null) ''
+        (lib.mkIf (cfg.defaultKeymap != null) (mkOrder 750 ''
           # Use ${cfg.defaultKeymap} keymap as the default.
           ${lib.getAttr cfg.defaultKeymap bindkeyCommands}
         ''))
 
-        (mkOrder 800 localVarsStr)
-        (mkOrder 850 cfg.initExtraBeforeCompInit)
+        (lib.mkIf (localVarsStr != "") (mkOrder 800 localVarsStr))
 
-        (mkOrder 900 (lib.concatStrings (map (plugin: ''
+        (lib.mkIf (cfg.initExtraBeforeCompInit != "") (mkOrder 850 cfg.initExtraBeforeCompInit))
+
+        (lib.mkIf (cfg.plugins != []) (mkOrder 900 (lib.concatStrings (map (plugin: ''
           path+="$HOME/${pluginsDir}/${plugin.name}"
           fpath+="$HOME/${pluginsDir}/${plugin.name}"
-        '') cfg.plugins)))
+        '') cfg.plugins))))
 
-        (mkOrder 950 ''
-          # Oh-My-Zsh/Prezto calls compinit during initialization,
-          # calling it twice causes slight start up slowdown
-          # as all $fpath entries will be traversed again.
-          ${optionalString
-          (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
-          cfg.completionInit}'')
+        # NOTE: Oh-My-Zsh/Prezto calls compinit during initialization,
+        # calling it twice causes slight start up slowdown
+        # as all $fpath entries will be traversed again.
+        (lib.mkIf (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
+          (mkOrder 950 cfg.completionInit))
 
-        (mkOrder 1000 (optionalString cfg.autosuggestion.enable ''
+        (lib.mkIf cfg.autosuggestion.enable (mkOrder 1000 ''
           source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
           ${optionalString (cfg.autosuggestion.strategy != [ ]) ''
             ZSH_AUTOSUGGEST_STRATEGY=(${
               concatStringsSep " " cfg.autosuggestion.strategy
             })
+          ''}${optionalString (cfg.autosuggestion.highlight != null) ''
+            ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"
           ''}
         ''))
-        (mkOrder 1050 (optionalString
-          (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
-            ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"
-          ''))
 
-        (mkOrder 1100 (optionalString cfg.oh-my-zsh.enable ''
+        (lib.mkIf cfg.oh-my-zsh.enable (mkOrder 1100 ''
           # oh-my-zsh extra settings for plugins
           ${cfg.oh-my-zsh.extraConfig}
           # oh-my-zsh configuration generated by NixOS
@@ -691,16 +690,14 @@ in
           ''ZSH_THEME="${cfg.oh-my-zsh.theme}"''}
           source $ZSH/oh-my-zsh.sh
         ''))
-        (mkOrder 1150 ''
-          ${optionalString cfg.prezto.enable (builtins.readFile
-            "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")}
 
-          ${lib.concatStrings (map (plugin: ''
+        (mkOrder 1150 ((optionalString cfg.prezto.enable (builtins.readFile
+          "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc"))
+          + (lib.concatStrings (map (plugin: ''
             if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
               source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}"
             fi
-          '') cfg.plugins)}
-
+          '') cfg.plugins)) + ''
           # History options should be set in .zshrc and after oh-my-zsh sourcing.
           # See https://github.com/nix-community/home-manager/issues/177.
           HISTSIZE="${toString cfg.history.size}"
@@ -727,21 +724,23 @@ in
           ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY
           ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY
           ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""}
-        '')
+        ''))
 
-        (mkOrder 1200 cfg.initExtra)
+        (lib.mkIf (cfg.initExtra != "") (mkOrder 1200 cfg.initExtra))
 
-        # Aliases
-        (mkOrder 1250 aliasesStr)
-        (mkOrder 1250 (concatStringsSep "\n" (lib.mapAttrsToList
-          (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
-          cfg.shellGlobalAliases)))
-        (mkOrder 1300 ''
+        (lib.mkIf (aliasesStr != "" || cfg.shellGlobalAliases != {}) (mkOrder 1250
+          ((optionalString (aliasesStr != "") aliasesStr) +
+           (optionalString (cfg.shellGlobalAliases != {})
+             (concatStringsSep "\n" (lib.mapAttrsToList
+               (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
+               cfg.shellGlobalAliases))))))
+
+        (lib.mkIf (dirHashesStr != "") (mkOrder 1300 ''
           # Named Directory Hashes
           ${dirHashesStr}
-        '')
+        ''))
 
-        (mkOrder 1350 (optionalString cfg.syntaxHighlighting.enable
+        (lib.mkIf cfg.syntaxHighlighting.enable (mkOrder 1350
           # Load zsh-syntax-highlighting after all custom widgets have been created
           # https://github.com/zsh-users/zsh-syntax-highlighting#faq
           ''
@@ -759,8 +758,7 @@ in
             )}
           ''))
 
-        (mkOrder 1400 (optionalString
-          (cfg.historySubstringSearch.enable or false)
+        (lib.mkIf (cfg.historySubstringSearch.enable or false) (mkOrder 1400
           # Load zsh-history-substring-search after zsh-syntax-highlighting
           # https://github.com/zsh-users/zsh-history-substring-search#usage
           ''
@@ -773,9 +771,7 @@ in
             (lib.toList cfg.historySubstringSearch.searchDownKey)}
           ''))
 
-        (mkOrder 1450 (optionalString cfg.zprof.enable ''
-          zprof
-        ''))
+        (lib.mkIf cfg.zprof.enable (mkOrder 1450 "zprof"))
       ];
 
       home.file."${relToDotDir ".zshrc"}".text = cfg.initContent;

From 0b0baed7b2bf6a5e365d4cba042b580a2bc32e34 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 14:05:30 -0500
Subject: [PATCH 541/546] tests/default: blacklist sapling

broken atm
---
 tests/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/default.nix b/tests/default.nix
index 05036d6a7..bc2124e69 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -93,6 +93,7 @@ let
       "pls"
       "pyenv"
       "sagemath"
+      "sapling"
       "scmpuff"
       "sm64ex"
       "thefuck"

From 8f8f5432d152d64dfde0e77c61530c3754dce660 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 14:41:23 -0500
Subject: [PATCH 542/546] tests/zsh: fix zshrc content priority test

Previous test didn't verify they were actually in correct order,
updating test to check configuration is generated, as expected.
---
 .../programs/zsh/zshrc-content-priorities.nix | 58 +++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/tests/modules/programs/zsh/zshrc-content-priorities.nix b/tests/modules/programs/zsh/zshrc-content-priorities.nix
index 5245bef58..f5479541e 100644
--- a/tests/modules/programs/zsh/zshrc-content-priorities.nix
+++ b/tests/modules/programs/zsh/zshrc-content-priorities.nix
@@ -1,4 +1,4 @@
-{ lib, ... }: {
+{ lib, pkgs, ... }: {
   programs.zsh = {
     enable = true;
 
@@ -22,15 +22,53 @@
     zprof.enable = true;
   };
 
-  nmt.script = ''
+  nmt.script = let
+    expectedFile = pkgs.writeTextFile {
+      name = ".zshrc";
+      text = ''
+        zmodload zsh/zprof
+
+        # High priority (mkBefore)
+        echo "High priority content"
+
+        typeset -U path cdpath fpath manpath
+        for profile in ''${(z)NIX_PROFILES}; do
+          fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions)
+        done
+
+        HELPDIR="@zsh@/share/zsh/$ZSH_VERSION/help"
+
+        autoload -U compinit && compinit
+        # Default priority
+        echo "Default priority content"
+
+        # History options should be set in .zshrc and after oh-my-zsh sourcing.
+        # See https://github.com/nix-community/home-manager/issues/177.
+        HISTSIZE="10000"
+        SAVEHIST="10000"
+
+        HISTFILE="$HOME/.zsh_history"
+        mkdir -p "$(dirname "$HISTFILE")"
+
+        setopt HIST_FCNTL_LOCK
+        unsetopt APPEND_HISTORY
+        setopt HIST_IGNORE_DUPS
+        unsetopt HIST_IGNORE_ALL_DUPS
+        unsetopt HIST_SAVE_NO_DUPS
+        unsetopt HIST_FIND_NO_DUPS
+        setopt HIST_IGNORE_SPACE
+        unsetopt HIST_EXPIRE_DUPS_FIRST
+        setopt SHARE_HISTORY
+        unsetopt EXTENDED_HISTORY
+
+
+        zprof
+        # Low priority (mkAfter)
+        echo "Low priority content"
+      '';
+    };
+  in ''
     assertFileExists home-files/.zshrc
-
-    assertFileContains home-files/.zshrc "zmodload zsh/zprof"
-    assertFileContains home-files/.zshrc "High priority content"
-    assertFileContains home-files/.zshrc "Default priority content"
-    assertFileContains home-files/.zshrc "Low priority content"
-
-    assertFileRegex home-files/.zshrc '^zmodload zsh/zprof'
-    assertFileRegex home-files/.zshrc 'echo "Low priority content"$'
+    assertFileContent home-files/.zshrc ${expectedFile}
   '';
 }

From 6914c15c09e3e635ce678eb72f5781e5a85a6b24 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 15:12:40 -0500
Subject: [PATCH 543/546] tests/default: scrub zsh

test expects scrubbed version
---
 tests/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/default.nix b/tests/default.nix
index bc2124e69..a92df8331 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -101,6 +101,7 @@ let
       "yubikey-agent"
       "zellij"
       "zplug"
+      "zsh"
     ];
 
     inner = self: super:

From 30cce6848a5aa41ceb5fb33185b84868cc3e9bef Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 14 Mar 2025 01:11:20 +0000
Subject: [PATCH 544/546] synthing: fix synthing config being deleted on
 rebuild (#6621)

---
 modules/services/syncthing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index bab71518a..02d6c96c7 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -706,7 +706,7 @@ in {
         };
 
         syncthing-init = {
-          enable = true;
+          enable = cleanedConfig != { };
           config = {
             ProgramArguments = [ "${updateConfig}" ];
             WatchPaths = [

From e30c6a41bc8548738341d10c0b17f8fead8e55ee Mon Sep 17 00:00:00 2001
From: CnTeng <rxsnakepi@gmail.com>
Date: Fri, 14 Mar 2025 13:17:43 +0800
Subject: [PATCH 545/546] megasync: remove with lib

---
 modules/services/megasync.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/modules/services/megasync.nix b/modules/services/megasync.nix
index 03eab490a..b058c01d6 100644
--- a/modules/services/megasync.nix
+++ b/modules/services/megasync.nix
@@ -1,23 +1,17 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.megasync;
-
+let cfg = config.services.megasync;
 in {
-  meta.maintainers = [ maintainers.GaetanLepage ];
+  meta.maintainers = [ lib.maintainers.GaetanLepage ];
 
   options = {
     services.megasync = {
-      enable = mkEnableOption "Megasync client";
+      enable = lib.mkEnableOption "Megasync client";
 
-      package = mkPackageOption pkgs "megasync" { };
+      package = lib.mkPackageOption pkgs "megasync" { };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
       (lib.hm.assertions.assertPlatform "services.megasync" pkgs
         lib.platforms.linux)

From 4e12151c9e014e2449e0beca2c0e9534b96a26b4 Mon Sep 17 00:00:00 2001
From: CnTeng <rxsnakepi@gmail.com>
Date: Fri, 14 Mar 2025 13:19:29 +0800
Subject: [PATCH 546/546] megasync: add option to enable wayland

---
 modules/services/megasync.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/services/megasync.nix b/modules/services/megasync.nix
index b058c01d6..19258e5dd 100644
--- a/modules/services/megasync.nix
+++ b/modules/services/megasync.nix
@@ -8,6 +8,13 @@ in {
       enable = lib.mkEnableOption "Megasync client";
 
       package = lib.mkPackageOption pkgs "megasync" { };
+
+      forceWayland = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        example = true;
+        description = "Force Megasync to run on wayland";
+      };
     };
   };
 
@@ -28,7 +35,11 @@ in {
 
       Install = { WantedBy = [ "graphical-session.target" ]; };
 
-      Service = { ExecStart = "${cfg.package}/bin/megasync"; };
+      Service = {
+        Environment =
+          lib.optionals cfg.forceWayland [ "DO_NOT_UNSET_XDG_SESSION_TYPE=1" ];
+        ExecStart = lib.getExe' cfg.package "megasync";
+      };
     };
   };
 }