Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nix-community:master' into todoman

Browse source
This commit is contained in:
Kilian Mio 2024-06-01 20:35:36 +02:00 committed by GitHub
parent 2b063dc1af 0eb314b4f0
commit bc59405ada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
44 changed files with 267 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.builds/manual.yml
View file

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

2
.github/workflows/github_pages.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
- uses: cachix/install-nix-action@v23 - uses: cachix/install-nix-action@v23
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v13 - uses: cachix/cachix-action@v15
with: with:
name: nix-community name: nix-community
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

4
README.md
View file

@ -28,7 +28,7 @@ Releases
Home Manager is developed against `nixpkgs-unstable` branch, which often causes Home Manager is developed against `nixpkgs-unstable` branch, which often causes
it to contain tweaks for changes/packages not yet released in stable [NixOS][]. it to contain tweaks for changes/packages not yet released in stable [NixOS][].
To avoid breaking users' configurations, Home Manager is released in branches 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 fixes, but usually not new modules. If you need a module to be backported, then
feel free to open an issue. 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 overwritten was from a previous Home Manager generation or from manual
configuration. 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 stable version), it may or may not work on other Linux distributions and NixOS
versions. versions.

6
docs/manual/installation/nix-darwin.md
View file

@ -15,10 +15,10 @@ $ nix-channel --add https://github.com/nix-community/home-manager/archive/master
$ nix-channel --update $ 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 ``` 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 $ nix-channel --update
``` ```
@ -45,7 +45,7 @@ home-manager.users.eve = { pkgs, ... }: {
# The state version is required and should stay at the version you # The state version is required and should stay at the version you
# originally installed. # originally installed.
home.stateVersion = "23.11"; home.stateVersion = "24.05";
}; };
``` ```

6
docs/manual/installation/nixos.md
View file

@ -17,10 +17,10 @@ $ sudo nix-channel --add https://github.com/nix-community/home-manager/archive/m
$ sudo nix-channel --update $ 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 ``` 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 $ 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 # The state version is required and should stay at the version you
# originally installed. # originally installed.
home.stateVersion = "23.11"; home.stateVersion = "24.05";
}; };
``` ```

4
docs/manual/installation/standalone.md
View file

@ -19,10 +19,10 @@
$ nix-channel --update $ 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 ``` 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 $ nix-channel --update
``` ```

6
docs/manual/nix-flakes/standalone.md
View file

@ -11,10 +11,10 @@ then to generate and activate a basic configuration run the command
$ nix run home-manager/master -- init --switch $ nix run home-manager/master -- init --switch
``` ```
For Nixpkgs or NixOS version 23.11 run For Nixpkgs or NixOS version 24.05 run
``` shell ``` 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 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 $ 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 After the initial activation has completed successfully then building
and activating your flake-based configuration is as simple as and activating your flake-based configuration is as simple as

4
docs/manual/usage/configuration.md
View file

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

1
docs/release-notes/release-notes.md
View file

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

5
docs/release-notes/rl-2405.md
View file

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

18
docs/release-notes/rl-2411.md Normal file
View file

@ -0,0 +1,18 @@
# 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.

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1716509168,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
home-manager/home-manager
View file

@ -198,9 +198,9 @@ function setFlakeAttribute() {
;; ;;
*) *)
local name="$USER" local name="$USER"
# Check both long and short hostnames; long first to preserve # Check FQDN, long, and short hostnames; long first to preserve
# pre-existing behaviour in case both happen to be defined. # pre-existing behaviour in case both happen to be defined.
for n in "$USER@$(hostname)" "$USER@$(hostname -s)"; do for n in "$USER@$(hostname -f)" "$USER@$(hostname)" "$USER@$(hostname -s)"; do
if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$n\"")" == "true" ]]; then if [[ "$(nix eval "$flake#homeConfigurations" --apply "x: x ? \"$n\"")" == "true" ]]; then
name="$n" name="$n"
if [[ -v VERBOSE ]]; then if [[ -v VERBOSE ]]; then
@ -359,7 +359,7 @@ $xdgVars
# You should not change this value, even if you update Home Manager. If you do # 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 # want to update the value, then make sure to first check the Home Manager
# release notes. # 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 # The home.packages option allows you to install Nix packages into your
# environment. # environment.
@ -857,7 +857,7 @@ function doUninstall() {
uninstall = true; uninstall = true;
home.username = "$USER"; home.username = "$USER";
home.homeDirectory = "$HOME"; home.homeDirectory = "$HOME";
home.stateVersion = "23.11"; home.stateVersion = "24.05";
} }
EOF EOF
# shellcheck disable=2064 # shellcheck disable=2064
@ -1044,7 +1044,7 @@ while [[ $# -gt 0 ]]; do
export VERBOSE=1 export VERBOSE=1
;; ;;
--version) --version)
echo 24.05-pre echo 24.11-pre
exit 0 exit 0
;; ;;
*) *)

22
home-manager/po/da.po
View file

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: Home Manager\n" "Project-Id-Version: Home Manager\n"
"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
"POT-Creation-Date: 2024-04-17 23:19+0200\n" "POT-Creation-Date: 2024-04-17 23:19+0200\n"
"PO-Revision-Date: 2024-02-16 22:01+0000\n" "PO-Revision-Date: 2024-05-25 11:09+0000\n"
"Last-Translator: Robert Helgesson <robert@rycee.net>\n" "Last-Translator: DeeKahy <Lennart.Diego.Kahn@gmail.com>\n"
"Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/cli/" "Language-Team: Danish <https://hosted.weblate.org/projects/home-manager/cli/"
"da/>\n" "da/>\n"
"Language: da\n" "Language: da\n"
@ -17,12 +17,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\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" #. translators: For example: "home-manager: missing argument for --cores"
#: home-manager/home-manager:16 #: home-manager/home-manager:16
msgid "%s: missing argument for %s" msgid "%s: missing argument for %s"
msgstr "" msgstr "%s: manglende argument for %s"
#: home-manager/home-manager:64 #: home-manager/home-manager:64
msgid "No configuration file found at %s" msgid "No configuration file found at %s"
@ -36,8 +36,8 @@ msgid ""
"Keeping your Home Manager %s in %s is deprecated,\n" "Keeping your Home Manager %s in %s is deprecated,\n"
"please move it to %s" "please move it to %s"
msgstr "" msgstr ""
"At have din Home Manager %s i %s er forældet,\n" "Det er forældet at holde Home Manager %s i %s,\n"
"flyt den venligst til %s" "ryk den venligst til %s"
#: home-manager/home-manager:92 #: home-manager/home-manager:92
msgid "No configuration file found. Please create one at %s" 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 #: home-manager/home-manager:107
msgid "Home Manager not found at %s." 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. #. 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 #: home-manager/home-manager:115
@ -53,8 +53,8 @@ msgid ""
"The fallback Home Manager path %s has been deprecated and a file/directory " "The fallback Home Manager path %s has been deprecated and a file/directory "
"was found there." "was found there."
msgstr "" msgstr ""
"Fallback-stien til Home Manager %s er blevet forældet, og en fil/mappe blev " "Det er forældet at bruge fallback Home Manager path %s og der blev fundet en "
"fundet der." "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. #. 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 #: 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 #: home-manager/home-manager:327 home-manager/home-manager:431
msgid "The file %s already exists, leaving it unchanged..." 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 #: home-manager/home-manager:329 home-manager/home-manager:433
msgid "Creating %s..." msgid "Creating %s..."
@ -189,7 +189,7 @@ msgstr "Ubekændt \"news.display\" indstilling \"%s\"."
#: home-manager/home-manager:594 #: home-manager/home-manager:594
#, sh-format #, sh-format
msgid "Please set the $EDITOR or $VISUAL environment variable" msgid "Please set the $EDITOR or $VISUAL environment variable"
msgstr "" msgstr "Indstil venligst miljøvariablen $EDITOR eller $VISUAL"
#: home-manager/home-manager:612 #: home-manager/home-manager:612
msgid "Cannot run build in read-only directory" msgid "Cannot run build in read-only directory"

8
home-manager/po/de.po
View file

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

31
home-manager/po/ja.po
View file

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: Home Manager\n" "Project-Id-Version: Home Manager\n"
"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
"POT-Creation-Date: 2024-04-17 23:19+0200\n" "POT-Creation-Date: 2024-04-17 23:19+0200\n"
"PO-Revision-Date: 2024-04-29 18:07+0000\n" "PO-Revision-Date: 2024-05-25 11:09+0000\n"
"Last-Translator: Kento Okamoto <kentokamoto@protonmail.com>\n" "Last-Translator: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/" "Language-Team: Japanese <https://hosted.weblate.org/projects/home-manager/"
"cli/ja/>\n" "cli/ja/>\n"
"Language: ja\n" "Language: ja\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\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" #. translators: For example: "home-manager: missing argument for --cores"
#: home-manager/home-manager:16 #: home-manager/home-manager:16
@ -45,14 +45,15 @@ msgstr "設定ファイルがありません。ファイルを %s に作って
#: home-manager/home-manager:107 #: home-manager/home-manager:107
msgid "Home Manager not found at %s." 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. #. 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 #: home-manager/home-manager:115
msgid "" msgid ""
"The fallback Home Manager path %s has been deprecated and a file/directory " "The fallback Home Manager path %s has been deprecated and a file/directory "
"was found there." "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. #. 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 #: home-manager/home-manager:118
@ -75,6 +76,24 @@ msgid ""
"\n" "\n"
" $ rm -r \"%s\"" " $ rm -r \"%s\""
msgstr "" 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 #: home-manager/home-manager:146
msgid "Sanity checking Nix" msgid "Sanity checking Nix"
@ -168,7 +187,7 @@ msgstr "\"news.display\"に\"%s\"という設定は存在しません。"
#: home-manager/home-manager:594 #: home-manager/home-manager:594
#, sh-format #, sh-format
msgid "Please set the $EDITOR or $VISUAL environment variable" msgid "Please set the $EDITOR or $VISUAL environment variable"
msgstr "" msgstr "環境変数 $EDITOR または $VISUAL を設定してください"
#: home-manager/home-manager:612 #: home-manager/home-manager:612
msgid "Cannot run build in read-only directory" msgid "Cannot run build in read-only directory"

8
home-manager/po/ko.po
View file

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

8
home-manager/po/zh_Hans.po
View file

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: Home Manager\n" "Project-Id-Version: Home Manager\n"
"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
"POT-Creation-Date: 2024-04-17 23:19+0200\n" "POT-Creation-Date: 2024-04-17 23:19+0200\n"
"PO-Revision-Date: 2024-03-03 06:24+0000\n" "PO-Revision-Date: 2024-05-13 10:00+0000\n"
"Last-Translator: immwind <i@immwind.com>\n" "Last-Translator: Zexin Yuan <yuan.zx@outlook.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"home-manager/cli/zh_Hans/>\n" "home-manager/cli/zh_Hans/>\n"
"Language: zh_Hans\n" "Language: zh_Hans\n"
@ -17,12 +17,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\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" #. translators: For example: "home-manager: missing argument for --cores"
#: home-manager/home-manager:16 #: home-manager/home-manager:16
msgid "%s: missing argument for %s" msgid "%s: missing argument for %s"
msgstr "" msgstr "%s：缺少参数 %s"
#: home-manager/home-manager:64 #: home-manager/home-manager:64
msgid "No configuration file found at %s" msgid "No configuration file found at %s"

2
modules/misc/uninstall.nix
View file

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

4
modules/programs/bash.nix
View file

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

2
modules/programs/eza.nix
View file

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

2
modules/programs/fd.nix
View file

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

4
modules/programs/khal.nix
View file

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

2
modules/programs/topgrade.nix
View file

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

62
modules/programs/yazi.nix
View file

@ -11,7 +11,7 @@ let
local tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" builtin cd -- "$cwd"
fi fi
rm -f -- "$tmp" rm -f -- "$tmp"
} }
@ -22,7 +22,7 @@ let
set tmp (mktemp -t "yazi-cwd.XXXXX") set tmp (mktemp -t "yazi-cwd.XXXXX")
yazi $argv --cwd-file="$tmp" yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
cd -- "$cwd" builtin cd -- "$cwd"
end end
rm -f -- "$tmp" rm -f -- "$tmp"
end end
@ -40,17 +40,12 @@ let
} }
''; '';
in { in {
meta.maintainers = [ maintainers.xyenon ]; meta.maintainers = with maintainers; [ xyenon ];
options.programs.yazi = { options.programs.yazi = {
enable = mkEnableOption "yazi"; enable = mkEnableOption "yazi";
package = mkOption { package = mkPackageOption pkgs "yazi" { };
type = types.package;
default = pkgs.yazi;
defaultText = literalExpression "pkgs.yazi";
description = "Yazi package to install.";
};
enableBashIntegration = mkEnableOption "Bash integration"; enableBashIntegration = mkEnableOption "Bash integration";
@ -135,6 +130,48 @@ in {
for the full list of options for the full list of options
''; '';
}; };
initLua = mkOption {
type = with types; nullOr path;
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.
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.
See https://yazi-rs.github.io/docs/flavors/overview/ for documentation.
'';
example = literalExpression ''
{
foo = ./foo;
bar = pkgs.bar;
}
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -160,6 +197,11 @@ in {
"yazi/theme.toml" = mkIf (cfg.theme != { }) { "yazi/theme.toml" = mkIf (cfg.theme != { }) {
source = tomlFormat.generate "yazi-theme" cfg.theme; source = tomlFormat.generate "yazi-theme" cfg.theme;
}; };
}; "yazi/init.lua" = mkIf (cfg.initLua != null) { source = cfg.initLua; };
} // (mapAttrs'
(name: value: nameValuePair "yazi/plugins/${name}" { source = value; })
cfg.plugins) // (mapAttrs'
(name: value: nameValuePair "yazi/flavors/${name}" { source = value; })
cfg.flavors);
}; };
} }

5
modules/services/gpg-agent.nix
View file

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

4
modules/services/kanshi.nix
View file

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

7
modules/services/kdeconnect.nix
View file

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

2
modules/services/listenbrainz-mpd.nix
View file

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

5
modules/services/window-managers/hyprland.nix
View file

@ -236,8 +236,9 @@ in {
}) + lib.optionalString (cfg.extraConfig != "") cfg.extraConfig; }) + lib.optionalString (cfg.extraConfig != "") cfg.extraConfig;
onChange = lib.mkIf (cfg.package != null) '' 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 for i in $(${cfg.finalPackage}/bin/hyprctl instances -j | jq ".[].instance" -r); do
${cfg.finalPackage}/bin/hyprctl -i "$i" reload config-only ${cfg.finalPackage}/bin/hyprctl -i "$i" reload config-only
done done

2
release.json
View file

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

2
tests/integration/nixos/basics.nix
View file

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

2
tests/integration/standalone/alice-home-init.nix
View file

@ -13,7 +13,7 @@
# You should not change this value, even if you update Home Manager. If you do # 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 # want to update the value, then make sure to first check the Home Manager
# release notes. # 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 # The home.packages option allows you to install Nix packages into your
# environment. # environment.

2
tests/integration/standalone/alice-home-next.nix
View file

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

25
tests/modules/programs/mpv/mpv-stubs.nix
View file

@ -1,14 +1,20 @@
{ pkgs, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (final: prev: {
mpvScript = pkgs.runCommandLocal "mpvScript" { scriptName = "something"; } mpvScript = prev.runCommandLocal "mpvScript" { scriptName = "something"; }
"mkdir $out"; "mkdir $out";
mpv-unwrapped = super.mpv-unwrapped.overrideAttrs { mpv-unwrapped = let
builder = pkgs.writeShellScript "dummy" '' lua = prev.emptyDirectory.overrideAttrs {
PATH=${pkgs.coreutils}/bin luaversion = "0";
passthru.withPackages = pkgsFn: prev.emptyDirectory;
};
mpv-unwrapped' = prev.mpv-unwrapped.override { inherit lua; };
in mpv-unwrapped'.overrideAttrs {
buildInputs = [ ];
nativeBuildInputs = [ ];
builder = prev.writeShellScript "dummy" ''
PATH=${final.coreutils}/bin
mkdir -p $dev $doc $man $out/bin $out/Applications/mpv.app/Contents/MacOS mkdir -p $dev $doc $man $out/bin $out/Applications/mpv.app/Contents/MacOS
touch $out/bin/{mpv,umpv} \ touch $out/bin/{mpv,umpv} \
$out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle} $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle}
@ -16,11 +22,6 @@
$out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle} $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle}
''; '';
}; };
lua = pkgs.emptyDirectory.overrideAttrs {
luaversion = "0";
withPackages = ps: pkgs.emptyDirectory;
};
}) })
]; ];

7
tests/modules/programs/topgrade/settings-expected.toml
View file

@ -1,8 +1,9 @@
[commands]
"Purge unused APT packages" = "sudo apt autoremove"
[misc]
cleanup = true cleanup = true
disable = ["sdkman", "flutter", "node", "nix", "home_manager"] disable = ["sdkman", "flutter", "node", "nix", "home_manager"]
remote_topgrade_path = "bin/topgrade" remote_topgrade_path = "bin/topgrade"
remote_topgrades = ["backup", "ci"] remote_topgrades = ["backup", "ci"]
set_title = false set_title = false
[commands]
"Purge unused APT packages" = "sudo apt autoremove"

6
tests/modules/programs/topgrade/settings.nix
View file

@ -6,17 +6,21 @@
settings = lib.mkMerge [ settings = lib.mkMerge [
{ {
misc = {
disable = [ "sdkman" "flutter" "node" "nix" "home_manager" ]; disable = [ "sdkman" "flutter" "node" "nix" "home_manager" ];
remote_topgrades = [ "backup" "ci" ]; remote_topgrades = [ "backup" "ci" ];
remote_topgrade_path = "bin/topgrade"; remote_topgrade_path = "bin/topgrade";
};
} }
{ {
misc = {
set_title = false; set_title = false;
cleanup = true;
cleanup = true;
};
commands = { "Purge unused APT packages" = "sudo apt autoremove"; }; commands = { "Purge unused APT packages" = "sudo apt autoremove"; };
} }
]; ];

2
tests/modules/programs/yazi/bash-integration-enabled.nix
View file

@ -6,7 +6,7 @@ let
local tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" builtin cd -- "$cwd"
fi fi
rm -f -- "$tmp" rm -f -- "$tmp"
} }

2
tests/modules/programs/yazi/fish-integration-enabled.nix
View file

@ -6,7 +6,7 @@ let
set tmp (mktemp -t "yazi-cwd.XXXXX") set tmp (mktemp -t "yazi-cwd.XXXXX")
yazi $argv --cwd-file="$tmp" yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
cd -- "$cwd" builtin cd -- "$cwd"
end end
rm -f -- "$tmp" rm -f -- "$tmp"
end end

1
tests/modules/programs/yazi/flavor/init.lua Normal file
View file

@ -0,0 +1 @@
-- This is a flavor.

3
tests/modules/programs/yazi/init.lua Normal file
View file

@ -0,0 +1,3 @@
require("zoxide"):setup {
update_db = true,
}

1
tests/modules/programs/yazi/plugin/init.lua Normal file
View file

@ -0,0 +1 @@
-- This is a plugin.

9
tests/modules/programs/yazi/settings.nix
View file

@ -69,6 +69,9 @@
]; ];
}; };
}; };
initLua = ./init.lua;
plugins = { "test.yazi" = ./plugin; };
flavors = { "test.yazi" = ./flavor; };
}; };
test.stubs.yazi = { }; test.stubs.yazi = { };
@ -80,5 +83,11 @@
${./settings-expected.toml} ${./settings-expected.toml}
assertFileContent home-files/.config/yazi/theme.toml \ assertFileContent home-files/.config/yazi/theme.toml \
${./theme-expected.toml} ${./theme-expected.toml}
assertFileContent home-files/.config/yazi/init.lua \
${./init.lua}
assertFileContent home-files/.config/yazi/plugins/test.yazi/init.lua \
${./plugin/init.lua}
assertFileContent home-files/.config/yazi/flavors/test.yazi/init.lua \
${./flavor/init.lua}
''; '';
} }

2
tests/modules/programs/yazi/zsh-integration-enabled.nix
View file

@ -6,7 +6,7 @@ let
local tmp="$(mktemp -t "yazi-cwd.XXXXX")" local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
yazi "$@" --cwd-file="$tmp" yazi "$@" --cwd-file="$tmp"
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
cd -- "$cwd" builtin cd -- "$cwd"
fi fi
rm -f -- "$tmp" rm -f -- "$tmp"
} }