diff --git a/home/home-darwin-work.nix b/home/home-darwin-work.nix
index 52fbfbd..95ef6b8 100644
--- a/home/home-darwin-work.nix
+++ b/home/home-darwin-work.nix
@@ -15,34 +15,10 @@ in
 
   # Override Darwin-incompatible settings from base role
   programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac;
-  
-  programs.bash = {
-    enable = true;
-    initExtra = ''
-      source ~/Development/config_files/square/bashrc
 
-      # Generated by Hermit; START; DO NOT EDIT.
-      if [[ $- == *i* ]]; then
-      HERMIT_ROOT_BIN="''${HERMIT_ROOT_BIN:-"$HOME/bin/hermit"}"
-      eval "$(test -x $HERMIT_ROOT_BIN && $HERMIT_ROOT_BIN shell-hooks --print --bash)"
-      fi
-      # Generated by Hermit; END; DO NOT EDIT.
-    '';
-  };
-
-  programs.zsh = {
-    enable = true;
-    initContent = ''
-      source ~/Development/config_files/square/zshrc
-
-      # Generated by Hermit; START; DO NOT EDIT.
-      if [[ -o interactive ]]; then
-      HERMIT_ROOT_BIN="''${HERMIT_ROOT_BIN:-"$HOME/bin/hermit"}"
-      eval "$(test -x $HERMIT_ROOT_BIN && $HERMIT_ROOT_BIN shell-hooks --print --zsh)"
-      fi
-      # Generated by Hermit; END; DO NOT EDIT.
-    '';
-  };
+  # Disable direct control over bash and zsh
+  programs.bash.enable = lib.mkForce false;
+  programs.zsh.enable = lib.mkForce false;
 
   # Keep SSH and Git disabled to avoid conflicts with work environment
   programs.ssh.enable = lib.mkForce false;
@@ -51,8 +27,14 @@ in
 
   home.shell.enableShellIntegration = true;
 
+  home.roles = {
+    base.enable = true;
+  };
+
   imports = [
+    ./roles
     ./modules/emacs
+    ./modules/kubectl
     ./modules/tmux
   ];
 }