move to unified flake config rather than seperate for each host

This commit is contained in:
Tyler Starr 2025-06-15 17:18:51 -07:00
parent 9643359027
commit 13ea2cc3d3
7 changed files with 15 additions and 121 deletions

View File

@ -20,13 +20,25 @@
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = lib.mapAttrs (hostname: hostConfig: nixosConfigurations = lib.mapAttrs (hostname: hostConfig:
lib.nixosSystem (import ./hosts/${hostConfig.role} { lib.nixosSystem ({
inherit lib;
inherit system inputs agenix home-manager jovian-nixos nixos-wsl nix-flatpak;
specialArgs = { specialArgs = {
inherit lib system inputs agenix home-manager jovian-nixos nixos-wsl nix-flatpak;
user = hostConfig.user; user = hostConfig.user;
hostname = "${hostname}"; hostname = "${hostname}";
}; };
modules = [
./hosts/${hostConfig.role}/configuration.nix
./modules
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { user = hostConfig.user; };
}
] ++ (if "${hostConfig.role}" == "htpc" then [/etc/nixos/hardware-configuration.nix]
else if "${hostConfig.role}" == "wsl" then []
else [./hosts/${hostConfig.role}/hardware.nix]);
}) })
) hosts; ) hosts;
}; };

View File

@ -1,20 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, nix-flatpak, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager jovian-nixos nix-flatpak; };
modules = [
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}

View File

@ -1,20 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
modules = [
./configuration.nix
../../modules
/etc/nixos/hardware-configuration.nix
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}

View File

@ -1,20 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
modules = [
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}

View File

@ -1,20 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user inputs home-manager nix-flatpak; };
modules = [
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}

View File

@ -1,20 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
modules = [
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}

View File

@ -1,18 +0,0 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }:
let
user = specialArgs.user;
hostname = specialArgs.hostname;
in {
inherit system;
specialArgs = { inherit user hostname inputs nixos-wsl home-manager; };
modules = [
./configuration.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
}
];
}