From 8748015accfadf62f115aa15c9ff2a2ebccdaa5d Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 5 Feb 2023 21:19:05 +0100 Subject: [PATCH] hosts: remove explicit per host configuration/common import --- hosts/aluminium/configuration.nix | 1 - hosts/backup-4/configuration.nix | 1 - hosts/beryllium/configuration.nix | 1 - hosts/carbon/configuration.nix | 1 - hosts/clerie-backup/configuration.nix | 1 - hosts/dn42-il-gw1/configuration.nix | 1 - hosts/dn42-il-gw5/configuration.nix | 1 - hosts/dn42-il-gw6/configuration.nix | 1 - hosts/dn42-ildix-clerie/configuration.nix | 1 - hosts/gatekeeper/configuration.nix | 1 - hosts/hydra-1/configuration.nix | 1 - hosts/hydra-2/configuration.nix | 1 - hosts/mail-1/configuration.nix | 5 ----- hosts/minecraft-2/configuration.nix | 1 - hosts/monitoring-3/configuration.nix | 1 - hosts/nonat/configuration.nix | 1 - hosts/osmium/configuration.nix | 1 - hosts/palladium/configuration.nix | 1 - hosts/porter/configuration.nix | 1 - hosts/storage-2/configuration.nix | 1 - hosts/web-2/configuration.nix | 1 - 21 files changed, 25 deletions(-) diff --git a/hosts/aluminium/configuration.nix b/hosts/aluminium/configuration.nix index 7585bc6..f15c1c3 100644 --- a/hosts/aluminium/configuration.nix +++ b/hosts/aluminium/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ]; boot.kernelParams = [ "console=ttyS0,115200n8" ]; diff --git a/hosts/backup-4/configuration.nix b/hosts/backup-4/configuration.nix index 580a714..868dc5d 100644 --- a/hosts/backup-4/configuration.nix +++ b/hosts/backup-4/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/beryllium/configuration.nix b/hosts/beryllium/configuration.nix index c1f2e8c..feb907c 100644 --- a/hosts/beryllium/configuration.nix +++ b/hosts/beryllium/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ]; boot.kernelParams = [ "console=ttyS0,115200n8" ]; diff --git a/hosts/carbon/configuration.nix b/hosts/carbon/configuration.nix index b72bace..a2da454 100644 --- a/hosts/carbon/configuration.nix +++ b/hosts/carbon/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/router ]; diff --git a/hosts/clerie-backup/configuration.nix b/hosts/clerie-backup/configuration.nix index 076d0c1..1ddfe64 100644 --- a/hosts/clerie-backup/configuration.nix +++ b/hosts/clerie-backup/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/dn42-il-gw1/configuration.nix b/hosts/dn42-il-gw1/configuration.nix index 20b2795..ab38577 100644 --- a/hosts/dn42-il-gw1/configuration.nix +++ b/hosts/dn42-il-gw1/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ../../configuration/dn42 ]; diff --git a/hosts/dn42-il-gw5/configuration.nix b/hosts/dn42-il-gw5/configuration.nix index 8e74f73..d3f634b 100644 --- a/hosts/dn42-il-gw5/configuration.nix +++ b/hosts/dn42-il-gw5/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ../../configuration/dn42 ]; diff --git a/hosts/dn42-il-gw6/configuration.nix b/hosts/dn42-il-gw6/configuration.nix index 5c69c14..1ec884c 100644 --- a/hosts/dn42-il-gw6/configuration.nix +++ b/hosts/dn42-il-gw6/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ../../configuration/dn42 ]; diff --git a/hosts/dn42-ildix-clerie/configuration.nix b/hosts/dn42-ildix-clerie/configuration.nix index 85ce070..5df650e 100644 --- a/hosts/dn42-ildix-clerie/configuration.nix +++ b/hosts/dn42-ildix-clerie/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/gatekeeper/configuration.nix b/hosts/gatekeeper/configuration.nix index 7415bf4..b400789 100644 --- a/hosts/gatekeeper/configuration.nix +++ b/hosts/gatekeeper/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/router ]; diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 90f588e..4a9ab14 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/hydra-2/configuration.nix b/hosts/hydra-2/configuration.nix index 61022b0..6860c82 100644 --- a/hosts/hydra-2/configuration.nix +++ b/hosts/hydra-2/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/mail-1/configuration.nix b/hosts/mail-1/configuration.nix index 8756e7a..80c5b38 100644 --- a/hosts/mail-1/configuration.nix +++ b/hosts/mail-1/configuration.nix @@ -1,11 +1,6 @@ { ... }: { - imports = - [ - ../../configuration/common - ]; - networking.hostName = "mail-1"; clerie.monitoring = { diff --git a/hosts/minecraft-2/configuration.nix b/hosts/minecraft-2/configuration.nix index f6a6735..395fbad 100644 --- a/hosts/minecraft-2/configuration.nix +++ b/hosts/minecraft-2/configuration.nix @@ -11,7 +11,6 @@ in { imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/monitoring-3/configuration.nix b/hosts/monitoring-3/configuration.nix index 792e3d5..886542d 100644 --- a/hosts/monitoring-3/configuration.nix +++ b/hosts/monitoring-3/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ./alertmanager.nix ./grafana.nix diff --git a/hosts/nonat/configuration.nix b/hosts/nonat/configuration.nix index a92738f..5cec93d 100644 --- a/hosts/nonat/configuration.nix +++ b/hosts/nonat/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ../../configuration/router ]; diff --git a/hosts/osmium/configuration.nix b/hosts/osmium/configuration.nix index b430c61..728f470 100644 --- a/hosts/osmium/configuration.nix +++ b/hosts/osmium/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ]; diff --git a/hosts/palladium/configuration.nix b/hosts/palladium/configuration.nix index a40f148..20c24e1 100644 --- a/hosts/palladium/configuration.nix +++ b/hosts/palladium/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ./backup-scripts.nix ]; diff --git a/hosts/porter/configuration.nix b/hosts/porter/configuration.nix index d63300a..beb13b5 100644 --- a/hosts/porter/configuration.nix +++ b/hosts/porter/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/router ]; diff --git a/hosts/storage-2/configuration.nix b/hosts/storage-2/configuration.nix index 2b1c66e..f2c1ded 100644 --- a/hosts/storage-2/configuration.nix +++ b/hosts/storage-2/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ../../configuration/proxmox-vm ./bahnansagen.nix ./mixcloud.nix diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index 88fc258..81dd913 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -4,7 +4,6 @@ imports = [ ./hardware-configuration.nix - ../../configuration/common ./bubblesort.nix ./bula22.nix ./clerie.nix