Update mac HM

devices/lcech-mac-veracode.nix

@@ -7,7 +7,10 @@ let
   username = "lcech";
   homedir = "/Users/${username}";
 
-  zshSourceCommon = ../.zsh/common;
+  zshSourceDirs = [
+    ../.zsh/common
+    ../.zsh/macos
+  ];
 in
 {
   # Let Home Manager install and manage itself.
@@ -21,9 +24,12 @@ in
 
   home.packages = with pkgs; [
     awscli2
+    bat
     k9s
+    keepassxc
     kubectl
     nixd
+    watch
   ];
 
   programs.direnv = {
@@ -31,13 +37,6 @@ in
     nix-direnv.enable = true;
   };
 
-  programs.ghostty = {
-    enable = true;
-
-    installVimSyntax = true;
-    enableZshIntegration = true;
-  };
-
   programs.git = {
     enable = true;
     userName = "Lukas Cech";
@@ -65,16 +64,29 @@ in
   programs.zsh = {
     enable = true;
 
+    autocd = true;
+
+    shellAliases = {
+      cat = "bat --paging=never";
+    };
+
     dirHashes = {
-      mac = "${homedir}/.macshare";
+      mac = "${homedir}/storage/.macshare";
       nix = "${homedir}/.config/nix";
     };
 
     initExtra = ''
-      for file in ${zshSourceCommon}/*.zsh; do
-          source "$file"
-      done
+      ${builtins.concatStringsSep "\n"
+        (builtins.map (dir:
+          ''
+            for file in ${dir}/*.zsh; do
+                source "$file"
+            done
+          ''
+        ) zshSourceDirs)
+      }
 
+      # ${pkgs.keepassxc}
       autoload -U +X bashcompinit && bashcompinit
 
       source <(kubectl completion zsh)
@@ -85,5 +97,6 @@ in
   home.sessionVariables = {
     EDITOR = "vim";
     GO111MODULE = "on";
+    TERMINAL = "ghostty";
   };
 }