From 852258d66f223dd7abc9cd1b9cf0116eb89c297a Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Tue, 16 Sep 2025 15:36:12 +0200
Subject: [PATCH] removes fish as shell

---
 home/server.nix               | 5 +----
 hosts/dnsc-server/default.nix | 9 +--------
 hosts/dnsc-vps-sm/default.nix | 9 +--------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/home/server.nix b/home/server.nix
index fc49b9a..cb0f437 100644
--- a/home/server.nix
+++ b/home/server.nix
@@ -18,16 +18,13 @@
     fortune
     iotop
     iftop
+    btop
     just
     mmv-go
-    lazygit
-    fish
     zoxide
   ];
 
   imports = [
-    ../modules/fish/server.nix
-    ../modules/lazygit
     ../modules/ssh
   ];
 
diff --git a/hosts/dnsc-server/default.nix b/hosts/dnsc-server/default.nix
index 67731f2..bd01e12 100644
--- a/hosts/dnsc-server/default.nix
+++ b/hosts/dnsc-server/default.nix
@@ -43,15 +43,8 @@
   };
   nix.settings.auto-optimise-store = true;
 
-  # Launch fish shell
   programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
+    enable = true;
   };
 
   # Networking
diff --git a/hosts/dnsc-vps-sm/default.nix b/hosts/dnsc-vps-sm/default.nix
index f68ab4e..db4f3aa 100644
--- a/hosts/dnsc-vps-sm/default.nix
+++ b/hosts/dnsc-vps-sm/default.nix
@@ -41,15 +41,8 @@
   };
   nix.settings.auto-optimise-store = true;
 
-  # Launch fish shell
   programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
+    enable = true;
   };
 
   security.sudo.enable = true;