summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index de880b8..ae1a82a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
# Gets module from ./machines/ and uses the lib to define which other modules
# the machine needs.
- mkSystem = name: machineModule: with lib;
+ mkSystem = name: machineConfig: with lib;
let
machine = ivi.machines.${name};
in
@@ -35,7 +35,7 @@
specialArgs = {inherit machine inputs;};
modules = with lib;
machine.modules
- ++ [machineModule]
+ ++ [machineConfig]
++ [({ config, ... }: {
nixpkgs.overlays = with lib; [(composeManyExtensions [
(import ./overlays/vimPlugins.nix {inherit pkgs;})
@@ -47,12 +47,7 @@
in with lib; {
inherit lib;
nixosConfigurations = with lib;
- mapAttrs
- (hostname: machineConfig:
- mkSystem
- hostname
- machineConfig)
- (modulesIn ./machines);
+ mapAttrs mkSystem (modulesIn ./machines);
deploy.nodes =
mapAttrs