[NixOS] Try to connect jimi-hendnix to ryzen-shine in k3s

nixos/k3s.nix

@@ -1,9 +1,29 @@
-{ config, makeEnable, ... }:
-makeEnable config "myModules.railbird-k3s" false {
+{ config, lib, ... }:
+with lib;
+let cfg = config.myModules.railbird-k3s;
+in {
+  options = {
+    enable = mkEnableOption "railbird k3s";
+    serverAddr = {
+      type = lib.types.str;
+      default = "";
+    };
+  };
+  config = {
+    age.secrets."1896Folsom-k3s-token.age".file = ./secrets/1896Folsom-k3s-token.age;
+    services.dockerRegistry = {
+      enable = true;
+      listenAddress = "0.0.0.0";
+      port = 5279;
+      enableDelete = true;
+      enableGarbageCollect = true;
+    };
     services.k3s = {
       enable = true;
       role = "server";
-    clusterInit = true;
+      clusterInit = cfg.serverAddr == "";
+      serverAddr = cfg.serverAddr;
+      tokenFile = config.age.secrets."1896Folsom-k3s-token.age".path;
       containerdConfigTemplate = ''
         {{ template "base" . }}
 
@@ -20,4 +40,5 @@ makeEnable config "myModules.railbird-k3s" false {
         enable = true;
       };
     };
+  };
 }

nixos/machines/jimi-hendnix.nix

@@ -5,6 +5,10 @@
     ../configuration.nix
   ];
 
+  myModules.railbird-k3s = {
+    enable = true;
+    serverAddr = "https://ryzen-shine.local:6433";
+  };
   myModules.base.enable = true;
   myModules.desktop.enable = true;
   myModules.xmonad.enable = true;
@@ -18,7 +22,6 @@
   myModules.postgres.enable = true;
 
   hardware.enableRedistributableFirmware = true;
-
   myModules.nvidia.enable = true;
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];

nixos/machines/ryzen-shine.nix

@@ -7,6 +7,7 @@
 
   features.full.enable = true;
   myModules.kubelet.enable = false;
+  myModules.railbird-k3s.enable = true;
   myModules.nvidia.enable = true;
   # Needed for now because monitors have different refresh rates
   myModules.xmonad.picom.vSync.enable = false;

nixos/secrets/secrets.nix

@@ -13,5 +13,6 @@ in
   "gitea-runner-token.mac-demarco-mini.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
   "nextcloud-admin.age".publicKeys = keys.agenixKeys;
   "ryzen-shine-kubernetes-token.age".publicKeys = keys.agenixKeys;
+  "1896Folsom-k3s-token.age".publicKeys = keys.agenixKeys;
   "api_service_account_key.json.age".publicKeys = keys.agenixKeys;
 }