diff --git a/sway_old/config b/old_configs/sway_old/config
similarity index 100%
rename from sway_old/config
rename to old_configs/sway_old/config
diff --git a/tmux/.tmux.conf b/old_configs/tmux/.tmux.conf
similarity index 100%
rename from tmux/.tmux.conf
rename to old_configs/tmux/.tmux.conf
diff --git a/tmux/.tmux.conf.local b/old_configs/tmux/.tmux.conf.local
similarity index 100%
rename from tmux/.tmux.conf.local
rename to old_configs/tmux/.tmux.conf.local
diff --git a/tmux/.tmux b/tmux/.tmux
deleted file mode 160000
index fd1bbb5..0000000
--- a/tmux/.tmux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd1bbb56148101f4b286ddafd98f2ac2dcd69cd8
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
new file mode 100644
index 0000000..4cddc03
--- /dev/null
+++ b/tmux/tmux.conf
@@ -0,0 +1,44 @@
+set-option -sa terminal-overrides ",xterm*:Tc"
+set -g mouse on
+
+set -g prefix C-Space
+bind C-Space send-prefix
+
+# Shift Alt vim keys to switch windows
+bind -n M-H previous-window
+bind -n M-L next-window
+
+# Window panes
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# Catppuccin configuration
+set -g @catppuccin_flavor 'macchiato'
+set -g @catppuccin_window_left_separator ""
+set -g @catppuccin_window_right_separator " "
+set -g @catppuccin_window_middle_separator "█ "
+set -g @catppuccin_window_number_position "left"
+
+set -g @catppuccin_window_default_fill "number"
+set -g @catppuccin_window_default_text "#W"
+
+set -g @catppuccin_window_current_fill "number"
+set -g @catppuccin_window_current_text "#W"
+
+set -g @catppuccin_status_modules_right "directory user session"
+set -g @catppuccin_status_left_separator  " "
+set -g @catppuccin_status_right_separator ""
+set -g @catppuccin_status_fill "icon"
+set -g @catppuccin_status_connect_separator "no"
+
+set -g @catppuccin_directory_text "#{pane_current_path}"
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'catppuccin/tmux'
+set -g @plugin 'tmux-plugins/tmux-yank'
+
+run '~/.tmux/plugins/tpm/tpm'