From c8ba38833fd50c428979926d94279828e118ae1d Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Mon, 21 Jul 2025 10:43:49 +0200 Subject: [PATCH] Revert "Large improvement to tmux config" This reverts commit 0a8c6c655359981469958f08ba2c113a953a28a0. --- .gitmodules | 8 ----- _config/tmux/plugins/catppuccin/tmux | 1 - _config/tmux/plugins/kube-tmux | 1 - _config/tmux/tmux.conf | 54 +++++++--------------------- 4 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 .gitmodules delete mode 160000 _config/tmux/plugins/catppuccin/tmux delete mode 160000 _config/tmux/plugins/kube-tmux diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7694b41..0000000 --- a/.gitmodules +++ /dev/null @@ -1,8 +0,0 @@ -[submodule "_config/tmux/plugins/catppuccin/tmux"] - path = _config/tmux/plugins/catppuccin/tmux - url = https://github.com/sambuc/catppuccin-tmux.git -[submodule "_config/tmux/plugins/kube-tmux"] - path = _config/tmux/plugins/kube-tmux - url = git@github.com:sambuc/kube-tmux.git -[submodule "_config/tmux/plugins/catppuccin"] - url = git@github.com:sambuc/catppuccin-tmux.git diff --git a/_config/tmux/plugins/catppuccin/tmux b/_config/tmux/plugins/catppuccin/tmux deleted file mode 160000 index 1795723..0000000 --- a/_config/tmux/plugins/catppuccin/tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 179572333b0473020e45f34fd7c1fd658b2831f4 diff --git a/_config/tmux/plugins/kube-tmux b/_config/tmux/plugins/kube-tmux deleted file mode 160000 index 480a9a5..0000000 --- a/_config/tmux/plugins/kube-tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 480a9a556cc1d5a90494984c04cb787bedf8200f diff --git a/_config/tmux/tmux.conf b/_config/tmux/tmux.conf index 8c62e58..8e2c028 100644 --- a/_config/tmux/tmux.conf +++ b/_config/tmux/tmux.conf @@ -1,54 +1,24 @@ -# Enable 265 colors -# https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-a-256-colour-terminal -set -g default-terminal "tmux-256color" - -#Does not work with Terminal.app? -#set -as terminal-overrides ",*:RGB" - # Might be useful with Windows Terminal +#set -g default-terminal "screen-255color" # Enable xterm scrolling #set -g terminal-overrides 'xterm*:smcup@:rmcup@' # Enable mouse support -#set -g mouse on +set -g mouse on # Highlight pane with activity setw -g monitor-activity on # THEME -#set -g pane-border-lines double -#set -g pane-active-border-style fg=blue +set -g pane-border-lines double +set -g pane-active-border-style fg=blue -# Test using catppuccin -set -g @catppuccin_flavor 'mocha' +set -g status-bg white +set -g status-fg black +set -g status-left-length 30 +set -g status-right-length 60 +set -g status-left '#[fg=black] [#S] #[default]' +set -g status-right '#[fg=black]%H:%M#[default] ' -set -ogq @catppuccin_window_flags "icon" # none, icon, or text -set -ogq @catppuccin_window_flags_icon_last " 󰖰" # - -set -ogq @catppuccin_window_flags_icon_current " 󰖯" # * -set -ogq @catppuccin_window_flags_icon_zoom " 󰁌" # Z -set -ogq @catppuccin_window_flags_icon_mark " 󰃀" # M -set -ogq @catppuccin_window_flags_icon_silent " 󰂛" # ~ -set -ogq @catppuccin_window_flags_icon_activity " 󱅫" # # -set -ogq @catppuccin_window_flags_icon_bell " 󰂞" # ! -# Matches icon order when using `#F` (`#!~[*-]MZ`) -set -ogq @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@catppuccin_window_flags_icon_activity},}##{?window_bell_flag,#{E:@catppuccin_window_flags_icon_bell},}##{?window_silence_flag,#{E:@catppuccin_window_flags_icon_silent},}##{?window_active,#{E:@catppuccin_window_flags_icon_current},}##{?window_last_flag,#{E:@catppuccin_window_flags_icon_last},}##{?window_marked_flag,#{E:@catppuccin_window_flags_icon_mark},}##{?window_zoomed_flag,#{E:@catppuccin_window_flags_icon_zoom},}" - -set -ogq @catppuccin_window_status_style "rounded" # basic, rounded, slanted, custom, or none -set -ogq @catppuccin_window_number_position "right" -set -ogq @catppuccin_window_default_fill "number" -set -ogq @catppuccin_window_default_text "#W" -set -ogq @catppuccin_window_current_fill "number" -set -ogq @catppuccin_window_current_text "#W" -#set -ogq @catppuccin_window_current_text "#{E:@catppuccin_status_application}" -set -ogq @catppuccin_window_text "#W" - -set -ogq @catppuccin_status_background "#000000" -set -ogq @catppuccin_status_fill "icon" - -run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux - -# Ensure that everything on the right side of the status line -# is included. -set -g status-right-length 100 -set -g status-left '#[fg=#{@thm_crust},bg=#{@thm_teal}]#[reverse]#[noreverse]#S#[reverse] ' -set -g status-right '#[bg=#{@thm_blue},fg=#{@thm_crust}]#[reverse]#[noreverse]%H:%M #(/bin/bash $HOME/.config/tmux/plugins/kube-tmux/kube.tmux black red blue)#[bg=#{@thm_blue},fg=#{@thm_crust}]#[reverse]' +setw -g window-status-format '#[fg=blue]#I#[fg=black]:#W#F#[default]' +setw -g window-status-current-format '#[bg=black,fg=white]#I:#W#F#[default]'