Merge branch 'master' into add-sesh-module

2024-11-23 03:29:45 +01:00 · 2024-11-01 20:34:47 +01:00 · 2024-11-01 20:34:47 +01:00 · 400b03b80c
commit 400b03b80c
parent cb2fd626fe 8ca921e5a8
233 changed files with 3891 additions and 816 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -19,3 +19,6 @@ indent_style = tab

 [*.md]
 trim_trailing_whitespace = false
+
+[*.plist]
+insert_final_newline = false
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -8,14 +8,6 @@ updates:
    commit-message:
      prefix: "ci:"

-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "release-23.11"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "ci:"
-
  - package-ecosystem: "github-actions"
    directory: "/"
    target-branch: "release-24.05"
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
+    - uses: cachix/install-nix-action@v30
      with:
        nix_path: nixpkgs=channel:nixos-unstable
    - uses: cachix/cachix-action@v15
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -12,7 +12,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
+    - uses: cachix/install-nix-action@v30
      with:
        nix_path: nixpkgs=channel:nixos-unstable
    - run: |
@ -25,3 +25,5 @@ jobs:
    - run: nix-shell --show-trace . -A install
    - run: yes | home-manager -I home-manager=. uninstall
    - run: nix-shell --show-trace --arg enableBig false --pure tests -A run.all
+      # Somebody please help us fix the macos tests.
+      if: matrix.os != 'macos-latest'
--- a/.github/workflows/update-flake.yml
+++ b/.github/workflows/update-flake.yml
@ -12,9 +12,9 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Install Nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v23
+        uses: DeterminateSystems/update-flake-lock@v24
        with:
          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
          pr-labels: dependencies
--- a/docs/default.nix
+++ b/docs/default.nix
@ -147,7 +147,7 @@ in {
      substitute \
        ${hmOptionsDocs.optionsJSON}/nix-support/hydra-build-products \
        $out/nix-support/hydra-build-products \
-        --replace \
+        --replace-fail \
          '${hmOptionsDocs.optionsJSON}/share/doc/nixos' \
          "$out/share/doc/home-manager"
    '';
--- a/docs/home-manager-manual.nix
+++ b/docs/home-manager-manual.nix
@ -59,5 +59,7 @@ in stdenv.mkDerivation {
    echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
  '';

+  passthru = { inherit home-manager-options; };
+
  meta = { maintainers = [ lib.maintainers.considerate ]; };
 }
--- a/docs/manual/usage.md
+++ b/docs/manual/usage.md
@ -59,5 +59,6 @@ usage/configuration.md
 usage/rollbacks.md
 usage/dotfiles.md
 usage/graphical.md
+usage/gpu-non-nixos.md
 usage/updating.md
 ```
--- a/docs/manual/usage/gpu-non-nixos.md
+++ b/docs/manual/usage/gpu-non-nixos.md
@ -0,0 +1,81 @@
+# GPU on non-NixOS systems {#sec-usage-gpu-non-nixos}
+
+To access the GPU, programs need access to OpenGL and Vulkan libraries. While
+this works transparently on NixOS, it does not on other Linux systems. A
+solution is provided by [NixGL](https://github.com/nix-community/nixGL), which
+can be integrated into Home Manager.
+
+To enable the integration, import NixGL into your home configuration, either as
+a channel, or as a flake input passed via `extraSpecialArgs`. Then, set the
+`nixGL.packages` option to the package set provided by NixGL.
+
+Once integration is enabled, it can be used in two ways: as Nix functions for
+wrapping programs installed via Home Manager, and as shell commands for running
+programs installed by other means (such as `nix shell`). In either case, there
+are several wrappers available. They can be broadly categorized
+
+- by vendor: as Mesa (for Free drivers of all vendors) and Nvidia (for
+  Nvidia-specific proprietary drivers).
+- by GPU selection: as primary and secondary (offloading).
+
+For example, the `mesa` wrapper provides support for running programs on the
+primary GPU for Intel, AMD and Nouveau drivers, while the `mesaPrime` wrapper
+does the same for the secondary GPU.
+
+**Note:** when using Nvidia wrappers together with flakes, your home
+configuration will not be pure and needs to be built using `home-manager switch
+--impure`. Otherwise, the build will fail, complaining about missing attribute
+`currentTime`.
+
+Wrapper functions are available under `config.lib.nixGL.wrappers`. However, it
+can be more convenient to use the `config.lib.nixGL.wrap` alias, which can be
+configured to use any of the wrappers. It is intended to provide a customization
+point when the same home configuration is used across several machines with
+different hardware. There is also the `config.lib.nixGL.wrapOffload` alias for
+two-GPU systems.
+
+Another convenience is that all wrapper functions are always available. However,
+when `nixGL.packages` option is unset, they are no-ops. This allows them to be
+used even when the home configuration is used on NixOS machines. The exception
+is the `prime-offload` script which ignores `nixGL.packages` and is installed
+into the environment whenever `nixGL.prime.installScript` is set. This script,
+which can be used to start a program on a secondary GPU, does not depend on
+NixGL and is useful on NixOS systems as well.
+
+Below is an abbreviated example for an Optimus laptop that makes use of both
+Mesa and Nvidia wrappers, where the latter is used in dGPU offloading mode. It
+demonstrates how to wrap `mpv` to run on the integrated Intel GPU, wrap FreeCAD
+to run on the Nvidia dGPU, and how to install the wrapper scripts. It also wraps
+Xonotic to run on the dGPU, but uses the wrapper function directly for
+demonstration purposes.
+
+```nix
+{ config, lib, pkgs, nixgl, ... }:
+{
+  nixGL.packages = nixgl.packages;
+  nixGL.defaultWrapper = "mesa";
+  nixGL.offloadWrapper = "nvidiaPrime";
+  nixGL.installScripts = [ "mesa" "nvidiaPrime" ];
+
+  programs.mpv = {
+    enable = true;
+    package = config.lib.nixGL.wrap pkgs.mpv;
+  };
+
+  home.packages = [
+    (config.lib.nixGL.wrapOffload pkgs.freecad)
+    (config.lib.nixGL.wrappers.nvidiaPrime pkgs.xonotic)
+  ];
+}
+```
+
+The above example assumes a flake-based setup where `nixgl` was passed from the
+flake. When using channels, the example would instead begin with
+
+```nix
+{ config, lib, pkgs, ... }:
+{
+  nixGL.packages = import <nixgl> { inherit pkgs; };
+  # The rest is the same as above
+  ...
+```
--- a/docs/release-notes/rl-2411.md
+++ b/docs/release-notes/rl-2411.md
@ -7,7 +7,21 @@ is therefore not final.

 This release has the following notable changes:

- No changes.
+- The swayidle module behavior has changed. Specifically, swayidle was
+  previously always called with a `-w` flag. This flag is now moved to
+  the default
+  [services.swayidle.extraArgs](#opt-services.swayidle.extraArgs)
+  value to make it optional.
+
+  Your configuration may break if you already set this option and also
+  rely on the flag being automatically added. To resolve this, please
+  add `-w` to your assignment of
+  [services.swayidle.extraArgs](#opt-services.swayidle.extraArgs).
+
+- Support for Boolean values in the option
+  [programs.eza.icons](#opt-programs.eza.icons) is deprecated for
+  future removal. The new value for `true` is `"auto"`, and for
+  `false` it is `null`.

 ## State Version Changes {#sec-release-24.11-state-version-changes}

--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
        "type": "github"
      },
      "original": {
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@ -1,5 +1,5 @@
 { runCommand, lib, bash, callPackage, coreutils, findutils, gettext, gnused, jq
-, less, ncurses, unixtools
+, less, ncurses, inetutils
 # used for pkgs.path for nixos-option
 , pkgs

@ -38,7 +38,7 @@ in runCommand "home-manager" {
        less
        ncurses
        nixos-option
-        unixtools.hostname
+        inetutils # for `hostname`
      ]
    }" \
    --subst-var-by HOME_MANAGER_LIB '${../lib/bash/home-manager.sh}' \
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@ -198,19 +198,9 @@ function setFlakeAttribute() {
                ;;
            *)
                local name="$USER"
-
-                local hostnameArray=()
-                # FQDN lookup can fail depending on the resolver.
-                local fqdn
-                fqdn="$(hostname -f 2> /dev/null)"
-                if [[ $? -eq 0 ]]; then
-                    hostnameArray+=( "$USER@$fqdn"  )
-                fi
                # Check FQDN, long, and short hostnames; long first to preserve
                # pre-existing behaviour in case both happen to be defined.
-                hostnameArray+=( "$USER@$(hostname)" "$USER@$(hostname -s)" )
-
-                for n in "${hostnameArray[@]}"; do
+                for n in "$USER@$(hostname -f)" "$USER@$(hostname)" "$USER@$(hostname -s)"; do
                    if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$n\"")" == "true" ]]; then
                        name="$n"
                        if [[ -v VERBOSE ]]; then
--- a/home-manager/po/hi.po
+++ b/home-manager/po/hi.po
@ -0,0 +1,220 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"PO-Revision-Date: 2024-10-09 14:31+0000\n"
+"Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
+"Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/cli/"
+"hi/>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.8-dev\n"
+
+#. translators: For example: "home-manager: missing argument for --cores"
+#: home-manager/home-manager:16
+msgid "%s: missing argument for %s"
+msgstr "%s: ‌%s के लिए कोई आर्ग्यूमेंट नहीं दिया"
+
+#: home-manager/home-manager:64
+msgid "No configuration file found at %s"
+msgstr "%s में कोई कन्फि़गरेशन फाइल नहीं मिली"
+
+#. translators: The first '%s' specifier will be replaced by either
+#. 'home.nix' or 'flake.nix'.
+#: home-manager/home-manager:81 home-manager/home-manager:85
+#: home-manager/home-manager:184
+msgid ""
+"Keeping your Home Manager %s in %s is deprecated,\n"
+"please move it to %s"
+msgstr ""
+"अपने Home Manager %s को %s में रखना अप्रचलित है,\n"
+"कृपया इसे %s में स्थानांतरित करें"
+
+#: home-manager/home-manager:92
+msgid "No configuration file found. Please create one at %s"
+msgstr "कोई कॉन्फ़िगरेशन फ़ाइल नहीं मिली। कृपया %s पर एक फ़ाइल बनाएं।"
+
+#: home-manager/home-manager:107
+msgid "Home Manager not found at %s."
+msgstr "%s पर Home Manager नहीं मिला।"
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:115
+msgid ""
+"The fallback Home Manager path %s has been deprecated and a file/directory "
+"was found there."
+msgstr ""
+
+#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
+#: home-manager/home-manager:118
+msgid ""
+"To remove this warning, do one of the following.\n"
+"\n"
+"1. Explicitly tell Home Manager to use the path, for example by adding\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   to your configuration.\n"
+"\n"
+"   If you import Home Manager directly, you can use the `path` parameter\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   when calling the Home Manager package.\n"
+"\n"
+"2. Remove the deprecated path.\n"
+"\n"
+"     $ rm -r \"%s\""
+msgstr ""
+
+#: home-manager/home-manager:146
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: home-manager/home-manager:166
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:221
+msgid "Can't inspect options of a flake configuration"
+msgstr ""
+
+#: home-manager/home-manager:296 home-manager/home-manager:319
+#: home-manager/home-manager:1051
+msgid "%s: unknown option '%s'"
+msgstr ""
+
+#: home-manager/home-manager:301 home-manager/home-manager:1052
+msgid "Run '%s --help' for usage help"
+msgstr ""
+
+#: home-manager/home-manager:327 home-manager/home-manager:431
+msgid "The file %s already exists, leaving it unchanged..."
+msgstr ""
+
+#: home-manager/home-manager:329 home-manager/home-manager:433
+msgid "Creating %s..."
+msgstr ""
+
+#: home-manager/home-manager:475
+msgid "Creating initial Home Manager generation..."
+msgstr ""
+
+#. translators: The "%s" specifier will be replaced by a file path.
+#: home-manager/home-manager:480
+msgid ""
+"All done! The home-manager tool should now be installed and you can edit\n"
+"\n"
+"    %s\n"
+"\n"
+"to configure Home Manager. Run 'man home-configuration.nix' to\n"
+"see all available options."
+msgstr ""
+
+#. translators: The "%s" specifier will be replaced by a URL.
+#: home-manager/home-manager:485
+msgid ""
+"Uh oh, the installation failed! Please create an issue at\n"
+"\n"
+"    %s\n"
+"\n"
+"if the error seems to be the fault of Home Manager."
+msgstr ""
+
+#. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
+#: home-manager/home-manager:496
+msgid "Can't instantiate a flake configuration"
+msgstr ""
+
+#: home-manager/home-manager:572
+msgid ""
+"There is %d unread and relevant news item.\n"
+"Read it by running the command \"%s news\"."
+msgid_plural ""
+"There are %d unread and relevant news items.\n"
+"Read them by running the command \"%s news\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: home-manager/home-manager:586
+msgid "Unknown \"news.display\" setting \"%s\"."
+msgstr ""
+
+#: home-manager/home-manager:594
+#, sh-format
+msgid "Please set the $EDITOR or $VISUAL environment variable"
+msgstr ""
+
+#: home-manager/home-manager:612
+msgid "Cannot run build in read-only directory"
+msgstr ""
+
+#: home-manager/home-manager:693
+msgid "No generation with ID %s"
+msgstr ""
+
+#: home-manager/home-manager:695
+msgid "Cannot remove the current generation %s"
+msgstr ""
+
+#: home-manager/home-manager:697
+msgid "Removing generation %s"
+msgstr ""
+
+#: home-manager/home-manager:718
+msgid "No generations to expire"
+msgstr ""
+
+#: home-manager/home-manager:729
+msgid "No home-manager packages seem to be installed."
+msgstr ""
+
+#: home-manager/home-manager:811
+msgid "Unknown argument %s"
+msgstr ""
+
+#: home-manager/home-manager:835
+msgid "This will remove Home Manager from your system."
+msgstr ""
+
+#: home-manager/home-manager:838
+msgid "This is a dry run, nothing will actually be uninstalled."
+msgstr ""
+
+#: home-manager/home-manager:842
+msgid "Really uninstall Home Manager?"
+msgstr ""
+
+#: home-manager/home-manager:848
+msgid "Switching to empty Home Manager configuration..."
+msgstr ""
+
+#: home-manager/home-manager:863
+msgid "Yay!"
+msgstr ""
+
+#: home-manager/home-manager:868
+msgid "Home Manager is uninstalled but your home.nix is left untouched."
+msgstr ""
+
+#: home-manager/home-manager:1091
+msgid "expire-generations expects one argument, got %d."
+msgstr ""
+
+#: home-manager/home-manager:1113
+msgid "Unknown command: %s"
+msgstr ""
+
+#: home-manager/install.nix:18
+msgid "This derivation is not buildable, please run it using nix-shell."
+msgstr ""
--- a/home-manager/po/hu.po
+++ b/home-manager/po/hu.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: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-07-05 14:09+0000\n"
+"PO-Revision-Date: 2024-09-02 17:09+0000\n"
 "Last-Translator: Ferenci Ákos <synthetace@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
 "cli/hu/>\n"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7-dev\n"
+"X-Generator: Weblate 5.8-dev\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
@ -54,6 +54,8 @@ msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
+"A tartalék Home Manager fájlútvonal %s elavult és fájl/könyvtár található "
+"itt."

 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:118
@ -76,19 +78,37 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
+"A felmerült hiba elhárítására a következőket tegye:\n"
+"\n"
+"1. Közvetlen adja át a Home Manager-nek a fájlútvonalat, pl.:\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"    sor  konfigurációhoz való hozzáadásával.\n"
+"\n"
+"   Amennyiben a Home Manager-t közvetlen importolja, használhatja a 'path' "
+"paramétert\n"
+"\n"
+"      pkgs.callPackage/path/tohome-manager-package{path = \"%s\"; }\n"
+"   a Home Manager csomag meghívásakor.\n"
+"\n"
+"   2. Távolítsa el az elavult fájlútvonalat.\n"
+"\n"
+"      $ rm -r \"$s\""

 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
-msgstr ""
+msgstr "Nix épségének ellenőrzése"

 #: home-manager/home-manager:166
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
+"Nem található megfelelő profil mappa, %s és %s útvonalak lettek kipróbálva."

 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:221
 msgid "Can't inspect options of a flake configuration"
-msgstr ""
+msgstr "Nem lehet a flake konfiguráció beállításait megtekinteni."

 #: home-manager/home-manager:296 home-manager/home-manager:319
 #: home-manager/home-manager:1051
@ -121,6 +141,13 @@ msgid ""
 "to configure Home Manager. Run 'man home-configuration.nix' to\n"
 "see all available options."
 msgstr ""
+"Elkészült! A home-manager eszköz most már installálva van és a \n"
+"\n"
+"      %s\n"
+"\n"
+"fájl szerkesztésével konfigurálhatja a Home Manager-t. \n"
+"Futtassa a 'man home-configuration.nix' parancsot az összes opció "
+"áttekintéséhez."

 #. translators: The "%s" specifier will be replaced by a URL.
 #: home-manager/home-manager:485
@ -131,6 +158,11 @@ msgid ""
 "\n"
 "if the error seems to be the fault of Home Manager."
 msgstr ""
+"Uh oh, az installáció nem sikerült! Kérem készítsen egy jelentést erről a \n"
+"\n"
+"      %s\n"
+"\n"
+"helyen amennyiben a hiba a Home Manager miatt lépett fel."

 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:496
@ -145,16 +177,20 @@ msgid_plural ""
 "There are %d unread and relevant news items.\n"
 "Read them by running the command \"%s news\"."
 msgstr[0] ""
+"%d olvasatlan és releváns hírt kapott.\n"
+"Olvassa el a \"%s news\" futattásával."
 msgstr[1] ""
+"%d olvasatlan és releváns hírt kapott.\n"
+"Olvassa el őket a \"%s news\" futattásával."

 #: home-manager/home-manager:586
 msgid "Unknown \"news.display\" setting \"%s\"."
-msgstr ""
+msgstr "Ismeretlen \"news.display\" opció \"%s\"."

 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "Kérem állítása be az $EDITOR vagy a $VISUAL környezeti változókat."

 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"
@ -162,11 +198,11 @@ msgstr "Build futtatása nem lehetséges csak-olvasható könyvtárban"

 #: home-manager/home-manager:693
 msgid "No generation with ID %s"
-msgstr ""
+msgstr "Nem található generáció a következő ID-val: %"

 #: home-manager/home-manager:695
 msgid "Cannot remove the current generation %s"
-msgstr ""
+msgstr "A jelenlegi generáció %s nem eltávolítható"

 #: home-manager/home-manager:697
 msgid "Removing generation %s"
@ -174,11 +210,11 @@ msgstr "%s generáció eltávolítása"

 #: home-manager/home-manager:718
 msgid "No generations to expire"
-msgstr ""
+msgstr "Nincs lejárandó generáció"

 #: home-manager/home-manager:729
 msgid "No home-manager packages seem to be installed."
-msgstr ""
+msgstr "Nem található installált Home Manager csomag"

 #: home-manager/home-manager:811
 msgid "Unknown argument %s"
@ -186,19 +222,19 @@ msgstr "Ismeretlen argumentum %s"

 #: home-manager/home-manager:835
 msgid "This will remove Home Manager from your system."
-msgstr ""
+msgstr "Ez a művelet eltávolítja a Home Manager-t a rendszeréről."

 #: home-manager/home-manager:838
 msgid "This is a dry run, nothing will actually be uninstalled."
-msgstr ""
+msgstr "Ez egy üres járat, semmi nem lesz valójában eltávolítva."

 #: home-manager/home-manager:842
 msgid "Really uninstall Home Manager?"
-msgstr ""
+msgstr "Biztosan eltávolítja a Home Managert-t?"

 #: home-manager/home-manager:848
 msgid "Switching to empty Home Manager configuration..."
-msgstr ""
+msgstr "Átváltás üres Home Manager konfigurációra..."

 #: home-manager/home-manager:863
 msgid "Yay!"
@ -206,7 +242,7 @@ msgstr "Hurrá!"

 #: home-manager/home-manager:868
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
-msgstr ""
+msgstr "Home Manager eltávolítva, de a home.nix fájl érintetlenül maradt."

 #: home-manager/home-manager:1091
 msgid "expire-generations expects one argument, got %d."
@ -219,3 +255,4 @@ msgstr "Ismeretlen parancs: %s"
 #: home-manager/install.nix:18
 msgid "This derivation is not buildable, please run it using nix-shell."
 msgstr ""
+"Ez a származtatás nem építhető fel, kérlek futtasd nix-shell segítségével."
--- a/home-manager/po/lt.po
+++ b/home-manager/po/lt.po
@ -8,22 +8,22 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-02-16 22:01+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2024-10-17 00:20+0000\n"
+"Last-Translator: Julius Marozas <marozas.julius@gmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/home-manager/"
 "cli/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && ("
+"n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.8-rc\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: trūksta argumento %s"

 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@ -55,6 +55,8 @@ msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
+"Atsarginis kelias %s į Home Manager jau nebenaudojamas, tačiau jame buvo "
+"rastas failas/katalogas."

 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:118
@ -77,6 +79,24 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
+"Norėdami pašalinti šį įspėjimą, atlikite vieną iš šių veiksmų.\n"
+"\n"
+"1. Aiškiai nurodykite kelią į Home Manager, pavyzdžiui, pridėdami\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   prie jūsų konfigūracijos.\n"
+"\n"
+"   Jei importuojate Home Manager tiesiogiai, galite naudoti parametrą `path`."
+"\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   kviečiant į Home Manager paketą.\n"
+"\n"
+"2. Pašalinkite nebenaudojamą kelią.\n"
+"\n"
+"     $ rm -r \"%s\""

 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
@ -175,10 +195,9 @@ msgstr "Nežinomas \"news.display\" nustatymas \"%s\"."
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "Nustatykite $EDITOR arba $VISUAL aplinkos kintamuosius"

 #: home-manager/home-manager:612
-#, fuzzy
 msgid "Cannot run build in read-only directory"
 msgstr "Negalima vykdyti kompiliavimo read-only kataloge"

--- a/home-manager/po/ro.po
+++ b/home-manager/po/ro.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-03-31 22:01+0000\n"
-"Last-Translator: SMFloris <floris.sm@gmail.com>\n"
+"PO-Revision-Date: 2024-09-09 10:09+0000\n"
+"Last-Translator: Felix Puscasu <puscasu.felix1@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/home-manager/"
 "cli/ro/>\n"
 "Language: ro\n"
@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.8-dev\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: Argument lipsă pentru %s"

 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
--- a/home-manager/po/ru.po
+++ b/home-manager/po/ru.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-03-31 22:01+0000\n"
-"Last-Translator: Petr Portnov | PROgrm_JARvis <mrJARVIScraft@gmail.com>\n"
+"PO-Revision-Date: 2024-09-12 02:12+0000\n"
+"Last-Translator: NikSne <commits@niksne.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/home-manager/cli/"
 "ru/>\n"
 "Language: ru\n"
@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.8-dev\n"

 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr ""
+msgstr "%s: отсутствует параметр для %s"

 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
--- a/modules/accounts/calendar.nix
+++ b/modules/accounts/calendar.nix
@ -12,7 +12,8 @@ let
        path = mkOption {
          type = types.str;
          default = "${cfg.basePath}/${name}";
-          defaultText = "‹accounts.calendar.basePath›/‹name›";
+          defaultText =
+            lib.literalExpression "‹accounts.calendar.basePath›/‹name›";
          description = "The path of the storage.";
        };

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

--- a/modules/lib/default.nix
+++ b/modules/lib/default.nix
@ -14,4 +14,5 @@ rec {

  shell = import ./shell.nix { inherit lib; };
  zsh = import ./zsh.nix { inherit lib; };
+  nushell = import ./nushell.nix { inherit lib; };
 }
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@ -7,6 +7,12 @@
 # [1] https://github.com/NixOS/nixpkgs/blob/fca0d6e093c82b31103dc0dacc48da2a9b06e24b/maintainers/maintainer-list.nix#LC1

 {
+  aabccd021 = {
+    name = "Muhamad Abdurahman";
+    email = "aabccd021@gmail.com";
+    github = "aabccd021";
+    githubId = 33031950;
+  };
  abayomi185 = {
    name = "Yomi";
    email = "yomi+nix@yomitosh.com";
@ -276,6 +282,12 @@
    github = "nilp0inter";
    githubId = 1224006;
  };
+  NitroSniper = {
+    name = "Nitro Sniper";
+    email = "nitro@ortin.dev";
+    github = "NitroSniper";
+    githubId = 44097331;
+  };
  seylerius = {
    email = "sable@seyleri.us";
    name = "Sable Seyler";
@ -337,6 +349,11 @@
    githubId = 12465195;
    name = "Bruno BELANYI";
  };
+  libewa = {
+    email = "libewa-git@icloud.com";
+    github = "libewa";
+    githubId = 67926131;
+  };
  malvo = {
    email = "malte@malvo.org";
    github = "malte-v";
@ -415,12 +432,6 @@
    github = "nurelin";
    githubId = 5276274;
  };
-  omernaveedxyz = {
-    name = "Omer Naveed";
-    email = "omer@omernaveed.dev";
-    github = "omernaveedxyz";
-    githubId = 112912585;
-  };
  otavio = {
    email = "otavio.salvador@ossystems.com.br";
    github = "otavio";
@ -593,4 +604,18 @@
    github = "michaelvanstraten";
    githubId = 50352631;
  };
+  joygnu = {
+    name = "joygnu";
+    email = "contact@joygnu.org";
+    github = "joygnu";
+    githubId = 152063003;
+  };
+  callumio = {
+    name = "Callum Leslie";
+    email = "git+nix@cleslie.uk";
+    github = "callumio";
+    githubId = 16057677;
+    keys =
+      [{ fingerprint = "BC82 4BB5 1656 D144 285E  A0EC D382 C4AF EECE AA90"; }];
+  };
 }
--- a/modules/lib/nushell.nix
+++ b/modules/lib/nushell.nix
@ -0,0 +1,65 @@
+{ lib }: rec {
+  mkNushellInline = expr: lib.setType "nushell-inline" { inherit expr; };
+
+  toNushell = { indent ? "", multiline ? true, asBindings ? false }@args:
+    v:
+    let
+      innerIndent = "${indent}    ";
+      introSpace = if multiline then ''
+
+        ${innerIndent}'' else
+        " ";
+      outroSpace = if multiline then ''
+
+        ${indent}'' else
+        " ";
+      innerArgs = args // {
+        indent = if asBindings then indent else innerIndent;
+        asBindings = false;
+      };
+      concatItems = lib.concatStringsSep introSpace;
+      isNushellInline = lib.isType "nushell-inline";
+
+      generatedBindings = assert lib.assertMsg (badVarNames == [ ])
+        "Bad Nushell variable names: ${
+          lib.generators.toPretty { } badVarNames
+        }";
+        lib.concatStrings (lib.mapAttrsToList (key: value: ''
+          ${indent}let ${key} = ${toNushell innerArgs value}
+        '') v);
+
+      isBadVarName = name:
+        # Extracted from https://github.com/nushell/nushell/blob/ebc7b80c23f777f70c5053cca428226b3fe00d30/crates/nu-parser/src/parser.rs#L33
+        # Variables with numeric or even empty names are allowed. The only requisite is not containing any of the following characters
+        let invalidVariableCharacters = ".[({+-*^/=!<>&|";
+        in lib.match "^[$]?[^${lib.escapeRegex invalidVariableCharacters}]+$"
+        name == null;
+      badVarNames = lib.filter isBadVarName (builtins.attrNames v);
+    in if asBindings then
+      generatedBindings
+    else if v == null then
+      "null"
+    else if lib.isInt v || lib.isFloat v || lib.isString v || lib.isBool v then
+      lib.strings.toJSON v
+    else if lib.isList v then
+      (if v == [ ] then
+        "[]"
+      else
+        "[${introSpace}${
+          concatItems (map (value: "${toNushell innerArgs value}") v)
+        }${outroSpace}]")
+    else if lib.isAttrs v then
+      (if isNushellInline v then
+        "(${v.expr})"
+      else if v == { } then
+        "{}"
+      else if lib.isDerivation v then
+        toString v
+      else
+        "{${introSpace}${
+          concatItems (lib.mapAttrsToList (key: value:
+            "${lib.strings.toJSON key}: ${toNushell innerArgs value}") v)
+        }${outroSpace}}")
+    else
+      abort "nushell.toNushell: type ${lib.typeOf v} is unsupported";
+}
--- a/modules/lib/types.nix
+++ b/modules/lib/types.nix
@ -107,4 +107,27 @@ in rec {
        mergeDefaultOption loc defs;
  };

+  nushellValue = let
+    valueType = types.nullOr (types.oneOf [
+      (lib.mkOptionType {
+        name = "nushell";
+        description = "Nushell inline value";
+        descriptionClass = "name";
+        check = lib.isType "nushell-inline";
+      })
+      types.bool
+      types.int
+      types.float
+      types.str
+      types.path
+      (types.attrsOf valueType // {
+        description = "attribute set of Nushell values";
+        descriptionClass = "name";
+      })
+      (types.listOf valueType // {
+        description = "list of Nushell values";
+        descriptionClass = "name";
+      })
+    ]);
+  in valueType;
 }
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@ -1,9 +1,6 @@
 { config, lib, options, pkgs, ... }:
-
 with lib;
-
 let
-
  cfg = config.news;

  hostPlatform = pkgs.stdenv.hostPlatform;
@ -44,7 +41,6 @@ let

    config = { id = mkDefault (builtins.hashString "sha256" config.message); };
  });
-
 in {
  meta.maintainers = [ maintainers.rycee ];

@ -1712,6 +1708,119 @@ in {
          Sesh is a CLI that helps you create and manage tmux sessions quickly
          and easily using zoxide. See https://github.com/joshmedeski/sesh for
          more.
+      }
+      
+      {
+        time = "2024-09-13T08:58:17+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.trayscale'.
+
+          An unofficial GUI wrapper around the Tailscale CLI client.
+        '';
+      }
+
+      {
+        time = "2024-09-13T09:50:49+00:00";
+        message = ''
+          A new module is available: 'programs.neovide'.
+
+          Neovide is a simple, no-nonsense, cross-platform graphical user
+          interface for Neovim (an aggressively refactored and updated Vim
+          editor).
+        '';
+      }
+
+      {
+        time = "2024-09-20T07:00:11+00:00";
+        condition = config.programs.kitty.theme != null;
+        message = ''
+          The option 'programs.kitty.theme' has been deprecated, please use
+          'programs.kitty.themeFile' instead.
+
+          The 'programs.kitty.themeFile' option expects the file name of a
+          theme from `kitty-themes`, without the `.conf` suffix. See
+          <https://github.com/kovidgoyal/kitty-themes/tree/master/themes> for a
+          list of themes.
+        '';
+      }
+
+      {
+        time = "2024-09-20T07:48:08+00:00";
+        condition = hostPlatform.isLinux && config.services.swayidle.enable;
+        message = ''
+          The swayidle module behavior has changed. Specifically, swayidle was
+          previously always called with a `-w` flag. This flag is now moved to
+          the default `services.swayidle.extraArgs` value to make it optional.
+
+          Your configuration may break if you already set this option and also
+          rely on the flag being automatically added. To resolve this, please
+          add `-w` to your assignment of `services.swayidle.extraArgs`.
+        '';
+      }
+
+      {
+        time = "2024-10-09T06:16:23+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.snixembed'.
+
+          snixembed proxies StatusNotifierItems as XEmbedded systemtray-spec
+          icons. This is useful for some tools in some environments, e.g., Safe
+          Eyes in i3, lxde or mate.
+        '';
+      }
+
+      {
+        time = "2024-10-11T08:23:19+00:00";
+        message = ''
+          A new module is available: 'programs.vifm'.
+
+          Vifm is a curses based Vim-like file manager extended with some useful
+          ideas from mutt.
+        '';
+      }
+
+      {
+        time = "2024-10-17T13:07:55+00:00";
+        message = ''
+          A new module is available: 'programs.zed-editor'.
+
+          Zed is a fast text editor for macOS and Linux.
+          See https://zed.dev for more.
+        '';
+      }
+
+      {
+        time = "2024-10-18T14:01:07+00:00";
+        message = ''
+          A new module is available: 'programs.cmus'.
+
+          cmus is a small, fast and powerful console music player.
+        '';
+      }
+
+      {
+        time = "2024-10-20T07:53:54+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'programs.nh'.
+
+          nh is yet another Nix CLI helper. Adding functionality on top of the
+          existing solutions, like nixos-rebuild, home-manager cli or nix
+          itself.
+        '';
+      }
+
+      {
+        time = "2024-10-25T08:18:30+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'nixGL'.
+
+          NixGL solve the "OpenGL" problem with nix. The 'nixGL' module provides
+          integration of NixGL into Home Manager. See the "GPU on non-NixOS
+          systems" section in the Home Manager mantual for more.
        '';
      }
    ];
--- a/modules/misc/nixgl.nix
+++ b/modules/misc/nixgl.nix
@ -0,0 +1,296 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.nixGL;
+  wrapperListMarkdown = with builtins;
+    foldl' (list: name:
+      list + ''
+        - ${name}
+      '') "" (attrNames config.lib.nixGL.wrappers);
+in {
+  meta.maintainers = [ lib.maintainers.smona ];
+
+  options.nixGL = {
+    packages = lib.mkOption {
+      type = with lib.types; nullOr attrs;
+      default = null;
+      example = lib.literalExpression "inputs.nixGL.packages";
+      description = ''
+        The nixGL package set containing GPU library wrappers. This can be used
+        to provide OpenGL and Vulkan access to applications on non-NixOS systems
+        by using `(config.lib.nixGL.wrap <package>)` for the default wrapper, or
+        `(config.lib.nixGL.wrappers.<wrapper> <package>)` for any available
+        wrapper.
+
+        The wrapper functions are always available. If this option is empty (the
+        default), they are a no-op. This is useful on NixOS where the wrappers
+        are unnecessary.
+
+        Note that using any Nvidia wrapper requires building the configuration
+        with the `--impure` option.
+      '';
+    };
+
+    defaultWrapper = lib.mkOption {
+      type = lib.types.enum (builtins.attrNames config.lib.nixGL.wrappers);
+      default = "mesa";
+      description = ''
+        The package wrapper function available for use as `(config.lib.nixGL.wrap
+        <package>)`. Intended to start programs on the main GPU.
+
+        Wrapper functions can be found under `config.lib.nixGL.wrappers`. They
+        can be used directly, however, setting this option provides a convenient
+        shorthand.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    offloadWrapper = lib.mkOption {
+      type = lib.types.enum (builtins.attrNames config.lib.nixGL.wrappers);
+      default = "mesaPrime";
+      description = ''
+        The package wrapper function available for use as
+        `(config.lib.nixGL.wrapOffload <package>)`. Intended to start programs
+        on the secondary GPU.
+
+        Wrapper functions can be found under `config.lib.nixGL.wrappers`. They
+        can be used directly, however, setting this option provides a convenient
+        shorthand.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    prime.card = lib.mkOption {
+      type = lib.types.str;
+      default = "1";
+      example = "pci-0000_06_00_0";
+      description = ''
+        Selects the non-default graphics card used for PRIME render offloading.
+        The value can be:
+
+        - a number, selecting the n-th non-default GPU;
+        - a PCI bus id in the form `pci-XXX_YY_ZZ_U`;
+        - a PCI id in the form `vendor_id:device_id`
+
+        For more information, consult the Mesa documentation on the `DRI_PRIME`
+        environment variable.
+      '';
+    };
+
+    prime.nvidiaProvider = lib.mkOption {
+      type = with lib.types; nullOr str;
+      default = null;
+      example = "NVIDIA-G0";
+      description = ''
+        If this option is set, it overrides the offload provider for Nvidia
+        PRIME offloading. Consult the proprietary Nvidia driver documentation
+        on the `__NV_PRIME_RENDER_OFFLOAD_PROVIDER` environment variable.
+      '';
+    };
+
+    prime.installScript = lib.mkOption {
+      type = with lib.types; nullOr (enum [ "mesa" "nvidia" ]);
+      default = null;
+      example = "mesa";
+      description = ''
+        If this option is set, the wrapper script `prime-offload` is installed
+        into the environment. It allows starting programs on the secondary GPU
+        selected by the `nixGL.prime.card` option. This makes sense when the
+        program is not already using one of nixGL PRIME wrappers, or for
+        programs not installed from Nixpkgs.
+
+        This option can be set to either "mesa" or "nvidia", making the script
+        use one or the other graphics library.
+      '';
+    };
+
+    installScripts = lib.mkOption {
+      type = with lib.types;
+        nullOr (listOf (enum (builtins.attrNames config.lib.nixGL.wrappers)));
+      default = null;
+      example = [ "mesa" "mesaPrime" ];
+      description = ''
+        For each wrapper `wrp` named in the provided list, a wrapper script
+        named `nixGLWrp` is installed into the environment. These scripts are
+        useful for running programs not installed via Home Manager.
+
+        The following wrappers are available:
+        ${wrapperListMarkdown}
+      '';
+    };
+
+    vulkan.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to enable Vulkan in nixGL wrappers.
+
+        This is disabled by default bacause Vulkan brings in several libraries
+        that can cause symbol version conflicts in wrapped programs. Your
+        mileage may vary.
+      '';
+    };
+  };
+
+  config = let
+    findWrapperPackage = packageAttr:
+      # NixGL has wrapper packages in different places depending on how you
+      # access it. We want HM configuration to be the same, regardless of how
+      # NixGL is imported.
+      #
+      # First, let's see if we have a flake.
+      if builtins.hasAttr pkgs.system cfg.packages then
+        cfg.packages.${pkgs.system}.${packageAttr}
+      else
+      # Next, let's see if we have a channel.
+      if builtins.hasAttr packageAttr cfg.packages then
+        cfg.packages.${packageAttr}
+      else
+      # Lastly, with channels, some wrappers are grouped under "auto".
+      if builtins.hasAttr "auto" cfg.packages then
+        cfg.packages.auto.${packageAttr}
+      else
+        throw "Incompatible NixGL package layout";
+
+    getWrapperExe = vendor:
+      let
+        glPackage = findWrapperPackage "nixGL${vendor}";
+        glExe = lib.getExe glPackage;
+        vulkanPackage = findWrapperPackage "nixVulkan${vendor}";
+        vulkanExe = if cfg.vulkan.enable then lib.getExe vulkanPackage else "";
+      in "${glExe} ${vulkanExe}";
+
+    mesaOffloadEnv = { "DRI_PRIME" = "${cfg.prime.card}"; };
+
+    nvOffloadEnv = {
+      "DRI_PRIME" = "${cfg.prime.card}";
+      "__NV_PRIME_RENDER_OFFLOAD" = "1";
+      "__GLX_VENDOR_LIBRARY_NAME" = "nvidia";
+      "__VK_LAYER_NV_optimus" = "NVIDIA_only";
+    } // (let provider = cfg.prime.nvidiaProvider;
+    in if !isNull provider then {
+      "__NV_PRIME_RENDER_OFFLOAD_PROVIDER" = "${provider}";
+    } else
+      { });
+
+    makePackageWrapper = vendor: environment: pkg:
+      if builtins.isNull cfg.packages then
+        pkg
+      else
+      # Wrap the package's binaries with nixGL, while preserving the rest of
+      # the outputs and derivation attributes.
+        (pkg.overrideAttrs (old: {
+          name = "nixGL-${pkg.name}";
+
+          # Make sure this is false for the wrapper derivation, so nix doesn't expect
+          # a new debug output to be produced. We won't be producing any debug info
+          # for the original package.
+          separateDebugInfo = false;
+          nativeBuildInputs = old.nativeBuildInputs or [ ]
+            ++ [ pkgs.makeWrapper ];
+          buildCommand = let
+            # We need an intermediate wrapper package because makeWrapper
+            # requires a single executable as the wrapper.
+            combinedWrapperPkg =
+              pkgs.writeShellScriptBin "nixGLCombinedWrapper-${vendor}" ''
+                exec ${getWrapperExe vendor} "$@"
+              '';
+          in ''
+            set -eo pipefail
+
+            ${ # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
+            lib.concatStringsSep "\n" (map (outputName: ''
+              echo "Copying output ${outputName}"
+              set -x
+              cp -rs --no-preserve=mode "${
+                pkg.${outputName}
+              }" "''$${outputName}"
+              set +x
+            '') (old.outputs or [ "out" ]))}
+
+            rm -rf $out/bin/*
+            shopt -s nullglob # Prevent loop from running if no files
+            for file in ${pkg.out}/bin/*; do
+              local prog="$(basename "$file")"
+              makeWrapper \
+                "${lib.getExe combinedWrapperPkg}" \
+                "$out/bin/$prog" \
+                --argv0 "$prog" \
+                --add-flags "$file" \
+                ${
+                  lib.concatStringsSep " " (lib.attrsets.mapAttrsToList
+                    (var: val: "--set '${var}' '${val}'") environment)
+                }
+            done
+
+            # If .desktop files refer to the old package, replace the references
+            for dsk in "$out/share/applications"/*.desktop ; do
+              if ! grep -q "${pkg.out}" "$dsk"; then
+                continue
+              fi
+              src="$(readlink "$dsk")"
+              rm "$dsk"
+              sed "s|${pkg.out}|$out|g" "$src" > "$dsk"
+            done
+
+            shopt -u nullglob # Revert nullglob back to its normal default state
+          '';
+        }));
+
+    wrappers = {
+      mesa = makePackageWrapper "Intel" { };
+      mesaPrime = makePackageWrapper "Intel" mesaOffloadEnv;
+      nvidia = makePackageWrapper "Nvidia" { };
+      nvidiaPrime = makePackageWrapper "Nvidia" nvOffloadEnv;
+    };
+  in {
+    lib.nixGL.wrap = wrappers.${cfg.defaultWrapper};
+    lib.nixGL.wrapOffload = wrappers.${cfg.offloadWrapper};
+    lib.nixGL.wrappers = wrappers;
+
+    home.packages = let
+      wantsPrimeWrapper = (!isNull cfg.prime.installScript);
+      wantsWrapper = wrapper:
+        (!isNull cfg.packages) && (!isNull cfg.installScripts)
+        && (builtins.elem wrapper cfg.installScripts);
+      envVarsAsScript = environment:
+        lib.concatStringsSep "\n"
+        (lib.attrsets.mapAttrsToList (var: val: "export ${var}=${val}")
+          environment);
+    in [
+      (lib.mkIf wantsPrimeWrapper (pkgs.writeShellScriptBin "prime-offload" ''
+        ${if cfg.prime.installScript == "mesa" then
+          (envVarsAsScript mesaOffloadEnv)
+        else
+          (envVarsAsScript nvOffloadEnv)}
+        exec "$@"
+      ''))
+
+      (lib.mkIf (wantsWrapper "mesa") (pkgs.writeShellScriptBin "nixGLMesa" ''
+        exec ${getWrapperExe "Intel"} "$@"
+      ''))
+
+      (lib.mkIf (wantsWrapper "mesaPrime")
+        (pkgs.writeShellScriptBin "nixGLMesaPrime" ''
+          ${envVarsAsScript mesaOffloadEnv}
+          exec ${getWrapperExe "Intel"} "$@"
+        ''))
+
+      (lib.mkIf (wantsWrapper "nvidia")
+        (pkgs.writeShellScriptBin "nixGLNvidia" ''
+          exec ${getWrapperExe "Nvidia"} "$@"
+        ''))
+
+      (lib.mkIf (wantsWrapper "nvidia")
+        (pkgs.writeShellScriptBin "nixGLNvidiaPrime" ''
+          ${envVarsAsScript nvOffloadEnv}
+          exec ${getWrapperExe "Nvidia"} "$@"
+        ''))
+    ];
+  };
+}
--- a/modules/misc/xdg-mime.nix
+++ b/modules/misc/xdg-mime.nix
@ -5,33 +5,50 @@ with lib;
 let

  cfg = config.xdg.mime;
+  inherit (lib) getExe getExe';

 in {
  options = {
-    xdg.mime.enable = mkOption {
-      type = types.bool;
-      default = pkgs.stdenv.hostPlatform.isLinux;
-      defaultText =
-        literalExpression "true if host platform is Linux, false otherwise";
-      description = ''
-        Whether to install programs and files to support the
-        XDG Shared MIME-info specification and XDG MIME Applications
-        specification at
-        <https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html>
-        and
-        <https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html>,
-        respectively.
-      '';
+    xdg.mime = {
+      enable = mkOption {
+        type = types.bool;
+        default = pkgs.stdenv.hostPlatform.isLinux;
+        defaultText =
+          literalExpression "true if host platform is Linux, false otherwise";
+        description = ''
+          Whether to install programs and files to support the
+          XDG Shared MIME-info specification and XDG MIME Applications
+          specification at
+          <https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html>
+          and
+          <https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html>,
+          respectively.
+        '';
+      };
+
+      sharedMimeInfoPackage = mkOption {
+        type = types.package;
+        default = pkgs.shared-mime-info;
+        defaultText = literalExpression "pkgs.shared-mime-info";
+        description = "The package to use when running update-mime-database.";
+      };
+
+      desktopFileUtilsPackage = mkOption {
+        type = types.package;
+        default = pkgs.desktop-file-utils;
+        defaultText = literalExpression "pkgs.desktop-file-utils";
+        description =
+          "The package to use when running update-desktop-database.";
+      };
    };
  };
-
-  config = mkIf config.xdg.mime.enable {
+  config = mkIf cfg.enable {
    assertions =
      [ (hm.assertions.assertPlatform "xdg.mime" pkgs platforms.linux) ];

    home.packages = [
      # Explicitly install package to provide basic mime types.
-      pkgs.shared-mime-info
+      cfg.sharedMimeInfoPackage

      # Make sure the target directories will be real directories.
      (pkgs.runCommandLocal "dummy-xdg-mime-dirs1" { } ''
@ -46,12 +63,12 @@ in {
      if [[ -w $out/share/mime && -w $out/share/mime/packages && -d $out/share/mime/packages ]]; then
        XDG_DATA_DIRS=$out/share \
        PKGSYSTEM_ENABLE_FSYNC=0 \
-        ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database \
+        ${getExe cfg.sharedMimeInfoPackage} \
          -V $out/share/mime > /dev/null
      fi

      if [[ -w $out/share/applications ]]; then
-        ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database \
+        ${getExe' cfg.desktopFileUtilsPackage "update-desktop-database"} \
          $out/share/applications
      fi
    '';
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@ -30,6 +30,8 @@ in {
      apply = toString;
      description = ''
        Absolute path to directory holding application caches.
+
+        Sets `XDG_CACHE_HOME` for the user if `xdg.enable` is set `true`.
      '';
    };

@ -48,6 +50,8 @@ in {
      apply = toString;
      description = ''
        Absolute path to directory holding application configurations.
+
+        Sets `XDG_CONFIG_HOME` for the user if `xdg.enable` is set `true`.
      '';
    };

@ -67,6 +71,18 @@ in {
      apply = toString;
      description = ''
        Absolute path to directory holding application data.
+
+        Sets `XDG_DATA_HOME` for the user if `xdg.enable` is set `true`.
+      '';
+    };
+
+    stateFile = mkOption {
+      type = fileType "xdg.stateFile" "<varname>xdg.stateHome</varname>"
+        cfg.stateHome;
+      default = { };
+      description = ''
+        Attribute set of files to link into the user's XDG
+        state home.
      '';
    };

@ -76,6 +92,8 @@ in {
      apply = toString;
      description = ''
        Absolute path to directory holding application states.
+
+        Sets `XDG_STATE_HOME` for the user if `xdg.enable` is set `true`.
      '';
    };
  };
@ -122,6 +140,8 @@ in {
          cfg.configFile)
        (mapAttrs' (name: file: nameValuePair "${cfg.dataHome}/${name}" file)
          cfg.dataFile)
+        (mapAttrs' (name: file: nameValuePair "${cfg.stateHome}/${name}" file)
+          cfg.stateFile)
        { "${cfg.cacheHome}/.keep".text = ""; }
      ];
    }
--- a/modules/modules.nix
+++ b/modules/modules.nix
@ -31,6 +31,7 @@ let
    ./misc/gtk.nix
    ./misc/lib.nix
    ./misc/news.nix
+    ./misc/nixgl.nix
    ./misc/numlock.nix
    ./misc/pam.nix
    ./misc/qt.nix
@ -77,6 +78,7 @@ let
    ./programs/carapace.nix
    ./programs/cava.nix
    ./programs/chromium.nix
+    ./programs/cmus.nix
    ./programs/command-not-found/command-not-found.nix
    ./programs/comodoro.nix
    ./programs/darcs.nix
@ -92,6 +94,7 @@ let
    ./programs/feh.nix
    ./programs/firefox.nix
    ./programs/fish.nix
+    ./programs/floorp.nix
    ./programs/foot.nix
    ./programs/freetube.nix
    ./programs/fuzzel.nix
@ -167,8 +170,10 @@ let
    ./programs/ncspot.nix
    ./programs/ne.nix
    ./programs/neomutt.nix
+    ./programs/neovide.nix
    ./programs/neovim.nix
    ./programs/newsboat.nix
+    ./programs/nh.nix
    ./programs/nheko.nix
    ./programs/nix-index.nix
    ./programs/nnn.nix
@ -241,8 +246,9 @@ let
    ./programs/translate-shell.nix
    ./programs/urxvt.nix
    ./programs/vdirsyncer.nix
-    ./programs/vim.nix
+    ./programs/vifm.nix
    ./programs/vim-vint.nix
+    ./programs/vim.nix
    ./programs/vscode.nix
    ./programs/vscode/haskell.nix
    ./programs/pywal.nix
@ -260,6 +266,7 @@ let
    ./programs/yt-dlp.nix
    ./programs/z-lua.nix
    ./programs/zathura.nix
+    ./programs/zed-editor.nix
    ./programs/zellij.nix
    ./programs/zk.nix
    ./programs/zoxide.nix
@ -361,6 +368,7 @@ let
    ./services/screen-locker.nix
    ./services/sctd.nix
    ./services/signaturepdf.nix
+    ./services/snixembed.nix
    ./services/spotifyd.nix
    ./services/ssh-agent.nix
    ./services/stalonetray.nix
@ -375,6 +383,7 @@ let
    ./services/tahoe-lafs.nix
    ./services/taskwarrior-sync.nix
    ./services/trayer.nix
+    ./services/trayscale.nix
    ./services/twmn.nix
    ./services/udiskie.nix
    ./services/unclutter.nix
--- a/modules/po/de.po
+++ b/modules/po/de.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2023-12-29 02:09+0000\n"
-"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
+"PO-Revision-Date: 2024-10-15 21:37+0000\n"
+"Last-Translator: Viktor Illmer <accounts@viktor.im>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/"
 "modules/de/>\n"
 "Language: de\n"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.4-dev\n"
+"X-Generator: Weblate 5.8-rc\n"

 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@ -120,7 +120,7 @@ msgstr "Fehler: HOME ist auf \"%s\" gesetzt, aber wir erwarten \"%s\""

 #: modules/lib-bash/activation-init.sh:153
 msgid "Starting Home Manager activation"
-msgstr "Starte Home Manager Aktivierung"
+msgstr "Starte Home-Manager-Aktivierung"

 #: modules/lib-bash/activation-init.sh:157
 msgid "Sanity checking Nix"
--- a/modules/po/hi.po
+++ b/modules/po/hi.po
@ -0,0 +1,116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Home Manager contributors
+# This file is distributed under the same license as the Home Manager Modules package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Home Manager Modules\n"
+"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
+"POT-Creation-Date: 2024-04-17 23:19+0200\n"
+"PO-Revision-Date: 2024-10-09 14:31+0000\n"
+"Last-Translator: Utkarsh Sharma <utkasharma19@gmail.com>\n"
+"Language-Team: Hindi <https://hosted.weblate.org/projects/home-manager/"
+"modules/hi/>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.8-dev\n"
+
+#: modules/files.nix:191
+msgid "Creating home file links in %s"
+msgstr ""
+
+#: modules/files.nix:204
+msgid "Cleaning up orphan links from %s"
+msgstr "%s से ऑर्फे़न लिंक्स मिटाई जा रही है"
+
+#: modules/files.nix:220
+msgid "Creating profile generation %s"
+msgstr ""
+
+#: modules/files.nix:237
+msgid "No change so reusing latest profile generation %s"
+msgstr ""
+
+#: modules/home-environment.nix:634
+msgid ""
+"Oops, Nix failed to install your new Home Manager profile!\n"
+"\n"
+"Perhaps there is a conflict with a package that was installed using\n"
+"\"%s\"? Try running\n"
+"\n"
+"    %s\n"
+"\n"
+"and if there is a conflicting package you can remove it with\n"
+"\n"
+"    %s\n"
+"\n"
+"Then try activating your Home Manager configuration again."
+msgstr ""
+
+#: modules/home-environment.nix:667
+msgid "Activating %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:22
+msgid "Migrating profile from %s to %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:54
+msgid "Could not find suitable profile directory, tried %s and %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:83
+msgid "Sanity checking oldGenNum and oldGenPath"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:86
+msgid ""
+"The previous generation number and path are in conflict! These\n"
+"must be either both empty or both set but are now set to\n"
+"\n"
+"    '%s' and '%s'\n"
+"\n"
+"If you don't mind losing previous profile generations then\n"
+"the easiest solution is probably to run\n"
+"\n"
+"   rm %s/home-manager*\n"
+"   rm %s/current-home\n"
+"\n"
+"and trying home-manager switch again. Good luck!"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:127
+msgid "Error: USER is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:136
+msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:153
+msgid "Starting Home Manager activation"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:157
+msgid "Sanity checking Nix"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:170
+msgid "This is a dry run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:174
+msgid "This is a live run"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:180
+msgid "Using Nix version: %s"
+msgstr ""
+
+#: modules/lib-bash/activation-init.sh:183
+msgid "Activation variables:"
+msgstr ""
--- a/modules/po/hu.po
+++ b/modules/po/hu.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-08-23 14:09+0000\n"
-"Last-Translator: Szabin Hamrik <h.szabin@gmail.com>\n"
+"PO-Revision-Date: 2024-09-02 17:09+0000\n"
+"Last-Translator: Ferenci Ákos <synthetace@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
 "modules/hu/>\n"
 "Language: hu\n"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7.1-dev\n"
+"X-Generator: Weblate 5.8-dev\n"

 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@ -62,6 +62,7 @@ msgstr ""
 #: modules/lib-bash/activation-init.sh:54
 msgid "Could not find suitable profile directory, tried %s and %s"
 msgstr ""
+"Nem található megfelelő profil mappa, %s és %s útvonalak lettek kipróbálva."

 #: modules/lib-bash/activation-init.sh:83
 msgid "Sanity checking oldGenNum and oldGenPath"
@ -97,7 +98,7 @@ msgstr ""

 #: modules/lib-bash/activation-init.sh:157
 msgid "Sanity checking Nix"
-msgstr ""
+msgstr "Nix épségének ellenőrzése"

 #: modules/lib-bash/activation-init.sh:170
 msgid "This is a dry run"
--- a/modules/po/ro.po
+++ b/modules/po/ro.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2023-08-11 19:51+0000\n"
-"Last-Translator: HeartBlin913861820c094e37 <heartblin@proton.me>\n"
+"PO-Revision-Date: 2024-10-13 22:15+0000\n"
+"Last-Translator: AtomicDude <vasilescutoma4@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/home-manager/"
 "modules/ro/>\n"
 "Language: ro\n"
@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.8-dev\n"

 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@ -26,7 +26,7 @@ msgstr "Se creează legături ale fișierelor personale în %s"

 #: modules/files.nix:204
 msgid "Cleaning up orphan links from %s"
-msgstr "Se curăță legăturiile orfane din %s"
+msgstr "Se curăță legăturile orfane din %s"

 #: modules/files.nix:220
 msgid "Creating profile generation %s"
--- a/modules/programs/alacritty.nix
+++ b/modules/programs/alacritty.nix
@ -56,7 +56,7 @@ in {
          buildCommand = lib.concatStringsSep "\n" [
            prevAttrs.buildCommand
            # TODO: why is this needed? Is there a better way to retain escape sequences?
-            "substituteInPlace $out --replace '\\\\' '\\'"
+            "substituteInPlace $out --replace-quiet '\\\\' '\\'"
          ];
        });
    };
--- a/modules/programs/autorandr.nix
+++ b/modules/programs/autorandr.nix
@ -177,6 +177,18 @@ let
        default = null;
        example = "nearest";
      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        description = "Extra lines to append to this profile's config.";
+        default = "";
+        example = literalExpression ''
+          '''
+            x-prop-non_desktop 0
+            some-key some-value
+          '''
+        '';
+      };
    };
  };

@ -267,7 +279,8 @@ let
          + concatMapStringsSep "," toString (flatten config.transform))
        ++ optional (config.scale != null)
        ((if config.scale.method == "factor" then "scale" else "scale-from")
-          + " ${toString config.scale.x}x${toString config.scale.y}"))
+          + " ${toString config.scale.x}x${toString config.scale.y}")
+        ++ optional (config.extraConfig != "") config.extraConfig)
    else ''
      output ${name}
      off
--- a/modules/programs/bemenu.nix
+++ b/modules/programs/bemenu.nix
@ -7,7 +7,7 @@ let
  cfg = config.programs.bemenu;

 in {
-  meta.maintainers = [ hm.maintainers.omernaveedxyz ];
+  meta.maintainers = [ ];

  options.programs.bemenu = {
    enable = mkEnableOption "bemenu";
--- a/modules/programs/borgmatic.nix
+++ b/modules/programs/borgmatic.nix
@ -272,10 +272,7 @@ in {
  };

  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "programs.borgmatic" pkgs
-        lib.platforms.linux)
-    ] ++ (mapAttrsToList (backup: opts: {
+    assertions = (mapAttrsToList (backup: opts: {
      assertion = opts.location.sourceDirectories == null
        || opts.location.patterns == null;
      message = ''
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@ -15,7 +15,7 @@ let
      modal = mkEnableOption "modal (vim) mode";

      verbs = mkOption {
-        type = with types; listOf (attrsOf (either bool str));
+        type = with types; listOf (attrsOf (oneOf [ bool str (listOf str) ]));
        default = [ ];
        example = literalExpression ''
          [
@ -46,6 +46,9 @@ let
          `key` (optional)
          : a keyboard key triggering execution

+          `keys` (optional)
+          : multiple keyboard keys each triggering execution
+
          `shortcut` (optional)
          : an alternate way to call the verb (without
            the arguments part)
@ -54,7 +57,7 @@ let
          : whether to quit broot on execution
            (default: `true`)

-          `from_shell` (optional)</term>
+          `from_shell` (optional)
          : whether the verb must be executed from the
            parent shell (default: `false`)
        '';
--- a/modules/programs/cmus.nix
+++ b/modules/programs/cmus.nix
@ -0,0 +1,44 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.cmus;
+
+in {
+  meta.maintainers = [ hm.maintainers.joygnu ];
+
+  options.programs.cmus = {
+    enable = mkEnableOption "Enable cmus, the music player.";
+
+    theme = mkOption {
+      type = types.lines;
+      default = "";
+      example = "gruvbox";
+      description = ''
+        Select color theme. A list of available color themes can be found
+        here: <https://github.com/cmus/cmus/tree/master/data>.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        set audio_backend = "mpd"
+        set status_display = "default"
+      '';
+      description = "Extra configuration to add to cmus {file}`rc`.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.cmus ];
+
+    home.file.".config/cmus/rc".text = ''
+      ${optionalString (cfg.theme != "") "colorscheme ${cfg.theme}"}
+      ${cfg.extraConfig}
+    '';
+  };
+}
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@ -19,7 +19,7 @@ in {
      "Flake support is now always enabled.")
  ];

-  meta.maintainers = [ lib.maintainers.rycee ];
+  meta.maintainers = [ lib.maintainers.rycee lib.maintainers.shikanime ];

  options.programs.direnv = {
    enable = mkEnableOption "direnv, the environment switcher";
@ -95,6 +95,14 @@ in {
      package = mkPackageOption pkgs "nix-direnv" { };
    };

+    mise = {
+      enable = mkEnableOption ''
+        [mise](https://mise.jdx.dev/direnv.html),
+        integration of use_mise for direnv'';
+
+      package = mkPackageOption pkgs "mise" { };
+    };
+
    silent = mkEnableOption "silent mode, that is, disabling direnv logging";
  };

@ -112,6 +120,12 @@ in {
    xdg.configFile."direnv/direnvrc" =
      lib.mkIf (cfg.stdlib != "") { text = cfg.stdlib; };

+    xdg.configFile."direnv/lib/hm-mise.sh" = mkIf cfg.mise.enable {
+      text = ''
+        eval "$(${getExe cfg.mise.package} direnv activate)"
+      '';
+    };
+
    programs.bash.initExtra = mkIf cfg.enableBashIntegration (
      # Using mkAfter to make it more likely to appear after other
      # manipulations of the prompt.
@ -130,40 +144,33 @@ in {
        ${getExe cfg.package} hook fish | source
      '');

-    programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration (
-      # Using mkAfter to make it more likely to appear after other
-      # manipulations of the prompt.
-      mkAfter ''
-        $env.config = ($env.config? | default {})
-        $env.config.hooks = ($env.config.hooks? | default {})
-        $env.config.hooks.pre_prompt = (
-            $env.config.hooks.pre_prompt?
-            | default []
-            | append {||
-                let direnv = (${getExe cfg.package} export json
-                | from json
-                | default {})
-                if ($direnv | is-empty) {
-                    return
-                }
-                $direnv
-                | items {|key, value|
-                    {
-                        key: $key
-                        value: (do (
-                            $env.ENV_CONVERSIONS?
-                            | default {}
-                            | get -i $key
-                            | get -i from_string
-                            | default {|x| $x}
-                        ) $value)
-                    }
-                }
-                | transpose -ird
-                | load-env
-            }
-        )
-      '');
+    # Using mkAfter to make it more likely to appear after other
+    # manipulations of the prompt.
+    programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration (mkAfter ''
+      $env.config = ($env.config? | default {})
+      $env.config.hooks = ($env.config.hooks? | default {})
+      $env.config.hooks.pre_prompt = (
+          $env.config.hooks.pre_prompt?
+          | default []
+          | append {||
+              ${getExe cfg.package} export json
+              | from json --strict
+              | default {}
+              | items {|key, value|
+                  let value = do (
+                      $env.ENV_CONVERSIONS?
+                      | default {}
+                      | get -i $key
+                      | get -i from_string
+                      | default {|x| $x}
+                  ) $value
+                  return [ $key $value ]
+              }
+              | into record
+              | load-env
+          }
+      )
+    '');

    home.sessionVariables = lib.mkIf cfg.silent { DIRENV_LOG_FORMAT = ""; };
  };
--- a/modules/programs/eza.nix
+++ b/modules/programs/eza.nix
@ -49,10 +49,21 @@ with lib;
    };

    icons = mkOption {
-      type = types.bool;
-      default = false;
+      type = types.enum [ null true false "auto" "always" "never" ];
+      default = null;
      description = ''
        Display icons next to file names ({option}`--icons` argument).
+
+        Note, the support for Boolean values is deprecated.
+        Setting this option to `true` corresponds to `--icons=auto`.
+      '';
+    };
+
+    colors = mkOption {
+      type = types.enum [ null "auto" "always" "never" ];
+      default = null;
+      description = ''
+        Use terminal colors in output ({option}`--color` argument).
      '';
    };

@ -70,7 +81,15 @@ with lib;
  config = let
    cfg = config.programs.eza;

-    args = escapeShellArgs (optional cfg.icons "--icons"
+    iconsOption = let
+      v = if isBool cfg.icons then
+        (if cfg.icons then "auto" else null)
+      else
+        cfg.icons;
+    in optionals (v != null) [ "--icons" v ];
+
+    args = escapeShellArgs (iconsOption
+      ++ optionals (cfg.colors != null) [ "--color" cfg.colors ]
      ++ optional cfg.git "--git" ++ cfg.extraOptions);

    optionsAlias = optionalAttrs (args != "") { eza = "eza ${args}"; };
@ -83,6 +102,12 @@ with lib;
      lla = "eza -la";
    };
  in mkIf cfg.enable {
+    warnings = optional (isBool cfg.icons) ''
+      Setting programs.eza.icons to a Boolean is deprecated.
+      Please update your configuration so that
+
+        programs.eza.icons = ${if cfg.icons then ''"auto"'' else "null"}'';
+
    home.packages = [ cfg.package ];

    programs.bash.shellAliases = optionsAlias
@ -91,8 +116,17 @@ with lib;
    programs.zsh.shellAliases = optionsAlias
      // optionalAttrs cfg.enableZshIntegration aliases;

-    programs.fish.shellAliases = optionsAlias
-      // optionalAttrs cfg.enableFishIntegration aliases;
+    programs.fish = mkMerge [
+      (mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = optionsAlias
+          // optionalAttrs cfg.enableFishIntegration aliases;
+      })
+
+      (mkIf config.programs.fish.preferAbbrs {
+        shellAliases = optionsAlias;
+        shellAbbrs = optionalAttrs cfg.enableFishIntegration aliases;
+      })
+    ];

    programs.ion.shellAliases = optionsAlias
      // optionalAttrs cfg.enableIonIntegration aliases;
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@ -11,8 +11,7 @@ let
  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;

 in {
-  meta.maintainers =
-    [ maintainers.rycee maintainers.kira-bruneau hm.maintainers.bricked ];
+  meta.maintainers = [ maintainers.rycee hm.maintainers.bricked ];

  imports = [
    (mkFirefoxModule {
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@ -61,7 +61,8 @@ let
    }) // {
      General = {
        StartWithLastProfile = 1;
-        Version = 2;
+      } // lib.optionalAttrs (cfg.profileVersion != null) {
+        Version = cfg.profileVersion;
      };
    };

@ -100,9 +101,10 @@ let
      };
    in ''
      ${builtins.toJSON {
-        version = 4;
+        version = 5;
        lastUserContextId =
-          elemAt (mapAttrsToList (_: container: container.id) containers) 0;
+          foldlAttrs (acc: _: value: if value.id > acc then value.id else acc) 0
+          containers;
        identities = mapAttrsToList containerToIdentity containers ++ [
          {
            userContextId = 4294967294; # 2^32 - 2
@ -329,7 +331,7 @@ in {
      description = "Resulting ${cfg.name} package.";
    };

-    policies = optionalAttrs (unwrappedPackageName != null) (mkOption {
+    policies = optionalAttrs (wrappedPackageName != null) (mkOption {
      inherit visible;
      type = types.attrsOf jsonFormat.type;
      default = { };
@ -341,6 +343,13 @@ in {
      };
    });

+    profileVersion = mkOption {
+      internal = true;
+      type = types.nullOr types.ints.unsigned;
+      default = if isDarwin then null else 2;
+      description = "profile version, set null for nix-darwin";
+    };
+
    profiles = mkOption {
      inherit visible;
      type = types.attrsOf (types.submodule ({ config, name, ... }: {
@ -538,93 +547,17 @@ in {
            description = "Whether this is a default profile.";
          };

-          search = {
-            force = mkOption {
-              type = with types; bool;
-              default = false;
-              description = ''
-                Whether to force replace the existing search
-                configuration. This is recommended since ${name} will
-                replace the symlink for the search configuration on every
-                launch, but note that you'll lose any existing
-                configuration by enabling this.
-              '';
-            };
-
-            default = mkOption {
-              type = with types; nullOr str;
-              default = null;
-              example = "DuckDuckGo";
-              description = ''
-                The default search engine used in the address bar and search bar.
-              '';
-            };
-
-            privateDefault = mkOption {
-              type = with types; nullOr str;
-              default = null;
-              example = "DuckDuckGo";
-              description = ''
-                The default search engine used in the Private Browsing.
-              '';
-            };
-
-            order = mkOption {
-              type = with types; uniq (listOf str);
-              default = [ ];
-              example = [ "DuckDuckGo" "Google" ];
-              description = ''
-                The order the search engines are listed in. Any engines
-                that aren't included in this list will be listed after
-                these in an unspecified order.
-              '';
-            };
-
-            engines = mkOption {
-              type = with types; attrsOf (attrsOf jsonFormat.type);
-              default = { };
-              example = literalExpression ''
-                {
-                  "Nix Packages" = {
-                    urls = [{
-                      template = "https://search.nixos.org/packages";
-                      params = [
-                        { name = "type"; value = "packages"; }
-                        { name = "query"; value = "{searchTerms}"; }
-                      ];
-                    }];
-
-                    icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                    definedAliases = [ "@np" ];
-                  };
-
-                  "NixOS Wiki" = {
-                    urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }];
-                    iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-                    updateInterval = 24 * 60 * 60 * 1000; # every day
-                    definedAliases = [ "@nw" ];
-                  };
-
-                  "Bing".metaData.hidden = true;
-                  "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
-                }
-              '';
-              description = ''
-                Attribute set of search engine configurations. Engines
-                that only have {var}`metaData` specified will
-                be treated as builtin to ${name}.
-
-                See [SearchEngine.jsm](https://searchfox.org/mozilla-central/rev/669329e284f8e8e2bb28090617192ca9b4ef3380/toolkit/components/search/SearchEngine.jsm#1138-1177)
-                in Firefox's source for available options. We maintain a
-                mapping to let you specify all options in the referenced
-                link without underscores, but it may fall out of date with
-                future options.
-
-                Note, {var}`icon` is also a special option
-                added by Home Manager to make it convenient to specify
-                absolute icon paths.
-              '';
-            };
+          search = mkOption {
+            type = types.submodule (args:
+              import ./profiles/search.nix {
+                inherit (args) config;
+                inherit lib pkgs;
+                appName = cfg.name;
+                modulePath = modulePath ++ [ "profiles" name "search" ];
+                profilePath = config.path;
+              });
+            default = { };
+            description = "Declarative search engine configuration.";
          };

          containersForce = mkOption {
@ -812,15 +745,6 @@ in {
      its example for how to do this.
    '';

-    programs.firefox.policies = {
-      ExtensionSettings = listToAttrs (map (lang:
-        nameValuePair "langpack-${lang}@firefox.mozilla.org" {
-          installation_mode = "normal_installed";
-          install_url =
-            "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi";
-        }) cfg.languagePacks);
-    };
-
    home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;

    home.file = mkMerge ([{
@ -853,152 +777,12 @@ in {
          force = profile.containersForce;
        };

-      "${profilesPath}/${profile.path}/search.json.mozlz4" = mkIf
-        (profile.search.default != null || profile.search.privateDefault != null
-          || profile.search.order != [ ] || profile.search.engines != { }) {
-            force = profile.search.force;
-            source = let
-              settings = {
-                version = 6;
-                engines = let
-                  # Map of nice field names to internal field names.
-                  # This is intended to be exhaustive and should be
-                  # updated at every version bump.
-                  internalFieldNames = (genAttrs [
-                    "name"
-                    "isAppProvided"
-                    "loadPath"
-                    "hasPreferredIcon"
-                    "updateInterval"
-                    "updateURL"
-                    "iconUpdateURL"
-                    "iconURL"
-                    "iconMapObj"
-                    "metaData"
-                    "orderHint"
-                    "definedAliases"
-                    "urls"
-                  ] (name: "_${name}")) // {
-                    searchForm = "__searchForm";
-                  };
-
-                  processCustomEngineInput = input:
-                    (removeAttrs input [ "icon" ])
-                    // optionalAttrs (input ? icon) {
-                      # Convenience to specify absolute path to icon
-                      iconURL = "file://${input.icon}";
-                    } // (optionalAttrs (input ? iconUpdateURL) {
-                      # Convenience to default iconURL to iconUpdateURL so
-                      # the icon is immediately downloaded from the URL
-                      iconURL = input.iconURL or input.iconUpdateURL;
-                    } // {
-                      # Required for custom engine configurations, loadPaths
-                      # are unique identifiers that are generally formatted
-                      # like: [source]/path/to/engine.xml
-                      loadPath = ''
-                        [home-manager]/${moduleName}.profiles.${profile.name}.search.engines."${
-                          replaceStrings [ "\\" ] [ "\\\\" ] input.name
-                        }"'';
-                    });
-
-                  processEngineInput = name: input:
-                    let
-                      requiredInput = {
-                        inherit name;
-                        isAppProvided = input.isAppProvided or removeAttrs input
-                          [ "metaData" ] == { };
-                        metaData = input.metaData or { };
-                      };
-                    in if requiredInput.isAppProvided then
-                      requiredInput
-                    else
-                      processCustomEngineInput (input // requiredInput);
-
-                  buildEngineConfig = name: input:
-                    mapAttrs' (name: value: {
-                      name = internalFieldNames.${name} or name;
-                      inherit value;
-                    }) (processEngineInput name input);
-
-                  sortEngineConfigs = configs:
-                    let
-                      buildEngineConfigWithOrder = order: name:
-                        let
-                          config = configs.${name} or {
-                            _name = name;
-                            _isAppProvided = true;
-                            _metaData = { };
-                          };
-                        in config // {
-                          _metaData = config._metaData // { inherit order; };
-                        };
-
-                      engineConfigsWithoutOrder =
-                        attrValues (removeAttrs configs profile.search.order);
-
-                      sortedEngineConfigs =
-                        (imap buildEngineConfigWithOrder profile.search.order)
-                        ++ engineConfigsWithoutOrder;
-                    in sortedEngineConfigs;
-
-                  engineInput = profile.search.engines // {
-                    # Infer profile.search.default as an app provided
-                    # engine if it's not in profile.search.engines
-                    ${profile.search.default} =
-                      profile.search.engines.${profile.search.default} or { };
-                  } // {
-                    ${profile.search.privateDefault} =
-                      profile.search.engines.${profile.search.privateDefault} or { };
-                  };
-                in sortEngineConfigs (mapAttrs buildEngineConfig engineInput);
-
-                metaData = optionalAttrs (profile.search.default != null) {
-                  current = profile.search.default;
-                  hash = "@hash@";
-                } // optionalAttrs (profile.search.privateDefault != null) {
-                  private = profile.search.privateDefault;
-                  privateHash = "@privateHash@";
-                } // {
-                  useSavedOrder = profile.search.order != [ ];
-                };
-              };
-
-              # Home Manager doesn't circumvent user consent and isn't acting
-              # maliciously. We're modifying the search outside of the browser, but
-              # a claim by Mozilla to remove this would be very anti-user, and
-              # is unlikely to be an issue for our use case.
-              disclaimer = appName:
-                "By modifying this file, I agree that I am doing so "
-                + "only within ${appName} itself, using official, user-driven search "
-                + "engine selection processes, and in a way which does not circumvent "
-                + "user consent. I acknowledge that any attempt to change this file "
-                + "from outside of ${appName} is a malicious act, and will be responded "
-                + "to accordingly.";
-
-              salt = if profile.search.default != null then
-                profile.path + profile.search.default + disclaimer cfg.name
-              else
-                null;
-
-              privateSalt = if profile.search.privateDefault != null then
-                profile.path + profile.search.privateDefault
-                + disclaimer cfg.name
-              else
-                null;
-            in pkgs.runCommand "search.json.mozlz4" {
-              nativeBuildInputs = with pkgs; [ mozlz4a openssl ];
-              json = builtins.toJSON settings;
-              inherit salt privateSalt;
-            } ''
-              if [[ -n $salt ]]; then
-                export hash=$(echo -n "$salt" | openssl dgst -sha256 -binary | base64)
-                export privateHash=$(echo -n "$privateSalt" | openssl dgst -sha256 -binary | base64)
-                mozlz4a <(substituteStream json search.json.in --subst-var hash --subst-var privateHash) "$out"
-              else
-                mozlz4a <(echo "$json") "$out"
-              fi
-            '';
-          };
+      "${profilesPath}/${profile.path}/search.json.mozlz4" =
+        mkIf (profile.search.enable) {
+          enable = profile.search.enable;
+          force = profile.search.force;
+          source = profile.search.file;
+        };

      "${profilesPath}/${profile.path}/extensions" =
        mkIf (profile.extensions != [ ]) {
@ -1012,6 +796,16 @@ in {
          force = true;
        };
    }));
-  } // setAttrByPath modulePath { finalPackage = wrapPackage cfg.package; });
-}
+  } // setAttrByPath modulePath {
+    finalPackage = wrapPackage cfg.package;

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

+      generateCompletions = mkEnableOption
+        "the automatic generation of completions based upon installed man pages"
+        // {
+          default = true;
+        };
+
      shellAliases = mkOption {
        type = with types; attrsOf str;
        default = { };
@ -288,6 +294,16 @@ in {
        '';
      };

+      preferAbbrs = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          If enabled, abbreviations will be preferred over aliases when
+          other modules define aliases for fish.
+        '';
+      };
+
      shellInit = mkOption {
        type = types.lines;
        default = "";
@ -380,9 +396,9 @@ in {
  };

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

+    (mkIf cfg.generateCompletions {
      # Support completion for `man` by building a cache for `apropos`.
      programs.man.generateCaches = mkDefault true;

@ -446,7 +462,9 @@ in {
          set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
        end
      '';
+    })

+    {
      xdg.configFile."fish/config.fish".source = fishIndent "config.fish" ''
        # ~/.config/fish/config.fish: DO NOT EDIT -- this file has been generated
        # automatically by home-manager.
--- a/modules/programs/floorp.nix
+++ b/modules/programs/floorp.nix
@ -0,0 +1,29 @@
+{ lib, ... }:
+
+with lib;
+
+let
+
+  modulePath = [ "programs" "floorp" ];
+
+  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+
+in {
+  meta.maintainers = [ hm.maintainers.bricked ];
+
+  imports = [
+    (mkFirefoxModule {
+      inherit modulePath;
+      name = "Floorp";
+      wrappedPackageName = "floorp";
+      unwrappedPackageName = "floorp-unwrapped";
+      visible = true;
+
+      platforms.linux = {
+        configPath = ".floorp";
+        vendorPath = ".floorp";
+      };
+      platforms.darwin = { configPath = "Library/Application Support/Floorp"; };
+    })
+  ];
+}
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@ -12,13 +12,27 @@ in {
      enable = lib.mkEnableOption "Git authentication handler for OAuth";

      package = lib.mkPackageOption pkgs "git-credential-oauth" { };
+
+      extraFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        example = lib.literalExpression ''[ "-device" ]'';
+        description = ''
+          Extra command-line arguments passed to git-credential-oauth.
+
+          For valid arguments, see {manpage}`git-credential-oauth(1)`.
+        '';
+      };
    };
  };

  config = lib.mkIf cfg.enable {
    home.packages = [ cfg.package ];

-    programs.git.extraConfig.credential.helper =
-      [ "${cfg.package}/bin/git-credential-oauth" ];
+    programs.git.extraConfig.credential.helper = lib.mkAfter [
+      ("${cfg.package}/bin/git-credential-oauth"
+        + lib.optionalString (cfg.extraFlags != [ ])
+        " ${lib.strings.concatStringsSep " " cfg.extraFlags}")
+    ];
  };
 }
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@ -214,6 +214,59 @@ in {
        };
      };

+      maintenance = {
+        enable = mkEnableOption "" // {
+          description = ''
+            Enable the automatic {command}`git maintenance`.
+
+            See <https://git-scm.com/docs/git-maintenance>.
+          '';
+        };
+
+        repositories = mkOption {
+          type = with types; listOf str;
+          default = [ ];
+          description = ''
+            Repositories on which {command}`git maintenance` should run.
+
+            Should be a list of absolute paths.
+          '';
+        };
+
+        timers = mkOption {
+          type = types.attrsOf types.str;
+          default = {
+            hourly = "*-*-* 1..23:53:00";
+            daily = "Tue..Sun *-*-* 0:53:00";
+            weekly = "Mon 0:53:00";
+          };
+          description = ''
+            Systemd timers to create for scheduled {command}`git maintenance`.
+
+            Key is passed to `--schedule` argument in {command}`git maintenance run`
+            and value is passed to `Timer.OnCalendar` in `systemd.user.timers`.
+          '';
+        };
+      };
+
+      diff-highlight = {
+        enable = mkEnableOption "" // {
+          description = ''
+            Enable the contrib {command}`diff-highlight` syntax highlighter.
+            See <https://github.com/git/git/blob/master/contrib/diff-highlight/README>,
+          '';
+        };
+
+        pagerOpts = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          example = [ "--tabs=4" "-RFX" ];
+          description = ''
+            Arguments to be passed to {command}`less`.
+          '';
+        };
+      };
+
      difftastic = {
        enable = mkEnableOption "" // {
          description = ''
@ -222,6 +275,8 @@ in {
          '';
        };

+        package = mkPackageOption pkgs "difftastic" { };
+
        background = mkOption {
          type = types.enum [ "light" "dark" ];
          default = "light";
@ -358,11 +413,15 @@ in {
      home.packages = [ cfg.package ];
      assertions = [{
        assertion = let
-          enabled =
-            [ cfg.delta.enable cfg.diff-so-fancy.enable cfg.difftastic.enable ];
+          enabled = [
+            cfg.delta.enable
+            cfg.diff-so-fancy.enable
+            cfg.difftastic.enable
+            cfg.diff-highlight.enable
+          ];
        in count id enabled <= 1;
        message =
-          "Only one of 'programs.git.delta.enable' or 'programs.git.difftastic.enable' or 'programs.git.diff-so-fancy.enable' can be set to true at the same time.";
+          "Only one of 'programs.git.delta.enable' or 'programs.git.difftastic.enable' or 'programs.git.diff-so-fancy.enable' or 'programs.git.diff-highlight' can be set to true at the same time.";
      }];

      programs.git.iniContent.user = {
@ -477,12 +536,66 @@ in {
        };
    })

+    (mkIf cfg.maintenance.enable {
+      programs.git.iniContent.maintenance.repo = cfg.maintenance.repositories;
+
+      systemd.user.services."git-maintenance@" = {
+        Unit = {
+          Description = "Optimize Git repositories data";
+          Documentation = [ "man:git-maintenance(1)" ];
+        };
+
+        Service = {
+          Type = "oneshot";
+          ExecStart = let exe = lib.getExe cfg.package;
+          in ''
+            "${exe}" --exec-path="${exe}" for-each-repo --config=maintenance.repo maintenance run --schedule=%i
+          '';
+          LockPersonality = "yes";
+          MemoryDenyWriteExecute = "yes";
+          NoNewPrivileges = "yes";
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_VSOCK";
+          RestrictNamespaces = "yes";
+          RestrictRealtime = "yes";
+          RestrictSUIDSGID = "yes";
+          SystemCallArchitectures = "native";
+          SystemCallFilter = "@system-service";
+        };
+      };
+
+      systemd.user.timers = let
+        toSystemdTimer = name: time:
+          lib.attrsets.nameValuePair "git-maintenance@${name}" {
+            Unit.Description = "Optimize Git repositories data";
+
+            Timer = {
+              OnCalendar = time;
+              Persistent = true;
+            };
+
+            Install.WantedBy = [ "timers.target" ];
+          };
+      in lib.attrsets.mapAttrs' toSystemdTimer cfg.maintenance.timers;
+    })
+
+    (mkIf cfg.diff-highlight.enable {
+      programs.git.iniContent = let
+        dhCommand =
+          "${cfg.package}/share/git/contrib/diff-highlight/diff-highlight";
+      in {
+        core.pager = "${dhCommand} | ${getExe pkgs.less} ${
+            escapeShellArgs cfg.diff-highlight.pagerOpts
+          }";
+        interactive.diffFilter = dhCommand;
+      };
+    })
+
    (mkIf cfg.difftastic.enable {
-      home.packages = [ pkgs.difftastic ];
+      home.packages = [ cfg.difftastic.package ];

      programs.git.iniContent = let
        difftCommand = concatStringsSep " " [
-          "${pkgs.difftastic}/bin/difft"
+          "${getExe cfg.difftastic.package}"
          "--color ${cfg.difftastic.color}"
          "--background ${cfg.difftastic.background}"
          "--display ${cfg.difftastic.display}"
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@ -28,7 +28,7 @@ in {
    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
      function assume() {
        export GRANTED_ALIAS_CONFIGURED="true"
-        source ${package}/bin/.assume-wrapped "$@"
+        source ${package}/bin/assume "$@"
        unset GRANTED_ALIAS_CONFIGURED
      }
    '';
--- a/modules/programs/helix.nix
+++ b/modules/programs/helix.nix
@ -15,6 +15,7 @@ in {
      type = types.package;
      default = pkgs.helix;
      defaultText = literalExpression "pkgs.helix";
+      example = literalExpression "pkgs.evil-helix";
      description = "The package to use for helix.";
    };

@ -75,7 +76,6 @@ in {
      default = { };
      example = literalExpression ''
        {
-          # the language-server option currently requires helix from the master branch at https://github.com/helix-editor/helix/
          language-server.typescript-language-server = with pkgs.nodePackages; {
            command = "''${typescript-language-server}/bin/typescript-language-server";
            args = [ "--stdio" "--tsserver-path=''${typescript}/lib/node_modules/typescript/lib" ];
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@ -113,7 +113,8 @@ in {
    enable = mkEnableOption "htop";

    settings = mkOption {
-      type = types.attrs;
+      type = with types;
+        attrsOf (oneOf [ bool int str (listOf (oneOf [ int str ])) ]);
      default = { };
      example = literalExpression ''
        {
--- a/modules/programs/k9s.nix
+++ b/modules/programs/k9s.nix
@ -9,11 +9,7 @@ let
  inherit (pkgs.stdenv.hostPlatform) isDarwin;

 in {
-  meta.maintainers = with maintainers; [
-    katexochen
-    liyangau
-    hm.maintainers.LucasWagler
-  ];
+  meta.maintainers = with maintainers; [ liyangau hm.maintainers.LucasWagler ];

  imports = [
    (mkRenamedOptionModule [ "programs" "k9s" "skin" ] [
@ -46,7 +42,7 @@ in {
    };

    skins = mkOption {
-      type = types.attrsOf yamlFormat.type;
+      type = with types; attrsOf (either yamlFormat.type path);
      default = { };
      description = ''
        Skin files written to {file}`$XDG_CONFIG_HOME/k9s/skins/` (linux)
@ -54,13 +50,16 @@ in {
        <https://k9scli.io/topics/skins/> for supported values.
      '';
      example = literalExpression ''
-        my_blue_skin = {
-          k9s = {
-            body = {
-              fgColor = "dodgerblue";
+        {
+          my_blue_skin = {
+            k9s = {
+              body = {
+                fgColor = "dodgerblue";
+              };
            };
          };
-        };
+          my_red_skin = ./red_skin.yaml;
+        }
      '';
    };

@ -174,7 +173,10 @@ in {
        "k9s/skins/${name}.yaml"
      else
        "Library/Application Support/k9s/skins/${name}.yaml") {
-          source = yamlFormat.generate "k9s-skin-${name}.yaml" value;
+          source = if lib.types.path.check value then
+            value
+          else
+            yamlFormat.generate "k9s-skin-${name}.yaml" value;
        }) cfg.skins;

    enableXdgConfig = !isDarwin || config.xdg.enable;
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@ -3,10 +3,9 @@
 with lib;

 let
-
  cfg = config.programs.kitty;

-  eitherStrBoolInt = with types; either str (either bool int);
+  settingsValueType = with types; oneOf [ str bool int float ];

  optionalPackage = opt:
    optional (opt != null && opt.package != null) opt.package;
@ -57,6 +56,26 @@ let
    '';
  };
 in {
+  imports = [
+    (mkChangedOptionModule [ "programs" "kitty" "theme" ] [
+      "programs"
+      "kitty"
+      "themeFile"
+    ] (config:
+      let value = getAttrFromPath [ "programs" "kitty" "theme" ] config;
+      in if value != null then
+        (let
+          matching = filter (x: x.name == value) (builtins.fromJSON
+            (builtins.readFile
+              "${pkgs.kitty-themes}/share/kitty-themes/themes.json"));
+        in throwIf (length matching == 0)
+        "kitty-themes does not contain a theme named ${value}"
+        strings.removeSuffix ".conf"
+        (strings.removePrefix "themes/" (head matching).file))
+      else
+        null))
+  ];
+
  options.programs.kitty = {
    enable = mkEnableOption "Kitty terminal emulator";

@ -83,7 +102,7 @@ in {
    };

    settings = mkOption {
-      type = types.attrsOf eitherStrBoolInt;
+      type = types.attrsOf settingsValueType;
      default = { };
      example = literalExpression ''
        {
@ -100,16 +119,16 @@ in {
      '';
    };

-    theme = mkOption {
+    themeFile = mkOption {
      type = types.nullOr types.str;
      default = null;
      description = ''
-        Apply a Kitty color theme. This option takes the friendly name of
-        any theme given by the command {command}`kitty +kitten themes`.
-        See <https://github.com/kovidgoyal/kitty-themes>
-        for more details.
+        Apply a Kitty color theme. This option takes the file name of a theme
+        in `kitty-themes`, without the `.conf` suffix. See
+        <https://github.com/kovidgoyal/kitty-themes/tree/master/themes> for a
+        list of themes.
      '';
-      example = "Space Gray Eighties";
+      example = "SpaceGray_Eighties";
    };

    font = mkOption {
@ -146,11 +165,11 @@ in {
        type = types.str;
        default = "no-rc";
        example = "no-cursor";
-        apply = (o:
+        apply = o:
          let
            modes = splitString " " o;
            filtered = filter (m: m != "no-rc") modes;
-          in concatStringsSep " " (concatLists [ [ "no-rc" ] filtered ]));
+          in concatStringsSep " " (concatLists [ [ "no-rc" ] filtered ]);
        description = ''
          Set the mode of the shell integration. This accepts the same options
          as the `shell_integration` option of Kitty. Note that
@ -184,24 +203,15 @@ in {
      text = ''
        # Generated by Home Manager.
        # See https://sw.kovidgoyal.net/kitty/conf.html
-      '' + concatStringsSep "\n" ([
-
+      '' + concatStringsSep "\n" [
        (optionalString (cfg.font != null) ''
          font_family ${cfg.font.name}
          ${optionalString (cfg.font.size != null)
          "font_size ${toString cfg.font.size}"}
        '')

-        (optionalString (cfg.theme != null) ''
-          include ${pkgs.kitty-themes}/share/kitty-themes/${
-            let
-              matching = filter (x: x.name == cfg.theme) (builtins.fromJSON
-                (builtins.readFile
-                  "${pkgs.kitty-themes}/share/kitty-themes/themes.json"));
-            in throwIf (length matching == 0)
-            "kitty-themes does not contain a theme named ${cfg.theme}"
-            (head matching).file
-          }
+        (optionalString (cfg.themeFile != null) ''
+          include ${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf
        '')
        ''
          # Shell integration is sourced and configured manually
@ -211,13 +221,23 @@ in {
        (toKittyKeybindings cfg.keybindings)
        (toKittyEnv cfg.environment)
        cfg.extraConfig
-      ]);
+      ];
    } // optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
      onChange = ''
        ${pkgs.procps}/bin/pkill -USR1 -u $USER kitty || true
      '';
    };

+    home.activation.checkKittyTheme = mkIf (cfg.themeFile != null) (let
+      themePath =
+        "${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf";
+    in hm.dag.entryBefore [ "writeBoundary" ] ''
+      if [[ ! -f "${themePath}" ]]; then
+        errorEcho "kitty-themes does not contain the theme file ${themePath}!"
+        exit 1
+      fi
+    '');
+
    xdg.configFile."kitty/macos-launch-services-cmdline" = mkIf
      (cfg.darwinLaunchOptions != null && pkgs.stdenv.hostPlatform.isDarwin) {
        text = concatStringsSep " " cfg.darwinLaunchOptions;
--- a/modules/programs/lsd.nix
+++ b/modules/programs/lsd.nix
@ -74,7 +74,15 @@ in {

    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;

-    programs.fish.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.fish = mkMerge [
+      (mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = mkIf cfg.enableAliases aliases;
+      })
+
+      (mkIf config.programs.fish.preferAbbrs {
+        shellAbbrs = mkIf cfg.enableAliases aliases;
+      })
+    ];

    programs.lsd =
      mkIf (cfg.colors != { }) { settings.color.theme = "custom"; };
--- a/modules/programs/neovide.nix
+++ b/modules/programs/neovide.nix
@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  cfg = config.programs.neovide;
+  settingsFormat = pkgs.formats.toml { };
+
+in {
+  meta.maintainers = [ lib.hm.maintainers.NitroSniper ];
+
+  options.programs.neovide = {
+    enable = lib.mkEnableOption "Neovide, No Nonsense Neovim Client in Rust";
+
+    package = lib.mkPackageOption pkgs "neovide" { };
+
+    settings = lib.mkOption {
+      type = settingsFormat.type;
+      example = lib.literalExpression ''
+        {
+          fork = false;
+          frame = "full";
+          idle = true;
+          maximized = false;
+          neovim-bin = "/usr/bin/nvim";
+          no-multigrid = false;
+          srgb = false;
+          tabs = true;
+          theme = "auto";
+          title-hidden = true;
+          vsync = true;
+          wsl = false;
+
+          font = {
+            normal = [];
+            size = 14.0;
+          };
+        }
+      '';
+      description = ''
+        Neovide configuration.
+        For available settings see <https://neovide.dev/config-file.html>.
+        For any option not found will need to be done in your neovim's config instead.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+    xdg.configFile."neovide/config.toml".source =
+      settingsFormat.generate "config.toml" cfg.settings;
+  };
+}
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@ -398,6 +398,13 @@ in {
      customRC = cfg.extraConfig;
    };

+    wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package (neovimConfig // {
+      wrapperArgs =
+        (lib.escapeShellArgs (neovimConfig.wrapperArgs ++ cfg.extraWrapperArgs))
+        + " " + extraMakeWrapperArgs + " " + extraMakeWrapperLuaCArgs + " "
+        + extraMakeWrapperLuaArgs;
+      wrapRc = false;
+    });
  in mkIf cfg.enable {

    programs.neovim.generatedConfigViml = neovimConfig.neovimRcContent;
@ -414,17 +421,18 @@ in {

    home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };

+    home.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
+
    xdg.configFile =
      let hasLuaConfig = hasAttr "lua" config.programs.neovim.generatedConfigs;
      in mkMerge (
        # writes runtime
        (map (x: x.runtime) pluginsNormalized) ++ [{
          "nvim/init.lua" = let
-            luaRcContent =
-              lib.optionalString (neovimConfig.neovimRcContent != "")
+            luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "")
              "vim.cmd [[source ${
                pkgs.writeText "nvim-init-home-manager.vim"
-                neovimConfig.neovimRcContent
+                wrappedNeovim'.initRc
              }]]" + config.programs.neovim.extraLuaConfig
              + lib.optionalString hasLuaConfig
              config.programs.neovim.generatedConfigs.lua;
@ -435,17 +443,6 @@ in {
          };
        }]);

-    programs.neovim.finalPackage = pkgs.wrapNeovimUnstable cfg.package
-      (neovimConfig // {
-        wrapperArgs = (lib.escapeShellArgs
-          (neovimConfig.wrapperArgs ++ cfg.extraWrapperArgs)) + " "
-          + extraMakeWrapperArgs + " " + extraMakeWrapperLuaCArgs + " "
-          + extraMakeWrapperLuaArgs;
-        wrapRc = false;
-      });
-
-    programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-    programs.fish.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-    programs.zsh.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
+    programs.neovim.finalPackage = wrappedNeovim';
  };
 }
--- a/modules/programs/nh.nix
+++ b/modules/programs/nh.nix
@ -0,0 +1,94 @@
+{ config, osConfig, lib, pkgs, ... }:
+
+let
+
+  cfg = config.programs.nh;
+
+in {
+  meta.maintainers = with lib.maintainers; [ johnrtitor ];
+
+  options.programs.nh = {
+    enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
+
+    package = lib.mkPackageOption pkgs "nh" { };
+
+    flake = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        The path that will be used for the {env}`FLAKE` environment variable.
+
+        {env}`FLAKE` is used by nh as the default flake for performing actions,
+        like {command}`nh os switch`.
+      '';
+    };
+
+    clean = {
+      enable = lib.mkEnableOption ''
+        periodic garbage collection for user profile and nix store with nh clean
+        user'';
+
+      dates = lib.mkOption {
+        type = lib.types.singleLineStr;
+        default = "weekly";
+        description = ''
+          How often cleanup is performed.
+
+          The format is described in {manpage}`systemd.time(7)`.
+        '';
+      };
+
+      extraArgs = lib.mkOption {
+        type = lib.types.singleLineStr;
+        default = "";
+        example = "--keep 5 --keep-since 3d";
+        description = ''
+          Options given to nh clean when the service is run automatically.
+
+          See `nh clean all --help` for more information.
+        '';
+      };
+    };
+  };
+
+  config = {
+    warnings = lib.optionals (!(cfg.clean.enable -> !osConfig.nix.gc.automatic))
+      [
+        "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict."
+      ];
+
+    assertions = [{
+      assertion = (cfg.flake != null) -> !(lib.hasSuffix ".nix" cfg.flake);
+      message = "nh.flake must be a directory, not a nix file";
+    }];
+
+    home = lib.mkIf cfg.enable {
+      packages = [ cfg.package ];
+      sessionVariables = lib.mkIf (cfg.flake != null) { FLAKE = cfg.flake; };
+    };
+
+    systemd.user = lib.mkIf cfg.clean.enable {
+      services.nh-clean = {
+        Unit.Description = "Nh clean (user)";
+
+        Service = {
+          Type = "oneshot";
+          ExecStart =
+            "exec ${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}";
+          Environment = "PATH=$PATH:${config.nix.package}";
+        };
+      };
+
+      timers.nh-clean = {
+        Unit.Description = "Run nh clean";
+
+        Timer = {
+          OnCalendar = cfg.clean.dates;
+          Persistent = true;
+        };
+
+        Install.WantedBy = [ "timers.target" ];
+      };
+    };
+  };
+}
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@ -39,7 +39,7 @@ let
      };
    });
 in {
-  meta.maintainers = [ maintainers.Philipp-M ];
+  meta.maintainers = [ maintainers.Philipp-M maintainers.joaquintrinanes ];

  imports = [
    (mkRemovedOptionModule [ "programs" "nushell" "settings" ] ''
@ -145,11 +145,24 @@ in {
    };

    environmentVariables = mkOption {
-      type = types.attrsOf types.str;
+      type = types.attrsOf hm.types.nushellValue;
      default = { };
-      example = { FOO = "BAR"; };
+      example = literalExpression ''
+        {
+          FOO = "BAR";
+          LIST_VALUE = [ "foo" "bar" ];
+          NU_LIB_DIRS = lib.concatStringsSep ":" [ ./scripts ];
+          PROMPT_COMMAND = lib.hm.nushell.mkNushellInline '''{|| "> "}''';
+          ENV_CONVERSIONS.PATH = {
+            from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
+            to_string = lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
+          };
+        }
+      '';
      description = ''
-        An attribute set that maps an environment variable to a shell interpreted string.
+        Environment variables to be set.
+
+        Inline values can be set with `lib.hm.nushell.mkNushellInline`.
      '';
    };
  };
@ -173,9 +186,11 @@ in {
      })

      (let
-        envVarsStr = concatStringsSep "\n"
-          (mapAttrsToList (k: v: "$env.${k} = ${v}") cfg.environmentVariables);
-      in mkIf (cfg.envFile != null || cfg.extraEnv != "" || envVarsStr != "") {
+        hasEnvVars = cfg.environmentVariables != { };
+        envVarsStr = ''
+          load-env ${hm.nushell.toNushell { } cfg.environmentVariables}
+        '';
+      in mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) {
        "${configDir}/env.nu".text = mkMerge [
          (mkIf (cfg.envFile != null) cfg.envFile.text)
          cfg.extraEnv
--- a/modules/programs/pls.nix
+++ b/modules/programs/pls.nix
@ -9,7 +9,7 @@ let
  aliases = {
    ls = "${cfg.package}/bin/pls";
    ll =
-      "${cfg.package}/bin/pls -d perms -d user -d group -d size -d mtime -d git";
+      "${cfg.package}/bin/pls -d perm -d user -d group -d size -d mtime -d git";
  };

 in {
@ -28,7 +28,15 @@ in {

    programs.bash.shellAliases = mkIf cfg.enableAliases aliases;

-    programs.fish.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.fish = mkMerge [
+      (mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = mkIf cfg.enableAliases aliases;
+      })
+
+      (mkIf config.programs.fish.preferAbbrs {
+        shellAbbrs = mkIf cfg.enableAliases aliases;
+      })
+    ];

    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;
  };
--- a/modules/programs/pqiv.nix
+++ b/modules/programs/pqiv.nix
@ -23,14 +23,13 @@ in {
      default = { };
      description = ''
        Configuration written to {file}`$XDG_CONFIG_HOME/pqivrc`. See
-        {manpage}`pqiv(1)` for a list of available options. To set a
-        boolean flag, set the value to 1.
+        {manpage}`pqiv(1)` for a list of available options.
      '';
      example = literalExpression ''
        {
          options = {
-            lazy-load = 1;
-            hide-info-box = 1;
+            lazy-load = true;
+            hide-info-box = true;
            background-pattern = "black";
            thumbnail-size = "256x256";
            command-1 = "thunar";
@ -68,7 +67,15 @@ in {
    xdg.configFile."pqivrc" =
      mkIf (cfg.settings != { } && cfg.extraConfig != "") {
        text = lib.concatLines [
-          (generators.toINI { } cfg.settings)
+          (generators.toINI {
+            mkKeyValue = key: value:
+              let
+                value' = if isBool value then
+                  (if value then "1" else "0")
+                else
+                  toString value;
+              in "${key} = ${value'}";
+          } cfg.settings)
          cfg.extraConfig
        ];
      };
--- a/modules/programs/spotify-player.nix
+++ b/modules/programs/spotify-player.nix
@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib)
-    mkEnableOption mkPackageOption mkOption types literalExpression mkIf;
+  inherit (lib) mkEnableOption mkPackageOption mkOption literalExpression mkIf;
+  inherit (lib.types) listOf;

  cfg = config.programs.spotify-player;
  tomlFormat = pkgs.formats.toml { };
-
+  tomlType = tomlFormat.type;
 in {
  meta.maintainers = with lib.hm.maintainers; [ diniamo ];

@ -16,7 +16,7 @@ in {
    package = mkPackageOption pkgs "spotify-player" { };

    settings = mkOption {
-      type = tomlFormat.type;
+      type = tomlType;
      default = { };
      example = literalExpression ''
        {
@ -43,7 +43,7 @@ in {
    };

    themes = mkOption {
-      type = types.listOf tomlFormat.type;
+      type = listOf tomlType;
      default = [ ];
      example = literalExpression ''
        [
@ -94,7 +94,7 @@ in {
    };

    keymaps = mkOption {
-      type = types.listOf tomlFormat.type;
+      type = listOf tomlType;
      default = [ ];
      example = literalExpression ''
        [
@ -129,6 +129,36 @@ in {
        for the full list of options.
      '';
    };
+
+    actions = mkOption {
+      type = listOf tomlType;
+      default = [ ];
+      example = literalExpression ''
+        [
+          {
+            action = "GoToArtist";
+            key_sequence = "g A";
+          }
+          {
+            action = "GoToAlbum";
+            key_sequence = "g B";
+            target = "PlayingTrack";
+          }
+          {
+            action = "ToggleLiked";
+            key_sequence = "C-l";
+          }
+        ]
+      '';
+      description = ''
+        Configuration written to the `actions` field of
+        {file}`$XDG_CONFIG_HOME/spotify-player/keymap.toml`.
+
+        See
+        <https://github.com/aome510/spotify-player/blob/master/docs/config.md#actions>
+        for the full list of options.
+      '';
+    };
  };

  config = mkIf cfg.enable {
@ -146,7 +176,7 @@ in {

      "spotify-player/keymap.toml" = mkIf (cfg.keymaps != [ ]) {
        source = tomlFormat.generate "spotify-player-keymap" {
-          inherit (cfg) keymaps;
+          inherit (cfg) keymaps actions;
        };
      };
    };
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@ -85,7 +85,8 @@ in {
        '';
      };

-      package = mkPackageOption pkgs "taskwarrior" { };
+      package =
+        mkPackageOption pkgs "taskwarrior" { example = "pkgs.taskwarrior3"; };
    };
  };

--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@ -7,6 +7,11 @@ let

  cfg = config.programs.thunderbird;

+  thunderbirdJson = types.attrsOf (pkgs.formats.json { }).type // {
+    description =
+      "Thunderbird preference (int, bool, string, and also attrs, list, float as a JSON string)";
+  };
+
  enabledAccounts = attrValues
    (filterAttrs (_: a: a.thunderbird.enable) config.accounts.email.accounts);

@ -161,11 +166,21 @@ in {
              };

              settings = mkOption {
-                type = with types; attrsOf (oneOf [ bool int str ]);
+                type = thunderbirdJson;
                default = { };
                example = literalExpression ''
                  {
                    "mail.spellcheck.inline" = false;
+                    "mailnews.database.global.views.global.columns" = {
+                      selectCol = {
+                        visible = false;
+                        ordinal = 1;
+                      };
+                      threadCol = {
+                        visible = true;
+                        ordinal = 2;
+                      };
+                    };
                  }
                '';
                description = ''
@ -210,13 +225,27 @@ in {
                  Extra preferences to add to {file}`user.js`.
                '';
              };
+
+              search = mkOption {
+                type = types.submodule (args:
+                  import ./firefox/profiles/search.nix {
+                    inherit (args) config;
+                    inherit lib pkgs;
+                    appName = "Thunderbird";
+                    modulePath =
+                      [ "programs" "thunderbird" "profiles" name "search" ];
+                    profilePath = name;
+                  });
+                default = { };
+                description = "Declarative search engine configuration.";
+              };
            };
          }));
        description = "Attribute set of Thunderbird profiles.";
      };

      settings = mkOption {
-        type = with types; attrsOf (oneOf [ bool int str ]);
+        type = thunderbirdJson;
        default = { };
        example = literalExpression ''
          {
@ -378,6 +407,13 @@ in {
        ] ++ (map (a: toThunderbirdAccount a profile) accounts)))
          profile.extraConfig;
      };
+
+      "${thunderbirdProfilesPath}/${name}/search.json.mozlz4" =
+        mkIf (profile.search.enable) {
+          enable = profile.search.enable;
+          force = profile.search.force;
+          source = profile.search.file;
+        };
    }));
  };
 }
--- a/modules/programs/vifm.nix
+++ b/modules/programs/vifm.nix
@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  inherit (lib) mkIf mkOption types;
+
+  cfg = config.programs.vifm;
+
+in {
+  meta.maintainers = [ lib.hm.maintainers.aabccd021 ];
+
+  options.programs.vifm = {
+    enable = lib.mkEnableOption "vifm, a Vim-like file manager";
+
+    package = lib.mkPackageOption pkgs "vifm" { };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = "mark h ~/";
+      description = ''
+        Extra lines added to the {file}`$XDG_CONFIG_HOME/vifm/vifmrc` file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."vifm/vifmrc" =
+      mkIf (cfg.extraConfig != "") { text = cfg.extraConfig; };
+  };
+}
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@ -100,7 +100,7 @@ in {
        -- Generated by Home Manager.
        -- See https://wezfurlong.org/wezterm/

-        local wezterm = require 'wezterm';
+        local wezterm = require 'wezterm'

        ${cfg.extraConfig}
      '';
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@ -56,13 +56,21 @@ in {
      '';
    };

-    enableBashIntegration = mkEnableOption "Bash integration";
+    enableBashIntegration = mkEnableOption "Bash integration" // {
+      default = true;
+    };

-    enableZshIntegration = mkEnableOption "Zsh integration";
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
+      default = true;
+    };

-    enableFishIntegration = mkEnableOption "Fish integration";
+    enableFishIntegration = mkEnableOption "Fish integration" // {
+      default = true;
+    };

-    enableNushellIntegration = mkEnableOption "Nushell integration";
+    enableNushellIntegration = mkEnableOption "Nushell integration" // {
+      default = true;
+    };

    keymap = mkOption {
      type = tomlFormat.type;
--- a/modules/programs/z-lua.nix
+++ b/modules/programs/z-lua.nix
@ -77,16 +77,26 @@ in {
      })"
    '';

-    programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
-      source (${pkgs.z-lua}/bin/z --init fish ${
-        concatStringsSep " " cfg.options
-      } | psub)
-    '';
-
    programs.bash.shellAliases = mkIf cfg.enableAliases aliases;

    programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;

-    programs.fish.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.fish = mkMerge [
+      {
+        shellInit = mkIf cfg.enableFishIntegration ''
+          source (${pkgs.z-lua}/bin/z --init fish ${
+            concatStringsSep " " cfg.options
+          } | psub)
+        '';
+      }
+
+      (mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = mkIf cfg.enableAliases aliases;
+      })
+
+      (mkIf config.programs.fish.preferAbbrs {
+        shellAbbrs = mkIf cfg.enableAliases aliases;
+      })
+    ];
  };
 }
--- a/modules/programs/zathura.nix
+++ b/modules/programs/zathura.nix
@ -31,7 +31,7 @@ in {

    options = mkOption {
      default = { };
-      type = with types; attrsOf (either str (either bool int));
+      type = with types; attrsOf (oneOf [ str bool int float ]);
      description = ''
        Add {option}`:set` command options to zathura and make
        them permanent. See
--- a/modules/programs/zed-editor.nix
+++ b/modules/programs/zed-editor.nix
@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zed-editor;
+  jsonFormat = pkgs.formats.json { };
+
+  mergedSettings = cfg.userSettings // {
+    # this part by @cmacrae
+    auto_install_extensions = lib.genAttrs cfg.extensions (_: true);
+  };
+in {
+  meta.maintainers = [ hm.maintainers.libewa ];
+
+  options = {
+    # TODO: add vscode option parity (installing extensions, configuring
+    # keybinds with nix etc.)
+    programs.zed-editor = {
+      enable = mkEnableOption
+        "Zed, the high performance, multiplayer code editor from the creators of Atom and Tree-sitter";
+
+      package = mkPackageOption pkgs "zed-editor" { };
+
+      userSettings = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          {
+            features = {
+              copilot = false;
+            };
+            telemetry = {
+              metrics = false;
+            };
+            vim_mode = false;
+            ui_font_size = 16;
+            buffer_font_size = 16;
+          }
+        '';
+        description = ''
+          Configuration written to Zed's {file}`settings.json`.
+        '';
+      };
+
+      userKeymaps = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          [
+            {
+              context = "Workspace";
+              bindings = {
+                ctrl-shift-t = "workspace::NewTerminal";
+              };
+            };
+          ]
+        '';
+        description = ''
+          Configuration written to Zed's {file}`keymap.json`.
+        '';
+      };
+
+      extensions = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = literalExpression ''
+          [ "swift" "nix" "xy-zed" ]
+        '';
+        description = ''
+          A list of the extensions Zed should install on startup.
+          Use the name of a repository in the [extension list](https://github.com/zed-industries/extensions/tree/main/extensions).
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) {
+      source = jsonFormat.generate "zed-user-settings" mergedSettings;
+    });
+
+    xdg.configFile."zed/keymap.json" = (mkIf (cfg.userKeymaps != { }) {
+      source = jsonFormat.generate "zed-user-keymaps" cfg.userKeymaps;
+    });
+  };
+}
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@ -26,9 +26,9 @@ in {
    options = mkOption {
      type = types.listOf types.str;
      default = [ ];
-      example = [ "--no-aliases" ];
+      example = [ "--no-cmd" ];
      description = ''
-        List of options to pass to zoxide.
+        List of options to pass to zoxide init.
      '';
    };

@ -68,9 +68,9 @@ in {
  config = mkIf cfg.enable {
    home.packages = [ cfg.package ];

-    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
+    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 150 ''
      eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
-    '';
+    '');

    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
      eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
--- a/modules/services/borgmatic.nix
+++ b/modules/services/borgmatic.nix
@ -46,7 +46,6 @@ in {

          # Lower CPU and I/O priority:
          Nice = 19;
-          CPUSchedulingPolicy = "batch";
          IOSchedulingClass = "best-effort";
          IOSchedulingPriority = 7;
          IOWeight = 100;
--- a/modules/services/espanso.nix
+++ b/modules/services/espanso.nix
@ -121,9 +121,9 @@ in {
    systemd.user.services.espanso = {
      Unit = { Description = "Espanso: cross platform text expander in Rust"; };
      Service = {
-        Type = "exec";
-        ExecStart = "${cfg.package}/bin/espanso daemon";
+        ExecStart = "${cfg.package}/bin/espanso launcher";
        Restart = "on-failure";
+        RestartSec = 3;
      };
      Install = { WantedBy = [ "default.target" ]; };
    };
--- a/modules/services/flameshot.nix
+++ b/modules/services/flameshot.nix
@ -24,7 +24,7 @@ in {
    };

    settings = mkOption {
-      type = iniFormat.type;
+      inherit (iniFormat) type;
      default = { };
      example = {
        General = {
@ -64,7 +64,7 @@ in {
      Install = { WantedBy = [ "graphical-session.target" ]; };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/flameshot";
        Restart = "on-abort";

--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@ -18,6 +18,10 @@ let
    export GPG_TTY
  '' + optionalString cfg.enableSshSupport gpgSshSupportStr;

+  gpgZshInitStr = ''
+    export GPG_TTY=$TTY
+  '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
+
  gpgFishInitStr = ''
    set -gx GPG_TTY (tty)
  '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
@ -30,7 +34,7 @@ let
    $env.SSH_AUTH_SOCK = ($env.SSH_AUTH_SOCK? | default (${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket))
  '';

-  # mimic `gpgconf` output for use in `systemd` unit definitions.
+  # mimic `gpgconf` output for use in the service definitions.
  # we cannot use `gpgconf` directly because it heavily depends on system
  # state, but we need the values at build time. original:
  # https://github.com/gpg/gnupg/blob/c6702d77d936b3e9d91b34d8fdee9599ab94ee1b/common/homedir.c#L672-L681
@ -38,10 +42,14 @@ let
    let
      hash =
        substring 0 24 (hexStringToBase32 (builtins.hashString "sha1" homedir));
-    in if homedir == options.programs.gpg.homedir.default then
-      "%t/gnupg/${dir}"
+      subdir = if homedir == options.programs.gpg.homedir.default then
+        "${dir}"
+      else
+        "d.${hash}/${dir}";
+    in if pkgs.stdenv.isDarwin then
+      "/private/var/run/org.nix-community.home.gpg-agent/${subdir}"
    else
-      "%t/gnupg/d.${hash}/${dir}";
+      "%t/gnupg/${subdir}";

  # Act like `xxd -r -p | base32` but with z-base-32 alphabet and no trailing padding.
  # Written in Nix for purity.
@ -77,6 +85,32 @@ let
      };
  in hexString: (foldl' go initState (stringToCharacters hexString)).ret;

+  # Systemd socket unit generator.
+  mkSocket = { desc, docs, stream, fdName }: {
+    Unit = {
+      Description = desc;
+      Documentation = docs;
+    };
+
+    Socket = {
+      ListenStream = gpgconf "${stream}";
+      FileDescriptorName = "${fdName}";
+      Service = "gpg-agent.service";
+      SocketMode = "0600";
+      DirectoryMode = "0700";
+    };
+
+    Install = { WantedBy = [ "sockets.target" ]; };
+  };
+
+  # Launchd agent socket generator.
+  mkAgentSock = name: {
+    SockType = "stream";
+    SockPathName = gpgconf name;
+    SockPathMode =
+      384; # Property lists don't support octal literals (0600 = 384).
+  };
+
 in {
  meta.maintainers = [ maintainers.rycee ];

@ -257,7 +291,7 @@ in {
      '';

      programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
-      programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
+      programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgZshInitStr;
      programs.fish.interactiveShellInit =
        mkIf cfg.enableFishIntegration gpgFishInitStr;

@ -272,90 +306,74 @@ in {
      '') cfg.sshKeys;
    })

-    # The systemd units below are direct translations of the
-    # descriptions in the
-    #
-    #   ${gpgPkg}/share/doc/gnupg/examples/systemd-user
-    #
-    # directory.
-    {
-      assertions = [
-        (hm.assertions.assertPlatform "services.gpg-agent" pkgs platforms.linux)
-      ];
+    (mkMerge [
+      (mkIf pkgs.stdenv.isLinux {
+        systemd.user.services.gpg-agent = {
+          Unit = {
+            Description = "GnuPG cryptographic agent and passphrase cache";
+            Documentation = "man:gpg-agent(1)";
+            Requires = "gpg-agent.socket";
+            After = "gpg-agent.socket";
+            # This is a socket-activated service:
+            RefuseManualStart = true;
+          };

-      systemd.user.services.gpg-agent = {
-        Unit = {
-          Description = "GnuPG cryptographic agent and passphrase cache";
-          Documentation = "man:gpg-agent(1)";
-          Requires = "gpg-agent.socket";
-          After = "gpg-agent.socket";
-          # This is a socket-activated service:
-          RefuseManualStart = true;
+          Service = {
+            ExecStart = "${gpgPkg}/bin/gpg-agent --supervised"
+              + optionalString cfg.verbose " --verbose";
+            ExecReload = "${gpgPkg}/bin/gpgconf --reload gpg-agent";
+            Environment = [ "GNUPGHOME=${homedir}" ];
+          };
        };

-        Service = {
-          ExecStart = "${gpgPkg}/bin/gpg-agent --supervised"
-            + optionalString cfg.verbose " --verbose";
-          ExecReload = "${gpgPkg}/bin/gpgconf --reload gpg-agent";
-          Environment = [ "GNUPGHOME=${homedir}" ];
-        };
-      };
-
-      systemd.user.sockets.gpg-agent = {
-        Unit = {
-          Description = "GnuPG cryptographic agent and passphrase cache";
-          Documentation = "man:gpg-agent(1)";
+        systemd.user.sockets.gpg-agent = mkSocket {
+          desc = "GnuPG cryptographic agent and passphrase cache";
+          docs = "man:gpg-agent(1)";
+          stream = "S.gpg-agent";
+          fdName = "std";
        };

-        Socket = {
-          ListenStream = gpgconf "S.gpg-agent";
-          FileDescriptorName = "std";
-          SocketMode = "0600";
-          DirectoryMode = "0700";
+        systemd.user.sockets.gpg-agent-ssh = mkIf cfg.enableSshSupport
+          (mkSocket ({
+            desc = "GnuPG cryptographic agent (ssh-agent emulation)";
+            docs =
+              "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
+            stream = "S.gpg-agent.ssh";
+            fdName = "ssh";
+          }));
+
+        systemd.user.sockets.gpg-agent-extra = mkIf cfg.enableExtraSocket
+          (mkSocket {
+            desc =
+              "GnuPG cryptographic agent and passphrase cache (restricted)";
+            docs = "man:gpg-agent(1) man:ssh(1)";
+            stream = "S.gpg-agent.extra";
+            fdName = "extra";
+          });
+      })
+
+      (mkIf pkgs.stdenv.isDarwin {
+        launchd.agents.gpg-agent = {
+          enable = true;
+          config = {
+            ProgramArguments = [ "${gpgPkg}/bin/gpg-agent" "--supervised" ]
+              ++ optional cfg.verbose "--verbose";
+            EnvironmentVariables = { GNUPGHOME = homedir; };
+            KeepAlive = {
+              Crashed = true;
+              SuccessfulExit = false;
+            };
+            ProcessType = "Background";
+            RunAtLoad = cfg.enableSshSupport;
+            Sockets = {
+              Agent = mkAgentSock "S.gpg-agent";
+              Ssh = mkIf cfg.enableSshSupport (mkAgentSock "S.gpg-agent.ssh");
+              Extra =
+                mkIf cfg.enableExtraSocket (mkAgentSock "S.gpg-agent.extra");
+            };
+          };
        };
-
-        Install = { WantedBy = [ "sockets.target" ]; };
-      };
-    }
-
-    (mkIf cfg.enableSshSupport {
-      systemd.user.sockets.gpg-agent-ssh = {
-        Unit = {
-          Description = "GnuPG cryptographic agent (ssh-agent emulation)";
-          Documentation =
-            "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
-        };
-
-        Socket = {
-          ListenStream = gpgconf "S.gpg-agent.ssh";
-          FileDescriptorName = "ssh";
-          Service = "gpg-agent.service";
-          SocketMode = "0600";
-          DirectoryMode = "0700";
-        };
-
-        Install = { WantedBy = [ "sockets.target" ]; };
-      };
-    })
-
-    (mkIf cfg.enableExtraSocket {
-      systemd.user.sockets.gpg-agent-extra = {
-        Unit = {
-          Description =
-            "GnuPG cryptographic agent and passphrase cache (restricted)";
-          Documentation = "man:gpg-agent(1) man:ssh(1)";
-        };
-
-        Socket = {
-          ListenStream = gpgconf "S.gpg-agent.extra";
-          FileDescriptorName = "extra";
-          Service = "gpg-agent.service";
-          SocketMode = "0600";
-          DirectoryMode = "0700";
-        };
-
-        Install = { WantedBy = [ "sockets.target" ]; };
-      };
-    })
+      })
+    ])
  ]);
 }
--- a/modules/services/grobi.nix
+++ b/modules/services/grobi.nix
@ -88,7 +88,7 @@ in {
        ExecStart = "${pkgs.grobi}/bin/grobi watch -v";
        Restart = "always";
        RestartSec = "2s";
-        Environment = "PATH=${pkgs.xorg.xrandr}/bin:${pkgs.bash}/bin";
+        Environment = [ "PATH=${pkgs.xorg.xrandr}/bin:${pkgs.bash}/bin" ];
      };

      Install = { WantedBy = [ "graphical-session.target" ]; };
--- a/modules/services/hound.nix
+++ b/modules/services/hound.nix
@ -72,7 +72,7 @@ in {
      Install = { WantedBy = [ "default.target" ]; };

      Service = {
-        Environment = "PATH=${makeBinPath [ pkgs.mercurial pkgs.git ]}";
+        Environment = [ "PATH=${makeBinPath [ pkgs.mercurial pkgs.git ]}" ];
        ExecStart =
          "${pkgs.hound}/bin/houndd ${concatStringsSep " " houndOptions}";
      };
--- a/modules/services/kanshi.nix
+++ b/modules/services/kanshi.nix
@ -123,6 +123,15 @@ let
        '';
      };

+      alias = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "laptopMonitor";
+        description = ''
+          Defines an alias for the output
+        '';
+      };
+
      adaptiveSync = mkOption {
        type = types.nullOr types.bool;
        default = null;
@ -135,15 +144,16 @@ let
    };
  };

-  outputStr =
-    { criteria, status, mode, position, scale, transform, adaptiveSync, ... }:
+  outputStr = { criteria, status, mode, position, scale, transform, adaptiveSync
+    , alias, ... }:
    ''output "${criteria}"'' + optionalString (status != null) " ${status}"
    + optionalString (mode != null) " mode ${mode}"
    + optionalString (position != null) " position ${position}"
    + optionalString (scale != null) " scale ${toString scale}"
    + optionalString (transform != null) " transform ${transform}"
    + optionalString (adaptiveSync != null)
-    " adaptive_sync ${if adaptiveSync then "on" else "off"}";
+    " adaptive_sync ${if adaptiveSync then "on" else "off"}"
+    + optionalString (alias != null) " alias \$${alias}";

  profileModule = types.submodule {
    options = {
@ -296,6 +306,14 @@ in {
          message =
            "Cannot mix kanshi.settings with kanshi.profiles or kanshi.extraConfig";
        }
+        {
+          assertion = let profiles = filter (x: x ? profile) cfg.settings;
+          in length
+          (filter (x: any (a: a ? alias && a.alias != null) x.profile.outputs)
+            profiles) == 0;
+          message =
+            "Output kanshi.*.output.alias can only be defined on global scope";
+        }
      ];
    }

--- a/modules/services/kbfs.nix
+++ b/modules/services/kbfs.nix
@ -46,7 +46,7 @@ in {

      Service = let mountPoint = ''"%h/${cfg.mountPoint}"'';
      in {
-        Environment = "PATH=/run/wrappers/bin KEYBASE_SYSTEMD=1";
+        Environment = [ "PATH=/run/wrappers/bin" "KEYBASE_SYSTEMD=1" ];
        ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${mountPoint}";
        ExecStart =
          "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${mountPoint}";
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@ -47,7 +47,7 @@ in {
        Install = { WantedBy = [ "graphical-session.target" ]; };

        Service = {
-          Environment = "PATH=${config.home.profileDirectory}/bin";
+          Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
          ExecStart =
            if strings.versionAtLeast (versions.majorMinor cfg.package.version)
            "24.05" then
@ -81,7 +81,7 @@ in {
        Install = { WantedBy = [ "graphical-session.target" ]; };

        Service = {
-          Environment = "PATH=${config.home.profileDirectory}/bin";
+          Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
          ExecStart = "${cfg.package}/bin/kdeconnect-indicator";
          Restart = "on-abort";
        };
--- a/modules/services/megasync.nix
+++ b/modules/services/megasync.nix
@ -28,7 +28,7 @@ in {
    systemd.user.services.megasync = {
      Unit = {
        Description = "megasync";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
        PartOf = [ "graphical-session.target" ];
      };

--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@ -188,7 +188,7 @@ in {
      };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${
            escapeShellArgs cfg.extraArgs
          }";
--- a/modules/services/nextcloud-client.nix
+++ b/modules/services/nextcloud-client.nix
@ -41,7 +41,7 @@ in {
      };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/nextcloud"
          + (optionalString cfg.startInBackground " --background");
      };
--- a/modules/services/nix-gc.nix
+++ b/modules/services/nix-gc.nix
@ -81,6 +81,18 @@ in {
        '';
      };

+      randomizedDelaySec = lib.mkOption {
+        default = "0";
+        type = lib.types.singleLineStr;
+        example = "45min";
+        description = ''
+          Add a randomized delay before each garbage collection.
+          The delay will be chosen between zero and this value.
+          This value must be a time span in the format specified by
+          {manpage}`systemd.time(7)`
+        '';
+      };
+
      options = mkOption {
        type = types.nullOr types.str;
        default = null;
@ -121,6 +133,7 @@ in {
        Unit = { Description = "Nix Garbage Collector"; };
        Timer = {
          OnCalendar = "${cfg.frequency}";
+          RandomizedDelaySec = cfg.randomizedDelaySec;
          Persistent = cfg.persistent;
          Unit = "nix-gc.service";
        };
--- a/modules/services/opensnitch-ui.nix
+++ b/modules/services/opensnitch-ui.nix
@ -28,7 +28,7 @@ in {
      };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${pkgs.opensnitch-ui}/bin/opensnitch-ui";
      };

--- a/modules/services/owncloud-client.nix
+++ b/modules/services/owncloud-client.nix
@ -29,7 +29,7 @@ in {
      };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/owncloud";
      };

--- a/modules/services/pass-secret-service.nix
+++ b/modules/services/pass-secret-service.nix
@ -58,6 +58,7 @@ in {
              optionalString (cfg.storePath != null) "--path ${cfg.storePath}"
            }";
          BusName = busName;
+          Environment = [ "GNUPGHOME=${config.programs.gpg.homedir}" ];
        };

        Install.WantedBy = [ "default.target" ];
--- a/modules/services/polybar.nix
+++ b/modules/services/polybar.nix
@ -220,7 +220,7 @@ in {

      Service = {
        Type = "forking";
-        Environment = "PATH=${cfg.package}/bin:/run/wrappers/bin";
+        Environment = [ "PATH=${cfg.package}/bin:/run/wrappers/bin" ];
        ExecStart =
          let scriptPkg = pkgs.writeShellScriptBin "polybar-start" cfg.script;
          in "${scriptPkg}/bin/polybar-start";
--- a/modules/services/poweralertd.nix
+++ b/modules/services/poweralertd.nix
@ -2,13 +2,37 @@

 with lib;

-let cfg = config.services.poweralertd;
-
+let
+  inherit (lib.strings) toJSON;
+  cfg = config.services.poweralertd;
+  escapeSystemdExecArg = arg:
+    let
+      s = if isPath arg then
+        "${arg}"
+      else if isString arg then
+        arg
+      else if isInt arg || isFloat arg || isDerivation arg then
+        toString arg
+      else
+        throw
+        "escapeSystemdExecArg only allows strings, paths, numbers and derivations";
+    in replaceStrings [ "%" "$" ] [ "%%" "$$" ] (toJSON s);
+  escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;
 in {
  meta.maintainers = [ maintainers.thibautmarty ];

-  options.services.poweralertd.enable =
-    mkEnableOption "the Upower-powered power alertd";
+  options.services.poweralertd = {
+    enable = mkEnableOption "the Upower-powered power alertd";
+
+    extraArgs = mkOption {
+      type = with types; listOf str;
+      default = [ ];
+      example = [ "-s" "-S" ];
+      description = ''
+        Extra command line arguments to pass to poweralertd.
+      '';
+    };
+  };

  config = mkIf cfg.enable {
    assertions = [
@ -28,7 +52,9 @@ in {

      Service = {
        Type = "simple";
-        ExecStart = "${pkgs.poweralertd}/bin/poweralertd";
+        ExecStart = "${pkgs.poweralertd}/bin/poweralertd ${
+            escapeSystemdExecArgs cfg.extraArgs
+          }";
        Restart = "always";
      };
    };
--- a/modules/services/rsibreak.nix
+++ b/modules/services/rsibreak.nix
@ -30,7 +30,7 @@ in {
      Install = { WantedBy = [ "graphical-session.target" ]; };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${pkgs.rsibreak}/bin/rsibreak";
      };
    };
--- a/modules/services/snixembed.nix
+++ b/modules/services/snixembed.nix
@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.snixembed;
+in {
+  meta.maintainers = [ maintainers.DamienCassou ];
+
+  options = {
+    services.snixembed = {
+      enable = mkEnableOption
+        "snixembed: proxy StatusNotifierItems as XEmbedded systemtray-spec icons";
+
+      package = mkPackageOption pkgs "snixembed" { };
+
+      beforeUnits = mkOption {
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "safeeyes.service" ];
+        description = ''
+          List of other units that should be started after snixembed.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (hm.assertions.assertPlatform "services.snixembed" pkgs platforms.linux)
+    ];
+
+    systemd.user.services.snixembed = {
+      Install.WantedBy = [ "graphical-session.target" ];
+
+      Unit = {
+        Description = "snixembed";
+        PartOf = [ "graphical-session.target" ];
+        StartLimitIntervalSec = 100;
+        StartLimitBurst = 10;
+        Before = cfg.beforeUnits;
+      };
+
+      Service = {
+        ExecStart = getExe pkgs.snixembed;
+        Restart = "on-failure";
+        RestartSec = 3;
+      };
+    };
+  };
+}
--- a/modules/services/ssh-agent.nix
+++ b/modules/services/ssh-agent.nix
@ -20,7 +20,7 @@ in {
    ];

    home.sessionVariablesExtra = ''
-      if [[ -z "$SSH_AUTH_SOCK" ]]; then
+      if [ -z "$SSH_AUTH_SOCK" ]; then
        export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
      fi
    '';
--- a/modules/services/swayidle.nix
+++ b/modules/services/swayidle.nix
@ -6,18 +6,6 @@ let

  cfg = config.services.swayidle;

-  mkTimeout = t:
-    [ "timeout" (toString t.timeout) (escapeShellArg t.command) ]
-    ++ optionals (t.resumeCommand != null) [
-      "resume"
-      (escapeShellArg t.resumeCommand)
-    ];
-
-  mkEvent = e: [ e.event (escapeShellArg e.command) ];
-
-  args = cfg.extraArgs ++ (concatMap mkTimeout cfg.timeouts)
-    ++ (concatMap mkEvent cfg.events);
-
 in {
  meta.maintainers = [ maintainers.c0deaddict ];

@ -94,7 +82,7 @@ in {

    extraArgs = mkOption {
      type = with types; listOf str;
-      default = [ ];
+      default = [ "-w" ];
      description = "Extra arguments to pass to swayidle.";
    };

@ -127,8 +115,16 @@ in {
        Restart = "always";
        # swayidle executes commands using "sh -c", so the PATH needs to contain a shell.
        Environment = [ "PATH=${makeBinPath [ pkgs.bash ]}" ];
-        ExecStart =
-          "${cfg.package}/bin/swayidle -w ${concatStringsSep " " args}";
+        ExecStart = let
+          mkTimeout = t:
+            [ "timeout" (toString t.timeout) t.command ]
+            ++ optionals (t.resumeCommand != null) [ "resume" t.resumeCommand ];
+
+          mkEvent = e: [ e.event e.command ];
+
+          args = cfg.extraArgs ++ (concatMap mkTimeout cfg.timeouts)
+            ++ (concatMap mkEvent cfg.events);
+        in "${getExe cfg.package} ${escapeShellArgs args}";
      };

      Install = { WantedBy = [ cfg.systemdTarget ]; };
--- a/modules/services/swaync.nix
+++ b/modules/services/swaync.nix
@ -63,7 +63,7 @@ in {
          notification-inline-replies = false;
          notification-icon-size = 64;
          notification-body-image-height = 100;
-          notification-body-image-width = 200
+          notification-body-image-width = 200;
        };
      '';
      description = ''
--- a/modules/services/taskwarrior-sync.nix
+++ b/modules/services/taskwarrior-sync.nix
@ -12,6 +12,9 @@ in {
  options.services.taskwarrior-sync = {
    enable = mkEnableOption "Taskwarrior periodic sync";

+    package =
+      mkPackageOption pkgs "taskwarrior" { example = "pkgs.taskwarrior3"; };
+
    frequency = mkOption {
      type = types.str;
      default = "*:0/5";
@ -36,7 +39,7 @@ in {
      Service = {
        CPUSchedulingPolicy = "idle";
        IOSchedulingClass = "idle";
-        ExecStart = "${pkgs.taskwarrior}/bin/task synchronize";
+        ExecStart = "${cfg.package}/bin/task synchronize";
      };
    };

--- a/modules/services/trayscale.nix
+++ b/modules/services/trayscale.nix
@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.services.trayscale;
+in {
+  meta.maintainers = [ lib.hm.maintainers.callumio ];
+
+  options.services.trayscale = {
+    enable = lib.mkEnableOption
+      "An unofficial GUI wrapper around the Tailscale CLI client.";
+
+    package = lib.mkPackageOption pkgs "trayscale" { };
+
+    hideWindow = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Whether to hide the trayscale window on startup.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.trayscale" pkgs
+        lib.platforms.linux)
+    ];
+
+    systemd.user.services.trayscale = {
+      Unit = {
+        Description =
+          "An unofficial GUI wrapper around the Tailscale CLI client";
+        Requires = [ "tray.target" ];
+        After = [ "graphical-session-pre.target" "tray.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+      Service.ExecStart = toString ([ "${cfg.package}/bin/trayscale" ]
+        ++ lib.optional cfg.hideWindow "--hide-window");
+    };
+  };
+}
--- a/modules/services/window-managers/i3-sway/lib/options.nix
+++ b/modules/services/window-managers/i3-sway/lib/options.nix
@ -31,7 +31,7 @@ let
      };

      size = mkOption {
-        type = types.float;
+        type = types.either types.float types.str;
        default = 8.0;
        description = ''
          The font size to use for window titles.
--- a/modules/services/window-managers/i3-sway/sway.nix
+++ b/modules/services/window-managers/i3-sway/sway.nix
@ -249,7 +249,7 @@ let
  moduleStr = moduleType: name: attrs: ''
    ${moduleType} "${name}" {
    ${concatStringsSep "\n"
-    (mapAttrsToList (name: value: "${name} ${value}") attrs)}
+    (mapAttrsToList (name: value: "  ${name} ${value}") attrs)}
    }
  '';
  inputStr = moduleStr "input";
@ -258,7 +258,6 @@ let

  variables = concatStringsSep " " cfg.systemd.variables;
  extraCommands = concatStringsSep " && " cfg.systemd.extraCommands;
-  swayPackage = if cfg.package == null then pkgs.sway else cfg.package;
  systemdActivation = ''
    exec "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables}; ${extraCommands}"'';

@ -269,7 +268,7 @@ let
    checkPhase = lib.optionalString cfg.checkConfig ''
      export DBUS_SESSION_BUS_ADDRESS=/dev/null
      export XDG_RUNTIME_DIR=$(mktemp -d)
-      ${pkgs.xvfb-run}/bin/xvfb-run ${swayPackage}/bin/sway --config "$target" --validate --unsupported-gpu
+      ${pkgs.xvfb-run}/bin/xvfb-run ${cfg.package}/bin/sway --config "$target" --validate --unsupported-gpu
    '';

    text = concatStringsSep "\n"
@ -331,13 +330,6 @@ let
        ++ [ cfg.extraConfig ]);
  };

-  defaultSwayPackage = pkgs.sway.override {
-    extraSessionCommands = cfg.extraSessionCommands;
-    extraOptions = cfg.extraOptions;
-    withBaseWrapper = cfg.wrapperFeatures.base;
-    withGtkWrapper = cfg.wrapperFeatures.gtk;
-  };
-
 in {
  meta.maintainers = with maintainers; [
    Scrumplex
@ -357,14 +349,20 @@ in {

    package = mkOption {
      type = with types; nullOr package;
-      default = defaultSwayPackage;
+      default = pkgs.sway.override {
+        extraSessionCommands = cfg.extraSessionCommands;
+        extraOptions = cfg.extraOptions;
+        withBaseWrapper = cfg.wrapperFeatures.base;
+        withGtkWrapper = cfg.wrapperFeatures.gtk;
+      };
      defaultText = literalExpression "${pkgs.sway}";
      description = ''
        Sway package to use. Will override the options
        'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.
        Set to `null` to not add any Sway package to your
        path. This should be done if you want to use the NixOS Sway
-        module to install Sway.
+        module to install Sway. Beware setting to `null` will also disable
+        reloading Sway when new config is activated.
      '';
    };

@ -485,9 +483,10 @@ in {

    checkConfig = mkOption {
      type = types.bool;
-      default = true;
-      description =
-        "If enabled (the default), validates the generated config file.";
+      default = cfg.package != null;
+      defaultText =
+        literalExpression "wayland.windowManager.sway.package != null";
+      description = "If enabled, validates the generated config file.";
    };

    extraConfig = mkOption {
@ -522,6 +521,11 @@ in {
      assertions = [
        (hm.assertions.assertPlatform "wayland.windowManager.sway" pkgs
          platforms.linux)
+        {
+          assertion = cfg.checkConfig -> cfg.package != null;
+          message =
+            "programs.sway.checkConfig requires non-null programs.sway.package";
+        }
      ];

      home.packages = optional (cfg.package != null) cfg.package
@ -529,10 +533,10 @@ in {

      xdg.configFile."sway/config" = {
        source = configFile;
-        onChange = ''
+        onChange = lib.optionalString (cfg.package != null) ''
          swaySocket="''${XDG_RUNTIME_DIR:-/run/user/$UID}/sway-ipc.$UID.$(${pkgs.procps}/bin/pgrep --uid $UID -x sway || true).sock"
          if [ -S "$swaySocket" ]; then
-            ${swayPackage}/bin/swaymsg -s $swaySocket reload
+            ${cfg.package}/bin/swaymsg -s $swaySocket reload
          fi
        '';
      };
--- a/modules/services/xembed-sni-proxy.nix
+++ b/modules/services/xembed-sni-proxy.nix
@ -41,7 +41,7 @@ in {
      Install = { WantedBy = [ "graphical-session.target" ]; };

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/xembedsniproxy";
        Restart = "on-abort";
      };
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@ -60,7 +60,7 @@ in {

      Service = {
        ExecStart = "${cfg.package}/bin/xscreensaver -no-splash";
-        Environment = "PATH=${makeBinPath [ cfg.package ]}";
+        Environment = [ "PATH=${makeBinPath [ cfg.package ]}" ];
      };

      Install = { WantedBy = [ "graphical-session.target" ]; };
--- a/modules/services/xsettingsd.nix
+++ b/modules/services/xsettingsd.nix
@ -82,7 +82,7 @@ in {
      Install.WantedBy = [ "graphical-session.target" ];

      Service = {
-        Environment = "PATH=${config.home.profileDirectory}/bin";
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
        ExecStart = "${cfg.package}/bin/xsettingsd"
          + optionalString (cfg.configFile != null)
          " -c ${escapeShellArg cfg.configFile}";
--- a/Show more
+++ b/Show more