Compare commits

...

22 commits

Author SHA1 Message Date
Gabriel Fontes e1391fb22e
hyprland: onChange: remove subshell comment
(cherry picked from commit 7e769959e8)
2024-07-03 23:40:25 +02:00
Gabriel Fontes c05d7204a9
hyprland: onChange: check XDG_RUNTIME_DIR as well
The previous check false negatives in Hyprland >= 0.40.0

(cherry picked from commit 7ac529c221)
2024-07-03 23:40:24 +02:00
dependabot[bot] 391ca6e950
ci: bump DeterminateSystems/update-flake-lock from 22 to 23
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 22 to 23.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v22...v23)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 11:49:45 +02:00
dependabot[bot] a1fddf0967
ci: bump DeterminateSystems/update-flake-lock from 21 to 22
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 21 to 22.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v21...v22)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-16 11:35:13 +02:00
Mario Rodas c26f6faf5a
docs: add redirect from the previous options.html
After migrating to nixos-render-docs, the extension move to .xtml.
Unfortunately, this broke links to the previous Options Page.

This patch provides a basic redirect support to the new Options Page.

(cherry picked from commit 8bdb74eaff)
2024-06-16 10:40:55 +02:00
Sumner Evans 8a687e4cf5
ci/labeler: fix upgrade to v5 format
Signed-off-by: Sumner Evans <me@sumnerevans.com>
(cherry picked from commit 2cacdd6a27)
2024-06-16 10:40:36 +02:00
Sumner Evans 1f45254ef9
ci/labeler: upgrade to v5 format
Signed-off-by: Sumner Evans <me@sumnerevans.com>
(cherry picked from commit 1a577c135c)
2024-06-16 10:40:36 +02:00
Robert Helgesson 845a5c4c07
home-manager: mark 24.05 as release 2024-06-04 20:53:02 +02:00
nurelin a631666f5e
kanshi: fix configuration example
(cherry picked from commit 5d151429e1)
2024-05-26 17:20:33 +02:00
dependabot[bot] 142d4365b5
ci: bump actions/labeler from 4 to 5
Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-26 11:40:33 +02:00
dependabot[bot] 0cbfb58c6a
ci: bump cachix/install-nix-action from 23 to 27
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 27.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v23...V27)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-26 11:31:05 +02:00
dependabot[bot] 6381634330
ci: bump cachix/cachix-action from 13 to 15
Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 13 to 15.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v13...v15)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-26 11:30:46 +02:00
DeeKahy c719dbb764
Translate using Weblate (Danish)
Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: DeeKahy <Lennart.Diego.Kahn@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/da/
Translation: Home Manager/Home Manager CLI
(cherry picked from commit 05e6ba83eb)
2024-05-26 11:30:06 +02:00
TANIGUCHI Kohei 3f3884d77f
Translate using Weblate (Japanese)
Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/ja/
Translation: Home Manager/Home Manager CLI
(cherry picked from commit 517682ed21)
2024-05-26 11:30:06 +02:00
Narazaki Shuji 02de6f987b
Translate using Weblate (Japanese)
Currently translated at 94.5% (35 of 37 strings)

Co-authored-by: Narazaki Shuji <shujinarazaki@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/ja/
Translation: Home Manager/Home Manager CLI
(cherry picked from commit cd29501b79)
2024-05-26 11:30:06 +02:00
halbGefressen 2b9c001428
Translate using Weblate (German)
Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: halbGefressen <chzi@pm.me>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/de/
Translation: Home Manager/Home Manager CLI
(cherry picked from commit 943f1e97fc)
2024-05-26 11:30:06 +02:00
Zexin Yuan ccc0e8d952
Translate using Weblate (Chinese (Simplified))
Currently translated at 100.0% (37 of 37 strings)

Co-authored-by: Zexin Yuan <yuan.zx@outlook.com>
Translate-URL: https://hosted.weblate.org/projects/home-manager/cli/zh_Hans/
Translation: Home Manager/Home Manager CLI
(cherry picked from commit fb7feac55b)
2024-05-26 11:30:06 +02:00
Robert Helgesson f3a4512166
ci: fix manual build in sourcehut build
(cherry picked from commit e4611630c3)
2024-05-26 01:31:17 +02:00
Robert Helgesson 569d928458
home-manager: switch nixpkgs input to nixos-24.05 2024-05-25 23:17:55 +02:00
Robert Helgesson 89fbc13af5
home-manager: prepare release 24.05
(cherry picked from commit 548ba194d0)
2024-05-25 22:31:45 +02:00
Robert Helgesson 00a86e4f7a
ci: make dependabot consider the release-24.05
Also remove 23.05 from dependabot.

(cherry picked from commit 850cb32204)
2024-05-24 17:18:06 +02:00
Robert Helgesson c583e715f7
ci: make test workflow use nixos-24.05 2024-05-24 17:16:52 +02:00
31 changed files with 187 additions and 136 deletions

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 \

View file

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

10
.github/labeler.yml vendored
View file

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

View file

@ -11,10 +11,10 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v23 - uses: cachix/install-nix-action@V27
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 }}'

View file

@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.repository_owner == 'nix-community' if: github.repository_owner == 'nix-community'
steps: steps:
- uses: actions/labeler@v4 - uses: actions/labeler@v5
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
sync-labels: true sync-labels: true

View file

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

View file

@ -12,9 +12,9 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v23 uses: cachix/install-nix-action@V27
- name: Update flake.lock - name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v21 uses: DeterminateSystems/update-flake-lock@v23
with: with:
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
pr-labels: dependencies pr-labels: dependencies

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.

View file

@ -32,6 +32,8 @@ in stdenv.mkDerivation {
OPTIONS_JSON \ OPTIONS_JSON \
${home-manager-options.nix-darwin}/share/doc/nixos/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 ${./static/style.css} out/style.css
cp -r ${./release-notes} release-notes cp -r ${./release-notes} release-notes

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";
}; };
``` ```

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";
}; };
``` ```

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
``` ```

View file

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

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

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;

15
docs/options.html Normal file
View file

@ -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>

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.

View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1716542732,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,7 +1,7 @@
{ {
description = "Home Manager for Nix"; 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, ... }: outputs = { self, nixpkgs, ... }:
{ {

View file

@ -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.05
exit 0 exit 0
;; ;;
*) *)

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"

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"

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"

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"

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";

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 {
} }
]; ];
} }
]
''; '';
}; };

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

View file

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

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;

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.

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";