From 2b1fa4df5b3e2d3ee1d1b124d425b0e5ac00c204 Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Mon, 2 Jun 2025 13:26:56 +0100
Subject: [PATCH] add fish

---
 configuration/base.nix         |  4 ++++
 devices/tuxedo/home.nix        |  1 +
 home-manager/base/terminal.nix | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/configuration/base.nix b/configuration/base.nix
index 6adae77..5efebfc 100644
--- a/configuration/base.nix
+++ b/configuration/base.nix
@@ -91,11 +91,15 @@
   };
   services.flatpak.enable = true;
 
+  programs.bash.blesh.enable = true;
+  programs.fish.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs;
     [
       # utils
+      uutils-coreutils-noprefix
       vim
       curl
       inetutils
diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix
index 9ae69e7..cce3ee0 100644
--- a/devices/tuxedo/home.nix
+++ b/devices/tuxedo/home.nix
@@ -79,6 +79,7 @@
         gpu-api = "vulkan";
         hwdec = "vulkan";
         screenshot-directory = "/mnt/HDD1/Pictures/";
+        # screenshot-directory = "~/Pictures/";
         screenshot-template = "%F/%F_snapshot_%P";
         glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl";
       };
diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix
index c9f8d02..3647874 100644
--- a/home-manager/base/terminal.nix
+++ b/home-manager/base/terminal.nix
@@ -31,8 +31,20 @@ with lib;
       bash = {
         enable = true;
         initExtra = ''
-          source $(blesh-share)/ble.sh
-          bleopt canvas_winch_action=redraw-prev
+          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
+          # source $(blesh-share)/ble.sh
+          # bleopt canvas_winch_action=redraw-prev
+        '';
+      };
+
+      fish = {
+        enable = true;
+        interactiveShellInit = ''
+          set fish_greeting # Disable greeting
         '';
       };
 
@@ -93,6 +105,7 @@ with lib;
       zellij = {
         enable = true;
         enableBashIntegration = true;
+        enableFishIntegration = true;
         settings = {
           theme = "dracula";
           show_startup_tips = false;
@@ -120,6 +133,7 @@ with lib;
       eza = {
         enable = true;
         enableBashIntegration = true;
+        enableFishIntegration = true;
         git = true;
         extraOptions = [
           "--color=auto"