hyprland: onChange: remove subshell comment

(cherry picked from commit 7e769959e8)

.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@V27
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: cachix/cachix-action@v15

.github/workflows/labeler.yml

@@ -21,3 +21,4 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           sync-labels: true
+

.github/workflows/test.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
+    - uses: cachix/install-nix-action@V27
       with:
-        nix_path: nixpkgs=channel:nixos-unstable
+        nix_path: nixpkgs=channel:nixos-24.05
     - run: |
         if grep -R --exclude stdlib-extended.nix literalExample modules ; then
           echo "Error: literalExample should be replaced by literalExpression" > /dev/stderr

.github/workflows/update-flake.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@V27
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v23
         with:

docs/manual/introduction.md

@@ -1,32 +0,0 @@
-# Introduction to Home Manager {#ch-introduction}
-
-Home Manager is a [Nix](https://nix.dev/)-powered tool for reproducible management of the contents of users' home directories.
-This includes programs, configuration files, environment variables and, well… arbitrary files.
-The following example snippet of Nix code:
-
-```nix
-programs.git = {
-  enable = true;
-  userEmail = "joe@example.org";
-  userName = "joe";
-};
-```
-
-would make available to a user the `git` executable and man pages and a configuration file `~/.config/git/config`:
-
-```ini
-[user]
-	email = "joe@example.org"
-	name = "joe"
-```
-
-Since Home Manager is implemented in Nix, it provides several benefits:
-
-- Contents are reproducible — a home will be the exact same every time it is built, unless of course, an intentional change is made.
-  This also means you can have the exact same home on different hosts.
-- Significantly faster and more powerful than various backup strategies.
-- Unlike "dotfiles" repositories, Home Manager supports specifying programs, as well as their configurations.
-- Supported by <http://cache.nixos.org/>, so that you don't have to build from source.
-- If you do want to build some programs from source, there is hardly a tool more useful than Nix for that, and the build instructions can be neatly integrated in your Home Manager usage.
-- Infinitely composable, so that values in different configuration files and build instructions can share a source of truth.
-- Connects you with the [most extensive](https://repology.org/repositories/statistics/total) and [most up-to-date](https://repology.org/repositories/statistics/newest) software package repository on earth, [Nixpkgs](https://github.com/NixOS/nixpkgs).

docs/manual/manual.md

@@ -1,6 +1,6 @@
 # Home Manager Manual {#home-manager-manual}
 
-## Version 24.05 (unstable)
+## Version 24.05
 
 
 ```{=include=} preface
@@ -8,7 +8,6 @@ preface.md
 ```
 
 ```{=include=} parts
-introduction.md
 installation.md
 usage.md
 nix-flakes.md

docs/release-notes/release-notes.md

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

docs/release-notes/rl-2411.md

@@ -1,18 +0,0 @@
-# Release 24.11 {#sec-release-24.11}
-
-This is the current unstable branch and the information in this section
-is therefore not final.
-
-## Highlights {#sec-release-24.11-highlights}
-
-This release has the following notable changes:
-
-- No changes.
-
-## State Version Changes {#sec-release-24.11-state-version-changes}
-
-The state version in this release includes the changes below. These
-changes are only active if the `home.stateVersion` option is set to
-\"24.11\" or later.
-
-- No changes.

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722185531,
+        "lastModified": 1716542732,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "Home Manager for Nix";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
   outputs = { self, nixpkgs, ... }:
     {

home-manager/home-manager

@@ -198,19 +198,9 @@ function setFlakeAttribute() {
                 ;;
             *)
                 local name="$USER"
-
+                # Check both long and short hostnames; long first to preserve
-                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 "$USER@$(hostname)" "$USER@$(hostname -s)"; do
-
-                for n in "${hostnameArray[@]}"; do
                     if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$n\"")" == "true" ]]; then
                         name="$n"
                         if [[ -v VERBOSE ]]; then
@@ -1054,7 +1044,7 @@ while [[ $# -gt 0 ]]; do
             export VERBOSE=1
             ;;
         --version)
-            echo 24.11-pre
+            echo 24.05
             exit 0
             ;;
         *)

home-manager/po/ar.po

@@ -1,217 +0,0 @@
-# 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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-
-#. translators: For example: "home-manager: missing argument for --cores"
-#: home-manager/home-manager:16
-msgid "%s: missing argument for %s"
-msgstr ""
-
-#: home-manager/home-manager:64
-msgid "No configuration file found at %s"
-msgstr ""
-
-#. translators: The first '%s' specifier will be replaced by either
-#. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
-msgid ""
-"Keeping your Home Manager %s in %s is deprecated,\n"
-"please move it to %s"
-msgstr ""
-
-#: home-manager/home-manager:92
-msgid "No configuration file found. Please create one at %s"
-msgstr ""
-
-#: home-manager/home-manager:107
-msgid "Home Manager not found at %s."
-msgstr ""
-
-#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
-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 ""

home-manager/po/fi.po

@@ -8,25 +8,23 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-05-31 17:09+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: jarre johansson <jarre@johansson.today>\n"
+"Last-Translator: Automatically generated\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/home-manager/cli/"
+"Language-Team: none\n"
-"fi/>\n"
 "Language: fi\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.6-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s: puuttuva argumentti kohteelle %s"
+msgstr ""
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
-msgstr "Konfiguraatiotiedostoa ei löytynyt sijainnista %s"
+msgstr ""
 
 #. translators: The first '%s' specifier will be replaced by either
 #. 'home.nix' or 'flake.nix'.
@@ -39,11 +37,11 @@ msgstr ""
 
 #: home-manager/home-manager:92
 msgid "No configuration file found. Please create one at %s"
-msgstr "Konfiguraatiotiedostoa ei löytynyt. Luo sellainen sijaintiin %s"
+msgstr ""
 
 #: home-manager/home-manager:107
 msgid "Home Manager not found at %s."
-msgstr "Home Manageria ei löytynyt sijainnista %s."
+msgstr ""
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:115
@@ -76,37 +74,37 @@ msgstr ""
 
 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
-msgstr "Nixin eheys tarkistetaan"
+msgstr ""
 
 #: home-manager/home-manager:166
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "Sopivaa profiilihakemistoa ei löytynyt, yritettiin %s ja %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 "Flake-konfiguraation asetuksia ei voi tarkastella"
+msgstr ""
 
 #: home-manager/home-manager:296 home-manager/home-manager:319
 #: home-manager/home-manager:1051
 msgid "%s: unknown option '%s'"
-msgstr "%s: tuntematon vaihtoehto '%s"
+msgstr ""
 
 #: home-manager/home-manager:301 home-manager/home-manager:1052
 msgid "Run '%s --help' for usage help"
-msgstr "Aja '%s --help' saadaksesi käyttöohjeita"
+msgstr ""
 
 #: home-manager/home-manager:327 home-manager/home-manager:431
 msgid "The file %s already exists, leaving it unchanged..."
-msgstr "Tiedosto %s on jo olemassa, jätetään se muuttumattomaksi..."
+msgstr ""
 
 #: home-manager/home-manager:329 home-manager/home-manager:433
 msgid "Creating %s..."
-msgstr "Luodaan tiedostoa %s..."
+msgstr ""
 
 #: home-manager/home-manager:475
 msgid "Creating initial Home Manager generation..."
-msgstr "Luodaan alkuperäistä Home Manager -generaatiota..."
+msgstr ""
 
 #. translators: The "%s" specifier will be replaced by a file path.
 #: home-manager/home-manager:480
@@ -132,7 +130,7 @@ 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 "Flake-konfiguraatiota ei voi luoda"
+msgstr ""
 
 #: home-manager/home-manager:572
 msgid ""
@@ -142,20 +140,16 @@ msgid_plural ""
 "There are %d unread and relevant news items.\n"
 "Read them by running the command \"%s news\"."
 msgstr[0] ""
-"Sinulla on %d lukematon ja oleellinen uutisartikkeli.\n"
-"Lue se ajamalla komento \"%s news\"."
 msgstr[1] ""
-"Sinulla on %d lukematonta ja oleellista uutisartikkelia.\n"
-"Lue ne ajamalla komento \"%s news\"."
 
 #: home-manager/home-manager:586
 msgid "Unknown \"news.display\" setting \"%s\"."
-msgstr "Tuntematon asetus \"news.display\" \"%s\"."
+msgstr ""
 
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr "Aseta $EDITOR- tai $VISUAL-ympäristömuuttujaksi"
+msgstr ""
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"
@@ -167,11 +161,11 @@ msgstr ""
 
 #: home-manager/home-manager:695
 msgid "Cannot remove the current generation %s"
-msgstr "Nykyistä generaatiota %s ei voi poistaa"
+msgstr ""
 
 #: home-manager/home-manager:697
 msgid "Removing generation %s"
-msgstr "Generaatio %s poistetaan"
+msgstr ""
 
 #: home-manager/home-manager:718
 msgid "No generations to expire"
@@ -179,36 +173,35 @@ msgstr ""
 
 #: home-manager/home-manager:729
 msgid "No home-manager packages seem to be installed."
-msgstr "Näyttää siltä, ettei yhtään home-manager-pakettia ole asennettu."
+msgstr ""
 
 #: home-manager/home-manager:811
 msgid "Unknown argument %s"
-msgstr "Tuntematon argumentti %s"
+msgstr ""
 
 #: home-manager/home-manager:835
 msgid "This will remove Home Manager from your system."
-msgstr "Tämä poistaa Home Managerin järjestelmästäsi."
+msgstr ""
 
 #: home-manager/home-manager:838
 msgid "This is a dry run, nothing will actually be uninstalled."
-msgstr "Tämä on kuivaharjoitus, mitään ei oikeasti poisteta."
+msgstr ""
 
 #: home-manager/home-manager:842
 msgid "Really uninstall Home Manager?"
-msgstr "Haluatko varmasti poistaa Home Managerin?"
+msgstr ""
 
 #: home-manager/home-manager:848
 msgid "Switching to empty Home Manager configuration..."
-msgstr "Vaihdetaan tyhjään Home Manager -konfiguraatioon..."
+msgstr ""
 
 #: home-manager/home-manager:863
 msgid "Yay!"
-msgstr "Jes!"
+msgstr ""
 
 #: home-manager/home-manager:868
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
 msgstr ""
-"Home Manager on poistettu, mutta home.nix-tiedostosi jää koskemattomaksi."
 
 #: home-manager/home-manager:1091
 msgid "expire-generations expects one argument, got %d."
@@ -216,7 +209,7 @@ msgstr ""
 
 #: home-manager/home-manager:1113
 msgid "Unknown command: %s"
-msgstr "Tuntematon komento: %s"
+msgstr ""
 
 #: home-manager/install.nix:18
 msgid "This derivation is not buildable, please run it using nix-shell."

home-manager/po/hu.po

@@ -1,221 +0,0 @@
-# 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-07-05 14:09+0000\n"
-"Last-Translator: Ferenci Ákos <synthetace@gmail.com>\n"
-"Language-Team: Hungarian <https://hosted.weblate.org/projects/home-manager/"
-"cli/hu/>\n"
-"Language: hu\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.7-dev\n"
-
-#. translators: For example: "home-manager: missing argument for --cores"
-#: home-manager/home-manager:16
-msgid "%s: missing argument for %s"
-msgstr "%s: hiányzó érték erre: %s"
-
-#: home-manager/home-manager:64
-msgid "No configuration file found at %s"
-msgstr "Nincs konfigurációs fájl itt: %s"
-
-#. translators: The first '%s' specifier will be replaced by either
-#. 'home.nix' or 'flake.nix'.
-#: home-manager/home-manager:81 home-manager/home-manager:85
-#: home-manager/home-manager:184
-msgid ""
-"Keeping your Home Manager %s in %s is deprecated,\n"
-"please move it to %s"
-msgstr ""
-"A Home Manager %s %s elérési úton való tárolása elavult. Kérem helyezze át a "
-"%s elérési úthoz"
-
-#: home-manager/home-manager:92
-msgid "No configuration file found. Please create one at %s"
-msgstr ""
-"Nem található konfigurációs fájl. Kérem hozza létre a fájlt a %s elérési úton"
-
-#: home-manager/home-manager:107
-msgid "Home Manager not found at %s."
-msgstr "Home Manager nem található a %s elérési úton."
-
-#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
-#: home-manager/home-manager:115
-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 "%s: ismeretlen opció '%s'"
-
-#: home-manager/home-manager:301 home-manager/home-manager:1052
-msgid "Run '%s --help' for usage help"
-msgstr "Futtasa a '%s --help' parancsot a használattal kapcsolatos segítségért"
-
-#: home-manager/home-manager:327 home-manager/home-manager:431
-msgid "The file %s already exists, leaving it unchanged..."
-msgstr "A fájl %s már létezik és változatlan marad..."
-
-#: home-manager/home-manager:329 home-manager/home-manager:433
-msgid "Creating %s..."
-msgstr "%s létrehozása..."
-
-#: home-manager/home-manager:475
-msgid "Creating initial Home Manager generation..."
-msgstr "Kezdeti Home Manager generáció létrehozása..."
-
-#. translators: The "%s" specifier will be replaced by a file path.
-#: home-manager/home-manager:480
-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 "Flake konfiguráció nem példányosítható"
-
-#: 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 "Build futtatása nem lehetséges csak-olvasható könyvtárban"
-
-#: 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 "%s generáció eltávolítása"
-
-#: 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 "Ismeretlen argumentum %s"
-
-#: home-manager/home-manager:835
-msgid "This will remove Home Manager from your system."
-msgstr ""
-
-#: home-manager/home-manager:838
-msgid "This is a dry run, nothing will actually be uninstalled."
-msgstr ""
-
-#: home-manager/home-manager:842
-msgid "Really uninstall Home Manager?"
-msgstr ""
-
-#: home-manager/home-manager:848
-msgid "Switching to empty Home Manager configuration..."
-msgstr ""
-
-#: home-manager/home-manager:863
-msgid "Yay!"
-msgstr "Hurrá!"
-
-#: 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 "Ismeretlen parancs: %s"
-
-#: home-manager/install.nix:18
-msgid "This derivation is not buildable, please run it using nix-shell."
-msgstr ""

home-manager/po/ko.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-05-30 06:09+0000\n"
+"PO-Revision-Date: 2024-03-19 04:01+0000\n"
-"Last-Translator: lentil32 <lentil32@icloud.com>\n"
+"Last-Translator: honnip <me@honnip.page>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/home-manager/cli/"
 "ko/>\n"
 "Language: ko\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s: %s에 대한 인자 누락"
+msgstr ""
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"

home-manager/po/pl.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-06-17 09:46+0000\n"
+"PO-Revision-Date: 2024-02-16 22:01+0000\n"
-"Last-Translator: Mateusz P <medan1993@gmail.com>\n"
+"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/cli/"
 "pl/>\n"
 "Language: pl\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.4\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s: brakuje wartości dla %s"
+msgstr ""
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@@ -194,7 +194,7 @@ msgstr "Nieznane ustawienie „%s” „news.display”."
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr "Proszę ustawić zmienną środowiskową $EDITOR lub $VISUAL"
+msgstr ""
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"

home-manager/po/vi.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-06-02 08:12+0000\n"
+"PO-Revision-Date: 2024-03-27 15:05+0000\n"
-"Last-Translator: goatastronaut0212 <goatastronaut0212@proton.me>\n"
+"Last-Translator: Nguyen Khanh <nguynkhan479@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/home-manager/"
 "cli/vi/>\n"
 "Language: vi\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
 msgid "%s: missing argument for %s"
-msgstr "%s: bị thiếu đối số cho %s"
+msgstr ""
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@@ -36,8 +36,6 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
-"Giữ Home Manager của bạn %s ở %s đã không còn phù hợp,\n"
-"hãy chuyển nó tới %s"
 
 #: home-manager/home-manager:92
 msgid "No configuration file found. Please create one at %s"
@@ -97,7 +95,7 @@ msgstr ""
 
 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
-msgstr "Kiểm tra độ hợp lệ của Nix"
+msgstr ""
 
 #: home-manager/home-manager:166
 msgid "Could not find suitable profile directory, tried %s and %s"
@@ -106,7 +104,7 @@ msgstr "Không thể tìm thấy thư mục hồ sơ phù hợp, đã thử %s v
 #. 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 "Không thể kiểm tra tùy chọn của cấu hình flake"
+msgstr ""
 
 #: home-manager/home-manager:296 home-manager/home-manager:319
 #: home-manager/home-manager:1051
@@ -139,13 +137,6 @@ msgid ""
 "to configure Home Manager. Run 'man home-configuration.nix' to\n"
 "see all available options."
 msgstr ""
-"Đã hoàn thành! Công cụ home-manager giờ đạ được cài đặt và bạn có thể chỉnh "
-"sửa\n"
-"\n"
-"    %s\n"
-"\n"
-"để cấu hình Home Manager. Chạy lệnh 'man home-configuration.nix' để\n"
-"xem toàn bộ tùy chọn có sẵn."
 
 #. translators: The "%s" specifier will be replaced by a URL.
 #: home-manager/home-manager:485
@@ -156,11 +147,6 @@ msgid ""
 "\n"
 "if the error seems to be the fault of Home Manager."
 msgstr ""
-"Quá trình cài đặt đã thất bại! Vui lòng tạo 1 báo cáo lỗi tại\n"
-"\n"
-"    %s\n"
-"\n"
-"nếu như lỗi đó thuộc về Home Manager."
 
 #. translators: Here "flake" is a noun that refers to the Nix Flakes feature.
 #: home-manager/home-manager:496
@@ -184,11 +170,11 @@ msgstr ""
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr "Vui lòng đặt biến môi trường $EDITOR hoặc $VISUAL"
+msgstr ""
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"
-msgstr "Không thể chạy lệnh xây dựng trong thư mục chỉ cho phép đọc"
+msgstr ""
 
 #: home-manager/home-manager:693
 msgid "No generation with ID %s"
@@ -208,31 +194,31 @@ msgstr ""
 
 #: home-manager/home-manager:729
 msgid "No home-manager packages seem to be installed."
-msgstr "Không có bất kỳ gói home-manager nào được cài đặt."
+msgstr ""
 
 #: home-manager/home-manager:811
 msgid "Unknown argument %s"
-msgstr "Không tồn tại đối số %s"
+msgstr ""
 
 #: home-manager/home-manager:835
 msgid "This will remove Home Manager from your system."
-msgstr "Việc này sẽ xóa Home Manager khỏi hệ thống của bạn."
+msgstr ""
 
 #: home-manager/home-manager:838
 msgid "This is a dry run, nothing will actually be uninstalled."
-msgstr "Đây là chạy thử nghiệm, sẽ không có bất cư thứ gì được gỡ cài đặt."
+msgstr ""
 
 #: home-manager/home-manager:842
 msgid "Really uninstall Home Manager?"
-msgstr "Bạn có muốn gỡ Home Manager không?"
+msgstr ""
 
 #: home-manager/home-manager:848
 msgid "Switching to empty Home Manager configuration..."
-msgstr "Chuyển đổi sang cấu hình Home Manager trống..."
+msgstr ""
 
 #: home-manager/home-manager:863
 msgid "Yay!"
-msgstr "Tuyệt vời!"
+msgstr ""
 
 #: home-manager/home-manager:868
 msgid "Home Manager is uninstalled but your home.nix is left untouched."
@@ -244,7 +230,7 @@ msgstr ""
 
 #: home-manager/home-manager:1113
 msgid "Unknown command: %s"
-msgstr "Không tồn tại câu lệnh: %s"
+msgstr ""
 
 #: home-manager/install.nix:18
 msgid "This derivation is not buildable, please run it using nix-shell."

modules/accounts/email.nix

@@ -493,14 +493,13 @@ in {
     maildirBasePath = mkOption {
       type = types.str;
       default = "${config.home.homeDirectory}/Maildir";
-      defaultText = "Maildir";
+      defaultText = "$HOME/Maildir";
       apply = p:
         if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
       description = ''
         The base directory for account maildir directories. May be a
-        relative path (e.g. the user setting this value as "MyMaildir"),
+        relative path, in which case it is relative the home
-        in which case it is relative the home directory (e.g. resulting
+        directory.
-        in "~/MyMaildir").
       '';
     };
 

modules/config/home-cursor.nix

@@ -67,7 +67,7 @@ let
   };
 
 in {
-  meta.maintainers = [ maintainers.league ];
+  meta.maintainers = [ maintainers.polykernel maintainers.league ];
 
   imports = [
     (mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [

modules/lib/maintainers.nix

@@ -49,12 +49,6 @@
     github = "bertof";
     githubId = 9915675;
   };
-  bricked = {
-    name = "Bricked";
-    email = "hello@bricked.dev";
-    github = "brckd";
-    githubId = 92804487;
-  };
   CarlosLoboxyz = {
     name = "Carlos Lobo";
     email = "86011416+CarlosLoboxyz@users.noreply.github.com";
@@ -119,13 +113,6 @@
     github = "jack5079";
     githubId = 29169102;
   };
-  janik = {
-    name = "Janik";
-    email = "janik@aq0.de";
-    matrix = "@janik0:matrix.org";
-    github = "Janik-Haag";
-    githubId = 80165193;
-  };
   jkarlson = {
     email = "jekarlson@gmail.com";
     github = "jkarlson";
@@ -186,13 +173,6 @@
     github = "iosmanthus";
     githubId = 16307070;
   };
-  jonringer = {
-    email = "jonringer117@gmail.com";
-    matrix = "@jonringer:matrix.org";
-    github = "jonringer";
-    githubId = 7673602;
-    name = "Jonathan Ringer";
-  };
   kalhauge = {
     name = "Christian Gram Kalhauge";
     email = "kalhauge@users.noreply.github.com";
@@ -221,19 +201,6 @@
     github = "kubukoz";
     githubId = 894884;
   };
-  lheckemann = {
-    name = "Linus Heckemann";
-    email = "git@sphalerite.org";
-    github = "lheckemann";
-    githubId = 341954;
-  };
-  lilyinstarlight = {
-    email = "lily@lily.flowers";
-    matrix = "@lily:lily.flowers";
-    github = "lilyinstarlight";
-    githubId = 298109;
-    name = "Lily Foster";
-  };
   loicreynier = {
     name = "Loïc Reynier";
     email = "loic@loireynier.fr";

modules/misc/gtk.nix

@@ -221,9 +221,10 @@ in {
 
   config = mkIf cfg.enable (let
     gtkIni = optionalAttrs (cfg.font != null) {
-      gtk-font-name =
+      gtk-font-name = let
-        let fontSize = if cfg.font.size != null then cfg.font.size else 10;
+        fontSize =
-        in "${cfg.font.name} ${toString fontSize}";
+          optionalString (cfg.font.size != null) " ${toString cfg.font.size}";
+      in "${cfg.font.name}" + fontSize;
     } // optionalAttrs (cfg.theme != null) { gtk-theme-name = cfg.theme.name; }
       // optionalAttrs (cfg.iconTheme != null) {
         gtk-icon-theme-name = cfg.iconTheme.name;
@@ -244,9 +245,10 @@ in {
       '' + cfg4.extraCss;
 
     dconfIni = optionalAttrs (cfg.font != null) {
-      font-name =
+      font-name = let
-        let fontSize = if cfg.font.size != null then cfg.font.size else 10;
+        fontSize =
-        in "${cfg.font.name} ${toString fontSize}";
+          optionalString (cfg.font.size != null) " ${toString cfg.font.size}";
+      in "${cfg.font.name}" + fontSize;
     } // optionalAttrs (cfg.theme != null) { gtk-theme = cfg.theme.name; }
       // optionalAttrs (cfg.iconTheme != null) {
         icon-theme = cfg.iconTheme.name;

modules/misc/news.nix

@@ -1656,53 +1656,6 @@ in {
           See https://codeberg.org/dnkl/yambar for more.
         '';
       }
-
-      {
-        time = "2024-05-25T14:36:03+00:00";
-        message = ''
-          Multiple new options are available:
-
-          - 'nix.nixPath'
-          - 'nix.keepOldNixPath'
-          - 'nix.channels'
-        '';
-      }
-
-      {
-        time = "2024-06-22T05:49:48+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.blanket'.
-
-          Blanket is a program you can use to improve your focus and increase
-          your productivity by listening to different sounds. See
-          https://github.com/rafaelmardojai/blanket for more.
-        '';
-      }
-
-      {
-        time = "2024-06-26T07:07:17+00:00";
-        condition = with config.programs.yazi;
-          enable && (enableBashIntegration || enableZshIntegration
-            || enableFishIntegration || enableNushellIntegration);
-        message = ''
-          Yazi's shell integration wrappers have been renamed from 'ya' to 'yy'.
-
-          A new option `programs.yazi.shellWrapperName` is also available that
-          allows you to override this name.
-        '';
-      }
-
-      {
-        time = "2024-06-28T14:18:16+00:00";
-        condition = hostPlatform.isLinux;
-        message = ''
-          A new module is available: 'services.glance'.
-
-          Glance is a self-hosted dashboard that puts all your feeds in
-          one place. See https://github.com/glanceapp/glance for more.
-        '';
-      }
     ];
   };
 }

modules/misc/nix.nix

@@ -1,12 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
 
-  inherit (lib)
+let
-    boolToString concatStringsSep escape floatToString getVersion isBool
-    isConvertibleWithToString isDerivation isFloat isInt isList isString
-    literalExpression maintainers mapAttrsToList mkDefault mkEnableOption mkIf
-    mkMerge mkOption optionalString toPretty types versionAtLeast;
 
   cfg = config.nix;
 
@@ -14,27 +10,6 @@ let
 
   isNixAtLeast = versionAtLeast (getVersion nixPackage);
 
-  nixPath = concatStringsSep ":" cfg.nixPath;
-
-  useXdg = config.nix.enable
-    && (config.nix.settings.use-xdg-base-directories or false);
-  defexprDir = if useXdg then
-    "${config.xdg.stateHome}/nix/defexpr"
-  else
-    "${config.home.homeDirectory}/.nix-defexpr";
-
-  # The deploy path for declarative channels. The directory name is prefixed
-  # with a number to make it easier for files in defexprDir to control the order
-  # they'll be read relative to each other.
-  channelPath = "${defexprDir}/50-home-manager";
-
-  channelsDrv = let
-    mkEntry = name: drv: {
-      inherit name;
-      path = toString drv;
-    };
-  in pkgs.linkFarm "channels" (lib.mapAttrsToList mkEntry cfg.channels);
-
   nixConf = assert isNixAtLeast "2.2";
     let
 
@@ -127,47 +102,6 @@ in {
       '';
     };
 
-    nixPath = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      example = [
-        "$HOME/.nix-defexpr/channels"
-        "darwin-config=$HOME/.config/nixpkgs/darwin-configuration.nix"
-      ];
-      description = ''
-        Adds new directories to the Nix expression search path.
-
-        Used by Nix when looking up paths in angular brackets
-        (e.g. `<nixpkgs>`).
-      '';
-    };
-
-    keepOldNixPath = mkOption {
-      type = types.bool;
-      default = true;
-      example = false;
-      description = ''
-        Whether {option}`nix.nixPath` should keep the previously set values in
-        {env}`NIX_PATH`.
-      '';
-    };
-
-    channels = lib.mkOption {
-      type = with lib.types; attrsOf package;
-      default = { };
-      example = lib.literalExpression "{ inherit nixpkgs; }";
-      description = ''
-        A declarative alternative to Nix channels. Whereas with stock channels,
-        you would register URLs and fetch them into the Nix store with
-        {manpage}`nix-channel(1)`, this option allows you to register the store
-        path directly. One particularly useful example is registering flake
-        inputs as channels.
-
-        This option can coexist with stock Nix channels. If the same channel is
-        defined in both, this option takes precedence.
-      '';
-    };
-
     registry = mkOption {
       type = types.attrsOf (types.submodule (let
         inputAttrs = types.attrsOf
@@ -276,19 +210,6 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
-    (mkIf (cfg.nixPath != [ ] && !cfg.keepOldNixPath) {
-      home.sessionVariables.NIX_PATH = "${nixPath}";
-    })
-
-    (mkIf (cfg.nixPath != [ ] && cfg.keepOldNixPath) {
-      home.sessionVariables.NIX_PATH = "${nixPath}\${NIX_PATH:+:$NIX_PATH}";
-    })
-
-    (lib.mkIf (cfg.channels != { }) {
-      nix.nixPath = [ channelPath ];
-      home.file."${channelPath}".source = channelsDrv;
-    })
-
     (mkIf (cfg.registry != { }) {
       xdg.configFile."nix/registry.json".source =
         jsonFormat.generate "registry.json" {
@@ -311,5 +232,5 @@ in {
     })
   ]);
 
-  meta.maintainers = [ ];
+  meta.maintainers = [ maintainers.polykernel ];
 }

modules/misc/version.nix

@@ -21,7 +21,6 @@ in {
         "23.05"
         "23.11"
         "24.05"
-        "24.11"
       ];
       description = ''
         It is occasionally necessary for Home Manager to change

modules/misc/xdg-desktop-entries.nix

@@ -51,7 +51,7 @@ let
 
       terminal = mkOption {
         description = "Whether the program runs in a terminal window.";
-        type = types.nullOr types.bool;
+        type = types.bool;
         default = false;
       };
 

modules/modules.nix

@@ -274,7 +274,6 @@ let
     ./services/barrier.nix
     ./services/batsignal.nix
     ./services/betterlockscreen.nix
-    ./services/blanket.nix
     ./services/blueman-applet.nix
     ./services/borgmatic.nix
     ./services/cachix-agent.nix
@@ -301,7 +300,6 @@ let
     ./services/fusuma.nix
     ./services/getmail.nix
     ./services/git-sync.nix
-    ./services/glance.nix
     ./services/gnome-keyring.nix
     ./services/gpg-agent.nix
     ./services/grobi.nix

modules/po/ar.po

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

modules/po/fi.po

@@ -8,24 +8,21 @@ 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-05-31 17:09+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: jarre johansson <jarre@johansson.today>\n"
+"Last-Translator: Automatically generated\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/home-manager/"
+"Language-Team: none\n"
-"modules/fi/>\n"
 "Language: fi\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.6-dev\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
-msgstr "Luodaan kotitiedostolinkkejä sijaintiin %s"
+msgstr ""
 
 #: modules/files.nix:204
 msgid "Cleaning up orphan links from %s"
-msgstr "Siivotaan orpoja linkkejä sijainnista %s"
+msgstr ""
 
 #: modules/files.nix:220
 msgid "Creating profile generation %s"
@@ -53,15 +50,15 @@ msgstr ""
 
 #: modules/home-environment.nix:667
 msgid "Activating %s"
-msgstr "Aktivoidaan %s"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:22
 msgid "Migrating profile from %s to %s"
-msgstr "Siirretään profiilia sijainnista %s kohteeseen %s"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:54
 msgid "Could not find suitable profile directory, tried %s and %s"
-msgstr "Sopivaa profiilihakemistoa ei löytynyt, yritettiin %s ja %s"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:83
 msgid "Sanity checking oldGenNum and oldGenPath"
@@ -82,19 +79,6 @@ msgid ""
 "\n"
 "and trying home-manager switch again. Good luck!"
 msgstr ""
-"Edellinen generaation numero ja polku ovat ristiriidassa! Niiden on oltava "
-"joko molemmat tyhjiä tai molemmat määritettyjä, mutta ne ovat nyt asetettu "
-"seuraavasti:\n"
-"\n"
-"'%s' ja '%s'\n"
-"\n"
-"Jos et välitä menettää aiempia profiilin generointeja, niin helpoin ratkaisu "
-"on todennäköisesti suorittaa\n"
-"\n"
-"rm %s/home-manager*\n"
-"rm %s/current-home\n"
-"\n"
-"ja yrittää sitten uudelleen home-manager switch -komentoa. Onnea matkaan!"
 
 #: modules/lib-bash/activation-init.sh:127
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
@@ -106,15 +90,15 @@ msgstr ""
 
 #: modules/lib-bash/activation-init.sh:153
 msgid "Starting Home Manager activation"
-msgstr "Home Managerin aktivointi käynnistyy"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:157
 msgid "Sanity checking Nix"
-msgstr "Nixin eheys tarkistetaan"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:170
 msgid "This is a dry run"
-msgstr "Tämä on testiajo"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:174
 msgid "This is a live run"
@@ -126,4 +110,4 @@ msgstr ""
 
 #: modules/lib-bash/activation-init.sh:183
 msgid "Activation variables:"
-msgstr "Aktivointimuuttujat:"
+msgstr ""

modules/po/hu.po

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

modules/po/pl.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: Home Manager Modules\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-06-17 09:46+0000\n"
+"PO-Revision-Date: 2023-05-03 19:48+0000\n"
-"Last-Translator: Mateusz P <medan1993@gmail.com>\n"
+"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/home-manager/"
 "modules/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@@ -112,14 +112,10 @@ msgstr ""
 #: modules/lib-bash/activation-init.sh:127
 msgid "Error: USER is set to \"%s\" but we expect \"%s\""
 msgstr ""
-"Błąd: Właściwość USER ma wartość \"%s\" podczas gdy spodziewana wartość to \""
-"%s\""
 
 #: modules/lib-bash/activation-init.sh:136
 msgid "Error: HOME is set to \"%s\" but we expect \"%s\""
 msgstr ""
-"Błąd: Właściwość HOME ma wartość \"%s\" podczas gdy spodziewana wartość to \""
-"%s\""
 
 #: modules/lib-bash/activation-init.sh:153
 msgid "Starting Home Manager activation"

modules/po/vi.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-06-02 08:12+0000\n"
+"PO-Revision-Date: 2024-03-27 15:05+0000\n"
-"Last-Translator: goatastronaut0212 <goatastronaut0212@proton.me>\n"
+"Last-Translator: Nguyen Khanh <nguynkhan479@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/home-manager/"
 "modules/vi/>\n"
 "Language: vi\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.6-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: modules/files.nix:191
 msgid "Creating home file links in %s"
@@ -97,7 +97,7 @@ msgstr ""
 
 #: modules/lib-bash/activation-init.sh:157
 msgid "Sanity checking Nix"
-msgstr "Kiểm tra độ hợp lệ của Nix"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:170
 msgid "This is a dry run"
@@ -109,8 +109,8 @@ msgstr ""
 
 #: modules/lib-bash/activation-init.sh:180
 msgid "Using Nix version: %s"
-msgstr "Phiên bản Nix đươc sử dụng: %s"
+msgstr ""
 
 #: modules/lib-bash/activation-init.sh:183
 msgid "Activation variables:"
-msgstr "Các biến được kích hoạt:"
+msgstr ""

modules/programs/atuin.nix

@@ -110,18 +110,18 @@ in {
     programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
       if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
         source "${pkgs.bash-preexec}/share/bash/bash-preexec.sh"
-        eval "$(${lib.getExe cfg.package} init bash ${flagsStr})"
+        eval "$(${cfg.package}/bin/atuin init bash ${flagsStr})"
       fi
     '';
 
     programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
       if [[ $options[zle] = on ]]; then
-        eval "$(${lib.getExe cfg.package} init zsh ${flagsStr})"
+        eval "$(${cfg.package}/bin/atuin init zsh ${flagsStr})"
       fi
     '';
 
     programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
-      ${lib.getExe cfg.package} init fish ${flagsStr} | source
+      ${cfg.package}/bin/atuin init fish ${flagsStr} | source
     '';
 
     programs.nushell = mkIf cfg.enableNushellIntegration {
@@ -130,9 +130,7 @@ in {
         if not ($atuin_cache | path exists) {
           mkdir $atuin_cache
         }
-        ${
+        ${cfg.package}/bin/atuin init nu ${flagsStr} | save --force ${config.xdg.cacheHome}/atuin/init.nu
-          lib.getExe cfg.package
-        } init nu ${flagsStr} | save --force ${config.xdg.cacheHome}/atuin/init.nu
       '';
       extraConfig = ''
         source ${config.xdg.cacheHome}/atuin/init.nu

modules/programs/bash.nix

@@ -67,8 +67,8 @@ in {
       };
 
       historyControl = mkOption {
-        type = types.listOf
+        type =
-          (types.enum [ "erasedups" "ignoredups" "ignorespace" "ignoreboth" ]);
+          types.listOf (types.enum [ "erasedups" "ignoredups" "ignorespace" ]);
         default = [ ];
         description = "Controlling how commands are saved on the history list.";
       };

modules/programs/bottom.nix

@@ -56,5 +56,5 @@ in {
     };
   };
 
-  meta.maintainers = [ ];
+  meta.maintainers = [ maintainers.polykernel ];
 }

modules/programs/direnv.nix

@@ -95,7 +95,6 @@ in {
       package = mkPackageOption pkgs "nix-direnv" { };
     };
 
-    silent = mkEnableOption "silent mode, that is, disabling direnv logging";
   };
 
   config = mkIf cfg.enable {
@@ -164,7 +163,5 @@ in {
             }
         )
       '');
-
-    home.sessionVariables = lib.mkIf cfg.silent { DIRENV_LOG_FORMAT = ""; };
   };
 }

modules/programs/eww.nix

@@ -5,7 +5,6 @@ with lib;
 let
 
   cfg = config.programs.eww;
-  ewwCmd = "${cfg.package}/bin/eww";
 
 in {
   meta.maintainers = [ hm.maintainers.mainrs ];
@@ -31,40 +30,10 @@ in {
         {file}`$XDG_CONFIG_HOME/eww`.
       '';
     };
-
-    enableBashIntegration = mkEnableOption "Bash integration" // {
-      default = true;
-    };
-
-    enableZshIntegration = mkEnableOption "Zsh integration" // {
-      default = true;
-    };
-
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = true;
-    };
   };
 
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
     xdg.configFile."eww".source = cfg.configDir;
-
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
-      if [[ $TERM != "dumb" ]]; then
-        eval "$(${ewwCmd} shell-completions --shell bash)"
-      fi
-    '';
-
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
-      if [[ $TERM != "dumb" ]]; then
-        eval "$(${ewwCmd} shell-completions --shell zsh)"
-      fi
-    '';
-
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
-      if test "$TERM" != "dumb"
-        eval "$(${ewwCmd} shell-completions --shell fish)"
-      end
-    '';
   };
 }

modules/programs/eza.nix

@@ -73,7 +73,7 @@ with lib;
     args = escapeShellArgs (optional cfg.icons "--icons"
       ++ optional cfg.git "--git" ++ cfg.extraOptions);
 
-    optionsAlias = optionalAttrs (args != "") { eza = "eza ${args}"; };
+    optionsAlias = { eza = "eza ${args}"; };
 
     aliases = builtins.mapAttrs (_name: value: lib.mkDefault value) {
       ls = "eza";

modules/programs/fd.nix

@@ -38,7 +38,7 @@ with lib; {
 
     args = escapeShellArgs (optional cfg.hidden "--hidden" ++ cfg.extraOptions);
 
-    optionsAlias = optionalAttrs (args != "") { fd = "fd ${args}"; };
+    optionsAlias = { fd = "fd ${args}"; };
   in mkIf cfg.enable {
     home.packages = [ cfg.package ];
 

modules/programs/firefox.nix

@@ -1,51 +1,945 @@
-{ lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
 let
 
-  modulePath = [ "programs" "firefox" ];
+  inherit (pkgs.stdenv.hostPlatform) isDarwin;
 
-  moduleName = concatStringsSep "." modulePath;
+  cfg = config.programs.firefox;
 
-  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+  jsonFormat = pkgs.formats.json { };
+
+  mozillaConfigPath =
+    if isDarwin then "Library/Application Support/Mozilla" else ".mozilla";
+
+  firefoxConfigPath = if isDarwin then
+    "Library/Application Support/Firefox"
+  else
+    "${mozillaConfigPath}/firefox";
+
+  profilesPath =
+    if isDarwin then "${firefoxConfigPath}/Profiles" else firefoxConfigPath;
+
+  nativeMessagingHostsPath = if isDarwin then
+    "${mozillaConfigPath}/NativeMessagingHosts"
+  else
+    "${mozillaConfigPath}/native-messaging-hosts";
+
+  nativeMessagingHostsJoined = pkgs.symlinkJoin {
+    name = "ff_native-messaging-hosts";
+    paths = [
+      # Link a .keep file to keep the directory around
+      (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "")
+      # Link package configured native messaging hosts (entire Firefox actually)
+      cfg.finalPackage
+    ]
+    # Link user configured native messaging hosts
+      ++ cfg.nativeMessagingHosts;
+  };
+
+  # The extensions path shared by all profiles; will not be supported
+  # by future Firefox versions.
+  extensionPath = "extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
+
+  profiles = flip mapAttrs' cfg.profiles (_: profile:
+    nameValuePair "Profile${toString profile.id}" {
+      Name = profile.name;
+      Path = if isDarwin then "Profiles/${profile.path}" else profile.path;
+      IsRelative = 1;
+      Default = if profile.isDefault then 1 else 0;
+    }) // {
+      General = { StartWithLastProfile = 1; };
+    };
+
+  profilesIni = generators.toINI { } profiles;
+
+  userPrefValue = pref:
+    builtins.toJSON (if isBool pref || isInt pref || isString pref then
+      pref
+    else
+      builtins.toJSON pref);
+
+  mkUserJs = prefs: extraPrefs: bookmarks:
+    let
+      prefs' = lib.optionalAttrs ([ ] != bookmarks) {
+        "browser.bookmarks.file" = toString (firefoxBookmarksFile bookmarks);
+        "browser.places.importBookmarksHTML" = true;
+      } // prefs;
+    in ''
+      // Generated by Home Manager.
+
+      ${concatStrings (mapAttrsToList (name: value: ''
+        user_pref("${name}", ${userPrefValue value});
+      '') prefs')}
+
+      ${extraPrefs}
+    '';
+
+  mkContainersJson = containers:
+    let
+      containerToIdentity = _: container: {
+        userContextId = container.id;
+        name = container.name;
+        icon = container.icon;
+        color = container.color;
+        public = true;
+      };
+    in ''
+      ${builtins.toJSON {
+        version = 4;
+        lastUserContextId =
+          elemAt (mapAttrsToList (_: container: container.id) containers) 0;
+        identities = mapAttrsToList containerToIdentity containers ++ [
+          {
+            userContextId = 4294967294; # 2^32 - 2
+            name = "userContextIdInternal.thumbnail";
+            icon = "";
+            color = "";
+            accessKey = "";
+            public = false;
+          }
+          {
+            userContextId = 4294967295; # 2^32 - 1
+            name = "userContextIdInternal.webextStorageLocal";
+            icon = "";
+            color = "";
+            accessKey = "";
+            public = false;
+          }
+        ];
+      }}
+    '';
+
+  firefoxBookmarksFile = bookmarks:
+    let
+      indent = level:
+        lib.concatStringsSep "" (map (lib.const "  ") (lib.range 1 level));
+
+      bookmarkToHTML = indentLevel: bookmark:
+        ''
+          ${indent indentLevel}<DT><A HREF="${
+            escapeXML bookmark.url
+          }" ADD_DATE="1" LAST_MODIFIED="1"${
+            lib.optionalString (bookmark.keyword != null)
+            " SHORTCUTURL=\"${escapeXML bookmark.keyword}\""
+          }${
+            lib.optionalString (bookmark.tags != [ ])
+            " TAGS=\"${escapeXML (concatStringsSep "," bookmark.tags)}\""
+          }>${escapeXML bookmark.name}</A>'';
+
+      directoryToHTML = indentLevel: directory: ''
+        ${indent indentLevel}<DT>${
+          if directory.toolbar then
+            ''
+              <H3 ADD_DATE="1" LAST_MODIFIED="1" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar''
+          else
+            ''<H3 ADD_DATE="1" LAST_MODIFIED="1">${escapeXML directory.name}''
+        }</H3>
+        ${indent indentLevel}<DL><p>
+        ${allItemsToHTML (indentLevel + 1) directory.bookmarks}
+        ${indent indentLevel}</DL><p>'';
+
+      itemToHTMLOrRecurse = indentLevel: item:
+        if item ? "url" then
+          bookmarkToHTML indentLevel item
+        else
+          directoryToHTML indentLevel item;
+
+      allItemsToHTML = indentLevel: bookmarks:
+        lib.concatStringsSep "\n"
+        (map (itemToHTMLOrRecurse indentLevel) bookmarks);
+
+      bookmarkEntries = allItemsToHTML 1 bookmarks;
+    in pkgs.writeText "firefox-bookmarks.html" ''
+      <!DOCTYPE NETSCAPE-Bookmark-file-1>
+      <!-- This is an automatically generated file.
+        It will be read and overwritten.
+        DO NOT EDIT! -->
+      <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+      <TITLE>Bookmarks</TITLE>
+      <H1>Bookmarks Menu</H1>
+      <DL><p>
+      ${bookmarkEntries}
+      </DL>
+    '';
+
+  mkNoDuplicateAssertion = entities: entityKind:
+    (let
+      # Return an attribute set with entity IDs as keys and a list of
+      # entity names with corresponding ID as value. An ID is present in
+      # the result only if more than one entity has it. The argument
+      # entities is a list of AttrSet of one id/name pair.
+      findDuplicateIds = entities:
+        filterAttrs (_entityId: entityNames: length entityNames != 1)
+        (zipAttrs entities);
+
+      duplicates = findDuplicateIds (mapAttrsToList
+        (entityName: entity: { "${toString entity.id}" = entityName; })
+        entities);
+
+      mkMsg = entityId: entityNames:
+        "  - ID ${entityId} is used by " + concatStringsSep ", " entityNames;
+    in {
+      assertion = duplicates == { };
+      message = ''
+        Must not have a Firefox ${entityKind} with an existing ID but
+      '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
+    });
+
+  wrapPackage = package:
+    let
+      # The configuration expected by the Firefox wrapper.
+      fcfg = { enableGnomeExtensions = cfg.enableGnomeExtensions; };
+
+      # A bit of hackery to force a config into the wrapper.
+      browserName =
+        package.browserName or (builtins.parseDrvName package.name).name;
+
+      # The configuration expected by the Firefox wrapper builder.
+      bcfg = setAttrByPath [ browserName ] fcfg;
+
+    in if package == null then
+      null
+    else if isDarwin then
+      package
+    else if versionAtLeast config.home.stateVersion "19.09" then
+      package.override (old: {
+        cfg = old.cfg or { } // fcfg;
+        extraPolicies = (old.extraPolicies or { }) // cfg.policies;
+      })
+    else
+      (pkgs.wrapFirefox.override { config = bcfg; }) package { };
 
 in {
-  meta.maintainers =
+  meta.maintainers = [ maintainers.rycee maintainers.kira-bruneau ];
-    [ maintainers.rycee maintainers.kira-bruneau hm.maintainers.bricked ];
 
   imports = [
-    (mkFirefoxModule {
+    (mkRemovedOptionModule [ "programs" "firefox" "extensions" ] ''
-      inherit modulePath;
-      name = "Firefox";
-      wrappedPackageName = "firefox";
-      unwrappedPackageName = "firefox-unwrapped";
-      visible = true;
-
-      platforms.linux = rec {
-        vendorPath = ".mozilla";
-        configPath = "${vendorPath}/firefox";
-      };
-      platforms.darwin = {
-        vendorPath = "Library/Application Support/Mozilla";
-        configPath = "Library/Application Support/Firefox";
-      };
-    })
-
-    (mkRemovedOptionModule (modulePath ++ [ "extensions" ]) ''
 
       Extensions are now managed per-profile. That is, change from
 
-        ${moduleName}.extensions = [ foo bar ];
+        programs.firefox.extensions = [ foo bar ];
 
       to
 
-        ${moduleName}.profiles.myprofile.extensions = [ foo bar ];'')
+        programs.firefox.profiles.myprofile.extensions = [ foo bar ];'')
-    (mkRemovedOptionModule (modulePath ++ [ "enableAdobeFlash" ])
+    (mkRemovedOptionModule [ "programs" "firefox" "enableAdobeFlash" ]
       "Support for this option has been removed.")
-    (mkRemovedOptionModule (modulePath ++ [ "enableGoogleTalk" ])
+    (mkRemovedOptionModule [ "programs" "firefox" "enableGoogleTalk" ]
       "Support for this option has been removed.")
-    (mkRemovedOptionModule (modulePath ++ [ "enableIcedTea" ])
+    (mkRemovedOptionModule [ "programs" "firefox" "enableIcedTea" ]
       "Support for this option has been removed.")
   ];
+
+  options = {
+    programs.firefox = {
+      enable = mkEnableOption "Firefox";
+
+      package = mkOption {
+        type = with types; nullOr package;
+        default = if versionAtLeast config.home.stateVersion "19.09" then
+          pkgs.firefox
+        else
+          pkgs.firefox-unwrapped;
+        defaultText = literalExpression "pkgs.firefox";
+        example = literalExpression ''
+          pkgs.firefox.override {
+            # See nixpkgs' firefox/wrapper.nix to check which options you can use
+            nativeMessagingHosts = [
+              # Gnome shell native connector
+              pkgs.gnome-browser-connector
+              # Tridactyl native connector
+              pkgs.tridactyl-native
+            ];
+          }
+        '';
+        description = ''
+          The Firefox package to use. If state version ≥ 19.09 then
+          this should be a wrapped Firefox package. For earlier state
+          versions it should be an unwrapped Firefox package.
+          Set to `null` to disable installing Firefox.
+        '';
+      };
+
+      nativeMessagingHosts = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        description = ''
+          Additional packages containing native messaging hosts that should be
+          made available to Firefox extensions.
+        '';
+      };
+
+      finalPackage = mkOption {
+        type = with types; nullOr package;
+        readOnly = true;
+        description = "Resulting Firefox package.";
+      };
+
+      policies = mkOption {
+        type = types.attrsOf jsonFormat.type;
+        default = { };
+        description =
+          "[See list of policies](https://mozilla.github.io/policy-templates/).";
+        example = {
+          DefaultDownloadDirectory = "\${home}/Downloads";
+          BlockAboutConfig = true;
+        };
+      };
+
+      profiles = mkOption {
+        type = types.attrsOf (types.submodule ({ config, name, ... }: {
+          options = {
+            name = mkOption {
+              type = types.str;
+              default = name;
+              description = "Profile name.";
+            };
+
+            id = mkOption {
+              type = types.ints.unsigned;
+              default = 0;
+              description = ''
+                Profile ID. This should be set to a unique number per profile.
+              '';
+            };
+
+            settings = mkOption {
+              type = types.attrsOf (jsonFormat.type // {
+                description =
+                  "Firefox preference (int, bool, string, and also attrs, list, float as a JSON string)";
+              });
+              default = { };
+              example = literalExpression ''
+                {
+                  "browser.startup.homepage" = "https://nixos.org";
+                  "browser.search.region" = "GB";
+                  "browser.search.isUS" = false;
+                  "distribution.searchplugins.defaultLocale" = "en-GB";
+                  "general.useragent.locale" = "en-GB";
+                  "browser.bookmarks.showMobileBookmarks" = true;
+                  "browser.newtabpage.pinned" = [{
+                    title = "NixOS";
+                    url = "https://nixos.org";
+                  }];
+                }
+              '';
+              description = ''
+                Attribute set of Firefox preferences.
+
+                Firefox only supports int, bool, and string types for
+                preferences, but home-manager will automatically
+                convert all other JSON-compatible values into strings.
+              '';
+            };
+
+            extraConfig = mkOption {
+              type = types.lines;
+              default = "";
+              description = ''
+                Extra preferences to add to {file}`user.js`.
+              '';
+            };
+
+            userChrome = mkOption {
+              type = types.lines;
+              default = "";
+              description = "Custom Firefox user chrome CSS.";
+              example = ''
+                /* Hide tab bar in FF Quantum */
+                @-moz-document url("chrome://browser/content/browser.xul") {
+                  #TabsToolbar {
+                    visibility: collapse !important;
+                    margin-bottom: 21px !important;
+                  }
+
+                  #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
+                    visibility: collapse !important;
+                  }
+                }
+              '';
+            };
+
+            userContent = mkOption {
+              type = types.lines;
+              default = "";
+              description = "Custom Firefox user content CSS.";
+              example = ''
+                /* Hide scrollbar in FF Quantum */
+                *{scrollbar-width:none !important}
+              '';
+            };
+
+            bookmarks = mkOption {
+              type = let
+                bookmarkSubmodule = types.submodule ({ config, name, ... }: {
+                  options = {
+                    name = mkOption {
+                      type = types.str;
+                      default = name;
+                      description = "Bookmark name.";
+                    };
+
+                    tags = mkOption {
+                      type = types.listOf types.str;
+                      default = [ ];
+                      description = "Bookmark tags.";
+                    };
+
+                    keyword = mkOption {
+                      type = types.nullOr types.str;
+                      default = null;
+                      description = "Bookmark search keyword.";
+                    };
+
+                    url = mkOption {
+                      type = types.str;
+                      description = "Bookmark url, use %s for search terms.";
+                    };
+                  };
+                }) // {
+                  description = "bookmark submodule";
+                };
+
+                bookmarkType = types.addCheck bookmarkSubmodule (x: x ? "url");
+
+                directoryType = types.submodule ({ config, name, ... }: {
+                  options = {
+                    name = mkOption {
+                      type = types.str;
+                      default = name;
+                      description = "Directory name.";
+                    };
+
+                    bookmarks = mkOption {
+                      type = types.listOf nodeType;
+                      default = [ ];
+                      description = "Bookmarks within directory.";
+                    };
+
+                    toolbar = mkOption {
+                      type = types.bool;
+                      default = false;
+                      description = ''
+                        Make this the toolbar directory. Note, this does _not_
+                        mean that this directory will be added to the toolbar,
+                        this directory _is_ the toolbar.
+                      '';
+                    };
+                  };
+                }) // {
+                  description = "directory submodule";
+                };
+
+                nodeType = types.either bookmarkType directoryType;
+              in with types;
+              coercedTo (attrsOf nodeType) attrValues (listOf nodeType);
+              default = [ ];
+              example = literalExpression ''
+                [
+                  {
+                    name = "wikipedia";
+                    tags = [ "wiki" ];
+                    keyword = "wiki";
+                    url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+                  }
+                  {
+                    name = "kernel.org";
+                    url = "https://www.kernel.org";
+                  }
+                  {
+                    name = "Nix sites";
+                    toolbar = true;
+                    bookmarks = [
+                      {
+                        name = "homepage";
+                        url = "https://nixos.org/";
+                      }
+                      {
+                        name = "wiki";
+                        tags = [ "wiki" "nix" ];
+                        url = "https://wiki.nixos.org/";
+                      }
+                    ];
+                  }
+                ]
+              '';
+              description = ''
+                Preloaded bookmarks. Note, this may silently overwrite any
+                previously existing bookmarks!
+              '';
+            };
+
+            path = mkOption {
+              type = types.str;
+              default = name;
+              description = "Profile path.";
+            };
+
+            isDefault = mkOption {
+              type = types.bool;
+              default = config.id == 0;
+              defaultText = "true if profile ID is 0";
+              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 Firefox 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 Firefox.
+
+                  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.
+                '';
+              };
+            };
+
+            containersForce = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Whether to force replace the existing containers
+                configuration. This is recommended since Firefox will
+                replace the symlink on every launch, but note that you'll
+                lose any existing configuration by enabling this.
+              '';
+            };
+
+            containers = mkOption {
+              type = types.attrsOf (types.submodule ({ name, ... }: {
+                options = {
+                  name = mkOption {
+                    type = types.str;
+                    default = name;
+                    description = "Container name, e.g., shopping.";
+                  };
+
+                  id = mkOption {
+                    type = types.ints.unsigned;
+                    default = 0;
+                    description = ''
+                      Container ID. This should be set to a unique number per container in this profile.
+                    '';
+                  };
+
+                  # List of colors at
+                  # https://searchfox.org/mozilla-central/rev/5ad226c7379b0564c76dc3b54b44985356f94c5a/toolkit/components/extensions/parent/ext-contextualIdentities.js#32
+                  color = mkOption {
+                    type = types.enum [
+                      "blue"
+                      "turquoise"
+                      "green"
+                      "yellow"
+                      "orange"
+                      "red"
+                      "pink"
+                      "purple"
+                      "toolbar"
+                    ];
+                    default = "pink";
+                    description = "Container color.";
+                  };
+
+                  icon = mkOption {
+                    type = types.enum [
+                      "briefcase"
+                      "cart"
+                      "circle"
+                      "dollar"
+                      "fence"
+                      "fingerprint"
+                      "gift"
+                      "vacation"
+                      "food"
+                      "fruit"
+                      "pet"
+                      "tree"
+                      "chill"
+                    ];
+                    default = "fruit";
+                    description = "Container icon.";
+                  };
+                };
+              }));
+              default = { };
+              example = {
+                "shopping" = {
+                  id = 1;
+                  color = "blue";
+                  icon = "cart";
+                };
+                "dangerous" = {
+                  id = 2;
+                  color = "red";
+                  icon = "fruit";
+                };
+              };
+              description = ''
+                Attribute set of container configurations. See
+                [Multi-Account
+                Containers](https://support.mozilla.org/en-US/kb/containers)
+                for more information.
+              '';
+            };
+
+            extensions = mkOption {
+              type = types.listOf types.package;
+              default = [ ];
+              example = literalExpression ''
+                with pkgs.nur.repos.rycee.firefox-addons; [
+                  privacy-badger
+                ]
+              '';
+              description = ''
+                List of Firefox add-on packages to install for this profile.
+                Some pre-packaged add-ons are accessible from the
+                [Nix User Repository](https://github.com/nix-community/NUR).
+                Once you have NUR installed run
+
+                ```console
+                $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
+                ```
+
+                to list the available Firefox add-ons.
+
+                Note that it is necessary to manually enable these extensions
+                inside Firefox after the first installation.
+
+                To automatically enable extensions add
+                `"extensions.autoDisableScopes" = 0;`
+                to
+                [{option}`programs.firefox.profiles.<profile>.settings`](#opt-programs.firefox.profiles._name_.settings)
+              '';
+            };
+
+          };
+        }));
+        default = { };
+        description = "Attribute set of Firefox profiles.";
+      };
+
+      enableGnomeExtensions = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the GNOME Shell native host connector. Note, you
+          also need to set the NixOS option
+          `services.gnome.gnome-browser-connector.enable` to
+          `true`.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (let
+        defaults =
+          catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
+      in {
+        assertion = cfg.profiles == { } || length defaults == 1;
+        message = "Must have exactly one default Firefox profile but found "
+          + toString (length defaults) + optionalString (length defaults > 1)
+          (", namely " + concatStringsSep ", " defaults);
+      })
+
+      (let
+        getContainers = profiles:
+          flatten
+          (mapAttrsToList (_: value: (attrValues value.containers)) profiles);
+
+        findInvalidContainerIds = profiles:
+          filter (container: container.id >= 4294967294)
+          (getContainers profiles);
+      in {
+        assertion = cfg.profiles == { }
+          || length (findInvalidContainerIds cfg.profiles) == 0;
+        message = "Container id must be smaller than 4294967294 (2^32 - 2)";
+      })
+
+      (mkNoDuplicateAssertion cfg.profiles "profile")
+    ] ++ (mapAttrsToList
+      (_: profile: mkNoDuplicateAssertion profile.containers "container")
+      cfg.profiles);
+
+    warnings = optional (cfg.enableGnomeExtensions or false) ''
+      Using 'programs.firefox.enableGnomeExtensions' has been deprecated and
+      will be removed in the future. Please change to overriding the package
+      configuration using 'programs.firefox.package' instead. You can refer to
+      its example for how to do this.
+    '';
+
+    programs.firefox.finalPackage = wrapPackage cfg.package;
+
+    home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
+
+    home.file = mkMerge ([{
+      "${firefoxConfigPath}/profiles.ini" =
+        mkIf (cfg.profiles != { }) { text = profilesIni; };
+
+      "${nativeMessagingHostsPath}" = {
+        source =
+          "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts";
+        recursive = true;
+      };
+    }] ++ flip mapAttrsToList cfg.profiles (_: profile: {
+      "${profilesPath}/${profile.path}/.keep".text = "";
+
+      "${profilesPath}/${profile.path}/chrome/userChrome.css" =
+        mkIf (profile.userChrome != "") { text = profile.userChrome; };
+
+      "${profilesPath}/${profile.path}/chrome/userContent.css" =
+        mkIf (profile.userContent != "") { text = profile.userContent; };
+
+      "${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { }
+        || profile.extraConfig != "" || profile.bookmarks != [ ]) {
+          text =
+            mkUserJs profile.settings profile.extraConfig profile.bookmarks;
+        };
+
+      "${profilesPath}/${profile.path}/containers.json" =
+        mkIf (profile.containers != { }) {
+          force = profile.containersForce;
+          text = mkContainersJson profile.containers;
+        };
+
+      "${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]/programs.firefox.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 Firefox, 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 "Firefox"
+              else
+                null;
+
+              privateSalt = if profile.search.privateDefault != null then
+                profile.path + profile.search.privateDefault
+                + disclaimer "Firefox"
+              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}/extensions" =
+        mkIf (profile.extensions != [ ]) {
+          source = let
+            extensionsEnvPkg = pkgs.buildEnv {
+              name = "hm-firefox-extensions";
+              paths = profile.extensions;
+            };
+          in "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
+          recursive = true;
+          force = true;
+        };
+    }));
+  };
 }

modules/programs/gh-dash.nix

@@ -7,7 +7,7 @@ let
   yamlFormat = pkgs.formats.yaml { };
 
 in {
-  meta.maintainers = [ lib.hm.maintainers.janik ];
+  meta.maintainers = [ lib.maintainers.janik ];
 
   options.programs.gh-dash = {
     enable = lib.mkEnableOption "GitHub CLI dashboard plugin";

modules/programs/gnome-terminal.nix

@@ -316,7 +316,7 @@ in {
       })
     ];
 
-    home.packages = [ pkgs.gnome-terminal ];
+    home.packages = [ pkgs.gnome.gnome-terminal ];
 
     dconf.settings = let dconfPath = "org/gnome/terminal/legacy";
     in {

modules/programs/hyfetch.nix

@@ -7,7 +7,7 @@ let
 
   jsonFormat = pkgs.formats.json { };
 in {
-  meta.maintainers = [ hm.maintainers.lilyinstarlight ];
+  meta.maintainers = [ maintainers.lilyinstarlight ];
 
   options.programs.hyfetch = {
     enable = mkEnableOption "hyfetch";

modules/programs/jujutsu.nix

@@ -7,11 +7,6 @@ let
   cfg = config.programs.jujutsu;
   tomlFormat = pkgs.formats.toml { };
 
-  configDir = if pkgs.stdenv.isDarwin then
-    "Library/Application Support"
-  else
-    config.xdg.configHome;
-
 in {
   meta.maintainers = [ maintainers.shikanime ];
 
@@ -56,7 +51,7 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    home.file."${configDir}/jj/config.toml" = mkIf (cfg.settings != { }) {
+    xdg.configFile."jj/config.toml" = mkIf (cfg.settings != { }) {
       source = tomlFormat.generate "jujutsu-config" (cfg.settings
         // optionalAttrs (cfg.ediff) (let
           emacsDiffScript = pkgs.writeShellScriptBin "emacs-ediff" ''

modules/programs/khal.nix

@@ -168,8 +168,6 @@ in {
   options.programs.khal = {
     enable = mkEnableOption "khal, a CLI calendar application";
 
-    package = mkPackageOption pkgs "khal" { };
-
     locale = mkOption {
       type = lib.types.submodule { options = localeOptions; };
       description = ''
@@ -199,7 +197,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = [ pkgs.khal ];
 
     xdg.configFile."khal/config".text = concatStringsSep "\n" ([ "[calendars]" ]
       ++ mapAttrsToList genCalendarStr khalAccounts ++ [

modules/programs/khard.nix

@@ -68,11 +68,6 @@ in {
       type = with lib.types;
         attrsOf (submodule {
           options.khard.enable = lib.mkEnableOption "khard access";
-          options.khard.defaultCollection = lib.mkOption {
-            type = types.str;
-            default = "";
-            description = "VCARD collection to be searched by khard.";
-          };
         });
     };
   };
@@ -80,17 +75,11 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = [ pkgs.khard ];
 
-    xdg.configFile."khard/khard.conf".text = let
+    xdg.configFile."khard/khard.conf".text = ''
-      makePath = anAccount:
-        builtins.toString (/. + lib.concatStringsSep "/" [
-          anAccount.local.path
-          anAccount.khard.defaultCollection
-        ]);
-    in ''
       [addressbooks]
       ${lib.concatMapStringsSep "\n" (acc: ''
         [[${acc.name}]]
-        path = ${makePath acc}
+        path = ${acc.local.path}
       '') (lib.attrValues accounts)}
 
       ${renderSettings cfg.settings}

modules/programs/mcfly.nix

@@ -5,8 +5,6 @@ let
 
   cfg = config.programs.mcfly;
 
-  tomlFormat = pkgs.formats.toml { };
-
   bashIntegration = ''
     eval "$(${getExe pkgs.mcfly} init bash)"
   '' + optionalString cfg.fzf.enable ''
@@ -42,37 +40,6 @@ in {
   options.programs.mcfly = {
     enable = mkEnableOption "mcfly";
 
-    settings = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      example = literalExpression ''
-        {
-          colors = {
-            menubar = {
-              bg = "black";
-              fg = "red";
-            };
-            darkmode = {
-              prompt = "cyan";
-              timing = "yellow";
-              results_selection_fg = "cyan";
-              results_selection_bg = "black";
-              results_selection_hl = "red";
-            };
-          };
-        }
-      '';
-      description = ''
-        Settings written to {file}`~/.config/mcfly/config.toml`.
-
-        Note, if your McFly database is currently in {file}`~/.mcfly`,
-        then this option has no effect.
-        Move the database to {file}`$XDG_DATA_DIR/mcfly/history.db` and
-        remove {file}`~/.mcfly` to make the settings take effect. See
-        <https://github.com/cantino/mcfly#database-location>.
-      '';
-    };
-
     keyScheme = mkOption {
       type = types.enum [ "emacs" "vim" ];
       default = "emacs";
@@ -138,11 +105,6 @@ in {
     {
       home.packages = [ pkgs.mcfly ] ++ optional cfg.fzf.enable pkgs.mcfly-fzf;
 
-      # Oddly enough, McFly expects this in the data path, not in config.
-      xdg.dataFile."mcfly/config.toml" = mkIf (cfg.settings != { }) {
-        source = tomlFormat.generate "mcfly-config.toml" cfg.settings;
-      };
-
       programs.bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration;
 
       programs.zsh.initExtra = mkIf cfg.enableZshIntegration zshIntegration;

modules/programs/micro.nix

@@ -15,8 +15,6 @@ in {
     programs.micro = {
       enable = mkEnableOption "micro, a terminal-based text editor";
 
-      package = mkPackageOption pkgs "micro" { };
-
       settings = mkOption {
         type = jsonFormat.type;
         default = { };
@@ -37,7 +35,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
+    home.packages = [ pkgs.micro ];
 
     xdg.configFile."micro/settings.json".source =
       jsonFormat.generate "micro-settings" cfg.settings;

modules/programs/mpv.nix

@@ -55,10 +55,8 @@ let
 
   mpvPackage = if cfg.scripts == [ ] then
     cfg.package
-  else if hasAttr "wrapMpv" pkgs then
-    pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; }
   else
-    pkgs.mpv.override { scripts = cfg.scripts; };
+    pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; };
 
 in {
   options = {
@@ -229,5 +227,5 @@ in {
     }
   ]);
 
-  meta.maintainers = with maintainers; [ thiagokokada chuangzhu ];
+  meta.maintainers = with maintainers; [ tadeokondrak thiagokokada chuangzhu ];
 }

modules/programs/papis.nix

@@ -19,8 +19,6 @@ in {
   options.programs.papis = {
     enable = mkEnableOption "papis";
 
-    package = mkPackageOption pkgs "papis" { };
-
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str ]);
       default = { };
@@ -86,7 +84,7 @@ in {
         (", namely " + concatStringsSep "," defaultLibraries);
     }];
 
-    home.packages = [ cfg.package ];
+    home.packages = [ pkgs.papis ];
 
     xdg.configFile."papis/config" =
       mkIf (cfg.libraries != { }) { text = generators.toINI { } settingsIni; };

modules/programs/rbw.nix

@@ -19,7 +19,7 @@ let
         base_url = mkOption {
           type = with types; nullOr str;
           default = null;
-          example = "https://bitwarden.example.com/";
+          example = "bitwarden.example.com";
           description =
             "The base-url for a self-hosted bitwarden installation.";
         };
@@ -27,7 +27,7 @@ let
         identity_url = mkOption {
           type = with types; nullOr str;
           default = null;
-          example = "https://identity.example.com/";
+          example = "identity.example.com";
           description = "The identity url for your bitwarden installation.";
         };
 

modules/programs/script-directory.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 let cfg = config.programs.script-directory;
 in {
-  meta.maintainers = [ lib.hm.maintainers.janik ];
+  meta.maintainers = [ lib.maintainers.janik ];
 
   options.programs.script-directory = {
     enable = lib.mkEnableOption "script-directory";

modules/programs/sm64ex.nix

@@ -29,7 +29,7 @@ let
     in "${key} ${generatedValue}";
 
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = [ maintainers.ivar ];
 
   options.programs.sm64ex = {
     enable = mkEnableOption "sm64ex";

modules/programs/starship.nix

@@ -24,7 +24,14 @@ in {
     };
 
     settings = mkOption {
-      type = tomlFormat.type;
+      type = with types;
+        let
+          prim = either bool (either int str);
+          primOrPrimAttrs = either prim (attrsOf prim);
+          entry = either prim (listOf primOrPrimAttrs);
+          entryOrAttrsOf = t: either entry (attrsOf t);
+          entries = entryOrAttrsOf (entryOrAttrsOf entry);
+        in attrsOf entries // { description = "Starship configuration"; };
       default = { };
       example = literalExpression ''
         {

modules/programs/topgrade.nix

@@ -28,7 +28,6 @@ in {
       defaultText = literalExpression "{ }";
       example = literalExpression ''
         {
-          misc = {
           assume_yes = true;
           disable = [
             "flutter"
@@ -36,7 +35,6 @@ in {
           ];
           set_title = false;
           cleanup = true;
-          };
           commands = {
             "Run garbage collection on Nix store" = "nix-collect-garbage";
           };

modules/programs/watson.nix

@@ -14,7 +14,7 @@ let
     config.xdg.configHome;
 
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = [ maintainers.polykernel ];
 
   options.programs.watson = {
     enable = mkEnableOption "watson, a wonderful CLI to track your time";

modules/programs/waybar.nix

@@ -69,8 +69,8 @@ let
         };
 
         modules-left = mkOption {
-          type = nullOr (listOf str);
+          type = listOf str;
-          default = null;
+          default = [ ];
           description = "Modules that will be displayed on the left.";
           example = literalExpression ''
             [ "sway/workspaces" "sway/mode" "wlr/taskbar" ]
@@ -78,8 +78,8 @@ let
         };
 
         modules-center = mkOption {
-          type = nullOr (listOf str);
+          type = listOf str;
-          default = null;
+          default = [ ];
           description = "Modules that will be displayed in the center.";
           example = literalExpression ''
             [ "sway/window" ]
@@ -87,8 +87,8 @@ let
         };
 
         modules-right = mkOption {
-          type = nullOr (listOf str);
+          type = listOf str;
-          default = null;
+          default = [ ];
           description = "Modules that will be displayed on the right.";
           example = literalExpression ''
             [ "mpd" "custom/mymodule#with-css-id" "temperature" ]

modules/programs/yazi.nix

@@ -7,29 +7,29 @@ let
   tomlFormat = pkgs.formats.toml { };
 
   bashIntegration = ''
-    function ${cfg.shellWrapperName}() {
+    function ya() {
       local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
       yazi "$@" --cwd-file="$tmp"
       if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
-        builtin cd -- "$cwd"
+        cd -- "$cwd"
       fi
       rm -f -- "$tmp"
     }
   '';
 
   fishIntegration = ''
-    function ${cfg.shellWrapperName}
+    function ya
       set tmp (mktemp -t "yazi-cwd.XXXXX")
       yazi $argv --cwd-file="$tmp"
       if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-        builtin cd -- "$cwd"
+        cd -- "$cwd"
       end
       rm -f -- "$tmp"
     end
   '';
 
   nushellIntegration = ''
-    def --env ${cfg.shellWrapperName} [...args] {
+    def --env ya [...args] {
       let tmp = (mktemp -t "yazi-cwd.XXXXX")
       yazi ...$args --cwd-file $tmp
       let cwd = (open $tmp)
@@ -40,20 +40,16 @@ let
     }
   '';
 in {
-  meta.maintainers = with maintainers; [ xyenon eljamm ];
+  meta.maintainers = [ maintainers.xyenon ];
 
   options.programs.yazi = {
     enable = mkEnableOption "yazi";
 
-    package = mkPackageOption pkgs "yazi" { };
+    package = mkOption {
-
+      type = types.package;
-    shellWrapperName = mkOption {
+      default = pkgs.yazi;
-      type = types.str;
+      defaultText = literalExpression "pkgs.yazi";
-      default = "yy";
+      description = "Yazi package to install.";
-      example = "y";
-      description = ''
-        Name of the shell wrapper to be called.
-      '';
     };
 
     enableBashIntegration = mkEnableOption "Bash integration";
@@ -139,52 +135,6 @@ in {
         for the full list of options
       '';
     };
-
-    initLua = mkOption {
-      type = with types; nullOr (either path lines);
-      default = null;
-      description = ''
-        The init.lua for Yazi itself.
-      '';
-      example = literalExpression "./init.lua";
-    };
-
-    plugins = mkOption {
-      type = with types; attrsOf (oneOf [ path package ]);
-      default = { };
-      description = ''
-        Lua plugins.
-        Values should be a package or path containing an `init.lua` file.
-        Will be linked to {file}`$XDG_CONFIG_HOME/yazi/plugins/<name>.yazi`.
-
-        See <https://yazi-rs.github.io/docs/plugins/overview>
-        for documentation.
-      '';
-      example = literalExpression ''
-        {
-          foo = ./foo;
-          bar = pkgs.bar;
-        }
-      '';
-    };
-
-    flavors = mkOption {
-      type = with types; attrsOf (oneOf [ path package ]);
-      default = { };
-      description = ''
-        Pre-made themes.
-        Values should be a package or path containing the required files.
-        Will be linked to {file}`$XDG_CONFIG_HOME/yazi/flavors/<name>.yazi`.
-
-        See <https://yazi-rs.github.io/docs/flavors/overview/> for documentation.
-      '';
-      example = literalExpression ''
-        {
-          foo = ./foo;
-          bar = pkgs.bar;
-        }
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -210,69 +160,6 @@ in {
       "yazi/theme.toml" = mkIf (cfg.theme != { }) {
         source = tomlFormat.generate "yazi-theme" cfg.theme;
       };
-      "yazi/init.lua" = mkIf (cfg.initLua != null)
+    };
-        (if builtins.isPath cfg.initLua then {
-          source = cfg.initLua;
-        } else {
-          text = cfg.initLua;
-        });
-    } // (mapAttrs' (name: value:
-      nameValuePair "yazi/flavors/${name}.yazi" { source = value; })
-      cfg.flavors) // (mapAttrs' (name: value:
-        nameValuePair "yazi/plugins/${name}.yazi" { source = value; })
-        cfg.plugins);
-
-    warnings = filter (s: s != "") (concatLists [
-      (mapAttrsToList (name: value:
-        optionalString (hasSuffix ".yazi" name) ''
-          Flavors like `programs.yazi.flavors."${name}"` should no longer have the suffix ".yazi" in their attribute name.
-          The flavor will be linked to `$XDG_CONFIG_HOME/yazi/flavors/${name}.yazi`.
-          You probably want to rename it to `programs.yazi.flavors."${
-            removeSuffix ".yazi" name
-          }"`.
-        '') cfg.flavors)
-      (mapAttrsToList (name: value:
-        optionalString (hasSuffix ".yazi" name) ''
-          Plugins like `programs.yazi.plugins."${name}"` should no longer have the suffix ".yazi" in their attribute name.
-          The plugin will be linked to `$XDG_CONFIG_HOME/yazi/plugins/${name}.yazi`.
-          You probably want to rename it to `programs.yazi.plugins."${
-            removeSuffix ".yazi" name
-          }"`.
-        '') cfg.plugins)
-    ]);
-
-    assertions = let
-      mkAsserts = opt: requiredFiles:
-        mapAttrsToList (name: value:
-          let
-            isDir = pathIsDirectory "${value}";
-            msgNotDir = optionalString (!isDir)
-              "The path or package should be a directory, not a single file.";
-            isFileMissing = file:
-              !(pathExists "${value}/${file}")
-              || pathIsDirectory "${value}/${file}";
-            missingFiles = filter isFileMissing requiredFiles;
-            msgFilesMissing = optionalString (missingFiles != [ ])
-              "The ${singularOpt} is missing these files: ${
-                toString missingFiles
-              }";
-            singularOpt = removeSuffix "s" opt;
-          in {
-            assertion = isDir && missingFiles == [ ];
-            message = ''
-              Value at `programs.yazi.${opt}.${name}` is not a valid yazi ${singularOpt}.
-              ${msgNotDir}
-              ${msgFilesMissing}
-              Evaluated value: `${value}`
-            '';
-          }) cfg.${opt};
-    in (mkAsserts "flavors" [
-      "flavor.toml"
-      "tmtheme.xml"
-      "README.md"
-      "preview.png"
-      "LICENSE"
-      "LICENSE-tmtheme"
-    ]) ++ (mkAsserts "plugins" [ "init.lua" ]);
   };
 }

modules/programs/zsh.nix

@@ -398,22 +398,6 @@ in
             {manpage}`zshzle(1)` for syntax.
           '';
         };
-
-        strategy = mkOption {
-          type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]);
-          default = [ "history" ];
-          description = ''
-            `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated.
-            The strategies in the array are tried successively until a suggestion is found.
-            There are currently three built-in strategies to choose from:
-
-            - `history`: Chooses the most recent match from history.
-            - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module)
-            - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches
-                the most recently executed command. Note that this strategy won't work as expected with ZSH options that
-                don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
-          '';
-        };
       };
 
       history = mkOption {
@@ -626,7 +610,6 @@ in
 
         (optionalString cfg.autosuggestion.enable ''
           source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-          ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy})
         '')
         (optionalString (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
           ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"

modules/services/blanket.nix

@@ -1,40 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-let
-  cfg = config.services.blanket;
-
-  inherit (lib) mkIf mkEnableOption mkPackageOption hm platforms;
-in {
-  meta.maintainers = [ lib.maintainers.daru-san ];
-
-  options.services.blanket = {
-    enable = mkEnableOption "blanket";
-
-    package = mkPackageOption pkgs "blanket" { };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      (hm.assertions.assertPlatform "services.blanket" pkgs platforms.linux)
-    ];
-
-    home.packages = [ cfg.package ];
-
-    systemd.user.services.blanket = {
-      Unit = {
-        Description = "Blanket daemon";
-        Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" "pipewire.service" ];
-      };
-
-      Install.WantedBy = [ "graphical-session.target" ];
-
-      Service = {
-        ExecStart = "${cfg.package}/bin/blanket --gapplication-service";
-        Restart = "on-failure";
-        RestartSec = 5;
-      };
-    };
-  };
-}

modules/services/cliphist.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let cfg = config.services.cliphist;
 in {
-  meta.maintainers = [ lib.hm.maintainers.janik ];
+  meta.maintainers = [ lib.maintainers.janik ];
 
   options.services.cliphist = {
     enable =

modules/services/dunst.nix

@@ -172,7 +172,7 @@ in {
 
         mkPath = { basePath, theme, category }:
           "${basePath}/share/icons/${theme.name}/${theme.size}/${category}";
-      in concatMapStringsSep ":" mkPath (cartesianProduct {
+      in concatMapStringsSep ":" mkPath (cartesianProductOfSets {
         basePath = basePaths;
         theme = themes;
         category = categories;

modules/services/fnott.nix

@@ -9,7 +9,7 @@ let
 
   iniFormat = pkgs.formats.ini { };
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = with maintainers; [ polykernel ];
 
   options = {
     services.fnott = {

modules/services/glance.nix

@@ -1,77 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.services.glance;
-
-  inherit (lib) mkEnableOption mkPackageOption mkOption mkIf getExe;
-
-  settingsFormat = pkgs.formats.yaml { };
-
-  settingsFile = settingsFormat.generate "glance.yml" cfg.settings;
-
-  configFilePath = "${config.xdg.configHome}/glance/glance.yml";
-in {
-  meta.maintainers = [ pkgs.lib.maintainers.gepbird ];
-
-  options.services.glance = {
-    enable = mkEnableOption "glance";
-
-    package = mkPackageOption pkgs "glance" { };
-
-    settings = mkOption {
-      type = settingsFormat.type;
-      default = {
-        pages = [{
-          name = "Calendar";
-          columns = [{
-            size = "full";
-            widgets = [{ type = "calendar"; }];
-          }];
-        }];
-      };
-      example = {
-        server.port = 5678;
-        pages = [{
-          name = "Home";
-          columns = [{
-            size = "full";
-            widgets = [
-              { type = "calendar"; }
-              {
-                type = "weather";
-                location = "London, United Kingdom";
-              }
-            ];
-          }];
-        }];
-      };
-      description = ''
-        Configuration written to a yaml file that is read by glance. See
-        <https://github.com/glanceapp/glance/blob/main/docs/configuration.md>
-        for more.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      (lib.hm.assertions.assertPlatform "services.glance" pkgs
-        lib.platforms.linux)
-    ];
-
-    home.packages = [ cfg.package ];
-
-    xdg.configFile."glance/glance.yml".source = settingsFile;
-
-    systemd.user.services.glance = {
-      Unit = {
-        Description = "Glance feed dashboard server";
-        PartOf = [ "graphical-session.target" ];
-      };
-
-      Install.WantedBy = [ "graphical-session.target" ];
-
-      Service.ExecStart = "${getExe cfg.package} --config ${configFilePath}";
-    };
-  };
-}

modules/services/gnome-keyring.nix

@@ -49,7 +49,7 @@ in {
           args = concatStringsSep " " ([ "--start" "--foreground" ]
             ++ optional (cfg.components != [ ])
             ("--components=" + concatStringsSep "," cfg.components));
-        in "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon ${args}";
+        in "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon ${args}";
         Restart = "on-abort";
       };
 

modules/services/gpg-agent.nix

@@ -48,8 +48,9 @@ let
   hexStringToBase32 = let
     mod = a: b: a - a / b * b;
     pow2 = elemAt [ 1 2 4 8 16 32 64 128 256 ];
+    splitChars = s: init (tail (splitString "" s));
 
-    base32Alphabet = stringToCharacters "ybndrfg8ejkmcpqxot1uwisza345h769";
+    base32Alphabet = splitChars "ybndrfg8ejkmcpqxot1uwisza345h769";
     hexToIntTable = listToAttrs (genList (x: {
       name = toLower (toHexString x);
       value = x;
@@ -75,7 +76,7 @@ let
         buf = buf';
         bufBits = bufBits';
       };
-  in hexString: (foldl' go initState (stringToCharacters hexString)).ret;
+  in hexString: (foldl' go initState (splitChars hexString)).ret;
 
 in {
   meta.maintainers = [ maintainers.rycee ];

modules/services/kbfs.nix

@@ -52,6 +52,7 @@ in {
           "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${mountPoint}";
         ExecStopPost = "/run/wrappers/bin/fusermount -u ${mountPoint}";
         Restart = "on-failure";
+        PrivateTmp = true;
       };
 
       Install.WantedBy = [ "default.target" ];

modules/services/kdeconnect.nix

@@ -48,12 +48,7 @@ in {
 
         Service = {
           Environment = "PATH=${config.home.profileDirectory}/bin";
-          ExecStart =
+          ExecStart = "${cfg.package}/libexec/kdeconnectd";
-            if strings.versionAtLeast (versions.majorMinor cfg.package.version)
-            "24.05" then
-              "${cfg.package}/bin/kdeconnectd"
-            else
-              "${cfg.package}/libexec/kdeconnectd";
           Restart = "on-abort";
         };
       };

modules/services/listenbrainz-mpd.nix

@@ -24,7 +24,7 @@ in {
         Configuration for listenbrainz-mpd written to
         {file}`$XDG_CONFIG_HOME/listenbrainz-mpd/config.toml`.
       '';
-      example = { submission.token_file = "/run/secrets/listenbrainz-mpd"; };
+      example = { submission.tokenFile = "/run/secrets/listenbrainz-mpd"; };
     };
   };
 

modules/services/mpd.nix

@@ -171,17 +171,10 @@ in {
     ];
 
     systemd.user.services.mpd = {
-      Unit = mkMerge [
+      Unit = {
-        {
-          Description = "Music Player Daemon";
         After = [ "network.target" "sound.target" ];
-        }
+        Description = "Music Player Daemon";
-
+      };
-        (mkIf cfg.network.startWhenNeeded {
-          Requires = [ "mpd.socket" ];
-          After = [ "mpd.socket" ];
-        })
-      ];
 
       Install = mkIf (!cfg.network.startWhenNeeded) {
         WantedBy = [ "default.target" ];

modules/services/nix-gc.nix

@@ -90,18 +90,6 @@ in {
           garbage collector is run automatically.
         '';
       };
-
-      persistent = mkOption {
-        type = types.bool;
-        default = true;
-        example = false;
-        description = ''
-          If true, the time when the service unit was last triggered is
-          stored on disk. When the timer is activated, the service unit is
-          triggered immediately if it would have been triggered at least once
-          during the time when the timer was inactive.
-        '';
-      };
     };
   };
 
@@ -110,18 +98,15 @@ in {
       systemd.user.services.nix-gc = {
         Unit = { Description = "Nix Garbage Collector"; };
         Service = {
-          Type = "oneshot";
+          ExecStart = "${nixPackage}/bin/nix-collect-garbage ${
-          ExecStart = toString (pkgs.writeShellScript "nix-gc"
-            "exec ${nixPackage}/bin/nix-collect-garbage ${
               lib.optionalString (cfg.options != null) cfg.options
-            }");
+            }";
         };
       };
       systemd.user.timers.nix-gc = {
         Unit = { Description = "Nix Garbage Collector"; };
         Timer = {
           OnCalendar = "${cfg.frequency}";
-          Persistent = cfg.persistent;
           Unit = "nix-gc.service";
         };
         Install = { WantedBy = [ "timers.target" ]; };

modules/services/pbgopy.nix

@@ -15,7 +15,7 @@ let
     "--basic-auth ${escapeShellArg cfg.httpAuth}");
 
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = [ maintainers.ivar ];
 
   options.services.pbgopy = {
     enable = mkEnableOption "pbgopy";

modules/services/pulseeffects.nix

@@ -9,7 +9,7 @@ let
   presetOpts = optionalString (cfg.preset != "") "--load-preset ${cfg.preset}";
 
 in {
-  meta.maintainers = [ hm.maintainers.jonringer ];
+  meta.maintainers = [ maintainers.jonringer ];
 
   options.services.pulseeffects = {
     enable = mkEnableOption ''

modules/services/ssh-agent.nix

@@ -5,7 +5,7 @@ let
   cfg = config.services.ssh-agent;
 
 in {
-  meta.maintainers = [ lib.hm.maintainers.lheckemann ];
+  meta.maintainers = [ lib.maintainers.lheckemann ];
 
   options = {
     services.ssh-agent = {

modules/services/stalonetray.nix

@@ -74,7 +74,7 @@ in {
     }
 
     (mkIf (cfg.config != { }) {
-      xdg.configFile."stalonetrayrc".text = let
+      home.file.".stalonetrayrc".text = let
         valueToString = v:
           if isBool v then
             (if v then "true" else "false")
@@ -88,7 +88,7 @@ in {
     })
 
     (mkIf (cfg.extraConfig != "") {
-      xdg.configFile."stalonetrayrc".text = cfg.extraConfig;
+      home.file.".stalonetrayrc".text = cfg.extraConfig;
     })
   ]);
 }

modules/services/swayidle.nix

@@ -118,7 +118,6 @@ in {
       Unit = {
         Description = "Idle manager for Wayland";
         Documentation = "man:swayidle(1)";
-        ConditionEnvironment = "WAYLAND_DISPLAY";
         PartOf = [ "graphical-session.target" ];
       };
 

modules/services/swayosd.nix

@@ -60,8 +60,6 @@ in {
           After = [ "graphical-session.target" ];
           ConditionEnvironment = "WAYLAND_DISPLAY";
           Documentation = "man:swayosd(1)";
-          StartLimitBurst = 5;
-          StartLimitIntervalSec = 10;
         };
 
         Service = {
@@ -73,7 +71,6 @@ in {
             + (optionalString (cfg.topMargin != null)
               " --top-margin ${toString cfg.topMargin}");
           Restart = "always";
-          RestartSec = "2s";
         };
 
         Install = { WantedBy = [ "graphical-session.target" ]; };

modules/services/window-managers/hyprland.nix

@@ -40,21 +40,7 @@ in {
   ];
 
   options.wayland.windowManager.hyprland = {
-    enable = lib.mkOption {
+    enable = lib.mkEnableOption "Hyprland wayland compositor";
-      type = lib.types.bool;
-      default = false;
-      description = ''
-        Whether to enable configuration for Hyprland, a tiling Wayland
-        compositor that doesn't sacrifice on its looks.
-
-        ::: {.note}
-        This module configures Hyprland and adds it to your user's {env}`PATH`,
-        but does not make certain system-level changes. NixOS users should
-        enable the NixOS module with {option}`programs.hyprland.enable`, which
-        makes system-level changes such as adding a desktop session entry.
-        :::
-      '';
-    };
 
     package = lib.mkPackageOption pkgs "hyprland" { };
 
@@ -220,10 +206,7 @@ in {
         "You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake.";
     in lib.optional inconsistent warning;
 
-    home.packages = lib.concatLists [
+    home.packages = lib.optional (cfg.package != null) cfg.finalPackage;
-      (lib.optional (cfg.package != null) cfg.finalPackage)
-      (lib.optional (cfg.xwayland.enable) pkgs.xwayland)
-    ];
 
     xdg.configFile."hypr/hyprland.conf" = let
       shouldGenerate = cfg.systemd.enable || cfg.extraConfig != ""

modules/services/window-managers/i3-sway/sway.nix

@@ -403,7 +403,7 @@ in {
           "XCURSOR_THEME"
           "XCURSOR_SIZE"
         ];
-        example = [ "--all" ];
+        example = [ "-all" ];
         description = ''
           Environment variables imported into the systemd and D-Bus user environment.
         '';
@@ -411,12 +411,7 @@ in {
 
       extraCommands = mkOption {
         type = types.listOf types.str;
-        default = [
+        default = [ "systemctl --user start sway-session.target" ];
-          "systemctl --user reset-failed"
-          "systemctl --user start sway-session.target"
-          "swaymsg -mt subscribe '[]' || true"
-          "systemctl --user stop sway-session.target"
-        ];
         description = ''
           Extra commands to run after D-Bus activation.
         '';

modules/services/window-managers/i3-sway/swaynag.nix

@@ -14,7 +14,7 @@ let
       };
     in attrsOf confAtom;
 in {
-  meta.maintainers = [ ];
+  meta.maintainers = with maintainers; [ polykernel ];
 
   options = {
     wayland.windowManager.sway.swaynag = {

modules/systemd-activate.sh

@@ -34,7 +34,7 @@ function systemdPostReload() {
     touch "$oldServiceFiles"
   else
     find "$oldUserServicePath" \
-      -maxdepth 1 -name '*.service' \! -name '*@.service' -exec basename '{}' ';' \
+      -maxdepth 1 -name '*.service' -exec basename '{}' ';' \
       | sort \
       > "$oldServiceFiles"
   fi
@@ -43,7 +43,7 @@ function systemdPostReload() {
     touch "$newServiceFiles"
   else
     find "$newUserServicePath" \
-      -maxdepth 1 -name '*.service' \! -name '*@.service' -exec basename '{}' ';' \
+      -maxdepth 1 -name '*.service' -exec basename '{}' ';' \
       | sort \
       > "$newServiceFiles"
   fi

modules/systemd.nix

@@ -100,8 +100,6 @@ let
       settingsFormat.generate "user.conf" cfg.settings;
   };
 
-  configHome = lib.removePrefix config.home.homeDirectory config.xdg.configHome;
-
 in {
   meta.maintainers = [ lib.maintainers.rycee ];
 
@@ -337,8 +335,8 @@ in {
         in ''
           ${pkgs.sd-switch}/bin/sd-switch \
             ''${DRY_RUN:+--dry-run} $VERBOSE_ARG ${timeoutArg} \
-            ''${oldUnitsDir:+--old-units $oldUnitsDir} \
+            ''${oldGenPath:+--old-units $oldGenPath/home-files/.config/systemd/user} \
-            --new-units "$newUnitsDir"
+            --new-units $newGenPath/home-files/.config/systemd/user
         '';
       };
 
@@ -356,22 +354,8 @@ in {
           warnEcho "Attempting to reload services anyway..."
         fi
 
-        if [[ -v oldGenPath ]]; then
-          oldUnitsDir="$oldGenPath/home-files${configHome}/systemd/user"
-          if [[ ! -e $oldUnitsDir ]]; then
-            oldUnitsDir=
-          fi
-        fi
-
-        newUnitsDir="$newGenPath/home-files${configHome}/systemd/user"
-        if [[ ! -e $newUnitsDir ]]; then
-          newUnitsDir=${pkgs.emptyDirectory}
-        fi
-
         ${ensureRuntimeDir} \
           ${getAttr cfg.startServices cmd}
-
-        unset newUnitsDir oldUnitsDir
       else
         echo "User systemd daemon not running. Skipping reload."
       fi

release.json

@@ -1,4 +1,4 @@
 {
-  "release": "24.11",
+  "release": "24.05",
-  "isReleaseBranch": false
+  "isReleaseBranch": true
 }

tests/default.nix

@@ -189,7 +189,7 @@ in import nmtSrc {
     ./modules/programs/bemenu
     ./modules/programs/borgmatic
     ./modules/programs/boxxy
-    ./modules/programs/firefox/firefox.nix
+    ./modules/programs/firefox
     ./modules/programs/foot
     ./modules/programs/freetube
     ./modules/programs/fuzzel
@@ -224,7 +224,6 @@ in import nmtSrc {
     ./modules/services/activitywatch
     ./modules/services/avizo
     ./modules/services/barrier
-    ./modules/services/blanket
     ./modules/services/borgmatic
     ./modules/services/cachix-agent
     ./modules/services/cliphist
@@ -241,7 +240,6 @@ in import nmtSrc {
     ./modules/services/fnott
     ./modules/services/fusuma
     ./modules/services/git-sync
-    ./modules/services/glance
     ./modules/services/gpg-agent
     ./modules/services/gromit-mpx
     ./modules/services/home-manager-auto-upgrade

tests/integration/nixos/basics.nix

@@ -7,8 +7,6 @@
   nodes.machine = { ... }: {
     imports = [ ../../../nixos ]; # Import the HM NixOS module.
 
-    virtualisation.memorySize = 2048;
-
     users.users.alice = {
       isNormalUser = true;
       description = "Alice Foobar";

tests/integration/standalone/flake-basics.nix

@@ -6,7 +6,7 @@
 
   nodes.machine = { ... }: {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
-    virtualisation.memorySize = 3072;
+    virtualisation.memorySize = 2048;
     nix = {
       registry.home-manager.to = {
         type = "path";
@@ -88,7 +88,7 @@
       } /home/alice/.config/home-manager/home.nix")
 
       actual = succeed_as_alice("home-manager switch")
-      expected = "Starting units: pueued.service"
+      expected = "Started pueued.service - active"
       assert expected in actual, \
         f"expected home-manager switch to contain {expected}, but got {actual}"
 

tests/integration/standalone/standard-basics.nix

@@ -85,7 +85,7 @@
       } /home/alice/.config/home-manager/home.nix")
 
       actual = succeed_as_alice("home-manager switch")
-      expected = "Starting units: pueued.service"
+      expected = "Started pueued.service - active"
       assert expected in actual, \
         f"expected home-manager switch to contain {expected}, but got {actual}"
 

tests/modules/i18n/input-method/fcitx5-stubs.nix

@@ -4,15 +4,11 @@
       version = "0";
       outPath = null;
       buildScript = ''
-        mkdir -p $out/bin $out/share/applications $out/share/dbus-1/services $out/etc/xdg/autostart
+        mkdir -p $out/bin $out/share/applications $out/etc/xdg/autostart
         touch $out/bin/fcitx5 \
               $out/bin/fcitx5-config-qt \
               $out/share/applications/org.fcitx.Fcitx5.desktop \
-              $out/share/dbus-1/services/org.fcitx.Fcitx5.service \
               $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop
-        # The grep usage of fcitx5-with-addons expects one of the files to match with the fcitx5.out
-        # https://github.com/NixOS/nixpkgs/blob/d2eb4be48705289791428c07aca8ff654c1422ba/pkgs/tools/inputmethods/fcitx5/with-addons.nix#L40-L44
-        echo $out >> $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop
         chmod +x $out/bin/fcitx5 \
                  $out/bin/fcitx5-config-qt
       '';

tests/modules/misc/nix/default.nix

@@ -2,7 +2,4 @@
   nix-empty-settings = ./empty-settings.nix;
   nix-example-settings = ./example-settings.nix;
   nix-example-registry = ./example-registry.nix;
-  nix-keep-old-nix-path = ./keep-old-nix-path.nix;
-  nix-example-channels = ./example-channels.nix;
-  nix-example-channels-xdg = ./example-channels-xdg.nix;
 }

tests/modules/misc/nix/empty-settings.nix

@@ -8,7 +8,6 @@ with lib;
 
     nmt.script = ''
       assertPathNotExists home-files/.config/nix
-      assertPathNotExists home-files/.nix-defexpr/50-home-manager
     '';
   };
 }

tests/modules/misc/nix/example-channels-xdg.nix

@@ -1,29 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-let
-  exampleChannel = pkgs.writeTextDir "default.nix" ''
-    { pkgs ? import <nixpkgs> { } }:
-
-    {
-      example = pkgs.emptyDirectory;
-    }
-  '';
-in {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage {
-        version = lib.getVersion pkgs.nixVersions.stable;
-      };
-      channels.example = exampleChannel;
-      settings.use-xdg-base-directories = true;
-    };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/home/hm-user/.local/state/nix/defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
-      assertFileContent \
-        home-files/.local/state/nix/defexpr/50-home-manager/example/default.nix \
-        ${exampleChannel}/default.nix
-    '';
-  };
-}

tests/modules/misc/nix/example-channels.nix

@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  exampleChannel = pkgs.writeTextDir "default.nix" ''
-    { pkgs ? import <nixpkgs> { } }:
-
-    {
-      example = pkgs.emptyDirectory;
-    }
-  '';
-in {
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage { };
-      channels.example = exampleChannel;
-    };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/home/hm-user/.nix-defexpr/50-home-manager''${NIX_PATH:+:$NIX_PATH}"'
-      assertFileContent \
-        home-files/.nix-defexpr/50-home-manager/example/default.nix \
-        ${exampleChannel}/default.nix
-    '';
-  };
-}

tests/modules/misc/nix/example-settings.nix

@@ -17,8 +17,6 @@ with lib;
         '';
       };
 
-      nixPath = [ "/a" "/b/c" ];
-
       settings = {
         use-sandbox = true;
         show-trace = true;
@@ -30,9 +28,6 @@ with lib;
       assertFileContent \
         home-files/.config/nix/nix.conf \
         ${./example-settings-expected.conf}
-
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/a:/b/c''${NIX_PATH:+:$NIX_PATH}"'
     '';
   };
 }

tests/modules/misc/nix/keep-old-nix-path.nix

@@ -1,16 +0,0 @@
-{ config, ... }:
-
-{
-  config = {
-    nix = {
-      package = config.lib.test.mkStubPackage { };
-      nixPath = [ "/a" "/b/c" ];
-      keepOldNixPath = false;
-    };
-
-    nmt.script = ''
-      assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
-        'export NIX_PATH="/a:/b/c"'
-    '';
-  };
-}

tests/modules/programs/atuin/bash.nix

@@ -10,7 +10,7 @@
   };
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };
 

tests/modules/programs/atuin/empty-settings.nix

@@ -4,7 +4,7 @@
   programs.atuin.enable = true;
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };
 

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

@@ -13,7 +13,7 @@
   };
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };
 

tests/modules/programs/atuin/fish.nix

@@ -11,7 +11,7 @@
     lib.mkForce (builtins.toFile "empty" "");
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };
 

tests/modules/programs/atuin/no-shell.nix

@@ -18,7 +18,7 @@
     lib.mkForce (builtins.toFile "empty" "");
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };
 

tests/modules/programs/atuin/set-flags.nix

@@ -17,7 +17,7 @@
     lib.mkForce (builtins.toFile "empty" "");
 
   test.stubs = {
-    atuin = { name = "atuin"; };
+    atuin = { };
     bash-preexec = { };
   };