feat(fish): disable gpg, its fking up fish atm

modules/home/programs/fish/default.nix

@@ -6,8 +6,9 @@
 }:
 let
   inherit (lib) mkIf mkEnableOption;
-  inherit (lib.meta) getExe;
+  packageNames = map (p: p.pname or p.name or null) config.home.packages;
-  inherit (pkgs) eza bat;
+  hasPackage = name: lib.any (x: x == name) packageNames;
+  hasEza = hasPackage "eza";
   cfg = config.home.programs.fish;
 in
 {
@@ -46,12 +47,8 @@ in
         nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
         nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
         nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
-        tree = "${getExe eza} --tree --icons=always";
+        ls = mkIf hasEza "eza";
-        cat = "${getExe bat} --style=plain";
+        tree = mkIf hasEza "eza --tree --icons=always";
-        ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
-        ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
-        lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
-        la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
         # Clear screen and scrollback
         clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
       };
@@ -61,14 +58,12 @@ in
         # Merge history when pressing up
         up-or-search = lib.readFile ./up-or-search.fish;
         # Check stuff in PATH
-        nix-inspect =
+        nix-inspect = # fish
-          # fish
           ''
             set -s PATH | grep "PATH\[.*/nix/store" | cut -d '|' -f2 |  grep -v -e "-man" -e "-terminfo" | perl -pe 's:^/nix/store/\w{32}-([^/]*)/bin$:\1:' | sort | uniq
           '';
       };
-      interactiveShellInit =
+      interactiveShellInit = # fish
-        # fish
         ''
           # Open command buffer in vim when alt+e is pressed
           bind \ee edit_command_buffer

modules/nixos/programs/fish/default.nix

@@ -1,13 +1,14 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
-  inherit (lib.meta) getExe;
-  inherit (pkgs) eza bat;
   inherit (lib) mkIf mkEnableOption mkMerge;
+  packageNames = map (p: p.pname or p.name or null) config.home.packages;
+  hasPackage = name: lib.any (x: x == name) packageNames;
+  hasEza = hasPackage "eza";
+
   cfg = config.nixos.programs.fish;
 in
 {
@@ -22,6 +23,7 @@ in
     (mkIf cfg.enable {
       programs.fish = {
         enable = true;
+        useBabelfish = true;
         vendor = {
           completions.enable = true;
           config.enable = true;
@@ -55,17 +57,12 @@ in
           nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
           nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
           nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
-          tree = "${getExe eza} --tree --icons=always";
+          ls = mkIf hasEza "eza";
-          cat = "${getExe bat} --style=plain";
+          tree = mkIf hasEza "eza --tree --icons=always";
-          ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
-          ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
-          lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
-          la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
           # Clear screen and scrollback
           clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
         };
-        interactiveShellInit =
+        interactiveShellInit = # fish
-          # fish
           ''
             # Open command buffer in vim when alt+e is pressed
             bind \ee edit_command_buffer

users/cnst/modules/kimamod.nix

@@ -39,7 +39,7 @@
         enable = true;
       };
       ghostty = {
-        enable = true;
+        enable = false;
       };
       helix = {
         enable = true;
@@ -120,7 +120,7 @@
         enable = true;
       };
       gpg = {
-        enable = true;
+        enable = false;
       };
       gtk = {
         enable = true;