3 files changed, 15 insertions, 58 deletions
diff --git a/hosts/by-name/server1/configuration.nix b/hosts/by-name/server1/configuration.nix
deleted file mode 100644
index 6bb1067..0000000
--- a/hosts/by-name/server1/configuration.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{config, ...}: {
-  imports = [
-    ./networking.nix # network configuration that just works
-    ./hardware.nix
-
-    ../../../system
-  ];
-
-  vhack = {
-    back = {
-      enable = true;
-      repositories = {
-        "${config.services.gitolite.dataDir}/vhack.eu/nixos-config.git" = {
-          domain = "issues.vhack.eu";
-          port = 9220;
-        };
-      };
-    };
-    etesync.enable = true;
-    git-server.enable = true;
-    nginx.enable = true;
-    nix-sync.enable = true;
-    openssh.enable = true;
-    peertube.enable = true;
-    postgresql.enable = true;
-    redlib.enable = true;
-    users.enable = true;
-    persist = {
-      enable = true;
-      directories = [
-        "/var/log"
-
-        # TODO(@bpeetz): Instead of persisting that, encode each uid/gid directly in the
-        # config. <2024-12-24>
-        "/var/lib/nixos"
-      ];
-    };
-  };
-
-  boot.tmp.cleanOnBoot = true;
-  zramSwap.enable = true;
-  networking.hostName = "server1";
-  networking.domain = "vhack.eu";
-
-  system.stateVersion = "22.11";
-}
diff --git a/hosts/by-name/server1/hardware.nix b/hosts/by-name/server3/hardware.nix
index 9abc64c..a6e4e40 100644
--- a/hosts/by-name/server1/hardware.nix
+++ b/hosts/by-name/server3/hardware.nix
@@ -9,6 +9,7 @@
     # FIXME: Find a better way to specify the disk
     disk = "/dev/vda";
   };
+
   boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
+  nixpkgs.hostPlatform = "x86_64-linux";
 }
diff --git a/hosts/by-name/server1/networking.nix b/hosts/by-name/server3/networking.nix
index dd9b9af..9f4eb27 100644
--- a/hosts/by-name/server1/networking.nix
+++ b/hosts/by-name/server3/networking.nix
@@ -3,12 +3,11 @@
   # details gathered from the active system.
   networking = {
     nameservers = [
-      "8.8.8.8"
+      "46.38.225.230"
+      "46.38.252.230"
+      "2a03:4000:0:1::e1e6"
     ];
-    defaultGateway = {
-      address = "89.58.56.1";
-      interface = "eth0";
-    };
+    defaultGateway = "92.60.36.1";
     defaultGateway6 = {
       address = "fe80::1";
       interface = "eth0";
@@ -19,19 +18,23 @@
       eth0 = {
         ipv4.addresses = [
           {
-            address = "89.58.58.33";
+            address = "92.60.38.179";
             prefixLength = 22;
           }
         ];
         ipv6.addresses = [
           {
-            address = "2a03:4000:6a:3f3::1";
+            address = "2a03:4000:33:25b::4f4e";
+            prefixLength = 64;
+          }
+          {
+            address = "fe80::98ed:a0ff:fecb:ea48";
             prefixLength = 64;
           }
         ];
         ipv4.routes = [
           {
-            address = "89.58.56.1";
+            address = "92.60.36.1";
             prefixLength = 32;
           }
         ];
@@ -44,9 +47,8 @@
       };
     };
   };
-
-  # cat /sys/class/net/eth0/address
   services.udev.extraRules = ''
-    ATTR{address}=="66:22:6d:82:93:9b", NAME="eth0"
+    ATTR{address}=="9a:ed:a0:cb:ea:48", NAME="eth0"
+
   '';
 }