From 6e757d821e2baf245377302714e9aae7da0067d9 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Thu, 23 Oct 2025 01:36:03 -0400
Subject: [PATCH 01/13] vesuvius: netboot prospit

---
 hosts/common/k3s-ports.nix       |  9 ++++++++
 hosts/common/k3s.nix             | 12 +++++++++++
 hosts/prospit/configuration.nix  | 15 +++++++++++++
 hosts/vesuvius/configuration.nix |  1 +
 hosts/vesuvius/k3s.nix           | 12 +++++++++++
 hosts/vesuvius/netboot.nix       | 37 +++++++++++++-------------------
 6 files changed, 64 insertions(+), 22 deletions(-)
 create mode 100644 hosts/common/k3s-ports.nix
 create mode 100644 hosts/common/k3s.nix
 create mode 100644 hosts/prospit/configuration.nix
 create mode 100644 hosts/vesuvius/k3s.nix

diff --git a/hosts/common/k3s-ports.nix b/hosts/common/k3s-ports.nix
new file mode 100644
index 0000000..23353b5
--- /dev/null
+++ b/hosts/common/k3s-ports.nix
@@ -0,0 +1,9 @@
+{
+  networking.firewall.allowedTCPPorts = [
+    6443
+  ];
+
+  networking.firewall.allowedUDPPorts = [
+    8472
+  ];
+}
diff --git a/hosts/common/k3s.nix b/hosts/common/k3s.nix
new file mode 100644
index 0000000..84bfce7
--- /dev/null
+++ b/hosts/common/k3s.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+  imports = [
+    ./k3s-ports.nix
+  ];
+
+  services.k3s = {
+    enable = true;
+    role = "agent";
+    token = "garbage secret";
+    serverAddr = "https://10.98.1.147:6443";
+  };
+}
diff --git a/hosts/prospit/configuration.nix b/hosts/prospit/configuration.nix
new file mode 100644
index 0000000..53e1e0c
--- /dev/null
+++ b/hosts/prospit/configuration.nix
@@ -0,0 +1,15 @@
+{ modulesPath, pkgs, ... }: {
+  imports = [
+    ../common/k3s.nix
+    ../common/nix.nix
+    ../common/sshd.nix
+    ../common/users-local.nix
+    (modulesPath + "/installer/netboot/netboot-minimal.nix")
+  ];
+
+  environment.systemPackages = [
+    pkgs.fastfetch
+  ];
+
+  system.stateVersion = "25.11";
+}
diff --git a/hosts/vesuvius/configuration.nix b/hosts/vesuvius/configuration.nix
index 482f77b..d060719 100644
--- a/hosts/vesuvius/configuration.nix
+++ b/hosts/vesuvius/configuration.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ./k3s.nix
     ./nix.nix
     ./zfs.nix
     ./netboot.nix
diff --git a/hosts/vesuvius/k3s.nix b/hosts/vesuvius/k3s.nix
new file mode 100644
index 0000000..f28a2cc
--- /dev/null
+++ b/hosts/vesuvius/k3s.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+  imports = [
+    ../common/k3s-ports.nix
+  ];
+
+  services.k3s = {
+    enable = true;
+    role = "server";
+    token = "garbage secret";
+    clusterInit = true;
+  };
+}
diff --git a/hosts/vesuvius/netboot.nix b/hosts/vesuvius/netboot.nix
index 9222a1c..c2918b2 100644
--- a/hosts/vesuvius/netboot.nix
+++ b/hosts/vesuvius/netboot.nix
@@ -1,38 +1,31 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   dom_ip = "10.98.2.1";
   dhcp_iface = "enp1s0f1";
   client_range = "10.98.2.2,10.98.2.100";
 
-  sub_image = pkgs.nixos {
-    imports = [ "${pkgs.path}/nixos/modules/installer/netboot/netboot-minimal.nix" ];
 
-    system.stateVersion = "25.05";
-    services.openssh = {
-      enable = true;
-      settings.PasswordAuthentication = true;
-      settings.KbdInteractiveAuthentication = false;
-    };
+  sub_image = lib.nixosSystem {
+    system = "x86_64-linux";
 
-    users.users.papatux = {
-      isNormalUser = true;
-      description = "papatux";
-      extraGroups = [ "networkmanager" "wheel" ];
-      hashedPassword = "$6$6GnvJWpo8oOWM1tb$GhuldW5iIdS6OuRyq5u1hSSu0VotQCLac7emA.Kui2hWLozR7EIO4Su6PCo5hTRG8iWnAOlGemQVyejIA9l4j/";
-      openssh.authorizedKeys.keys = import ../../papatux-keys.nix;
-    };
+    modules = [
+      ../prospit/configuration.nix
+    ];
   };
-  
+
+  prospit = sub_image.config.system.build;
+
   ipxe_config = pkgs.writeText "boot.ipxe" ''
     #!ipxe
-    kernel http://${dom_ip}:8080/netboot-nixtest/kernel init=/init boot.shell_on_fail
-    initrd http://${dom_ip}:8080/netboot-nixtest/initrd
+    kernel http://${dom_ip}:8080/netboot-kernel/bzImage init=${prospit.toplevel}/init boot.shell_on_fail
+    initrd http://${dom_ip}:8080/netboot-initrd/initrd
 
     boot
   '';
 
   webroot = pkgs.linkFarm "netboot" [
-    { name = "netboot-nixtest"; path = sub_image.config.system.build.toplevel; }
+    { name = "netboot-kernel"; path = prospit.kernel; }
+    { name = "netboot-initrd"; path = prospit.netbootRamdisk; }
     { name = "boot.ipxe"; path = ipxe_config; }
   ];
 
@@ -61,7 +54,7 @@ in
     settings.dhcp-userclass = [ "set:ipxe,iPXE" ];
     settings.dhcp-boot = [
       "tag:!ipxe,ipxe.efi"
-      "http://${dom_ip}:8080/boot.ipxe" 
+      "http://${dom_ip}:8080/boot.ipxe"
     ];
   };
 
@@ -77,4 +70,4 @@ in
     allowedTCPPorts = [ 8080 ];
     allowedUDPPorts = [ 67 69 ];
   };
-}
\ No newline at end of file
+}

From 3fcba7841fc897ef423097490c4852bd456a53b9 Mon Sep 17 00:00:00 2001
From: Ralakus <mikhail@licas.dev>
Date: Thu, 6 Nov 2025 15:52:29 -0500
Subject: [PATCH 02/13] corrected netboot configuration to avoid interface
 leakage and corrected addresses for dhcp clients on cluster vlan

---
 hosts/vesuvius/netboot.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/hosts/vesuvius/netboot.nix b/hosts/vesuvius/netboot.nix
index c2918b2..d2bb802 100644
--- a/hosts/vesuvius/netboot.nix
+++ b/hosts/vesuvius/netboot.nix
@@ -1,8 +1,10 @@
 { config, lib, pkgs, ... }:
 let
-  dom_ip = "10.98.2.1";
+  dom_ip = "10.98.3.2";
+  vlan_router_ip = "10.98.3.1";
+  dns_server_ip = "10.98.0.1";
   dhcp_iface = "enp1s0f1";
-  client_range = "10.98.2.2,10.98.2.100";
+  client_range = "10.98.3.3,10.98.3.100";
 
 
   sub_image = lib.nixosSystem {
@@ -47,10 +49,14 @@ in
 
   services.dnsmasq = {
     enable = true;
+    settings.domain = "hephaestus.vtluug.org";
+    settings.interface = "enp1s0f1";
+    settings.bind-interfaces = true;
+    settings.server = [ "${dns_server_ip}" ];
     settings.enable-tftp = true;
     settings.tftp-root = "${tftproot}";
     settings.dhcp-range = "${client_range},12h";
-    settings.dhcp-option = [ "option:router,${dom_ip}" ];
+    settings.dhcp-option = [ "option:router,${vlan_router_ip}" ];
     settings.dhcp-userclass = [ "set:ipxe,iPXE" ];
     settings.dhcp-boot = [
       "tag:!ipxe,ipxe.efi"

From 10ebb8fb6a152b6ae916a07ab2f7af91df8de861 Mon Sep 17 00:00:00 2001
From: Ralakus <mikhail@licas.dev>
Date: Thu, 6 Nov 2025 15:59:58 -0500
Subject: [PATCH 03/13] corrected dhcp interface

---
 hosts/vesuvius/netboot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/vesuvius/netboot.nix b/hosts/vesuvius/netboot.nix
index d2bb802..c7effc0 100644
--- a/hosts/vesuvius/netboot.nix
+++ b/hosts/vesuvius/netboot.nix
@@ -50,7 +50,7 @@ in
   services.dnsmasq = {
     enable = true;
     settings.domain = "hephaestus.vtluug.org";
-    settings.interface = "enp1s0f1";
+    settings.interface = "${dhcp_iface}";
     settings.bind-interfaces = true;
     settings.server = [ "${dns_server_ip}" ];
     settings.enable-tftp = true;

From eb25e2262b3cff1599b7e3a6bb13e9b78c023399 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:17:38 -0500
Subject: [PATCH 04/13] hosts/vesuvius: change DNS domain from hephaestus to
 bastille

this is hugely important and a major blocker
---
 hosts/vesuvius/netboot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/vesuvius/netboot.nix b/hosts/vesuvius/netboot.nix
index c7effc0..e6ba985 100644
--- a/hosts/vesuvius/netboot.nix
+++ b/hosts/vesuvius/netboot.nix
@@ -49,7 +49,7 @@ in
 
   services.dnsmasq = {
     enable = true;
-    settings.domain = "hephaestus.vtluug.org";
+    settings.domain = "bastille.vtluug.org";
     settings.interface = "${dhcp_iface}";
     settings.bind-interfaces = true;
     settings.server = [ "${dns_server_ip}" ];

From 56bf0e8964505919f8d189b2200e17817d7f8ada Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:37:57 -0500
Subject: [PATCH 05/13] hosts/common: refactor to remove k3s-ports.nix

---
 hosts/common/k3s-ports.nix | 9 ---------
 hosts/common/k3s.nix       | 9 ++++++---
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 hosts/common/k3s-ports.nix

diff --git a/hosts/common/k3s-ports.nix b/hosts/common/k3s-ports.nix
deleted file mode 100644
index 23353b5..0000000
--- a/hosts/common/k3s-ports.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  networking.firewall.allowedTCPPorts = [
-    6443
-  ];
-
-  networking.firewall.allowedUDPPorts = [
-    8472
-  ];
-}
diff --git a/hosts/common/k3s.nix b/hosts/common/k3s.nix
index 84bfce7..a4f9a7c 100644
--- a/hosts/common/k3s.nix
+++ b/hosts/common/k3s.nix
@@ -1,11 +1,14 @@
 { ... }: {
-  imports = [
-    ./k3s-ports.nix
+  networking.firewall.allowedTCPPorts = [
+    6443
+  ];
+
+  networking.firewall.allowedUDPPorts = [
+    8472
   ];
 
   services.k3s = {
     enable = true;
-    role = "agent";
     token = "garbage secret";
     serverAddr = "https://10.98.1.147:6443";
   };

From 7128fff2df415aa36fdf6eda3079c0e0b64a9d82 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:39:42 -0500
Subject: [PATCH 06/13] hosts/prospit: set k3s role

---
 hosts/prospit/configuration.nix | 2 +-
 hosts/prospit/k3s.nix           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 hosts/prospit/k3s.nix

diff --git a/hosts/prospit/configuration.nix b/hosts/prospit/configuration.nix
index 53e1e0c..fb9b108 100644
--- a/hosts/prospit/configuration.nix
+++ b/hosts/prospit/configuration.nix
@@ -1,6 +1,6 @@
 { modulesPath, pkgs, ... }: {
   imports = [
-    ../common/k3s.nix
+    ../k3s.nix
     ../common/nix.nix
     ../common/sshd.nix
     ../common/users-local.nix
diff --git a/hosts/prospit/k3s.nix b/hosts/prospit/k3s.nix
new file mode 100644
index 0000000..d9480e9
--- /dev/null
+++ b/hosts/prospit/k3s.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  imports = [
+    ../common/k3s.nix
+  ];
+
+  services.k3s = {
+    role = "agent";
+  };
+}

From 4dc169a571a77e053f5f1d2abd999cd8e8040999 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:40:01 -0500
Subject: [PATCH 07/13] hosts/vesuvius: become the k3s cluster init

---
 hosts/vesuvius/k3s.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hosts/vesuvius/k3s.nix b/hosts/vesuvius/k3s.nix
index f28a2cc..25e8a73 100644
--- a/hosts/vesuvius/k3s.nix
+++ b/hosts/vesuvius/k3s.nix
@@ -1,12 +1,10 @@
 { ... }: {
   imports = [
-    ../common/k3s-ports.nix
+    ../common/k3s.nix
   ];
 
   services.k3s = {
-    enable = true;
     role = "server";
-    token = "garbage secret";
     clusterInit = true;
   };
 }

From 194b9cb610cba72c6b13cfdc3deb0b735e3b7686 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:51:07 -0500
Subject: [PATCH 08/13] hosts/common/k3s: refactor to take role and clusterInit
 args

---
 hosts/common/k3s.nix             |  4 +++-
 hosts/prospit/configuration.nix  |  2 +-
 hosts/prospit/k3s.nix            |  9 ---------
 hosts/vesuvius/configuration.nix |  2 +-
 hosts/vesuvius/k3s.nix           | 10 ----------
 5 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 hosts/prospit/k3s.nix
 delete mode 100644 hosts/vesuvius/k3s.nix

diff --git a/hosts/common/k3s.nix b/hosts/common/k3s.nix
index a4f9a7c..46327b6 100644
--- a/hosts/common/k3s.nix
+++ b/hosts/common/k3s.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ role ? "agent", clusterInit ? false }: {
   networking.firewall.allowedTCPPorts = [
     6443
   ];
@@ -8,6 +8,8 @@
   ];
 
   services.k3s = {
+    inherit role clusterInit;
+
     enable = true;
     token = "garbage secret";
     serverAddr = "https://10.98.1.147:6443";
diff --git a/hosts/prospit/configuration.nix b/hosts/prospit/configuration.nix
index fb9b108..69b3c1b 100644
--- a/hosts/prospit/configuration.nix
+++ b/hosts/prospit/configuration.nix
@@ -1,6 +1,6 @@
 { modulesPath, pkgs, ... }: {
   imports = [
-    ../k3s.nix
+    (import ../common/k3s.nix {})
     ../common/nix.nix
     ../common/sshd.nix
     ../common/users-local.nix
diff --git a/hosts/prospit/k3s.nix b/hosts/prospit/k3s.nix
deleted file mode 100644
index d9480e9..0000000
--- a/hosts/prospit/k3s.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }: {
-  imports = [
-    ../common/k3s.nix
-  ];
-
-  services.k3s = {
-    role = "agent";
-  };
-}
diff --git a/hosts/vesuvius/configuration.nix b/hosts/vesuvius/configuration.nix
index d060719..3e9e43a 100644
--- a/hosts/vesuvius/configuration.nix
+++ b/hosts/vesuvius/configuration.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./k3s.nix
+    (import ../common/k3s.nix { role = "server"; clusterInit = true; })
     ./nix.nix
     ./zfs.nix
     ./netboot.nix
diff --git a/hosts/vesuvius/k3s.nix b/hosts/vesuvius/k3s.nix
deleted file mode 100644
index 25e8a73..0000000
--- a/hosts/vesuvius/k3s.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }: {
-  imports = [
-    ../common/k3s.nix
-  ];
-
-  services.k3s = {
-    role = "server";
-    clusterInit = true;
-  };
-}

From 3845c0b8077bc227de8247b4591fce8ca8c7ec58 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 20:54:10 -0500
Subject: [PATCH 09/13] hosts/prospit: be adopted by bastille

---
 .../{prospit/configuration.nix => bastille/blade.nix}  |  0
 hosts/vesuvius/netboot.nix                             | 10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename hosts/{prospit/configuration.nix => bastille/blade.nix} (100%)

diff --git a/hosts/prospit/configuration.nix b/hosts/bastille/blade.nix
similarity index 100%
rename from hosts/prospit/configuration.nix
rename to hosts/bastille/blade.nix
diff --git a/hosts/vesuvius/netboot.nix b/hosts/vesuvius/netboot.nix
index e6ba985..e0c090c 100644
--- a/hosts/vesuvius/netboot.nix
+++ b/hosts/vesuvius/netboot.nix
@@ -11,23 +11,23 @@ let
     system = "x86_64-linux";
 
     modules = [
-      ../prospit/configuration.nix
+      ../bastille/blade.nix
     ];
   };
 
-  prospit = sub_image.config.system.build;
+  blade = sub_image.config.system.build;
 
   ipxe_config = pkgs.writeText "boot.ipxe" ''
     #!ipxe
-    kernel http://${dom_ip}:8080/netboot-kernel/bzImage init=${prospit.toplevel}/init boot.shell_on_fail
+    kernel http://${dom_ip}:8080/netboot-kernel/bzImage init=${blade.toplevel}/init boot.shell_on_fail
     initrd http://${dom_ip}:8080/netboot-initrd/initrd
 
     boot
   '';
 
   webroot = pkgs.linkFarm "netboot" [
-    { name = "netboot-kernel"; path = prospit.kernel; }
-    { name = "netboot-initrd"; path = prospit.netbootRamdisk; }
+    { name = "netboot-kernel"; path = blade.kernel; }
+    { name = "netboot-initrd"; path = blade.netbootRamdisk; }
     { name = "boot.ipxe"; path = ipxe_config; }
   ];
 

From 3a8573ff327cfc34bddc740fadd886a64c1eb7a9 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 21:08:47 -0500
Subject: [PATCH 10/13] hosts/bastille: fix root password warning

---
 hosts/bastille/blade.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hosts/bastille/blade.nix b/hosts/bastille/blade.nix
index 69b3c1b..0154d94 100644
--- a/hosts/bastille/blade.nix
+++ b/hosts/bastille/blade.nix
@@ -1,4 +1,4 @@
-{ modulesPath, pkgs, ... }: {
+{ modulesPath, pkgs, lib, ... }: {
   imports = [
     (import ../common/k3s.nix {})
     ../common/nix.nix
@@ -7,6 +7,10 @@
     (modulesPath + "/installer/netboot/netboot-minimal.nix")
   ];
 
+  # when making the ISO, the initialHashedPassword is set to "" for some reason
+  # we already set a hashed password, so null this
+  users.users.root.initialHashedPassword = lib.mkForce null;
+
   environment.systemPackages = [
     pkgs.fastfetch
   ];

From 6041f784dfef9fc0834bf623ccd79f8967917914 Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Mon, 10 Nov 2025 23:46:49 -0500
Subject: [PATCH 11/13] hosts/bastille: automatically set hostname based on mac
 address

---
 hosts/bastille/auto-hostname.nix | 39 ++++++++++++++++++++++++++++++++
 hosts/bastille/blade.nix         |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 hosts/bastille/auto-hostname.nix

diff --git a/hosts/bastille/auto-hostname.nix b/hosts/bastille/auto-hostname.nix
new file mode 100644
index 0000000..7b5cd78
--- /dev/null
+++ b/hosts/bastille/auto-hostname.nix
@@ -0,0 +1,39 @@
+{ pkgs, lib, ... }:
+let
+  # TODO: make this like a python script with a list of interfaces in order of preference
+  auto-hostname = pkgs.writeShellApplication {
+    name = "auto-hostname";
+
+    runtimeInputs = [
+      pkgs.hostname
+    ];
+
+    text = ''
+      if [[ -e "/sys/class/net/eno2/address" ]]; then
+        mac_file="/sys/class/net/eno2/address"
+      else
+        mac_file=/sys/class/net/enp0s25/address
+      fi
+
+      mac=$(cat $mac_file | tr -d '\r\n ' | tr ':' '-')
+
+      hostname "blade-$mac"
+    '';
+  };
+in {
+  networking.hostName = "";
+
+  systemd.services."auto-hostname" = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+
+    unitConfig = {
+      Description = "Automatically set the hostname ";
+    };
+
+    serviceConfig = {
+      Type = "oneshot";
+      ExecStart = "${lib.getExe auto-hostname}";
+    };
+  };
+}
diff --git a/hosts/bastille/blade.nix b/hosts/bastille/blade.nix
index 0154d94..208bfb9 100644
--- a/hosts/bastille/blade.nix
+++ b/hosts/bastille/blade.nix
@@ -1,5 +1,6 @@
 { modulesPath, pkgs, lib, ... }: {
   imports = [
+    ./auto-hostname.nix
     (import ../common/k3s.nix {})
     ../common/nix.nix
     ../common/sshd.nix

From 95545c0a1672361a1f2228f0bfba97f34d72ed2b Mon Sep 17 00:00:00 2001
From: mehbark <terezi@pyrope.net>
Date: Tue, 11 Nov 2025 02:41:30 -0500
Subject: [PATCH 12/13] hosts/bastille: add some actual names to auto-hostname

there's still some possible issues with the script (hence the paranoid `echo` after `hostname`)
---
 hosts/bastille/auto-hostname.nix | 22 ++++++++++++++++++---
 hosts/bastille/blade-names.nix   | 34 +++++++++++++++++---------------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/hosts/bastille/auto-hostname.nix b/hosts/bastille/auto-hostname.nix
index 7b5cd78..8ec374d 100644
--- a/hosts/bastille/auto-hostname.nix
+++ b/hosts/bastille/auto-hostname.nix
@@ -1,6 +1,9 @@
 { pkgs, lib, ... }:
 let
-  # TODO: make this like a python script with a list of interfaces in order of preference
+  names = import ./blade-names.nix;
+
+  bash-sets = lib.mapAttrsToList (mac: name: "names['${mac}']='${name}'") names;
+
   auto-hostname = pkgs.writeShellApplication {
     name = "auto-hostname";
 
@@ -15,9 +18,22 @@ let
         mac_file=/sys/class/net/enp0s25/address
       fi
 
-      mac=$(cat $mac_file | tr -d '\r\n ' | tr ':' '-')
+      mac=$(cat $mac_file | tr -d '\r\n ')
+
+      declare -A names
+      ${lib.concatLines bash-sets}
+
+      if [[ -v names[$mac] ]]; then
+        name=''${names[$mac]}
+      else
+        name="node-(echo $mac | tr ':' '-')"
+      fi
+
+      echo "mac:  '$mac'"
+      echo "name: '$name'"
 
-      hostname "blade-$mac"
+      hostname "$name"
+      echo "hostname set to '$(hostname)'"
     '';
   };
 in {
diff --git a/hosts/bastille/blade-names.nix b/hosts/bastille/blade-names.nix
index f656f2d..083cad3 100644
--- a/hosts/bastille/blade-names.nix
+++ b/hosts/bastille/blade-names.nix
@@ -1,16 +1,18 @@
-# keep-sorted start
-[
-  "backbiter"
-  "damocles"
-  "durendal"
-  "eyelander"
-  "excalibur"
-  "gram"
-  "gryffindor"
-  "kusanagi"
-  "narsil"
-  "oathbringer"
-  "riptide"
-  "sting"
-]
-# keep-sorted end
+{
+  # TODO: prospit's a special case and won't remain here forever
+  "d8:9e:f3:3e:f9:41" = "prospit";
+
+  "40:f2:e9:c6:65:5f" = "backbiter";
+  "40:f2:e9:c6:69:43" = "damocles";
+  "40:f2:e9:c6:69:67" = "durendal";
+  "40:f2:e9:c6:74:59" = "eyelander";
+  "40:f2:e9:c6:75:f1" = "excalibur";
+  "40:f2:e9:c6:76:21" = "gram";
+
+  "unassigned-0" = "gryffindor";
+  "unassigned-1" = "kusanagi";
+  "unassigned-2" = "narsil";
+  "unassigned-3" = "oathbringer";
+  "unassigned-4" = "riptide";
+  "unassigned-5" = "sting";
+}

From 5364e331fb4771809dabd015233af45c8f3f2f34 Mon Sep 17 00:00:00 2001
From: rsk <rsk@vtluug.org>
Date: Wed, 26 Nov 2025 04:02:35 -0500
Subject: [PATCH 13/13] fix(common/k3s): use cluster routing IP for vesuvius

---
 hosts/common/k3s.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/common/k3s.nix b/hosts/common/k3s.nix
index 46327b6..1ad0ded 100644
--- a/hosts/common/k3s.nix
+++ b/hosts/common/k3s.nix
@@ -12,6 +12,6 @@
 
     enable = true;
     token = "garbage secret";
-    serverAddr = "https://10.98.1.147:6443";
+    serverAddr = "https://10.98.3.2:6443";
   };
 }