From 0e66dee11ee396824668d4db863f1873e9e9243f Mon Sep 17 00:00:00 2001 From: Muhammad Zafar Date: Mon, 18 Nov 2024 09:31:00 +1100 Subject: [PATCH] fix: specify the color for right separator of the status modules to be the same as text bg color (#429) * fix: specify the color for right separator to be the same as text bg color and fix space among windows * Use a space instead of a vertical block char --------- Co-authored-by: Kaley Main --- catppuccin_options_tmux.conf | 2 +- tests/application_module_expected.txt | 2 +- tests/battery_module_expected.txt | 2 +- tests/cpu_module_expected.txt | 2 +- utils/status_module.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/catppuccin_options_tmux.conf b/catppuccin_options_tmux.conf index a73c7678..b717acd7 100644 --- a/catppuccin_options_tmux.conf +++ b/catppuccin_options_tmux.conf @@ -63,7 +63,7 @@ set -ogq @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@cat # Status line options set -ogq @catppuccin_status_left_separator "" set -ogq @catppuccin_status_middle_separator "" -set -ogq @catppuccin_status_right_separator "#[reverse]█#[noreverse]" +set -ogq @catppuccin_status_right_separator " " set -ogq @catppuccin_status_connect_separator "yes" # yes, no # Maintain backwards compatibility. Use @catppuccin_status_module_bg_color if it is set. diff --git a/tests/application_module_expected.txt b/tests/application_module_expected.txt index 4281918c..75f40826 100644 --- a/tests/application_module_expected.txt +++ b/tests/application_module_expected.txt @@ -1 +1 @@ -@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[reverse]█#[noreverse] \ No newline at end of file +@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[fg=#313244] diff --git a/tests/battery_module_expected.txt b/tests/battery_module_expected.txt index 8af68077..c29e485f 100644 --- a/tests/battery_module_expected.txt +++ b/tests/battery_module_expected.txt @@ -1 +1 @@ -@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[reverse]█#[noreverse] +@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[fg=#313244] diff --git a/tests/cpu_module_expected.txt b/tests/cpu_module_expected.txt index 166c1a0d..61695f5a 100644 --- a/tests/cpu_module_expected.txt +++ b/tests/cpu_module_expected.txt @@ -1 +1 @@ -E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[reverse]█#[noreverse] +E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[fg=#{cpu_bg_color}] diff --git a/utils/status_module.conf b/utils/status_module.conf index 3d0f1ec3..fc725787 100644 --- a/utils/status_module.conf +++ b/utils/status_module.conf @@ -41,7 +41,7 @@ set -agF "@catppuccin_status_${MODULE_NAME}" \ set -ag "@catppuccin_status_${MODULE_NAME}" "#{E:@catppuccin_${MODULE_NAME}_text}" -set -agF "@catppuccin_status_${MODULE_NAME}" "#{@_ctp_connect_style}#{@catppuccin_status_right_separator}" +set -agF "@catppuccin_status_${MODULE_NAME}" "#[fg=#{@_ctp_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}" set -ug @_ctp_connect_style set -ug @_ctp_module_text_bg