one last big shuffle

3 files changed, 57 insertions, 11 deletions

diff --git a/home/profiles/darwin.nix b/home/profiles/darwin.nix
index 5cbb1d7..8c1655c 100644
--- a/home/profiles/darwin.nix
+++ b/home/profiles/darwin.nix
@@ -6,19 +6,16 @@
   };
 
   imports = [
-    ../programs/cli/bat.nix
-    ../programs/cli/eza.nix
-    ../programs/cli/fd.nix
-    ../programs/dev/delta.nix
-    ../programs/dev/direnv.nix
-    ../programs/dev/git.nix
-    ../programs/dev/go.nix
+    ../programs/aider.nix
+    ../programs/bat.nix
     ../programs/emacs
+    ../programs/eza.nix
+    ../programs/fd.nix
     ../programs/firefox
-    ../programs/security/onepassword.nix
-    ../programs/security/ssh.nix
-    ../programs/shell/fish.nix
-    ../programs/term/kitty.nix
+    ../programs/fish.nix
+    ../programs/kitty.nix
+    ../programs/onepassword.nix
+    ../programs/ssh.nix
   ];
 
   home.packages = with pkgs; [
@@ -33,6 +30,7 @@
     tree
     wget
     wireshark
+    yubikey-manager
   ];
 
   programs.fish.shellAliases = {
diff --git a/home/profiles/development.nix b/home/profiles/development.nix
new file mode 100644
index 0000000..f5cdcca
--- /dev/null
+++ b/home/profiles/development.nix
@@ -0,0 +1,25 @@
+{ ... }:
+{
+  imports = [
+    ../programs/aider.nix
+    ../programs/gh.nix
+    ../programs/git.nix
+    ../programs/go.nix
+  ];
+
+  programs.delta = {
+    enable = true;
+    options.features = "decorations side-by-side line-numbers";
+  };
+
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+    config.global = {
+      disable_stdin = true;
+      strict_env = true;
+      hide_env_diff = true;
+      warn_timeout = 0;
+    };
+  };
+}
diff --git a/home/programs/dev/k8s.nix b/home/profiles/k8s.nix
index 18d706a..bb176e1 100644
--- a/home/programs/dev/k8s.nix
+++ b/home/profiles/k8s.nix
@@ -6,10 +6,33 @@
     kubectl
     kubernetes-helm # deploy applications
     kubelogin-oidc # OIDC plugin
+    kubie # kubeconfig browser https://github.com/sbstp/kubie
   ];
 
+  programs.k9s = {
+    enable = true;
+    settings = {
+      k9s = {
+        refreshRate = 1;
+      };
+    };
+  };
+
+  home.file.kubie = {
+    target = ".kube/kubie.yaml";
+    text = ''
+      shell: fish
+      configs:
+        include:
+          - ~/.kube/rksconfig
+      prompt:
+        fish_use_rprompt: false
+    '';
+  };
+
   programs.fish = {
     shellAbbrs = {
+      kctx = "kubie ctx";
       k = "kubectl";
       klogs = "kubectl logs";
     };