From 714aef3b904d1e56de3cde5f8ffe53d9ca932cc0 Mon Sep 17 00:00:00 2001
From: greysoh <me@greysoh.dev>
Date: Fri, 19 Jul 2024 16:19:50 -0400
Subject: [PATCH] fix(wip): Adds workaround for weird k3s issues.

---
 nixinfra/commons.agent.nix        | 16 +++++++++++++---
 nixinfra/commons.server.nix       | 17 +++++++++++++----
 nixinfra/kitteh-node-1/server.nix | 19 ++++++++++++++-----
 nixinfra/update.sh                |  8 ++++----
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/nixinfra/commons.agent.nix b/nixinfra/commons.agent.nix
index a829c9e..72bafa3 100644
--- a/nixinfra/commons.agent.nix
+++ b/nixinfra/commons.agent.nix
@@ -5,10 +5,20 @@ in {
     ./commons.nix
   ];
 
-  services.k3s = {
+  systemd.services.k3s = {
     enable = true;
-    role = "agent";
-    serverAddr = "https://kitteh-node-1-k3s-server:6443";
+    description = "(manual) k3s service";
+
+    path = [
+      pkgs.k3s
+    ];
+
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = pkgs.writeShellScript "k3s-hack" ''
+        k3s agent --token ${services.k3s.token} --server https://kitteh-node-1-k3s-server:6443
+      '';
+    };
   };
 
   virtualisation.docker.enable = true;
diff --git a/nixinfra/commons.server.nix b/nixinfra/commons.server.nix
index 9300b0a..1589e13 100644
--- a/nixinfra/commons.server.nix
+++ b/nixinfra/commons.server.nix
@@ -5,11 +5,20 @@ in {
     ./commons.nix
   ];
 
-  services.k3s = {
+  systemd.services.k3s = {
     enable = true;
-    role = "server";
-    serverAddr = "https://kitteh-node-1-k3s-server:6443";
-    extraFlags = "--disable servicelb";
+    description = "(manual) k3s service";
+
+    path = [
+      pkgs.k3s
+    ];
+
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = pkgs.writeShellScript "k3s-hack" ''
+        k3s server --token ${services.k3s.token} --server https://kitteh-node-1-k3s-server:6443 --disable servicelb
+      '';
+    };
   };
 
   # K3s settings
diff --git a/nixinfra/kitteh-node-1/server.nix b/nixinfra/kitteh-node-1/server.nix
index 6319891..51ba7a8 100644
--- a/nixinfra/kitteh-node-1/server.nix
+++ b/nixinfra/kitteh-node-1/server.nix
@@ -10,12 +10,21 @@ in {
 
   networking.hostName = "kitteh-node-1-k3s-server";
   environment.variables.NIX_BUILD_ID = "kitteh-node-1/server";
-  
-  services.k3s = {
+
+  systemd.services.k3s = {
     enable = true;
-    role = "server";
-    clusterInit = true;
-    extraFlags = "--disable servicelb";
+    description = "(manual) k3s service";
+
+    path = [
+      pkgs.k3s
+    ];
+
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = pkgs.writeShellScript "k3s-hack" ''
+        k3s server --cluster-init --token ${services.k3s.token} --disable servicelb
+      '';
+    };
   };
 
   # K3s settings
diff --git a/nixinfra/update.sh b/nixinfra/update.sh
index 05abd6d..21fde32 100644
--- a/nixinfra/update.sh
+++ b/nixinfra/update.sh
@@ -1,8 +1,7 @@
 nix_bld_unset_err() {
-  echo "ERROR: You have held a (potentially) broken install!"
-  echo "NIX_BUILD_ID is not set (should be set by default!)"
-  echo "Please set NIX_BUILD_ID manually. i.e:"
-  echo "NIX_BUILD_ID=kitteh-node-1/agent updater"
+  echo "ERROR: NIX_BUILD_ID is not set (should be set by default!)"
+  echo "  Please set NIX_BUILD_ID manually. i.e:"
+  echo "  NIX_BUILD_ID=kitteh-node-1/agent updater"
   exit 1
 }
 
@@ -24,6 +23,7 @@ if [[ "$UID" != "0" ]]; then
   # but this works:
   # - $: sudo su
   # - #: ./update
+  # NOTE: Calling `$: sudo ./update` still doesn't work with this hack. Just use `./update`, man.
 
   echo "NIX_BUILD_ID=$NIX_BUILD_ID" > /tmp/nixbuildid
   chmod +x /tmp/nixbuildid