nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

feat: add inputs' to mkSystem

Browse source
This commit is contained in:
Nydragon 2024-09-22 00:40:12 +02:00
parent 3097632cfb
commit 18161231cc
Signed by: nydragon
SSH key fingerprint: SHA256:iQnIC12spf4QjWSbarmkD2No1cLMlu6TWoV7K6cYF5g
2 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hosts/default.nix
View file

@ -1,28 +1,35 @@
{ inputs, ... }: { inputs, withSystem, ... }:
let let
inherit (inputs.self) lib; inherit (inputs.self.lib.my) mkSystem;
in in
{ {
flake.nixosConfigurations = { flake.nixosConfigurations = {
marr = lib.my.mkSystem { marr = mkSystem {
inherit withSystem;
hostname = "marr"; hostname = "marr";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ inputs.agenix.nixosModules.default ]; extraModules = [ inputs.agenix.nixosModules.default ];
}; };
brontes = lib.my.mkSystem { brontes = mkSystem {
inherit withSystem;
hostname = "brontes"; hostname = "brontes";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ inputs.agenix.nixosModules.default ]; extraModules = [ inputs.agenix.nixosModules.default ];
}; };
styrak = lib.my.mkSystem { shan = mkSystem {
hostname = "styrak"; inherit withSystem;
hostname = "shan";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ inputs.disko.nixosModules.disko ]; extraModules = [
inputs.disko.nixosModules.disko
inputs.agenix.nixosModules.default
];
}; };
raptus = lib.my.mkSystem { raptus = mkSystem {
inherit withSystem;
hostname = "raptus"; hostname = "raptus";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ extraModules = [

12
parts/lib/functions.nix
View file

@ -17,24 +17,28 @@
mkSystem = mkSystem =
{ {
withSystem,
hostname, hostname,
extraModules ? [ ], extraModules ? [ ],
system, system,
}: }:
withSystem system (
{ inputs', self', ... }:
lib.nixosSystem { lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
"${self}/hosts/${hostname}/configuration.nix" "${self}/hosts/${hostname}/configuration.nix"
"${self}/options" "${self}/options"
"${self}/options/pulseview.nix" "${self}/modules/commons"
"${self}/options/media.nix"
{ networking.hostName = hostname; } { networking.hostName = hostname; }
] ++ extraModules; ] ++ extraModules;
specialArgs = { specialArgs = {
inherit inputs self; inherit inputs inputs';
inherit self self';
username = "ny"; username = "ny";
}; };
}; }
);
validatePath = validatePath =
s: if (builtins.pathExists s) then (builtins.baseNameOf s) else throw "${s} does not exist"; s: if (builtins.pathExists s) then (builtins.baseNameOf s) else throw "${s} does not exist";