ft: catppuccin nix

modules/base.nix

@@ -82,6 +82,13 @@
           STARSHIP_LOG = "error";
         };
       };
+
     };
   };
+  catppuccin = {
+    accent = "mauve";
+    autoEnable = true;
+    enable = true;
+    flavor = "macchiato";
+  };
 }

modules/terminal/fish-functions/ranger.fish

@@ -1,12 +0,0 @@
-
-set tempfile '/tmp/chosendir'
-command ranger --choosedir=$tempfile (pwd) $argv
-
-if test -f $tempfile
- if [ (cat $tempfile) != (pwd) ]
-  cd (cat $tempfile)
- end
-end
-
-rm -f $tempfile
-

modules/terminal/fish.nix

@@ -16,11 +16,11 @@ in
   home-manager.users.djai.programs.fish = {
     enable = true;
     binds = {
-      "\cf" = {
+      "ctrl-f" = {
         command = "forward-char";
         mode = "insert";
       };
-      "\ef" = {
+      "alt-f" = {
         command = "forward-word";
         mode = "insert";
       };
@@ -32,12 +32,12 @@ in
       end
 
       [ -d "$HOME/.cargo/env.fish" ] && source "$HOME/.cargo/env.fish"
+      set -g fish_greeting
     '';
 
     interactiveShellInit = ''
       fish_vi_key_bindings
       starship init fish | source
-      fish_config theme choose "Catppuccin Macchiato"
 
       if test -n "$TMUX"
         ascii.sh

modules/terminal/kitty.nix

@@ -15,7 +15,7 @@
 
       "ctrl+shift+n" = "new_os_window_with_cwd";
     };
-    themeFile = "Catppuccin-Macchiato";
+    themeFile = "Catppuccin-Macchiato"; # FIXME: borked in home manager?
 
     settings = {
       shell = "${pkgs.fish}/bin/fish";