ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

home: nix: rename 'inputs' options

Browse source 
This mirrors the changes made to the NixOS module.
This commit is contained in:
Bruno BELANYI 2024-02-12 11:39:13 +00:00
parent 5e3bc5a8c9
commit 7f17069998
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/home/nix/default.nix
View file

@ -12,7 +12,7 @@ let
# Use pinned nixpkgs when using `nix run pkgs#<whatever>` # Use pinned nixpkgs when using `nix run pkgs#<whatever>`
pkgs = inputs.nixpkgs; pkgs = inputs.nixpkgs;
} }
(lib.optionalAttrs cfg.overrideNixpkgs { (lib.optionalAttrs cfg.inputs.overrideNixpkgs {
# ... And with `nix run nixpkgs#<whatever>` # ... And with `nix run nixpkgs#<whatever>`
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
}) })
@ -22,20 +22,22 @@ in
options.my.home.nix = with lib; { options.my.home.nix = with lib; {
enable = my.mkDisableOption "nix configuration"; enable = my.mkDisableOption "nix configuration";
linkInputs = my.mkDisableOption "link inputs to `$XDG_CONFIG_HOME/nix/inputs`"; inputs = {
link = my.mkDisableOption "link inputs to `/etc/nix/inputs/`";
addToRegistry = my.mkDisableOption "add inputs and self to registry"; addToRegistry = my.mkDisableOption "add inputs and self to registry";
addToNixPath = my.mkDisableOption "add inputs and self to nix path"; addToNixPath = my.mkDisableOption "add inputs and self to nix path";
overrideNixpkgs = my.mkDisableOption "point nixpkgs to pinned system version"; overrideNixpkgs = my.mkDisableOption "point nixpkgs to pinned system version";
};
}; };
config = lib.mkIf cfg.enable (lib.mkMerge [ config = lib.mkIf cfg.enable (lib.mkMerge [
{ {
assertions = [ assertions = [
{ {
assertion = cfg.addToNixPath -> cfg.linkInputs; assertion = cfg.inputs.addToNixPath -> cfg.inputs.link;
message = '' message = ''
enabling `my.home.nix.addToNixPath` needs to have enabling `my.home.nix.addToNixPath` needs to have
`my.home.nix.linkInputs = true` `my.home.nix.linkInputs = true`
@ -54,7 +56,7 @@ in
}; };
} }
(lib.mkIf cfg.addToRegistry { (lib.mkIf cfg.inputs.addToRegistry {
nix.registry = nix.registry =
let let
makeEntry = v: { flake = v; }; makeEntry = v: { flake = v; };
@ -63,7 +65,7 @@ in
makeEntries channels; makeEntries channels;
}) })
(lib.mkIf cfg.linkInputs { (lib.mkIf cfg.inputs.link {
xdg.configFile = xdg.configFile =
let let
makeLink = n: v: { makeLink = n: v: {
@ -75,7 +77,7 @@ in
makeLinks channels; makeLinks channels;
}) })
(lib.mkIf cfg.addToNixPath { (lib.mkIf cfg.inputs.addToNixPath {
home.sessionVariables.NIX_PATH = "${config.xdg.configHome}/nix/inputs\${NIX_PATH:+:$NIX_PATH}"; home.sessionVariables.NIX_PATH = "${config.xdg.configHome}/nix/inputs\${NIX_PATH:+:$NIX_PATH}";
}) })
]); ]);