alacritty/ghostty + some catppuccin fixes

nix-darwin/home-modules/programs/alacritty.nix

@@ -14,8 +14,6 @@
   };
 
   config = lib.mkIf config.alacritty.enable {
-    # C-r history
-    # C-l clear
     home = {
       sessionVariables = {
         TERMINAL = "alacritty";
@@ -24,15 +22,8 @@
     programs = {
       alacritty = {
         enable = true;
-        catppuccin.enable = true;
-        shellIntegration.enableFishIntegration = true;
-        shellIntegration.enableZshIntegration = true;
-        font = {
-          size = 16;
-          name = "JetBrainsMono";
-          package = pkgs.nerd-fonts.jetbrains-mono;
-        };
       };
     };
+    catppuccin.alacritty.enable = true;
   };
 }

nix-darwin/home-modules/programs/bat.nix

@@ -16,7 +16,7 @@
   config = lib.mkIf config.bat.enable {
     programs.bat = {
       enable = true;
-      catppuccin.enable = true;
     };
+    catppuccin.bat.enable = true;
   };
 }

nix-darwin/home-modules/programs/btop.nix

@@ -16,10 +16,10 @@
   config = lib.mkIf config.btop.enable {
     programs.btop = {
       enable = true;
-      catppuccin.enable = true;
       settings = {
         theme_background = true;
       };
     };
+    catppuccin.btop.enable = true;
   };
 }

nix-darwin/home-modules/programs/default.nix

@@ -13,6 +13,7 @@
     ./flameshot.nix
     ./fuzzel.nix
     ./fzf.nix
+    ./ghostty.nix
     ./git.nix
     ./k9s.nix
     ./keychain.nix

nix-darwin/home-modules/programs/fish.nix

@@ -20,7 +20,6 @@
     programs.fish = {
       plugins = [ ];
       enable = true;
-      #  catppuccin.enable = true;
       shellInit = ''
                  # set -x PATH $PATH $HOME/.npm-global/bin
         set ENTERPRISE_REPO_PATH ~/knak
@@ -110,5 +109,6 @@
         top = "btop";
       };
     };
+    catppuccin.fish.enable = true;
   };
 }

nix-darwin/home-modules/programs/fzf.nix

@@ -17,8 +17,8 @@
     programs = {
       fzf = {
         enable = true;
-        catppuccin.enable = true;
       };
     };
+    catppuccin.fzf.enable = true;
   };
 }

nix-darwin/home-modules/programs/ghostty.nix

@@ -0,0 +1,34 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  options = {
+    ghostty.enable = lib.mkOption {
+      type = lib.types.bool;
+      description = "Enables ghostty shell";
+      default = true;
+    };
+  };
+
+  config = lib.mkIf config.ghostty.enable {
+    home = {
+      sessionVariables = {
+        # TERMINAL = "kitty";
+      };
+    };
+    programs = {
+      ghostty = {
+        enable = true;
+        enableFishIntegration = true;
+        enableZshIntegration = true;
+        settings = {
+          font-size = 16;
+          font-family = "JetBrainsMono";
+        };
+      };
+    };
+  };
+}