ghostty: use the systemd X-Base option

- restructure module from `podman-linux` to platform-agnostic `podman`
- move linux-specific implementation to `modules/services/podman/linux/`
- add darwin module with declarative machine management
- implement launchd-based watchdog for auto-starting machines
- maintains backward compatibility with existing linux functionality

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,7 +22,7 @@ Also make sure to read the guidelines found at
 - [ ] Change is backwards compatible.
 
 - [ ] Code formatted with `nix fmt` or
-      `nix-shell -p treefmt nixfmt deadnix keep-sorted --run treefmt`.
+      `nix-shell -p treefmt nixfmt deadnix keep-sorted nixf-diagnose --run treefmt`.
 
 - [ ] Code tested through `nix run .#tests -- test-all` or
       `nix-shell --pure tests -A run.all`.

.github/dependabot.yml

@@ -7,10 +7,9 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "ci:"
-
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "release-25.05"
+    target-branch: "release-25.11"
     schedule:
       interval: "weekly"
     commit-message:

.github/labeler.yml

@@ -165,7 +165,7 @@
 "containers":
   - changed-files:
       - any-glob-to-any-file:
-          - modules/services/podman-linux/**/*
+          - modules/services/podman/linux/**/*
           - modules/programs/distrobox.nix
           - modules/programs/docker-cli.nix
 "desktop-ui":

.github/workflows/backport.yml

@@ -37,7 +37,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@v3
+        uses: korthout/backport-action@v4
         with:
           # See https://github.com/korthout/backport-action#inputs
           github_token: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}

.github/workflows/update-flake.yml

@@ -9,8 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'schedule' || github.repository_owner == 'nix-community'
     strategy:
+      fail-fast: false
       matrix:
-        branch: [master, release-25.05]
+        branch: [master, release-25.11]
     steps:
       - name: Create GitHub App token
         uses: actions/create-github-app-token@v2
@@ -41,7 +42,7 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v31
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v27
+        uses: DeterminateSystems/update-flake-lock@v28
         with:
           token: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
           git-committer-name: ${{ steps.user-info.outputs.name || 'github-actions[bot]' }}

.github/workflows/validate-maintainers.yml

@@ -1,7 +1,10 @@
 name: Validate maintainers.nix
 on:
   pull_request:
-    paths: ["modules/lib/maintainers.nix"]
+    paths:
+      - "modules/lib/maintainers.nix"
+      - "flake.lock"
+      - "all-maintainers.nix"
   workflow_dispatch:
     inputs:
       run_tests:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 Home Manager contributors
+Copyright (c) 2017-2026 Home Manager contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MAINTAINING.md

@@ -121,6 +121,22 @@ Reference commits:
    - Change `isReleaseBranch` from `false` to `true`
    - Do NOT change the `release` field (it's already correct from Step 1)
 
+2. **flake.nix**
+   - Update the nixpkgs input to track the corresponding stable branch
+   - Example: For `release-25.11`, change from:
+     ```nix
+     inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+     ```
+     to:
+     ```nix
+     inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+     ```
+   - Run `nix flake update` to update flake.lock to the stable branch
+   - Commit the flake.nix and flake.lock changes
+
+**Note**: The release branch should track the stable NixOS release channel
+(e.g., `nixos-25.11`), while master continues to track `nixos-unstable`.
+
 #### Step 3.5: On master - Update CI for the New Release Branch
 
 **When**: After marking the release branch as a release branch (Step 3)
@@ -150,6 +166,37 @@ Reference commits:
    - This ensures automated flake.lock updates run on the current stable branch
    - Note: We only maintain CI for the latest stable release, not older releases
 
+2. **.github/dependabot.yml** (on master)
+   - Replace the old stable branch with the new release branch
+   - Example: When creating `release-25.11`, update the target-branch from:
+
+     ```yaml
+     - package-ecosystem: "github-actions"
+       directory: "/"
+       target-branch: "release-25.05"
+       schedule:
+         interval: "weekly"
+       commit-message:
+         prefix: "ci:"
+     ```
+
+     to:
+
+     ```yaml
+     - package-ecosystem: "github-actions"
+       directory: "/"
+       target-branch: "release-25.11"
+       schedule:
+         interval: "weekly"
+       commit-message:
+         prefix: "ci:"
+     ```
+
+   - This ensures automated dependency updates for GitHub Actions on the current
+     stable branch
+   - Note: We only maintain dependabot for the latest stable release, not older
+     releases
+
 **Important**: CI workflows are executed from master, so this change must be
 committed to the master branch.
 

Makefile

@@ -17,4 +17,4 @@ test-install:
 	HOME=$(shell mktemp -d) NIX_PATH=${NIX_PATH} nix-shell . -A install
 
 format:
-	nix-shell -p treefmt nixfmt deadnix keep-sorted --run "treefmt --config-file ./treefmt.toml"
+	nix-shell -p treefmt nixfmt deadnix keep-sorted nixf-diagnose --run "treefmt --config-file ./treefmt.toml"

all-maintainers.nix

@@ -19,6 +19,11 @@
     email = "da157@voidq.com";
     github = "0xda157";
     githubId = 153149335;
+    keys = [
+      {
+        fingerprint = "5A66 FF95 36DE B501 DDD2  1647 B7AC 1B10 365D 45FF";
+      }
+    ];
     matrix = "@da157:catgirl.cloud";
     name = "0xda157";
     source = "nixpkgs";
@@ -65,14 +70,6 @@
     name = "Alex";
     source = "home-manager";
   };
-  AndersonTorres = {
-    email = "torres.anderson.85@protonmail.com";
-    github = "AndersonTorres";
-    githubId = 5954806;
-    matrix = "@anderson_torres:matrix.org";
-    name = "Anderson Torres";
-    source = "nixpkgs";
-  };
   AndreasMager = {
     email = "andreas@mager.eu";
     github = "AndreasMager";
@@ -361,6 +358,11 @@
     email = "nixpkgs@perchun.it";
     github = "PerchunPak";
     githubId = 68118654;
+    keys = [
+      {
+        fingerprint = "BBB5 1142 959D 8549 A3D2  F6C5 313F 67D1 EAB7 70F9";
+      }
+    ];
     name = "Perchun Pak";
     source = "nixpkgs";
   };
@@ -629,6 +631,13 @@
     name = "Arjan Schrijver";
     source = "nixpkgs";
   };
+  arunoruto = {
+    email = "mirza.arnaut45@gmail.com";
+    github = "arunoruto";
+    githubId = 21687187;
+    name = "Mirza Arnaut";
+    source = "nixpkgs";
+  };
   asymmetric = {
     email = "lorenzo@mailbox.org";
     github = "asymmetric";
@@ -1085,19 +1094,6 @@
     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";
@@ -1761,7 +1757,7 @@
     github = "nickthegroot";
     githubId = 1966472;
     name = "Nick DeGroot";
-    source = "home-manager";
+    source = "nixpkgs";
   };
   nikp123 = {
     email = "nikp123@users.noreply.github.com";
@@ -2013,7 +2009,7 @@
     github = "rrvsh";
     githubId = 20300874;
     name = "Mohammad Rafiq";
-    source = "home-manager";
+    source = "nixpkgs";
   };
   rszamszur = {
     email = "radoslawszamszur@gmail.com";
@@ -2066,7 +2062,7 @@
     source = "nixpkgs";
   };
   shikanime = {
-    email = "deva.shikanime@protonmail.com";
+    email = "william.phetsinorath@shikanime.studio";
     github = "shikanime";
     githubId = 22115108;
     name = "William Phetsinorath";
@@ -2304,6 +2300,13 @@
     name = "Florian Peter";
     source = "nixpkgs";
   };
+  xavwe = {
+    email = "git@xavwe.dev";
+    github = "xavwe";
+    githubId = 125409009;
+    name = "Xaver Wenhart";
+    source = "nixpkgs";
+  };
   xlambein = {
     email = "xlambein@gmail.com";
     github = "xlambein";

docs/default.nix

@@ -110,8 +110,7 @@ let
     in
     pkgs.buildPackages.nixosOptionsDoc (
       {
-        options =
-          if includeModuleSystemOptions then options else builtins.removeAttrs options [ "_module" ];
+        options = if includeModuleSystemOptions then options else removeAttrs options [ "_module" ];
         transformOptions =
           opt:
           opt
@@ -133,7 +132,7 @@ let
             ) opt.declarations;
           };
       }
-      // builtins.removeAttrs args [
+      // removeAttrs args [
         "modules"
         "includeModuleSystemOptions"
       ]

docs/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743938762,
-        "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
+        "lastModified": 1764081664,
+        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
+        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
         "type": "github"
       },
       "original": {

docs/manual/faq/session-variables.md

@@ -17,8 +17,11 @@ 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)
+plugin](https://github.com/oh-my-fish/plugin-foreign-env) or using the builtin
+[babelfish](https://github.com/bouk/babelfish)-translated variables:
 
 ``` 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"
 ```

docs/manual/manual.md

@@ -1,6 +1,6 @@
 # Home Manager Manual {#home-manager-manual}
 
-## Version 25.11
+## Version 26.05 (unstable)
 
 
 ```{=include=} preface

docs/release-notes/release-notes.md

@@ -4,6 +4,7 @@ This section lists the release notes for stable versions of Home Manager
 and the current unstable version.
 
 ```{=include=} chapters
+rl-2605.md
 rl-2511.md
 rl-2505.md
 rl-2411.md

docs/release-notes/rl-2305.md

@@ -57,3 +57,9 @@ 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.

docs/release-notes/rl-2505.md

@@ -27,4 +27,8 @@ The state version in this release includes the changes below. These
 changes are only active if the `home.stateVersion` option is set to
 \"25.05\" or later.
 
-- No changes.
+- 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.

docs/release-notes/rl-2511.md

@@ -80,3 +80,10 @@ 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.

docs/release-notes/rl-2605.md

@@ -0,0 +1,25 @@
+# Release 26.05 {#sec-release-26.05}
+
+This is the current unstable branch and the information in this
+section is therefore not final.
+
+## Highlights {#sec-release-26.05-highlights}
+
+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.

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763678758,
-        "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {

flake.nix

@@ -57,6 +57,7 @@
               nixfmt
               deadnix
               keep-sorted
+              nixf-diagnose
             ];
             settings = pkgs.lib.importTOML ./treefmt.toml;
           }

home-manager/home-manager

@@ -1277,7 +1277,7 @@ while [[ $# -gt 0 ]]; do
             export VERBOSE=1
             ;;
         --version)
-            echo 25.11-pre
+            echo 26.05-pre
             exit 0
             ;;
         *)

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: 2025-08-23 20:02+0000\n"
+"PO-Revision-Date: 2026-01-07 17:01+0000\n"
 "Last-Translator: Brian E <brianellingsgaard9@gmail.com>\n"
 "Language-Team: Faroese <https://hosted.weblate.org/projects/home-manager/cli/"
 "fo/>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.13\n"
+"X-Generator: Weblate 5.15.1\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: manglar eitt ávirki fyri %s"
 
 #. translators: For example: "home-manager: --rollback can only be used after switch"
 #: home-manager/home-manager:22
@@ -31,7 +31,7 @@ msgstr "%s: %s kann bert brúkast aftaná %s"
 
 #: home-manager/home-manager:71
 msgid "No configuration file found at %s"
-msgstr ""
+msgstr "Eingin samansetingsfíla funni hjá %s"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
@@ -41,10 +41,12 @@ 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 ""
+msgstr "Eingin samansetingsfíla funni. Vinarliga stovna ein hjá %s"
 
 #: home-manager/home-manager:114
 msgid "Home Manager not found at %s."

home-manager/po/zh_Hant.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-07-22 10:59+0200\n"
-"PO-Revision-Date: 2025-03-07 18:58+0000\n"
-"Last-Translator: 807 <s10855168@gmail.com>\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"
 "Language: zh_Hant\n"
@@ -17,21 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.15-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s: 缺少參數 %s"
+msgstr "%s：缺少 %s 的引數"
 
 #. translators: For example: "home-manager: --rollback can only be used after switch"
 #: home-manager/home-manager:22
 msgid "%s: %s can only be used after %s"
-msgstr ""
+msgstr "%s：%s 只能在 %s 之後使用"
 
 #: home-manager/home-manager:71
 msgid "No configuration file found at %s"
-msgstr "未在 %s 處找到配置檔案"
+msgstr "在 %s 找不到設定檔"
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
@@ -41,12 +41,12 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
-"保持你的 Home Manager 在 %s 中，%s 已被拋棄，\n"
-"請將它移動到 %s"
+"將 Home Manager 的 %s 放在 %s 中， 已經被棄用，\n"
+"請改放到 %s"
 
 #: home-manager/home-manager:99
 msgid "No configuration file found. Please create one at %s"
-msgstr "未找到配置檔案。請在 %s 處建立一份"
+msgstr "找不到設定檔。請在 %s 建立新的設定檔"
 
 #: home-manager/home-manager:114
 msgid "Home Manager not found at %s."
@@ -57,7 +57,7 @@ msgstr "在 %s 中找不到 Home Manager。"
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
-msgstr "備用的 Home Manager 路徑 %s 已被拋棄，但一個檔案/資料夾在這被找到。"
+msgstr "備用的 Home Manager 路徑 %s 已被棄用，且在該處找到了檔案/目錄。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:125
@@ -80,21 +80,21 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
-"要消除這個警告，請做以下其中一步。\n"
+"若要移除此警告，請執行下列其中一項。\n"
 "\n"
-"1. 告訴Home Manager去使用路徑，例如加入\n"
+"1. 明確告知 Home Manager 使用該路徑，例如在\n"
 "\n"
 "     { programs.home-manager.path = \"%s\"; }\n"
 "\n"
-"   到你的配置中。\n"
+"   中，加入您的設定。\n"
 "\n"
-"   如果你想要直接引入Home Manager， 請你使用 `path` 參數r\n"
+"   如果想直接匯入 Home Manager，可以在呼叫時使用 `path` 參數來指定路徑：\n"
 "\n"
 "     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
 "\n"
-"   當呼叫 Home Manager 模組。\n"
+"   這樣就能正確傳遞 Home Manager 的路徑。\n"
 "\n"
-"2. 刪除無效的路徑\n"
+"2. 移除已棄用的路徑。\n"
 "\n"
 "     $ rm -r \"%s\""
 
@@ -104,33 +104,33 @@ msgstr "正在進行 Nix 完整性檢查"
 
 #: home-manager/home-manager:173
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s"
+msgstr "找不到合適的設定檔目錄，已嘗試 %s 和 %s"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:230
 msgid "Can't inspect options of a flake configuration"
-msgstr "無法檢查 flake 配置中的選項"
+msgstr "無法檢查 flake 設定的選項"
 
 #: home-manager/home-manager:305 home-manager/home-manager:328
 #: home-manager/home-manager:734 home-manager/home-manager:1237
 msgid "%s: unknown option '%s'"
-msgstr "%s：未知選項 ‘%s’"
+msgstr "%s：未知選項 '%s'"
 
 #: home-manager/home-manager:310 home-manager/home-manager:1238
 msgid "Run '%s --help' for usage help"
-msgstr "執行 ‘%s --help’ 獲取用法幫助"
+msgstr "執行 '%s --help' 以取得使用說明"
 
 #: home-manager/home-manager:336 home-manager/home-manager:441
 msgid "The file %s already exists, leaving it unchanged..."
-msgstr "檔案 %s 已經存在，不更改它..."
+msgstr "檔案 %s 已存在，保持不變..."
 
 #: home-manager/home-manager:338 home-manager/home-manager:443
 msgid "Creating %s..."
-msgstr "創建 %s 中..."
+msgstr "正在建立 %s..."
 
 #: home-manager/home-manager:487
 msgid "Creating initial Home Manager generation..."
-msgstr "正在建立初始 Home Manager 世代 ..."
+msgstr "正在建立初始 Home Manager 世代..."
 
 #. translators: The "%s" specifier will be replaced by a file path.
 #: home-manager/home-manager:492
@@ -142,12 +142,12 @@ msgid ""
 "to configure Home Manager. Run 'man home-configuration.nix' to\n"
 "see all available options."
 msgstr ""
-"全部工作完成了！home-manager 工具現應已安裝，您可以編輯\n"
+"全部完成！home-manager 工具現在應該已被安裝，您可以編輯\n"
 "\n"
 "    %s\n"
 "\n"
-"來配置 Home Manager。執行 ‘man home-configuration.nix’\n"
-"來檢視所有可用選項。"
+"來設定 Home Manager。執行 'man home-configuration.nix' 時\n"
+"可查看所有可用選項。"
 
 #. translators: The "%s" specifier will be replaced by a URL.
 #: home-manager/home-manager:497
@@ -158,16 +158,16 @@ msgid ""
 "\n"
 "if the error seems to be the fault of Home Manager."
 msgstr ""
-"啊哦，安裝失敗了！如果感覺是 Home Manager 造成的錯誤，請在下方\n"
+"糟糕，安裝失敗了！如果感覺是 Home Manager 所造成的錯誤，請在此連結\n"
 "\n"
 "    %s\n"
 "\n"
-"處建立 Issue 告知我們。"
+"中，建立 Issue 告知我們。"
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:508
 msgid "Can't instantiate a flake configuration"
-msgstr "無法建立 flake 配置例項"
+msgstr "無法實例化 flake 設定"
 
 #: home-manager/home-manager:584
 msgid ""
@@ -177,12 +177,12 @@ msgid_plural ""
 "There are %d unread and relevant news items.\n"
 "Read them by running the command \"%s news\"."
 msgstr[0] ""
-"有 %d 條未讀的相關新聞或訊息。\n"
-"可執行 “%s news” 命令進行閱讀。"
+"有 %d 則未讀且相關的消息項目。\n"
+"執行指令 \"%s news\" 來進行確認。"
 
 #: home-manager/home-manager:598
 msgid "Unknown \"news.display\" setting \"%s\"."
-msgstr "未知的 “news.display” 設定項 “%s”。"
+msgstr "未知的 \"news.display\" 設定值 \"%s\"。"
 
 #: home-manager/home-manager:606
 #, sh-format
@@ -191,11 +191,11 @@ msgstr "請設定 $EDITOR 或 $VISUAL 環境變數"
 
 #: home-manager/home-manager:624
 msgid "Cannot run build in read-only directory"
-msgstr "無法在唯讀目錄中執行構建"
+msgstr "無法在唯讀目錄中執行建置"
 
 #: home-manager/home-manager:787
 msgid "The configuration did not contain the specialisation \"%s\""
-msgstr ""
+msgstr "設定中不包含特化設定 \"%s\""
 
 #: home-manager/home-manager:841
 msgid "No generation with ID %s"
@@ -203,7 +203,7 @@ msgstr "沒有 ID 為 %s 的世代"
 
 #: home-manager/home-manager:843
 msgid "Cannot remove the current generation %s"
-msgstr "無法移除當前世代 %s"
+msgstr "無法移除目前的世代 %s"
 
 #: home-manager/home-manager:845
 msgid "Removing generation %s"
@@ -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/accounts/contacts.nix

@@ -102,8 +102,8 @@ let
         };
 
         local = mkOption {
-          type = types.nullOr (localModule name);
-          default = null;
+          type = localModule name;
+          default = { };
           description = ''
             Local configuration for the contacts.
           '';

modules/default.nix

@@ -31,7 +31,7 @@ let
     modules = [ configuration ] ++ hmModules;
     class = "homeManager";
     specialArgs = {
-      modulesPath = builtins.toString ./.;
+      modulesPath = toString ./.;
     }
     // extraSpecialArgs;
   };
@@ -57,9 +57,8 @@ let
     let
       module = moduleChecks rawModule;
     in
-    {
-      inherit (module) options config;
-
+    module
+    // {
       activationPackage = module.config.home.activationPackage;
 
       # For backwards compatibility. Please use activationPackage instead.

modules/home-environment.nix

@@ -193,6 +193,13 @@ in
       description = "The user's username.";
     };
 
+    home.uid = mkOption {
+      type = types.nullOr types.ints.unsigned;
+      default = null;
+      example = 1000;
+      description = "The user's uid.";
+    };
+
     home.homeDirectory = mkOption {
       type = types.path;
       defaultText = literalExpression ''
@@ -570,14 +577,25 @@ in
     warnings =
       let
         hmRelease = config.home.version.release;
-        nixpkgsRelease = lib.trivial.release;
-        releaseMismatch = config.home.enableNixpkgsReleaseCheck && hmRelease != nixpkgsRelease;
+        libRelease = lib.trivial.release;
+        pkgsRelease = pkgs.lib.trivial.release;
+        releaseMismatch = hmRelease != libRelease || hmRelease != pkgsRelease;
+
+        versionsSummary =
+          if libRelease == pkgsRelease then
+            ''
+              Home Manager version ${hmRelease} and
+              Nixpkgs version ${libRelease}.''
+          else
+            ''
+              Home Manager version: ${hmRelease}
+              Nixpkgs version used to evaluate Home Manager: ${libRelease}
+              Nixpkgs version used for packages (`pkgs`): ${pkgsRelease}'';
       in
-      lib.optional releaseMismatch ''
+      lib.optional (config.home.enableNixpkgsReleaseCheck && releaseMismatch) ''
         You are using
 
-          Home Manager version ${hmRelease} and
-          Nixpkgs version ${nixpkgsRelease}.
+          ${lib.replaceString "\n" "\n  " versionsSummary}
 
         Using mismatched versions is likely to cause errors and unexpected
         behavior. It is therefore highly recommended to use a release of Home
@@ -831,6 +849,9 @@ in
           if [[ ! -v SKIP_SANITY_CHECKS ]]; then
             checkUsername ${lib.escapeShellArg config.home.username}
             checkHomeDirectory ${lib.escapeShellArg config.home.homeDirectory}
+            ${lib.optionalString (config.home.uid != null) ''
+              checkUid ${toString config.home.uid}
+            ''}
           fi
 
           ${lib.optionalString config.home.activationGenerateGcRoot ''

modules/i18n/input-method/fcitx5.nix

@@ -192,7 +192,7 @@ in
         ++ lib.optionals (cfg.quickPhraseFiles != { }) [
           (pkgs.linkFarm "quickPhraseFiles" (
             lib.mapAttrs' (
-              name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value
+              name: value: lib.nameValuePair "share/fcitx5/data/quickphrase.d/${name}.mb" value
             ) cfg.quickPhraseFiles
           ))
         ];

modules/launchd/default.nix

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

modules/launchd/types.nix

@@ -13,12 +13,9 @@ let
     mergeDefinitions
     ;
   inherit (builtins)
-    map
     filter
     length
     deepSeq
-    throw
-    toString
     concatLists
     ;
   inherit (lib.options) showDefs;

modules/lib-bash/activation-init.sh

@@ -117,6 +117,17 @@ function checkHomeDirectory() {
   fi
 }
 
+function checkUid() {
+  local expectedUid="$1"
+  local actualUid
+  actualUid="$(id -u)"
+
+  if [[ "$actualUid" != "$expectedUid" ]]; then
+    _iError 'Error: UID is "%s" but we expect "%s"' "$actualUid" "$expectedUid"
+    exit 1
+  fi
+}
+
 # Note, the VERBOSE_ECHO variable is deprecated and should not be used inside
 # the Home Manager project. It is provided here for backwards compatibility.
 if [[ -v VERBOSE ]]; then

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
 {

modules/lib/generators.nix

@@ -21,6 +21,7 @@
         isList
         mapAttrsToList
         replicate
+        attrNames
         ;
 
       initialIndent = concatStrings (replicate indentLevel "  ");
@@ -28,31 +29,36 @@
       toHyprconf' =
         indent: attrs:
         let
-          sections = 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 attrs;
+          withoutImportantFields = fields: removeAttrs fields (attrNames importantFields);
+
+          allSections = filterAttrs (n: v: isAttrs v || isList v) attrs;
+          sections = withoutImportantFields allSections;
 
           mkSection =
             n: attrs:
-            if lib.isList attrs then
-              (concatMapStringsSep "\n" (a: mkSection n a) attrs)
-            else
+            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
               ''
                 ${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 && 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);
+          allFields = filterAttrs (n: v: !(isAttrs v || isList v)) attrs;
+          fields = withoutImportantFields allFields;
         in
         mkFields importantFields
         + concatStringsSep "\n" (mapAttrsToList mkSection sections)

modules/lib/maintainers.nix

@@ -175,6 +175,12 @@
     github = "exzombie";
     githubId = 11456290;
   };
+  farberbrodsky = {
+    name = "Michael Farber Brodsky";
+    email = "misha@farberbrodsky.com";
+    github = "farberbrodsky";
+    githubId = 36243759;
+  };
   fendse = {
     email = "46252070+Fendse@users.noreply.github.com";
     github = "Fendse";
@@ -423,12 +429,6 @@
     github = "natecox";
     githubId = 2782695;
   };
-  nickthegroot = {
-    name = "Nick DeGroot";
-    email = "nick@nickthegroot.com";
-    github = "nickthegroot";
-    githubId = 1966472;
-  };
   nikp123 = {
     name = "nikp123";
     email = "nikp123@users.noreply.github.com";
@@ -507,12 +507,6 @@
     github = "Rosuavio";
     githubId = 7164552;
   };
-  rrvsh = {
-    name = "Mohammad Rafiq";
-    email = "rafiq@rrv.sh";
-    github = "rrvsh";
-    githubId = 20300874;
-  };
   rszamszur = {
     name = "Radosław Szamszur";
     email = "radoslawszamszur@gmail.com";

modules/misc/dconf.nix

@@ -17,15 +17,29 @@ let
   # The dconf keys managed by this configuration. We store this as part of the
   # generation state to be able to reset keys that become unmanaged during
   # switch.
-  stateDconfKeys = pkgs.writeText "dconf-keys.json" (
-    builtins.toJSON (
-      lib.concatLists (
-        lib.mapAttrsToList (
-          dir: entries: lib.mapAttrsToList (key: _: "/${dir}/${key}") entries
-        ) cfg.settings
+  mkStateDconfKeys =
+    nameSuffix: settings:
+    pkgs.writeText "dconf-keys${nameSuffix}.json" (
+      builtins.toJSON (
+        lib.concatLists (
+          lib.mapAttrsToList (dir: entries: lib.mapAttrsToList (key: _: "/${dir}/${key}") entries) settings
+        )
       )
-    )
-  );
+    );
+
+  databases =
+    lib.optional (cfg.settings != { }) {
+      dconfProfile = null;
+      stateDconfKeys = mkStateDconfKeys "" cfg.settings;
+      inherit (cfg) settings;
+    }
+    ++ lib.mapAttrsToList (name: value: {
+      dconfProfile = pkgs.writeText "dconf-profile-${name}" ''
+        user-db:${name}
+      '';
+      stateDconfKeys = mkStateDconfKeys "-${name}" value;
+      settings = value;
+    }) cfg.databases;
 
 in
 {
@@ -81,73 +95,87 @@ in
           to convert dconf database dumps into compatible Nix expression.
         '';
       };
+      databases = lib.mkOption {
+        type = with types; attrsOf (attrsOf (attrsOf lib.hm.types.gvariant));
+        default = { };
+        description = ''
+          Settings to write to specific dconf user databases.
+          See [](#opt-dconf.settings) for details.
+        '';
+      };
     };
   };
 
-  config = lib.mkIf (cfg.enable && cfg.settings != { }) {
+  config = lib.mkIf (cfg.enable && databases != [ ]) {
     # Make sure the dconf directory exists.
     xdg.configFile."dconf/.keep".source = builtins.toFile "keep" "";
 
     home.extraBuilderCommands = ''
       mkdir -p $out/state/
-      ln -s ${stateDconfKeys} $out/state/${stateDconfKeys.name}
-    '';
+    ''
+    + lib.concatMapStrings (db: ''
+      ln -s ${db.stateDconfKeys} $out/state/${db.stateDconfKeys.name}
+    '') databases;
 
     home.activation.dconfSettings = lib.hm.dag.entryAfter [ "installPackages" ] (
-      let
-        iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings);
+      lib.concatMapStrings (
+        db:
+        let
+          iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni db.settings);
 
-        statePath = "state/${stateDconfKeys.name}";
+          statePath = "state/${db.stateDconfKeys.name}";
 
-        cleanup = pkgs.writeShellScript "dconf-cleanup" ''
-          set -euo pipefail
+          cleanup = pkgs.writeShellScript "dconf-cleanup" ''
+            set -euo pipefail
 
-          ${config.lib.bash.initHomeManagerLib}
+            ${config.lib.bash.initHomeManagerLib}
 
-          PATH=${
-            lib.makeBinPath [
-              pkgs.dconf
-              pkgs.jq
-            ]
-          }''${PATH:+:}$PATH
+            PATH=${
+              lib.makeBinPath [
+                pkgs.dconf
+                pkgs.jq
+              ]
+            }''${PATH:+:}$PATH
 
-          oldState="$1"
-          newState="$2"
+            oldState="$1"
+            newState="$2"
 
-          # Can't do cleanup if we don't know the old state.
-          if [[ ! -f $oldState ]]; then
-            exit 0
+            # Can't do cleanup if we don't know the old state.
+            if [[ ! -f $oldState ]]; then
+              exit 0
+            fi
+
+            # Reset all keys that are present in the old generation but not the new
+            # one.
+            jq -r -n \
+                --slurpfile old "$oldState" \
+                --slurpfile new "$newState" \
+                '($old[] - $new[])[]' \
+              | while read -r key; do
+                  verboseEcho "Resetting dconf key \"$key\""
+                  run $DCONF_DBUS_RUN_SESSION dconf reset "$key"
+                done
+          '';
+          envCommand = lib.optionalString (db.dconfProfile != null) "env DCONF_PROFILE=${db.dconfProfile}";
+        in
+        ''
+          if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
+            export DCONF_DBUS_RUN_SESSION="${envCommand}"
+          else
+            export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon ${envCommand}"
           fi
 
-          # Reset all keys that are present in the old generation but not the new
-          # one.
-          jq -r -n \
-              --slurpfile old "$oldState" \
-              --slurpfile new "$newState" \
-              '($old[] - $new[])[]' \
-            | while read -r key; do
-                verboseEcho "Resetting dconf key \"$key\""
-                run $DCONF_DBUS_RUN_SESSION dconf reset "$key"
-              done
-        '';
-      in
-      ''
-        if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then
-          export DCONF_DBUS_RUN_SESSION=""
-        else
-          export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon"
-        fi
+          if [[ -v oldGenPath ]]; then
+            ${cleanup} \
+              "$oldGenPath/${statePath}" \
+              "$newGenPath/${statePath}"
+          fi
 
-        if [[ -v oldGenPath ]]; then
-          ${cleanup} \
-            "$oldGenPath/${statePath}" \
-            "$newGenPath/${statePath}"
-        fi
+          run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile}
 
-        run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile}
-
-        unset DCONF_DBUS_RUN_SESSION
-      ''
+          unset DCONF_DBUS_RUN_SESSION
+        ''
+      ) databases
     );
   };
 }

modules/misc/fontconfig.nix

@@ -278,7 +278,7 @@ in
                   else if builtins.isString value then
                     "<const>${value}</const>"
                   else
-                    throw ("expected bool or string but got ${builtins.typeOf value}: ${toString value}");
+                    throw "expected bool or string but got ${builtins.typeOf value}: ${toString value}";
               in
               ''
                 <match target="font">
@@ -338,7 +338,7 @@ in
 
     xdg.configFile = lib.mapAttrs' (
       name: config:
-      lib.nameValuePair "fontconfig/conf.d/${builtins.toString config.priority}-hm-${config.label}.conf" {
+      lib.nameValuePair "fontconfig/conf.d/${toString config.priority}-hm-${config.label}.conf" {
         inherit (config) enable text;
         source = lib.mkIf (config.source != null) config.source;
       }

modules/misc/gtk.nix

@@ -59,7 +59,7 @@ in
     theme = mkOption {
       type = types.nullOr themeType;
       default = null;
-      description = "Default theme for all GTK versions.";
+      description = "Default theme for GTK 2/3.";
     };
 
     iconTheme = mkOption {

modules/misc/gtk/gtk4.nix

@@ -45,9 +45,17 @@ in
           packageExample = "pkgs.gnome.gnome-themes-extra";
         }
       );
-      default = cfg.theme;
-      defaultText = literalExpression "config.gtk.theme";
-      description = "Theme for GTK 4 applications.";
+      default = if lib.versionOlder config.home.stateVersion "26.05" then cfg.theme else null;
+      defaultText = literalExpression ''if lib.versionOlder config.home.stateVersion "26.05" then cfg.theme else null'';
+      description = ''
+        Theme for GTK 4 applications.
+
+        Warning: This is not officially supported and applied using a workaround.
+        It may cause issues with some apps.
+
+        For context, see [Please don’t theme our apps](https://stopthemingmy.app/)
+        and [Restyling apps at scale](https://blogs.gnome.org/tbernard/2018/10/15/restyling-apps-at-scale/).
+      '';
     };
 
     iconTheme = mkOption {

modules/misc/news.nix

@@ -72,7 +72,7 @@ let
     fileList ++ subdirFiles;
 
   newsFiles = collectNixFiles ./news;
-  newsEntries = builtins.map (
+  newsEntries = map (
     newsFile:
     let
       imported = import newsFile;

modules/misc/news/2025/10/2025-10-15_10-44-58.nix

@@ -0,0 +1,9 @@
+{
+  time = "2025-10-14T23:44:58+00:00";
+  condition = true;
+  message = ''
+    A new module is available: `services.colima`
+
+    Colima is a tool for orchestrating container runtimes under a linux VM.
+  '';
+}

modules/misc/news/2025/11/2025-11-04_16-44-03.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  time = "2025-11-04T15:44:03+00:00";
+  condition = true;
+  message = ''
+    The 'services.podman' module now supports Darwin (macOS) with declarative
+    machine management.
+
+    On Darwin, podman requires running containers inside a virtual machine.
+    The new configuration options allow you to declaratively manage podman
+    machines with automatic creation, configuration, and startup.
+
+    By default, a machine named 'podman-machine-default' will be created
+    automatically. You can customize machines or disable the default with:
+
+      services.podman.useDefaultMachine = false;
+      services.podman.machines = {
+        "my-machine" = {
+          cpus = 4;
+          memory = 8192;
+          diskSize = 100;
+          autoStart = true;
+        };
+      };
+
+    The module includes a launchd-based watchdog service that automatically
+    starts configured machines on login and keeps them running.
+  '';
+}

modules/misc/news/2025/11/2025-11-26_06-33-49.nix

@@ -0,0 +1,9 @@
+{
+  time = "2025-11-26T05:33:49+00:00";
+  condition = true;
+  message = ''
+    A new module is available: 'programs.cargo'.
+
+    cargo is the build system and package manager of Rust.
+  '';
+}

modules/misc/news/2025/11/2025-11-26_11-55-28.nix

@@ -0,0 +1,11 @@
+{
+  time = "2025-11-26T10:55:28+00:00";
+  condition = true;
+  message = ''
+    The option 'gtk.theme' does not apply to GTK 4 automatically anymore for new
+    installations (with `home.stateVersion` >= "26.05"). Using a custom theme is
+    not officially supported by GTK 4, and implemented by home-manager using a
+    workaround that may cause issues in some cases. If you still want to use a GTK
+    4 theme, you need to explicitly set 'gtk.gtk4.theme'.
+  '';
+}

modules/misc/news/2025/11/2025-11-27_08-22-14.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  time = "2025-11-27T07:22:14+00:00";
+  condition = pkgs.stdenv.hostPlatform.isDarwin;
+  message = ''
+    A new module is available: 'programs.infat'.
+    Infat is a command line tool to set default openers
+    for file formats and url schemes on macOS.
+  '';
+}

modules/misc/news/2025/11/2025-11-30_00-04-38.nix

@@ -0,0 +1,7 @@
+{
+  time = "2025-11-29T23:04:38+00:00";
+  condition = true;
+  message = ''
+    A new module is available: 'programs.parallel'.
+  '';
+}

modules/misc/news/2025/12/2025-12-01_09-35-38.nix

@@ -0,0 +1,16 @@
+{ config, ... }:
+
+{
+  time = "2025-12-01T12:35:38+00:00";
+  condition = config.services.ludusavi.enable;
+  message = ''
+    BREAKING CHANGE:
+
+    The `ludusavi` module has changed its default backup and restore path.
+    The new module implements a mechanism to automatically migrate the backups
+    to the new path, but if it doesn't work and you can't find your backups in
+    `ludusavi`, they should be in the old path: ~/\$XDG_STATE_HOME/backups/ludusavi/
+    (that means a directory literally called $XDG_STATE_HOME in your home, rather than
+    the env var expanded). For more info, see pull #8234.
+  '';
+}

modules/misc/news/2025/12/2025-12-03_10-14-53.nix

@@ -0,0 +1,12 @@
+{
+  time = "2025-12-03T13:14:53+00:00";
+  condition = true;
+  message = ''
+    A new module is available: `programs.calibre`
+
+    Calibre is a powerful and easy to use e-book manager. Users say it’s outstanding
+    and a must-have. It’ll allow you to do nearly everything and it takes things a
+    step beyond normal e-book software. It’s also completely free and open source
+    and great for both casual users and computer experts.
+  '';
+}

modules/misc/news/2025/12/2025-12-04_16-34-38.nix

@@ -0,0 +1,12 @@
+{
+  time = "2025-12-04T19:34:38+00:00";
+  condition = true;
+  message = ''
+    A new module is available: `programs.screen`
+
+    GNU Screen is a terminal multiplexer, a software application that can
+    be used to multiplex several virtual consoles, allowing a user to access
+    multiple separate login sessions inside a single terminal window, or detach
+    and reattach sessions from a terminal.
+  '';
+}

modules/misc/news/2025/12/2025-12-04_22-50-03.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  time = "2025-12-05T01:50:03+00:00";
+  condition = pkgs.stdenv.hostPlatform.isLinux;
+  message = ''
+    A new module is available: `programs.hyprlauncher`
+
+    Hyprlauncher is a multipurpose and versatile launcher/picker
+    for hyprland. It’s fast, simple, and provides various modules.
+  '';
+}

modules/misc/news/2025/12/2025-12-06_11-03-01.nix

@@ -0,0 +1,10 @@
+{
+  time = "2025-12-06T10:03:01+00:00";
+  condition = true;
+  message = ''
+    A new module is available: `programs.npm`
+
+    It allows you manage your npm user configuration (`.npmrc`)
+    and install a specific version of the package.
+  '';
+}

modules/misc/news/2025/12/2025-12-06_11-05-43.nix

@@ -0,0 +1,10 @@
+{
+  time = "2025-12-06T10:05:43+00:00";
+  condition = true;
+  message = ''
+    A new module is available: `programs.ty`
+
+    It allows to manage the configuration and package
+    of the Python language server `ty` by Astral.
+  '';
+}

modules/misc/news/2025/12/2025-12-11_13-04-30.nix

@@ -0,0 +1,32 @@
+{ config, ... }:
+
+{
+  time = "2025-12-11T19:04:30+00:00";
+  condition =
+    let
+      helixEnabled = config.programs.helix.enable && config.programs.helix.defaultEditor;
+      kakouneEnabled = config.programs.kakoune.enable && config.programs.kakoune.defaultEditor;
+      neovimEnabled = config.programs.neovim.enable && config.programs.neovim.defaultEditor;
+      vimEnabled = config.programs.vim.enable && config.programs.vim.defaultEditor;
+      emacsEnabled = config.services.emacs.enable && config.services.emacs.defaultEditor;
+    in
+    helixEnabled || kakouneEnabled || neovimEnabled || vimEnabled || emacsEnabled;
+  message = ''
+    The 'defaultEditor' option now sets both {env}`EDITOR` and {env}`VISUAL`
+    environment variables.
+
+    Previously, only {env}`EDITOR` was set. The {env}`VISUAL` variable is now
+    also configured to point to the same editor, which is the expected behavior
+    for modern terminal editors.
+
+    This change affects the following modules:
+    - programs.helix
+    - programs.kakoune
+    - programs.neovim
+    - programs.vim
+    - services.emacs
+
+    No action is required. This change should improve compatibility with tools
+    that check {env}`VISUAL` before {env}`EDITOR`.
+  '';
+}

modules/misc/news/2025/12/2025-12-12_19-20-28.nix

@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  time = "2025-12-12T19:20:28+00:00";
+  condition = config.xsession.windowManager.herbstluftwm.enable;
+  message = ''
+    It is now possible to disable the `herbstclient` alias in the autostart
+    script by setting `xsession.windowManagers.herbsluftwm.enableAlias = false`.
+    This makes it possible to use the `herbstclient` command in bash functions,
+    though may cause flickering while the autostart script runs.
+  '';
+}

modules/misc/news/2025/12/2025-12-27_13-32-14.nix

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

modules/misc/news/2026/01/2026-01-02_00-03-48.nix

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

modules/misc/news/2026/01/2026-01-05_13-57-57.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  time = "2026-01-05T11:57:57+00:00";
+  condition = pkgs.stdenv.hostPlatform.isLinux;
+  message = ''
+    A new module is available: 'programs.workstyle'.
+
+    Workstyle dynamically renames Sway/i3/Hyprland workspaces to indicate
+    which programs are running in each one. For example, with a font icon.
+  '';
+}

modules/misc/qt.nix

@@ -8,6 +8,10 @@
 let
   cfg = config.qt;
 
+  qtctFormat = pkgs.formats.ini {
+    listToValue = values: lib.concatStringsSep ", " values;
+  };
+
   # Map platform names to their packages.
   platformPackages = with pkgs; {
     gnome = [
@@ -286,7 +290,34 @@ in
           '';
         };
       };
-    };
+    }
+    // (lib.genAttrs' [ "qt5ct" "qt6ct" ] (
+      name:
+      lib.nameValuePair "${name}Settings" (
+        lib.mkOption {
+          type = lib.types.nullOr qtctFormat.type;
+          default = null;
+          example = lib.literalExpression ''
+            {
+              Appearance = {
+                style = "kvantum";
+                icon_theme = "Papirus-Dark";
+                standar_dialogs = "xdgdesktopportal";
+              };
+              Fonts = {
+                fixed = "\"DejaVuSansM Nerd Font Mono,12\"";
+                general = "\"DejaVu Sans,12\"";
+              };
+            }
+          '';
+          description = ''
+            Qtct configuration. Writes settings to `${name}/${name}.conf`
+            file. Lists will be translated to comma-separated strings.
+            Fonts must be quoted (see example).
+          '';
+        }
+      )
+    ));
   };
 
   config =
@@ -397,5 +428,18 @@ in
       ]
       ++ lib.optionals (platformTheme.name != null) [ "QT_QPA_PLATFORMTHEME" ]
       ++ lib.optionals (cfg.style.name != null) [ "QT_STYLE_OVERRIDE" ];
+
+      xdg.configFile =
+        lib.pipe
+          [ "qt5ct" "qt6ct" ]
+          [
+            (lib.filter (qtct: cfg."${qtct}Settings" != null))
+            (lib.flip lib.genAttrs' (
+              qtct:
+              lib.nameValuePair "${qtct}/${qtct}.conf" {
+                source = qtctFormat.generate "${qtct}-config" cfg."${qtct}Settings";
+              }
+            ))
+          ];
     };
 }

modules/misc/version.nix

@@ -26,6 +26,7 @@ in
         "24.11"
         "25.05"
         "25.11"
+        "26.05"
       ];
       description = ''
         It is occasionally necessary for Home Manager to change

modules/misc/xdg-terminal-exec.nix

@@ -47,9 +47,9 @@ in
       desktop: terminals:
       # Map desktop name such as GNOME to `.config/gnome-xdg-terminals.list`,
       # default to `.config/xdg-terminals.list`.
-      lib.nameValuePair (
-        "${if desktop == "default" then "" else "${lib.toLower desktop}-"}xdg-terminals.list"
-      ) { text = lib.concatLines terminals; }
+      lib.nameValuePair "${
+        if desktop == "default" then "" else "${lib.toLower desktop}-"
+      }xdg-terminals.list" { text = lib.concatLines terminals; }
     ) cfg.settings;
   };
 }

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/po/fo.po

@@ -8,30 +8,32 @@ 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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2026-01-07 17:01+0000\n"
+"Last-Translator: Brian E <brianellingsgaard9@gmail.com>\n"
+"Language-Team: Faroese <https://hosted.weblate.org/projects/home-manager/"
+"modules/fo/>\n"
 "Language: fo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.15.1\n"
 
 #: modules/files.nix:206
 msgid "Creating home file links in %s"
-msgstr ""
+msgstr "Stávni heimafílaleinkir innaní %s"
 
 #: modules/files.nix:219
 msgid "Cleaning up orphan links from %s"
-msgstr ""
+msgstr "Ruddi foreldraleys leinkir frá %s"
 
 #: modules/home-environment.nix:647
 msgid "Creating new profile generation"
-msgstr ""
+msgstr "Stovni nýggjan profil ættarlið"
 
 #: modules/home-environment.nix:650
 msgid "No change so reusing latest profile generation"
-msgstr ""
+msgstr "Eingin broyting. Seinastið umhvarv ættarlið er enn í brúk"
 
 #: modules/home-environment.nix:699
 msgid ""

modules/po/zh_Hant.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2025-07-22 10:59+0200\n"
-"PO-Revision-Date: 2025-03-07 18:58+0000\n"
-"Last-Translator: 807 <s10855168@gmail.com>\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/modules/zh_Hant/>\n"
 "Language: zh_Hant\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.15-dev\n"
 
 #: modules/files.nix:206
 msgid "Creating home file links in %s"
@@ -25,15 +25,15 @@ msgstr "正在 %s 中建立家目錄檔案連結"
 
 #: modules/files.nix:219
 msgid "Cleaning up orphan links from %s"
-msgstr "正在從 %s 清理孤立連結"
+msgstr "正在清理 %s 中的孤立連結"
 
 #: modules/home-environment.nix:647
 msgid "Creating new profile generation"
-msgstr "正在建立新一代的配置文件中"
+msgstr "正在建立新的世代設定檔"
 
 #: modules/home-environment.nix:650
 msgid "No change so reusing latest profile generation"
-msgstr "為發生改變，請重新使用新一代的配置文件"
+msgstr "沒有變更，將重複使用最新的設定檔世代"
 
 #: modules/home-environment.nix:699
 msgid ""
@@ -50,18 +50,18 @@ msgid ""
 "\n"
 "Then try activating your Home Manager configuration again."
 msgstr ""
-"糟糕，Nix 未能安裝您的新 Home Manager 配置文件！\n"
+"糟糕，Nix 無法安裝您的新 Home Manager 設定檔！\n"
 "\n"
-"也許這裏和使用 \"%s\" 安裝的包有衝突？\n"
-"嘗試運行\n"
+"可能與使用 \"%s\" 安裝的套件衝突？\n"
+"請嘗試執行\n"
 "\n"
 "    %s\n"
 "\n"
-"如果有衝突的包，你可以用\n"
+"如果有衝突的套件，您可以使用以下指令移除\n"
 "\n"
 "    %s\n"
 "\n"
-"來移除。然後嘗試再次啟用您的 Home Manager 配置。"
+"然後再次嘗試啟用您的 Home Manager 設定。"
 
 #: modules/home-environment.nix:735
 msgid "Activating %s"
@@ -69,27 +69,27 @@ msgstr "正在啟用 %s"
 
 #: modules/home-environment.nix:807
 msgid "%s: unknown option '%s'"
-msgstr ""
+msgstr "%s：未知選項 '%s'"
 
 #: modules/lib-bash/activation-init.sh:22
 msgid "Migrating profile from %s to %s"
-msgstr "正在從 %S 配置文件轉移到 %s 中"
+msgstr "正在將設定檔從 %s 遷移至 %s"
 
 #: modules/lib-bash/activation-init.sh:54
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s"
+msgstr "找不到合適的設定檔目錄，已嘗試 %s 和 %s"
 
 #: modules/lib-bash/activation-init.sh:106
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
-msgstr "錯誤：USER 被設定為 「%s」但我們希望是 「%s」"
+msgstr "錯誤：USER 被設定為「%s」，但我們的預期為「%s」"
 
 #: modules/lib-bash/activation-init.sh:115
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
-msgstr "錯誤：HOME 被設定為 「%s」但我們預期得到 「%s」"
+msgstr "錯誤：HOME 被設定為「%s」，但我們的預期為「%s」"
 
 #: modules/lib-bash/activation-init.sh:132
 msgid "Starting Home Manager activation"
-msgstr "正在啟動 Home Manager 初始化程式"
+msgstr "正在進行 Home Manager 啟用程序"
 
 #: modules/lib-bash/activation-init.sh:136
 msgid "Sanity checking Nix"
@@ -97,19 +97,19 @@ msgstr "正在進行 Nix 完整性檢查"
 
 #: modules/lib-bash/activation-init.sh:149
 msgid "This is a dry run"
-msgstr "這是試運行"
+msgstr "這是模擬執行"
 
 #: modules/lib-bash/activation-init.sh:153
 msgid "This is a live run"
-msgstr "這是在實際運行"
+msgstr "這是實際執行"
 
 #: modules/lib-bash/activation-init.sh:159
 msgid "Using Nix version: %s"
-msgstr "正在使用的 Nix 版本: %s"
+msgstr "使用中的 Nix 版本：%s"
 
 #: modules/lib-bash/activation-init.sh:162
 msgid "Activation variables:"
-msgstr "啟用的變數:"
+msgstr "啟用變數："
 
 #~ msgid "Creating profile generation %s"
 #~ msgstr "正在建立配置檔案世代 %s"

modules/programs/aerc/default.nix

@@ -104,7 +104,7 @@ in
     };
 
     stylesets = mkOption {
-      type = with types; attrsOf (sectionsOrLines);
+      type = with types; attrsOf sectionsOrLines;
       default = { };
       example = literalExpression ''
         { default = { ui = { "tab.selected.reverse" = "toggle"; }; }; };

modules/programs/aerospace.nix

@@ -10,6 +10,12 @@ let
 
   tomlFormat = pkgs.formats.toml { };
 
+  configPath =
+    if config.xdg.enable then
+      "${lib.removePrefix config.home.homeDirectory config.xdg.configHome}/aerospace/aerospace.toml"
+    else
+      ".aerospace.toml";
+
   # filterAttrsRecursive supporting lists, as well.
   filterListAndAttrsRecursive =
     pred: set:
@@ -39,6 +45,19 @@ in
 {
   meta.maintainers = with lib.maintainers; [ damidoug ];
 
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "programs" "aerospace" "userSettings" ]
+      [ "programs" "aerospace" "settings" ]
+    )
+
+    (lib.mkRemovedOptionModule [
+      "programs"
+      "aerospace"
+      "extraConfig"
+    ] "This option has been removed. Please use 'programs.aerospace.settings' instead.")
+  ];
+
   options.programs.aerospace = {
     enable = lib.mkEnableOption "AeroSpace window manager";
 
@@ -81,24 +100,7 @@ in
       };
     };
 
-    extraConfig = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Extra configuration to append to the aerospace.toml file.
-        This allows you to add raw TOML content, including multiline strings.
-      '';
-      example = lib.literalExpression ''
-        alt-enter = ''''exec-and-forget osascript -e '
-          tell application "Terminal"
-              do script
-              activate
-          end tell'
-        ''''
-      '';
-    };
-
-    userSettings = mkOption {
+    settings = mkOption {
       inherit (tomlFormat) type;
       default = { };
       example = lib.literalExpression ''
@@ -115,6 +117,27 @@ in
             alt-k = "focus up";
             alt-l = "focus right";
           };
+          on-window-detected = [
+            {
+              "if".app-id = "com.apple.finder";
+              run = "move-node-to-workspace 9";
+            }
+
+            {
+              "if" = {
+                app-id = "com.apple.systempreferences";
+                app-name-regex-substring = "settings";
+                window-title-regex-substring = "substring";
+                workspace = "workspace-name";
+                during-aerospace-startup = true;
+              };
+              check-further-callbacks = true;
+              run = [
+                "layout floating"
+                "move-node-to-workspace S"
+              ];
+            }
+          ];
         }
       '';
       description = ''
@@ -128,32 +151,68 @@ in
   config = lib.mkIf cfg.enable {
     assertions = [
       (lib.hm.assertions.assertPlatform "programs.aerospace" pkgs lib.platforms.darwin)
+
+      # 1. Fail if user sets start-at-login = true BUT launchd is disabled.
+      {
+        assertion =
+          !((lib.hasAttr "start-at-login" cfg.settings) && (cfg.settings."start-at-login" == true))
+          || (cfg.launchd.enable == true);
+        message = ''
+          You have set `programs.aerospace.settings."start-at-login" = true;`
+          but `programs.aerospace.launchd.enable` is false.
+
+          This tells AeroSpace to manage its own startup, which can conflict
+          with Home Manager.
+
+          To manage startup with Home Manager, please set
+          `programs.aerospace.launchd.enable = true;`
+          (You can leave `start-at-login = true` in your settings, it will be
+          correctly overridden).
+        '';
+      }
+
+      # 2. Fail if user sets after-login-command (in any case).
+      {
+        assertion =
+          !(
+            (lib.hasAttr "after-login-command" cfg.settings)
+            && (lib.isList cfg.settings."after-login-command")
+            && (cfg.settings."after-login-command" != [ ])
+          );
+        message = ''
+          You have set `programs.aerospace.settings."after-login-command"`.
+
+          This setting is not supported when using this Home Manager module,
+          as it either conflicts with the launchd service (if enabled)
+          or bypasses it (if disabled).
+
+          The correct way to run commands after AeroSpace starts is to use:
+          1. `programs.aerospace.launchd.enable = true;`
+          2. `programs.aerospace.settings."after-startup-command" = [ ... ];`
+        '';
+      }
     ];
 
     home = {
       packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-      file.".config/aerospace/aerospace.toml".source =
-        let
-          generatedConfig = tomlFormat.generate "aerospace" (
-            filterNulls (
-              cfg.userSettings
-              // lib.optionalAttrs cfg.launchd.enable {
-                # Override these to avoid launchd conflicts
-                start-at-login = false;
-                after-login-command = [ ];
-              }
-            )
-          );
-          extraConfig = pkgs.writeText "aerospace-extra-config" cfg.extraConfig;
-        in
-        pkgs.runCommandLocal "aerospace.toml"
-          {
-            inherit generatedConfig extraConfig;
-          }
-          ''
-            cat "$generatedConfig" "$extraConfig" > "$out"
-          '';
+      file.${configPath} = lib.mkIf (cfg.settings != { }) {
+        source = tomlFormat.generate "aerospace" (
+          filterNulls (
+            cfg.settings
+            // {
+              # Override these to avoid launchd conflicts
+              start-at-login = false;
+              after-login-command = [ ];
+            }
+          )
+        );
+
+        onChange = lib.mkIf cfg.launchd.enable ''
+          echo "AeroSpace config changed, reloading..."
+          ${lib.getExe cfg.package} reload-config
+        '';
+      };
     };
 
     launchd.agents.aerospace = {

modules/programs/anki/default.nix

@@ -82,7 +82,7 @@ in
     };
 
     uiScale = lib.mkOption {
-      type = with lib.types; nullOr (numbers.between 0.0 1.0);
+      type = with lib.types; nullOr (numbers.between 1.0 2.0);
       default = null;
       example = 1.0;
       description = "User interface scale.";

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/anyrun.nix

@@ -6,9 +6,7 @@
 }:
 let
   inherit (builtins)
-    map
     toJSON
-    toString
     substring
     stringLength
     ;
@@ -185,7 +183,7 @@ in
 
     extraCss = mkOption {
       type = nullOr lines;
-      default = "";
+      default = null;
       description = ''
         Extra CSS lines to add to {file}`~/.config/anyrun/style.css`.
       '';

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,98 +220,82 @@ in
           };
         }
 
-        (mkIf daemonCfg.enable (
-          lib.mkMerge [
+        (mkIf daemonCfg.enable {
+          assertions = [
             {
-              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.";
-                }
-              ];
-
-              programs.atuin.settings = {
-                daemon = {
-                  enabled = true;
-                };
-              };
+              assertion = lib.versionAtLeast cfg.package.version "18.2.0";
+              message = ''
+                The Atuin daemon requires at least version 18.2.0 or later.
+              '';
             }
-            (mkIf isLinux {
-              programs.atuin.settings = {
-                daemon = {
-                  systemd_socket = true;
-                };
-              };
+            {
+              assertion = config.systemd.user.enable || config.launchd.enable;
+              message = "The Atuin daemon can only be configured on systems with systemd or launchd.";
+            }
+          ];
 
-              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;
-                };
-              };
+          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.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";
-                };
-              };
+          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;
+            };
+          };
 
-              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";
-                };
+          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"
+              ];
+              EnvironmentVariables = lib.optionalAttrs (daemonCfg.logLevel != null) {
+                ATUIN_LOG = daemonCfg.logLevel;
+              };
+              KeepAlive = {
+                Crashed = true;
+                SuccessfulExit = false;
+              };
+              ProcessType = "Background";
+            };
+          };
+        })
       ]
     );
 }

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/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.toGNUCommandLineShell { } cfg.settings;
+      BEMENU_OPTS = lib.cli.toCommandLineShellGNU { } cfg.settings;
     };
   };
 }

modules/programs/calibre.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  inherit (lib)
+    types
+    mkIf
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    ;
+
+  cfg = config.programs.calibre;
+in
+{
+  meta.maintainers = with lib.hm.maintainers; [ aguirre-matteo ];
+  options.programs.calibre = {
+    enable = mkEnableOption "calibre";
+    package = mkPackageOption pkgs "calibre" { nullable = true; };
+    plugins = mkOption {
+      type = with types; listOf path;
+      default = [ ];
+      description = "List of plugins to install for calibre";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = mkIf (cfg.package != null) [ cfg.package ];
+    xdg.configFile = mkIf (cfg.plugins != [ ]) (
+      let
+        symlinkedPlugins = pkgs.symlinkJoin {
+          name = "calibre-plugins";
+          paths = cfg.plugins;
+        };
+      in
+      lib.mapAttrs' (
+        k: _: lib.nameValuePair "calibre/plugins/${k}" { source = (symlinkedPlugins + "/${k}"); }
+      ) (builtins.readDir symlinkedPlugins)
+    );
+  };
+}

modules/programs/cargo.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkEnableOption;
+
+  tomlFormat = pkgs.formats.toml { };
+
+  cfg = config.programs.cargo;
+in
+{
+  meta.maintainers = [ lib.maintainers.friedrichaltheide ];
+
+  options = {
+    programs = {
+      cargo = {
+        enable = mkEnableOption "management of cargo config";
+
+        settings = lib.mkOption {
+          inherit (tomlFormat) type;
+          default = { };
+          description = ''
+            Available configuration options for the .cargo/config see:
+            https://doc.rust-lang.org/cargo/reference/config.html
+          '';
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home = {
+      file = {
+        ".cargo/config.toml" = {
+          source = tomlFormat.generate "config.toml" cfg.settings;
+        };
+      };
+    };
+  };
+}

modules/programs/chromium.nix

@@ -40,7 +40,7 @@ let
 
       finalPackage = mkOption {
         inherit visible;
-        type = types.package;
+        type = types.nullOr types.package;
         readOnly = true;
         description = ''
           Resulting customized ${name} package
@@ -220,15 +220,22 @@ let
       };
 
     in
+
     lib.mkIf cfg.enable {
-      programs.${browser}.finalPackage = lib.mkIf (cfg.package != null) (
+      assertions = [
+        {
+          assertion = !(cfg.package == null && cfg.commandLineArgs != [ ]);
+          message = "Cannot set `commandLineArgs` when `package` is null for ${browser}.";
+        }
+      ];
+
+      programs.${browser}.finalPackage =
         if cfg.commandLineArgs != [ ] then
           cfg.package.override {
             commandLineArgs = lib.concatStringsSep " " cfg.commandLineArgs;
           }
         else
-          cfg.package
-      );
+          cfg.package;
 
       home.packages = lib.mkIf (cfg.finalPackage != null) [
         cfg.finalPackage
@@ -274,7 +281,7 @@ in
   ) supportedBrowsers;
 
   config = lib.mkMerge (
-    builtins.map (browser: browserConfig browser config.programs.${browser}) (
+    map (browser: browserConfig browser config.programs.${browser}) (
       builtins.attrNames supportedBrowsers
     )
   );

modules/programs/claude-code.nix

@@ -197,6 +197,47 @@ 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;
@@ -325,6 +366,10 @@ 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`";
@@ -348,7 +393,7 @@ in
         makeWrapperArgs = lib.flatten (
           lib.filter (x: x != [ ]) [
             (lib.optional (cfg.mcpServers != { }) [
-              "--add-flags"
+              "--append-flags"
               "--mcp-config ${jsonFormat.generate "claude-code-mcp-config.json" { inherit (cfg) mcpServers; }}"
             ])
           ]
@@ -386,6 +431,11 @@ 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;
@@ -406,6 +456,12 @@ 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" (

modules/programs/diff-highlight.nix

@@ -68,8 +68,15 @@ in
     in
     lib.mkMerge [
       (mkIf cfg.enable {
-        # Auto-enable git integration if programs.git.diff-highlight.enable was set to true
-        programs.diff-highlight.enableGitIntegration = lib.mkIf oldOptionEnabled (lib.mkOverride 1490 true);
+        assertions = [
+          {
+            assertion = !cfg.enableGitIntegration || config.programs.git.package != null;
+            message = ''
+              programs.diff-highlight.enableGitIntegration requires programs.git.package to be set.
+              Please set programs.git.package to a valid git package.
+            '';
+          }
+        ];
 
         warnings =
           lib.optional
@@ -77,9 +84,12 @@ in
               cfg.enableGitIntegration && options.programs.diff-highlight.enableGitIntegration.highestPrio == 1490
             )
             "`programs.diff-highlight.enableGitIntegration` automatic enablement is deprecated. Please explicitly set `programs.diff-highlight.enableGitIntegration = true`.";
+
+        # Auto-enable git integration if programs.git.diff-highlight.enable was set to true
+        programs.diff-highlight.enableGitIntegration = lib.mkIf oldOptionEnabled (lib.mkOverride 1490 true);
       })
 
-      (mkIf (cfg.enable && cfg.enableGitIntegration) {
+      (mkIf (cfg.enable && cfg.enableGitIntegration && config.programs.git.package != null) {
         programs.git = {
           enable = lib.mkDefault true;
           iniContent =

modules/programs/difftastic.nix

@@ -129,7 +129,7 @@ in
           enable = lib.mkDefault true;
           iniContent =
             let
-              difftCommand = "${lib.getExe cfg.package} ${lib.cli.toGNUCommandLineShell { } cfg.options}";
+              difftCommand = "${lib.getExe cfg.package} ${lib.cli.toCommandLineShellGNU { } cfg.options}";
             in
             mkMerge [
               {

modules/programs/direnv.nix

@@ -75,25 +75,7 @@ in
 
     enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { 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;
-      };
+    enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { inherit config; };
 
     enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };
 

modules/programs/distrobox.nix

@@ -16,8 +16,7 @@ let
 
   generateConfig = lib.generators.toKeyValue {
     mkKeyValue =
-      name: value:
-      if lib.isString value then ''${name}="${value}"'' else "${name}=${builtins.toString value}";
+      name: value: if lib.isString value then ''${name}="${value}"'' else "${name}=${toString value}";
   };
 
   iniFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; };

modules/programs/docker-cli.nix

@@ -103,7 +103,7 @@ in
         {
           name = path;
           value = {
-            source = jsonFormat.generate "config.json" (ctx);
+            source = jsonFormat.generate "config.json" ctx;
           };
         }
       ) cfg.contexts;

modules/programs/firefox/profiles/search.nix

@@ -471,7 +471,7 @@ in
 
     order = mkOption {
       type = with types; uniq (listOf str);
-      apply = builtins.map migrateEngineNameToIdV7;
+      apply = map migrateEngineNameToIdV7;
       default = [ ];
       example = [
         "ddg"

modules/programs/fish.nix

@@ -301,20 +301,13 @@ let
       let
         name = if isAttrs def && def.name != null then def.name else attrName;
         mods =
-          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)
-                  ];
-            }
+          lib.cli.toCommandLineShell
+            (optionName: {
+              option = "--${optionName}";
+              sep = if optionName == "set-cursor" then "=" else null;
+              explicitBool = false;
+              formatArg = lib.generators.mkValueStringDefault { };
+            })
             {
               inherit (def)
                 position
@@ -395,12 +388,14 @@ let
       passAsFile = [ "text" ];
     } "env HOME=$(mktemp -d) fish_indent < $textPath > $out";
 
-  translatedSessionVariables = pkgs.runCommandLocal "hm-session-vars.fish" { } ''
+  sessionVarsFile = "etc/profile.d/hm-session-vars.fish";
+  sessionVarsPkg = pkgs.runCommandLocal "hm-session-vars.fish" { } ''
+    mkdir -p "$(dirname $out/${sessionVarsFile})"
     (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
+    echo "setup_hm_session_vars") > $out/${sessionVarsFile}
   '';
 
 in
@@ -598,11 +593,25 @@ 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 ]; }
+      {
+        home.packages = [
+          cfg.package
+          cfg.sessionVariablesPackage
+        ];
+        programs.fish.sessionVariablesPackage = sessionVarsPkg;
+      }
 
       (mkIf cfg.generateCompletions (
         let
@@ -618,7 +627,7 @@ in
                   package
                 ]
                 ++ lib.filter (p: p != null) (
-                  builtins.map (outName: package.${outName} or null) config.home.extraOutputsToInstall
+                  map (outName: package.${outName} or null) config.home.extraOutputsToInstall
                 );
                 nativeBuildInputs = [ pkgs.python3 ];
                 buildInputs = [ cfg.package ];
@@ -645,7 +654,7 @@ in
           # Support completion for `man` by building a cache for `apropos`.
           programs.man.generateCaches = lib.mkDefault true;
 
-          xdg.dataFile."fish/home-manager_generated_completions".source =
+          xdg.dataFile."fish/home-manager/generated_completions".source =
             let
               # Paths later in the list will overwrite those already linked
               destructiveSymlinkJoin =
@@ -696,7 +705,7 @@ in
               set -l post_joined (string replace $prev_joined "" $joined)
               set -l prev (string split " " (string trim $prev_joined))
               set -l post (string split " " (string trim $post_joined))
-              set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
+              set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager/generated_completions" $post
             end
           '';
         }
@@ -715,7 +724,7 @@ in
           set -q __fish_home_manager_config_sourced; and exit
           set -g __fish_home_manager_config_sourced 1
 
-          source ${translatedSessionVariables}
+          source ${cfg.sessionVariablesPackage}/${sessionVarsFile}
 
           ${cfg.shellInit}
 

modules/programs/gemini-cli.nix

@@ -11,7 +11,7 @@ let
   tomlFormat = pkgs.formats.toml { };
 in
 {
-  meta.maintainers = [ lib.hm.maintainers.rrvsh ];
+  meta.maintainers = [ lib.maintainers.rrvsh ];
 
   options.programs.gemini-cli = {
     enable = lib.mkEnableOption "gemini-cli";
@@ -21,14 +21,19 @@ in
     settings = lib.mkOption {
       inherit (jsonFormat) type;
       default = { };
-      example = lib.literalExpression ''
-        {
-          "theme": "Default",
-          "vimMode": true,
-          "preferredEditor": "nvim",
-          "autoAccept": true
-        }
-      '';
+      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";
+      };
       description = "JSON config for gemini-cli";
     };
 
@@ -81,12 +86,12 @@ in
       };
 
     defaultModel = lib.mkOption {
-      type = lib.types.str;
-      default = "gemini-2.5-pro";
+      type = lib.types.nullOr lib.types.str;
+      default = null;
       example = "gemini-2.5-flash";
       description = ''
         The default model to use for the CLI.
-        Will be set as $GEMINI_MODEL.
+        Will be set as $GEMINI_MODEL when configured.
       '';
     };
 
@@ -138,7 +143,9 @@ in
           file.".gemini/settings.json" = lib.mkIf (cfg.settings != { }) {
             source = jsonFormat.generate "gemini-cli-settings.json" cfg.settings;
           };
-          sessionVariables.GEMINI_MODEL = cfg.defaultModel;
+          sessionVariables = lib.mkIf (cfg.defaultModel != null) {
+            GEMINI_MODEL = cfg.defaultModel;
+          };
         };
       }
       {

modules/programs/gh.nix

@@ -204,7 +204,7 @@ in
 
     xdg.dataFile."gh/extensions" = mkIf (cfg.extensions != [ ]) {
       source = pkgs.linkFarm "gh-extensions" (
-        builtins.map (p: {
+        map (p: {
           name = p.pname;
           path = "${p}/bin";
         }) cfg.extensions

modules/programs/ghostty.nix

@@ -224,8 +224,20 @@ 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";
+
+        systemd.user.services."app-com.mitchellh.ghostty" = {
+          Unit = {
+            X-Base = "${cfg.package}/share/systemd/user/app-com.mitchellh.ghostty.service";
+            X-SwitchMethod = "keep-old";
+            X-Reload-Triggers =
+              let
+                storePathOf = name: config.xdg.configFile.${name}.source;
+              in
+              lib.optionals (cfg.settings != { }) [ (storePathOf "ghostty/config") ]
+              ++ lib.mapAttrsToList (name: _: storePathOf "ghostty/themes/${name}") cfg.themes;
+          };
+        };
+
         dbus.packages = [ cfg.package ];
       })
 

modules/programs/git.nix

@@ -41,6 +41,7 @@ in
         enable = mkEnableOption "Git";
 
         package = lib.mkPackageOption pkgs "git" {
+          nullable = true;
           example = "pkgs.gitFull";
           extraDescription = ''
             Use {var}`pkgs.gitFull`
@@ -328,7 +329,7 @@ in
   config = mkIf cfg.enable (
     lib.mkMerge [
       {
-        home.packages = [ cfg.package ];
+        home.packages = lib.optionals (cfg.package != null) [ cfg.package ];
 
         assertions = [
           {
@@ -516,7 +517,7 @@ in
             Type = "oneshot";
             ExecStart =
               let
-                exe = lib.getExe cfg.package;
+                exe = if cfg.package != null then lib.getExe cfg.package else "git";
               in
               ''
                 "${exe}" for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
@@ -553,7 +554,7 @@ in
         launchd.agents =
           let
             baseArguments = [
-              "${lib.getExe cfg.package}"
+              "${if cfg.package != null then lib.getExe cfg.package else "git"}"
               "for-each-repo"
               "--keep-going"
               "--config=maintenance.repo"

modules/programs/gpg.nix

@@ -16,18 +16,13 @@ let
 
   cfg = config.programs.gpg;
 
-  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;
+  toKeyValue =
+    settings:
+    lib.generators.toKeyValue {
+      mkKeyValue =
+        key: value: if lib.isString value then "${key} ${value}" else lib.optionalString value key;
+      listsAsDuplicateKeys = true;
+    } 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/gurk-rs.nix

@@ -7,6 +7,8 @@
 let
   tomlFormat = pkgs.formats.toml { };
   cfg = config.programs.gurk-rs;
+  configDir =
+    if pkgs.stdenv.hostPlatform.isDarwin then "Library/Application Support" else config.xdg.configHome;
 in
 {
   meta.maintainers = [ lib.maintainers.da157 ];
@@ -46,9 +48,8 @@ in
   config = lib.mkIf cfg.enable {
     home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-    home.file."${
-      if pkgs.stdenv.hostPlatform.isDarwin then "Library/Application Support" else config.xdg.configHome
-    }/gurk/gurk.toml".source =
-      lib.mkIf (cfg.settings != { }) (tomlFormat.generate "gurk-config" cfg.settings);
+    home.file."${configDir}/gurk/gurk.toml" = lib.mkIf (cfg.settings != { }) {
+      source = tomlFormat.generate "gurk-config" cfg.settings;
+    };
   };
 }

modules/programs/havoc.nix

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

modules/programs/helix.nix

@@ -49,7 +49,8 @@ in
       default = false;
       description = ''
         Whether to configure {command}`hx` as the default
-        editor using the {env}`EDITOR` environment variable.
+        editor using the {env}`EDITOR` and {env}`VISUAL`
+        environment variables.
       '';
     };
 
@@ -225,7 +226,10 @@ in
       else
         [ cfg.package ];
 
-    home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "hx"; };
+    home.sessionVariables = mkIf cfg.defaultEditor {
+      EDITOR = "hx";
+      VISUAL = "hx";
+    };
 
     xdg.configFile =
       let

modules/programs/hyprpanel/default.nix

@@ -9,7 +9,7 @@ let
   jsonFormat = pkgs.formats.json { };
 in
 {
-  meta.maintainers = [ lib.maintainers.perchun ];
+  meta.maintainers = [ lib.maintainers.PerchunPak ];
 
   imports = [
     (lib.mkRemovedOptionModule [ "programs" "hyprpanel" "dontAssertNotificationDaemons " ] ''
@@ -70,7 +70,7 @@ in
           "mako"
         ];
       in
-      builtins.map (name: {
+      map (name: {
         assertion = !config.services.${name}.enable;
         message = ''
           Only one notification daemon can be enabled at once. You have enabled

modules/programs/infat.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.infat;
+  tomlFormat = pkgs.formats.toml { };
+
+  configDir =
+    if config.xdg.enable then
+      config.xdg.configHome
+    else
+      "${config.home.homeDirectory}/Library/Application Support";
+
+  configFile = "${configDir}/infat/config.toml";
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    mirkolenz
+  ];
+
+  options = {
+    programs.infat = {
+      enable = lib.mkEnableOption "infat";
+      package = lib.mkPackageOption pkgs "infat" { nullable = true; };
+      settings = lib.mkOption {
+        type = tomlFormat.type;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            extensions = {
+              md = "TextEdit";
+              html = "Safari";
+              pdf = "Preview";
+            };
+            schemes = {
+              mailto = "Mail";
+              web = "Safari";
+            };
+            types = {
+              plain-text = "VSCode";
+            };
+          }
+        '';
+        description = ''
+          Configuration written to
+          {file}`$XDG_CONFIG_HOME/infat/config.toml`.
+        '';
+      };
+      autoActivate = lib.mkEnableOption "auto-activate infat" // {
+        default = true;
+        example = false;
+        description = ''
+          Automatically activate infat on startup.
+          This is useful if you want to use infat as a
+          default application handler for certain file types.
+          If you don't want this, set this to false.
+          This option is only effective if `settings` is set.
+        '';
+      };
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "programs.infat" pkgs lib.platforms.darwin)
+    ];
+    home = {
+      packages = lib.mkIf (cfg.package != null) [ cfg.package ];
+      file.${configFile} = lib.mkIf (cfg.settings != { }) {
+        source = tomlFormat.generate "infat-settings.toml" cfg.settings;
+      };
+      activation = lib.mkIf (cfg.settings != { } && cfg.package != null && cfg.autoActivate) {
+        infat = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+          run ${lib.getExe cfg.package} --config "${configFile}" $VERBOSE_ARG
+        '';
+      };
+    };
+  };
+}

modules/programs/joplin-desktop.nix

@@ -139,7 +139,7 @@ in
         in
         lib.hm.dag.entryAfter [ "linkGeneration" ] ''
           # Ensure that settings.json exists.
-          mkdir -p ${builtins.dirOf configPath}
+          mkdir -p ${dirOf configPath}
           touch ${configPath}
           # Config has to be written to temporary variable because jq cannot edit files in place.
           config="$(jq -s '.[0] + .[1]' ${configPath} ${newConfig})"

modules/programs/kakoune.nix

@@ -705,7 +705,8 @@ in
         default = false;
         description = ''
           Whether to configure {command}`kak` as the default
-          editor using the {env}`EDITOR` environment variable.
+          editor using the {env}`EDITOR` and {env}`VISUAL`
+          environment variables.
         '';
       };
 
@@ -755,7 +756,10 @@ in
     programs.kakoune.finalPackage = lib.mkIf (cfg.package != null) kakouneWithPlugins;
 
     home.packages = lib.mkIf (cfg.finalPackage != null) [ cfg.finalPackage ];
-    home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "kak"; };
+    home.sessionVariables = mkIf cfg.defaultEditor {
+      EDITOR = "kak";
+      VISUAL = "kak";
+    };
     xdg.configFile = lib.mkMerge [
       { "kak/kakrc".source = configFile; }
       (mkIf (cfg.colorSchemePackage != null) {

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/khard.nix

@@ -14,7 +14,7 @@ let
   renderSettings =
     with lib.generators;
     toINI {
-      mkKeyValue = mkKeyValueDefault rec {
+      mkKeyValue = mkKeyValueDefault {
         mkValueString =
           v:
           if lib.isList v then
@@ -139,7 +139,7 @@ in
       let
         makePath =
           baseDir: subDir:
-          builtins.toString (
+          toString (
             /.
             + lib.concatStringsSep "/" [
               baseDir

modules/programs/kitty.nix

@@ -341,16 +341,13 @@ in
         # See https://sw.kovidgoyal.net/kitty/conf.html
         ${cfg.extraConfig}
       '';
-    }
-    // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-      onChange = ''
-        ${pkgs.procps}/bin/pkill -USR1 -u $USER kitty || true
-      '';
-    }
-    // lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-      onChange = ''
-        /usr/bin/pkill -USR1 -u $USER kitty || true
-      '';
+      onChange =
+        let
+          prefix = if pkgs.stdenv.hostPlatform.isDarwin then "/usr" else pkgs.procps;
+        in
+        ''
+          ${prefix}/bin/pkill -USR1 -u $USER kitty || true
+        '';
     };
 
     xdg.configFile."kitty/quick-access-terminal.conf" = mkIf (cfg.quickAccessTerminalConfig != { }) {

modules/programs/kubecolor.nix

@@ -9,7 +9,6 @@ let
 
   cfg = config.programs.kubecolor;
   yamlFormat = pkgs.formats.yaml { };
-  inherit (pkgs.stdenv.hostPlatform) isDarwin;
 
 in
 {
@@ -50,18 +49,20 @@ in
 
   config =
     let
-      preferXdgDirectories = config.home.preferXdgDirectories && (!isDarwin || config.xdg.enable);
+      preferXdgDirectories =
+        config.home.preferXdgDirectories && (!pkgs.stdenv.hostPlatform.isDarwin || config.xdg.enable);
+      configDir =
+        if preferXdgDirectories then
+          "${config.xdg.configHome}/kube"
+        else if pkgs.stdenv.hostPlatform.isDarwin then
+          "Library/Application Support/kube"
+        else
+          ".kube";
 
       # https://github.com/kubecolor/kubecolor/pull/145
-      configPathSuffix =
-        if
-          cfg.package.pname == "kubecolor"
-          && lib.strings.toInt (lib.versions.major cfg.package.version) == 0
-          && lib.strings.toInt (lib.versions.minor cfg.package.version) < 4
-        then
-          "kube/"
-        else
-          "kube/color.yaml";
+      configPathSuffix = lib.optionalString (
+        cfg.package.pname == "kubecolor" && lib.versionOlder (lib.getVersion cfg.package) "0.4"
+      ) "color.yaml";
 
     in
     mkIf cfg.enable {
@@ -73,31 +74,10 @@ in
 
       home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-      home.sessionVariables =
-        if preferXdgDirectories then
-          {
-            KUBECOLOR_CONFIG = "${config.xdg.configHome}/${configPathSuffix}";
-          }
-        else if isDarwin then
-          {
-            KUBECOLOR_CONFIG = "${config.home.homeDirectory}/Library/Application Support/${configPathSuffix}";
-          }
-        else
-          { };
+      home.sessionVariables.KUBECOLOR_CONFIG = "${configDir}/${configPathSuffix}";
 
-      xdg.configFile = mkIf preferXdgDirectories {
-        "kube/color.yaml" = mkIf (cfg.settings != { }) {
-          source = yamlFormat.generate "kubecolor-settings" cfg.settings;
-        };
-      };
-
-      home.file = mkIf (!preferXdgDirectories) {
-        "Library/Application Support/kube/color.yaml" = mkIf (isDarwin && cfg.settings != { }) {
-          source = yamlFormat.generate "kubecolor-settings" cfg.settings;
-        };
-        ".kube/color.yaml" = mkIf (!isDarwin && cfg.settings != { }) {
-          source = yamlFormat.generate "kubecolor-settings" cfg.settings;
-        };
+      home.file."${configDir}/color.yaml" = mkIf (cfg.settings != { }) {
+        source = yamlFormat.generate "kubecolor-settings" cfg.settings;
       };
 
       home.shellAliases = lib.mkIf (cfg.enableAlias && (cfg.package != null)) {

modules/programs/lapce.nix

@@ -201,7 +201,7 @@ let
     plugins:
     pkgs.linkFarm "lapce-plugins" (
       builtins.listToAttrs (
-        builtins.map (
+        map (
           {
             author,
             name,

modules/programs/lazydocker.nix

@@ -11,7 +11,11 @@ let
 
   yamlFormat = pkgs.formats.yaml { };
 
-  inherit (pkgs.stdenv.hostPlatform) isDarwin;
+  configDir =
+    if pkgs.stdenv.hostPlatform.isDarwin && !config.xdg.enable then
+      "Library/Application Support/jesseduffield"
+    else
+      config.xdg.configHome;
 
 in
 {
@@ -51,16 +55,8 @@ in
   config = lib.mkIf cfg.enable {
     home.packages = lib.mkIf (cfg.package != null) [ cfg.package ];
 
-    home.file."Library/Application Support/jesseduffield/lazydocker/config.yml" =
-      lib.mkIf (cfg.settings != { } && (isDarwin && !config.xdg.enable))
-        {
-          source = yamlFormat.generate "lazydocker-config" cfg.settings;
-        };
-
-    xdg.configFile."lazydocker/config.yml" =
-      lib.mkIf (cfg.settings != { } && !(isDarwin && !config.xdg.enable))
-        {
-          source = yamlFormat.generate "lazydocker-config" cfg.settings;
-        };
+    home.file."${configDir}/lazydocker/config.yml" = lib.mkIf (cfg.settings != { }) {
+      source = yamlFormat.generate "lazydocker-config" cfg.settings;
+    };
   };
 }