rewrite flake
This commit is contained in:
parent
e6e2f6f199
commit
0b8a6699af
116
flake.nix
116
flake.nix
|
@ -48,16 +48,16 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mkComputer = configurationNix: nixpkgs.lib.nixosSystem {
|
mkComputer = { hostname, system ? "x86_64-linux" }: nixpkgs.lib.nixosSystem {
|
||||||
inherit system pkgs;
|
inherit system pkgs;
|
||||||
specialArgs = { inherit custom inputs; };
|
specialArgs = { inherit custom inputs; };
|
||||||
modules = (
|
modules = (
|
||||||
[
|
[
|
||||||
# System configuration for this host
|
# System configuration for this host
|
||||||
configurationNix
|
"${self}/systems/${hostname}"
|
||||||
|
|
||||||
# Common configuration
|
# Common configuration
|
||||||
(import ./modules/common-x86 {inherit custom inputs pkgs system;})
|
(import ./modules/common-x86 { inherit custom inputs pkgs system; })
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
|
@ -69,19 +69,21 @@
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
mkVM = configurationNix: nixpkgs.lib.nixosSystem {
|
mkVM = { hostname, system ? "x86_64-linux" }: nixpkgs.lib.nixosSystem {
|
||||||
inherit system pkgs;
|
inherit system pkgs;
|
||||||
specialArgs = { inherit custom inputs; };
|
specialArgs = {
|
||||||
|
inherit custom inputs;
|
||||||
|
};
|
||||||
modules = (
|
modules = (
|
||||||
[
|
[
|
||||||
# System configuration for this host
|
# System configuration for this host
|
||||||
configurationNix
|
"${self}/systems/${hostname}"
|
||||||
|
|
||||||
# Common configuration
|
# Common configuration
|
||||||
./modules/common-x86
|
./modules/common-x86
|
||||||
|
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
|
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
|
@ -93,19 +95,19 @@
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
mkRaspi = configurationNix: nixpkgs.lib.nixosSystem {
|
mkRaspi = { hostname, system ? "aarch64-linux" }: nixpkgs.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
inherit system;
|
||||||
specialArgs = { inherit custom inputs; };
|
specialArgs = { inherit custom inputs; };
|
||||||
modules = (
|
modules = (
|
||||||
[
|
[
|
||||||
# System configuration for this host
|
# System configuration for this host
|
||||||
configurationNix
|
"${self}/systems/${hostname}"
|
||||||
|
|
||||||
# Common configuration
|
# Common configuration
|
||||||
./modules/common
|
./modules/common
|
||||||
|
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
|
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
|
@ -120,29 +122,73 @@
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
gwyn = mkComputer ./systems/gwyn;
|
gwyn = mkComputer {
|
||||||
nixos-vm = mkComputer ./systems/desktop-vm;
|
hostname = "gwyn";
|
||||||
staubfinger = mkComputer ./systems/staubfinger;
|
};
|
||||||
|
nixos-vm = mkComputer {
|
||||||
|
hostname = "desktop-vm";
|
||||||
|
};
|
||||||
|
staubfinger = mkComputer {
|
||||||
|
hostname = "staubfinger";
|
||||||
|
};
|
||||||
# Servers
|
# Servers
|
||||||
git = mkVM ./systems/git;
|
git = mkVM {
|
||||||
grav = mkVM ./systems/grav;
|
hostname = "git";
|
||||||
heimdall = mkVM ./systems/heimdall;
|
};
|
||||||
jdownloader = mkVM ./systems/jdownloader;
|
grav = mkVM {
|
||||||
k3s-master1 = mkVM ./systems/k3s-master1;
|
hostname = "grav";
|
||||||
k3s-node1 = mkVM ./systems/k3s-node1;
|
};
|
||||||
k3s-node2 = mkVM ./systems/k3s-node2;
|
heimdall = mkVM {
|
||||||
mail = mkVM ./systems/mail;
|
hostname = "heimdall";
|
||||||
nextcloud = mkVM ./systems/nextcloud;
|
};
|
||||||
nixos-management = mkVM ./systems/nixos-management;
|
jdownloader = mkVM {
|
||||||
nomad-master1 = mkVM ./systems/nomad-master1;
|
hostname = "jdownloader";
|
||||||
nomad-client1 = mkVM ./systems/nomad-client1;
|
};
|
||||||
pihole = mkVM ./systems/pihole;
|
k3s-master1 = mkVM {
|
||||||
plex = mkVM ./systems/plex;
|
hostname = "k3s-master1";
|
||||||
proxy = mkVM ./systems/proxy;
|
};
|
||||||
raspi-test = mkRaspi ./systems/raspi-test;
|
k3s-node1 = mkVM {
|
||||||
restic-server = mkVM ./systems/restic-server;
|
hostname = "k3s-node1";
|
||||||
rss-bridge = mkVM ./systems/rss-bridge;
|
};
|
||||||
ttrss = mkVM ./systems/ttrss;
|
k3s-node2 = mkVM {
|
||||||
|
hostname = "k3s-node2";
|
||||||
|
};
|
||||||
|
mail = mkVM {
|
||||||
|
hostname = "mail";
|
||||||
|
};
|
||||||
|
nextcloud = mkVM {
|
||||||
|
hostname = "nextcloud";
|
||||||
|
};
|
||||||
|
nixos-management = mkVM {
|
||||||
|
hostname = "nixos-management";
|
||||||
|
};
|
||||||
|
nomad-master1 = mkVM {
|
||||||
|
hostname = "nomad-master1";
|
||||||
|
};
|
||||||
|
nomad-client1 = mkVM {
|
||||||
|
hostname = "nomad-client1";
|
||||||
|
};
|
||||||
|
pihole = mkVM {
|
||||||
|
hostname = "pihole";
|
||||||
|
};
|
||||||
|
plex = mkVM {
|
||||||
|
hostname = "plex";
|
||||||
|
};
|
||||||
|
proxy = mkVM {
|
||||||
|
hostname = "proxy";
|
||||||
|
};
|
||||||
|
raspi-test = mkRaspi {
|
||||||
|
hostname = "raspi-test";
|
||||||
|
};
|
||||||
|
restic-server = mkVM {
|
||||||
|
hostname = "restic-server";
|
||||||
|
};
|
||||||
|
rss-bridge = mkVM {
|
||||||
|
hostname = "rss-bridge";
|
||||||
|
};
|
||||||
|
ttrss = mkVM {
|
||||||
|
hostname = "ttrss";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
|
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
|
Loading…
Reference in New Issue