erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
Erwin Boskma 2024-03-11 17:47:04 +01:00
parent e8006179f8
commit 323b0291df
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
flake.nix
View file

@ -158,24 +158,19 @@
overlays.default = import ./overlays;
nixosModules = builtins.listToAttrs (
map
(x: {
name = x;
value = import (./modules + "/${x}");
})
(builtins.attrNames (builtins.readDir ./modules))
map (x: {
name = x;
value = import (./modules + "/${x}");
}) (builtins.attrNames (builtins.readDir ./modules))
);
nixosConfigurations = builtins.listToAttrs (
map
(machine: {
name = machine;
value =
self.lib.defSystem (machines.${machine}.system or "x86_64-linux")
{ imports = [ machines.${machine}.config ]; }
(machines.${machine}.deploy or null);
})
(builtins.attrNames machines)
map (machine: {
name = machine;
value = self.lib.defSystem (machines.${machine}.system or "x86_64-linux") {
imports = [ machines.${machine}.config ];
} (machines.${machine}.deploy or null);
}) (builtins.attrNames machines)
);
colmena =
@ -189,22 +184,19 @@
};
}
// builtins.listToAttrs (
map
(machine: {
name = machine;
value = {
deployment = {
targetHost = machines.${machine}.deploy.host;
targetUser = "root"; # machines.${machine}.deploy.sshUser;
# targetUser = machines.${machine}.deploy.sshUser;
tags = machines.${machine}.deploy.tags or [ ];
};
imports =
self.lib.systemModules (machines.${machine}.system or "x86_64-linux")
machines.${machine}.config;
map (machine: {
name = machine;
value = {
deployment = {
targetHost = machines.${machine}.deploy.host;
targetUser = "root"; # machines.${machine}.deploy.sshUser;
# targetUser = machines.${machine}.deploy.sshUser;
tags = machines.${machine}.deploy.tags or [ ];
};
})
(builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
imports = self.lib.systemModules (machines.${machine}.system or "x86_64-linux"
) machines.${machine}.config;
};
}) (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
);
};