Allow configuring configuration src path in nixosConfig

Co-authored-by: h7x4 <h7x4@nani.wtf>
This commit is contained in:
Albert 2025-07-20 03:54:00 +02:00 committed by h7x4
parent febc0940f8
commit 59969b9ec8
No known key found for this signature in database
GPG Key ID: 9F2F7D8250F35146

View File

@ -55,37 +55,50 @@
nixosConfigurations = let nixosConfigurations = let
unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
nixosConfig = nixpkgs: name: config: lib.nixosSystem (lib.recursiveUpdate
rec { nixosConfig =
nixpkgs:
name:
configurationPath:
extraArgs:
lib.nixosSystem (lib.recursiveUpdate
(let
system = "x86_64-linux"; system = "x86_64-linux";
in {
inherit system;
specialArgs = { specialArgs = {
inherit unstablePkgs inputs; inherit unstablePkgs inputs;
values = import ./values.nix; values = import ./values.nix;
fp = path: ./${path}; fp = path: ./${path};
}; } // extraArgs.specialArgs or { };
modules = [ modules = [
./hosts/${name}/configuration.nix configurationPath
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
] ++ config.modules or []; ] ++ extraArgs.modules or [];
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) extraArgs.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
[ [
"nvidia-x11" "nvidia-x11"
"nvidia-settings" "nvidia-settings"
]; ];
overlays = [ overlays = [
# Global overlays go here # Global overlays go here
] ++ config.overlays or [ ]; ] ++ extraArgs.overlays or [ ];
}; };
} })
(removeAttrs config [ "modules" "overlays" ]) (builtins.removeAttrs extraArgs [
"modules"
"overlays"
"specialArgs"
])
); );
stableNixosConfig = nixosConfig nixpkgs; stableNixosConfig = name: extraArgs:
unstableNixosConfig = nixosConfig nixpkgs-unstable; nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
in { in {
bicep = stableNixosConfig "bicep" { bicep = stableNixosConfig "bicep" {
modules = [ modules = [