diff --git a/home-manager/home-fish.nix b/home-manager/home-fish.nix
index 5c4bef7..3067b4a 100644
--- a/home-manager/home-fish.nix
+++ b/home-manager/home-fish.nix
@@ -5,6 +5,7 @@ pkgs:
         nsh = "nix-shell --command fish";
         cd = "z";
       };
+
 #    interactiveShellInit = ''
 #      function fish_prompt
 #        set -l last_status $status
diff --git a/home-manager/home-tmux.nix b/home-manager/home-tmux.nix
index 3f3e9b6..1c88e94 100644
--- a/home-manager/home-tmux.nix
+++ b/home-manager/home-tmux.nix
@@ -5,7 +5,10 @@ pkgs: {
     escapeTime = 0;
     keyMode = "vi";
     mouse = true;
-    plugins = [pkgs.tmuxPlugins.catppuccin];
+    plugins = [{
+        plugin = pkgs.tmuxPlugins.catppuccin;
+        extraConfig = "set -g @catppuccin_window_tabs_enabled on";
+    }];
     shortcut = "Space";
     tmuxinator.enable = true;
     extraConfig = ''
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a43695b..0306aa2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -32,6 +32,16 @@
         } + /themes/macchiato.yml;
     };
 
+    xdg.configFile."fish/themes/Catppuccin Macchiato.theme" = {
+          enable = true;
+          source = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "fish";
+            rev = "91e6d6721362be05a5c62e235ed8517d90c567c9";
+            sha256 = "l9V7YMfJWhKDL65dNbxaddhaM6GJ0CFZ6z+4R6MJwBA=";
+          } + "/themes/Catppuccin Macchiato.theme";
+    };
+
     home.packages = [
         # pkgs.apacheKafka
         pkgs.aria
diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua
index 0dff871..bf06b84 100644
--- a/nvim/lua/plugins/plugins.lua
+++ b/nvim/lua/plugins/plugins.lua
@@ -35,15 +35,15 @@ return {
   --   "rafamadriz/friendly-snippets",
   --   enabled = false,
   -- },
-  {
-    "folke/noice.nvim",
-    enabled = false,
-    opts = {
-      cmdline = {
-        view = "cmdline",
-      },
-    },
-  },
+  -- {
+  --   "folke/noice.nvim",
+  --   enabled = false,
+  --   opts = {
+  --     cmdline = {
+  --       view = "cmdline",
+  --     },
+  --   },
+  -- },
   {
     "echasnovski/mini.pairs",
     enabled = false,