flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c0b0e0fddf73fd517c3471e546c0df87a42d53f4?narHash=sha256-coBu0ONtFzlwwVBzmjacUQwj3G%2BlybcZ1oeNSQkgC0M%3D' (2025-12-28)
  → 'github:NixOS/nixpkgs/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5?narHash=sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i%2BbwD6XxMb8A%3D' (2026-01-05)

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766902085,
-        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
         "type": "github"
       },
       "original": {

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 04:17+0000\n"
+"PO-Revision-Date: 2025-12-04 09:16+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 "此配置檔案/變體不可構建，請在 nix-shell 中執行它。"
+msgstr "此 derivation 無法建置，請使用 nix-shell 執行。"
 
 #, sh-format
 #~ msgid "Please set the $EDITOR environment variable"

modules/launchd/default.nix

@@ -270,9 +270,7 @@ in
             setupLaunchAgents
 
             # Restore errexit
-            if [[ -o errexit ]]; then
             set -e
-            fi
           '';
     })
   ];

modules/misc/xdg.nix

@@ -136,7 +136,7 @@ in
         xdg.stateHome = mkOptionDefault defaultStateHome;
 
         home.sessionVariables = variables;
-        systemd.user.sessionVariables = mkIf pkgs.stdenv.hostPlatform.isLinux variables;
+        systemd.user.sessionVariables = variables;
       }
     )
 

modules/misc/xfconf.nix

@@ -135,7 +135,7 @@ in
     home.activation.xfconfSettings = lib.hm.dag.entryAfter [ "installPackages" ] (
       let
         mkCommand = channel: property: value: ''
-          run ${pkgs.xfce.xfconf}/bin/xfconf-query \
+          run ${pkgs.xfconf}/bin/xfconf-query \
             ${lib.escapeShellArgs (
               [
                 "-c"

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)
 

modules/programs/atuin.nix

@@ -11,7 +11,6 @@ let
   tomlFormat = pkgs.formats.toml { };
 
   inherit (lib) mkIf mkOption types;
-  inherit (pkgs.stdenv) isLinux isDarwin;
 in
 {
   meta.maintainers = with lib.maintainers; [
@@ -221,9 +220,7 @@ in
           };
         }
 
-        (mkIf daemonCfg.enable (
-          lib.mkMerge [
-            {
+        (mkIf daemonCfg.enable {
           assertions = [
             {
               assertion = lib.versionAtLeast cfg.package.version "18.2.0";
@@ -232,22 +229,17 @@ in
               '';
             }
             {
-                  assertion = isLinux || isDarwin;
-                  message = "The Atuin daemon can only be configured on either Linux or macOS.";
+              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 = {
+          programs.atuin.settings.daemon = {
             enabled = true;
-                };
-              };
-            }
-            (mkIf isLinux {
-              programs.atuin.settings = {
-                daemon = {
-                  systemd_socket = 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 = {
@@ -285,13 +277,6 @@ in
                 RemoveOnStop = true;
               };
             };
-            })
-            (mkIf isDarwin {
-              programs.atuin.settings = {
-                daemon = {
-                  socket_path = lib.mkDefault "${config.xdg.dataHome}/atuin/daemon.sock";
-                };
-              };
 
           launchd.agents.atuin-daemon = {
             enable = true;
@@ -312,7 +297,5 @@ in
           };
         })
       ]
-        ))
-      ]
     );
 }

modules/programs/bashmount.nix

@@ -8,7 +8,7 @@ let
   cfg = config.programs.bashmount;
 in
 {
-  meta.maintainers = [ lib.maintainers.AndersonTorres ];
+  meta.maintainers = [ ];
 
   options.programs.bashmount = {
     enable = lib.mkEnableOption "bashmount";

modules/programs/ghostty.nix

@@ -224,8 +224,15 @@ 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
+        '';
+
         dbus.packages = [ cfg.package ];
       })
 

modules/programs/gpg.nix

@@ -16,18 +16,13 @@ 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;
-
-  cfgText = lib.generators.toKeyValue {
-    inherit mkKeyValue;
       listsAsDuplicateKeys = true;
-  } cfg.settings;
-
-  scdaemonCfgText = lib.generators.toKeyValue {
-    inherit mkKeyValue;
-    listsAsDuplicateKeys = true;
-  } cfg.scdaemonSettings;
+    } settings;
 
   primitiveType = types.oneOf [
     types.str
@@ -193,6 +188,7 @@ in
 
     scdaemonSettings = mkOption {
       type = types.attrsOf (types.either primitiveType (types.listOf types.str));
+      default = { };
       example = literalExpression ''
         {
           disable-ccid = true;
@@ -207,6 +203,41 @@ 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"'';
@@ -267,8 +298,7 @@ in
       cert-digest-algo = mkDefault "SHA512";
       s2k-digest-algo = mkDefault "SHA512";
       s2k-cipher-algo = mkDefault "AES256";
-      charset = mkDefault "utf-8";
-      fixed-list-mode = mkDefault true;
+      display-charset = mkDefault "utf-8";
       no-comments = mkDefault true;
       no-emit-version = mkDefault true;
       keyid-format = mkDefault "0xlong";
@@ -277,11 +307,6 @@ 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 ];
@@ -289,9 +314,21 @@ in
       GNUPGHOME = cfg.homedir;
     };
 
-    home.file."${cfg.homedir}/gpg.conf".text = cfgText;
+    home.file."${cfg.homedir}/gpg.conf" = mkIf (cfg.settings != { }) {
+      text = toKeyValue cfg.settings;
+    };
 
-    home.file."${cfg.homedir}/scdaemon.conf".text = scdaemonCfgText;
+    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;
+    };
 
     # Link keyring if keys are not mutable
     home.file."${cfg.homedir}/pubring.kbx" = mkIf (!cfg.mutableKeys && cfg.publicKeys != [ ]) {

modules/programs/havoc.nix

@@ -9,7 +9,7 @@ let
   iniFormat = pkgs.formats.ini { };
 in
 {
-  meta.maintainers = with lib.maintainers; [ AndersonTorres ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   options.programs.havoc = {
     enable = lib.mkEnableOption "Havoc terminal";

modules/programs/keepassxc.nix

@@ -62,8 +62,15 @@ in
         Configuration written to
         {file}`$XDG_CONFIG_HOME/keepassxc/keepassxc.ini`.
 
-        See <https://github.com/keepassxreboot/keepassxc/blob/647272e9c5542297d3fcf6502e6173c96f12a9a0/src/core/Config.cpp#L49-L223>
+        See <https://github.com/keepassxreboot/keepassxc/blob/develop/src/core/Config.cpp>
         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.
+        :::
       '';
     };
 

modules/programs/neovim.nix

@@ -459,7 +459,7 @@ in
 
         generatedConfigs =
           let
-            grouped = builtins.groupBy (x: x.type) pluginsNormalized;
+            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;

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 = lib.optionals pkgs.stdenv.isDarwin [
+    assertions = [
       (lib.hm.darwin.assertInterval "programs.nh.clean.dates" cfg.clean.dates pkgs)
     ];
 
@@ -131,30 +131,25 @@ in
       ];
     };
 
-    systemd.user = lib.mkIf (cfg.clean.enable && pkgs.stdenv.isLinux) {
+    systemd.user = lib.mkIf cfg.clean.enable {
       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 && pkgs.stdenv.isDarwin) {
+    launchd.agents.nh-clean = lib.mkIf cfg.clean.enable {
       enable = true;
       config = {
         ProgramArguments = [
@@ -163,9 +158,7 @@ in
           "user"
         ]
         ++ lib.optional (cfg.clean.extraArgs != "") cfg.clean.extraArgs;
-
         StartCalendarInterval = lib.hm.darwin.mkCalendarInterval cfg.clean.dates;
-
       };
     };
   };

modules/programs/niriswitcher.nix

@@ -66,10 +66,7 @@ in
 
   config = lib.mkIf cfg.enable {
     assertions = [
-      {
-        assertion = pkgs.stdenv.hostPlatform.isLinux;
-        message = "niriswitcher is only available on Linux.";
-      }
+      (lib.hm.assertions.assertPlatform "programs.niriswitcher" pkgs lib.platforms.linux)
     ];
 
     home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];

modules/services/borgmatic.nix

@@ -32,9 +32,7 @@ in
     };
   };
 
-  config = lib.mkIf serviceConfig.enable (
-    lib.mkMerge [
-      (lib.mkIf pkgs.stdenv.isLinux {
+  config = lib.mkIf serviceConfig.enable {
     systemd.user = {
       services.borgmatic = {
         Unit = {
@@ -82,9 +80,7 @@ in
         Install.WantedBy = [ "timers.target" ];
       };
     };
-      })
 
-      (lib.mkIf pkgs.stdenv.isDarwin {
     assertions = [
       (lib.hm.darwin.assertInterval "services.borgmatic.frequency" serviceConfig.frequency pkgs)
     ];
@@ -103,7 +99,5 @@ in
         StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/borgmatic/launchd-stderr.log";
       };
     };
-      })
-    ]
-  );
+  };
 }

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 (pkgs.stdenv.isLinux && (cfg.package != null)) {
+    systemd.user.services.clipse = lib.mkIf (cfg.package != null) {
       Unit = {
         Description = "Clipse listener";
         PartOf = [ "graphical-session.target" ];

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,8 +189,7 @@ in
         if activeProfile.name != "default" then "colima-${activeProfile.name}" else "colima"
       );
 
-    launchd.agents = lib.mkIf pkgs.stdenv.isDarwin (
-      lib.mapAttrs' (
+    launchd.agents = lib.mapAttrs' (
       name: profile:
       lib.nameValuePair "colima-${name}" {
         enable = true;
@@ -219,11 +218,9 @@ in
           StandardErrorPath = profile.logFile;
         };
       }
-      ) (lib.filterAttrs (_: p: p.isService) cfg.profiles)
-    );
+    ) (lib.filterAttrs (_: p: p.isService) cfg.profiles);
 
-    systemd.user.services = lib.mkIf pkgs.stdenv.isLinux (
-      lib.mapAttrs' (
+    systemd.user.services = lib.mapAttrs' (
       name: profile:
       lib.nameValuePair "colima-${name}" {
         Unit = {
@@ -260,7 +257,6 @@ in
           WantedBy = [ "default.target" ];
         };
       }
-      ) (lib.filterAttrs (_: p: p.isService) cfg.profiles)
-    );
-  });
+    ) (lib.filterAttrs (_: p: p.isService) cfg.profiles);
+  };
 }

modules/services/emacs.nix

@@ -119,9 +119,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable (
-    lib.mkMerge [
-      {
+  config = mkIf cfg.enable {
     home.sessionVariables =
       let
         editorBin = lib.getBin (
@@ -132,9 +130,9 @@ in
         EDITOR = editorBin;
         VISUAL = editorBin;
       };
-      }
 
-      (mkIf pkgs.stdenv.isLinux {
+    home.packages = optional (cfg.client.enable && pkgs.stdenv.isLinux) (lib.hiPrio clientDesktopItem);
+
     systemd.user.services.emacs = {
       Unit = {
         Description = "Emacs text editor";
@@ -190,11 +188,7 @@ in
       };
     };
 
-        home.packages = optional cfg.client.enable (lib.hiPrio clientDesktopItem);
-      })
-
-      (mkIf (cfg.socketActivation.enable && pkgs.stdenv.isLinux) {
-        systemd.user.sockets.emacs = {
+    systemd.user.sockets.emacs = mkIf cfg.socketActivation.enable {
       Unit = {
         Description = "Emacs text editor";
         Documentation = "info:emacs man:emacs(1) https://gnu.org/software/emacs/";
@@ -221,9 +215,7 @@ in
         RequiredBy = [ "emacs.service" ];
       };
     };
-      })
 
-      (mkIf pkgs.stdenv.isDarwin {
     launchd.agents.emacs = {
       enable = true;
       config = {
@@ -239,7 +231,5 @@ in
         };
       };
     };
-      })
-    ]
-  );
+  };
 }

modules/services/git-sync.nix

@@ -15,46 +15,9 @@ let
 
   cfg = config.services.git-sync;
 
-  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: {
+  services =
+    mkService:
+    lib.mapAttrs' (name: repo: {
       name = "git-sync-${name}";
       value = mkService name repo;
     }) cfg.repositories;
@@ -141,11 +104,48 @@ in
     };
   };
 
-  config = mkIf cfg.enable (
-    lib.mkMerge [
-      (mkIf pkgs.stdenv.isLinux { systemd.user.services = services; })
-      (mkIf pkgs.stdenv.isDarwin { launchd.agents = services; })
-    ]
+  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";
+        };
+      }
+    );
+  };
+
 }

modules/services/gpg-agent.nix

@@ -344,9 +344,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable (
-    lib.mkMerge [
-      {
+  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"
@@ -382,17 +380,14 @@ in
       fish.interactiveShellInit = mkIf cfg.enableFishIntegration gpgFishInitStr;
       nushell.extraConfig = mkIf cfg.enableNushellIntegration gpgNushellInitStr;
     };
-      }
 
-      (mkIf (cfg.sshKeys != null) {
     # Trailing newlines are important
-        home.file."${homedir}/sshcontrol".text = lib.concatMapStrings (s: ''
+    home.file."${homedir}/sshcontrol" = mkIf (cfg.sshKeys != null) {
+      text = lib.concatMapStrings (s: ''
         ${s}
       '') cfg.sshKeys;
-      })
+    };
 
-      (lib.mkMerge [
-        (mkIf pkgs.stdenv.isLinux {
     systemd.user = {
       services.gpg-agent = {
         Unit = {
@@ -434,9 +429,7 @@ in
         });
       };
     };
-        })
 
-        (mkIf pkgs.stdenv.isDarwin {
     launchd.agents.gpg-agent = {
       enable = true;
       config = {
@@ -461,8 +454,5 @@ in
         };
       };
     };
-        })
-      ])
-    ]
-  );
+  };
 }

modules/services/home-manager-auto-expire.nix

@@ -81,31 +81,24 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      (lib.mkIf pkgs.stdenv.isLinux {
+  config = lib.mkIf cfg.enable {
+
     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;
         };
       };
-
       services.home-manager-auto-expire = {
         Unit.Description = "Home Manager expire generations";
-
         Service.ExecStart = toString script;
       };
     };
-      })
 
-      (lib.mkIf pkgs.stdenv.isDarwin {
     assertions = [
       (lib.hm.darwin.assertInterval "services.home-manager.autoExpire.frequency" cfg.frequency pkgs)
     ];
@@ -120,7 +113,6 @@ in
         StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/home-manager-auto-expire/launchd-stderr.log";
       };
     };
-      })
-    ]
-  );
+
+  };
 }

modules/services/hyprpaper.nix

@@ -45,16 +45,18 @@ in
       '';
       example = lib.literalExpression ''
         {
-          ipc = "on";
           splash = false;
-          splash_offset = 2.0;
-
-          preload =
-            [ "/share/wallpapers/buttons.png" "/share/wallpapers/cat_pacman.png" ];
 
           wallpaper = [
-            "DP-3,/share/wallpapers/buttons.png"
-            "DP-1,/share/wallpapers/cat_pacman.png"
+            {
+              monitor = "DP-3";
+              path = "/share/wallpapers/buttons.png";
+              fit_mode = "tile";
+            }
+            {
+              monitor = "DP-1";
+              path = "/share/wallpapers/cat_pacman.png";
+            }
           ];
         }
       '';

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/CONFIGURE.md#config-options>
+        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/docs/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/CONFIGURE.md#css>
+        options can be found here: <https://github.com/H3rmt/hyprshell/blob/hyprshell-release/docs/CONFIGURE.md#css>
       '';
     };
 

modules/services/mpd.nix

@@ -182,7 +182,7 @@ in
         })
       ];
 
-      systemd.user = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
+      systemd.user = {
         services.mpd = {
           Unit = lib.mkMerge [
             {
@@ -236,7 +236,7 @@ in
         };
       };
 
-      launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
+      launchd.agents.mpd = {
         enable = true;
         config = {
           ProgramArguments = [

modules/services/nix-gc.nix

@@ -83,9 +83,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.automatic (
-    lib.mkMerge [
-      (lib.mkIf pkgs.stdenv.isLinux {
+  config = lib.mkIf cfg.automatic {
     systemd.user.services.nix-gc = {
       Unit = {
         Description = "Nix Garbage Collector";
@@ -97,6 +95,7 @@ in
         }";
       };
     };
+
     systemd.user.timers.nix-gc = {
       Unit = {
         Description = "Nix Garbage Collector";
@@ -111,12 +110,10 @@ in
         WantedBy = [ "timers.target" ];
       };
     };
-      })
 
-      (lib.mkIf pkgs.stdenv.isDarwin {
     assertions = [
       {
-            assertion = (lib.length cfg.dates) == 1;
+        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)
@@ -132,7 +129,5 @@ in
         StartCalendarInterval = lib.hm.darwin.mkCalendarInterval (lib.elemAt cfg.dates 0);
       };
     };
-      })
-    ]
-  );
+  };
 }

modules/services/ollama.nix

@@ -87,7 +87,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.user.services.ollama = mkIf pkgs.stdenv.isLinux {
+    systemd.user.services.ollama = {
       Unit = {
         Description = "Server for local large language models";
         After = [ "network.target" ];
@@ -105,7 +105,7 @@ in
       };
     };
 
-    launchd.agents.ollama = mkIf pkgs.stdenv.isDarwin {
+    launchd.agents.ollama = {
       enable = true;
       config = {
         ProgramArguments = [

modules/services/pueue.nix

@@ -11,7 +11,7 @@ let
   pueuedBin = "${cfg.package}/bin/pueued";
 in
 {
-  meta.maintainers = [ lib.maintainers.AndersonTorres ];
+  meta.maintainers = [ ];
 
   options.services.pueue = {
     enable = lib.mkEnableOption "Pueue, CLI process scheduler and manager";
@@ -35,13 +35,11 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
+  config = lib.mkIf cfg.enable {
     home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
-      }
-      (lib.mkIf pkgs.stdenv.isLinux {
-        xdg.configFile."pueue/pueue.yml".source = configFile;
+
+    xdg.configFile."pueue/pueue.yml" = lib.mkIf pkgs.stdenv.isLinux { source = configFile; };
+
     systemd.user = lib.mkIf (cfg.package != null) {
       services.pueued = {
         Unit = {
@@ -56,11 +54,13 @@ in
         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;
+    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;
 
@@ -79,7 +79,5 @@ in
         RunAtLoad = true;
       };
     };
-      })
-    ]
-  );
+  };
 }

modules/services/restic.nix

@@ -62,15 +62,13 @@ 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.isDarwin;
+      readOnly = !pkgs.stdenv.hostPlatform.isLinux;
 
       description = option.description + ''
 
@@ -393,16 +391,12 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
+  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;
-      }
 
-      (lib.mkIf isLinux {
     systemd.user.services = lib.mapAttrs' (
       name: backup:
       let
@@ -535,9 +529,7 @@ in
         };
       }
     ) cfg.backups;
-      })
 
-      (lib.mkIf isLinux {
     systemd.user.timers = lib.mapAttrs' (
       name: backup:
       lib.nameValuePair "restic-backups-${name}" {
@@ -547,9 +539,7 @@ in
         Timer = backup.timerConfig;
       }
     ) (lib.filterAttrs (_: v: v.timerConfig != null) cfg.backups);
-      })
 
-      {
     home.packages = lib.mapAttrsToList (
       name: backup:
       let
@@ -605,7 +595,5 @@ in
         '';
       }
     ) (lib.filterAttrs (_: v: v.createWrapper) cfg.backups);
-      }
-    ]
-  );
+  };
 }

modules/services/ssh-agent.nix

@@ -46,9 +46,8 @@ in
     enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };
   };
 
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
+  config = lib.mkIf cfg.enable {
+
     programs =
       let
         socketPath =
@@ -57,29 +56,30 @@ in
           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" ]; then
+          if [ -z "$SSH_AUTH_SOCK" -o -z "$SSH_CONNECTION" ]; then
             export SSH_AUTH_SOCK=${socketPath}
           fi
         '';
-
         fishIntegration = ''
-              if test -z "$SSH_AUTH_SOCK"
+          if test -z "$SSH_AUTH_SOCK"; or test -z "$SSH_CONNECTION"
             set -x SSH_AUTH_SOCK ${socketPath}
           end
         '';
-
         nushellIntegration =
+          let
+            unsetOrEmpty = var: ''("${var}" not-in $env) or ($env.${var} | is-empty)'';
+            socketPath =
               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}"
-                  }
-                ''
+                ''$"(${lib.getExe pkgs.getconf} DARWIN_USER_TEMP_DIR)/${cfg.socket}"''
               else
+                ''$"($env.XDG_RUNTIME_DIR)/${cfg.socket}"'';
+          in
           ''
-                  if "SSH_AUTH_SOCK" not-in $env {
-                    $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/${cfg.socket}"
+            if ${unsetOrEmpty "SSH_AUTH_SOCK"} or ${unsetOrEmpty "SSH_CONNECTION"} {
+              $env.SSH_AUTH_SOCK = ${socketPath}
             }
           '';
       in
@@ -90,9 +90,7 @@ in
         nushell.extraConfig = lib.mkIf cfg.enableNushellIntegration (lib.mkOrder 900 nushellIntegration);
         zsh.envExtra = lib.mkIf cfg.enableZshIntegration (lib.mkOrder 900 bashIntegration);
       };
-      }
 
-      (lib.mkIf pkgs.stdenv.isLinux {
     systemd.user.services.ssh-agent = {
       Install.WantedBy = [ "default.target" ];
       Unit = {
@@ -105,9 +103,7 @@ in
         ) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
       }";
     };
-      })
 
-      (lib.mkIf pkgs.stdenv.isDarwin {
     launchd.agents.ssh-agent = {
       enable = true;
       config = {
@@ -128,7 +124,7 @@ in
         RunAtLoad = true;
       };
     };
-      })
-    ]
-  );
+
+  };
+
 }

modules/services/window-managers/fluxbox.nix

@@ -11,7 +11,7 @@ let
 
 in
 {
-  meta.maintainers = [ lib.maintainers.AndersonTorres ];
+  meta.maintainers = [ ];
 
   options = {
     xsession.windowManager.fluxbox = {

modules/services/window-managers/hyprland.nix

@@ -48,6 +48,11 @@ in
       [ "wayland" "windowManager" "hyprland" "systemdIntegration" ] # \
       [ "wayland" "windowManager" "hyprland" "systemd" "enable" ]
     )
+
+    (lib.mkRenamedOptionModule # \
+      [ "wayland" "windowManager" "hyprland" "xwayland" "enable" ] # \
+      [ "wayland" "windowManager" "hyprland" "settings" "xwayland" "enable" ]
+    )
   ];
 
   options.wayland.windowManager.hyprland = {
@@ -79,11 +84,7 @@ in
     finalPackage = lib.mkOption {
       type = with lib.types; nullOr package;
       readOnly = true;
-      default =
-        if cfg.package != null then
-          cfg.package.override { enableXWayland = cfg.xwayland.enable; }
-        else
-          null;
+      default = if cfg.package != null then cfg.package else null;
       defaultText = lib.literalMD "`wayland.windowManager.hyprland.package` with applied configuration";
       description = ''
         The Hyprland package after applying configuration.
@@ -162,10 +163,6 @@ in
         {manpage}`systemd-xdg-autostart-generator(8)`'';
     };
 
-    xwayland.enable = lib.mkEnableOption "XWayland" // {
-      default = true;
-    };
-
     settings = lib.mkOption {
       type =
         with lib.types;
@@ -357,7 +354,10 @@ in
       submapWarnings ++ lib.optional inconsistent warning;
 
     home.packages = lib.mkIf (cfg.package != null) (
-      [ cfg.finalPackage ] ++ lib.optional cfg.xwayland.enable pkgs.xwayland
+      [ cfg.finalPackage ]
+      ++ lib.optional (
+        (lib.hasAttrByPath [ "settings" "xwayland" "enable" ] cfg) && cfg.settings.xwayland.enable
+      ) pkgs.xwayland
     );
 
     xdg.configFile."hypr/hyprland.conf" =

modules/services/yubikey-agent.nix

@@ -19,11 +19,15 @@ in
     package = lib.mkPackageOption pkgs "yubikey-agent" { };
   };
 
-  config = mkIf cfg.enable (
-    lib.mkMerge [
-      { home.packages = [ cfg.package ]; }
+  config = mkIf cfg.enable {
+    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";
@@ -59,12 +63,6 @@ in
       };
     };
 
-        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 = {
@@ -87,11 +85,5 @@ in
         };
       };
     };
-
-        home.sessionVariables = {
-          SSH_AUTH_SOCK = "/tmp/yubikey-agent.sock";
   };
-      })
-    ]
-  );
 }

modules/systemd.nix

@@ -430,10 +430,7 @@ in
   # Do not install any user services if username is root.
   config = mkIf (cfg.enable && config.home.username != "root") {
     assertions = [
-      {
-        assertion = pkgs.stdenv.isLinux;
-        message = "This module is only available on Linux.";
-      }
+      (lib.hm.assertions.assertPlatform "systemd" pkgs lib.platforms.linux)
     ];
 
     xdg.configFile = mkMerge [

tests/modules/programs/ghostty/default.nix

@@ -1,5 +1,10 @@
+{ lib, pkgs, ... }:
+
 {
-  ghostty-example-settings = ./example-settings.nix;
   ghostty-empty-settings = ./empty-settings.nix;
+  ghostty-example-settings = ./example-settings.nix;
   ghostty-example-theme = ./example-theme.nix;
 }
+// lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
+  ghostty-systemd-service = ./systemd-service.nix;
+}

tests/modules/programs/ghostty/example-settings.nix

@@ -11,6 +11,9 @@
   };
 
   nmt.script = ''
+    servicePath=home-files/.config/systemd/user/app-com.mitchellh.ghostty.service
+    assertPathNotExists $servicePath
+
     assertFileContent \
       home-files/.config/ghostty/config \
       ${./example-config-expected}

tests/modules/programs/ghostty/systemd-service.nix

@@ -0,0 +1,28 @@
+{ config, ... }:
+{
+  programs.ghostty = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = null; };
+    systemd.enable = true;
+    settings = {
+      theme = "catppuccin-mocha";
+      font-size = 10;
+    };
+  };
+
+  nmt.script = ''
+    servicePath=home-files/.config/systemd/user/app-com.mitchellh.ghostty.service
+    serviceOverridesPath=$servicePath.d/overrides.conf
+
+    assertFileExists $serviceOverridesPath
+    assertFileContent $serviceOverridesPath \
+      ${builtins.toFile "ghostty-service-overrides" ''
+        [Unit]
+        X-SwitchMethod=keep-old
+      ''}
+
+    assertFileContent \
+      home-files/.config/ghostty/config \
+      ${./example-config-expected}
+  '';
+}

tests/modules/programs/gpg/default.nix

@@ -3,4 +3,5 @@
   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;
 }

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-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM=";
+          hash = "sha256-csrFDI6QSPfNN+adOPEAupAtspYNBCybFZExvVS+vRY=";
         };
         trust = 1; # "unknown"
       }

tests/modules/programs/gpg/other-dirmngr.conf

@@ -0,0 +1,2 @@
+keyserver ldaps://ldap.example.com
+use-tor

tests/modules/programs/gpg/other-gpgsm.conf

@@ -0,0 +1,3 @@
+cipher-algo AES256
+validation-model steed
+with-md5-fingerprint

tests/modules/programs/gpg/other-scdaemon.conf

@@ -0,0 +1,3 @@
+application-priority openpgp p15 sc-hsm nks geldkarte dinsig
+disable-ccid
+reader-port 32769

tests/modules/programs/gpg/other-settings.nix

@@ -0,0 +1,32 @@
+{
+  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}
+  '';
+}

tests/modules/programs/gpg/override-defaults-expected.conf

@@ -1,7 +1,6 @@
 cert-digest-algo SHA512
-charset utf-8
 default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed
-fixed-list-mode
+display-charset utf-8
 keyid-format 0xlong
 list-options show-uid-validity
 
@@ -16,6 +15,5 @@ s2k-digest-algo SHA512
 throw-keyids
 trusted-key 0xXXXXXXXXXXXXX
 trusted-key 0xYYYYYYYYYYYYY
-use-agent
 verify-options show-uid-validity
 with-fingerprint

tests/modules/programs/vicinae/example-settings.nix

@@ -62,9 +62,9 @@
 
     extensions = [
       (config.lib.vicinae.mkRayCastExtension {
-        name = "gif-search";
-        sha256 = "sha256-G7il8T1L+P/2mXWJsb68n4BCbVKcrrtK8GnBNxzt73Q=";
-        rev = "4d417c2dfd86a5b2bea202d4a7b48d8eb3dbaeb1";
+        name = "cdnjs";
+        sha256 = "sha256-k3YfruMxSOMf8K65iTW84aZxiknADCcntJOAE89agYc=";
+        rev = "ac7c50844bf77d0cf51daa840e369d999f2add59";
       })
       (config.lib.vicinae.mkExtension {
         name = "test-extension";
@@ -88,7 +88,7 @@
     assertFileExists      "home-files/.config/vicinae/settings.json"
     assertFileExists      "home-files/.config/systemd/user/vicinae.service"
     assertFileExists      "home-files/.local/share/vicinae/themes/catppuccin-mocha.toml"
-    assertFileExists      "home-files/.local/share/vicinae/extensions/gif-search/package.json"
+    assertFileExists      "home-files/.local/share/vicinae/extensions/cdnjs/package.json"
     assertFileExists      "home-files/.local/share/vicinae/extensions/test-extension/package.json"
     assertFileContent     "home-files/.config/systemd/user/vicinae.service"  ${./service.service}
   '';

tests/modules/services/podman-linux/build-expected.service

@@ -26,5 +26,5 @@ Type=oneshot
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
 Description=Service for build my-bld
-RequiresMountsFor=%t/containers
 SourcePath=/nix/store/00000000000000000000000000000000-home-build-podman-my-bld/quadlets/podman-my-bld.build
+RequiresMountsFor=%t/containers

tests/modules/services/podman-linux/build.nix

@@ -4,10 +4,9 @@
   pkgs,
   ...
 }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
-
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       builds = {
@@ -50,4 +49,5 @@ lib.mkIf config.test.enableLegacyIfd {
 
       assertFileContent $buildFile ${./build-expected.service}
     '';
+  };
 }

tests/modules/services/podman-linux/container-expected.service

@@ -27,18 +27,18 @@ WantedBy=default.target
 WantedBy=multi-user.target
 
 [Service]
-Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:@nftables@/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
 Restart=on-failure
 TimeoutStopSec=30
 Environment=PODMAN_SYSTEMD_UNIT=%n
 KillMode=mixed
-ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
-ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container
 Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --entrypoint /sleep.sh --network-alias test-alias-1 --network-alias test-alias-2 --read-only-tmpfs --network mynet --sdnotify=conmon -d --device /dev/null:/dev/null -v /tmp:/tmp --label io.containers.autoupdate=registry --publish 8080:80 --env VAL_A=A --env VAL_B=2 --env VAL_C=false --label nix.home-manager.managed=true --security-opt=no-new-privileges docker.io/alpine:latest
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --replace --rm --cgroups=split --entrypoint /sleep.sh --network-alias test-alias-1 --network-alias test-alias-2 --read-only-tmpfs --network mynet --sdnotify=conmon -d --device /dev/null:/dev/null -v /tmp:/tmp --label io.containers.autoupdate=registry --publish 8080:80 --env VAL_A=A --env VAL_B=2 --env VAL_C=false --label nix.home-manager.managed=true --security-opt=no-new-privileges docker.io/alpine:latest
 
 [Unit]
 Wants=podman-user-wait-network-online.service

tests/modules/services/podman-linux/container.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
+  config = lib.mkIf config.test.enableLegacyIfd {
 
     services.podman = {
       enable = true;
@@ -58,4 +58,5 @@ lib.mkIf config.test.enableLegacyIfd {
 
       assertFileContent $containerFile ${./container-expected.service}
     '';
+  };
 }

tests/modules/services/podman-linux/image.nix

@@ -1,8 +1,7 @@
 { config, lib, ... }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
-
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       images = {
@@ -21,4 +20,5 @@ lib.mkIf config.test.enableLegacyIfd {
 
       assertFileContent $imageFile ${./image-expected.service}
     '';
+  };
 }

tests/modules/services/podman-linux/integration-build-expected.service

@@ -26,5 +26,5 @@ Type=oneshot
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
 Description=Service for build my-bld
-RequiresMountsFor=%t/containers
 SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container-bld/quadlets/podman-my-bld.build
+RequiresMountsFor=%t/containers

tests/modules/services/podman-linux/integration-container-bld-expected.service

@@ -15,24 +15,24 @@ WantedBy=default.target
 WantedBy=multi-user.target
 
 [Service]
-Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:@nftables@/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
 Restart=always
 TimeoutStopSec=30
 Environment=PODMAN_SYSTEMD_UNIT=%n
 KillMode=mixed
-ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
-ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container-bld
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container-bld
 Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container-bld --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon -d --label nix.home-manager.managed=true homemanager/my-bld
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container-bld --replace --rm --cgroups=split --sdnotify=conmon -d --label nix.home-manager.managed=true homemanager/my-bld
 
 [Unit]
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
 Description=Service for container my-container-bld
 SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container-bld/quadlets/podman-my-container-bld.container
+RequiresMountsFor=%t/containers
 Requires=podman-my-bld-build.service
 After=podman-my-bld-build.service
-RequiresMountsFor=%t/containers

tests/modules/services/podman-linux/integration-container-expected.service

@@ -18,27 +18,27 @@ WantedBy=default.target
 WantedBy=multi-user.target
 
 [Service]
-Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
+Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:@nftables@/bin:/home/hm-user/.nix-profile/bin:@systemd@/bin
 Restart=always
 TimeoutStopSec=30
 Environment=PODMAN_SYSTEMD_UNIT=%n
 KillMode=mixed
-ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
-ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid
+ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container
+ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i my-container
 Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
-ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-app --network externalnet --sdnotify=conmon -d -v my-app:/data --label nix.home-manager.managed=true docker.io/alpine:latest
+ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --replace --rm --cgroups=split --network my-app --network externalnet --sdnotify=conmon -d -v my-app:/data --label nix.home-manager.managed=true docker.io/alpine:latest
 
 [Unit]
 Wants=podman-user-wait-network-online.service
 After=podman-user-wait-network-online.service
 Description=Service for container my-container
 SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container
+RequiresMountsFor=%t/containers
 Requires=podman-my-img-image.service
 After=podman-my-img-image.service
-RequiresMountsFor=%t/containers
 Requires=podman-my-app-network.service
 After=podman-my-app-network.service
 Requires=podman-my-app-volume.service

tests/modules/services/podman-linux/integration.nix

@@ -4,10 +4,10 @@
   pkgs,
   ...
 }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
 
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       builds."my-bld" = {
@@ -78,4 +78,5 @@ lib.mkIf config.test.enableLegacyIfd {
       assertFileContent $networkFile ${./integration-network-expected.service}
       assertFileContent $volumeFile ${./integration-volume-expected.service}
     '';
+  };
 }

tests/modules/services/podman-linux/manifest.nix

@@ -1,8 +1,7 @@
 { config, lib, ... }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
-
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       containers."my-container-1" = {
@@ -59,4 +58,5 @@ lib.mkIf config.test.enableLegacyIfd {
         mynet-2
       ''}
     '';
+  };
 }

tests/modules/services/podman-linux/network.nix

@@ -1,8 +1,7 @@
 { config, lib, ... }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
-
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       networks = {
@@ -49,4 +48,5 @@ lib.mkIf config.test.enableLegacyIfd {
 
       assertFileContent $networkFile ${./network-expected.service}
     '';
+  };
 }

tests/modules/services/podman-linux/volume.nix

@@ -1,8 +1,7 @@
 { config, lib, ... }:
-
-lib.mkIf config.test.enableLegacyIfd {
+{
   imports = [ ./podman-stubs.nix ];
-
+  config = lib.mkIf config.test.enableLegacyIfd {
     services.podman = {
       enable = true;
       volumes = {
@@ -41,4 +40,5 @@ lib.mkIf config.test.enableLegacyIfd {
 
       assertFileContent $volumeFile ${./volume-expected.service}
     '';
+  };
 }