Skip to content

Commit 2b81472

Browse files
committed
treewide: remove unnecessary uses of homeManagerNixpkgs, mention it in the docs
Using `delib.configurations :: homeManagerNixpkgs` is almost always unnecessary if `inputs.denix.inputs.nixpkgs.follows = "nixpkgs";` is set, since `homeManagerNixpkgs` defaults to `nixpkgs` from inputs.
1 parent 5c415f3 commit 2b81472

File tree

8 files changed

+2
-8
lines changed

8 files changed

+2
-8
lines changed

docs/src/configurations/introduction.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ An example of a flake's `outputs` for `nixosConfigurations` and `homeConfigurati
3232
outputs = {denix, nixpkgs, ...} @ inputs: let
3333
mkConfigurations = isHomeManager:
3434
denix.lib.configurations rec {
35-
homeManagerNixpkgs = nixpkgs;
3635
homeManagerUser = "sjohn";
3736
inherit isHomeManager;
3837

docs/src/configurations/structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Function Arguments {#function-arguments}
44
- `myconfigName` (string): the category for all Denix module options, hosts, and rices. Default is `myconfig`; changes are not recommended.
55
- `denixLibName` (string): the name of the Denix library in `specialArgs` (`{denixLibName, ...}: denixLibName.module { ... }`). Default is `delib`; changes are not recommended.
6-
- `homeManagerNixpkgs` (nixpkgs): used in the `pkgs` attribute of the `home-manager.lib.homeManagerConfiguration` function in the format: `homeManagerNixpkgs.legacyPackages.${host :: homeManagerSystem}`. By default, it takes `nixpkgs` from the flake.
6+
- `homeManagerNixpkgs` (nixpkgs): used in the `pkgs` attribute of the `home-manager.lib.homeManagerConfiguration` function in the format: `homeManagerNixpkgs.legacyPackages.${host :: homeManagerSystem}`. By default, it takes `nixpkgs` from the flake, so if you've set `inputs.denix.inputs.nixpkgs.follows = "nixpkgs";`, specifying `homeManagerNixpkgs` is typically unnecessary.
77
- `homeManagerUser` (string): the username, used in `home-manager.users.${homeManagerUser}` and for generating the Home Manager configuration list.
88
- `isHomeManager` (boolean): indicates whether to create a configuration list for Home Manager or for NixOS.
99
- `paths` (listOf string): paths to be imported; add hosts, rices, and modules here. Default is `[]`.

docs/src/getting_started/initialization.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ First, create a directory for your configuration and a `flake.nix` file with the
3535
} @ inputs: let
3636
mkConfigurations = isHomeManager:
3737
denix.lib.configurations {
38-
homeManagerNixpkgs = nixpkgs;
3938
homeManagerUser = "sjohn"; #!!! REPLACEME
4039
inherit isHomeManager;
4140

docs/src/ru/configurations/introduction.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ nixos-rebuild switch --flake .#desktop-dark --use-remote-sudo
3232
outputs = {denix, nixpkgs, ...} @ inputs: let
3333
mkConfigurations = isHomeManager:
3434
denix.lib.configurations rec {
35-
homeManagerNixpkgs = nixpkgs;
3635
homeManagerUser = "sjohn";
3736
inherit isHomeManager;
3837

docs/src/ru/configurations/structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Аргументы функции {#function-arguments}
44
- `myconfigName` (string): категория для всех опций модулей Denix, хостов и райсов. По умолчанию `myconfig`; изменять не рекомендуется.
55
- `denixLibName` (string): имя библиотеки Denix в `specialArgs` (`{denixLibName, ...}: denixLibName.module { ... }`). По умолчанию `delib`; изменять не рекомендуется.
6-
- `homeManagerNixpkgs` (nixpkgs): используется в атрибуте `pkgs` функции `home-manager.lib.homeManagerConfiguration` в формате: `homeManagerNixpkgs.legacyPackages.${host :: homeManagerSystem}`. По умолчанию берется `nixpkgs` из флейка.
6+
- `homeManagerNixpkgs` (nixpkgs): используется в атрибуте `pkgs` функции `home-manager.lib.homeManagerConfiguration` в формате: `homeManagerNixpkgs.legacyPackages.${host :: homeManagerSystem}`. По умолчанию берется `nixpkgs` из флейка, поэтому если вы указали `inputs.denix.inputs.nixpkgs.follows = "nixpkgs";`, указывать `homeManagerNixpkgs` обычно не имеет смысла.
77
- `homeManagerUser` (string): имя пользователя, используется в `home-manager.users.${homeManagerUser}` и для генерации списка конфигураций Home Manager.
88
- `isHomeManager` (boolean): указывает, создавать ли список конфигураций для Home Manager или для NixOS.
99
- `paths` (listOf string): пути, которые будут импортированы; добавьте сюда хосты, райсы и модули. По умолчанию `[]`.

docs/src/ru/getting_started/initialization.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ nix flake init -t github:yunfachi/denix#minimal-no-rices
3535
} @ inputs: let
3636
mkConfigurations = isHomeManager:
3737
denix.lib.configurations {
38-
homeManagerNixpkgs = nixpkgs;
3938
homeManagerUser = "sjohn"; #!!! REPLACEME
4039
inherit isHomeManager;
4140

templates/minimal-no-rices/flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
} @ inputs: let
2222
mkConfigurations = isHomeManager:
2323
denix.lib.configurations {
24-
homeManagerNixpkgs = nixpkgs;
2524
homeManagerUser = "sjohn";
2625
inherit isHomeManager;
2726

templates/minimal/flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
} @ inputs: let
2222
mkConfigurations = isHomeManager:
2323
denix.lib.configurations {
24-
homeManagerNixpkgs = nixpkgs;
2524
homeManagerUser = "sjohn";
2625
inherit isHomeManager;
2726

0 commit comments

Comments
 (0)