ctucx.git: nixfiles

machines: clean up of system configurations

diff --git a/machines/coladose/configuration.nix b/machines/coladose/configuration.nix
@@ -50,24 +50,9 @@
   };
 
   networking = {
-    hostName                       = "coladose";
-#   domain                         = "ctu.cx";
-
-    dhcpcd = {
-      enable = true;
-      extraConfig = ''
-        duid 04:ea:56:f3:0b:5b
-      '';
-    };
-
-    wireless = {
-      iwd.enable = true;
-    };
-
-    firewall = {
-      enable = true;
-#      allowedTCPPorts = [ ];
-    };
+    dhcpcd.enable       = true;
+    wireless.iwd.enable = true;
+    firewall.enable     = true;
   };
 
   services = {

diff --git a/machines/desastro/configuration.nix b/machines/desastro/configuration.nix
@@ -46,8 +46,6 @@
   age.secrets.restic-server-hector.file = ../../secrets/restic-server/hector.age;
 
   networking = {
-    hostName                         = "desastro";
-    domain                           = "ctu.cx";
     useDHCP                          = false;
 	resolvconf.useLocalResolver      = lib.mkForce false;
 

@@ -62,15 +60,11 @@
         generatePrivateKeyFile = true;
         postSetup              = "ip link set dev wg0 mtu 1500";
 
-        peers          = [
+        peers = [
           {
 	        allowedIPs = [ "195.39.246.32/28" "2a0f:4ac0:acab::1/62" ];
 	        publicKey  = "nvyhYuWJl/dKyV/2+bDrUisvL3mi38PsNzfdIDDwSjY=";
           }
-#          {
-#          	allowedIPs = [ "195.39.247.51/32" "2a0f:4ac0:acab:1234::51/128" ];
-#          	publicKey  = "g8u4m8Lvj8tVOWWCnH4pWFJsAG53yLZP84bQ/hFbGXs=";
-#          }
         ];
       };
     };

diff --git a/machines/hector/configuration.nix b/machines/hector/configuration.nix
@@ -20,9 +20,6 @@
   };
 
   networking = {
-    hostName = "hector";
-    domain   = "ctu.cx";
-
     useDHCP = false;
 
     interfaces.ens18 = {

diff --git a/machines/lollo/configuration.nix b/machines/lollo/configuration.nix
@@ -9,7 +9,6 @@
   imports = [
     ./hardware-configuration.nix
 
-
     ./router
     ./smarthome
     ./websites

@@ -18,6 +17,7 @@
 
     ../../configurations/services/prometheus-node-exporter.nix
     ../../configurations/services/restic-server.nix
+
     ./syncthing.nix
     ./restic-vnstat.nix
     ./gotosocial.nix

@@ -34,13 +34,10 @@
     efi.canTouchEfiVariables = true;
   };
 
-  networking = {
-    hostName        = "lollo";
-    domain          = "ctu.cx";
-    useDHCP         = false;
-  };
   services.email-notify.enable = true;
 
+  networking.useDHCP = false;
+
   users.users.leah.extraGroups = [ "audio" ];
 
   environment.systemPackages = with pkgs; [

diff --git a/machines/osterei/configuration.nix b/machines/osterei/configuration.nix
@@ -72,11 +72,9 @@
     };
   };
 
-  networking = {
-    hostName = "osterei";
-    domain   = "ctu.cx";
   services.email-notify.enable = true;
 
+  networking = {
     useDHCP  = false;
 
     defaultGateway6 = {

diff --git a/machines/wanderduene/configuration.nix b/machines/wanderduene/configuration.nix
@@ -42,9 +42,6 @@
   };
 
   networking = {
-    hostName = "wanderduene";
-    domain   = "ctu.cx";
-
     useDHCP  = false;
 
     defaultGateway6 = {