diff --git a/modules/core/packages/programs.nix b/modules/core/packages/programs.nix
index db87b72..13b9ea6 100644
--- a/modules/core/packages/programs.nix
+++ b/modules/core/packages/programs.nix
@@ -1,11 +1,14 @@
-_: {
+{shell, ...}: {
   programs = {
     nano.enable = true;
     hyprland = {
       enable = true;
       withUWSM = false;
     };
-    fish.enable = true;
+    fish.enable =
+      if shell == "fish"
+      then true
+      else false;
     dconf.enable = true;
     seahorse.enable = true;
     fuse.userAllowOther = true;
diff --git a/modules/core/user.nix b/modules/core/user.nix
index 6ddc45c..df5b323 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -43,7 +43,10 @@
         username = "${username}";
         homeDirectory = "/home/${username}";
         stateVersion = "25.11";
-        shell.enableFishIntegration = true;
+        shell.enableFishIntegration =
+          if shell == "fish"
+          then true
+          else false;
       };
     };
   };
diff --git a/modules/home/eza.nix b/modules/home/eza.nix
index 95c7c95..92eaaef 100644
--- a/modules/home/eza.nix
+++ b/modules/home/eza.nix
@@ -1,10 +1,15 @@
-# Eza is a ls replacement
-{
+{shell, ...}: {
   programs.eza = {
     enable = true;
     icons = "auto";
-    enableFishIntegration = true;
-    enableBashIntegration = true;
+    enableFishIntegration =
+      if shell == "fish"
+      then true
+      else false;
+    enableBashIntegration =
+      if shell == "bash"
+      then true
+      else false;
     git = true;
 
     extraOptions = [
diff --git a/modules/home/fastfetch/settings/modules.nix b/modules/home/fastfetch/settings/modules.nix
index 3ee25fb..0912c66 100644
--- a/modules/home/fastfetch/settings/modules.nix
+++ b/modules/home/fastfetch/settings/modules.nix
@@ -122,29 +122,25 @@ _: {
     {
       type = "command";
       key = "│  IN";
-      text =
-        #bash
-        ''
-          birth_install=$(stat -c %W /)
-          if [ "$birth_install" -gt 0 ]; then
-            echo "Installed $(date -d @"$birth_install" +"%Y-%m-%d")"
-          else
-            echo "Installation date unknown"
-          fi
-        '';
+      text = ''
+        birth_install=$(stat -c %W /)
+        if [ "$birth_install" -gt 0 ]; then
+          echo "Installed $(date -d @"$birth_install" +"%Y-%m-%d")"
+        else
+          echo "Installation date unknown"
+        fi
+      '';
     }
     {
       type = "command";
       key = "│ ├  ";
-      text =
-        #bash
-        ''
-          birth_install=$(stat -c %W /)
-          current=$(date +%s)
-          delta=$((current - birth_install))
-          delta_days=$((delta / 86400))
-          echo $delta_days days
-        '';
+      text = ''
+        birth_install=$(stat -c %W /)
+        current=$(date +%s)
+        delta=$((current - birth_install))
+        delta_days=$((delta / 86400))
+        echo $delta_days days
+      '';
     }
     {
       type = "uptime";
diff --git a/modules/home/fish/default.nix b/modules/home/fish/default.nix
index 8a2cefa..24cb31e 100644
--- a/modules/home/fish/default.nix
+++ b/modules/home/fish/default.nix
@@ -20,7 +20,10 @@
     nix-your-shell = {
       enable = true;
       package = pkgs.nix-your-shell;
-      enableFishIntegration = true;
+      enableFishIntegration =
+        if shell == "fish"
+        then true
+        else false;
       nix-output-monitor = {
         enable = true;
         package = pkgs.nix-output-monitor;
diff --git a/modules/home/fzf.nix b/modules/home/fzf.nix
index 19b2f86..c69738b 100644
--- a/modules/home/fzf.nix
+++ b/modules/home/fzf.nix
@@ -1,8 +1,14 @@
-_: {
+{shell, ...}: {
   programs.fzf = {
     enable = true;
-    enableFishIntegration = true;
-    enableBashIntegration = true;
+    enableFishIntegration =
+      if shell == "fish"
+      then true
+      else false;
+    enableBashIntegration =
+      if shell == "bash"
+      then true
+      else false;
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
diff --git a/modules/home/kitty/default.nix b/modules/home/kitty/default.nix
index fe34e37..7efef6e 100644
--- a/modules/home/kitty/default.nix
+++ b/modules/home/kitty/default.nix
@@ -1,8 +1,15 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  shell,
+  ...
+}: {
   programs.kitty = {
     enable = true;
     package = pkgs.kitty;
-    shellIntegration.enableFishIntegration = true;
+    shellIntegration.enableFishIntegration =
+      if shell == "fish"
+      then true
+      else false;
   };
 
   imports = [
diff --git a/modules/home/starship.nix b/modules/home/starship.nix
index 06ed800..0b6215e 100644
--- a/modules/home/starship.nix
+++ b/modules/home/starship.nix
@@ -1,7 +1,14 @@
-{lib, ...}: {
+{
+  lib,
+  shell,
+  ...
+}: {
   programs.starship = {
     enable = true;
-    enableFishIntegration = true;
+    enableFishIntegration =
+      if shell == "fish"
+      then true
+      else false;
     settings = {
       add_newline = true;
       format = lib.concatStrings [
diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix
index ba9549e..3481bdd 100644
--- a/modules/home/stylix.nix
+++ b/modules/home/stylix.nix
@@ -1,4 +1,8 @@
-{host, ...}: {
+{
+  host,
+  shell,
+  ...
+}: {
   stylix.targets = {
     librewolf.profileNames = ["${host}"];
 
@@ -27,7 +31,10 @@
     };
 
     fish = {
-      enable = true;
+      enable =
+        if shell == "fish"
+        then true
+        else false;
       colors.enable = true;
       inputs.enable = true;
     };
diff --git a/modules/home/zoxide.nix b/modules/home/zoxide.nix
index 06a9251..d5f5b0b 100644
--- a/modules/home/zoxide.nix
+++ b/modules/home/zoxide.nix
@@ -1,8 +1,14 @@
-_: {
+{shell, ...}: {
   programs.zoxide = {
     enable = true;
-    enableFishIntegration = true;
-    enableBashIntegration = true;
+    enableFishIntegration =
+      if shell == "fish"
+      then true
+      else false;
+    enableBashIntegration =
+      if shell == "bash"
+      then true
+      else false;
     options = [
       "--cmd cd"
     ];