From 91078925890dfbbef82a644dfc9734a0efdc179b Mon Sep 17 00:00:00 2001
From: Grisha Shipunov
Date: Sun, 12 Jan 2025 13:45:55 +0100
Subject: some work

---
 hosts/minime/default.nix            |  2 +-
 hosts/minime/networking.nix         | 29 -----------------------------
 hosts/minime/networking/default.nix | 24 ++++++++++++++++++++++++
 hosts/minime/networking/uplink.nix  | 29 +++++++++++++++++++++++++++++
 hosts/minime/networking/uvm.nix     | 19 +++++++++++++++++++
 5 files changed, 73 insertions(+), 30 deletions(-)
 delete mode 100644 hosts/minime/networking.nix
 create mode 100644 hosts/minime/networking/default.nix
 create mode 100644 hosts/minime/networking/uplink.nix
 create mode 100644 hosts/minime/networking/uvm.nix

(limited to 'hosts/minime')

diff --git a/hosts/minime/default.nix b/hosts/minime/default.nix
index 3b679be..95f1f6b 100644
--- a/hosts/minime/default.nix
+++ b/hosts/minime/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    ./networking.nix
+    ./networking
     ./secrets.nix
     ./zfs.nix
   ];
diff --git a/hosts/minime/networking.nix b/hosts/minime/networking.nix
deleted file mode 100644
index 9631b2d..0000000
--- a/hosts/minime/networking.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ ... }:
-{
-  networking.hostName = "minime"; # Define your hostname.
-  networking.useNetworkd = true;
-  networking.firewall.enable = true;
-
-  services.resolved = {
-    enable = true;
-    dnssec = "false";
-    fallbackDns = [
-      "9.9.9.9"
-      "2620:fe::fe"
-      "149.112.112.112"
-      "2620:fe::9"
-    ];
-  };
-
-  systemd.network.enable = true;
-
-  systemd.network.networks = {
-    "10-ether-uplink" = {
-      matchConfig.name = "enp90s0";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-    };
-  };
-}
diff --git a/hosts/minime/networking/default.nix b/hosts/minime/networking/default.nix
new file mode 100644
index 0000000..b1c044f
--- /dev/null
+++ b/hosts/minime/networking/default.nix
@@ -0,0 +1,24 @@
+{ ... }: {
+  imports = [
+    ./uplink.nix
+    ./uvm.nix
+  ];
+
+  networking.hostName = "minime"; # Define your hostname.
+  networking.useNetworkd = true;
+  networking.firewall.enable = true;
+
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    fallbackDns = [
+      "9.9.9.9"
+      "2620:fe::fe"
+      "149.112.112.112"
+      "2620:fe::9"
+    ];
+  };
+
+  systemd.network.enable = true;
+
+}
diff --git a/hosts/minime/networking/uplink.nix b/hosts/minime/networking/uplink.nix
new file mode 100644
index 0000000..9631b2d
--- /dev/null
+++ b/hosts/minime/networking/uplink.nix
@@ -0,0 +1,29 @@
+{ ... }:
+{
+  networking.hostName = "minime"; # Define your hostname.
+  networking.useNetworkd = true;
+  networking.firewall.enable = true;
+
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    fallbackDns = [
+      "9.9.9.9"
+      "2620:fe::fe"
+      "149.112.112.112"
+      "2620:fe::9"
+    ];
+  };
+
+  systemd.network.enable = true;
+
+  systemd.network.networks = {
+    "10-ether-uplink" = {
+      matchConfig.name = "enp90s0";
+      networkConfig = {
+        DHCP = "yes";
+        IPv6AcceptRA = true;
+      };
+    };
+  };
+}
diff --git a/hosts/minime/networking/uvm.nix b/hosts/minime/networking/uvm.nix
new file mode 100644
index 0000000..15e498e
--- /dev/null
+++ b/hosts/minime/networking/uvm.nix
@@ -0,0 +1,19 @@
+{ ... }: {
+  systemd.network = {
+    netdevs."10-uvm-br" = {
+      netdevConfig = {
+        Kind = bridge;
+        Name = "uvm-br";
+      };
+    };
+
+    networks."10-uvm-br" = {
+      matchConfig.Name = "uvm-br";
+      networkConfig = {
+        DHCPServer = false;
+        IPv6SendRA = true;
+      };
+      Address = [ ];
+    };
+  };
+}
-- 
cgit v1.3.1