diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/mkHomeManagerConfiguration.nix | 10 | ||||
| -rw-r--r-- | nix/mkSystem.nix | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/nix/mkHomeManagerConfiguration.nix b/nix/mkHomeManagerConfiguration.nix index bcf374a..70e875d 100644 --- a/nix/mkHomeManagerConfiguration.nix +++ b/nix/mkHomeManagerConfiguration.nix @@ -3,9 +3,11 @@ inputs@{ self, ... }: , username ? "fcuny" , hostname , stateVersion ? "22.05" -, extraModules ? [ ] , }: +let + naersk = inputs.naersk.lib."${system}"; +in inputs.home-manager.lib.homeManagerConfiguration { inherit system; inherit username; @@ -19,8 +21,12 @@ inputs.home-manager.lib.homeManagerConfiguration { overlays = [ inputs.emacs-overlay.overlay inputs.nur.overlay + inputs.naersk.overlay inputs.rust.overlays.default - (final: prev: { tools = import "${self}/tools" { pkgs = prev; }; }) + (final: prev: + { + tools = import "${self}/tools" { pkgs = prev; inherit naersk; }; + }) ]; }; configuration.imports = diff --git a/nix/mkSystem.nix b/nix/mkSystem.nix index 00b5664..4debbab 100644 --- a/nix/mkSystem.nix +++ b/nix/mkSystem.nix @@ -1,5 +1,8 @@ inputs@{ self, ... }: { system ? "x86_64-linux", hostname, }: +let + naersk = inputs.naersk.lib."${system}"; +in inputs.nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs system hostname; }; @@ -14,13 +17,12 @@ inputs.nixpkgs.lib.nixosSystem { overlays = [ inputs.nur.overlay inputs.rust.overlays.default - (final: prev: { tools = import "${self}/tools" { pkgs = prev; }; }) + (final: prev: + { + tools = import "${self}/tools" { pkgs = prev; inherit naersk; }; + }) ]; }; - # Add each input as a registry - nix.registry = inputs.nixpkgs.lib.mapAttrs' - (n: v: inputs.nixpkgs.lib.nameValuePair (n) ({ flake = v; })) - inputs; } ]; } |