From 47c4e0097eda571dc893efd337f34f7cc8703ec3 Mon Sep 17 00:00:00 2001
From: John Ogle <johno@squareup.com>
Date: Tue, 30 Sep 2025 08:36:36 -0700
Subject: [PATCH] [home-work] Fix remaining conflicts

claude and other ai tools should follow standard install process on work machines
---
 home/roles/base/default.nix        | 13 ++++---------
 home/roles/development/default.nix |  6 +++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/home/roles/base/default.nix b/home/roles/base/default.nix
index 000a050..d234f59 100644
--- a/home/roles/base/default.nix
+++ b/home/roles/base/default.nix
@@ -12,8 +12,8 @@ in
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      # Core CLI utilities
       fd
+      glances
       gzip
       htop
       killall
@@ -21,12 +21,7 @@ in
       ncdu
       shellcheck
       tmux
-      
-      # Development/automation tools that are widely used
-      claude-code
-      codex
-      goose-cli
-      pandoc
+      tree
     ];
 
     # Essential programs everyone needs
@@ -63,11 +58,11 @@ in
 
     programs.ssh = {
       enable = true;
-      addKeysToAgent = "yes";
       matchBlocks = {
         "nucdeb1" = {
           hostname = "nucdeb1.oglehome";
           user = "root";
+          addKeysToAgent = "yes";
         };
       };
     };
@@ -83,4 +78,4 @@ in
 
     # Note: modules must be imported at top-level home config
   };
-}
\ No newline at end of file
+}
diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix
index 29db5d6..2b071bf 100644
--- a/home/roles/development/default.nix
+++ b/home/roles/development/default.nix
@@ -12,6 +12,10 @@ in
 
   config = mkIf cfg.enable {
     home.packages = [
+      claude-code
+      codex
+      goose-cli
+
       # Custom packages
       customPkgs.tea-rbw
     ];
@@ -20,4 +24,4 @@ in
 
     # Note: modules must be imported at top-level home config
   };
-}
\ No newline at end of file
+}