diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..72fd5c9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tmux/plugins/catppuccin/tmux"]
+	path = tmux/plugins/catppuccin/tmux
+	url = https://github.com/catppuccin/tmux.git
diff --git a/tmux/plugins/catppuccin/tmux b/tmux/plugins/catppuccin/tmux
new file mode 160000
index 0000000..14a546f
--- /dev/null
+++ b/tmux/plugins/catppuccin/tmux
@@ -0,0 +1 @@
+Subproject commit 14a546fb64dc1141e5d02bac2185d8c1fd530d6a
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
new file mode 100644
index 0000000..3c86bb1
--- /dev/null
+++ b/tmux/tmux.conf
@@ -0,0 +1,32 @@
+run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux
+
+
+# Options to make tmux more pleasant
+set -g mouse on
+set -g default-terminal "tmux-256color"
+set -g base-index 1
+set -g renumber-windows on
+
+# Configure the catppuccin plugin
+set -g @catppuccin_flavor "mocha"
+set -g @catppuccin_window_status_style "slanted"
+
+# Load catppuccin
+run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux
+
+# Make the status line pretty and add some modules
+set-option -g status-position top
+set -g status-right-length 100
+set -g status-left-length 100
+
+set -g status-left "#[fg=#{@thm_teal},bg=#{@thm_crust}]#[fg=#{@thm_crust},bg=#{@thm_teal}] #(hostname -s) "
+
+#set -g status-left "#[fg=$thm_green,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_green,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_bg]#(hostname -s) "
+set -g status-right "#{E:@catppuccin_status_application}"
+#set -agF status-right "#{E:@catppuccin_status_cpu}"
+set -ag status-right "#{E:@catppuccin_status_session}"
+#set -ag status-right "#{E:@catppuccin_status_uptime}"
+#set -agF status-right "#{E:@catppuccin_status_battery}"
+
+#run ~/.config/tmux/plugins/tmux-plugins/tmux-cpu/cpu.tmux
+#run ~/.config/tmux/plugins/tmux-plugins/tmux-battery/battery.tmux