diff --git a/home/common/shell/default.nix b/home/common/shell/default.nix
index d407001..da48e07 100644
--- a/home/common/shell/default.nix
+++ b/home/common/shell/default.nix
@@ -2,6 +2,7 @@ _:
 {
   imports = [ 
     ./fish.nix 
+    ./starship.nix
     ./zoxide.nix 
     ./direnv.nix 
     ./zellij.nix
diff --git a/home/common/shell/fish.nix b/home/common/shell/fish.nix
index 4460713..7406f24 100644
--- a/home/common/shell/fish.nix
+++ b/home/common/shell/fish.nix
@@ -15,19 +15,10 @@ 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; }
-      { name = "hydro"; src = pkgs.fishPlugins.hydro.src; }
     ];
   };
 
diff --git a/home/common/shell/starship.nix b/home/common/shell/starship.nix
new file mode 100644
index 0000000..da47f59
--- /dev/null
+++ b/home/common/shell/starship.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  programs.starship = {
+    enable = true;
+    enableTransience = true;
+  };
+}
diff --git a/modules/docker.nix b/modules/docker.nix
index 31ae164..e591292 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, username, ... }:
 let 
   cfg = config.modules.docker;
 in
@@ -12,6 +12,6 @@ in
         setSocketVariable = true;
       };
     };
-    users.users.nezia.extraGroups = [ "docker" ];
+    users.users.${username}.extraGroups = [ "docker" ];
   };
 }