diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index 17ac2bb..f63cbf0 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -70,35 +70,53 @@
     };
   };
 
-  programs.fish = {
+  programs.bash = {
     enable = true;
-    plugins = [
-      # {
-      #   name = "fifc";
-      #   src = pkgs.fishPlugins.fifc.src;
-      # }
-      {
-        name = "z";
-        src = pkgs.fishPlugins.z.src;
-      }
-    ];
-    shellInit =
-      ''
-        # fish_vi_key_bindings
-        fish_default_key_bindings
-      ''
-      + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
-        export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
-      '';
+    initExtra = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+      export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+    '';
     shellAliases = {
       "cat" = "bat";
     };
   };
 
+  programs.zoxide.enable = true;
+  programs.thefuck.enable = true;
+  programs.oh-my-posh = {
+    enable = true;
+    useTheme = "catppuccin_mocha";
+  };
+
+  programs.zellij.enableBashIntegration = false;
+
+  # programs.fish = {
+  #   enable = true;
+  #   plugins = [
+  #     # {
+  #     #   name = "fifc";
+  #     #   src = pkgs.fishPlugins.fifc.src;
+  #     # }
+  #     {
+  #       name = "z";
+  #       src = pkgs.fishPlugins.z.src;
+  #     }
+  #   ];
+  #   shellInit =
+  #     ''
+  #       # fish_vi_key_bindings
+  #       fish_default_key_bindings
+  #     ''
+  #     + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+  #       export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+  #     '';
+  #   shellAliases = {
+  #     "cat" = "bat";
+  #   };
+  # };
+
   home.packages =
     with pkgs;
     [
-      thefuck
       dig.dnsutils
       lsof
       comma
diff --git a/hmModules/zellij/default.nix b/hmModules/zellij/default.nix
index 9e75788..b2a7bd3 100644
--- a/hmModules/zellij/default.nix
+++ b/hmModules/zellij/default.nix
@@ -99,7 +99,6 @@ in
 {
   programs.zellij = {
     enable = true;
-    enableFishIntegration = false;
     settings = {
       default_layout = "${layout}";
       pane_frames = false;
diff --git a/modules/ccr/default.nix b/modules/ccr/default.nix
index 31c7859..5f25ab4 100644
--- a/modules/ccr/default.nix
+++ b/modules/ccr/default.nix
@@ -28,7 +28,7 @@ in
 
     shell = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.fish;
+      default = pkgs.bash;
     };
 
     modules = lib.mkOption {