From 9fad3ac91d88588a97e8835f3bad4cef7eb32ca2 Mon Sep 17 00:00:00 2001 From: lilly Date: Sun, 20 Sep 2026 00:16:28 +0200 Subject: [PATCH] remove obsolete hosts from config --- config/hosts/audio-hauptraum-kueche/audio.nix | 14 ---- .../audio-hauptraum-kueche/configuration.nix | 9 --- .../hosts/audio-hauptraum-kueche/default.nix | 8 -- .../audio-hauptraum-kueche/networking.nix | 21 ------ config/hosts/audio-hauptraum-tafel/audio.nix | 14 ---- .../audio-hauptraum-tafel/configuration.nix | 9 --- .../hosts/audio-hauptraum-tafel/default.nix | 8 -- .../audio-hauptraum-tafel/networking.nix | 21 ------ config/hosts/esphome/configuration.nix | 9 --- config/hosts/esphome/default.nix | 9 --- config/hosts/esphome/esphome.nix | 7 -- config/hosts/esphome/networking.nix | 29 -------- config/hosts/esphome/nginx.nix | 73 ------------------- flake.nix | 28 ------- 14 files changed, 259 deletions(-) delete mode 100644 config/hosts/audio-hauptraum-kueche/audio.nix delete mode 100644 config/hosts/audio-hauptraum-kueche/configuration.nix delete mode 100644 config/hosts/audio-hauptraum-kueche/default.nix delete mode 100644 config/hosts/audio-hauptraum-kueche/networking.nix delete mode 100644 config/hosts/audio-hauptraum-tafel/audio.nix delete mode 100644 config/hosts/audio-hauptraum-tafel/configuration.nix delete mode 100644 config/hosts/audio-hauptraum-tafel/default.nix delete mode 100644 config/hosts/audio-hauptraum-tafel/networking.nix delete mode 100644 config/hosts/esphome/configuration.nix delete mode 100644 config/hosts/esphome/default.nix delete mode 100644 config/hosts/esphome/esphome.nix delete mode 100644 config/hosts/esphome/networking.nix delete mode 100644 config/hosts/esphome/nginx.nix diff --git a/config/hosts/audio-hauptraum-kueche/audio.nix b/config/hosts/audio-hauptraum-kueche/audio.nix deleted file mode 100644 index 2a75d8a..0000000 --- a/config/hosts/audio-hauptraum-kueche/audio.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ../../../modules/services/audio - ]; - - ccchh.services.audio = { - enable = true; - name = "Audio Hauptraum Küche"; - }; - services.mpd.musicDirectory = "smb://beamer:beamer@beamer.z9.ccchh.net/music"; - - users.users.chaos.extraGroups = [ "pipewire" ]; -} diff --git a/config/hosts/audio-hauptraum-kueche/configuration.nix b/config/hosts/audio-hauptraum-kueche/configuration.nix deleted file mode 100644 index 93a6b53..0000000 --- a/config/hosts/audio-hauptraum-kueche/configuration.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - networking = { - hostName = "audio-hauptraum-kueche"; - domain = "z9.ccchh.net"; - }; - - system.stateVersion = "23.05"; -} diff --git a/config/hosts/audio-hauptraum-kueche/default.nix b/config/hosts/audio-hauptraum-kueche/default.nix deleted file mode 100644 index a271e8e..0000000 --- a/config/hosts/audio-hauptraum-kueche/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - imports = [ - ./audio.nix - ./configuration.nix - ./networking.nix - ]; -} diff --git a/config/hosts/audio-hauptraum-kueche/networking.nix b/config/hosts/audio-hauptraum-kueche/networking.nix deleted file mode 100644 index 6e1e7d8..0000000 --- a/config/hosts/audio-hauptraum-kueche/networking.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -{ - networking = { - interfaces.net0 = { - ipv4.addresses = [ - { - address = "172.31.200.14"; - prefixLength = 23; - } - ]; - }; - defaultGateway = "172.31.200.1"; - nameservers = [ "172.31.200.1" ]; - }; - - systemd.network.links."10-net0" = { - matchConfig.MACAddress = "1E:EF:2D:92:81:DA"; - linkConfig.Name = "net0"; - }; -} diff --git a/config/hosts/audio-hauptraum-tafel/audio.nix b/config/hosts/audio-hauptraum-tafel/audio.nix deleted file mode 100644 index f090fd9..0000000 --- a/config/hosts/audio-hauptraum-tafel/audio.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ../../../modules/services/audio - ]; - - ccchh.services.audio = { - enable = true; - name = "Audio Hauptraum Tafel"; - }; - services.mpd.musicDirectory = "smb://beamer:beamer@beamer.z9.ccchh.net/music"; - - users.users.chaos.extraGroups = [ "pipewire" ]; -} diff --git a/config/hosts/audio-hauptraum-tafel/configuration.nix b/config/hosts/audio-hauptraum-tafel/configuration.nix deleted file mode 100644 index 2f14d0c..0000000 --- a/config/hosts/audio-hauptraum-tafel/configuration.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - networking = { - hostName = "audio-hauptraum-tafel"; - domain = "z9.ccchh.net"; - }; - - system.stateVersion = "23.05"; -} diff --git a/config/hosts/audio-hauptraum-tafel/default.nix b/config/hosts/audio-hauptraum-tafel/default.nix deleted file mode 100644 index a271e8e..0000000 --- a/config/hosts/audio-hauptraum-tafel/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: -{ - imports = [ - ./audio.nix - ./configuration.nix - ./networking.nix - ]; -} diff --git a/config/hosts/audio-hauptraum-tafel/networking.nix b/config/hosts/audio-hauptraum-tafel/networking.nix deleted file mode 100644 index e357d38..0000000 --- a/config/hosts/audio-hauptraum-tafel/networking.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -{ - networking = { - interfaces.net0 = { - ipv4.addresses = [ - { - address = "172.31.200.15"; - prefixLength = 23; - } - ]; - }; - defaultGateway = "172.31.200.1"; - nameservers = [ "172.31.200.1" ]; - }; - - systemd.network.links."10-net0" = { - matchConfig.MACAddress = "D2:10:33:B1:72:C3"; - linkConfig.Name = "net0"; - }; -} diff --git a/config/hosts/esphome/configuration.nix b/config/hosts/esphome/configuration.nix deleted file mode 100644 index 0ef1dce..0000000 --- a/config/hosts/esphome/configuration.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - networking = { - hostName = "esphome"; - domain = "z9.ccchh.net"; - }; - - system.stateVersion = "23.05"; -} diff --git a/config/hosts/esphome/default.nix b/config/hosts/esphome/default.nix deleted file mode 100644 index 8d5150d..0000000 --- a/config/hosts/esphome/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - imports = [ - ./configuration.nix - ./esphome.nix - ./networking.nix - ./nginx.nix - ]; -} diff --git a/config/hosts/esphome/esphome.nix b/config/hosts/esphome/esphome.nix deleted file mode 100644 index e41c771..0000000 --- a/config/hosts/esphome/esphome.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - services.esphome = { - enable = true; - openFirewall = true; - }; -} diff --git a/config/hosts/esphome/networking.nix b/config/hosts/esphome/networking.nix deleted file mode 100644 index 8a84112..0000000 --- a/config/hosts/esphome/networking.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ ... }: - -{ - networking = { - interfaces.net0 = { - ipv4.addresses = [ - { - address = "10.31.208.24"; - prefixLength = 23; - } - ]; - ipv6.addresses = [ - { - address = "2a07:c481:1:d0::66"; - prefixLength = 64; - } - ]; - }; - defaultGateway = "10.31.208.1"; - defaultGateway6 = "2a07:c481:1:d0::1"; - nameservers = [ "10.31.208.1" "2a07:c481:1:d0::1" ]; - search = [ "z9.ccchh.net" ]; - }; - - systemd.network.links."10-net0" = { - matchConfig.MACAddress = "7E:3C:F0:77:8A:F4"; - linkConfig.Name = "net0"; - }; -} diff --git a/config/hosts/esphome/nginx.nix b/config/hosts/esphome/nginx.nix deleted file mode 100644 index 2b154f0..0000000 --- a/config/hosts/esphome/nginx.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, ... }: - -{ - services.nginx = { - enable = true; - - virtualHosts = { - "esphome.ccchh.net" = { - forceSSL = true; - enableACME = true; - serverName = "esphome.ccchh.net"; - - listen = [ - { - addr = "0.0.0.0"; - port = 80; - } - { - addr = "[::]"; - port = 80; - } - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - { - addr = "[::]"; - port = 443; - ssl = true; - } - ]; - - locations."/" = { - proxyPass = "http://${config.services.esphome.address}:${builtins.toString config.services.esphome.port}"; - proxyWebsockets = true; - }; - }; - "esphome.z9.ccchh.net" = { - forceSSL = true; - useACMEHost = "esphome.ccchh.net"; - serverName = "esphome.z9.ccchh.net"; - - listen = [ - { - addr = "0.0.0.0"; - port = 80; - } - { - addr = "[::]"; - port = 80; - } - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - { - addr = "[::]"; - port = 443; - ssl = true; - } - ]; - - globalRedirect = "esphome.ccchh.net"; - redirectCode = 307; - }; - }; - }; - security.acme.certs."esphome.ccchh.net".extraDomainNames = [ "esphome.z9.ccchh.net" ]; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; -} diff --git a/flake.nix b/flake.nix index f802368..f75f2d4 100644 --- a/flake.nix +++ b/flake.nix @@ -67,34 +67,6 @@ }; }; nixosConfigurations = { - audio-hauptraum-kueche = nixpkgs.lib.nixosSystem { - inherit system specialArgs; - modules = [ - self.nixosModules.common - self.nixosModules.proxmox-vm - ./config/hosts/audio-hauptraum-kueche - ]; - }; - - audio-hauptraum-tafel = nixpkgs.lib.nixosSystem { - inherit system specialArgs; - modules = [ - self.nixosModules.common - self.nixosModules.proxmox-vm - ./config/hosts/audio-hauptraum-tafel - { nixpkgs.overlays = [ self.overlays.librespotFixOverlay ]; } - ]; - }; - - esphome = nixpkgs.lib.nixosSystem { - inherit system specialArgs; - modules = [ - self.nixosModules.common - self.nixosModules.proxmox-vm - ./config/hosts/esphome - ]; - }; - matrix = nixpkgs.lib.nixosSystem { inherit system specialArgs; modules = [