WIP home-manager: use putter for file management

2026-01-11 17:39:37 +08:00 · 2025-12-16 18:49:58 +01:00
161 changed files with 2325 additions and 3294 deletions
--- a/all-maintainers.nix
+++ b/all-maintainers.nix
@@ -1097,6 +1097,19 @@
    name = "Hoang Nguyen";
    source = "home-manager";
  };
+  foo-dogsquared = {
+    email = "foodogsquared@foodogsquared.one";
+    github = "foo-dogsquared";
+    githubId = 34962634;
+    keys = [
+      {
+        fingerprint = "DDD7 D0BD 602E 564B AA04  FC35 1431 0D91 4115 2B92";
+      }
+    ];
+    matrix = "@foodogsquared:matrix.org";
+    name = "Gabriel Arazas";
+    source = "nixpkgs";
+  };
  fpob = {
    email = "fpob@proton.me";
    github = "fpob";
@@ -2065,7 +2078,7 @@
    source = "nixpkgs";
  };
  shikanime = {
-    email = "william.phetsinorath@shikanime.studio";
+    email = "deva.shikanime@protonmail.com";
    github = "shikanime";
    githubId = 22115108;
    name = "William Phetsinorath";
--- a/docs/manual/faq/session-variables.md
+++ b/docs/manual/faq/session-variables.md
@@ -17,11 +17,8 @@ way. In Bash and Z shell this can be done by adding
 to your `.profile` and `.zshrc` files, respectively. The
 `hm-session-vars.sh` file should work in most Bourne-like shells. For
 fish shell, it is possible to source it using [the foreign-env
-plugin](https://github.com/oh-my-fish/plugin-foreign-env) or using the builtin
-[babelfish](https://github.com/bouk/babelfish)-translated variables:
+plugin](https://github.com/oh-my-fish/plugin-foreign-env)

 ``` bash
 fenv source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" > /dev/null
-# or
-source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.fish"
 ```
--- a/docs/release-notes/rl-2305.md
+++ b/docs/release-notes/rl-2305.md
@@ -57,9 +57,3 @@ changes are only active if the `home.stateVersion` option is set to

    now default to `true` which is consistent with the default values
    for those options used by `i3` and `sway`.
-
-   The [](#opt-programs.swaylock.enable) option now defaults to `false`
-    and must be explicitly enabled. Previously, it would be implicitly
-    enabled when `programs.swaylock.settings` was non-empty. Users with
-    `home.stateVersion` set to earlier versions will continue to get the
-    old implicit behavior.
--- a/docs/release-notes/rl-2505.md
+++ b/docs/release-notes/rl-2505.md
@@ -27,8 +27,4 @@ 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.

- The [](#opt-programs.git.signing.format) option no longer defaults to
-  `"openpgp"`. Users who use Git signing with GPG should explicitly set
-  this option to `"openpgp"` to maintain the previous behavior. Users
-  with `home.stateVersion` set to earlier versions will continue to get
-  the `"openpgp"` default for backwards compatibility.
+- No changes.
--- a/docs/release-notes/rl-2511.md
+++ b/docs/release-notes/rl-2511.md
@@ -80,10 +80,3 @@ changes are only active if the `home.stateVersion` option is set to
  `{ PASSWORD_STORE_DIR = $XDG_DATA_HOME/password-store; }` anymore by its
  default value. This will revert to the default behaviour of the program,
  namely `$HOME/.password-store` to be used as the store path.
-
- On macOS, [](#opt-targets.darwin.copyApps.enable) is now enabled by
-  default instead of [](#opt-targets.darwin.linkApps.enable). This means
-  applications from `home.packages` will be copied to
-  `~/Applications/Home Manager Apps` rather than symlinked, making them
-  work properly with Spotlight. Users with `home.stateVersion` set to
-  earlier versions will continue to use `linkApps` by default.
--- a/docs/release-notes/rl-2605.md
+++ b/docs/release-notes/rl-2605.md
@@ -7,19 +7,11 @@ section is therefore not final.

 This release has the following notable changes:

- The [](#opt-programs.anki.uiScale) option now expects a value in the
-  range 1.0–2.0, previously it erroneously expected values in the
-  range `0.0–1.0`.
-
 ## State Version Changes {#sec-release-26.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
 \"26.05\" or later.

- The [](#opt-gtk.gtk4.theme) option does not mirror
-  [](#opt-gtk.theme) by default anymore.
-
- The [](#opt-programs.zsh.dotDir) option now defaults to the XDG
-  configuration directory (usually `~/.config/zsh`) when
-  [](#opt-xdg.enable) is true.
+- The `gtk.gtk4.theme` option does not mirror `gtk.theme` by default
+  anymore.
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,112 @@
 {
  "nodes": {
+    "crane": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": [
+          "putter",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "putter",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1697588719,
+        "narHash": "sha256-n9ALgm3S+ygpzjesBkB9qutEtM4dtIkhn8WnstCPOew=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "da6b58e270d339a78a6e95728012ec2eea879612",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "ref": "v0.14.3",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696267196,
+        "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "putter",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1767767207,
-        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
        "type": "github"
      },
      "original": {
@@ -16,9 +116,133 @@
        "type": "github"
      }
    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1699094435,
+        "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": [
+          "putter",
+          "flake-utils"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "putter",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1698852633,
+        "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "putter": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
+      "locked": {
+        "lastModified": 1704013409,
+        "narHash": "sha256-v7CTHSKcD6vnIwXRPav+3XETf+uNJz3G+RUF/SHZ+vE=",
+        "ref": "refs/heads/master",
+        "rev": "4d773d3aa9feca3af4578dc62cc6f91ebb16b002",
+        "revCount": 33,
+        "type": "git",
+        "url": "file:///home/rycee/devel/putter"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/rycee/devel/putter"
+      }
+    },
    "root": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "putter": "putter"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "putter",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "putter",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696299134,
+        "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,13 @@
  description = "Home Manager for Nix";

  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.putter.url = "git+file:///home/rycee/devel/putter";

  outputs =
    {
      self,
      nixpkgs,
+      putter,
      ...
    }:
    {
--- a/home-manager/po/fo.po
+++ b/home-manager/po/fo.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-07-22 10:59+0200\n"
-"PO-Revision-Date: 2026-01-07 17:01+0000\n"
+"PO-Revision-Date: 2025-11-30 14:00+0000\n"
 "Last-Translator: Brian E <brianellingsgaard9@gmail.com>\n"
 "Language-Team: Faroese <https://hosted.weblate.org/projects/home-manager/cli/"
 "fo/>\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.15.1\n"
+"X-Generator: Weblate 5.15-dev\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
@@ -41,12 +41,10 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
-"At hava Heimvørðurin %s í %s er fyrnast,\n"
-"vinarliga flyt hann til %s"

 #: home-manager/home-manager:99
 msgid "No configuration file found. Please create one at %s"
-msgstr "Eingin samansetingsfíla funni. Vinarliga stovna ein hjá %s"
+msgstr ""

 #: home-manager/home-manager:114
 msgid "Home Manager not found at %s."
--- a/home-manager/po/zh_Hant.po
+++ b/home-manager/po/zh_Hant.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-07-22 10:59+0200\n"
-"PO-Revision-Date: 2025-12-04 09:16+0000\n"
+"PO-Revision-Date: 2025-12-04 04:17+0000\n"
 "Last-Translator: \"Urocissa Caerulea.Tw\" <urocissa.tw@proton.me>\n"
 "Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/"
 "projects/home-manager/cli/zh_Hant/>\n"
@@ -215,7 +215,7 @@ msgstr "沒有即將過期的世代"

 #: home-manager/home-manager:877
 msgid "No home-manager packages seem to be installed."
-msgstr "似乎沒有安裝 home-manager 套件。"
+msgstr "似乎沒有安裝 home-manager 軟體包。"

 #: home-manager/home-manager:962
 msgid "Unknown argument %s"
@@ -223,11 +223,11 @@ msgstr "未知引數 %s"

 #: home-manager/home-manager:987
 msgid "This will remove Home Manager from your system."
-msgstr "這將會從您的系統中移除 Home Manager。"
+msgstr "這將會從系統中移除 Home Manager。"

 #: home-manager/home-manager:990
 msgid "This is a dry run, nothing will actually be uninstalled."
-msgstr "這是模擬執行，實際上並不會解除安裝任何內容。"
+msgstr "這是試執行結果，沒有實際解除安裝任何軟體包。"

 #: home-manager/home-manager:994
 msgid "Really uninstall Home Manager?"
@@ -235,27 +235,27 @@ msgstr "確定要解除安裝 Home Manager 嗎？"

 #: home-manager/home-manager:1000
 msgid "Switching to empty Home Manager configuration..."
-msgstr "正在切換至空的 Home Manager 設定..."
+msgstr "正在切換至空的 Home Manager 配置 ..."

 #: home-manager/home-manager:1015
 msgid "Yay!"
-msgstr "太好了！"
+msgstr "好耶！"

 #: home-manager/home-manager:1020
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
-msgstr "Home Manager 已解除安裝，但您的 home.nix 保持不變。"
+msgstr "Home Manager 已解除安裝，但未改動您的 home.nix 配置檔案。"

 #: home-manager/home-manager:1285
 msgid "expire-generations expects one argument, got %d."
-msgstr "expire-generations 預期一個引數，但得到了 %d 個。"
+msgstr "expire-generations 須要一個引數，但獲取到了 %d 個。"

 #: home-manager/home-manager:1310
 msgid "Unknown command: %s"
-msgstr "未知指令：%s"
+msgstr "未知命令：%s"

 #: home-manager/install.nix:21
 msgid "This derivation is not buildable, please run it using nix-shell."
-msgstr "此 derivation 無法建置，請使用 nix-shell 執行。"
+msgstr "此配置檔案/變體不可構建，請在 nix-shell 中執行它。"

 #, sh-format
 #~ msgid "Please set the $EDITOR environment variable"
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -2,6 +2,7 @@
  pkgs,
  config,
  lib,
+  putter,
  ...
 }:

@@ -30,6 +31,8 @@ let
        name = sourceName;
      };

+  putterStatePath = "${config.xdg.stateHome}/home-manager/putter-state.json";
+
 in

 {
@@ -45,6 +48,14 @@ in
      internal = true;
      description = "Package to contain all home files";
    };
+
+    home.internal = {
+      filePutterConfig = lib.mkOption {
+        type = lib.types.package;
+        internal = true;
+        description = "Putter configuration.";
+      };
+    };
  };

  config = {
@@ -91,156 +102,17 @@ in

    # This verifies that the links we are about to create will not
    # overwrite an existing file.
-    home.activation.checkLinkTargets = lib.hm.dag.entryBefore [ "writeBoundary" ] (
-      let
-        # Paths that should be forcibly overwritten by Home Manager.
-        # Caveat emptor!
-        forcedPaths = lib.concatMapStringsSep " " (p: ''"$HOME"/${lib.escapeShellArg p}'') (
-          lib.mapAttrsToList (n: v: v.target) (lib.filterAttrs (n: v: v.force) cfg)
-        );
+    home.activation.checkLinkTargets = lib.hm.dag.entryBefore [ "writeBoundary" ] ''
+      ${lib.getExe putter} check -v \
+        --state-file "${putterStatePath}" \
+        ${config.home.internal.filePutterConfig}
+    '';

-        storeDir = lib.escapeShellArg builtins.storeDir;
-
-        check = pkgs.replaceVars ./files/check-link-targets.sh {
-          inherit (config.lib.bash) initHomeManagerLib;
-          inherit forcedPaths storeDir;
-        };
-      in
-      ''
-        function checkNewGenCollision() {
-          local newGenFiles
-          newGenFiles="$(readlink -e "$newGenPath/home-files")"
-          find "$newGenFiles" \( -type f -or -type l \) \
-              -exec bash ${check} "$newGenFiles" {} +
-        }
-
-        checkNewGenCollision || exit 1
-      ''
-    );
-
-    # This activation script will
-    #
-    # 1. Remove files from the old generation that are not in the new
-    #    generation.
-    #
-    # 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
-    # generation A to generation B having sets of home file links FA
-    # and FB, respectively then cleaning before linking produces state
-    # transitions similar to
-    #
-    #      FA   →   FA ∩ FB   →   (FA ∩ FB) ∪ FB = FB
-    #
-    # 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 = lib.hm.dag.entryAfter [ "writeBoundary" ] (
-      let
-        link = pkgs.writeShellScript "link" ''
-          ${config.lib.bash.initHomeManagerLib}
-
-          newGenFiles="$1"
-          shift
-          for sourcePath in "$@" ; do
-            relativePath="''${sourcePath#$newGenFiles/}"
-            targetPath="$HOME/$relativePath"
-            if [[ -e "$targetPath" && ! -L "$targetPath" ]] ; then
-              if [[ -n "$HOME_MANAGER_BACKUP_COMMAND" ]] ; then
-                verboseEcho "Running $HOME_MANAGER_BACKUP_COMMAND $targetPath."
-                run $HOME_MANAGER_BACKUP_COMMAND "$targetPath" || errorEcho "Running `$HOME_MANAGER_BACKUP_COMMAND` on '$targetPath' failed."
-              elif [[ -n "$HOME_MANAGER_BACKUP_EXT" ]] ; then
-                # The target exists, back it up
-                backup="$targetPath.$HOME_MANAGER_BACKUP_EXT"
-                if [[ -e "$backup" && -n "$HOME_MANAGER_BACKUP_OVERWRITE" ]]; then
-                  run rm $VERBOSE_ARG "$backup"
-                fi
-                run mv $VERBOSE_ARG "$targetPath" "$backup" || errorEcho "Moving '$targetPath' failed!"
-              fi
-            fi
-
-            if [[ -e "$targetPath" && ! -L "$targetPath" ]] && cmp -s "$sourcePath" "$targetPath" ; then
-              # The target exists but is identical – don't do anything.
-              verboseEcho "Skipping '$targetPath' as it is identical to '$sourcePath'"
-            else
-              # Place that symlink, --force
-              # This can still fail if the target is a directory, in which case we bail out.
-              run mkdir -p $VERBOSE_ARG "$(dirname "$targetPath")"
-              run ln -Tsf $VERBOSE_ARG "$sourcePath" "$targetPath" || exit 1
-            fi
-          done
-        '';
-
-        cleanup = pkgs.writeShellScript "cleanup" ''
-          ${config.lib.bash.initHomeManagerLib}
-
-          # A symbolic link whose target path matches this pattern will be
-          # considered part of a Home Manager generation.
-          homeFilePattern="$(readlink -e ${lib.escapeShellArg builtins.storeDir})/*-home-manager-files/*"
-
-          newGenFiles="$1"
-          shift 1
-          for relativePath in "$@" ; do
-            targetPath="$HOME/$relativePath"
-            if [[ -e "$newGenFiles/$relativePath" ]] ; then
-              verboseEcho "Checking $targetPath: exists"
-            elif [[ ! "$(readlink "$targetPath")" == $homeFilePattern ]] ; then
-              warnEcho "Path '$targetPath' does not link into a Home Manager generation. Skipping delete."
-            else
-              verboseEcho "Checking $targetPath: gone (deleting)"
-              run rm $VERBOSE_ARG "$targetPath"
-
-              # Recursively delete empty parent directories.
-              targetDir="$(dirname "$relativePath")"
-              if [[ "$targetDir" != "." ]] ; then
-                pushd "$HOME" > /dev/null
-
-                # Call rmdir with a relative path excluding $HOME.
-                # Otherwise, it might try to delete $HOME and exit
-                # with a permission error.
-                run rmdir $VERBOSE_ARG \
-                    -p --ignore-fail-on-non-empty \
-                    "$targetDir"
-
-                popd > /dev/null
-              fi
-            fi
-          done
-        '';
-      in
-      ''
-        function linkNewGen() {
-          _i "Creating home file links in %s" "$HOME"
-
-          local newGenFiles
-          newGenFiles="$(readlink -e "$newGenPath/home-files")"
-          find "$newGenFiles" \( -type f -or -type l \) \
-            -exec bash ${link} "$newGenFiles" {} +
-        }
-
-        function cleanOldGen() {
-          if [[ ! -v oldGenPath || ! -e "$oldGenPath/home-files" ]] ; then
-            return
-          fi
-
-          _i "Cleaning up orphan links from %s" "$HOME"
-
-          local newGenFiles oldGenFiles
-          newGenFiles="$(readlink -e "$newGenPath/home-files")"
-          oldGenFiles="$(readlink -e "$oldGenPath/home-files")"
-
-          # Apply the cleanup script on each leaf in the old
-          # generation. The find command below will print the
-          # relative path of the entry.
-          find "$oldGenFiles" '(' -type f -or -type l ')' -printf '%P\0' \
-            | xargs -0 bash ${cleanup} "$newGenFiles"
-        }
-
-        cleanOldGen
-        linkNewGen
-      ''
-    );
+    home.activation.linkGeneration = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      ${lib.getExe putter} apply $VERBOSE_ARG -v ''${DRY_RUN:+--dry-run} \
+        --state-file "${putterStatePath}" \
+        ${config.home.internal.filePutterConfig}
+    '';

    home.activation.checkFilesChanged = lib.hm.dag.entryBefore [ "linkGeneration" ] (
      let
@@ -286,6 +158,18 @@ in
      '') (lib.filter (v: v.onChange != "") (lib.attrValues cfg))
    );

+    home.internal.filePutterConfig =
+      let
+        putter = import ./lib/putter.nix { inherit lib; };
+        manifest = putter.mkPutterManifest {
+          inherit putterStatePath;
+          sourceBaseDirectory = config.home-files;
+          targetBaseDirectory = config.home.homeDirectory;
+          fileEntries = attrValues cfg;
+        };
+      in
+      pkgs.writeText "hm-putter.json" manifest;
+
    # Symlink directories and files that have the right execute bit.
    # Copy files that need their execute bit changed.
    home-files =
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -906,6 +906,7 @@ in
            --subst-var-by GENERATION_DIR $out

          ln -s ${config.home-files} $out/home-files
+          ln -s ${config.home.internal.filePutterConfig} $out/putter.json
          ln -s ${cfg.path} $out/home-path

          cp "$extraDependenciesPath" "$out/extra-dependencies"
--- a/modules/launchd/default.nix
+++ b/modules/launchd/default.nix
@@ -270,7 +270,9 @@ in
            setupLaunchAgents

            # Restore errexit
-            set -e
+            if [[ -o errexit ]]; then
+              set -e
+            fi
          '';
    })
  ];
--- a/modules/lib/darwin.nix
+++ b/modules/lib/darwin.nix
@@ -63,12 +63,12 @@ let
  intervalsString = lib.concatStringsSep ", " intervals;

  assertInterval = option: interval: pkgs: {
-    assertion = pkgs.stdenv.isDarwin -> lib.elem interval intervals;
-    message = "On Darwin, ${option} must be one of: ${intervalsString}.";
+    assertion = (!pkgs.stdenv.isDarwin) || (lib.elem interval intervals);
+    message = "On Darwin ${option} must be one of: ${intervalsString}.";
  };

  intervalDocumentation = ''
-    On Darwin, it must be one of: ${intervalsString}, which are implemented as defined in {manpage}`systemd.time(7)`.
+    On Darwin it must be one of: ${intervalsString}, which are implemented as defined in {manpage}`systemd.time(7)`.
  '';
 in
 {
--- a/modules/lib/generators.nix
+++ b/modules/lib/generators.nix
@@ -21,7 +21,6 @@
        isList
        mapAttrsToList
        replicate
-        attrNames
        ;

      initialIndent = concatStrings (replicate indentLevel "  ");
@@ -29,36 +28,31 @@
      toHyprconf' =
        indent: attrs:
        let
-          isImportantField =
-            n: _: foldl (acc: prev: if hasPrefix prev n then true else acc) false importantPrefixes;
-          importantFields = filterAttrs isImportantField attrs;
-          withoutImportantFields = fields: removeAttrs fields (attrNames importantFields);
-
-          allSections = filterAttrs (n: v: isAttrs v || isList v) attrs;
-          sections = withoutImportantFields allSections;
+          sections = filterAttrs (n: v: isAttrs v || (isList v && all isAttrs v)) attrs;

          mkSection =
            n: attrs:
-            if isList attrs then
-              let
-                separator = if all isAttrs attrs then "\n" else "";
-              in
-              (concatMapStringsSep separator (a: mkSection n a) attrs)
-            else if isAttrs attrs then
+            if lib.isList attrs then
+              (concatMapStringsSep "\n" (a: mkSection n a) attrs)
+            else
              ''
                ${indent}${n} {
                ${toHyprconf' "  ${indent}" attrs}${indent}}
-              ''
-            else
-              toHyprconf' indent { ${n} = attrs; };
+              '';

          mkFields = generators.toKeyValue {
            listsAsDuplicateKeys = true;
            inherit indent;
          };

-          allFields = filterAttrs (n: v: !(isAttrs v || isList v)) attrs;
-          fields = withoutImportantFields allFields;
+          allFields = filterAttrs (n: v: !(isAttrs v || (isList v && all isAttrs v))) attrs;
+
+          isImportantField =
+            n: _: foldl (acc: prev: if hasPrefix prev n then true else acc) false importantPrefixes;
+
+          importantFields = filterAttrs isImportantField allFields;
+
+          fields = builtins.removeAttrs allFields (mapAttrsToList (n: _: n) importantFields);
        in
        mkFields importantFields
        + concatStringsSep "\n" (mapAttrsToList mkSection sections)
--- a/modules/lib/putter.nix
+++ b/modules/lib/putter.nix
@@ -0,0 +1,81 @@
+# Contains some handy functions for generating Putter file manifests.
+
+{ lib }:
+
+let
+
+  inherit (lib)
+    concatMap
+    concatLists
+    mapAttrsToList
+    hasPrefix
+    filter
+    ;
+
+in
+{
+  # Converts a Home Manager style list of file specifications into a Putter
+  # configuration.
+  #
+  # Note, the interface of this function is not considered stable, it may change
+  # as the needs of Home Manager change.
+  mkPutterManifest =
+    {
+      putterStatePath,
+      sourceBaseDirectory,
+      targetBaseDirectory,
+      fileEntries,
+    }:
+    let
+      # Convert a directory to a Putter configuration. Basically, this will
+      # create a file entry for each file in the directory. Any sub-directories
+      # will be handled recursively.
+      mkDirEntry =
+        f:
+        concatLists (
+          mapAttrsToList (
+            n: v:
+            let
+              f' = f // {
+                source = "${f.source}/${n}";
+                target = "${f.target}/${n}";
+              };
+            in
+            mkEntriesForType f' v
+          ) (builtins.readDir f.source)
+        );
+
+      mkEntriesForType =
+        f: t:
+        if t == "regular" || t == "symlink" then
+          mkFileEntry f
+        else if t == "directory" then
+          mkDirEntry f
+        else
+          throw "unexpected file type ${t}";
+
+      # Create a file entry for the given file.
+      mkFileEntry = f: [
+        {
+          collision.resolution = if f.force then "force" else "abort";
+          action.type = "symlink";
+          source = "${sourceBaseDirectory}/${f.target}";
+          target = (if hasPrefix "/" f.target then "" else "${targetBaseDirectory}/") + f.target;
+        }
+      ];
+
+      # Given a Home Manager file entry, produce a list of Putter entries. For
+      # recursive HM file entries, we recursively traverse the source directory
+      # and generate a Putter entry for each file we encounter.
+      mkEntries = f: if f.recursive then mkEntriesForType f "directory" else mkFileEntry f;
+
+      putterJson = {
+        version = "1";
+        state = putterStatePath;
+        files = concatMap mkEntries (filter (f: f.enable) fileEntries);
+      };
+
+      putterJsonText = builtins.toJSON putterJson;
+    in
+    putterJsonText;
+}
--- a/modules/misc/news/2025/12/2025-12-27_13-32-14.nix
+++ b/modules/misc/news/2025/12/2025-12-27_13-32-14.nix
@@ -1,20 +0,0 @@
-{ config, ... }:
-{
-  time = "2025-12-27T19:00:00+00:00";
-  condition = config.programs.zsh.enable;
-
-  message = ''
-    The default value of `programs.zsh.dotDir` has changed.
-
-    When `home.stateVersion` is set to "26.05" or later, and `xdg.enable` is
-    `true` (the default), `programs.zsh.dotDir` now defaults to
-    `''${config.xdg.configHome}/zsh`. Previously, it defaulted to the home
-    directory.
-
-    This means your Zsh configuration files (`.zshrc`, `.zshenv`, etc.) will be
-    moved to `~/.config/zsh` (or your configured XDG config home).
-
-    If you prefer the old behavior, you can explicitly set:
-    `programs.zsh.dotDir = config.home.homeDirectory;`
-  '';
-}
--- a/modules/misc/news/2026/01/2026-01-02_00-03-48.nix
+++ b/modules/misc/news/2026/01/2026-01-02_00-03-48.nix
@@ -1,10 +0,0 @@
-{ config, ... }:
-{
-  time = "2026-01-02T00:03:48+00:00";
-  condition = config.services.mpd.enable;
-  message = ''
-    `MPD_HOST` and `MPD_PORT` environment variables are now set automatically.
-
-    This can be disabled with `services.mpd.enableSessionVariables = false`.
-  '';
-}
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -136,7 +136,7 @@ in
        xdg.stateHome = mkOptionDefault defaultStateHome;

        home.sessionVariables = variables;
-        systemd.user.sessionVariables = variables;
+        systemd.user.sessionVariables = mkIf pkgs.stdenv.hostPlatform.isLinux variables;
      }
    )

--- a/modules/misc/xfconf.nix
+++ b/modules/misc/xfconf.nix
@@ -135,7 +135,7 @@ in
    home.activation.xfconfSettings = lib.hm.dag.entryAfter [ "installPackages" ] (
      let
        mkCommand = channel: property: value: ''
-          run ${pkgs.xfconf}/bin/xfconf-query \
+          run ${pkgs.xfce.xfconf}/bin/xfconf-query \
            ${lib.escapeShellArgs (
              [
                "-c"
--- a/modules/po/fo.po
+++ b/modules/po/fo.po
@@ -8,7 +8,7 @@ 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-07-22 10:59+0200\n"
-"PO-Revision-Date: 2026-01-07 17:01+0000\n"
+"PO-Revision-Date: 2025-11-30 14:00+0000\n"
 "Last-Translator: Brian E <brianellingsgaard9@gmail.com>\n"
 "Language-Team: Faroese <https://hosted.weblate.org/projects/home-manager/"
 "modules/fo/>\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.15.1\n"
+"X-Generator: Weblate 5.15-dev\n"

 #: modules/files.nix:206
 msgid "Creating home file links in %s"
@@ -33,7 +33,7 @@ msgstr "Stovni nýggjan profil ættarlið"

 #: modules/home-environment.nix:650
 msgid "No change so reusing latest profile generation"
-msgstr "Eingin broyting. Seinastið umhvarv ættarlið er enn í brúk"
+msgstr ""

 #: modules/home-environment.nix:699
 msgid ""
--- a/modules/programs/anki/default.nix
+++ b/modules/programs/anki/default.nix
@@ -82,7 +82,7 @@ in
    };

    uiScale = lib.mkOption {
-      type = with lib.types; nullOr (numbers.between 1.0 2.0);
+      type = with lib.types; nullOr (numbers.between 0.0 1.0);
      default = null;
      example = 1.0;
      description = "User interface scale.";
--- a/modules/programs/anki/helper.nix
+++ b/modules/programs/anki/helper.nix
@@ -112,7 +112,7 @@ let

    answer_keys: tuple[tuple[int, str], ...] = (${
      lib.strings.concatMapStringsSep ", " (val: "(${toString val.ease}, '${val.key}')") cfg.answerKeys
-    }${if cfg.answerKeys != [ ] then "," else ""})
+    })
    for ease, key in answer_keys:
      profile_manager.set_answer_key(ease, key)

--- a/modules/programs/anyrun.nix
+++ b/modules/programs/anyrun.nix
@@ -185,7 +185,7 @@ in

    extraCss = mkOption {
      type = nullOr lines;
-      default = null;
+      default = "";
      description = ''
        Extra CSS lines to add to {file}`~/.config/anyrun/style.css`.
      '';
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -11,6 +11,7 @@ let
  tomlFormat = pkgs.formats.toml { };

  inherit (lib) mkIf mkOption types;
+  inherit (pkgs.stdenv) isLinux isDarwin;
 in
 {
  meta.maintainers = with lib.maintainers; [
@@ -220,82 +221,98 @@ in
          };
        }

-        (mkIf daemonCfg.enable {
-          assertions = [
+        (mkIf daemonCfg.enable (
+          lib.mkMerge [
            {
-              assertion = lib.versionAtLeast cfg.package.version "18.2.0";
-              message = ''
-                The Atuin daemon requires at least version 18.2.0 or later.
-              '';
-            }
-            {
-              assertion = config.systemd.user.enable || config.launchd.enable;
-              message = "The Atuin daemon can only be configured on systems with systemd or launchd.";
-            }
-          ];
-
-          programs.atuin.settings.daemon = {
-            enabled = true;
-            systemd_socket = config.systemd.user.enable;
-            socket_path = lib.mkIf (!config.systemd.user.enable) (
-              lib.mkDefault "${config.xdg.dataHome}/atuin/daemon.sock"
-            );
-          };
-
-          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 = lib.optionals (daemonCfg.logLevel != null) [ "ATUIN_LOG=${daemonCfg.logLevel}" ];
-              Restart = "on-failure";
-              RestartSteps = 3;
-              RestartMaxDelaySec = 6;
-            };
-          };
-
-          systemd.user.sockets.atuin-daemon =
-            let
-              socket_dir = if lib.versionAtLeast cfg.package.version "18.4.0" then "%t" else "%D/atuin";
-            in
-            {
-              Unit = {
-                Description = "Atuin daemon socket";
-              };
-              Install = {
-                WantedBy = [ "sockets.target" ];
-              };
-              Socket = {
-                ListenStream = "${socket_dir}/atuin.sock";
-                SocketMode = "0600";
-                RemoveOnStop = true;
-              };
-            };
-
-          launchd.agents.atuin-daemon = {
-            enable = true;
-            config = {
-              ProgramArguments = [
-                "${lib.getExe cfg.package}"
-                "daemon"
+              assertions = [
+                {
+                  assertion = lib.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.";
+                }
              ];
-              EnvironmentVariables = lib.optionalAttrs (daemonCfg.logLevel != null) {
-                ATUIN_LOG = daemonCfg.logLevel;
+
+              programs.atuin.settings = {
+                daemon = {
+                  enabled = true;
+                };
              };
-              KeepAlive = {
-                Crashed = true;
-                SuccessfulExit = false;
+            }
+            (mkIf isLinux {
+              programs.atuin.settings = {
+                daemon = {
+                  systemd_socket = true;
+                };
              };
-              ProcessType = "Background";
-            };
-          };
-        })
+
+              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 = lib.optionals (daemonCfg.logLevel != null) [ "ATUIN_LOG=${daemonCfg.logLevel}" ];
+                  Restart = "on-failure";
+                  RestartSteps = 3;
+                  RestartMaxDelaySec = 6;
+                };
+              };
+
+              systemd.user.sockets.atuin-daemon =
+                let
+                  socket_dir = if lib.versionAtLeast cfg.package.version "18.4.0" then "%t" else "%D/atuin";
+                in
+                {
+                  Unit = {
+                    Description = "Atuin daemon socket";
+                  };
+                  Install = {
+                    WantedBy = [ "sockets.target" ];
+                  };
+                  Socket = {
+                    ListenStream = "${socket_dir}/atuin.sock";
+                    SocketMode = "0600";
+                    RemoveOnStop = true;
+                  };
+                };
+            })
+            (mkIf isDarwin {
+              programs.atuin.settings = {
+                daemon = {
+                  socket_path = lib.mkDefault "${config.xdg.dataHome}/atuin/daemon.sock";
+                };
+              };
+
+              launchd.agents.atuin-daemon = {
+                enable = true;
+                config = {
+                  ProgramArguments = [
+                    "${lib.getExe cfg.package}"
+                    "daemon"
+                  ];
+                  EnvironmentVariables = lib.optionalAttrs (daemonCfg.logLevel != null) {
+                    ATUIN_LOG = daemonCfg.logLevel;
+                  };
+                  KeepAlive = {
+                    Crashed = true;
+                    SuccessfulExit = false;
+                  };
+                  ProcessType = "Background";
+                };
+              };
+            })
+          ]
+        ))
      ]
    );
 }
--- a/modules/programs/bashmount.nix
+++ b/modules/programs/bashmount.nix
@@ -8,7 +8,7 @@ let
  cfg = config.programs.bashmount;
 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.AndersonTorres ];

  options.programs.bashmount = {
    enable = lib.mkEnableOption "bashmount";
--- a/modules/programs/bemenu.nix
+++ b/modules/programs/bemenu.nix
@@ -54,7 +54,7 @@ in
    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];

    home.sessionVariables = lib.mkIf (cfg.settings != { }) {
-      BEMENU_OPTS = lib.cli.toCommandLineShellGNU { } cfg.settings;
+      BEMENU_OPTS = lib.cli.toGNUCommandLineShell { } cfg.settings;
    };
  };
 }
--- a/modules/programs/claude-code.nix
+++ b/modules/programs/claude-code.nix
@@ -197,47 +197,6 @@ in
      };
    };

-    rules = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.either lib.types.lines lib.types.path);
-      default = { };
-      description = ''
-        Modular rule files for Claude Code.
-        The attribute name becomes the rule filename, and the value is either:
-        - Inline content as a string
-        - A path to a file containing the rule content
-        Rules are stored in .claude/rules/ directory.
-        All markdown files in .claude/rules/ are automatically loaded as project memory.
-      '';
-      example = lib.literalExpression ''
-        {
-          code-style = '''
-            # Code Style Guidelines
-
-            - Use consistent formatting
-            - Follow language conventions
-          ''';
-          testing = '''
-            # Testing Conventions
-
-            - Write tests for all new features
-            - Maintain test coverage above 80%
-          ''';
-          security = ./rules/security.md;
-        }
-      '';
-    };
-
-    rulesDir = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        Path to a directory containing rule files for Claude Code.
-        Rule files from this directory will be symlinked to .claude/rules/.
-        All markdown files in this directory are automatically loaded as project memory.
-      '';
-      example = lib.literalExpression "./rules";
-    };
-
    agentsDir = lib.mkOption {
      type = lib.types.nullOr lib.types.path;
      default = null;
@@ -366,10 +325,6 @@ in
        assertion = !(cfg.memory.text != null && cfg.memory.source != null);
        message = "Cannot specify both `programs.claude-code.memory.text` and `programs.claude-code.memory.source`";
      }
-      {
-        assertion = !(cfg.rules != { } && cfg.rulesDir != null);
-        message = "Cannot specify both `programs.claude-code.rules` and `programs.claude-code.rulesDir`";
-      }
      {
        assertion = !(cfg.agents != { } && cfg.agentsDir != null);
        message = "Cannot specify both `programs.claude-code.agents` and `programs.claude-code.agentsDir`";
@@ -431,11 +386,6 @@ in
          if cfg.memory.text != null then { text = cfg.memory.text; } else { source = cfg.memory.source; }
        );

-        ".claude/rules" = lib.mkIf (cfg.rulesDir != null) {
-          source = cfg.rulesDir;
-          recursive = true;
-        };
-
        ".claude/agents" = lib.mkIf (cfg.agentsDir != null) {
          source = cfg.agentsDir;
          recursive = true;
@@ -456,12 +406,6 @@ in
          recursive = true;
        };
      }
-      // lib.mapAttrs' (
-        name: content:
-        lib.nameValuePair ".claude/rules/${name}.md" (
-          if lib.isPath content then { source = content; } else { text = content; }
-        )
-      ) cfg.rules
      // lib.mapAttrs' (
        name: content:
        lib.nameValuePair ".claude/agents/${name}.md" (
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -75,7 +75,25 @@ in

    enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { inherit config; };

-    enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { inherit config; };
+    enableFishIntegration =
+      lib.hm.shell.mkFishIntegrationOption {
+        inherit config;
+        extraDescription = ''
+          Note, enabling the direnv module will always activate 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" ];
+          ```
+
+          to the system configuration.
+        '';
+      }
+      // {
+        default = true;
+        readOnly = true;
+      };

    enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };

--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -301,13 +301,20 @@ let
      let
        name = if isAttrs def && def.name != null then def.name else attrName;
        mods =
-          lib.cli.toCommandLineShell
-            (optionName: {
-              option = "--${optionName}";
-              sep = if optionName == "set-cursor" then "=" else null;
-              explicitBool = false;
-              formatArg = lib.generators.mkValueStringDefault { };
-            })
+          lib.cli.toGNUCommandLineShell
+            {
+              mkOption =
+                k: v:
+                if v == null then
+                  [ ]
+                else if k == "set-cursor" then
+                  [ "--${k}=${lib.generators.mkValueStringDefault { } v}" ]
+                else
+                  [
+                    "--${k}"
+                    (lib.generators.mkValueStringDefault { } v)
+                  ];
+            }
            {
              inherit (def)
                position
@@ -388,14 +395,12 @@ let
      passAsFile = [ "text" ];
    } "env HOME=$(mktemp -d) fish_indent < $textPath > $out";

-  sessionVarsFile = "etc/profile.d/hm-session-vars.fish";
-  sessionVarsPkg = pkgs.runCommandLocal "hm-session-vars.fish" { } ''
-    mkdir -p "$(dirname $out/${sessionVarsFile})"
+  translatedSessionVariables = pkgs.runCommandLocal "hm-session-vars.fish" { } ''
    (echo "function setup_hm_session_vars;"
    ${pkgs.buildPackages.babelfish}/bin/babelfish \
-      <${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
+    <${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
    echo "end"
-    echo "setup_hm_session_vars") > $out/${sessionVarsFile}
+    echo "setup_hm_session_vars") > $out
  '';

 in
@@ -593,25 +598,11 @@ in
        <https://fishshell.com/docs/current/completions.html>.
      '';
    };
-
-    programs.fish.sessionVariablesPackage = mkOption {
-      type = types.package;
-      internal = true;
-      description = ''
-        The package containing the translated {file}`hm-session-vars.fish` file.
-      '';
-    };
  };

  config = mkIf cfg.enable (
    lib.mkMerge [
-      {
-        home.packages = [
-          cfg.package
-          cfg.sessionVariablesPackage
-        ];
-        programs.fish.sessionVariablesPackage = sessionVarsPkg;
-      }
+      { home.packages = [ cfg.package ]; }

      (mkIf cfg.generateCompletions (
        let
@@ -724,7 +715,7 @@ in
          set -q __fish_home_manager_config_sourced; and exit
          set -g __fish_home_manager_config_sourced 1

-          source ${cfg.sessionVariablesPackage}/${sessionVarsFile}
+          source ${translatedSessionVariables}

          ${cfg.shellInit}

--- a/modules/programs/gemini-cli.nix
+++ b/modules/programs/gemini-cli.nix
@@ -21,19 +21,14 @@ in
    settings = lib.mkOption {
      inherit (jsonFormat) type;
      default = { };
-      example = {
-        ui.theme = "Default";
-        general = {
-          vimMode = true;
-          preferredEditor = "nvim";
-          previewFeatures = true;
-        };
-        ide.enabled = true;
-        privacy.usageStatisticsEnabled = false;
-        tools.autoAccept = false;
-        context.loadMemoryFromIncludeDirectories = true;
-        security.auth.selectedType = "oauth-personal";
-      };
+      example = lib.literalExpression ''
+        {
+          "theme": "Default",
+          "vimMode": true,
+          "preferredEditor": "nvim",
+          "autoAccept": true
+        }
+      '';
      description = "JSON config for gemini-cli";
    };

@@ -86,12 +81,12 @@ in
      };

    defaultModel = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
+      type = lib.types.str;
+      default = "gemini-2.5-pro";
      example = "gemini-2.5-flash";
      description = ''
        The default model to use for the CLI.
-        Will be set as $GEMINI_MODEL when configured.
+        Will be set as $GEMINI_MODEL.
      '';
    };

@@ -143,9 +138,7 @@ in
          file.".gemini/settings.json" = lib.mkIf (cfg.settings != { }) {
            source = jsonFormat.generate "gemini-cli-settings.json" cfg.settings;
          };
-          sessionVariables = lib.mkIf (cfg.defaultModel != null) {
-            GEMINI_MODEL = cfg.defaultModel;
-          };
+          sessionVariables.GEMINI_MODEL = cfg.defaultModel;
        };
      }
      {
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -224,24 +224,8 @@ in
            message = "Ghostty systemd integration cannot be enabled for non-linux platforms";
          }
        ];
-
        xdg.configFile."systemd/user/app-com.mitchellh.ghostty.service".source =
          "${cfg.package}/share/systemd/user/app-com.mitchellh.ghostty.service";
-
-        xdg.configFile."systemd/user/app-com.mitchellh.ghostty.service.d/overrides.conf".text = ''
-          [Unit]
-          X-SwitchMethod=keep-old
-          X-Reload-Triggers=${
-            let
-              storePathOf = name: config.xdg.configFile.${name}.source;
-            in
-            toString (
-              lib.optionals (cfg.settings != { }) [ (storePathOf "ghostty/config") ]
-              ++ lib.mapAttrsToList (name: _: storePathOf "ghostty/themes/${name}") cfg.themes
-            )
-          }
-        '';
-
        dbus.packages = [ cfg.package ];
      })

--- a/modules/programs/gpg.nix
+++ b/modules/programs/gpg.nix
@@ -16,13 +16,18 @@ let

  cfg = config.programs.gpg;

-  toKeyValue =
-    settings:
-    lib.generators.toKeyValue {
-      mkKeyValue =
-        key: value: if lib.isString value then "${key} ${value}" else lib.optionalString value key;
-      listsAsDuplicateKeys = true;
-    } settings;
+  mkKeyValue =
+    key: value: if lib.isString value then "${key} ${value}" else lib.optionalString value key;
+
+  cfgText = lib.generators.toKeyValue {
+    inherit mkKeyValue;
+    listsAsDuplicateKeys = true;
+  } cfg.settings;
+
+  scdaemonCfgText = lib.generators.toKeyValue {
+    inherit mkKeyValue;
+    listsAsDuplicateKeys = true;
+  } cfg.scdaemonSettings;

  primitiveType = types.oneOf [
    types.str
@@ -188,7 +193,6 @@ in

    scdaemonSettings = mkOption {
      type = types.attrsOf (types.either primitiveType (types.listOf types.str));
-      default = { };
      example = literalExpression ''
        {
          disable-ccid = true;
@@ -203,41 +207,6 @@ in
      '';
    };

-    dirmngrSettings = mkOption {
-      type = types.attrsOf (types.either primitiveType (types.listOf types.str));
-      default = { };
-      example = literalExpression ''
-        {
-          allow-version-check = true;
-          keyserver = "ldaps://ldap.example.com";
-        }
-      '';
-      description = ''
-        Dirmngr configuration options. Available options are described
-        in
-        [
-          {manpage}`dirmngr(1)`
-        ](https://www.gnupg.org/documentation/manuals/gnupg/Dirmngr-Options.html)
-      '';
-    };
-
-    gpgsmSettings = mkOption {
-      type = types.attrsOf (types.either primitiveType (types.listOf types.str));
-      default = { };
-      example = literalExpression ''
-        {
-          with-key-data = true;
-        }
-      '';
-      description = ''
-        GPGSM configuration options. Available options are described
-        in
-        [
-          {manpage}`gpgsm(1)`
-        ](https://www.gnupg.org/documentation/manuals/gnupg/GPGSM-Options.html)
-      '';
-    };
-
    homedir = mkOption {
      type = types.path;
      example = literalExpression ''"''${config.xdg.dataHome}/gnupg"'';
@@ -298,7 +267,8 @@ in
      cert-digest-algo = mkDefault "SHA512";
      s2k-digest-algo = mkDefault "SHA512";
      s2k-cipher-algo = mkDefault "AES256";
-      display-charset = mkDefault "utf-8";
+      charset = mkDefault "utf-8";
+      fixed-list-mode = mkDefault true;
      no-comments = mkDefault true;
      no-emit-version = mkDefault true;
      keyid-format = mkDefault "0xlong";
@@ -307,6 +277,11 @@ in
      with-fingerprint = mkDefault true;
      require-cross-certification = mkDefault true;
      no-symkey-cache = mkDefault true;
+      use-agent = mkDefault true;
+    };
+
+    programs.gpg.scdaemonSettings = {
+      # no defaults for scdaemon
    };

    home.packages = [ cfg.package ];
@@ -314,21 +289,9 @@ in
      GNUPGHOME = cfg.homedir;
    };

-    home.file."${cfg.homedir}/gpg.conf" = mkIf (cfg.settings != { }) {
-      text = toKeyValue cfg.settings;
-    };
+    home.file."${cfg.homedir}/gpg.conf".text = cfgText;

-    home.file."${cfg.homedir}/scdaemon.conf" = mkIf (cfg.scdaemonSettings != { }) {
-      text = toKeyValue cfg.scdaemonSettings;
-    };
-
-    home.file."${cfg.homedir}/dirmngr.conf" = mkIf (cfg.dirmngrSettings != { }) {
-      text = toKeyValue cfg.dirmngrSettings;
-    };
-
-    home.file."${cfg.homedir}/gpgsm.conf" = mkIf (cfg.gpgsmSettings != { }) {
-      text = toKeyValue cfg.gpgsmSettings;
-    };
+    home.file."${cfg.homedir}/scdaemon.conf".text = scdaemonCfgText;

    # Link keyring if keys are not mutable
    home.file."${cfg.homedir}/pubring.kbx" = mkIf (!cfg.mutableKeys && cfg.publicKeys != [ ]) {
--- a/modules/programs/havoc.nix
+++ b/modules/programs/havoc.nix
@@ -9,7 +9,7 @@ let
  iniFormat = pkgs.formats.ini { };
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ AndersonTorres ];

  options.programs.havoc = {
    enable = lib.mkEnableOption "Havoc terminal";
--- a/modules/programs/keepassxc.nix
+++ b/modules/programs/keepassxc.nix
@@ -62,15 +62,8 @@ in
        Configuration written to
        {file}`$XDG_CONFIG_HOME/keepassxc/keepassxc.ini`.

-        See <https://github.com/keepassxreboot/keepassxc/blob/develop/src/core/Config.cpp>
+        See <https://github.com/keepassxreboot/keepassxc/blob/647272e9c5542297d3fcf6502e6173c96f12a9a0/src/core/Config.cpp#L49-L223>
        for the full list of options.
-
-        ::: {.note}
-        When the settings are non-empty, the configuration file will be linked
-        into the Nix store and KeePassXC will report an access error for its
-        configuration file. This is expected and can not be fixed in a way that
-        aligns with Home Manager's principles. See [#8257](https://github.com/nix-community/home-manager/issues/8257) for more details.
-        :::
      '';
    };

--- a/modules/programs/meli.nix
+++ b/modules/programs/meli.nix
@@ -24,8 +24,7 @@ let
  meliAccounts = (lib.attrsets.mapAttrs (name: value: (mkMeliAccounts name value)) enabledAccounts);

  mkMeliAccounts = (
-    name: account:
-    {
+    name: account: {
      root_mailbox = "${config.accounts.email.maildirBasePath}/${account.maildir.path}";
      format = "Maildir";
      identity = account.address;
@@ -34,14 +33,6 @@ let
      send_mail = mkSmtp account;
      mailboxes = account.meli.mailboxAliases;
    }
-    // lib.optionalAttrs (account.flavor == "fastmail.com") {
-      server_username = account.userName;
-      server_password_command = lib.concatMapStringsSep " " lib.escapeShellArg account.passwordCommand;
-      format = "jmap";
-      server_url = "https://api.fastmail.com/jmap/session";
-      use_token = true;
-    }
-    // account.meli.settings
  );

  mkSmtp = account: {
@@ -162,14 +153,6 @@ in
                };
                description = "Folder display name";
              };
-
-              settings = mkOption {
-                type = types.submodule {
-                  freeformType = tomlFormat.type;
-                };
-                default = { };
-                description = "Account specific meli configuration";
-              };
            };
          }
        )
@@ -177,15 +160,6 @@ in
    };
  };
  config = mkIf config.programs.meli.enable {
-    assertions = [
-      {
-        assertion = cfg.settings ? accounts == false;
-        message = ''
-          programs.meli.settings.accounts override the accounts.email values.
-                      Use per-email accounts.email.<ACCOUNT>.meli.settings instead'';
-      }
-    ];
-
    home.packages = [ config.programs.meli.package ];

    # Generate meli configuration from email accounts
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -7,46 +7,121 @@

 let
  inherit (lib)
-    concatMapStringsSep
    literalExpression
    mkEnableOption
    mkIf
    mkOption
-    mkPackageOption
-    optionals
+    mkRemovedOptionModule
    types
    ;

  cfg = config.programs.neovim;

-  inherit
-    (
-      (import ../lib/file-type.nix {
-        inherit (config.home) homeDirectory;
-        inherit lib pkgs;
-      })
-    )
-    fileType
-    ;
+  fileType =
+    (import ../lib/file-type.nix {
+      inherit (config.home) homeDirectory;
+      inherit lib pkgs;
+    }).fileType;

  jsonFormat = pkgs.formats.json { };
+
+  pluginWithConfigType = types.submodule {
+    options = {
+      config = mkOption {
+        type = types.nullOr types.lines;
+        description = "Script to configure this plugin. The scripting language should match type.";
+        default = null;
+      };
+
+      type = mkOption {
+        type = types.either (types.enum [
+          "lua"
+          "viml"
+          "teal"
+          "fennel"
+        ]) types.str;
+        description = "Language used in config. Configurations are aggregated per-language.";
+        default = "viml";
+      };
+
+      optional = mkEnableOption "optional" // {
+        description = "Don't load by default (load with :packadd)";
+      };
+
+      plugin = lib.mkPackageOption pkgs.vimPlugins "plugin" {
+        default = null;
+        example = "pkgs.vimPlugins.nvim-treesitter";
+        pkgsText = "pkgs.vimPlugins";
+      };
+
+      runtime = mkOption {
+        default = { };
+        # passing actual "${xdg.configHome}/nvim" as basePath was a bit tricky
+        # due to how fileType.target is implemented
+        type = fileType "programs.neovim.plugins._.runtime" "{var}`xdg.configHome/nvim`" "nvim";
+        example = literalExpression ''
+          { "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; }
+        '';
+        description = ''
+          Set of files that have to be linked in nvim config folder.
+        '';
+      };
+    };
+  };
+
+  allPlugins =
+    cfg.plugins
+    ++ lib.optional cfg.coc.enable {
+      type = "viml";
+      plugin = cfg.coc.package;
+      config = cfg.coc.pluginConfig;
+      optional = false;
+    };
+
+  luaPackages = cfg.finalPackage.unwrapped.lua.pkgs;
+  resolvedExtraLuaPackages = cfg.extraLuaPackages luaPackages;
+
+  extraMakeWrapperArgs = lib.optionalString (
+    cfg.extraPackages != [ ]
+  ) ''--suffix PATH : "${lib.makeBinPath cfg.extraPackages}"'';
+  extraMakeWrapperLuaCArgs =
+    lib.optionalString (resolvedExtraLuaPackages != [ ])
+      ''--suffix LUA_CPATH ";" "${
+        lib.concatMapStringsSep ";" luaPackages.getLuaCPath resolvedExtraLuaPackages
+      }"'';
+  extraMakeWrapperLuaArgs =
+    lib.optionalString (resolvedExtraLuaPackages != [ ])
+      ''--suffix LUA_PATH ";" "${
+        lib.concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages
+      }"'';
 in
 {
  meta.maintainers = with lib.maintainers; [ khaneliman ];

+  imports = [
+    (mkRemovedOptionModule [
+      "programs"
+      "neovim"
+      "withPython"
+    ] "Python2 support has been removed from neovim.")
+    (mkRemovedOptionModule [
+      "programs"
+      "neovim"
+      "extraPythonPackages"
+    ] "Python2 support has been removed from neovim.")
+    (mkRemovedOptionModule [ "programs" "neovim" "configure" ] ''
+      programs.neovim.configure is deprecated.
+            Other programs.neovim options can override its settings or ignore them.
+            Please use the other options at your disposal:
+              configure.packages.*.opt  -> programs.neovim.plugins = [ { plugin = ...; optional = true; }]
+              configure.packages.*.start  -> programs.neovim.plugins = [ { plugin = ...; }]
+              configure.customRC -> programs.neovim.extraConfig
+    '')
+  ];
  options = {
    programs.neovim = {
      enable = mkEnableOption "Neovim";

-      package = mkPackageOption pkgs "neovim" { default = "neovim-unwrapped"; };
-
-      finalPackage = mkOption {
-        type = types.package;
-        readOnly = true;
-        description = "Resulting customized neovim package.";
-      };
-
-      # Aliases
      viAlias = mkOption {
        type = types.bool;
        default = false;
@@ -71,17 +146,6 @@ in
        '';
      };

-      defaultEditor = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to configure {command}`nvim` as the default
-          editor using the {env}`EDITOR` and {env}`VISUAL`
-          environment variables.
-        '';
-      };
-
-      # Providers & Runtimes
      withNodeJs = mkOption {
        type = types.bool;
        default = false;
@@ -91,12 +155,11 @@ in
        '';
      };

-      withPerl = mkOption {
-        type = types.bool;
-        default = false;
+      withRuby = mkOption {
+        type = types.nullOr types.bool;
+        default = true;
        description = ''
-          Enable perl provider. Set to `true` to
-          use Perl plugins.
+          Enable ruby provider.
        '';
      };

@@ -109,16 +172,21 @@ in
        '';
      };

-      withRuby = mkOption {
-        type = types.nullOr types.bool;
-        default = true;
-        description = ''
-          Enable ruby provider.
-        '';
-      };
-
      extraPython3Packages = mkOption {
-        type = types.functionTo (types.listOf types.package);
+        # 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 =
+          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 = literalExpression "pyPkgs: with pyPkgs; [ python-language-server ]";
@@ -130,8 +198,21 @@ in
        '';
      };

+      # We get the Lua package from the final package and use its
+      # 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 = types.functionTo (types.listOf types.package);
+        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 ]";
@@ -143,34 +224,8 @@ in
        '';
      };

-      # Wrapper Configuration
-      extraName = mkOption {
-        type = types.str;
-        default = "";
-        description = ''
-          Extra name appended to the wrapper package name.
-        '';
-      };
-
-      autowrapRuntimeDeps = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to automatically wrap the binary with the runtime dependencies of the plugins.
-        '';
-      };
-
-      waylandSupport = mkOption {
-        type = types.bool;
-        default = pkgs.stdenv.isLinux;
-        defaultText = literalExpression "pkgs.stdenv.isLinux";
-        description = ''
-          Whether to enable Wayland clipboard support.
-        '';
-      };
-
      extraWrapperArgs = mkOption {
-        type = types.listOf types.str;
+        type = with types; listOf str;
        default = [ ];
        example = literalExpression ''
          [
@@ -191,14 +246,54 @@ in
        '';
      };

-      extraPackages = mkOption {
-        type = types.listOf types.package;
-        default = [ ];
-        example = literalExpression "[ pkgs.shfmt ]";
-        description = "Extra packages available to nvim.";
+      generatedConfigViml = mkOption {
+        type = types.lines;
+        visible = true;
+        readOnly = true;
+        description = ''
+          Generated vimscript config.
+        '';
+      };
+
+      generatedConfigs = mkOption {
+        type = types.attrsOf types.lines;
+        visible = true;
+        readOnly = true;
+        example = literalExpression ''
+          {
+            viml = '''
+              " Generated by home-manager
+              map <leader> ,
+            ''';
+
+            lua = '''
+              -- Generated by home-manager
+              vim.opt.background = "dark"
+            ''';
+          }'';
+        description = ''
+          Generated configurations with as key their language (set via type).
+        '';
+      };
+
+      package = lib.mkPackageOption pkgs "neovim" { default = "neovim-unwrapped"; };
+
+      finalPackage = mkOption {
+        type = types.package;
+        readOnly = true;
+        description = "Resulting customized neovim package.";
+      };
+
+      defaultEditor = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to configure {command}`nvim` as the default
+          editor using the {env}`EDITOR` and {env}`VISUAL`
+          environment variables.
+        '';
      };

-      # Configuration & Plugins
      extraConfig = mkOption {
        type = types.lines;
        default = "";
@@ -213,92 +308,45 @@ in
      extraLuaConfig = mkOption {
        type = types.lines;
        default = "";
-        example = lib.literalExpression ''
-          let
-              nvimEarlyInit = lib.mkOrder 500 "set rtp+=vim.opt.rtp:prepend('/home/user/myplugin')";
-              nvimLateInit = lib.mkAfter "vim.opt.signcolumn = 'auto:1-3'";
-          in
-              lib.mkMerge [ nvimEarlyInit nvimLateInit ];
+        example = ''
+          vim.opt.nobackup = true
        '';
        description = ''
-          Content to be added to {file}`init.lua`.
-
-          To specify the order, use `lib.mkOrder`, `lib.mkBefore`, `lib.mkAfter`.
+          Custom lua lines.
        '';
      };

-      plugins =
-        let
-          pluginWithConfigType = types.submodule {
-            options = {
-              config = mkOption {
-                type = types.nullOr types.lines;
-                description = "Script to configure this plugin. The scripting language should match type.";
-                default = null;
-              };
+      extraPackages = mkOption {
+        type = with types; listOf package;
+        default = [ ];
+        example = literalExpression "[ pkgs.shfmt ]";
+        description = "Extra packages available to nvim.";
+      };

-              type = mkOption {
-                type = types.either (types.enum [
-                  "lua"
-                  "viml"
-                  "teal"
-                  "fennel"
-                ]) types.str;
-                description = "Language used in config. Configurations are aggregated per-language.";
-                default = "viml";
-              };
+      plugins = mkOption {
+        type = with types; listOf (either package pluginWithConfigType);
+        default = [ ];
+        example = literalExpression ''
+          with pkgs.vimPlugins; [
+            yankring
+            vim-nix
+            { plugin = vim-startify;
+              config = "let g:startify_change_to_vcs_root = 0";
+            }
+          ]
+        '';
+        description = ''
+          List of vim plugins to install optionally associated with
+          configuration to be placed in init.vim.

-              optional = mkEnableOption "optional" // {
-                description = "Don't load by default (load with :packadd)";
-              };
-
-              plugin = mkPackageOption pkgs.vimPlugins "plugin" {
-                default = null;
-                example = "pkgs.vimPlugins.nvim-treesitter";
-                pkgsText = "pkgs.vimPlugins";
-              };
-
-              runtime = mkOption {
-                default = { };
-                # passing actual "${xdg.configHome}/nvim" as basePath was a bit tricky
-                # due to how fileType.target is implemented
-                type = fileType "programs.neovim.plugins._.runtime" "{var}`xdg.configHome/nvim`" "nvim";
-                example = literalExpression ''
-                  { "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; }
-                '';
-                description = ''
-                  Set of files that have to be linked in nvim config folder.
-                '';
-              };
-            };
-          };
-
-        in
-        mkOption {
-          type = types.listOf (types.either types.package pluginWithConfigType);
-          default = [ ];
-          example = literalExpression ''
-            with pkgs.vimPlugins;
-            [
-              yankring
-              vim-nix
-              { plugin = vim-startify;
-                config = "let g:startify_change_to_vcs_root = 0";
-              }
-            ]
-          '';
-          description = ''
-            List of vim plugins to install optionally associated with
-            configuration to be placed in init.vim.
-
-            This option is mutually exclusive with {var}`configure`.
-          '';
-        };
+          This option is mutually exclusive with {var}`configure`.
+        '';
+      };

      coc = {
        enable = mkEnableOption "Coc";

-        package = mkPackageOption pkgs "coc-nvim" {
+        package = lib.mkPackageOption pkgs "coc-nvim" {
          default = [
            "vimPlugins"
            "coc-nvim"
@@ -328,7 +376,7 @@ in
                  filetypes = [ "haskell" "lhaskell" ];
                };
              };
-            }
+            };
          '';
          description = ''
            Extra configuration lines to add to
@@ -345,52 +393,11 @@ in
          description = "Script to configure CoC. Must be viml.";
        };
      };
-
-      # Generated / Read-Only
-      generatedConfigViml = mkOption {
-        type = types.lines;
-        visible = true;
-        readOnly = true;
-        description = ''
-          Generated vimscript config.
-        '';
-      };
-
-      generatedConfigs = mkOption {
-        type = types.attrsOf types.lines;
-        visible = true;
-        readOnly = true;
-        example = literalExpression ''
-          {
-            viml = '''
-              " Generated by home-manager
-              map <leader> ,
-            ''';
-
-            lua = '''
-              -- Generated by home-manager
-              vim.opt.background = "dark"
-            ''';
-          }
-        '';
-        description = ''
-          Generated configurations with as key their language (set via type).
-        '';
-      };
    };
  };

-  config = mkIf cfg.enable (
+  config =
    let
-      allPlugins =
-        cfg.plugins
-        ++ lib.optional cfg.coc.enable {
-          type = "viml";
-          plugin = cfg.coc.package;
-          config = cfg.coc.pluginConfig;
-          optional = false;
-        };
-
      defaultPlugin = {
        type = "viml";
        plugin = null;
@@ -406,100 +413,81 @@ in

      suppressNotVimlConfig = p: if p.type != "viml" then p // { config = null; } else p;

-      # Lua & Python Package Resolution
-      luaPackages = cfg.finalPackage.unwrapped.lua.pkgs;
-      resolvedExtraLuaPackages = cfg.extraLuaPackages luaPackages;
-
-      # Wrapper Arguments Construction
-      extraMakeWrapperArgs = optionals (cfg.extraPackages != [ ]) [
-        "--suffix"
-        "PATH"
-        ":"
-        (lib.makeBinPath cfg.extraPackages)
-      ];
-
-      extraMakeWrapperLuaCArgs = optionals (resolvedExtraLuaPackages != [ ]) [
-        "--suffix"
-        "LUA_CPATH"
-        ";"
-        (concatMapStringsSep ";" luaPackages.getLuaCPath resolvedExtraLuaPackages)
-      ];
-
-      extraMakeWrapperLuaArgs = optionals (resolvedExtraLuaPackages != [ ]) [
-        "--suffix"
-        "LUA_PATH"
-        ";"
-        (concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages)
-      ];
-
-      wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package {
-        withNodeJs = cfg.withNodeJs || cfg.coc.enable;
-        plugins = map suppressNotVimlConfig pluginsNormalized;
-
+      neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
        inherit (cfg)
          extraPython3Packages
          withPython3
          withRuby
-          withPerl
          viAlias
          vimAlias
-          extraName
-          autowrapRuntimeDeps
-          waylandSupport
          ;
-        neovimRcContent = cfg.extraConfig;
-        wrapperArgs =
-          cfg.extraWrapperArgs ++ extraMakeWrapperArgs ++ extraMakeWrapperLuaCArgs ++ extraMakeWrapperLuaArgs;
-        wrapRc = false;
-      };
-    in
-    {
-      programs.neovim = {
-        generatedConfigViml = cfg.extraConfig;
-
-        generatedConfigs =
-          let
-            grouped = lib.groupBy (x: x.type) pluginsNormalized;
-            configsOnly = lib.foldl (acc: p: if p.config != null then acc ++ [ p.config ] else acc) [ ];
-          in
-          lib.mapAttrs (_name: vals: lib.concatStringsSep "\n" (configsOnly vals)) grouped;
-
-        finalPackage = wrappedNeovim';
+        withNodeJs = cfg.withNodeJs || cfg.coc.enable;
+        plugins = map suppressNotVimlConfig pluginsNormalized;
+        customRC = cfg.extraConfig;
      };

-      home = {
-        packages = [ cfg.finalPackage ];
-
-        sessionVariables = mkIf cfg.defaultEditor {
-          EDITOR = "nvim";
-          VISUAL = "nvim";
-        };
-
-        shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-      };
-
-      programs.neovim.extraLuaConfig = lib.mkMerge [
-        (lib.mkIf (wrappedNeovim'.initRc != "") (
-          lib.mkBefore "vim.cmd [[source ${pkgs.writeText "nvim-init-home-manager.vim" wrappedNeovim'.initRc}]]"
-        ))
-        (lib.mkIf (lib.hasAttr "lua" cfg.generatedConfigs) (lib.mkAfter cfg.generatedConfigs.lua))
-      ];
-
-      xdg.configFile = lib.mkMerge (
-        # writes runtime
-        (map (x: x.runtime) pluginsNormalized)
-        ++ [
-          {
-            "nvim/init.lua" = mkIf (cfg.extraLuaConfig != "") {
-              text = cfg.extraLuaConfig;
-            };
-
-            "nvim/coc-settings.json" = mkIf cfg.coc.enable {
-              source = jsonFormat.generate "coc-settings.json" cfg.coc.settings;
-            };
-          }
-        ]
+      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;
+
+      programs.neovim.generatedConfigs =
+        let
+          grouped = lib.lists.groupBy (x: x.type) pluginsNormalized;
+          configsOnly = lib.foldl (acc: p: if p.config != null then acc ++ [ p.config ] else acc) [ ];
+        in
+        lib.mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals)) grouped;
+
+      home.packages = [ cfg.finalPackage ];
+
+      home.sessionVariables = mkIf cfg.defaultEditor {
+        EDITOR = "nvim";
+        VISUAL = "nvim";
+      };
+
+      home.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
+
+      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}]]\n"
+                    + 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;
+              };
+            }
+          ]
+        );
+
+      programs.neovim.finalPackage = wrappedNeovim';
+    };
 }
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@@ -100,7 +100,7 @@ in
      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.";

-    assertions = [
+    assertions = lib.optionals pkgs.stdenv.isDarwin [
      (lib.hm.darwin.assertInterval "programs.nh.clean.dates" cfg.clean.dates pkgs)
    ];

@@ -131,25 +131,30 @@ in
      ];
    };

-    systemd.user = lib.mkIf cfg.clean.enable {
+    systemd.user = lib.mkIf (cfg.clean.enable && pkgs.stdenv.isLinux) {
      services.nh-clean = {
        Unit.Description = "Nh clean (user)";
+
        Service = {
          Type = "oneshot";
          ExecStart = "${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}";
        };
      };
+
      timers.nh-clean = {
        Unit.Description = "Run nh clean";
+
        Timer = {
          OnCalendar = cfg.clean.dates;
          Persistent = true;
        };
+
        Install.WantedBy = [ "timers.target" ];
      };
+
    };

-    launchd.agents.nh-clean = lib.mkIf cfg.clean.enable {
+    launchd.agents.nh-clean = lib.mkIf (cfg.clean.enable && pkgs.stdenv.isDarwin) {
      enable = true;
      config = {
        ProgramArguments = [
@@ -158,7 +163,9 @@ in
          "user"
        ]
        ++ lib.optional (cfg.clean.extraArgs != "") cfg.clean.extraArgs;
+
        StartCalendarInterval = lib.hm.darwin.mkCalendarInterval cfg.clean.dates;
+
      };
    };
  };
--- a/modules/programs/niriswitcher.nix
+++ b/modules/programs/niriswitcher.nix
@@ -66,7 +66,10 @@ in

  config = lib.mkIf cfg.enable {
    assertions = [
-      (lib.hm.assertions.assertPlatform "programs.niriswitcher" pkgs lib.platforms.linux)
+      {
+        assertion = pkgs.stdenv.hostPlatform.isLinux;
+        message = "niriswitcher is only available on Linux.";
+      }
    ];

    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
--- a/modules/programs/opencode.nix
+++ b/modules/programs/opencode.nix
@@ -133,7 +133,7 @@ in
        The attribute name becomes the command filename, and the value is either:
        - Inline content as a string
        - A path to a file containing the command content
-        Commands are stored in {file}`$XDG_CONFIG_HOME/opencode/command/` directory.
+        Commands are stored in {file}`$XDG_CONFIG_HOME/.config/opencode/command/` directory.
      '';
      example = lib.literalExpression ''
        {
@@ -162,7 +162,7 @@ in
        The attribute name becomes the agent filename, and the value is either:
        - Inline content as a string
        - A path to a file containing the agent content
-        Agents are stored in {file}`$XDG_CONFIG_HOME/opencode/agent/` directory.
+        Agents are stored in {file}`$XDG_CONFIG_HOME/.config/opencode/agent/` directory.
      '';
      example = lib.literalExpression ''
        {
@@ -183,49 +183,6 @@ in
      '';
    };

-    skills = lib.mkOption {
-      type = lib.types.either (lib.types.attrsOf (lib.types.either lib.types.lines lib.types.path)) lib.types.path;
-      default = { };
-      description = ''
-        Custom agent skills for opencode.
-
-        This option can either be:
-        - An attribute set defining skills
-        - A path to a directory containing multiple skill folders
-
-        If an attribute set is used, the attribute name becomes the skill directory name,
-        and the value is either:
-        - Inline content as a string (creates `opencode/skill/<name>/SKILL.md`)
-        - A path to a file (creates `opencode/skill/<name>/SKILL.md`)
-        - A path to a directory (creates `opencode/skill/<name>/` with all files)
-
-        If a path is used, it is expected to contain one folder per skill name, each
-        containing a {file}`SKILL.md`. The directory is symlinked to
-        {file}`$XDG_CONFIG_HOME/opencode/skill/`.
-
-        See <https://opencode.ai/docs/skills/> for the documentation.
-      '';
-      example = lib.literalExpression ''
-        {
-          git-release = '''
-            ---
-            name: git-release
-            description: Create consistent releases and changelogs
-            ---
-
-            ## What I do
-
-            - Draft release notes from merged PRs
-            - Propose a version bump
-            - Provide a copy-pasteable `gh release create` command
-          ''';
-
-          # A skill can also be a directory containing SKILL.md and other files.
-          data-analysis = ./skills/data-analysis;
-        }
-      '';
-    };
-
    themes = mkOption {
      type = lib.types.attrsOf (lib.types.either jsonFormat.type lib.types.path);
      default = { };
@@ -242,13 +199,6 @@ in
  };

  config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = !lib.isPath cfg.skills || lib.pathIsDirectory cfg.skills;
-        message = "`programs.opencode.skills` must be a directory when set to a path";
-      }
-    ];
-
    home.packages = mkIf (cfg.package != null) [ cfg.package ];

    xdg.configFile = {
@@ -277,11 +227,6 @@ in
            text = cfg.rules;
          })
      );
-
-      "opencode/skill" = mkIf (lib.isPath cfg.skills) {
-        source = cfg.skills;
-        recursive = true;
-      };
    }
    // lib.mapAttrs' (
      name: content:
@@ -295,18 +240,6 @@ in
        if lib.isPath content then { source = content; } else { text = content; }
      )
    ) cfg.agents
-    // lib.mapAttrs' (
-      name: content:
-      if lib.isPath content && lib.pathIsDirectory content then
-        lib.nameValuePair "opencode/skill/${name}" {
-          source = content;
-          recursive = true;
-        }
-      else
-        lib.nameValuePair "opencode/skill/${name}/SKILL.md" (
-          if lib.isPath content then { source = content; } else { text = content; }
-        )
-    ) (if builtins.isAttrs cfg.skills then cfg.skills else { })
    // lib.mapAttrs' (
      name: content:
      lib.nameValuePair "opencode/themes/${name}.json" (
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -30,42 +30,44 @@ let
      mapAttrsToList (name: value: ''${name}="${lib.escape [ ''"'' "\\" ] (toString value)}"'') envStr
    );

-  mkAddressPortModule =
-    {
-      actionType,
-      nullableAddress ? actionType == "forward",
-    }:
-    types.submodule {
-      options = {
+  bindOptions = {
+    address = mkOption {
+      type = types.str;
+      default = "localhost";
+      example = "example.org";
+      description = "The address where to bind the port.";
+    };
+
+    port = mkOption {
+      type = types.nullOr types.port;
+      default = null;
+      example = 8080;
+      description = "Specifies port number to bind on bind address.";
+    };
+  };
+
+  dynamicForwardModule = types.submodule { options = bindOptions; };
+
+  forwardModule = types.submodule {
+    options = {
+      bind = bindOptions;
+
+      host = {
        address = mkOption {
-          type = if nullableAddress then types.nullOr types.str else types.str;
-          default = if nullableAddress then null else "localhost";
+          type = types.nullOr types.str;
+          default = null;
          example = "example.org";
-          description = "The address to ${actionType} to.";
+          description = "The address where to forward the traffic to.";
        };

        port = mkOption {
          type = types.nullOr types.port;
          default = null;
-          example = 8080;
-          description = "Specifies port number to ${actionType} to.";
+          example = 80;
+          description = "Specifies port number to forward the traffic to.";
        };
      };
    };
-
-  dynamicForwardModule = mkAddressPortModule { actionType = "bind"; };
-
-  forwardModule = types.submodule {
-    options = {
-      bind = mkOption {
-        type = mkAddressPortModule { actionType = "bind"; };
-        description = "Local port binding options";
-      };
-      host = mkOption {
-        type = mkAddressPortModule { actionType = "forward"; };
-        description = "Host port binding options";
-      };
-    };
  };

  matchBlockModule = types.submodule {
@@ -381,18 +383,6 @@ let
        example = "10m";
        description = "Whether control socket should remain open in the background.";
      };
-
-      kexAlgorithms = mkOption {
-        type = types.nullOr (types.listOf types.str);
-        default = null;
-        example = [
-          "curve25519-sha256@libssh.org"
-          "diffie-hellman-group-exchange-sha256"
-        ];
-        description = ''
-          Specifies the available KEX (Key Exchange) algorithms.
-        '';
-      };
    };

    #    config.host = mkDefault dagName;
@@ -440,9 +430,6 @@ let
      ++ map (f: "  LocalForward" + addressPort f.bind + addressPort f.host) cf.localForwards
      ++ map (f: "  RemoteForward" + addressPort f.bind + addressPort f.host) cf.remoteForwards
      ++ map (f: "  DynamicForward" + addressPort f) cf.dynamicForwards
-      ++ optional (
-        cf.kexAlgorithms != null
-      ) "  KexAlgorithms ${builtins.concatStringsSep "," cf.kexAlgorithms}"
      ++ [
        (lib.generators.toKeyValue {
          mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
--- a/modules/programs/television.nix
+++ b/modules/programs/television.nix
@@ -106,13 +106,13 @@ in
    ];

    programs.bash.initExtra = lib.mkIf cfg.enableBashIntegration ''
-      source ${cfg.package}/share/television/completion.bash
+      eval "$(${lib.getExe cfg.package} init bash)"
    '';
    programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration ''
-      source ${cfg.package}/share/television/completion.zsh
+      eval "$(${lib.getExe cfg.package} init zsh)"
    '';
    programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
-      source ${cfg.package}/share/television/completion.fish
+      ${lib.getExe cfg.package} init fish | source
    '';
  };
 }
--- a/modules/programs/vicinae.nix
+++ b/modules/programs/vicinae.nix
@@ -12,7 +12,6 @@ let

  packageVersion = if cfg.package != null then lib.getVersion cfg.package else null;
  themeIsToml = lib.versionAtLeast packageVersion "0.15.0";
-  versionPost0_17 = lib.versionAtLeast packageVersion "0.17.0";
 in
 {
  meta.maintainers = [ lib.maintainers.leiserfg ];
@@ -44,12 +43,7 @@ in
    useLayerShell = lib.mkOption {
      type = lib.types.bool;
      default = true;
-      description = ''
-        Whether vicinae should use the layer shell.
-        If you are using version 0.17 or newer, you should use
-        {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false
-        instead.
-      '';
+      description = "If vicinae should use the layer shell";
    };

    extensions = lib.mkOption {
@@ -133,22 +127,27 @@ in
    settings = lib.mkOption {
      inherit (jsonFormat) type;
      default = { };
+      description = "Settings written as JSON to `~/.config/vicinae/vicinae.json.";
      example = lib.literalExpression ''
        {
-          favicon_service = "twenty";
-          font.normal.size = 10;
-          pop_to_root_on_close=false;
-          search_files_in_root= false;
+          faviconService = "twenty";
+          font = {
+            size = 10;
+          };
+          popToRootOnClose = false;
+          rootSearch = {
+            searchFiles = false;
+          };
          theme = {
-            dark.name = "vicinae-dark";
-            light.name = "vicinae-light";
+            name = "vicinae-dark";
+          };
+          window = {
+           csd = true;
+           opacity = 0.95;
+           rounding = 10;
          };
        }
      '';
-      description = ''
-        Settings written as JSON to {file}`~/.config/vicinae/settings.json`.
-        See {command}`vicinae config default`.
-      '';
    };
  };

@@ -159,10 +158,6 @@ in
        assertion = cfg.systemd.enable -> cfg.package != null;
        message = "{option}programs.vicinae.systemd.enable requires non null {option}programs.vicinae.package";
      }
-      {
-        assertion = !cfg.useLayerShell -> !versionPost0_17;
-        message = ''After version 0.17, if you want to explicitly disable the use of layer shell, you need to set {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false.'';
-      }
    ];
    lib.vicinae.mkExtension = (
      {
@@ -228,11 +223,10 @@ in
            source = themeFormat.generate "vicinae-${name}-theme" theme;
          }
        ) cfg.themes;
-        settingsPath = if versionPost0_17 then "vicinae/settings.json" else "vicinae/vicinae.json";
      in
      {
        configFile = {
-          "${settingsPath}" = lib.mkIf (cfg.settings != { }) {
+          "vicinae/vicinae.json" = lib.mkIf (cfg.settings != { }) {
            source = jsonFormat.generate "vicinae-settings" cfg.settings;
          };
        }
@@ -256,16 +250,14 @@ in
        PartOf = [ cfg.systemd.target ];
      };
      Service = {
+        EnvironmentFile = pkgs.writeText "vicinae-env" ''
+          USE_LAYER_SHELL=${if cfg.useLayerShell then builtins.toString 1 else builtins.toString 0}
+        '';
        Type = "simple";
        ExecStart = "${lib.getExe' cfg.package "vicinae"} server";
        Restart = "always";
        RestartSec = 5;
        KillMode = "process";
-        EnvironmentFile = lib.mkIf (!versionPost0_17) (
-          pkgs.writeText "vicinae-env" ''
-            USE_LAYER_SHELL=${if cfg.useLayerShell then builtins.toString 1 else builtins.toString 0}
-          ''
-        );
      };
      Install = lib.mkIf cfg.systemd.autoStart {
        WantedBy = [ cfg.systemd.target ];
--- a/modules/programs/yt-dlp.nix
+++ b/modules/programs/yt-dlp.nix
@@ -9,27 +9,12 @@ let

  cfg = config.programs.yt-dlp;

-  configAtom =
-    with types;
-    oneOf [
-      bool
-      int
-      str
-    ];
-
-  renderSingleOption =
+  renderSettings = lib.mapAttrsToList (
    name: value:
    if lib.isBool value then
      if value then "--${name}" else "--no-${name}"
    else
-      "--${name} ${toString value}";
-
-  renderSettings = lib.mapAttrsToList (
-    name: value:
-    if lib.isList value then
-      lib.concatStringsSep "\n" (map (renderSingleOption name) value)
-    else
-      renderSingleOption name value
+      "--${name} ${toString value}"
  );

 in
@@ -42,7 +27,13 @@ in
    package = lib.mkPackageOption pkgs "yt-dlp" { };

    settings = mkOption {
-      type = with types; attrsOf (either configAtom (listOf configAtom));
+      type =
+        with types;
+        attrsOf (oneOf [
+          bool
+          int
+          str
+        ]);
      default = { };
      example = lib.literalExpression ''
        {
@@ -51,10 +42,6 @@ in
          sub-langs = "all";
          downloader = "aria2c";
          downloader-args = "aria2c:'-c -x8 -s8 -k1M'";
-          color = [
-            "stdout:no_color"
-            "stderr:always"
-          ];
        }
      '';
      description = ''
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  options,
  ...
 }:
 let
@@ -101,18 +100,9 @@ in
        };

        dotDir = mkOption {
-          default =
-            if config.xdg.enable && lib.versionAtLeast config.home.stateVersion "26.05" then
-              "${config.xdg.configHome}/zsh"
-            else
-              homeDir;
-          defaultText = lib.literalExpression ''
-            if config.xdg.enable && lib.versionAtLeast config.home.stateVersion "26.05" then
-              "''${config.xdg.configHome}/zsh"
-            else
-              config.home.homeDirectory
-          '';
-          example = literalExpression ''"''${config.xdg.configHome}/zsh"'';
+          default = homeDir;
+          defaultText = "`config.home.homeDirectory`";
+          example = "`\${config.xdg.configHome}/zsh`";
          description = ''
            Directory where the zsh configuration and more should be located,
            relative to the users home directory. The default is the home
@@ -401,24 +391,7 @@ in
                  - config.xdg.dataHome (XDG data directory)
                  - config.xdg.cacheHome (XDG cache directory)
                ''
-              ]
-            ++
-              lib.optionals
-                (
-                  config.xdg.enable
-                  && !lib.versionAtLeast config.home.stateVersion "26.05"
-                  && options.programs.zsh.dotDir.highestPrio >= 1500
-                )
-                [
-                  ''
-                    The default value of `programs.zsh.dotDir` will change in future versions.
-                    You are currently using the legacy default (home directory) because `home.stateVersion` is less than "26.05".
-                    To silence this warning and lock in the current behavior, set:
-                      programs.zsh.dotDir = config.home.homeDirectory;
-                    To adopt the new behavior (XDG config directory), set:
-                      programs.zsh.dotDir = "''${config.xdg.configHome}/zsh";
-                  ''
-                ];
+              ];
        }

        (mkIf (cfg.envExtra != "") {
@@ -439,7 +412,7 @@ in

        (mkIf (dotDirAbs != homeDir) {
          home.file."${dotDirRel}/.zshenv".text = ''
-            ${config.lib.zsh.export "ZDOTDIR" dotDirAbs}
+            export ZDOTDIR=${dotDirAbs}
          '';

          # When dotDir is set, only use ~/.zshenv to source ZDOTDIR/.zshenv,
@@ -447,7 +420,7 @@ in
          # already set correctly (by e.g. spawning a zsh inside a zsh), all env
          # vars still get exported
          home.file.".zshenv".text = ''
-            source ${lib.escapeShellArg "${dotDirAbs}/.zshenv"}
+            source ${dotDirAbs}/.zshenv
          '';
        })

--- a/modules/programs/zsh/lib.nix
+++ b/modules/programs/zsh/lib.nix
@@ -1,12 +1,9 @@
 { config, lib, ... }:
 let
  cfg = config.programs.zsh;
-
-  stripSlash = lib.removeSuffix "/";
 in
 rec {
-  # Raw home directory, no trailing slash.
-  homeDir = stripSlash config.home.homeDirectory;
+  homeDir = config.home.homeDirectory;

  /*
    Escape a path string for shell usage and remove trailing slashes.
@@ -21,11 +18,10 @@ rec {
      cleanPathStr "/path/to/dir/" => "'/path/to/dir'"
      cleanPathStr "path with spaces" => "'path with spaces'"
  */
-  cleanPathStr = pathStr: lib.escapeShellArg (stripSlash pathStr);
+  cleanPathStr = pathStr: lib.escapeShellArg (lib.removeSuffix "/" pathStr);

  /*
    Convert an absolute path to a relative path by stripping the home directory prefix.
-    Returns the raw path (unescaped) for use in home.file keys.

    This function converts absolute paths within the home directory to relative paths
    by removing the home directory prefix. Paths already relative are returned as-is.
@@ -34,22 +30,19 @@ rec {
    Type: String -> String

    Example:
-      mkRelPathStr "/home/user/config" => "config"
-      mkRelPathStr "config" => "config"
-      mkRelPathStr "/home/user" => "."
+      mkRelPathStr "/home/user/config" => "'config'"
+      mkRelPathStr "config" => "'config'"
      mkRelPathStr "/etc/config" => <error>
  */
  mkRelPathStr =
    pathStr:
-    let
-      normPath = stripSlash pathStr;
-    in
-    if (!lib.hasPrefix "/" normPath) then
-      normPath
-    else if normPath == homeDir then
-      "."
-    else if (lib.hasPrefix "${homeDir}/" normPath) then
-      lib.removePrefix "${homeDir}/" normPath
+    # is already a relative path
+    if (!lib.hasPrefix "/" pathStr) then
+      cleanPathStr pathStr
+    # is an absolute path within home dir
+    else if (lib.hasPrefix homeDir pathStr) then
+      cleanPathStr (lib.removePrefix "${homeDir}/" pathStr)
+    # is an absolute path not in home dir
    else
      throw ''
        Attempted to convert an absolute path not within home directory to a
@@ -61,47 +54,47 @@ rec {
      '';

  /*
-    Convert a relative path to an absolute path.
-    Returns RAW path (unescaped).
+    Convert a relative path to an absolute path by prepending the home directory.

    This function ensures paths are absolute by prepending the home directory
    to relative paths. Already absolute paths are returned unchanged (after cleaning).
+    This function does NOT support shell variables.

    Type: String -> String

    Example:
-      mkAbsPathStr "config" => "/home/user/config"
-      mkAbsPathStr "/absolute/path" => "/absolute/path"
+      mkAbsPathStr "config" => "'/home/user/config'"
+      mkAbsPathStr "/absolute/path" => "'/absolute/path'"
  */
  mkAbsPathStr =
-    pathStr:
-    let
-      normPath = stripSlash pathStr;
-    in
-    if lib.hasPrefix "/" normPath then normPath else "${homeDir}/${normPath}";
+    pathStr: cleanPathStr ((lib.optionalString (!lib.hasPrefix "/" pathStr) "${homeDir}/") + pathStr);

  /*
-    Convert a path to absolute form while preserving shell variables.
-    Returns RAW path (unescaped) unless vars are present (then preserves vars).
+    Convert a path to absolute form while preserving shell variables for runtime expansion.

    This function handles both literal paths and shell variable expressions.
    Shell variables (containing '$') are preserved unescaped to allow runtime expansion.
-    Literal paths are made absolute.
+    Literal paths are made absolute and properly escaped for shell usage.

    Type: String -> String

    Example:
-      mkShellVarPathStr "config" => "/home/user/config"
+      mkShellVarPathStr "config" => "'/home/user/config'"
      mkShellVarPathStr "$HOME/config" => "$HOME/config"
      mkShellVarPathStr "\${XDG_CONFIG_HOME:-$HOME/.config}/app" => "\${XDG_CONFIG_HOME:-$HOME/.config}/app"
  */
  mkShellVarPathStr =
    pathStr:
    let
-      normPath = stripSlash pathStr;
-      hasShellVars = lib.hasInfix "$" normPath;
+      cleanPath = lib.removeSuffix "/" pathStr;
+      hasShellVars = lib.hasInfix "$" cleanPath;
    in
-    if hasShellVars then normPath else mkAbsPathStr normPath;
+    if hasShellVars then
+      # Does not escape shell variables, allowing them to be expanded at runtime
+      cleanPath
+    else
+      # For literal paths, make them absolute if needed and escape them
+      cleanPathStr ((lib.optionalString (!lib.hasPrefix "/" cleanPath) "${homeDir}/") + cleanPath);

  dotDirAbs = mkAbsPathStr cfg.dotDir;
  dotDirRel = mkRelPathStr cfg.dotDir;
@@ -114,5 +107,5 @@ rec {

    Type: String
  */
-  pluginsDir = dotDirAbs + (lib.optionalString (mkRelPathStr cfg.dotDir == ".") "/.zsh") + "/plugins";
+  pluginsDir = dotDirAbs + (lib.optionalString (homeDir == dotDirAbs) "/.zsh") + "/plugins";
 }
--- a/modules/services/activitywatch.nix
+++ b/modules/services/activitywatch.nix
@@ -136,7 +136,7 @@ let
    );
 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = with lib.maintainers; [ foo-dogsquared ];

  options.services.activitywatch = {
    enable = lib.mkEnableOption "ActivityWatch, an automated time tracker";
--- a/modules/services/borgmatic.nix
+++ b/modules/services/borgmatic.nix
@@ -32,72 +32,78 @@ in
    };
  };

-  config = lib.mkIf serviceConfig.enable {
-    systemd.user = {
-      services.borgmatic = {
-        Unit = {
-          Description = "borgmatic backup";
-          # Prevent borgmatic from running unless the machine is
-          # plugged into power:
-          ConditionACPower = true;
+  config = lib.mkIf serviceConfig.enable (
+    lib.mkMerge [
+      (lib.mkIf pkgs.stdenv.isLinux {
+        systemd.user = {
+          services.borgmatic = {
+            Unit = {
+              Description = "borgmatic backup";
+              # Prevent borgmatic from running unless the machine is
+              # plugged into power:
+              ConditionACPower = true;
+            };
+            Service = {
+              Type = "oneshot";
+
+              # Lower CPU and I/O priority:
+              Nice = 19;
+              IOSchedulingClass = "best-effort";
+              IOSchedulingPriority = 7;
+              IOWeight = 100;
+
+              Restart = "no";
+              LogRateLimitIntervalSec = 0;
+
+              # Delay start to prevent backups running during boot:
+              ExecStartPre = "${pkgs.coreutils}/bin/sleep 3m";
+
+              ExecStart = ''
+                ${pkgs.systemd}/bin/systemd-inhibit \
+                  --who="borgmatic" \
+                  --what="sleep:shutdown" \
+                  --why="Prevent interrupting scheduled backup" \
+                  ${programConfig.package}/bin/borgmatic \
+                    --stats \
+                    --verbosity -1 \
+                    --list \
+                    --syslog-verbosity 1
+              '';
+            };
+          };
+
+          timers.borgmatic = {
+            Unit.Description = "Run borgmatic backup";
+            Timer = {
+              OnCalendar = serviceConfig.frequency;
+              Persistent = true;
+              RandomizedDelaySec = "10m";
+            };
+            Install.WantedBy = [ "timers.target" ];
+          };
        };
-        Service = {
-          Type = "oneshot";
+      })

-          # Lower CPU and I/O priority:
-          Nice = 19;
-          IOSchedulingClass = "best-effort";
-          IOSchedulingPriority = 7;
-          IOWeight = 100;
-
-          Restart = "no";
-          LogRateLimitIntervalSec = 0;
-
-          # Delay start to prevent backups running during boot:
-          ExecStartPre = "${pkgs.coreutils}/bin/sleep 3m";
-
-          ExecStart = ''
-            ${pkgs.systemd}/bin/systemd-inhibit \
-              --who="borgmatic" \
-              --what="sleep:shutdown" \
-              --why="Prevent interrupting scheduled backup" \
-              ${programConfig.package}/bin/borgmatic \
-                --stats \
-                --verbosity -1 \
-                --list \
-                --syslog-verbosity 1
-          '';
-        };
-      };
-
-      timers.borgmatic = {
-        Unit.Description = "Run borgmatic backup";
-        Timer = {
-          OnCalendar = serviceConfig.frequency;
-          Persistent = true;
-          RandomizedDelaySec = "10m";
-        };
-        Install.WantedBy = [ "timers.target" ];
-      };
-    };
-
-    assertions = [
-      (lib.hm.darwin.assertInterval "services.borgmatic.frequency" serviceConfig.frequency pkgs)
-    ];
-
-    launchd.agents.borgmatic = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          (lib.getExe programConfig.package)
-          "--stats"
-          "--list"
+      (lib.mkIf pkgs.stdenv.isDarwin {
+        assertions = [
+          (lib.hm.darwin.assertInterval "services.borgmatic.frequency" serviceConfig.frequency pkgs)
        ];
-        ProcessType = "Background";
-        StartCalendarInterval = lib.hm.darwin.mkCalendarInterval serviceConfig.frequency;
-        StandardOutPath = "${config.home.homeDirectory}/Library/Logs/borgmatic/launchd-stdout.log";
-        StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/borgmatic/launchd-stderr.log";
-      };
-    };
-  };
+
+        launchd.agents.borgmatic = {
+          enable = true;
+          config = {
+            ProgramArguments = [
+              (lib.getExe programConfig.package)
+              "--stats"
+              "--list"
+            ];
+            ProcessType = "Background";
+            StartCalendarInterval = lib.hm.darwin.mkCalendarInterval serviceConfig.frequency;
+            StandardOutPath = "${config.home.homeDirectory}/Library/Logs/borgmatic/launchd-stdout.log";
+            StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/borgmatic/launchd-stderr.log";
+          };
+        };
+      })
+    ]
+  );
 }
--- a/modules/services/clipse.nix
+++ b/modules/services/clipse.nix
@@ -156,7 +156,7 @@ in

    xdg.configFile."clipse/custom_theme.json".source = jsonFormat.generate "theme" cfg.theme;

-    systemd.user.services.clipse = lib.mkIf (cfg.package != null) {
+    systemd.user.services.clipse = lib.mkIf (pkgs.stdenv.isLinux && (cfg.package != null)) {
      Unit = {
        Description = "Clipse listener";
        PartOf = [ "graphical-session.target" ];
--- a/modules/services/colima.nix
+++ b/modules/services/colima.nix
@@ -163,7 +163,7 @@ in
    };
  };

-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable ({
    assertions = [
      {
        assertion = (lib.count (p: p.isActive) (lib.attrValues cfg.profiles)) <= 1;
@@ -189,74 +189,78 @@ in
        if activeProfile.name != "default" then "colima-${activeProfile.name}" else "colima"
      );

-    launchd.agents = lib.mapAttrs' (
-      name: profile:
-      lib.nameValuePair "colima-${name}" {
-        enable = true;
-        config = {
-          ProgramArguments = [
-            "${lib.getExe cfg.package}"
-            "start"
-            name
-            "-f"
-            "--activate=${if profile.isActive then "true" else "false"}"
-            "--save-config=false"
-          ];
-          KeepAlive = true;
-          RunAtLoad = true;
-          EnvironmentVariables.PATH = lib.makeBinPath [
-            cfg.package
-            cfg.perlPackage
-            cfg.dockerPackage
-            cfg.sshPackage
-            cfg.coreutilsPackage
-            cfg.curlPackage
-            cfg.bashPackage
-            pkgs.darwin.DarwinTools
-          ];
-          StandardOutPath = profile.logFile;
-          StandardErrorPath = profile.logFile;
-        };
-      }
-    ) (lib.filterAttrs (_: p: p.isService) cfg.profiles);
+    launchd.agents = lib.mkIf pkgs.stdenv.isDarwin (
+      lib.mapAttrs' (
+        name: profile:
+        lib.nameValuePair "colima-${name}" {
+          enable = true;
+          config = {
+            ProgramArguments = [
+              "${lib.getExe cfg.package}"
+              "start"
+              name
+              "-f"
+              "--activate=${if profile.isActive then "true" else "false"}"
+              "--save-config=false"
+            ];
+            KeepAlive = true;
+            RunAtLoad = true;
+            EnvironmentVariables.PATH = lib.makeBinPath [
+              cfg.package
+              cfg.perlPackage
+              cfg.dockerPackage
+              cfg.sshPackage
+              cfg.coreutilsPackage
+              cfg.curlPackage
+              cfg.bashPackage
+              pkgs.darwin.DarwinTools
+            ];
+            StandardOutPath = profile.logFile;
+            StandardErrorPath = profile.logFile;
+          };
+        }
+      ) (lib.filterAttrs (_: p: p.isService) cfg.profiles)
+    );

-    systemd.user.services = lib.mapAttrs' (
-      name: profile:
-      lib.nameValuePair "colima-${name}" {
-        Unit = {
-          Description = "Colima container runtime (${name} profile)";
-          After = [ "network-online.target" ];
-          Wants = [ "network-online.target" ];
-        };
-        Service = {
-          ExecStart = ''
-            ${lib.getExe cfg.package} start ${name} \
-              -f \
-              --activate=${if profile.isActive then "true" else "false"} \
-              --save-config=false
-          '';
-          Restart = "always";
-          RestartSec = 2;
-          Environment = [
-            "PATH=${
-              lib.makeBinPath [
-                cfg.package
-                cfg.perlPackage
-                cfg.dockerPackage
-                cfg.sshPackage
-                cfg.coreutilsPackage
-                cfg.curlPackage
-                cfg.bashPackage
-              ]
-            }"
-          ];
-          StandardOutput = "append:${profile.logFile}";
-          StandardError = "append:${profile.logFile}";
-        };
-        Install = {
-          WantedBy = [ "default.target" ];
-        };
-      }
-    ) (lib.filterAttrs (_: p: p.isService) cfg.profiles);
-  };
+    systemd.user.services = lib.mkIf pkgs.stdenv.isLinux (
+      lib.mapAttrs' (
+        name: profile:
+        lib.nameValuePair "colima-${name}" {
+          Unit = {
+            Description = "Colima container runtime (${name} profile)";
+            After = [ "network-online.target" ];
+            Wants = [ "network-online.target" ];
+          };
+          Service = {
+            ExecStart = ''
+              ${lib.getExe cfg.package} start ${name} \
+                -f \
+                --activate=${if profile.isActive then "true" else "false"} \
+                --save-config=false
+            '';
+            Restart = "always";
+            RestartSec = 2;
+            Environment = [
+              "PATH=${
+                lib.makeBinPath [
+                  cfg.package
+                  cfg.perlPackage
+                  cfg.dockerPackage
+                  cfg.sshPackage
+                  cfg.coreutilsPackage
+                  cfg.curlPackage
+                  cfg.bashPackage
+                ]
+              }"
+            ];
+            StandardOutput = "append:${profile.logFile}";
+            StandardError = "append:${profile.logFile}";
+          };
+          Install = {
+            WantedBy = [ "default.target" ];
+          };
+        }
+      ) (lib.filterAttrs (_: p: p.isService) cfg.profiles)
+    );
+  });
 }
--- a/modules/services/easyeffects.nix
+++ b/modules/services/easyeffects.nix
@@ -117,8 +117,6 @@ in
    systemd.user.services.easyeffects = {
      Unit = {
        Description = "Easyeffects daemon";
-        After = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
      };

      Install.WantedBy = [ "graphical-session.target" ];
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -107,10 +107,10 @@ in
      '';
    };

-    defaultEditor = mkOption {
+    defaultEditor = mkOption rec {
      type = types.bool;
      default = false;
-      example = true;
+      example = !default;
      description = ''
        Whether to configure {command}`emacsclient` as the default
        editor using the {env}`EDITOR` and {env}`VISUAL`
@@ -119,117 +119,127 @@ in
    };
  };

-  config = mkIf cfg.enable {
-    home.sessionVariables =
-      let
-        editorBin = lib.getBin (
-          pkgs.writeShellScript "editor" ''exec ${lib.getBin cfg.package}/bin/emacsclient "''${@:---create-frame}"''
-        );
-      in
-      mkIf cfg.defaultEditor {
-        EDITOR = editorBin;
-        VISUAL = editorBin;
-      };
-
-    home.packages = optional (cfg.client.enable && pkgs.stdenv.isLinux) (lib.hiPrio clientDesktopItem);
-
-    systemd.user.services.emacs = {
-      Unit = {
-        Description = "Emacs text editor";
-        Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
-
-        After = optional (cfg.startWithUserSession == "graphical") "graphical-session.target";
-        PartOf = optional (cfg.startWithUserSession == "graphical") "graphical-session.target";
-
-        # Avoid killing the Emacs session, which may be full of
-        # unsaved buffers.
-        X-RestartIfChanged = false;
+  config = mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        home.sessionVariables =
+          let
+            editorBin = lib.getBin (
+              pkgs.writeShellScript "editor" ''exec ${lib.getBin cfg.package}/bin/emacsclient "''${@:---create-frame}"''
+            );
+          in
+          mkIf cfg.defaultEditor {
+            EDITOR = editorBin;
+            VISUAL = editorBin;
+          };
      }
-      // optionalAttrs needsSocketWorkaround {
-        # Emacs deletes its socket when shutting down, which systemd doesn't
-        # handle, resulting in a server without a socket.
-        # See https://github.com/nix-community/home-manager/issues/2018
-        RefuseManualStart = true;
-      };

-      Service = {
-        Type = "notify";
+      (mkIf pkgs.stdenv.isLinux {
+        systemd.user.services.emacs = {
+          Unit = {
+            Description = "Emacs text editor";
+            Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";

-        # We wrap ExecStart in a login shell so Emacs starts with the user's
-        # environment, most importantly $PATH and $NIX_PROFILES. It may be
-        # worth investigating a more targeted approach for user services to
-        # import the user environment.
-        ExecStart = ''${pkgs.runtimeShell} -l -c "${emacsBinPath}/emacs --fg-daemon${
-          # In case the user sets 'server-directory' or 'server-name' in
-          # their Emacs config, we want to specify the socket path explicitly
-          # so launching 'emacs.service' manually doesn't break emacsclient
-          # when using socket activation.
-          lib.optionalString cfg.socketActivation.enable "=${lib.escapeShellArg socketPath}"
-        } ${lib.escapeShellArgs cfg.extraOptions}"'';
+            After = optional (cfg.startWithUserSession == "graphical") "graphical-session.target";
+            PartOf = optional (cfg.startWithUserSession == "graphical") "graphical-session.target";

-        # Emacs will exit with status 15 after having received SIGTERM, which
-        # is the default "KillSignal" value systemd uses to stop services.
-        SuccessExitStatus = 15;
+            # Avoid killing the Emacs session, which may be full of
+            # unsaved buffers.
+            X-RestartIfChanged = false;
+          }
+          // optionalAttrs needsSocketWorkaround {
+            # Emacs deletes its socket when shutting down, which systemd doesn't
+            # handle, resulting in a server without a socket.
+            # See https://github.com/nix-community/home-manager/issues/2018
+            RefuseManualStart = true;
+          };

-        Restart = "on-failure";
-      }
-      // optionalAttrs needsSocketWorkaround {
-        # Use read-only directory permissions to prevent emacs from
-        # deleting systemd's socket file before exiting.
-        ExecStartPost = "${pkgs.coreutils}/bin/chmod --changes -w ${socketDir}";
-        ExecStopPost = "${pkgs.coreutils}/bin/chmod --changes +w ${socketDir}";
-      };
-    }
-    // optionalAttrs (cfg.startWithUserSession != false) {
-      Install = {
-        WantedBy = [
-          (if cfg.startWithUserSession == true then "default.target" else "graphical-session.target")
-        ];
-      };
-    };
+          Service = {
+            Type = "notify";

-    systemd.user.sockets.emacs = mkIf cfg.socketActivation.enable {
-      Unit = {
-        Description = "Emacs text editor";
-        Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
-      };
+            # We wrap ExecStart in a login shell so Emacs starts with the user's
+            # environment, most importantly $PATH and $NIX_PROFILES. It may be
+            # worth investigating a more targeted approach for user services to
+            # import the user environment.
+            ExecStart = ''${pkgs.runtimeShell} -l -c "${emacsBinPath}/emacs --fg-daemon${
+              # In case the user sets 'server-directory' or 'server-name' in
+              # their Emacs config, we want to specify the socket path explicitly
+              # so launching 'emacs.service' manually doesn't break emacsclient
+              # when using socket activation.
+              lib.optionalString cfg.socketActivation.enable "=${lib.escapeShellArg socketPath}"
+            } ${lib.escapeShellArgs cfg.extraOptions}"'';

-      Socket = {
-        ListenStream = socketPath;
-        FileDescriptorName = "server";
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-        # This prevents the service from immediately starting again
-        # after being stopped, due to the function
-        # `server-force-stop' present in `kill-emacs-hook', which
-        # calls `server-running-p', which opens the socket file.
-        FlushPending = true;
-      };
+            # Emacs will exit with status 15 after having received SIGTERM, which
+            # is the default "KillSignal" value systemd uses to stop services.
+            SuccessExitStatus = 15;

-      Install = {
-        WantedBy = [ "sockets.target" ];
-        # Adding this Requires= dependency ensures that systemd
-        # manages the socket file, in the case where the service is
-        # started when the socket is stopped.
-        # The socket unit is implicitly ordered before the service.
-        RequiredBy = [ "emacs.service" ];
-      };
-    };
-
-    launchd.agents.emacs = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          "${cfg.package}/bin/emacs"
-          "--fg-daemon"
-        ]
-        ++ cfg.extraOptions;
-        RunAtLoad = true;
-        KeepAlive = {
-          Crashed = true;
-          SuccessfulExit = false;
+            Restart = "on-failure";
+          }
+          // optionalAttrs needsSocketWorkaround {
+            # Use read-only directory permissions to prevent emacs from
+            # deleting systemd's socket file before exiting.
+            ExecStartPost = "${pkgs.coreutils}/bin/chmod --changes -w ${socketDir}";
+            ExecStopPost = "${pkgs.coreutils}/bin/chmod --changes +w ${socketDir}";
+          };
+        }
+        // optionalAttrs (cfg.startWithUserSession != false) {
+          Install = {
+            WantedBy = [
+              (if cfg.startWithUserSession == true then "default.target" else "graphical-session.target")
+            ];
+          };
        };
-      };
-    };
-  };
+
+        home.packages = optional cfg.client.enable (lib.hiPrio clientDesktopItem);
+      })
+
+      (mkIf (cfg.socketActivation.enable && pkgs.stdenv.isLinux) {
+        systemd.user.sockets.emacs = {
+          Unit = {
+            Description = "Emacs text editor";
+            Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
+          };
+
+          Socket = {
+            ListenStream = socketPath;
+            FileDescriptorName = "server";
+            SocketMode = "0600";
+            DirectoryMode = "0700";
+            # This prevents the service from immediately starting again
+            # after being stopped, due to the function
+            # `server-force-stop' present in `kill-emacs-hook', which
+            # calls `server-running-p', which opens the socket file.
+            FlushPending = true;
+          };
+
+          Install = {
+            WantedBy = [ "sockets.target" ];
+            # Adding this Requires= dependency ensures that systemd
+            # manages the socket file, in the case where the service is
+            # started when the socket is stopped.
+            # The socket unit is implicitly ordered before the service.
+            RequiredBy = [ "emacs.service" ];
+          };
+        };
+      })
+
+      (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;
+            };
+          };
+        };
+      })
+    ]
+  );
 }
--- a/modules/services/git-sync.nix
+++ b/modules/services/git-sync.nix
@@ -15,12 +15,49 @@ let

  cfg = config.services.git-sync;

-  services =
-    mkService:
-    lib.mapAttrs' (name: repo: {
-      name = "git-sync-${name}";
-      value = mkService name repo;
-    }) cfg.repositories;
+  mkUnit = name: repo: {
+    Unit.Description = "Git Sync ${name}";
+
+    Install.WantedBy = [ "default.target" ];
+
+    Service = {
+      Environment = [
+        "PATH=${
+          lib.makeBinPath (
+            with pkgs;
+            [
+              openssh
+              git
+            ]
+            ++ repo.extraPackages
+          )
+        }"
+        "GIT_SYNC_DIRECTORY=${lib.strings.escapeShellArg repo.path}"
+        "GIT_SYNC_COMMAND=${cfg.package}/bin/git-sync"
+        "GIT_SYNC_REPOSITORY=${lib.strings.escapeShellArg repo.uri}"
+        "GIT_SYNC_INTERVAL=${toString repo.interval}"
+      ];
+      ExecStart = "${cfg.package}/bin/git-sync-on-inotify";
+      Restart = "on-abort";
+    };
+  };
+
+  mkAgent = name: repo: {
+    enable = true;
+    config = {
+      StartInterval = repo.interval;
+      ProcessType = "Background";
+      WorkingDirectory = "${repo.path}";
+      WatchPaths = [ "${repo.path}" ];
+      ProgramArguments = [ "${cfg.package}/bin/git-sync" ];
+    };
+  };
+
+  mkService = if pkgs.stdenv.isLinux then mkUnit else mkAgent;
+  services = lib.mapAttrs' (name: repo: {
+    name = "git-sync-${name}";
+    value = mkService name repo;
+  }) cfg.repositories;

  repositoryType = types.submodule (
    { name, ... }:
@@ -104,48 +141,11 @@ in
    };
  };

-  config = mkIf cfg.enable {
-    launchd.agents = services (
-      name: repo: {
-        enable = true;
-        config = {
-          StartInterval = repo.interval;
-          ProcessType = "Background";
-          WorkingDirectory = "${repo.path}";
-          WatchPaths = [ "${repo.path}" ];
-          ProgramArguments = [ "${cfg.package}/bin/git-sync" ];
-        };
-      }
-    );
-
-    systemd.user.services = services (
-      name: repo: {
-        Unit.Description = "Git Sync ${name}";
-
-        Install.WantedBy = [ "default.target" ];
-
-        Service = {
-          Environment = [
-            "PATH=${
-              lib.makeBinPath (
-                with pkgs;
-                [
-                  openssh
-                  git
-                ]
-                ++ repo.extraPackages
-              )
-            }"
-            "GIT_SYNC_DIRECTORY=${lib.strings.escapeShellArg repo.path}"
-            "GIT_SYNC_COMMAND=${cfg.package}/bin/git-sync"
-            "GIT_SYNC_REPOSITORY=${lib.strings.escapeShellArg repo.uri}"
-            "GIT_SYNC_INTERVAL=${toString repo.interval}"
-          ];
-          ExecStart = "${cfg.package}/bin/git-sync-on-inotify";
-          Restart = "on-abort";
-        };
-      }
-    );
-  };
+  config = mkIf cfg.enable (
+    lib.mkMerge [
+      (mkIf pkgs.stdenv.isLinux { systemd.user.services = services; })
+      (mkIf pkgs.stdenv.isDarwin { launchd.agents = services; })
+    ]
+  );

 }
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -344,115 +344,125 @@ in
    };
  };

-  config = mkIf cfg.enable {
-    # Grab the default binary name and fallback to expected value if `meta.mainProgram` not set
-    services.gpg-agent.pinentry.program = lib.mkOptionDefault (
-      cfg.pinentry.package.meta.mainProgram or "pinentry"
-    );
+  config = mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        # Grab the default binary name and fallback to expected value if `meta.mainProgram` not set
+        services.gpg-agent.pinentry.program = lib.mkOptionDefault (
+          cfg.pinentry.package.meta.mainProgram or "pinentry"
+        );

-    home.file."${homedir}/gpg-agent.conf".text = lib.concatStringsSep "\n" (
-      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
-      ) "default-cache-ttl-ssh ${toString cfg.defaultCacheTtlSsh}"
-      ++ optional (cfg.maxCacheTtl != null) "max-cache-ttl ${toString cfg.maxCacheTtl}"
-      ++ optional (cfg.maxCacheTtlSsh != null) "max-cache-ttl-ssh ${toString cfg.maxCacheTtlSsh}"
-      ++ optional (
-        cfg.pinentry.package != null
-      ) "pinentry-program ${lib.getExe' cfg.pinentry.package cfg.pinentry.program}"
-      ++ [ cfg.extraConfig ]
-    );
+        home.file."${homedir}/gpg-agent.conf".text = lib.concatStringsSep "\n" (
+          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
+          ) "default-cache-ttl-ssh ${toString cfg.defaultCacheTtlSsh}"
+          ++ optional (cfg.maxCacheTtl != null) "max-cache-ttl ${toString cfg.maxCacheTtl}"
+          ++ optional (cfg.maxCacheTtlSsh != null) "max-cache-ttl-ssh ${toString cfg.maxCacheTtlSsh}"
+          ++ optional (
+            cfg.pinentry.package != null
+          ) "pinentry-program ${lib.getExe' cfg.pinentry.package cfg.pinentry.program}"
+          ++ [ cfg.extraConfig ]
+        );

-    home.sessionVariablesExtra = optionalString cfg.enableSshSupport ''
-      unset SSH_AGENT_PID
-      if [ -z "$SSH_CONNECTION" -o -z "$SSH_AUTH_SOCK" ] && [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-        export SSH_AUTH_SOCK="$(${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-      fi
-    '';
+        home.sessionVariablesExtra = optionalString cfg.enableSshSupport ''
+          unset SSH_AGENT_PID
+          if [ -z "$SSH_CONNECTION" -o -z "$SSH_AUTH_SOCK" ] && [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+            export SSH_AUTH_SOCK="$(${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket)"
+          fi
+        '';

-    programs = {
-      bash.initExtra = mkIf cfg.enableBashIntegration gpgBashInitStr;
-      zsh.initContent = mkIf cfg.enableZshIntegration gpgZshInitStr;
-      fish.interactiveShellInit = mkIf cfg.enableFishIntegration gpgFishInitStr;
-      nushell.extraConfig = mkIf cfg.enableNushellIntegration gpgNushellInitStr;
-    };
-
-    # Trailing newlines are important
-    home.file."${homedir}/sshcontrol" = mkIf (cfg.sshKeys != null) {
-      text = lib.concatMapStrings (s: ''
-        ${s}
-      '') cfg.sshKeys;
-    };
-
-    systemd.user = {
-      services.gpg-agent = {
-        Unit = {
-          Description = "GnuPG cryptographic agent and passphrase cache";
-          Documentation = "man:gpg-agent(1)";
-          Requires = "gpg-agent.socket";
-          After = "gpg-agent.socket";
-          # This is a socket-activated service:
-          RefuseManualStart = true;
+        programs = {
+          bash.initExtra = mkIf cfg.enableBashIntegration gpgBashInitStr;
+          zsh.initContent = mkIf cfg.enableZshIntegration gpgZshInitStr;
+          fish.interactiveShellInit = mkIf cfg.enableFishIntegration gpgFishInitStr;
+          nushell.extraConfig = mkIf cfg.enableNushellIntegration gpgNushellInitStr;
        };
+      }

-        Service = {
-          ExecStart = "${gpgPkg}/bin/gpg-agent --supervised" + optionalString cfg.verbose " --verbose";
-          ExecReload = "${gpgPkg}/bin/gpgconf --reload gpg-agent";
-          Environment = [ "GNUPGHOME=${homedir}" ];
-        };
-      };
+      (mkIf (cfg.sshKeys != null) {
+        # Trailing newlines are important
+        home.file."${homedir}/sshcontrol".text = lib.concatMapStrings (s: ''
+          ${s}
+        '') cfg.sshKeys;
+      })

-      sockets = {
-        gpg-agent = mkSocket {
-          desc = "GnuPG cryptographic agent and passphrase cache";
-          docs = "man:gpg-agent(1)";
-          stream = "S.gpg-agent";
-          fdName = "std";
-        };
+      (lib.mkMerge [
+        (mkIf pkgs.stdenv.isLinux {
+          systemd.user = {
+            services.gpg-agent = {
+              Unit = {
+                Description = "GnuPG cryptographic agent and passphrase cache";
+                Documentation = "man:gpg-agent(1)";
+                Requires = "gpg-agent.socket";
+                After = "gpg-agent.socket";
+                # This is a socket-activated service:
+                RefuseManualStart = true;
+              };

-        gpg-agent-ssh = mkIf cfg.enableSshSupport (mkSocket {
-          desc = "GnuPG cryptographic agent (ssh-agent emulation)";
-          docs = "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
-          stream = "S.gpg-agent.ssh";
-          fdName = "ssh";
-        });
+              Service = {
+                ExecStart = "${gpgPkg}/bin/gpg-agent --supervised" + optionalString cfg.verbose " --verbose";
+                ExecReload = "${gpgPkg}/bin/gpgconf --reload gpg-agent";
+                Environment = [ "GNUPGHOME=${homedir}" ];
+              };
+            };

-        gpg-agent-extra = mkIf cfg.enableExtraSocket (mkSocket {
-          desc = "GnuPG cryptographic agent and passphrase cache (restricted)";
-          docs = "man:gpg-agent(1) man:ssh(1)";
-          stream = "S.gpg-agent.extra";
-          fdName = "extra";
-        });
-      };
-    };
+            sockets = {
+              gpg-agent = mkSocket {
+                desc = "GnuPG cryptographic agent and passphrase cache";
+                docs = "man:gpg-agent(1)";
+                stream = "S.gpg-agent";
+                fdName = "std";
+              };

-    launchd.agents.gpg-agent = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          "${gpgPkg}/bin/gpg-agent"
-          "--supervised"
-        ]
-        ++ optional cfg.verbose "--verbose";
-        EnvironmentVariables = {
-          GNUPGHOME = homedir;
-        };
-        KeepAlive = {
-          Crashed = true;
-          SuccessfulExit = false;
-        };
-        ProcessType = "Background";
-        RunAtLoad = cfg.enableSshSupport;
-        Sockets = {
-          Agent = mkAgentSock "S.gpg-agent";
-          Ssh = mkIf cfg.enableSshSupport (mkAgentSock "S.gpg-agent.ssh");
-          Extra = mkIf cfg.enableExtraSocket (mkAgentSock "S.gpg-agent.extra");
-        };
-      };
-    };
-  };
+              gpg-agent-ssh = mkIf cfg.enableSshSupport (mkSocket {
+                desc = "GnuPG cryptographic agent (ssh-agent emulation)";
+                docs = "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
+                stream = "S.gpg-agent.ssh";
+                fdName = "ssh";
+              });
+
+              gpg-agent-extra = mkIf cfg.enableExtraSocket (mkSocket {
+                desc = "GnuPG cryptographic agent and passphrase cache (restricted)";
+                docs = "man:gpg-agent(1) man:ssh(1)";
+                stream = "S.gpg-agent.extra";
+                fdName = "extra";
+              });
+            };
+          };
+        })
+
+        (mkIf pkgs.stdenv.isDarwin {
+          launchd.agents.gpg-agent = {
+            enable = true;
+            config = {
+              ProgramArguments = [
+                "${gpgPkg}/bin/gpg-agent"
+                "--supervised"
+              ]
+              ++ optional cfg.verbose "--verbose";
+              EnvironmentVariables = {
+                GNUPGHOME = homedir;
+              };
+              KeepAlive = {
+                Crashed = true;
+                SuccessfulExit = false;
+              };
+              ProcessType = "Background";
+              RunAtLoad = cfg.enableSshSupport;
+              Sockets = {
+                Agent = mkAgentSock "S.gpg-agent";
+                Ssh = mkIf cfg.enableSshSupport (mkAgentSock "S.gpg-agent.ssh");
+                Extra = mkIf cfg.enableExtraSocket (mkAgentSock "S.gpg-agent.extra");
+              };
+            };
+          };
+        })
+      ])
+    ]
+  );
 }
--- a/modules/services/home-manager-auto-expire.nix
+++ b/modules/services/home-manager-auto-expire.nix
@@ -81,38 +81,46 @@ in
    };
  };

-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (lib.mkIf pkgs.stdenv.isLinux {
+        systemd.user = {
+          timers.home-manager-auto-expire = {
+            Unit.Description = "Home Manager expire generations timer";

-    systemd.user = {
-      timers.home-manager-auto-expire = {
-        Unit.Description = "Home Manager expire generations timer";
-        Install.WantedBy = [ "timers.target" ];
-        Timer = {
-          OnCalendar = cfg.frequency;
-          Unit = "home-manager-auto-expire.service";
-          Persistent = true;
+            Install.WantedBy = [ "timers.target" ];
+
+            Timer = {
+              OnCalendar = cfg.frequency;
+              Unit = "home-manager-auto-expire.service";
+              Persistent = true;
+            };
+          };
+
+          services.home-manager-auto-expire = {
+            Unit.Description = "Home Manager expire generations";
+
+            Service.ExecStart = toString script;
+          };
        };
-      };
-      services.home-manager-auto-expire = {
-        Unit.Description = "Home Manager expire generations";
-        Service.ExecStart = toString script;
-      };
-    };
+      })

-    assertions = [
-      (lib.hm.darwin.assertInterval "services.home-manager.autoExpire.frequency" cfg.frequency pkgs)
-    ];
+      (lib.mkIf pkgs.stdenv.isDarwin {
+        assertions = [
+          (lib.hm.darwin.assertInterval "services.home-manager.autoExpire.frequency" cfg.frequency pkgs)
+        ];

-    launchd.agents.home-manager-auto-expire = {
-      enable = true;
-      config = {
-        ProgramArguments = [ (toString script) ];
-        ProcessType = "Background";
-        StartCalendarInterval = lib.hm.darwin.mkCalendarInterval cfg.frequency;
-        StandardOutPath = "${config.home.homeDirectory}/Library/Logs/home-manager-auto-expire/launchd-stdout.log";
-        StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/home-manager-auto-expire/launchd-stderr.log";
-      };
-    };
-
-  };
+        launchd.agents.home-manager-auto-expire = {
+          enable = true;
+          config = {
+            ProgramArguments = [ (toString script) ];
+            ProcessType = "Background";
+            StartCalendarInterval = lib.hm.darwin.mkCalendarInterval cfg.frequency;
+            StandardOutPath = "${config.home.homeDirectory}/Library/Logs/home-manager-auto-expire/launchd-stdout.log";
+            StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/home-manager-auto-expire/launchd-stderr.log";
+          };
+        };
+      })
+    ]
+  );
 }
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -45,18 +45,16 @@ in
      '';
      example = lib.literalExpression ''
        {
+          ipc = "on";
          splash = false;
+          splash_offset = 2.0;
+
+          preload =
+            [ "/share/wallpapers/buttons.png" "/share/wallpapers/cat_pacman.png" ];

          wallpaper = [
-            {
-              monitor = "DP-3";
-              path = "/share/wallpapers/buttons.png";
-              fit_mode = "tile";
-            }
-            {
-              monitor = "DP-1";
-              path = "/share/wallpapers/cat_pacman.png";
-            }
+            "DP-3,/share/wallpapers/buttons.png"
+            "DP-1,/share/wallpapers/cat_pacman.png"
          ];
        }
      '';
@@ -64,10 +62,7 @@ in

    importantPrefixes = lib.mkOption {
      type = with lib.types; listOf str;
-      default = [
-        "$"
-        "monitor"
-      ];
+      default = [ "$" ];
      example = [ "$" ];
      description = ''
        List of prefix of attributes to source at the top of the config.
--- a/modules/services/hyprshell.nix
+++ b/modules/services/hyprshell.nix
@@ -29,7 +29,7 @@ in
      default = { };
      description = ''
        Configuration settings for hyprshell. All the avaiblable
-        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/docs/CONFIGURE.md#config-options>
+        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/CONFIGURE.md#config-options>
      '';
    };

@@ -38,7 +38,7 @@ in
      default = "";
      description = ''
        CSS file for customizing hyprshell. All the available
-        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/docs/CONFIGURE.md#css>
+        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/CONFIGURE.md#css>
      '';
    };

--- a/modules/services/linux-wallpaperengine.nix
+++ b/modules/services/linux-wallpaperengine.nix
@@ -8,6 +8,7 @@ let
  inherit (lib) mkOption types;

  cfg = config.services.linux-wallpaperengine;
+
 in
 {
  meta.maintainers = [ lib.hm.maintainers.ckgxrg ];
@@ -104,10 +105,10 @@ in
  config = lib.mkIf cfg.enable {
    assertions = [
      (lib.hm.assertions.assertPlatform "services.linux-wallpaperengine" pkgs lib.platforms.linux)
-      {
+      ({
        assertion = cfg.wallpapers != null;
        message = "linux-wallpaperengine: You must set at least one wallpaper";
-      }
+      })
    ];

    home.packages = [ cfg.package ];
@@ -117,19 +118,17 @@ in
        args = lib.lists.forEach cfg.wallpapers (
          each:
          lib.concatStringsSep " " (
-            lib.cli.toCommandLineGNU { } {
+            lib.cli.toGNUCommandLine { } {
              screen-root = each.monitor;
              inherit (each) scaling fps;
-              inherit (each.audio) silent;
+              silent = each.audio.silent;
              noautomute = !each.audio.automute;
              no-audio-processing = !each.audio.processing;
            }
            ++ each.extraOptions
-            ++ [
-              "--bg"
-              each.wallpaperId
-            ]
          )
+          # This has to be the last argument in each group
+          + " --bg ${each.wallpaperId}"
        );
      in
      {
@@ -139,12 +138,11 @@ in
          PartOf = [ "graphical-session.target" ];
        };
        Service = {
-          ExecStart = lib.concatStringsSep " " (
-            [ (lib.getExe cfg.package) ]
-            ++ lib.optional (cfg.assetsPath != null) "--assets-dir ${cfg.assetsPath}"
-            ++ lib.optional (cfg.clamping != null) "--clamping ${cfg.clamping}"
-            ++ args
-          );
+          ExecStart =
+            lib.getExe cfg.package
+            + (lib.optionalString (cfg.assetsPath != null) " --assets-dir ${cfg.assetsPath} ")
+            + (lib.optionalString (cfg.clamping != null) "--clamping ${cfg.clamping} ")
+            + (lib.strings.concatStringsSep " " args);
          Restart = "on-failure";
        };
        Install = {
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -75,7 +75,7 @@ let

 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.foo-dogsquared ];

  options.services.mopidy = {
    enable = lib.mkEnableOption "Mopidy music player daemon";
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -22,15 +22,6 @@ in

      package = lib.mkPackageOption pkgs "mpd" { };

-      enableSessionVariables = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to set {env}`MPD_HOST` {env}`MPD_PORT` environment variables
-          according to {option}`services.mpd.network`.
-        '';
-      };
-
      musicDirectory = mkOption {
        type = with types; either path str;
        defaultText = lib.literalExpression ''
@@ -164,17 +155,7 @@ in
      );
    in
    mkIf cfg.enable {
-      home = {
-        packages = [ cfg.package ];
-        sessionVariables = mkIf cfg.enableSessionVariables (
-          {
-            MPD_PORT = builtins.toString cfg.network.port;
-          }
-          // lib.optionalAttrs (cfg.network.listenAddress != "any") {
-            MPD_HOST = cfg.network.listenAddress;
-          }
-        );
-      };
+      home.packages = [ cfg.package ];

      services.mpd = lib.mkMerge [
        (mkIf (lib.versionAtLeast config.home.stateVersion "22.11" && config.xdg.userDirs.enable) {
@@ -186,7 +167,7 @@ in
        })
      ];

-      systemd.user = {
+      systemd.user = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
        services.mpd = {
          Unit = lib.mkMerge [
            {
@@ -240,7 +221,7 @@ in
        };
      };

-      launchd.agents.mpd = {
+      launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
        enable = true;
        config = {
          ProgramArguments = [
--- a/modules/services/nix-gc.nix
+++ b/modules/services/nix-gc.nix
@@ -83,51 +83,56 @@ in
    };
  };

-  config = lib.mkIf cfg.automatic {
-    systemd.user.services.nix-gc = {
-      Unit = {
-        Description = "Nix Garbage Collector";
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = pkgs.writeShellScript "nix-gc" "exec ${nixPackage}/bin/nix-collect-garbage ${
-          lib.optionalString (cfg.options != null) cfg.options
-        }";
-      };
-    };
+  config = lib.mkIf cfg.automatic (
+    lib.mkMerge [
+      (lib.mkIf pkgs.stdenv.isLinux {
+        systemd.user.services.nix-gc = {
+          Unit = {
+            Description = "Nix Garbage Collector";
+          };
+          Service = {
+            Type = "oneshot";
+            ExecStart = pkgs.writeShellScript "nix-gc" "exec ${nixPackage}/bin/nix-collect-garbage ${
+              lib.optionalString (cfg.options != null) cfg.options
+            }";
+          };
+        };
+        systemd.user.timers.nix-gc = {
+          Unit = {
+            Description = "Nix Garbage Collector";
+          };
+          Timer = {
+            OnCalendar = cfg.dates;
+            RandomizedDelaySec = cfg.randomizedDelaySec;
+            Persistent = cfg.persistent;
+            Unit = "nix-gc.service";
+          };
+          Install = {
+            WantedBy = [ "timers.target" ];
+          };
+        };
+      })

-    systemd.user.timers.nix-gc = {
-      Unit = {
-        Description = "Nix Garbage Collector";
-      };
-      Timer = {
-        OnCalendar = cfg.dates;
-        RandomizedDelaySec = cfg.randomizedDelaySec;
-        Persistent = cfg.persistent;
-        Unit = "nix-gc.service";
-      };
-      Install = {
-        WantedBy = [ "timers.target" ];
-      };
-    };
+      (lib.mkIf pkgs.stdenv.isDarwin {
+        assertions = [
+          {
+            assertion = (lib.length cfg.dates) == 1;
+            message = "On Darwin, `nix.gc.dates` must contain a single element.";
+          }
+          (lib.hm.darwin.assertInterval "nix.gc.dates.*" (lib.elemAt cfg.dates 0) pkgs)
+        ];

-    assertions = [
-      {
-        assertion = pkgs.stdenv.isDarwin -> (lib.length cfg.dates == 1);
-        message = "On Darwin, `nix.gc.dates` must contain a single element.";
-      }
-      (lib.hm.darwin.assertInterval "nix.gc.dates.*" (lib.elemAt cfg.dates 0) pkgs)
-    ];
-
-    launchd.agents.nix-gc = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          "${nixPackage}/bin/nix-collect-garbage"
-        ]
-        ++ lib.optional (cfg.options != null) cfg.options;
-        StartCalendarInterval = lib.hm.darwin.mkCalendarInterval (lib.elemAt cfg.dates 0);
-      };
-    };
-  };
+        launchd.agents.nix-gc = {
+          enable = true;
+          config = {
+            ProgramArguments = [
+              "${nixPackage}/bin/nix-collect-garbage"
+            ]
+            ++ lib.optional (cfg.options != null) cfg.options;
+            StartCalendarInterval = lib.hm.darwin.mkCalendarInterval (lib.elemAt cfg.dates 0);
+          };
+        };
+      })
+    ]
+  );
 }
--- a/modules/services/ollama.nix
+++ b/modules/services/ollama.nix
@@ -87,7 +87,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" ];
@@ -105,7 +105,7 @@ in
      };
    };

-    launchd.agents.ollama = {
+    launchd.agents.ollama = mkIf pkgs.stdenv.isDarwin {
      enable = true;
      config = {
        ProgramArguments = [
--- a/modules/services/pueue.nix
+++ b/modules/services/pueue.nix
@@ -11,7 +11,7 @@ let
  pueuedBin = "${cfg.package}/bin/pueued";
 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.AndersonTorres ];

  options.services.pueue = {
    enable = lib.mkEnableOption "Pueue, CLI process scheduler and manager";
@@ -35,49 +35,51 @@ in
    };
  };

-  config = lib.mkIf cfg.enable {
-    home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
+      }
+      (lib.mkIf pkgs.stdenv.isLinux {
+        xdg.configFile."pueue/pueue.yml".source = configFile;
+        systemd.user = lib.mkIf (cfg.package != null) {
+          services.pueued = {
+            Unit = {
+              Description = "Pueue Daemon - CLI process scheduler and manager";
+            };

-    xdg.configFile."pueue/pueue.yml" = lib.mkIf pkgs.stdenv.isLinux { source = configFile; };
+            Service = {
+              Restart = "on-failure";
+              ExecStart = "${pueuedBin} -v -c ${configFile}";
+            };

-    systemd.user = lib.mkIf (cfg.package != null) {
-      services.pueued = {
-        Unit = {
-          Description = "Pueue Daemon - CLI process scheduler and manager";
+            Install.WantedBy = [ "default.target" ];
+          };
        };
+      })
+      (lib.mkIf pkgs.stdenv.isDarwin {
+        # This is the default configuration file location for pueue on
+        # darwin (https://github.com/Nukesor/pueue/wiki/Configuration)
+        home.file."Library/Application Support/pueue/pueue.yml".source = configFile;
+        launchd.agents.pueued = lib.mkIf (cfg.package != null) {
+          enable = true;

-        Service = {
-          Restart = "on-failure";
-          ExecStart = "${pueuedBin} -v -c ${configFile}";
+          config = {
+            ProgramArguments = [
+              pueuedBin
+              "-v"
+              "-c"
+              "${configFile}"
+            ];
+            KeepAlive = {
+              Crashed = true;
+              SuccessfulExit = false;
+            };
+            ProcessType = "Background";
+            RunAtLoad = true;
+          };
        };
-
-        Install.WantedBy = [ "default.target" ];
-      };
-    };
-
-    # This is the default configuration file location for pueue on
-    # darwin (https://github.com/Nukesor/pueue/wiki/Configuration)
-    home.file."Library/Application Support/pueue/pueue.yml" = lib.mkIf pkgs.stdenv.isDarwin {
-      source = configFile;
-    };
-
-    launchd.agents.pueued = lib.mkIf (cfg.package != null) {
-      enable = true;
-
-      config = {
-        ProgramArguments = [
-          pueuedBin
-          "-v"
-          "-c"
-          "${configFile}"
-        ];
-        KeepAlive = {
-          Crashed = true;
-          SuccessfulExit = false;
-        };
-        ProcessType = "Background";
-        RunAtLoad = true;
-      };
-    };
-  };
+      })
+    ]
+  );
 }
--- a/modules/services/recoll.nix
+++ b/modules/services/recoll.nix
@@ -103,7 +103,7 @@ let
  settingsFormat = recollConfFormat { };
 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.foo-dogsquared ];

  options.services.recoll = {
    enable = lib.mkEnableOption "Recoll file index service";
--- a/modules/services/restic.nix
+++ b/modules/services/restic.nix
@@ -62,13 +62,15 @@ let
      ))
    ];

+  inherit (pkgs.stdenv.hostPlatform) isLinux;
+
  # Until we have launchd support (#7924), mark the options
  # not used in the helper script as "linux exclusive"
  linuxExclusive =
    option:
    option
    // {
-      readOnly = !pkgs.stdenv.hostPlatform.isLinux;
+      readOnly = pkgs.stdenv.hostPlatform.isDarwin;

      description = option.description + ''

@@ -391,209 +393,219 @@ in
    };
  };

-  config = lib.mkIf cfg.enable {
-    assertions = lib.mapAttrsToList (n: v: {
-      assertion = lib.xor (v.repository == null) (v.repositoryFile == null);
-      message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";
-    }) cfg.backups;
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        assertions = lib.mapAttrsToList (n: v: {
+          assertion = lib.xor (v.repository == null) (v.repositoryFile == null);
+          message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";
+        }) cfg.backups;
+      }

-    systemd.user.services = lib.mapAttrs' (
-      name: backup:
-      let
-        doBackup = backup.dynamicFilesFrom != null || backup.paths != [ ];
-        doPrune = backup.pruneOpts != [ ];
-        doCheck = backup.runCheck;
-        serviceName = "restic-backups-${name}";
+      (lib.mkIf isLinux {
+        systemd.user.services = lib.mapAttrs' (
+          name: backup:
+          let
+            doBackup = backup.dynamicFilesFrom != null || backup.paths != [ ];
+            doPrune = backup.pruneOpts != [ ];
+            doCheck = backup.runCheck;
+            serviceName = "restic-backups-${name}";

-        extraOptions = lib.concatMap (arg: [
-          "-o"
-          arg
-        ]) backup.extraOptions;
+            extraOptions = lib.concatMap (arg: [
+              "-o"
+              arg
+            ]) backup.extraOptions;

-        excludeFile = pkgs.writeText "exclude-patterns" (lib.concatLines backup.exclude);
-        excludeFileFlag = "--exclude-file=${excludeFile}";
+            excludeFile = pkgs.writeText "exclude-patterns" (lib.concatLines backup.exclude);
+            excludeFileFlag = "--exclude-file=${excludeFile}";

-        filesFromTmpFile = "/run/user/$UID/${serviceName}/includes";
-        filesFromFlag = "--files-from=${filesFromTmpFile}";
+            filesFromTmpFile = "/run/user/$UID/${serviceName}/includes";
+            filesFromFlag = "--files-from=${filesFromTmpFile}";

-        inhibitCmd = lib.optionals backup.inhibitsSleep [
-          "${pkgs.systemd}/bin/systemd-inhibit"
-          "--mode='block'"
-          "--who='restic'"
-          "--what='idle'"
-          "--why=${lib.escapeShellArg "Scheduled backup ${name}"}"
-        ];
+            inhibitCmd = lib.optionals backup.inhibitsSleep [
+              "${pkgs.systemd}/bin/systemd-inhibit"
+              "--mode='block'"
+              "--who='restic'"
+              "--what='idle'"
+              "--why=${lib.escapeShellArg "Scheduled backup ${name}"}"
+            ];

-        mkResticCmd' =
-          pre: args:
-          lib.concatStringsSep " " (
-            pre ++ lib.singleton (lib.getExe backup.package) ++ extraOptions ++ lib.flatten args
-          );
-        mkResticCmd = mkResticCmd' [ ];
+            mkResticCmd' =
+              pre: args:
+              lib.concatStringsSep " " (
+                pre ++ lib.singleton (lib.getExe backup.package) ++ extraOptions ++ lib.flatten args
+              );
+            mkResticCmd = mkResticCmd' [ ];

-        backupCmd =
-          "${lib.getExe pkgs.bash} -c "
-          + lib.escapeShellArg (
-            mkResticCmd' inhibitCmd [
-              "backup"
-              backup.extraBackupArgs
-              excludeFileFlag
-              filesFromFlag
-            ]
-          );
+            backupCmd =
+              "${lib.getExe pkgs.bash} -c "
+              + lib.escapeShellArg (
+                mkResticCmd' inhibitCmd [
+                  "backup"
+                  backup.extraBackupArgs
+                  excludeFileFlag
+                  filesFromFlag
+                ]
+              );

-        forgetCmd = mkResticCmd [
-          "forget"
-          "--prune"
-          backup.pruneOpts
-        ];
-        checkCmd = mkResticCmd [
-          "check"
-          backup.checkOpts
-        ];
-        unlockCmd = mkResticCmd "unlock";
-      in
-      lib.nameValuePair serviceName {
-        Unit = {
-          Description = "Restic backup service";
-          Wants = [ "network-online.target" ];
-          After = [ "network-online.target" ];
-        };
+            forgetCmd = mkResticCmd [
+              "forget"
+              "--prune"
+              backup.pruneOpts
+            ];
+            checkCmd = mkResticCmd [
+              "check"
+              backup.checkOpts
+            ];
+            unlockCmd = mkResticCmd "unlock";
+          in
+          lib.nameValuePair serviceName {
+            Unit = {
+              Description = "Restic backup service";
+              Wants = [ "network-online.target" ];
+              After = [ "network-online.target" ];
+            };

-        Service = {
-          Type = "oneshot";
+            Service = {
+              Type = "oneshot";

-          X-RestartIfChanged = true;
-          RuntimeDirectory = serviceName;
-          CacheDirectory = serviceName;
-          CacheDirectoryMode = "0700";
-          PrivateTmp = true;
+              X-RestartIfChanged = true;
+              RuntimeDirectory = serviceName;
+              CacheDirectory = serviceName;
+              CacheDirectoryMode = "0700";
+              PrivateTmp = true;

-          Environment = mkEnvironment backup ++ [ "RESTIC_CACHE_DIR=%C/${serviceName}" ];
+              Environment = mkEnvironment backup ++ [ "RESTIC_CACHE_DIR=%C/${serviceName}" ];

-          ExecStart =
-            lib.optional doBackup backupCmd
-            ++ lib.optionals doPrune [
-              unlockCmd
-              forgetCmd
-            ]
-            ++ lib.optional doCheck checkCmd;
+              ExecStart =
+                lib.optional doBackup backupCmd
+                ++ lib.optionals doPrune [
+                  unlockCmd
+                  forgetCmd
+                ]
+                ++ lib.optional doCheck checkCmd;

-          ExecStartPre = lib.getExe (
-            pkgs.writeShellApplication {
-              name = "${serviceName}-exec-start-pre";
-              inherit runtimeInputs;
-              text = ''
-                set -x
+              ExecStartPre = lib.getExe (
+                pkgs.writeShellApplication {
+                  name = "${serviceName}-exec-start-pre";
+                  inherit runtimeInputs;
+                  text = ''
+                    set -x

-                ${lib.optionalString (backup.backupPrepareCommand != null) ''
-                  ${pkgs.writeShellScript "backupPrepareCommand" backup.backupPrepareCommand}
-                ''}
+                    ${lib.optionalString (backup.backupPrepareCommand != null) ''
+                      ${pkgs.writeShellScript "backupPrepareCommand" backup.backupPrepareCommand}
+                    ''}

-                ${lib.optionalString (backup.initialize) ''
-                  ${
-                    mkResticCmd [
-                      "cat"
-                      "config"
-                    ]
-                  } 2>/dev/null || ${mkResticCmd "init"}
-                ''}
+                    ${lib.optionalString (backup.initialize) ''
+                      ${
+                        mkResticCmd [
+                          "cat"
+                          "config"
+                        ]
+                      } 2>/dev/null || ${mkResticCmd "init"}
+                    ''}

-                ${lib.optionalString (backup.paths != null && backup.paths != [ ]) ''
-                  cat ${pkgs.writeText "staticPaths" (lib.concatLines backup.paths)} >> ${filesFromTmpFile}
-                ''}
+                    ${lib.optionalString (backup.paths != null && backup.paths != [ ]) ''
+                      cat ${pkgs.writeText "staticPaths" (lib.concatLines backup.paths)} >> ${filesFromTmpFile}
+                    ''}

-                ${lib.optionalString (backup.dynamicFilesFrom != null) ''
-                  ${pkgs.writeShellScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile}
-                ''}
-              '';
+                    ${lib.optionalString (backup.dynamicFilesFrom != null) ''
+                      ${pkgs.writeShellScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile}
+                    ''}
+                  '';
+                }
+              );
+
+              ExecStopPost = lib.getExe (
+                pkgs.writeShellApplication {
+                  name = "${serviceName}-exec-stop-post";
+                  inherit runtimeInputs;
+                  text = ''
+                    set -x
+
+                    ${lib.optionalString (backup.backupCleanupCommand != null) ''
+                      ${pkgs.writeShellScript "backupCleanupCommand" backup.backupCleanupCommand}
+                    ''}
+                  '';
+                }
+              );
            }
-          );
+            // lib.optionalAttrs (backup.environmentFile != null) {
+              EnvironmentFile = backup.environmentFile;
+            };
+          }
+        ) cfg.backups;
+      })

-          ExecStopPost = lib.getExe (
-            pkgs.writeShellApplication {
-              name = "${serviceName}-exec-stop-post";
-              inherit runtimeInputs;
-              text = ''
-                set -x
+      (lib.mkIf isLinux {
+        systemd.user.timers = lib.mapAttrs' (
+          name: backup:
+          lib.nameValuePair "restic-backups-${name}" {
+            Unit.Description = "Restic backup service";
+            Install.WantedBy = [ "timers.target" ];

-                ${lib.optionalString (backup.backupCleanupCommand != null) ''
-                  ${pkgs.writeShellScript "backupCleanupCommand" backup.backupCleanupCommand}
-                ''}
-              '';
-            }
-          );
-        }
-        // lib.optionalAttrs (backup.environmentFile != null) {
-          EnvironmentFile = backup.environmentFile;
-        };
+            Timer = backup.timerConfig;
+          }
+        ) (lib.filterAttrs (_: v: v.timerConfig != null) cfg.backups);
+      })
+
+      {
+        home.packages = lib.mapAttrsToList (
+          name: backup:
+          let
+            serviceName = "restic-backups-${name}";
+            environment = mkEnvironment backup;
+            notPathVar = x: !(lib.hasPrefix "PATH" x);
+            extraOptions = lib.concatMap (arg: [
+              "-o"
+              arg
+            ]) backup.extraOptions;
+            restic = lib.concatStringsSep " " (
+              lib.flatten [
+                (lib.getExe backup.package)
+                extraOptions
+              ]
+            );
+          in
+          pkgs.writeShellApplication {
+            name = "restic-${name}";
+            excludeShellChecks = [
+              # https://github.com/koalaman/shellcheck/issues/1986
+              "SC2034"
+              # Allow sourcing environmentFile
+              "SC1091"
+            ];
+            bashOptions = [
+              "errexit"
+              "nounset"
+              "allexport"
+            ];
+            text = ''
+              ${lib.optionalString (backup.environmentFile != null) ''
+                source ${backup.environmentFile}
+              ''}
+
+              # Set same environment variables as the systemd service
+              ${lib.pipe environment [
+                (lib.filter notPathVar)
+                lib.concatLines
+              ]}
+
+              RESTIC_CACHE_DIR=${config.xdg.cacheHome}/${serviceName}
+
+              PATH=${
+                lib.pipe environment [
+                  (lib.filter (lib.hasPrefix "PATH="))
+                  lib.head
+                  (lib.removePrefix "PATH=")
+                ]
+              }:$PATH
+
+              exec ${restic} "$@"
+            '';
+          }
+        ) (lib.filterAttrs (_: v: v.createWrapper) cfg.backups);
      }
-    ) cfg.backups;
-
-    systemd.user.timers = lib.mapAttrs' (
-      name: backup:
-      lib.nameValuePair "restic-backups-${name}" {
-        Unit.Description = "Restic backup service";
-        Install.WantedBy = [ "timers.target" ];
-
-        Timer = backup.timerConfig;
-      }
-    ) (lib.filterAttrs (_: v: v.timerConfig != null) cfg.backups);
-
-    home.packages = lib.mapAttrsToList (
-      name: backup:
-      let
-        serviceName = "restic-backups-${name}";
-        environment = mkEnvironment backup;
-        notPathVar = x: !(lib.hasPrefix "PATH" x);
-        extraOptions = lib.concatMap (arg: [
-          "-o"
-          arg
-        ]) backup.extraOptions;
-        restic = lib.concatStringsSep " " (
-          lib.flatten [
-            (lib.getExe backup.package)
-            extraOptions
-          ]
-        );
-      in
-      pkgs.writeShellApplication {
-        name = "restic-${name}";
-        excludeShellChecks = [
-          # https://github.com/koalaman/shellcheck/issues/1986
-          "SC2034"
-          # Allow sourcing environmentFile
-          "SC1091"
-        ];
-        bashOptions = [
-          "errexit"
-          "nounset"
-          "allexport"
-        ];
-        text = ''
-          ${lib.optionalString (backup.environmentFile != null) ''
-            source ${backup.environmentFile}
-          ''}
-
-          # Set same environment variables as the systemd service
-          ${lib.pipe environment [
-            (lib.filter notPathVar)
-            lib.concatLines
-          ]}
-
-          RESTIC_CACHE_DIR=${config.xdg.cacheHome}/${serviceName}
-
-          PATH=${
-            lib.pipe environment [
-              (lib.filter (lib.hasPrefix "PATH="))
-              lib.head
-              (lib.removePrefix "PATH=")
-            ]
-          }:$PATH
-
-          exec ${restic} "$@"
-        '';
-      }
-    ) (lib.filterAttrs (_: v: v.createWrapper) cfg.backups);
-  };
+    ]
+  );
 }
--- a/modules/services/ssh-agent.nix
+++ b/modules/services/ssh-agent.nix
@@ -46,85 +46,91 @@ in
    enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };
  };

-  config = lib.mkIf cfg.enable {
-
-    programs =
-      let
-        socketPath =
-          if pkgs.stdenv.isDarwin then
-            "$(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"
-          else
-            "$XDG_RUNTIME_DIR/${cfg.socket}";
-
-        # Preserve $SSH_AUTH_SOCK only if it stems from a forwarded agent which
-        # is the case if both $SSH_AUTH_SOCK and $SSH_CONNECTION are set.
-        bashIntegration = ''
-          if [ -z "$SSH_AUTH_SOCK" -o -z "$SSH_CONNECTION" ]; then
-            export SSH_AUTH_SOCK=${socketPath}
-          fi
-        '';
-        fishIntegration = ''
-          if test -z "$SSH_AUTH_SOCK"; or test -z "$SSH_CONNECTION"
-            set -x SSH_AUTH_SOCK ${socketPath}
-          end
-        '';
-        nushellIntegration =
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        programs =
          let
-            unsetOrEmpty = var: ''("${var}" not-in $env) or ($env.${var} | is-empty)'';
            socketPath =
              if pkgs.stdenv.isDarwin then
-                ''$"(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"''
+                "$(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"
              else
-                ''$"($env.XDG_RUNTIME_DIR)/${cfg.socket}"'';
+                "$XDG_RUNTIME_DIR/${cfg.socket}";
+
+            bashIntegration = ''
+              if [ -z "$SSH_AUTH_SOCK" ]; then
+                export SSH_AUTH_SOCK=${socketPath}
+              fi
+            '';
+
+            fishIntegration = ''
+              if test -z "$SSH_AUTH_SOCK"
+                set -x SSH_AUTH_SOCK ${socketPath}
+              end
+            '';
+
+            nushellIntegration =
+              if pkgs.stdenv.isDarwin then
+                ''
+                  if "SSH_AUTH_SOCK" not-in $env {
+                    $env.SSH_AUTH_SOCK = $"(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"
+                  }
+                ''
+              else
+                ''
+                  if "SSH_AUTH_SOCK" not-in $env {
+                    $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/${cfg.socket}"
+                  }
+                '';
          in
-          ''
-            if ${unsetOrEmpty "SSH_AUTH_SOCK"} or ${unsetOrEmpty "SSH_CONNECTION"} {
-              $env.SSH_AUTH_SOCK = ${socketPath}
-            }
-          '';
-      in
-      {
-        # $SSH_AUTH_SOCK has to be set early since other tools rely on it
-        bash.profileExtra = lib.mkIf cfg.enableBashIntegration (lib.mkOrder 900 bashIntegration);
-        fish.shellInit = lib.mkIf cfg.enableFishIntegration (lib.mkOrder 900 fishIntegration);
-        nushell.extraConfig = lib.mkIf cfg.enableNushellIntegration (lib.mkOrder 900 nushellIntegration);
-        zsh.envExtra = lib.mkIf cfg.enableZshIntegration (lib.mkOrder 900 bashIntegration);
-      };
+          {
+            bash.initExtra = lib.mkIf cfg.enableBashIntegration bashIntegration;

-    systemd.user.services.ssh-agent = {
-      Install.WantedBy = [ "default.target" ];
-      Unit = {
-        Description = "SSH authentication agent";
-        Documentation = "man:ssh-agent(1)";
-      };
-      Service.ExecStart = "${lib.getExe' cfg.package "ssh-agent"} -D -a %t/${cfg.socket}${
-        lib.optionalString (
-          cfg.defaultMaximumIdentityLifetime != null
-        ) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
-      }";
-    };
+            zsh.initContent = lib.mkIf cfg.enableZshIntegration bashIntegration;

-    launchd.agents.ssh-agent = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          (lib.getExe pkgs.bash)
-          "-c"
-          ''${lib.getExe' cfg.package "ssh-agent"} -D -a "$(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"${
+            fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration fishIntegration;
+
+            nushell.extraConfig = lib.mkIf cfg.enableNushellIntegration nushellIntegration;
+          };
+      }
+
+      (lib.mkIf pkgs.stdenv.isLinux {
+        systemd.user.services.ssh-agent = {
+          Install.WantedBy = [ "default.target" ];
+          Unit = {
+            Description = "SSH authentication agent";
+            Documentation = "man:ssh-agent(1)";
+          };
+          Service.ExecStart = "${lib.getExe' cfg.package "ssh-agent"} -D -a %t/${cfg.socket}${
            lib.optionalString (
              cfg.defaultMaximumIdentityLifetime != null
            ) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
-          }''
-        ];
-        KeepAlive = {
-          Crashed = true;
-          SuccessfulExit = false;
+          }";
        };
-        ProcessType = "Background";
-        RunAtLoad = true;
-      };
-    };
-
-  };
+      })

+      (lib.mkIf pkgs.stdenv.isDarwin {
+        launchd.agents.ssh-agent = {
+          enable = true;
+          config = {
+            ProgramArguments = [
+              (lib.getExe pkgs.bash)
+              "-c"
+              ''${lib.getExe' cfg.package "ssh-agent"} -D -a "$(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"${
+                lib.optionalString (
+                  cfg.defaultMaximumIdentityLifetime != null
+                ) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
+              }''
+            ];
+            KeepAlive = {
+              Crashed = true;
+              SuccessfulExit = false;
+            };
+            ProcessType = "Background";
+            RunAtLoad = true;
+          };
+        };
+      })
+    ]
+  );
 }
--- a/modules/services/window-managers/fluxbox.nix
+++ b/modules/services/window-managers/fluxbox.nix
@@ -11,7 +11,7 @@ let

 in
 {
-  meta.maintainers = [ ];
+  meta.maintainers = [ lib.maintainers.AndersonTorres ];

  options = {
    xsession.windowManager.fluxbox = {
--- a/modules/services/window-managers/hyprland.nix
+++ b/modules/services/window-managers/hyprland.nix
@@ -164,14 +164,6 @@ in

    xwayland.enable = lib.mkEnableOption "XWayland" // {
      default = true;
-      description = ''
-        Whether or not to enable XWayland.
-
-        Overrides the `enableXWayland` option of the Hyprland package.
-
-        In newer versions of Hyprland, you can use the {option}`wayland.windowManager.hyprland.settings.xwayland`
-        option to avoid recompiling Hyprland.
-      '';
    };

    settings = lib.mkOption {
--- a/modules/services/window-managers/xmonad.nix
+++ b/modules/services/window-managers/xmonad.nix
@@ -19,15 +19,6 @@ let
        self.xmonad-extras
      ];
  };
-  ghc-builder = cfg.haskellPackages.ghcWithPackages (
-    self:
-    [ self.xmonad ]
-    ++ (cfg.extraPackages self)
-    ++ lib.optionals cfg.enableContribAndExtras [
-      self.xmonad-contrib
-      self.xmonad-extras
-    ]
-  );

 in
 {
@@ -113,21 +104,6 @@ in
          contents of the files.
        '';
      };
-      buildScript = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        description = ''
-          Build script for your xmonad configuration.
-        '';
-        example = literalExpression ''
-          pkgs.writeText "build" '''
-            #!/bin/sh
-
-            # Enable -threaded
-            ghc --make xmonad.hs -threaded -i -ilib -fforce-recomp -main-is main -v0 -O2 -o "$1"
-          '''
-        '';
-      };
    };
  };

@@ -143,12 +119,7 @@ in
      xmonadBin = "${
        pkgs.runCommandLocal "xmonad-compile"
          {
-            nativeBuildInputs = [
-              xmonad
-            ]
-            ++ lib.optional (cfg.buildScript != null) [
-              ghc-builder
-            ];
+            nativeBuildInputs = [ xmonad ];
          }
          ''
            mkdir -p $out/bin
@@ -160,9 +131,7 @@ in
            mkdir -p "$XMONAD_CONFIG_DIR/lib" "$XMONAD_CACHE_DIR" "$XMONAD_DATA_DIR"

            cp ${cfg.config} xmonad-config/xmonad.hs
-            ${lib.optionalString (cfg.buildScript != null) ''
-              install -m 555 ${cfg.buildScript} xmonad-config/build
-            ''}
+
            declare -A libFiles
            libFiles=(${
              lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "['${name}']='${value}'") cfg.libFiles)
--- a/modules/services/wlsunset.nix
+++ b/modules/services/wlsunset.nix
@@ -134,7 +134,7 @@ in
      Service = {
        ExecStart =
          let
-            args = lib.cli.toCommandLineShellGNU { } {
+            args = lib.cli.toGNUCommandLineShell { } {
              t = cfg.temperature.night;
              T = cfg.temperature.day;
              g = cfg.gamma;
--- a/modules/services/yubikey-agent.nix
+++ b/modules/services/yubikey-agent.nix
@@ -19,71 +19,79 @@ in
    package = lib.mkPackageOption pkgs "yubikey-agent" { };
  };

-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+  config = mkIf cfg.enable (
+    lib.mkMerge [
+      { home.packages = [ cfg.package ]; }

-    home.sessionVariables.SSH_AUTH_SOCK =
-      if pkgs.stdenv.isDarwin then
-        "/tmp/yubikey-agent.sock"
-      else
-        "\${XDG_RUNTIME_DIR:-/run/user/$UID}/yubikey-agent/yubikey-agent.sock";
+      (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;
+          };

-    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" ];
-      };
-    };
-
-    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
+          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";
+        };
+      })
+    ]
+  );
 }
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -430,7 +430,10 @@ in
  # Do not install any user services if username is root.
  config = mkIf (cfg.enable && config.home.username != "root") {
    assertions = [
-      (lib.hm.assertions.assertPlatform "systemd" pkgs lib.platforms.linux)
+      {
+        assertion = pkgs.stdenv.isLinux;
+        message = "This module is only available on Linux.";
+      }
    ];

    xdg.configFile = mkMerge [
--- a/modules/targets/generic-linux/nixgl.nix
+++ b/modules/targets/generic-linux/nixgl.nix
@@ -274,26 +274,6 @@ in
                  sed "s|${pkg.out}|$out|g" "$src" > "$dsk"
                done

-                # Patch systemd user services
-                for svc in "$out/share/systemd/user"/*.service ; do
-                  if ! grep -q "${pkg.out}" "$svc"; then
-                    continue
-                  fi
-                  src="$(readlink "$svc")"
-                  rm "$svc"
-                  sed "s|${pkg.out}|$out|g" "$src" > "$svc"
-                done
-
-                # Patch DBus services
-                for svc in "$out/share/dbus-1/services"/*.service ; do
-                  if ! grep -q "${pkg.out}" "$svc"; then
-                    continue
-                  fi
-                  src="$(readlink "$svc")"
-                  rm "$svc"
-                  sed "s|${pkg.out}|$out|g" "$src" > "$svc"
-                done
-
                shopt -u nullglob # Revert nullglob back to its normal default state
              '';
          }))
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -130,13 +130,6 @@ let
            stateVersion = lib.mkDefault "18.09";
          };

-          # NOTE: Added 2025-12-27
-          # Avoid option change deprecation warning
-          # Remove after deprecation period
-          programs.zsh.dotDir = lib.mkIf (config.home.stateVersion == "18.09") (
-            lib.mkDefault "/home/hm-user"
-          );
-
          # Avoid including documentation since this will cause
          # unnecessary rebuilds of the tests.
          manual.manpages.enable = lib.mkDefault false;
--- a/tests/lib/generators/default.nix
+++ b/tests/lib/generators/default.nix
@@ -1,5 +1,4 @@
 {
-  generators-hyprconf = ./tohyprconf.nix;
  generators-tokdl = ./tokdl.nix;
  generators-toscfg-empty = ./toscfg-empty.nix;
  generators-toscfg-example = ./toscfg-example.nix;
--- a/tests/lib/generators/tohyprconf-result.txt
+++ b/tests/lib/generators/tohyprconf-result.txt
@@ -1,93 +0,0 @@
-$important=123
-attrs-section {
-  bool=true
-  float=0.800000
-  int=5
-  null=null
-  string=abc
-}
-
-combined-attrs-nested-section {
-  a {
-    a=123
-  }
-
-  a {
-    b=123
-  }
-
-  a {
-    c=123
-  }
-
-  b {
-    a=123
-  }
-
-  b {
-    b=123
-  }
-
-  b {
-    c=123
-  }
-}
-
-combined-list-nested-section {
-  b {
-    c {
-      abc=123
-    }
-  }
-}
-
-combined-list-nested-section {
-  bar {
-    baz {
-      aaa=111
-    }
-  }
-}
-
-list-section=foo
-list-section=bar
-list-section=baz
-
-list-with-strings-and-attrs=abc
-list-with-strings-and-attrs {
-  a=123
-}
-list-with-strings-and-attrs=foo
-list-with-strings-and-attrs {
-  b=321
-}
-
-nested-attrs-section {
-  a {
-    b {
-      c {
-        abc=123
-      }
-    }
-  }
-
-  foo {
-    bar {
-      baz {
-        aaa=111
-      }
-    }
-  }
-}
-
-nested-list-section {
-  a=123
-}
-
-nested-list-section {
-  b=123
-}
-
-nested-list-section {
-  c=123
-}
--- a/tests/lib/generators/tohyprconf.nix
+++ b/tests/lib/generators/tohyprconf.nix
@@ -1,70 +0,0 @@
-{ lib, ... }:
-
-{
-  home.file."tohyprconf-result.txt".text = lib.hm.generators.toHyprconf {
-    attrs = rec {
-      "$important" = 123;
-
-      list-section = [
-        "foo"
-        "bar"
-        "baz"
-      ];
-
-      attrs-section = {
-        string = "abc";
-        int = 5;
-        float = 0.8;
-        bool = true;
-        null = null;
-      };
-
-      nested-attrs-section = {
-        a = {
-          b = {
-            c = {
-              abc = 123;
-            };
-          };
-        };
-
-        foo = {
-          bar = {
-            baz = {
-              aaa = 111;
-            };
-          };
-        };
-      };
-
-      nested-list-section = [
-        { a = 123; }
-        { b = 123; }
-        { c = 123; }
-      ];
-
-      combined-list-nested-section = [
-        nested-attrs-section.a
-        nested-attrs-section.foo
-      ];
-
-      combined-attrs-nested-section = {
-        a = nested-list-section;
-        b = nested-list-section;
-      };
-
-      list-with-strings-and-attrs = [
-        "abc"
-        { a = 123; }
-        "foo"
-        { b = 321; }
-      ];
-    };
-  };
-
-  nmt.script = ''
-    assertFileContent \
-      home-files/tohyprconf-result.txt \
-      ${./tohyprconf-result.txt}
-  '';
-}
--- a/tests/modules/programs/anyrun/default.nix
+++ b/tests/modules/programs/anyrun/default.nix
@@ -2,5 +2,4 @@

 lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
  anyrun = ./basic-config.nix;
-  anyrun-empty-css = ./empty-css.nix;
 }
--- a/tests/modules/programs/anyrun/empty-css.nix
+++ b/tests/modules/programs/anyrun/empty-css.nix
@@ -1,10 +0,0 @@
-{
-  programs.anyrun = {
-    enable = true;
-    config.plugins = [ ];
-  };
-
-  nmt.script = ''
-    assertPathNotExists home-files/.config/anyrun/style.css
-  '';
-}
--- a/tests/modules/programs/bemenu/basic-configuration.nix
+++ b/tests/modules/programs/bemenu/basic-configuration.nix
@@ -22,6 +22,6 @@
  nmt.script = ''
    assertFileExists home-path/etc/profile.d/hm-session-vars.sh
    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-      "export BEMENU_OPTS=\"'--ab=#1e1e2e' '--af=#cdd6f4' '--fb=#1e1e2e' '--ff=#cdd6f4' '--hb=#1e1e2e' '--hf=#f9e2af' --ignorecase '--line-height=28' '--nb=#1e1e2e' '--nf=#cdd6f4' '--prompt=open' '--tb=#1e1e2e' '--tf=#f38ba8' '--width-factor=0.300000'\""
+      "export BEMENU_OPTS=\"--ab '#1e1e2e' --af '#cdd6f4' --fb '#1e1e2e' --ff '#cdd6f4' --hb '#1e1e2e' --hf '#f9e2af' --ignorecase --line-height 28 --nb '#1e1e2e' --nf '#cdd6f4' --prompt open --tb '#1e1e2e' --tf '#f38ba8' --width-factor 0.300000\""
  '';
 }
--- a/tests/modules/programs/claude-code/default.nix
+++ b/tests/modules/programs/claude-code/default.nix
@@ -5,8 +5,6 @@
  claude-code-assertion = ./assertion.nix;
  claude-code-memory-management = ./memory-management.nix;
  claude-code-memory-from-source = ./memory-from-source.nix;
-  claude-code-rules-dir = ./rules-dir.nix;
-  claude-code-rules-path = ./rules-path.nix;
  claude-code-agents-dir = ./agents-dir.nix;
  claude-code-commands-dir = ./commands-dir.nix;
  claude-code-hooks-dir = ./hooks-dir.nix;
--- a/tests/modules/programs/claude-code/rules-dir.nix
+++ b/tests/modules/programs/claude-code/rules-dir.nix
@@ -1,14 +0,0 @@
-{
-  programs.claude-code = {
-    enable = true;
-    rulesDir = ./rules;
-  };
-
-  nmt.script = ''
-    assertFileExists home-files/.claude/rules/test-rule.md
-    assertLinkExists home-files/.claude/rules/test-rule.md
-    assertFileContent \
-      home-files/.claude/rules/test-rule.md \
-      ${./rules/test-rule.md}
-  '';
-}
--- a/tests/modules/programs/claude-code/rules-path.nix
+++ b/tests/modules/programs/claude-code/rules-path.nix
@@ -1,20 +0,0 @@
-{
-  programs.claude-code = {
-    enable = true;
-    rules = {
-      test-rule = ./test-rule.md;
-      inline-rule = ''
-        # Inline Rule
-
-        This is an inline rule for testing.
-      '';
-    };
-  };
-
-  nmt.script = ''
-    assertFileExists home-files/.claude/rules/test-rule.md
-    assertFileContent home-files/.claude/rules/test-rule.md \
-      ${./test-rule.md}
-    assertFileExists home-files/.claude/rules/inline-rule.md
-  '';
-}
--- a/tests/modules/programs/claude-code/rules/test-rule.md
+++ b/tests/modules/programs/claude-code/rules/test-rule.md
@@ -1,9 +0,0 @@
-# Test Rule from Directory
-
-This is a test rule loaded from a directory.
-Used to verify rulesDir support functionality.
-
-## Best Practices
-
- Write clean code
- Test thoroughly
--- a/tests/modules/programs/claude-code/test-rule.md
+++ b/tests/modules/programs/claude-code/test-rule.md
@@ -1,9 +0,0 @@
-# Test Rule
-
-This is a test rule loaded from a file path.
-Used to verify path support functionality for rules.
-
-## Guidelines
-
- Follow test conventions
- Maintain code quality
--- a/tests/modules/programs/fish/default.nix
+++ b/tests/modules/programs/fish/default.nix
@@ -7,5 +7,4 @@
  fish-plugins = ./plugins.nix;
  fish-manpage = ./manpage.nix;
  fish-binds = ./binds.nix;
-  fish-session-variables = ./session-variables.nix;
 }
--- a/tests/modules/programs/fish/session-variables.nix
+++ b/tests/modules/programs/fish/session-variables.nix
@@ -1,20 +0,0 @@
-{ config, ... }:
-
-{
-  config = {
-    home.sessionVariables = {
-      V1 = "v1";
-      V2 = "v2-${config.home.sessionVariables.V1}";
-    };
-
-    programs.fish.enable = true;
-
-    nmt.script = ''
-      assertFileExists home-path/etc/profile.d/hm-session-vars.fish
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.fish \
-        "set -gx V1 'v1'"
-      assertFileRegex home-path/etc/profile.d/hm-session-vars.fish \
-        "set -gx V1 'v1'"
-    '';
-  };
-}
--- a/tests/modules/programs/gemini-cli/context.nix
+++ b/tests/modules/programs/gemini-cli/context.nix
@@ -41,9 +41,5 @@
    assertFileExists home-files/.gemini/CONTEXT.md
    assertFileContent home-files/.gemini/CONTEXT.md \
      ${./context-additional.md}
-
-    assertFileExists home-path/etc/profile.d/hm-session-vars.sh
-    assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh \
-      "GEMINI_MODEL"
  '';
 }
--- a/tests/modules/programs/gemini-cli/settings.nix
+++ b/tests/modules/programs/gemini-cli/settings.nix
@@ -1,7 +1,6 @@
 {
  programs.gemini-cli = {
    enable = true;
-    defaultModel = "gemini-2.5-flash";
    settings = {
      theme = "Default";
      vimMode = true;
@@ -29,9 +28,5 @@
      ${./changelog.toml}
    assertFileContent home-files/.gemini/commands/git/fix.toml \
      ${./fix.toml}
-
-    assertFileExists home-path/etc/profile.d/hm-session-vars.sh
-    assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-      'export GEMINI_MODEL="gemini-2.5-flash"'
  '';
 }
--- a/tests/modules/programs/ghostty/default.nix
+++ b/tests/modules/programs/ghostty/default.nix
@@ -1,10 +1,5 @@
-{ lib, pkgs, ... }:
-
 {
-  ghostty-empty-settings = ./empty-settings.nix;
  ghostty-example-settings = ./example-settings.nix;
+  ghostty-empty-settings = ./empty-settings.nix;
  ghostty-example-theme = ./example-theme.nix;
 }
-// lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  ghostty-systemd-service = ./systemd-service.nix;
-}
--- a/tests/modules/programs/ghostty/example-settings.nix
+++ b/tests/modules/programs/ghostty/example-settings.nix
@@ -11,9 +11,6 @@
  };

  nmt.script = ''
-    servicePath=home-files/.config/systemd/user/app-com.mitchellh.ghostty.service
-    assertPathNotExists $servicePath
-
    assertFileContent \
      home-files/.config/ghostty/config \
      ${./example-config-expected}
--- a/tests/modules/programs/ghostty/systemd-service.nix
+++ b/tests/modules/programs/ghostty/systemd-service.nix
@@ -1,56 +0,0 @@
-{ config, ... }:
-{
-  programs.ghostty = {
-    enable = true;
-    package = config.lib.test.mkStubPackage { outPath = null; };
-    systemd.enable = true;
-    settings = {
-      theme = "catppuccin-mocha";
-      font-size = 10;
-    };
-    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 = ''
-    servicePath=home-files/.config/systemd/user/app-com.mitchellh.ghostty.service
-    serviceOverridesPath=$servicePath.d/overrides.conf
-
-    assertFileExists $serviceOverridesPath
-    assertFileContent $(normalizeStorePaths $serviceOverridesPath) \
-      ${builtins.toFile "ghostty-service-overrides" ''
-        [Unit]
-        X-SwitchMethod=keep-old
-        X-Reload-Triggers=/nix/store/00000000000000000000000000000000-ghostty-config /nix/store/00000000000000000000000000000000-ghostty-catppuccin-mocha-theme
-      ''}
-
-    assertFileContent \
-      home-files/.config/ghostty/config \
-      ${./example-config-expected}
-  '';
-}
--- a/tests/modules/programs/gpg/default.nix
+++ b/tests/modules/programs/gpg/default.nix
@@ -3,5 +3,4 @@
  gpg-mutable-keyfiles = ./mutable-keyfiles.nix;
  gpg-multiple-keys-trust = ./multiple-keys-trust.nix;
  gpg-override-defaults = ./override-defaults.nix;
-  gpg-other-settings = ./other-settings.nix;
 }
--- a/tests/modules/programs/gpg/immutable-keyfiles.nix
+++ b/tests/modules/programs/gpg/immutable-keyfiles.nix
@@ -12,7 +12,7 @@
      {
        source = realPkgs.fetchurl {
          url = "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x44CF42371ADF842E12F116EAA9D3F98FCCF5460B";
-          hash = "sha256-csrFDI6QSPfNN+adOPEAupAtspYNBCybFZExvVS+vRY=";
+          hash = "sha256-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM=";
        };
        trust = 1; # "unknown"
      }
--- a/tests/modules/programs/gpg/other-dirmngr.conf
+++ b/tests/modules/programs/gpg/other-dirmngr.conf
@@ -1,2 +0,0 @@
-keyserver ldaps://ldap.example.com
-use-tor
--- a/tests/modules/programs/gpg/other-gpgsm.conf
+++ b/tests/modules/programs/gpg/other-gpgsm.conf
@@ -1,3 +0,0 @@
-cipher-algo AES256
-validation-model steed
-with-md5-fingerprint
--- a/tests/modules/programs/gpg/other-scdaemon.conf
+++ b/tests/modules/programs/gpg/other-scdaemon.conf
@@ -1,3 +0,0 @@
-application-priority openpgp p15 sc-hsm nks geldkarte dinsig
-disable-ccid
-reader-port 32769
--- a/tests/modules/programs/gpg/other-settings.nix
+++ b/tests/modules/programs/gpg/other-settings.nix
@@ -1,32 +0,0 @@
-{
-  programs.gpg = {
-    enable = true;
-
-    scdaemonSettings = {
-      disable-ccid = true;
-      reader-port = "32769";
-      application-priority = "openpgp p15 sc-hsm nks geldkarte dinsig";
-    };
-
-    dirmngrSettings = {
-      use-tor = true;
-      keyserver = "ldaps://ldap.example.com";
-    };
-
-    gpgsmSettings = {
-      cipher-algo = "AES256";
-      with-md5-fingerprint = true;
-      validation-model = "steed";
-    };
-  };
-
-  nmt.script = ''
-    assertFileExists home-files/.gnupg/scdaemon.conf
-    assertFileExists home-files/.gnupg/dirmngr.conf
-    assertFileExists home-files/.gnupg/gpgsm.conf
-
-    assertFileContent home-files/.gnupg/scdaemon.conf ${./other-scdaemon.conf}
-    assertFileContent home-files/.gnupg/dirmngr.conf ${./other-dirmngr.conf}
-    assertFileContent home-files/.gnupg/gpgsm.conf ${./other-gpgsm.conf}
-  '';
-}
--- a/tests/modules/programs/gpg/override-defaults-expected.conf
+++ b/tests/modules/programs/gpg/override-defaults-expected.conf
@@ -1,6 +1,7 @@
 cert-digest-algo SHA512
+charset utf-8
 default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
-display-charset utf-8
+fixed-list-mode
 keyid-format 0xlong
 list-options show-uid-validity

@@ -15,5 +16,6 @@ s2k-digest-algo SHA512
 throw-keyids
 trusted-key 0xXXXXXXXXXXXXX
 trusted-key 0xYYYYYYYYYYYYY
+use-agent
 verify-options show-uid-validity
 with-fingerprint
--- a/tests/modules/programs/meli/expected.toml
+++ b/tests/modules/programs/meli/expected.toml
@@ -5,9 +5,6 @@ identity = "hm@example.com"
 root_mailbox = "/home/hm-user/Mail/hm@example.com"
 subscribed_mailboxes = ["Inbox", "Sent", "Trash", "Drafts"]

-[accounts."hm@example.com".listing]
-index_style = "compact"
-
 [accounts."hm@example.com".mailboxes]

 [accounts."hm@example.com".send_mail]
--- a/Show More
+++ b/Show More