diff --git a/home/base/shell/default.nix b/home/base/shell/default.nix
index 768e9b0..173c42c 100644
--- a/home/base/shell/default.nix
+++ b/home/base/shell/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [ 
     ./fish.nix 
-    ./starship.nix 
     ./zoxide.nix 
     ./direnv.nix 
     ./zellij.nix
diff --git a/home/base/shell/fish.nix b/home/base/shell/fish.nix
index 68cc18d..4460713 100644
--- a/home/base/shell/fish.nix
+++ b/home/base/shell/fish.nix
@@ -15,9 +15,20 @@ in
       set fish_greeting # Disable greeting
       fish_vi_key_bindings # Enable Vi mode
       fish_config theme choose "Catppuccin Frappe"
+
+      set --global hydro_fetch true
+      set --global hydro_multiline true
+      set --global hydro_color_pwd blue
+      set --global hydro_color_git yellow
+      set --global hydro_color_error red
+      set --global hydro_color_prompt magenta
+      set --global hydro_color_duration cyan
     '';
     shellAbbrs = { cd = "z"; ngc = "sudo nix-collect-garbage -d"; };
-    plugins = [ { name = "fzf"; src = pkgs.fishPlugins.fzf.src; } ];
+    plugins = [ 
+      { name = "fzf"; src = pkgs.fishPlugins.fzf.src; }
+      { name = "hydro"; src = pkgs.fishPlugins.hydro.src; }
+    ];
   };
 
   programs.bash = {
diff --git a/home/base/shell/starship.nix b/home/base/shell/starship.nix
deleted file mode 100644
index 5730b98..0000000
--- a/home/base/shell/starship.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ config, ... }:
-
-{
-  home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
-
-  programs.starship = {
-    enable = true;
-
-    settings = {
-      # Sets user-defined palette
-      # Palettes must be defined _after_ this line
-      palette = "catppuccin_frappe";
-
-      # Starship modules
-      character = {
-        # Note the use of Catppuccin color 'peach'
-        success_symbol = "[[󰄛 ](green) ❯](peach)";
-        error_symbol = "[[󰄛 ](red) ❯](peach)";
-        vimcmd_symbol = "[󰄛  ❮](subtext1)"; 
-      };
-
-      git_branch = {
-        style = "bold mauve";
-      };
-
-      directory = {
-        truncation_length = 4;
-        style = "bold lavender";
-      };
-
-      # Palette definitions
-      palettes = {
-        catppuccin_latte = {
-          rosewater = "#dc8a78";
-          flamingo = "#dd7878";
-          pink = "#ea76cb";
-          mauve = "#8839ef";
-          red = "#d20f39";
-          maroon = "#e64553";
-          peach = "#fe640b";
-          yellow = "#df8e1d";
-          green = "#40a02b";
-          teal = "#179299";
-          sky = "#04a5e5";
-          sapphire = "#209fb5";
-          blue = "#1e66f5";
-          lavender = "#7287fd";
-          text = "#4c4f69";
-          subtext1 = "#5c5f77";
-          subtext0 = "#6c6f85";
-          overlay2 = "#7c7f93";
-          overlay1 = "#8c8fa1";
-          overlay0 = "#9ca0b0";
-          surface2 = "#acb0be";
-          surface1 = "#bcc0cc";
-          surface0 = "#ccd0da";
-          base = "#eff1f5";
-          mantle = "#e6e9ef";
-          crust = "#dce0e8";
-        };
-
-        catppuccin_frappe = {
-          rosewater = "#f2d5cf";
-          flamingo = "#eebebe";
-          pink = "#f4b8e4";
-          mauve = "#ca9ee6";
-          red = "#e78284";
-          maroon = "#ea999c";
-          peach = "#ef9f76";
-          yellow = "#e5c890";
-          green = "#a6d189";
-          teal = "#81c8be";
-          sky = "#99d1db";
-          sapphire = "#85c1dc";
-          blue = "#8caaee";
-          lavender = "#babbf1";
-          text = "#c6d0f5";
-          subtext1 = "#b5bfe2";
-          subtext0 = "#a5adce";
-          overlay2 = "#949cbb";
-          overlay1 = "#838ba7";
-          overlay0 = "#737994";
-          surface2 = "#626880";
-          surface1 = "#51576d";
-          surface0 = "#414559";
-          base = "#303446";
-          mantle = "#292c3c";
-          crust = "#232634";
-        };
-
-        catppuccin_macchiato = {
-          rosewater = "#f4dbd6";
-          flamingo = "#f0c6c6";
-          pink = "#f5bde6";
-          mauve = "#c6a0f6";
-          red = "#ed8796";
-          maroon = "#ee99a0";
-          peach = "#f5a97f";
-          yellow = "#eed49f";
-          green = "#a6da95";
-          teal = "#8bd5ca";
-          sky = "#91d7e3";
-          sapphire = "#7dc4e4";
-          blue = "#8aadf4";
-          lavender = "#b7bdf8";
-          text = "#cad3f5";
-          subtext1 = "#b8c0e0";
-          subtext0 = "#a5adcb";
-          overlay2 = "#939ab7";
-          overlay1 = "#8087a2";
-          overlay0 = "#6e738d";
-          surface2 = "#5b6078";
-          surface1 = "#494d64";
-          surface0 = "#363a4f";
-          base = "#24273a";
-          mantle = "#1e2030";
-          crust = "#181926";
-        };
-
-        catppuccin_mocha = {
-          rosewater = "#f5e0dc";
-          flamingo = "#f2cdcd";
-          pink = "#f5c2e7";
-          mauve = "#cba6f7";
-          red = "#f38ba8";
-          maroon = "#eba0ac";
-          peach = "#fab387";
-          yellow = "#f9e2af";
-          green = "#a6e3a1";
-          teal = "#94e2d5";
-          sky = "#89dceb";
-          sapphire = "#74c7ec";
-          blue = "#89b4fa";
-          lavender = "#b4befe";
-          text = "#cdd6f4";
-          subtext1 = "#bac2de";
-          subtext0 = "#a6adc8";
-          overlay2 = "#9399b2";
-          overlay1 = "#7f849c";
-          overlay0 = "#6c7086";
-          surface2 = "#585b70";
-          surface1 = "#45475a";
-          surface0 = "#313244";
-          base = "#1e1e2e";
-          mantle = "#181825";
-          crust = "#11111b";
-        };
-      };
-    };
-    enableFishIntegration = true;
-  };
-}