Skip to content

Commit

Permalink
feat!: rebalance the colors used, and follow the styleguide
Browse files Browse the repository at this point in the history
  • Loading branch information
kjnsn committed Oct 13, 2024
1 parent c4c60b5 commit d34ae97
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions catppuccin_options_tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions catppuccin_tmux.conf
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"

2 changes: 1 addition & 1 deletion status/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion status/date_time.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion status/directory.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion status/gitmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit d34ae97

Please sign in to comment.