Some clean up #11

Manually merged
jopejoe1 merged 4 commits from simple-clean-up into main 2024-11-17 19:50:37 +01:00
Showing only changes of commit 6c85b91efb - Show all commits

111
flake.nix
View file

@ -38,12 +38,17 @@
});
};
};
nixosModules = {
common = ./config/common;
proxmox-vm = ./config/proxmox-vm;
prometheus-exporter = ./config/extra/prometheus-exporter.nix;
};
nixosConfigurations = {
audio-hauptraum-kueche = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
{ nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
./config/hosts/audio-hauptraum-kueche
];
@ -52,8 +57,8 @@
audio-hauptraum-tafel = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
{ nixpkgs.overlays = [ self.overlays.shairportSyncAirplay2 ]; }
./config/hosts/audio-hauptraum-tafel
];
@ -62,8 +67,8 @@
esphome = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
./config/hosts/esphome
];
};
@ -71,8 +76,8 @@
public-reverse-proxy = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
./config/hosts/public-reverse-proxy
];
};
@ -80,10 +85,10 @@
netbox = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/netbox
];
};
@ -91,10 +96,10 @@
matrix = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/matrix
];
};
@ -102,10 +107,10 @@
public-web-static = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/public-web-static
];
};
@ -113,10 +118,10 @@
git = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/git
];
};
@ -124,10 +129,10 @@
forgejo-actions-runner = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/forgejo-actions-runner
];
};
@ -135,8 +140,8 @@
ptouch-print-server = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
./config/hosts/ptouch-print-server
];
};
@ -144,9 +149,9 @@
eh22-wiki = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
./config/extra/prometheus-exporter.nix
self.nixosModules.common
self.nixosModules.proxmox-vm
self.nixosModules.prometheus-exporter
./config/hosts/eh22-wiki
];
};
@ -154,9 +159,9 @@
nix-box-june = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
./config/extra/prometheus-exporter.nix
self.nixosModules.common
self.nixosModules.proxmox-vm
self.nixosModules.prometheus-exporter
./config/hosts/nix-box-june
];
};
@ -164,8 +169,8 @@
yate = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
./config/hosts/yate
];
};
@ -173,8 +178,8 @@
mqtt = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
./config/hosts/mqtt
];
};
@ -182,10 +187,10 @@
mjolnir = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/mjolnir
];
};
@ -193,10 +198,10 @@
woodpecker = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/woodpecker
];
specialArgs = {
@ -207,8 +212,8 @@
status = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/hosts/status
];
@ -217,10 +222,10 @@
penpot = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
sops-nix.nixosModules.sops
./config/extra/prometheus-exporter.nix
self.nixosModules.prometheus-exporter
./config/hosts/penpot
];
};
@ -228,9 +233,9 @@
hydra = nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./config/common
./config/proxmox-vm
./config/extra/prometheus-exporter.nix
self.nixosModules.common
self.nixosModules.proxmox-vm
self.nixosModules.prometheus-exporter
./config/hosts/hydra
];
};
@ -241,8 +246,8 @@
system = "x86_64-linux";
modules = [
./config/nixos-generators/proxmox.nix
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
];
format = "proxmox";
};
@ -252,8 +257,8 @@
modules = [
./config/nixos-generators/proxmox-chaosknoten.nix
./config/proxmox-chaosknoten-additional-initial-config.nix
./config/common
./config/proxmox-vm
self.nixosModules.common
self.nixosModules.proxmox-vm
];
format = "proxmox";
};