diff --git a/modules/biscuit/editor.nix b/modules/biscuit/editor.nix
index 4d2cd86..c72712d 100644
--- a/modules/biscuit/editor.nix
+++ b/modules/biscuit/editor.nix
@@ -5,6 +5,7 @@
     ../../pkgs/kitty/biscuit.nix
     ../../pkgs/neovim/biscuit.nix
     ../../pkgs/fish/biscuit.nix
+    ../../pkgs/starship/biscuit.nix
     # ../../pkgs/zsh/biscuit.nix
   ];
 }
diff --git a/pkgs/fish/biscuit.nix b/pkgs/fish/biscuit.nix
index 14b64bc..62cd73b 100644
--- a/pkgs/fish/biscuit.nix
+++ b/pkgs/fish/biscuit.nix
@@ -1,22 +1,19 @@
-{...}: {
+{pkgs, ...}: {
+  programs.zoxide.enable = true;
   programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      zoxide init fish | source
+      fish_vi_key_bindings
 
+    '';
+    shellAliases = {
+      ll = "ls -l";
+      upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit";
+      hupd = "home-manager switch --flake ~/Nixos/#biscuit";
+      agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &";
+    };
     plugins = with pkgs.fishPlugins; [
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "e0e1b9dfdba362f8ab1ae8c1afc7ccf62b89f7eb";
-          sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
-        };
-      }
     ];
   };
-  shellAliases = {
-    ll = "ls -l";
-    upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit";
-    hupd = "home-manager switch --flake ~/Nixos/#biscuit";
-    agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &";
-  };
 }
diff --git a/pkgs/starship/biscuit.nix b/pkgs/starship/biscuit.nix
new file mode 100644
index 0000000..e682a27
--- /dev/null
+++ b/pkgs/starship/biscuit.nix
@@ -0,0 +1,63 @@
+{...}: {
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = true;
+      format = ''
+        $username\
+        $hostname\
+        $directory\
+        $git_branch\
+        $git_state\
+        $git_status\
+        $cmd_duration\
+        $line_break\
+        $python\
+        $character'';
+      # Optional: You can set right_format = "" if you want
+      right_format = "";
+
+      directory = {
+        style = "blue";
+      };
+
+      character = {
+        success_symbol = "[❯](purple)";
+        error_symbol = "[❯](red)";
+        vimcmd_symbol = "[❮](green)";
+      };
+
+      git_branch = {
+        format = "[$branch]($style)";
+        style = "bright-black";
+      };
+
+      git_state = {
+        format = "([$state( $progress_current/$progress_total)]($style)) ";
+        style = "bright-black";
+      };
+
+      git_status = {
+        format = "  ($ahead_behind$stashed)]($style)";
+        style = "cyan";
+        conflicted = "​"; # zero-width space
+        untracked = "​";
+        modified = "​";
+        staged = "​";
+        renamed = "​";
+        deleted = "​";
+        stashed = "≡";
+      };
+
+      cmd_duration = {
+        format = "[$duration]($style) ";
+        style = "yellow";
+      };
+
+      python = {
+        format = "[$virtualenv]($style) ";
+        style = "bright-black";
+      };
+    };
+  };
+}