4: Removed manual Yazi Fish function declaration, fixed wrong way of adding Bat themes, added all Catppuccin themes for Bat, and configured Bat to use Catppuccin Mocha

home/modules/shellConfig.nix

@@ -12,16 +12,6 @@
     functions = {
       gitignore = "touch .gitignore && curl -sL https://www.gitignore.io/api/$argv >> .gitignore";
       finit = "nix flake init --template \"https://flakehub.com/f/the-nix-way/dev-templates/*#$argv\"";
-      y = ''
-        function y
-          set tmp (mktemp -t "yazi-cwd.XXXXXX")
-          yazi $argv --cwd-file="$tmp"
-          if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-          	builtin cd -- "$cwd"
-          end
-          rm -f -- "$tmp"
-        end
-      '';
     };
 
     generateCompletions = true;
@@ -85,17 +75,31 @@
   programs.yazi = {
     enable = true;
     enableFishIntegration = true;
+    shellWrapperName = "y";
   };
 
   programs.bat = {
     enable = true;
-    enableFishIntegration = true;
-
     themes = {
-      catppuccin = {
+      CatppuccinMocha = {
-        src = builtins.readFile ./batThemes/CatppuccinMocha.tmTheme;
+        src = ./batThemes;
         file = "CatppuccinMocha.tmTheme";
       };
+      CatppuccinFrappe = {
+        src = ./batThemes;
+        file = "CatppuccinFrappe.tmTheme";
+      };
+      CatppuccinLatte = {
+        src = ./batThemes;
+        file = "CatppuccinLatte.tmTheme";
+      };
+      CatppuccinMacchiato = {
+        src = ./batThemes;
+        file = "CatppuccinMacchiato.tmTheme";
+      };
+    };
+    config = {
+      theme = "CatppuccinMocha";
     };
   };