borgmatic: fix service permissions

Fixes #5749

(cherry picked from commit 9c5f16d703)

.builds/manual.yml

@@ -9,6 +9,7 @@ environment:
   NIX_CONFIG: "experimental-features = nix-command flakes"
 packages:
   - nixos.cachix
+  - nixos.jq
 tasks:
   - setup: |
       cachix use rycee
@@ -26,7 +27,7 @@ tasks:
       if [[ $gitBranch == master ]]; then
         dirName="unstable"
       else
-        dirName="$(cat .release)"
+        dirName="$(jq -r .release < release.json)"
       fi
 
       rsync --delete -r --info=stats \

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
 
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "release-23.05"
+    target-branch: "release-23.11"
     schedule:
       interval: "weekly"
     commit-message:
@@ -18,7 +18,7 @@ updates:
 
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "release-23.11"
+    target-branch: "release-24.05"
     schedule:
       interval: "weekly"
     commit-message:

.github/labeler.yml

@@ -1,4 +1,6 @@
 "mail":
+- changed-files:
+  - any-glob-to-any-file:
     - modules/programs/aerc*.nix
     - modules/programs/alot*.nix
     - tests/modules/programs/aerc/*
@@ -18,19 +20,27 @@
     - modules/services/imapnotify.nix
 
 "neovim":
+- changed-files:
+  - any-glob-to-any-file:
     - modules/programs/neovim.nix
     - tests/modules/programs/neovim/**/*
 
 "shell":
+- changed-files:
+  - any-glob-to-any-file:
     - modules/lib/zsh.nix
     - modules/programs/zsh*
     - modules/programs/bash*
     - tests/modules/programs/zsh/**/*
 
 "calendar":
+- changed-files:
+  - any-glob-to-any-file:
     - modules/programs/khal*
     - modules/*/vdirsyncer*
     - modules/accounts/calendar.nix
 
 "contacts":
+- changed-files:
+  - any-glob-to-any-file:
     - modules/accounts/contacts.nix

.github/workflows/github_pages.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v23
+    - uses: cachix/install-nix-action@V27
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v13
+    - uses: cachix/cachix-action@v15
       with:
         name: nix-community
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

.github/workflows/labeler.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'nix-community'
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         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@v23
+    - 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,9 +12,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v23
+        uses: cachix/install-nix-action@V27
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v21
+        uses: DeterminateSystems/update-flake-lock@v24
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
           pr-labels: dependencies

README.md

@@ -28,7 +28,7 @@ Releases
 Home Manager is developed against `nixpkgs-unstable` branch, which often causes
 it to contain tweaks for changes/packages not yet released in stable [NixOS][].
 To avoid breaking users' configurations, Home Manager is released in branches
-corresponding to NixOS releases (e.g. `release-23.11`). These branches get
+corresponding to NixOS releases (e.g. `release-24.05`). These branches get
 fixes, but usually not new modules. If you need a module to be backported, then
 feel free to open an issue.
 
@@ -49,7 +49,7 @@ dconf store and cannot tell whether a configuration that it is about to be
 overwritten was from a previous Home Manager generation or from manual
 configuration.
 
-Home Manager targets [NixOS][] unstable and NixOS version 23.11 (the current
+Home Manager targets [NixOS][] unstable and NixOS version 24.05 (the current
 stable version), it may or may not work on other Linux distributions and NixOS
 versions.
 

docs/home-manager-manual.nix

@@ -32,6 +32,8 @@ in stdenv.mkDerivation {
         OPTIONS_JSON \
         ${home-manager-options.nix-darwin}/share/doc/nixos/options.json
 
+    cp ${./options.html} out/options.html
+
     cp ${./static/style.css} out/style.css
 
     cp -r ${./release-notes} release-notes

docs/manual/installation/nix-darwin.md

@@ -15,10 +15,10 @@ $ nix-channel --add https://github.com/nix-community/home-manager/archive/master
 $ nix-channel --update
 ```
 
-and if you follow a Nixpkgs version 23.11 channel, you can run
+and if you follow a Nixpkgs version 24.05 channel, you can run
 
 ``` shell
-$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
+$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
 $ nix-channel --update
 ```
 
@@ -45,7 +45,7 @@ home-manager.users.eve = { pkgs, ... }: {
 
   # The state version is required and should stay at the version you
   # originally installed.
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 };
 ```
 

docs/manual/installation/nixos.md

@@ -17,10 +17,10 @@ $ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/m
 $ sudo nix-channel --update
 ```
 
-and if you follow a Nixpkgs version 23.11 channel, you can run
+and if you follow a Nixpkgs version 24.05 channel, you can run
 
 ``` shell
-$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
+$ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
 $ sudo nix-channel --update
 ```
 
@@ -44,7 +44,7 @@ home-manager.users.eve = { pkgs, ... }: {
 
   # The state version is required and should stay at the version you
   # originally installed.
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 };
 ```
 

docs/manual/installation/standalone.md

@@ -19,10 +19,10 @@
     $ nix-channel --update
     ```
 
-    and if you follow a Nixpkgs version 23.11 channel you can run
+    and if you follow a Nixpkgs version 24.05 channel you can run
 
     ``` shell
-    $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
+    $ nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
     $ nix-channel --update
     ```
 

docs/manual/manual.md

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

docs/manual/nix-flakes/standalone.md

@@ -11,10 +11,10 @@ then to generate and activate a basic configuration run the command
 $ nix run home-manager/master -- init --switch
 ```
 
-For Nixpkgs or NixOS version 23.11 run
+For Nixpkgs or NixOS version 24.05 run
 
 ``` shell
-$ nix run home-manager/release-23.11 -- init --switch
+$ nix run home-manager/release-24.05 -- init --switch
 ```
 
 This will generate a `flake.nix` and a `home.nix` file in
@@ -30,7 +30,7 @@ $ # Edit files in ~/.config/home-manager
 $ nix run home-manager/$branch -- init --switch
 ```
 
-Where `$branch` is one of `master` or `release-23.11`.
+Where `$branch` is one of `master` or `release-24.05`.
 
 After the initial activation has completed successfully then building
 and activating your flake-based configuration is as simple as

docs/manual/usage/configuration.md

@@ -20,7 +20,7 @@ A fresh install of Home Manager will generate a minimal
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -65,7 +65,7 @@ follows:
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

docs/options.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Redirecting&hellip;</title>
+    <meta charset="utf-8">
+    <link rel="canonical" href="options.xhtml">
+    <noscript><meta http-equiv="refresh" content="0; url=options.xhtml"></noscript>
+  </head>
+  <body>
+    <h1>Redirecting&hellip;</h1>
+    <script>
+      window.location.href = "options.xhtml" + (window.location.search || "") + (window.location.hash || "");
+    </script>
+  </body>
+</html>

docs/release-notes/rl-2405.md

@@ -1,7 +1,6 @@
 # Release 24.05 {#sec-release-24.05}
 
-This is the current unstable branch and the information in this section
-is therefore not final.
+The 24.05 release branch became stable in May, 2024.
 
 ## Highlights {#sec-release-24.05-highlights}
 
@@ -89,4 +88,4 @@ The state version in this release includes the changes below. These
 changes are only active if the `home.stateVersion` option is set to
 \"24.05\" or later.
 
--   Nothing, yet.
+- There was no state version change in this release.

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
+        "lastModified": 1716542732,
+        "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
+        "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

@@ -359,7 +359,7 @@ $xdgVars
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "23.11"; # Please read the comment before changing.
+  home.stateVersion = "24.05"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
@@ -857,7 +857,7 @@ function doUninstall() {
   uninstall = true;
   home.username = "$USER";
   home.homeDirectory = "$HOME";
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 }
 EOF
             # shellcheck disable=2064
@@ -1044,7 +1044,7 @@ while [[ $# -gt 0 ]]; do
             export VERBOSE=1
             ;;
         --version)
-            echo 24.05-pre
+            echo 24.05
             exit 0
             ;;
         *)

home-manager/po/da.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-02-16 22:01+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2024-05-25 11:09+0000\n"
+"Last-Translator: DeeKahy <Lennart.Diego.Kahn@gmail.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/cli/"
 "da/>\n"
 "Language: da\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.4\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 ""
+msgstr "%s: manglende argument for %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"
@@ -36,8 +36,8 @@ msgid ""
 "Keeping your Home Manager %s in %s is deprecated,\n"
 "please move it to %s"
 msgstr ""
-"At have din Home Manager %s i %s er forældet,\n"
-"flyt den venligst til %s"
+"Det er forældet at holde Home Manager %s i %s,\n"
+"ryk den venligst til %s"
 
 #: home-manager/home-manager:92
 msgid "No configuration file found. Please create one at %s"
@@ -45,7 +45,7 @@ msgstr "Ingen konfigurationsfiler fundet. Venligst lav en ved %s"
 
 #: home-manager/home-manager:107
 msgid "Home Manager not found at %s."
-msgstr "Home Manager kan ikke findes under %s."
+msgstr "Home Manager blev ikke fundet ved %s."
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:115
@@ -53,8 +53,8 @@ msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
 msgstr ""
-"Fallback-stien til Home Manager %s er blevet forældet, og en fil/mappe blev "
-"fundet der."
+"Det er forældet at bruge fallback Home Manager path %s og der blev fundet en "
+"fil/mappe der."
 
 #. 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
@@ -120,7 +120,7 @@ msgstr "Kør '%s --help' for brugsvejledning"
 
 #: home-manager/home-manager:327 home-manager/home-manager:431
 msgid "The file %s already exists, leaving it unchanged..."
-msgstr "Filen %s findes allerede, lader den være uændret..."
+msgstr "Filen %s eksisterer allerede, efterlader den uændret…"
 
 #: home-manager/home-manager:329 home-manager/home-manager:433
 msgid "Creating %s..."
@@ -189,7 +189,7 @@ msgstr "Ubekændt \"news.display\" indstilling \"%s\"."
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "Indstil venligst miljøvariablen $EDITOR eller $VISUAL"
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"

home-manager/po/de.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-03-04 18:50+0000\n"
-"Last-Translator: Robert Helgesson <robert@rycee.net>\n"
+"PO-Revision-Date: 2024-05-21 18:02+0000\n"
+"Last-Translator: halbGefressen <chzi@pm.me>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/home-manager/cli/"
 "de/>\n"
 "Language: de\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5-dev\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 ""
+msgstr "%s: Fehlendes Argument für %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"

home-manager/po/ja.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-04-29 18:07+0000\n"
-"Last-Translator: Kento Okamoto <kentokamoto@protonmail.com>\n"
+"PO-Revision-Date: 2024-05-25 11:09+0000\n"
+"Last-Translator: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
 "cli/ja/>\n"
 "Language: ja\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.5.2\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #. translators: For example: "home-manager: missing argument for --cores"
 #: home-manager/home-manager:16
@@ -45,14 +45,15 @@ msgstr "設定ファイルがありません。ファイルを %s に作って
 
 #: home-manager/home-manager:107
 msgid "Home Manager not found at %s."
-msgstr ""
+msgstr "%s にHome Managerが見つかりません。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:115
 msgid ""
 "The fallback Home Manager path %s has been deprecated and a file/directory "
 "was found there."
-msgstr ""
+msgstr "フォールバックの Home Manager のパス %s "
+"は非推奨ですが、そこにファイルまたはディレクトリがあります。"
 
 #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated.
 #: home-manager/home-manager:118
@@ -75,6 +76,24 @@ msgid ""
 "\n"
 "     $ rm -r \"%s\""
 msgstr ""
+"この警告が表示されないようにするには、以下のどれかを行ってください。\n"
+"\n"
+"1. Home Manager にそのパスを使うよう伝えます。例えば\n"
+"\n"
+"     { programs.home-manager.path = \"%s\"; }\n"
+"\n"
+"   を設定に追加します。\n"
+"\n"
+"   もし Home Manager を直接インポートしているのであれば、 Home Manager "
+"パッケージを呼び出すときに `path` パラメーターを使って\n"
+"\n"
+"     pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n"
+"\n"
+"   のようにできます。\n"
+"\n"
+"2. 非推奨のパスにあるものを削除します。\n"
+"\n"
+"     $ rm -r \"%s\""
 
 #: home-manager/home-manager:146
 msgid "Sanity checking Nix"
@@ -168,7 +187,7 @@ msgstr "\"news.display\"に\"%s\"という設定は存在しません。"
 #: home-manager/home-manager:594
 #, sh-format
 msgid "Please set the $EDITOR or $VISUAL environment variable"
-msgstr ""
+msgstr "環境変数 $EDITOR または $VISUAL を設定してください"
 
 #: home-manager/home-manager:612
 msgid "Cannot run build in read-only directory"

home-manager/po/zh_Hans.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Home Manager\n"
 "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
 "POT-Creation-Date: 2024-04-17 23:19+0200\n"
-"PO-Revision-Date: 2024-03-03 06:24+0000\n"
-"Last-Translator: immwind <i@immwind.com>\n"
+"PO-Revision-Date: 2024-05-13 10:00+0000\n"
+"Last-Translator: Zexin Yuan <yuan.zx@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "home-manager/cli/zh_Hans/>\n"
 "Language: zh_Hans\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.5-dev\n"
+"X-Generator: Weblate 5.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 ""
+msgstr "%s：缺少参数 %s"
 
 #: home-manager/home-manager:64
 msgid "No configuration file found at %s"

modules/config/home-cursor.nix

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

modules/lib/maintainers.nix

@@ -113,6 +113,13 @@
     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";
@@ -173,6 +180,13 @@
     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";
@@ -201,6 +215,19 @@
     github = "kubukoz";
     githubId = 894884;
   };
+  lilyinstarlight = {
+    email = "lily@lily.flowers";
+    matrix = "@lily:lily.flowers";
+    github = "lilyinstarlight";
+    githubId = 298109;
+    name = "Lily Foster";
+  };
+  lheckemann = {
+    name = "Linus Heckemann";
+    email = "git@sphalerite.org";
+    github = "lheckemann";
+    githubId = 341954;
+  };
   loicreynier = {
     name = "Loïc Reynier";
     email = "loic@loireynier.fr";

modules/misc/nix.nix

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

modules/misc/uninstall.nix

@@ -21,7 +21,7 @@ in {
   config = mkIf config.uninstall {
     home.packages = lib.mkForce [ ];
     home.file = lib.mkForce { };
-    home.stateVersion = lib.mkForce "23.11";
+    home.stateVersion = lib.mkForce "24.05";
     home.enableNixpkgsReleaseCheck = lib.mkForce false;
     manual.manpages.enable = lib.mkForce false;
     news.display = lib.mkForce "silent";

modules/programs/bottom.nix

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

modules/programs/firefox.nix

@@ -89,7 +89,8 @@ let
       ${builtins.toJSON {
         version = 4;
         lastUserContextId =
-          elemAt (mapAttrsToList (_: container: container.id) containers) 0;
+          foldlAttrs (acc: _: value: if value.id > acc then value.id else acc) 0
+          containers;
         identities = mapAttrsToList containerToIdentity containers ++ [
           {
             userContextId = 4294967294; # 2^32 - 2

modules/programs/gh-dash.nix

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

modules/programs/hyfetch.nix

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

modules/programs/jujutsu.nix

@@ -7,6 +7,11 @@ 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 ];
 
@@ -51,7 +56,7 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    xdg.configFile."jj/config.toml" = mkIf (cfg.settings != { }) {
+    home.file."${configDir}/jj/config.toml" = mkIf (cfg.settings != { }) {
       source = tomlFormat.generate "jujutsu-config" (cfg.settings
         // optionalAttrs (cfg.ediff) (let
           emacsDiffScript = pkgs.writeShellScriptBin "emacs-ediff" ''

modules/programs/mpv.nix

@@ -227,5 +227,5 @@ in {
     }
   ]);
 
-  meta.maintainers = with maintainers; [ tadeokondrak thiagokokada chuangzhu ];
+  meta.maintainers = with maintainers; [ thiagokokada chuangzhu ];
 }

modules/programs/script-directory.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 let cfg = config.programs.script-directory;
 in {
-  meta.maintainers = [ lib.maintainers.janik ];
+  meta.maintainers = [ lib.hm.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 = [ maintainers.ivar ];
+  meta.maintainers = [ ];
 
   options.programs.sm64ex = {
     enable = mkEnableOption "sm64ex";

modules/programs/watson.nix

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

modules/services/borgmatic.nix

@@ -46,7 +46,6 @@ in {
 
           # Lower CPU and I/O priority:
           Nice = 19;
-          CPUSchedulingPolicy = "batch";
           IOSchedulingClass = "best-effort";
           IOSchedulingPriority = 7;
           IOWeight = 100;

modules/services/cliphist.nix

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

modules/services/fnott.nix

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

modules/services/kanshi.nix

@@ -209,6 +209,7 @@ in {
         Attribute set of profiles.
       '';
       example = literalExpression ''
+        {
           undocked = {
             outputs = [
               {
@@ -227,6 +228,7 @@ in {
               }
             ];
           };
+        }
       '';
     };
 
@@ -247,6 +249,7 @@ in {
         See kanshi(5) for informations.
       '';
       example = literalExpression ''
+        [
           { include = "path/to/included/files"; }
           { output.criteria = "eDP-1";
             output.scale = 2;
@@ -269,6 +272,7 @@ in {
               }
             ];
           }
+        ]
       '';
     };
 

modules/services/pbgopy.nix

@@ -15,7 +15,7 @@ let
     "--basic-auth ${escapeShellArg cfg.httpAuth}");
 
 in {
-  meta.maintainers = [ maintainers.ivar ];
+  meta.maintainers = [ ];
 
   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 = [ maintainers.jonringer ];
+  meta.maintainers = [ hm.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.maintainers.lheckemann ];
+  meta.maintainers = [ lib.hm.maintainers.lheckemann ];
 
   options = {
     services.ssh-agent = {

modules/services/window-managers/hyprland.nix

@@ -236,8 +236,9 @@ in {
         }) + lib.optionalString (cfg.extraConfig != "") cfg.extraConfig;
 
       onChange = lib.mkIf (cfg.package != null) ''
-        ( # Execute in subshell so we don't poision environment with vars
-          if [[ -d "/tmp/hypr" ]]; then
+        (
+          XDG_RUNTIME_DIR=''${XDG_RUNTIME_DIR:-/run/user/$(id -u)}
+          if [[ -d "/tmp/hypr" || -d "$XDG_RUNTIME_DIR/hypr" ]]; then
             for i in $(${cfg.finalPackage}/bin/hyprctl instances -j | jq ".[].instance" -r); do
               ${cfg.finalPackage}/bin/hyprctl -i "$i" reload config-only
             done

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

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

release.json

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

tests/integration/nixos/basics.nix

@@ -15,7 +15,7 @@
     };
 
     home-manager.users.alice = { ... }: {
-      home.stateVersion = "23.11";
+      home.stateVersion = "24.05";
       home.file.test.text = "testfile";
       # Enable a light-weight systemd service.
       services.pueue.enable = true;

tests/integration/standalone/alice-home-init.nix

@@ -13,7 +13,7 @@
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "23.11"; # Please read the comment before changing.
+  home.stateVersion = "24.05"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.

tests/integration/standalone/alice-home-next.nix

@@ -3,7 +3,7 @@
 {
   home.username = "alice";
   home.homeDirectory = "/home/alice";
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
   home.packages = [ pkgs.hello ];
   home.file.test.text = "test";
   home.sessionVariables.EDITOR = "emacs";

tests/modules/programs/jujutsu/empty-config.nix

@@ -1,11 +1,14 @@
-{ ... }:
+{ pkgs, ... }:
 
-{
+let
+  configDir =
+    if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
+in {
   programs.jujutsu.enable = true;
 
   test.stubs.jujutsu = { };
 
   nmt.script = ''
-    assertPathNotExists home-files/.config/jj/config.toml
+    assertPathNotExists 'home-files/${configDir}/jj/config.toml'
   '';
 }

tests/modules/programs/jujutsu/example-config.nix

@@ -1,6 +1,9 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 
-{
+let
+  configDir =
+    if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config";
+in {
   programs.jujutsu = {
     enable = true;
     package = config.lib.test.mkStubPackage { };
@@ -13,9 +16,8 @@
   };
 
   nmt.script = ''
-    assertFileExists home-files/.config/jj/config.toml
-    assertFileContent \
-      home-files/.config/jj/config.toml \
+    assertFileExists 'home-files/${configDir}/jj/config.toml'
+    assertFileContent 'home-files/${configDir}/jj/config.toml' \
       ${
         builtins.toFile "expected.toml" ''
           [user]

tests/modules/services/borgmatic/basic-configuration.service

@@ -1,5 +1,4 @@
 [Service]
-CPUSchedulingPolicy=batch
 ExecStart=/nix/store/00000000000000000000000000000000-systemd/bin/systemd-inhibit \
   --who="borgmatic" \
   --what="sleep:shutdown" \