feat!: rebalance the colors used, and follow the styleguide

Author: kjnsn

catppuccin_options_tmux.conf

@@ -8,7 +8,7 @@ set -ogq @catppuccin_flavor "mocha"
 set -ogq @catppuccin_status_background "default"
 
 # Menu styling options
-set -ogq @catppuccin_menu_selected_style "fg=#{@thm_surface_0},bg=#{@thm_yellow}"
+set -ogq @catppuccin_menu_selected_style "fg=#{@thm_fg},bold,bg=#{@thm_overlay_0}"
 
 # Pane styling options
 set -ogq @catppuccin_pane_status_enabled "no" # set to "yes" to enable
@@ -32,7 +32,7 @@ set -ogq @catppuccin_window_default_background "#{@thm_overlay_2}"
 set -ogq @catppuccin_window_default_text " #T"
 set -ogq @catppuccin_window_current_fill "number"
 set -ogq @catppuccin_window_current_color "#{@thm_surface_1}"
-set -ogq @catppuccin_window_current_background "#{@thm_peach}"
+set -ogq @catppuccin_window_current_background "#{@thm_mauve}"
 set -ogq @catppuccin_window_current_text " #T"
 set -ogq @catppuccin_window_number_position "left"
 set -ogq @catppuccin_window_status "none"

catppuccin_tmux.conf

@@ -1,10 +1,10 @@
 source -F "#{d:current_file}/themes/catppuccin_#{@catppuccin_flavor}_tmux.conf"
 
 %if "#{==:#{@catppuccin_status_background},default}"
-  set -gF @_ctp_status_bg "#{@thm_surface_1}"
+  set -gF @_ctp_status_bg "#{@thm_mantle}"
   set -gF status-style "bg=#{@_ctp_status_bg},fg=#{@thm_fg}"
 
-  %hidden CTP_MESSAGE_BACKGROUND="#{@thm_surface_0}"
+  %hidden CTP_MESSAGE_BACKGROUND="#{@thm_overlay_0}"
 %elif "#{==:#{@catppuccin_status_background},none}"
   set -g status-style "default"
   set -g @_ctp_status_bg "none"
@@ -35,8 +35,8 @@ source -F "#{d:current_file}/status/user.conf"
 source -F "#{d:current_file}/status/weather.conf"
 
 # messages
-set -gF message-style "fg=#{@thm_sky},bg=$CTP_MESSAGE_BACKGROUND,align=centre"
-set -gF message-command-style "fg=#{@thm_sky},bg=$CTP_MESSAGE_BACKGROUND,align=centre"
+set -gF message-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre"
+set -gF message-command-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre"
 
 # menu
 %if "#{>=:#{version},3.4}"
@@ -154,7 +154,7 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right
 
 # window status
 %if "#{!=:#{@catppuccin_window_status_style},none}"
-  set -gF window-status-activity-style "bg=#{@thm_yellow},fg=#{@thm_crust}"
+  set -gF window-status-activity-style "bg=#{@thm_lavender},fg=#{@thm_crust}"
   set -gF window-status-bell-style "bg=#{@thm_yellow},fg=#{@thm_crust}"
 
   # "internal" variables are kept as @_ctp_w_.*
@@ -311,7 +311,7 @@ set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right
   set -ug @_ctp_w_flags
 %endif
 
-# modes
-set -wF mode-style "fg=#{@thm_pink},bg=#{@thm_surface_2},bold"
-set -wF clock-mode-colour "#{@thm_blue}"
+# Mode style. This is used for copy mode highlighting to style the current selection.
+set -gF mode-style "bg=#{@thm_surface_0},bold"
+set -gF clock-mode-colour "#{@thm_blue}"
 

status/application.conf

@@ -2,7 +2,7 @@
 %hidden MODULE_NAME="application"
 
 set -ogq "@catppuccin_${MODULE_NAME}_icon" " "
-set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_pink}"
+set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_maroon}"
 set -ogq "@catppuccin_${MODULE_NAME}_text" "#{pane_current_command}"
 
 source -F "#{d:current_file}/../utils/status_module.conf"

status/date_time.conf

@@ -2,7 +2,7 @@
 %hidden MODULE_NAME="date_time"
 
 set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰃰 "
-set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_blue}"
+set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_sapphire}"
 set -ogq "@catppuccin_${MODULE_NAME}_text" "%Y-%m-%d %H:%M"
 
 source -F "#{d:current_file}/../utils/status_module.conf"

status/directory.conf

@@ -2,7 +2,7 @@
 %hidden MODULE_NAME="directory"
 
 set -ogq "@catppuccin_${MODULE_NAME}_icon" " "
-set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_pink}"
+set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_rosewater}"
 set -ogq "@catppuccin_${MODULE_NAME}_text" "#{b:pane_current_path}"
 
 source -F "#{d:current_file}/../utils/status_module.conf"

status/gitmux.conf

@@ -3,7 +3,7 @@
 
 # Requires https://github.com/arl/gitmux
 set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰊢 "
-set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{@thm_green}"
+set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{@thm_teal}"
 set -gq "@catppuccin_${MODULE_NAME}_text" '#(gitmux "#{pane_current_path}")'
 
 source -F "#{d:current_file}/../utils/status_module.conf"

tests/application_module_expected.txt

@@ -1 +1 @@
-@catppuccin_status_application #[fg=#f5c2e7,nobold,nounderscore,noitalics]#[fg=#11111b,bg=#f5c2e7] #[fg=#f5c2e7,bg=#45475a]#[fg=#cdd6f4] #{E:@catppuccin_application_text}#[fg=#45475a]█
+@catppuccin_status_application #[fg=#eba0ac,nobold,nounderscore,noitalics]#[fg=#11111b,bg=#eba0ac] #[fg=#eba0ac,bg=#181825]#[fg=#cdd6f4] #{E:@catppuccin_application_text}#[fg=#181825]█

tests/battery_module_expected.txt

@@ -1 +1 @@
-@catppuccin_status_battery #[fg=#f9e2af,nobold,nounderscore,noitalics]#[fg=#11111b,bg=#f9e2af]#{l:#{battery_icon}} #[fg=#f9e2af,bg=#45475a]#[fg=#cdd6f4] #{E:@catppuccin_battery_text}#[fg=#45475a]█
+@catppuccin_status_battery #[fg=#f9e2af,nobold,nounderscore,noitalics]#[fg=#11111b,bg=#f9e2af]#{l:#{battery_icon}} #[fg=#f9e2af,bg=#181825]#[fg=#cdd6f4] #{E:@catppuccin_battery_text}#[fg=#181825]█

tests/cpu_module_expected.txt

@@ -1 +1 @@
-E:@catppuccin_status_cpu #[fg=#{cpu_bg_color},nobold,nounderscore,noitalics]#[fg=#11111b,bg=#{cpu_bg_color}] #[fg=#{cpu_bg_color},bg=#45475a]#[fg=#cdd6f4] #{cpu_percentage}#[fg=#45475a]█
+E:@catppuccin_status_cpu #[fg=#{cpu_bg_color},nobold,nounderscore,noitalics]#[fg=#11111b,bg=#{cpu_bg_color}] #[fg=#{cpu_bg_color},bg=#181825]#[fg=#cdd6f4] #{cpu_percentage}#[fg=#181825]█

tests/default_options_expected.txt

@@ -1,3 +1,3 @@
 @catppuccin_flavor mocha
-@catppuccin_menu_selected_style fg=#{@thm_surface_0},bg=#{@thm_yellow}
+@catppuccin_menu_selected_style fg=#{@thm_fg},bold,bg=#{@thm_overlay_0}
 @catppuccin_pane_active_border_style ##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}}