diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 36 | ||||
| -rw-r--r-- | nix/mkSystem.nix | 27 |
2 files changed, 28 insertions, 35 deletions
diff --git a/nix/default.nix b/nix/default.nix index 8b46c58..2dfd8a2 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,39 +1,5 @@ { inputs }: { - mkSystem = - { hostname - , system - }: - inputs.nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { - inherit inputs system hostname; - }; - modules = [ - ../modules - ../hosts/${hostname} - ./private-wireguard.nix - { - networking.hostName = hostname; - nixpkgs = { - config.allowUnfree = true; - overlays = [ - inputs.emacs-overlay.overlay - inputs.nur.overlay - (final: prev: { - tools = { - gerrit-hook = import ../tools/gerrit-hook final; - }; - }) - ]; - }; - # Add each input as a registry - nix.registry = inputs.nixpkgs.lib.mapAttrs' - (n: v: - inputs.nixpkgs.lib.nameValuePair (n) ({ flake = v; })) - inputs; - } - ]; - }; + mkSystem = import ./mkSystem.nix inputs; } diff --git a/nix/mkSystem.nix b/nix/mkSystem.nix new file mode 100644 index 0000000..28e42b1 --- /dev/null +++ b/nix/mkSystem.nix @@ -0,0 +1,27 @@ +inputs@{ self, ... }: +{ system ? "x86_64-linux", hostname, }: +inputs.nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit inputs system hostname; }; + modules = [ + "${self}/modules" + "${self}/hosts/${hostname}" + ./private-wireguard.nix + { + networking.hostName = hostname; + nixpkgs = { + config.allowUnfree = true; + overlays = [ + inputs.emacs-overlay.overlay + inputs.nur.overlay + (final: prev: { + tools = { gerrit-hook = import ../tools/gerrit-hook final; }; + }) + ]; + }; + # Add each input as a registry + nix.registry = inputs.nixpkgs.lib.mapAttrs' + (n: v: inputs.nixpkgs.lib.nameValuePair (n) ({ flake = v; })) inputs; + } + ]; +} |