Remove defaultModules

This commit is contained in:
Dave Gallant
2024-03-10 13:01:45 -04:00
parent 80119dd363
commit b21ecbdb3b

View File

@@ -32,69 +32,65 @@
} @ inputs: { } @ inputs: {
nixosConfigurations = nixosConfigurations =
let let
modulesDir = ./modules;
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
config.permittedInsecurePackages = [ ]; config.permittedInsecurePackages = [ ];
}; };
defaultModules = [
home-manager.nixosModules.home-manager
./fonts.nix
./packages.nix
./upgrade-diff.nix
({ config
, lib
, ...
}: {
config = {
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = [ "https://davegallant.cachix.org" ];
trusted-users = [ "root" "dave" ];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = { nixpkgs.flake = nixpkgs; };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 14d";
};
};
nixpkgs.overlays = [
(import ./overlays)
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [
./home/default.nix
inputs.nixvim.homeManagerModules.nixvim
];
extraSpecialArgs = {
inherit unstable;
};
};
};
})
];
in in
{ {
hephaestus = nixpkgs.lib.nixosSystem { hephaestus = nixpkgs.lib.nixosSystem {
specialArgs = { inherit unstable; }; specialArgs = { inherit unstable; };
modules = modules =
[ [
./fonts.nix
./machines/hephaestus/configuration.nix ./machines/hephaestus/configuration.nix
./packages.nix
./services/netdata/default.nix ./services/netdata/default.nix
] ./upgrade-diff.nix
++ defaultModules; home-manager.nixosModules.home-manager
({ config
, lib
, ...
}: {
config = {
nix = {
settings = {
auto-optimise-store = true;
sandbox = false;
substituters = [ "https://davegallant.cachix.org" ];
trusted-users = [ "root" "dave" ];
trusted-public-keys = [
"davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
];
};
registry = { nixpkgs.flake = nixpkgs; };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 14d";
};
};
nixpkgs.overlays = [
(import ./overlays)
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [
./home/default.nix
inputs.nixvim.homeManagerModules.nixvim
];
extraSpecialArgs = {
inherit unstable;
};
};
};
})
];
}; };
}; };