From d34ae978d999387f094c73704f888e49823c17dc Mon Sep 17 00:00:00 2001 From: Kaley Main Date: Sun, 13 Oct 2024 13:40:28 +1100 Subject: [PATCH] feat!: rebalance the colors used, and follow the styleguide --- catppuccin_options_tmux.conf | 4 ++-- catppuccin_tmux.conf | 14 +++++++------- status/application.conf | 2 +- status/date_time.conf | 2 +- status/directory.conf | 2 +- status/gitmux.conf | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/catppuccin_options_tmux.conf b/catppuccin_options_tmux.conf index 7bfd5b28..580b4328 100644 --- a/catppuccin_options_tmux.conf +++ b/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" diff --git a/catppuccin_tmux.conf b/catppuccin_tmux.conf index cbe9fc1a..840bbc79 100644 --- a/catppuccin_tmux.conf +++ b/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}" @@ -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}" diff --git a/status/application.conf b/status/application.conf index d2da2fea..977c09da 100644 --- a/status/application.conf +++ b/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" diff --git a/status/date_time.conf b/status/date_time.conf index 76a284ac..7e9de65e 100644 --- a/status/date_time.conf +++ b/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" diff --git a/status/directory.conf b/status/directory.conf index 4e84fdba..3f30daa5 100644 --- a/status/directory.conf +++ b/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" diff --git a/status/gitmux.conf b/status/gitmux.conf index 7a47bb2e..7987f54a 100644 --- a/status/gitmux.conf +++ b/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"