refactor: use a custom mkNixOS func to make devices more clear

This commit is contained in:
matt1432 2023-12-05 20:10:40 -05:00
parent 0d75b0d487
commit 956e845635

View file

@ -14,27 +14,21 @@
attrs system pkgs); attrs system pkgs);
# Default system # Default system
system = "x86_64-linux"; mkNixOS = mods:
specialArgs = inputs; nixpkgs.lib.nixosSystem {
defaultModules = [ system = "x86_64-linux";
{home-manager.extraSpecialArgs = inputs;} specialArgs = inputs;
./common modules =
]; [
{home-manager.extraSpecialArgs = inputs;}
./common
]
++ mods;
};
in { in {
nixosConfigurations = { nixosConfigurations = {
wim = nixpkgs.lib.nixosSystem { wim = mkNixOS [./devices/wim];
inherit system specialArgs; binto = mkNixOS [./devices/binto];
modules =
defaultModules
++ [./devices/wim];
};
binto = nixpkgs.lib.nixosSystem {
inherit system specialArgs;
modules =
defaultModules
++ [./devices/binto];
};
}; };
formatter = perSystem (_: pkgs: pkgs.alejandra); formatter = perSystem (_: pkgs: pkgs.alejandra);
@ -59,7 +53,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
caddy-plugins = { caddy-plugins = {
url = "github:matt1432/nixos-caddy-patched"; url = "github:matt1432/nixos-caddy-cloudflare";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pihole = { pihole = {
@ -95,6 +89,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# FIXME: some of these prevent from using nixos-install
nh.url = "github:viperML/nh"; nh.url = "github:viperML/nh";
nix-melt.url = "github:nix-community/nix-melt"; nix-melt.url = "github:nix-community/nix-melt";
nurl.url = "github:nix-community/nurl"; nurl.url = "github:nix-community/nurl";