refactor(vars,hosts): networking & k3s clusters

hosts/k8s/k3s-prod-1-worker-2/default.nix

@@ -1,19 +1,27 @@
 {
+  config,
   pkgs,
   myvars,
   mylib,
   ...
 }: let
   hostName = "k3s-prod-1-worker-2"; # define your hostname.
-  k8sLib = import ../lib.nix;
-  coreModule = k8sLib.gencoreModule {
+  k3sServerName = "k3s-prod-1-master-1";
+
+  coreModule = mylib.genKubeVirtCoreModule {
     inherit pkgs hostName;
     inherit (myvars) networking;
   };
+  k3sModule = mylib.genK3sAgentModule {
+    inherit pkgs;
+    tokenFile = config.age.secrets."k3s-prod-1-token".path;
+    serverIp = myvars.networking.hostsAddr.${k3sServerName}.ipv4;
+  };
 in {
   imports =
     (mylib.scanPaths ./.)
     ++ [
       coreModule
+      k3sModule
     ];
 }

hosts/k8s/k3s-prod-1-worker-2/k3s.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  pkgs,
-  myvars,
-  ...
-}: let
-  serverName = "k3s-prod-1-master-1";
-  serverIp = myvars.networking.hostAddress.${serverName}.address;
-  package = pkgs.k3s_1_29;
-in {
-  environment.systemPackages = [package];
-  services.k3s = {
-    inherit package;
-    enable = true;
-    role = "agent";
-    serverAddr = "https://${serverIp}:6443";
-    tokenFile = config.age.secrets."k3s-prod-1-token".path;
-    # https://docs.k3s.io/cli/agent
-    extraFlags =
-      " --node-label=node-type=worker"
-      + " --data-dir /var/lib/rancher/k3s";
-  };
-}