From cb69f4ae60e2d94039a7bb0b5caa566a9d288686 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 5 Feb 2023 08:58:11 +0100
Subject: Fix: correct host name and convenience changes

We used the domain name instead of the host name, which obviously
doesn't work for multiple host. In addition to that I changed some
directory to make importing easier and enabled the "nix-command" and
"flakes" experimental options, to make the `nix flake check` command
usable.

Refs: #15
---
 hosts/server1/configuration.nix  | 20 ++++++++++++++++
 hosts/server1/networking.nix     | 49 ++++++++++++++++++++++++++++++++++++++++
 hosts/vhack.eu/configuration.nix | 25 --------------------
 hosts/vhack.eu/networking.nix    | 49 ----------------------------------------
 4 files changed, 69 insertions(+), 74 deletions(-)
 create mode 100644 hosts/server1/configuration.nix
 create mode 100644 hosts/server1/networking.nix
 delete mode 100644 hosts/vhack.eu/configuration.nix
 delete mode 100644 hosts/vhack.eu/networking.nix

(limited to 'hosts')

diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix
new file mode 100644
index 0000000..6f91fc0
--- /dev/null
+++ b/hosts/server1/configuration.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  imports = [
+    ./networking.nix # network configuration that just works
+
+    ../../system/system.nix
+
+    ../../services/services.nix
+  ];
+
+  boot.cleanTmpDir = true;
+  zramSwap.enable = true;
+  networking.hostName = "server1";
+  networking.domain = "vhack.eu";
+
+  system.fileSystemLayouts.mainDisk = "/dev/vda3";
+
+  system.stateVersion = "22.11";
+}
+# vim: ts=2
+
diff --git a/hosts/server1/networking.nix b/hosts/server1/networking.nix
new file mode 100644
index 0000000..26d6719
--- /dev/null
+++ b/hosts/server1/networking.nix
@@ -0,0 +1,49 @@
+{lib, ...}: {
+  # This file was populated at runtime with the networking
+  # details gathered from the active system.
+  networking = {
+    nameservers = [
+      "8.8.8.8"
+    ];
+    defaultGateway = "89.58.56.1";
+    defaultGateway6 = "fe80::1";
+    dhcpcd.enable = false;
+    usePredictableInterfaceNames = lib.mkForce false;
+    interfaces = {
+      eth0 = {
+        ipv4.addresses = [
+          {
+            address = "89.58.58.33";
+            prefixLength = 22;
+          }
+        ];
+        ipv6.addresses = [
+          {
+            address = "2a03:4000:6a:3f3:6422:6dff:fe82:939b";
+            prefixLength = 64;
+          }
+          {
+            address = "fe80::6422:6dff:fe82:939b";
+            prefixLength = 64;
+          }
+        ];
+        ipv4.routes = [
+          {
+            address = "89.58.56.1";
+            prefixLength = 32;
+          }
+        ];
+        ipv6.routes = [
+          {
+            address = "fe80::1";
+            prefixLength = 128;
+          }
+        ];
+      };
+    };
+  };
+  services.udev.extraRules = ''
+    ATTR{address}=="66:22:6d:82:93:9b", NAME="eth0"
+
+  '';
+}
diff --git a/hosts/vhack.eu/configuration.nix b/hosts/vhack.eu/configuration.nix
deleted file mode 100644
index a58e58d..0000000
--- a/hosts/vhack.eu/configuration.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./networking.nix # network configuration that just works
-
-    ../../system/hardware.nix
-    ../../system/fileSystemLayouts.nix
-    ../../system/packages.nix
-    ../../system/users.nix
-
-    ../../services/minecraft.nix
-    ../../services/rust-motd.nix
-    ../../services/opensshd.nix
-  ];
-
-  boot.cleanTmpDir = true;
-  zramSwap.enable = true;
-  networking.hostName = "server1";
-  networking.domain = "vhack.eu";
-
-  system.fileSystemLayouts.mainDisk = "/dev/vda3";
-
-  system.stateVersion = "22.11";
-}
-# vim: ts=2
-
diff --git a/hosts/vhack.eu/networking.nix b/hosts/vhack.eu/networking.nix
deleted file mode 100644
index 26d6719..0000000
--- a/hosts/vhack.eu/networking.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{lib, ...}: {
-  # This file was populated at runtime with the networking
-  # details gathered from the active system.
-  networking = {
-    nameservers = [
-      "8.8.8.8"
-    ];
-    defaultGateway = "89.58.56.1";
-    defaultGateway6 = "fe80::1";
-    dhcpcd.enable = false;
-    usePredictableInterfaceNames = lib.mkForce false;
-    interfaces = {
-      eth0 = {
-        ipv4.addresses = [
-          {
-            address = "89.58.58.33";
-            prefixLength = 22;
-          }
-        ];
-        ipv6.addresses = [
-          {
-            address = "2a03:4000:6a:3f3:6422:6dff:fe82:939b";
-            prefixLength = 64;
-          }
-          {
-            address = "fe80::6422:6dff:fe82:939b";
-            prefixLength = 64;
-          }
-        ];
-        ipv4.routes = [
-          {
-            address = "89.58.56.1";
-            prefixLength = 32;
-          }
-        ];
-        ipv6.routes = [
-          {
-            address = "fe80::1";
-            prefixLength = 128;
-          }
-        ];
-      };
-    };
-  };
-  services.udev.extraRules = ''
-    ATTR{address}=="66:22:6d:82:93:9b", NAME="eth0"
-
-  '';
-}
-- 
cgit 1.4.1