diff --git a/flake.lock b/flake.lock
index 1b4419e..9f0414c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1734734291,
+        "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "nixpkgs": [
@@ -393,6 +408,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "firefox-addons": "firefox-addons",
         "hardware": "hardware",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 1ee8610..1ab459d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Catppuccin theme
+    catppuccin.url = "github:catppuccin/nix";
+
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
diff --git a/home/global/default.nix b/home/global/default.nix
index cd772ba..d711de3 100644
--- a/home/global/default.nix
+++ b/home/global/default.nix
@@ -1,5 +1,5 @@
-{ outputs, lib, config, pkgs, ... }: {
-  imports = [ ../modules/tui ]
+{ inputs, outputs, lib, config, pkgs, ... }: {
+  imports = [ ../modules/tui inputs.catppuccin.homeManagerModules.catppuccin ]
     ++ (builtins.attrValues outputs.homeManagerModules);
 
   nixpkgs = {
@@ -31,5 +31,10 @@
 
   };
 
+  catppuccin = {
+    flavor = "mocha";
+    enable = true;
+  };
+
   targets.genericLinux.enable = true;
 }
diff --git a/home/modules/gui/kitty.nix b/home/modules/gui/kitty.nix
index 99123c0..e98d127 100644
--- a/home/modules/gui/kitty.nix
+++ b/home/modules/gui/kitty.nix
@@ -16,7 +16,6 @@
       visual_bell_duration = "1.0 ease-in-out";
     };
     shellIntegration.enableFishIntegration = true;
-    themeFile = "Catppuccin-Mocha";
   };
 }
 
diff --git a/home/modules/tui/shell/default.nix b/home/modules/tui/shell/default.nix
index 74e7c4f..03a517e 100644
--- a/home/modules/tui/shell/default.nix
+++ b/home/modules/tui/shell/default.nix
@@ -16,9 +16,6 @@
 
     fzf.enable = true;
 
-    bat = {
-      enable = true;
-      config = { theme = "gruvbox-dark"; };
-    };
+    bat = { enable = true; };
   };
 }
diff --git a/home/modules/tui/tmux.nix b/home/modules/tui/tmux.nix
index bca51b8..daab9cc 100644
--- a/home/modules/tui/tmux.nix
+++ b/home/modules/tui/tmux.nix
@@ -1,5 +1,15 @@
 { pkgs, ... }: {
 
+  catppuccin.tmux.extraConfig = ''
+    # catppuccin theme options
+    set -g @catppuccin_status_modules_left "host"
+    set -g @catppuccin_status_modules_right "application cpu weather session"
+    set -g @tmux-weather-units "u"
+    run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux
+    run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
+    run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/tmux-weather.tmux
+  '';
+
   programs.tmux = {
     enable = true;
     aggressiveResize = true;
@@ -12,17 +22,8 @@
     keyMode = "vi";
     mouse = true;
     shell = "${pkgs.fish}/bin/fish";
-    plugins = with pkgs.tmuxPlugins; [ catppuccin cpu weather ];
+    plugins = with pkgs.tmuxPlugins; [ cpu weather ];
     extraConfig = ''
-      # catppuccin theme options
-      set -g @catppuccin_flavour "mocha"
-      set -g @catppuccin_status_modules_left "host"
-      set -g @catppuccin_status_modules_right "application cpu weather session"
-      set -g @tmux-weather-units "u"
-      run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux
-      run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
-      run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/tmux-weather.tmux
-
       # new panes inherit current working directory
       bind '%' split-window -h -c '#{pane_current_path}'
       bind '"' split-window -v -c '#{pane_current_path}'