diff options
| author | Baitinq <manuelpalenzuelamerino@gmail.com> | 2022-09-21 17:15:14 +0200 |
|---|---|---|
| committer | Baitinq <manuelpalenzuelamerino@gmail.com> | 2022-09-22 00:18:59 +0200 |
| commit | 23ab0cd74d8ff051b1f2018222e1dec603c0c4a7 (patch) | |
| tree | 34ba68fc446e6b8841b4a6b9b1e66f81fa7b5fa4 /hosts | |
| parent | Misc: Move patches to their respective overlay's folder (diff) | |
| download | nixos-config-23ab0cd74d8ff051b1f2018222e1dec603c0c4a7.tar.gz nixos-config-23ab0cd74d8ff051b1f2018222e1dec603c0c4a7.tar.bz2 nixos-config-23ab0cd74d8ff051b1f2018222e1dec603c0c4a7.zip | |
mkHost: Add extraOverlays argument
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hosts/default.nix b/hosts/default.nix index 157bf1b..7ddb3ad 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -5,8 +5,8 @@ let dotfiles = ../dotfiles; hosts = [ - { host = "phobos"; system = "x86_64-linux"; timezone = secrets.main_timezone; location = secrets.main_location; } - { host = "luna"; system = "x86_64-linux"; timezone = secrets.main_timezone; location = secrets.main_location; } + { host = "phobos"; system = "x86_64-linux"; extraOverlays = [ ]; timezone = secrets.main_timezone; location = secrets.main_location; } + { host = "luna"; system = "x86_64-linux"; extraOverlays = [ ]; timezone = secrets.main_timezone; location = secrets.main_location; } ]; hardwares = [ @@ -15,7 +15,7 @@ let { hardware = "virtualbox"; } ]; - mkHost = { host, hardware, system, timezone, location }: extraModules: isNixOS: isIso: isHardware: + mkHost = { host, hardware, system, timezone, location, extraOverlays }: extraModules: isNixOS: isIso: isHardware: let pkgs = import nixpkgs { inherit system; @@ -27,7 +27,7 @@ let inputs.nur.overlay (import ../packages) (import ../overlays) - ]; + ] ++ extraOverlays; }; extraArgs = { inherit pkgs inputs isIso isHardware user secrets dotfiles timezone location; hostname = host; }; extraSpecialModules = extraModules ++ lib.optional isHardware ../hardware/${hardware} ++ lib.optional isIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; @@ -73,4 +73,4 @@ in Map each element of the list applying the mkHost function to its elements and returning a set in the listToAttrs format builtins.listToAttrs on the result */ -builtins.listToAttrs (map ({ host, hardware, system, timezone, location }: { name = host + "-" + hardware; value = mkHost { inherit host hardware system timezone location; } extraModules isNixOS isIso isHardware; }) permutatedHosts) +builtins.listToAttrs (map (mInput@{ host, hardware, system, timezone, location, extraOverlays }: { name = host + "-" + hardware; value = mkHost mInput extraModules isNixOS isIso isHardware; }) permutatedHosts) |