seth/fish: use hydro for prompt

getchoo · Feb 4, 2025 · 957e95b · 957e95b
1 parent c437465
commit 957e95b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 46 deletions.
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
@@ -12,7 +12,7 @@
     ./bash.nix
     ./chromium.nix
     ./firefox
-    ./fish
+    ./fish.nix
     ./gh.nix
     ./git.nix
     ./gpg.nix

diff --git a/users/seth/programs/fish/default.nix → users/seth/programs/fish.nix b/users/seth/programs/fish/default.nix → users/seth/programs/fish.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 let
@@ -9,6 +10,9 @@ in
 {
   options.seth.programs.fish = {
     enable = lib.mkEnableOption "Fish configuration";
+    hydro.enable = lib.mkEnableOption "Hydra prompt" // {
+      default = true;
+    };
   };
 
   config = lib.mkIf cfg.enable (
@@ -19,7 +23,6 @@ in
 
           functions = {
             last_history_item.body = "echo $history[1]";
-            fish_prompt = lib.readFile ./fish_prompt.fish;
           };
 
           shellAbbrs = {
@@ -32,6 +35,21 @@ in
         };
       }
 
+      (lib.mkIf cfg.hydro.enable {
+        programs.fish = {
+          interactiveShellInit = ''
+            set --global hydro_symbol_prompt ">"
+          '';
+
+          plugins = [
+            {
+              name = "hydro";
+              inherit (pkgs.fishPlugins.hydro) src;
+            }
+          ];
+        };
+      })
+
       # TODO: do i still need this weird sourcing?
       (lib.mkIf config.seth.standalone.enable {
         programs.fish = {

diff --git a/users/seth/programs/fish/fish_prompt.fish b/users/seth/programs/fish/fish_prompt.fish