Big updates

devices/becky-dingleberry.nix

@@ -7,17 +7,16 @@ let
   username = "becky";
   homedir = "/home/${username}";
 
-  zshSourceCommon = ../.zsh/common;
-  zshSourceUser = ../.zsh/dingleberry;
+  zshSourceDirs = [
+    ../modules/zsh/dingleberry
+  ];
 in
 {
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  #targets.genericLinux.enable = true;
 
   # Enable XDG for non terminal apps
   # https://github.com/nix-community/home-manager/issues/1439
   #programs.bash.enable = true;
-  #targets.genericLinux.enable = true;
   #xdg = {
   #  enable = true;
   #  mime = {
@@ -35,7 +34,6 @@ in
   home.stateVersion = "24.11";
 
   home.packages = with pkgs; [
-    bat
     nixd
     # TODO: Move from system to nix
     # awscli2
@@ -72,25 +70,27 @@ in
     };
   };
 
-
   programs.ghostty = {
     enable = true;
 
+    installBatSyntax = true;
     installVimSyntax = true;
     enableZshIntegration = true;
 
     package = config.lib.nixGL.wrap pkgs.ghostty;
+
+    settings = {
+      theme = "catppuccin-mocha";
+      font-size = 10;
+    };
   };
 
   programs.zsh = {
     enable = true;
 
-    autocd = true;
-
     shellAliases = {
-      cat = "bat --paging=never";
+      hm-switch = "home-manager switch --impure --flake ~/.config/nix";
     };
-
     dirHashes = {
       mac = "${homedir}/storage/.macshare";
       nix = "${homedir}/.config/nix";
@@ -119,13 +119,13 @@ in
     };
 
     initExtra = ''
-      for file in ${zshSourceCommon}/*.zsh; do
-          source "$file"
-      done
-
-      for file in ${zshSourceUser}/*.zsh; do
-          source "$file"
-      done
+      ${builtins.concatStringsSep "\n" (
+        builtins.map (dir: ''
+          for file in ${dir}/*.zsh; do
+              source "$file"
+          done
+        '') zshSourceDirs
+      )}
 
       autoload -U +X bashcompinit && bashcompinit
 

devices/lcech-mac-veracode.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }:
@@ -9,13 +8,10 @@ let
 
   zshSourceDirs = [
     ../.zsh/common
-    ../.zsh/macos
+    ../modules/zsh/macos
   ];
 in
 {
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
   home.username = username;
 
   home.homeDirectory = homedir;
@@ -24,7 +20,6 @@ in
 
   home.packages = with pkgs; [
     awscli2
-    bat
     k9s
     kubectl
     nixd
@@ -64,29 +59,20 @@ in
   programs.zsh = {
     enable = true;
 
-    autocd = true;
-
-    shellAliases = {
-      cat = "bat --paging=never";
-    };
-
     dirHashes = {
       mac = "${homedir}/storage/.macshare";
       nix = "${homedir}/.config/nix";
     };
 
     initExtra = ''
-      ${builtins.concatStringsSep "\n"
-        (builtins.map (dir:
-          ''
-            for file in ${dir}/*.zsh; do
-                source "$file"
-            done
-          ''
-        ) zshSourceDirs)
-      }
+      ${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)
@@ -101,7 +87,6 @@ in
   };
 }
 
-
 # TODO: launchd timers
 
 # <?xml version="1.0" encoding="UTF-8"?>