Merge pull request #291 from djensenius/fixes

some fixes

Author: djensenius

tmux/custom_modules/ctp_speedtest.conf

@@ -5,6 +5,7 @@ set-option -gq "@catppuccin_${MODULE_NAME}_icon" '󰓅 '
 set-option -gq "@catppuccin_${MODULE_NAME}_color" '#{E:@thm_yellow}'
 set-option -gq "@catppuccin_${MODULE_NAME}_text" '#($HOME/.config/tmux/plugins/tmux-speedtest/scripts/speedtest_status.sh)'
 
-source-file -F '/Users/djensenius/.config/tmux/plugins/tmux/utils/status_module.conf'
+if-shell "test -f $HOME/.config/tmux/plugins/tmux/utils/status_module.conf" \
+  "source-file -F $HOME/.config/tmux/plugins/tmux/utils/status_module.conf"
 
 set -g @catppuccin_status_ctp_speedtest "#[fg=#{E:@thm_yellow}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}#[fg=#{E:@thm_crust},bg=#{E:@thm_yellow}]#{@catppuccin_ctp_speedtest_icon}#{@catppuccin_status_middle_separator}#[fg=#{E:@thm_fg},bg=#{E:@catppuccin_status_module_text_bg}]#{E:@catppuccin_ctp_speedtest_text}#[fg=#{E:@catppuccin_status_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}"

tmux/post-catppuccin.conf

@@ -3,7 +3,7 @@ set -g @battery_bar_content "#[fg=#{E:@thm_lavender}]#{@_ctp_connect_style}#{@ca
 set -g @catppuccin_status_battery "#{?#(battery_hearts | xargs),#{E:@battery_bar_content},}"
 
 # Load outdated packages module if catppuccin is available
-if-shell '[ -f ~/.config/tmux/plugins/tmux/utils/status_module.conf ]' \
+if-shell '[ -f ~/.config/tmux/status_module.conf ]' \
   'source-file ~/.config/tmux/plugins/tmux-outdated-packages/status/outdated_packages.conf'
 
 # Override outdated packages to hide when empty

tmux/status_module.conf

@@ -0,0 +1,47 @@
+# vim:set ft=tmux:
+
+# Embedded style that ensures that modules look "connected"
+# when required.
+set -gqF @_ctp_connect_style \
+  "#{?#{==:#{@catppuccin_status_connect_separator},yes},,#[bg=default]}"
+
+# There are four colors involved:
+#
+# - Icon
+#   - fg: @catppuccin_status_[module]_icon_fg [default = crust]
+#   - bg: @catppuccin_status_[module]_icon_bg [required]
+# - Text
+#   - fg: @catppuccin_status_[module]_text_fg [default = foreground]
+#   - bg: @catppuccin_status_[module]_text_bg [default = @catppuccin_status_module_text_bg]
+
+set -ogqF "@catppuccin_status_${MODULE_NAME}_icon_fg" "#{E:@thm_crust}"
+set -ogqF "@catppuccin_status_${MODULE_NAME}_text_fg" "#{E:@thm_fg}"
+
+%if "#{==:#{@catppuccin_status_${MODULE_NAME}_icon_bg},}"
+  set -gqF "@catppuccin_status_${MODULE_NAME}_icon_bg" "#{@catppuccin_${MODULE_NAME}_color}"
+%endif
+
+%if "#{==:#{@catppuccin_status_${MODULE_NAME}_text_bg},}"
+  set -gqF @_ctp_module_text_bg "#{E:@catppuccin_status_module_text_bg}"
+%else
+  set -gqF @_ctp_module_text_bg "#{@catppuccin_status_${MODULE_NAME}_text_bg}"
+%endif
+
+set -gF "@catppuccin_status_${MODULE_NAME}" \
+  "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}"
+
+set -agF "@catppuccin_status_${MODULE_NAME}" \
+  "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_fg},bg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@catppuccin_${MODULE_NAME}_icon}"
+
+set -agF "@catppuccin_status_${MODULE_NAME}" \
+  "#{@catppuccin_status_middle_separator}"
+
+set -agF "@catppuccin_status_${MODULE_NAME}" \
+  "#[fg=#{@catppuccin_status_${MODULE_NAME}_text_fg},bg=#{@_ctp_module_text_bg}]"
+
+set -ag "@catppuccin_status_${MODULE_NAME}" "#{E:@catppuccin_${MODULE_NAME}_text}"
+
+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

tmux/tmux.conf

@@ -77,6 +77,8 @@ set -g @speedtest_provider 'cloudflare'
 set -g @speedtest_icon_running '󰔟'
 set -g @speedtest_icon_idle ''
 set -g @speedtest_format ' #{download}  #{upload} 󰛳 #{ping}'
+set -g @speedtest_detail_key 'T'
+set -g @speedtest_compare_key 'C'
 source -F ~/.config/tmux/custom_modules/ctp_speedtest.conf
 
 # ============== Outdated Packages Plugin ==========