diff --git a/configuration.nix b/configuration.nix
index ef0eaa9..bddf5f8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -75,7 +75,7 @@ in
   services.xserver.displayManager.defaultSession = "plasmawayland";
 
   programs.partition-manager.enable = true;
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
 
   # use bash shell for other users
   environment.shells = with pkgs; [ bash ];
@@ -153,6 +153,14 @@ in
   environment.systemPackages = (with pkgs; [
     (python3.withPackages(python-packages))
 
+    fishPlugins.done
+    fishPlugins.fzf-fish
+    fishPlugins.forgit
+    fishPlugins.hydro
+    fzf
+    fishPlugins.grc
+    grc
+
     distrobox
 
     go
diff --git a/users/servostar/user.nix b/users/servostar/user.nix
index 14ba72d..e4b849b 100644
--- a/users/servostar/user.nix
+++ b/users/servostar/user.nix
@@ -24,8 +24,8 @@
       "plugdev"
       "docker"
     ];
-    # use zsh
-    shell = pkgs.zsh;
+    # use fish
+    shell = pkgs.fish;
 
     # ------------------------------------------------------
     # user packages
@@ -54,7 +54,6 @@
       figlet
       cowsay
       cmatrix
-      eza
       btop
       htop
       tmux
@@ -129,6 +128,10 @@
   home-manager.users.servostar = {
     home = {
       stateVersion = "23.11";
+      sessionVariables = {
+            PAGER = "most";  # use most as pager program for man pages (colors!)
+            EDITOR = "nvim"; # overwrite editor
+        };
     };
     programs.vscode = {
       enable = true;
@@ -148,7 +151,7 @@
     };
     programs.starship = {
       enable = true;
-      enableZshIntegration = true;
+      enableFishIntegration = true;
     };
     programs.kitty = {
       enable = true;
@@ -164,40 +167,19 @@
     xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf;
 
     # ------------------------------------------------------
-    # ZSH
-    programs.zsh = {
-      enable = true;
-      autocd = true;
-      completionInit = "autoload -U compinit";
-      initExtra = ''
-        export PAGER="most"
-        export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=242"
-      '';
-      # Custom keybindings
-      initExtraFirst = ''
-        bindkey "^[[1;5C" emacs-forward-word
-        bindkey "^[[1;5D" emacs-backward-word
-      '';
-      enableCompletion = true;
-      enableAutosuggestions = true;
-      syntaxHighlighting = {
+    # Fish shell
+    programs.fish = {
         enable = true;
-      };
-      shellAliases = {
-        ls = "eza --icons";
-      };
-      history = {
-        size = 10000;
-        share = true;
-      };
-      zplug = {
+        interactiveShellInit = ''
+            set fish_greeting # Disable greeting
+        '';
+    };
+
+    programs.eza = {
         enable = true;
-        plugins = [
-          { name = "MichaelAquilina/zsh-you-should-use"; }
-          { name = "akash329d/zsh-alias-finder"; }
-          { name = "zsh-users/zsh-completions"; }
-        ];
-      };
+        enableAliases = true;
+        git = true;
+        icons = true;
     };
 
     # ------------------------------------------------------