felixalb/pvv-nixos-config
1
0
Fork 0
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git synced 2026-01-09 08:58:24 +01:00
Code Issues Projects Releases Wiki Activity

flake.nix: allow disabling defaults for nixosConfig func

Browse Source
This commit is contained in:
h7x4
2026-01-06 17:11:15 +09:00
parent 4abe86dc07
commit 893de326af
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@@ -80,7 +80,13 @@
nixpkgs: nixpkgs:
name: name:
configurationPath: configurationPath:
extraArgs: extraArgs@{
specialArgs ? { },
modules ? [ ],
overlays ? [ ],
enableDefaults ? true,
...
}:
lib.nixosSystem (lib.recursiveUpdate lib.nixosSystem (lib.recursiveUpdate
(let (let
system = "x86_64-linux"; system = "x86_64-linux";
@@ -91,13 +97,14 @@
inherit unstablePkgs inputs; inherit unstablePkgs inputs;
values = import ./values.nix; values = import ./values.nix;
fp = path: ./${path}; fp = path: ./${path};
} // extraArgs.specialArgs or { }; } // specialArgs;
modules = [ modules = [
configurationPath configurationPath
] ++ (lib.optionals enableDefaults [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
inputs.roowho2.nixosModules.default inputs.roowho2.nixosModules.default
] ++ extraArgs.modules or []; ]) ++ modules;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@@ -106,10 +113,10 @@
"nvidia-x11" "nvidia-x11"
"nvidia-settings" "nvidia-settings"
]; ];
overlays = [ overlays = (lib.optionals enableDefaults [
# Global overlays go here # Global overlays go here
inputs.roowho2.overlays.default inputs.roowho2.overlays.default
] ++ extraArgs.overlays or [ ]; ]) ++ overlays;
}; };
}) })
(builtins.removeAttrs extraArgs [ (builtins.removeAttrs extraArgs [