From b70c7874cc8da53d81e9997ca132027e84ea621b Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 19 May 2025 21:47:35 -0500
Subject: [PATCH] Fix Isaiah to actually work

---
 home/modules/baseline/xonsh.nix |  3 +++
 hosts/isaiah/default.nix        | 12 ++----------
 modules/nixos/kubernetes.nix    |  7 +++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/home/modules/baseline/xonsh.nix b/home/modules/baseline/xonsh.nix
index bd39ed2..e207579 100644
--- a/home/modules/baseline/xonsh.nix
+++ b/home/modules/baseline/xonsh.nix
@@ -63,6 +63,9 @@
 
       # General
       gh-personal = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/personal\" gh";
+      k = "kubectl";
+      kn = "kubectl get nodes -o wide";
+      kp = "kubectl get pods -o wide";
       ls = "ls --color";
       ll = "ls -l --color";
       win = "sudo virsh start win10";
diff --git a/hosts/isaiah/default.nix b/hosts/isaiah/default.nix
index 817eaa2..1315572 100644
--- a/hosts/isaiah/default.nix
+++ b/hosts/isaiah/default.nix
@@ -52,12 +52,9 @@
   };
 
   networking = {
-    bridges.br0 = {
-      interfaces = [ "enp38s0" ];
-    };
     defaultGateway = {
       address = " 10.42.1.1";
-      interface = "br0";
+      interface = "enp38s0";
     };
     firewall = {
       enable = true;
@@ -66,7 +63,7 @@
     };
     hostName = "isaiah";
     interfaces = {
-      br0 = {
+      enp38s0 = {
         ipv4.addresses = [
           {
             address = "10.42.1.6";
@@ -76,11 +73,6 @@
       };
     };
     nameservers = [ "10.42.1.5" ];
-    nat = {
-      enable = true;
-      internalInterfaces = [ "ve-+" ];
-      externalInterface = "br0";
-    };
     useDHCP = false;
   };
 
diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix
index 0bb4e0c..5997ab6 100644
--- a/modules/nixos/kubernetes.nix
+++ b/modules/nixos/kubernetes.nix
@@ -29,8 +29,15 @@ in
       extraFlags = [
         "--cluster-cidr=10.211.0.0/16"
         "--service-cidr=10.221.0.0/16"
+        "--write-kubeconfig-mode 0640"
+        "--write-kubeconfig-group kubeconfig"
       ];
       serverAddr = lib.mkIf (config.networking.hostName != "isaiah") "https://isaiah.home:6443";
     };
+
+    users = {
+      groups.kubeconfig = { };
+      users.greg.extraGroups = [ "kubeconfig" ];
+    };
   };
 }