feat(overrides): Add additional prefix/suffix support

Allows a higher-level prefixes and suffixes by allowing it directly on
`@theme-*` options, which are what are set directly against Tmux's
options.

These are the prefix/suffix options added:

- `@theme-status-left-prefix`
- `@theme-status-left-suffix`
- `@theme-status-right-prefix`
- `@theme-status-right-suffix`
- `@theme-window-status-current-prefix`
- `@theme-window-status-current-suffix`
- `@theme-window-status-prefix`
- `@theme-window-status-suffix`

As they are applied on the highest level, it means they work on ALL
themes, including the `default` theme.

The `@themepack-*` prefix/suffix options still work too, but only for
themes that uses them and have three separate text areas on the left and
right status.
This commit is contained in:
2019-12-22 23:07:10 +00:00
parent bb24b3981f
commit 6f3a16ae58
56 changed files with 323 additions and 141 deletions

View File

@@ -1,17 +1,33 @@
# Apply theme options
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
set -gF display-panes-colour "#{@theme-display-panes-colour}"
set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
set -gF status-interval "#{@theme-status-interval}"
set -gF status-justify "#{@theme-status-justify}"
set -gF status-left "#{@theme-status-left}"
set -gF status-left-length "#{@theme-status-left-length}"
set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
set -gF status-right "#{@theme-status-right}"
set -gF status-right-length "#{@theme-status-right-length}"
set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
# Customizable prefixes and suffixes for @theme-* format options
set -goq @theme-status-left-prefix ""
set -goq @theme-status-left-suffix ""
set -goq @theme-status-right-prefix ""
set -goq @theme-status-right-suffix ""
set -goq @theme-window-status-current-prefix ""
set -goq @theme-window-status-current-suffix ""
set -goq @theme-window-status-prefix ""
set -goq @theme-window-status-suffix ""
# Apply prefixes and suffixes to @theme-* format options
set -gqF @theme-status-left "#{@theme-status-left-prefix}#{@theme-status-left}#{@theme-status-left-suffix}"
set -gqF @theme-status-right "#{@theme-status-right-prefix}#{@theme-status-right}#{@theme-status-right-suffix}"
set -gqF @theme-window-status-current-format "#{@theme-window-status-current-prefix}#{@theme-window-status-current-format}#{@theme-window-status-current-suffix}"
set -gqF @theme-window-status-format "#{@theme-window-status-prefix}#{@theme-window-status-format}#{@theme-window-status-suffix}"
# Apply @theme-* options to Tmux
set -gF display-panes-active-colour "#{@theme-display-panes-active-colour}"
set -gF display-panes-colour "#{@theme-display-panes-colour}"
set -gF message-command-style "fg=#{@theme-message-command-fg},bg=#{@theme-message-command-bg}"
set -gF message-style "fg=#{@theme-message-fg},bg=#{@theme-message-bg}"
set -gF status-interval "#{@theme-status-interval}"
set -gF status-justify "#{@theme-status-justify}"
set -gF status-left "#{@theme-status-left}"
set -gF status-left-length "#{@theme-status-left-length}"
set -gF status-left-style "fg=#{@theme-status-left-fg},bg=#{@theme-status-left-bg}"
set -gF status-right "#{@theme-status-right}"
set -gF status-right-length "#{@theme-status-right-length}"
set -gF status-right-style "fg=#{@theme-status-right-fg},bg=#{@theme-status-right-bg}"
set -gF status-style "fg=#{@theme-status-fg},bg=#{@theme-status-bg}"
set -gwF clock-mode-colour "#{@theme-clock-mode-colour}"
set -gwF clock-mode-style "#{@theme-clock-mode-style}"
set -gwF mode-style "fg=#{@theme-mode-fg},bg=#{@theme-mode-bg}"

View File

@@ -1,4 +1,22 @@
# Themepack format options - combine prefixes, formats, and suffixes
# Customizable prefixes and suffixes for @themepack-* format options
set -goq @themepack-status-left-area-left-prefix ""
set -goq @themepack-status-left-area-left-suffix ""
set -goq @themepack-status-left-area-middle-prefix ""
set -goq @themepack-status-left-area-middle-suffix ""
set -goq @themepack-status-left-area-right-prefix ""
set -goq @themepack-status-left-area-right-suffix ""
set -goq @themepack-status-right-area-left-prefix ""
set -goq @themepack-status-right-area-left-suffix ""
set -goq @themepack-status-right-area-middle-prefix ""
set -goq @themepack-status-right-area-middle-suffix ""
set -goq @themepack-status-right-area-right-prefix ""
set -goq @themepack-status-right-area-right-suffix ""
set -goq @themepack-window-status-current-prefix ""
set -goq @themepack-window-status-current-suffix ""
set -goq @themepack-window-status-prefix ""
set -goq @themepack-window-status-suffix ""
# Apply prefixes and suffixes to @themepack-* format options
set -gqF @themepack-status-left-area-left-format "#{@themepack-status-left-area-left-prefix}#{@themepack-status-left-area-left-format}#{@themepack-status-left-area-left-suffix}"
set -gqF @themepack-status-left-area-middle-format "#{@themepack-status-left-area-middle-prefix}#{@themepack-status-left-area-middle-format}#{@themepack-status-left-area-middle-suffix}"
set -gqF @themepack-status-left-area-right-format "#{@themepack-status-left-area-right-prefix}#{@themepack-status-left-area-right-format}#{@themepack-status-left-area-right-suffix}"

View File

@@ -2,33 +2,17 @@
# Basic theme
#
# Themepack format options - Overrideable
# Themepack format options
set -goq @themepack-status-left-area-left-format "#S"
set -goq @themepack-status-left-area-left-prefix ""
set -goq @themepack-status-left-area-left-suffix ""
set -goq @themepack-status-left-area-middle-format "#I"
set -goq @themepack-status-left-area-middle-prefix ""
set -goq @themepack-status-left-area-middle-suffix ""
set -goq @themepack-status-left-area-right-format "#P"
set -goq @themepack-status-left-area-right-prefix ""
set -goq @themepack-status-left-area-right-suffix ""
set -goq @themepack-status-right-area-left-format "#H"
set -goq @themepack-status-right-area-left-prefix ""
set -goq @themepack-status-right-area-left-suffix ""
set -goq @themepack-status-right-area-middle-format "%H:%M:%S"
set -goq @themepack-status-right-area-middle-prefix ""
set -goq @themepack-status-right-area-middle-suffix ""
set -goq @themepack-status-right-area-right-format "%d-%b-%y"
set -goq @themepack-status-right-area-right-prefix ""
set -goq @themepack-status-right-area-right-suffix ""
set -goq @themepack-window-status-current-format "#I:#W#F"
set -goq @themepack-window-status-current-prefix ""
set -goq @themepack-window-status-current-suffix ""
set -goq @themepack-window-status-format "#I:#W#F"
set -goq @themepack-window-status-prefix ""
set -goq @themepack-window-status-suffix ""
#= include "_formats_combine"
#= include "_themepack-options-affixes"
# Theme options
set -goq @theme-clock-mode-colour red

View File

@@ -1,7 +1,7 @@
set -goq @powerline-color-black-1 black
set -goq @powerline-color-grey-1 colour233
set -goq @powerline-color-grey-2 colour235
set -goq @powerline-color-grey-3 colour238
set -goq @powerline-color-grey-4 colour240
set -goq @powerline-color-grey-5 colour243
set -goq @powerline-color-grey-6 colour245
set -goq @powerline-color-black-1 black
set -goq @powerline-color-grey-1 colour233
set -goq @powerline-color-grey-2 colour235
set -goq @powerline-color-grey-3 colour238
set -goq @powerline-color-grey-4 colour240
set -goq @powerline-color-grey-5 colour243
set -goq @powerline-color-grey-6 colour245

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour24
set -goq @powerline-color-main-2 colour33
set -goq @powerline-color-main-3 colour31
set -goq @powerline-color-main-1 colour24
set -goq @powerline-color-main-2 colour33
set -goq @powerline-color-main-3 colour31

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour39
set -goq @powerline-color-main-2 colour81
set -goq @powerline-color-main-3 colour75
set -goq @powerline-color-main-1 colour39
set -goq @powerline-color-main-2 colour81
set -goq @powerline-color-main-3 colour75

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour245
set -goq @powerline-color-main-2 colour250
set -goq @powerline-color-main-3 colour245
set -goq @powerline-color-main-1 colour245
set -goq @powerline-color-main-2 colour250
set -goq @powerline-color-main-3 colour245

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour100
set -goq @powerline-color-main-2 colour190
set -goq @powerline-color-main-3 colour107
set -goq @powerline-color-main-1 colour100
set -goq @powerline-color-main-2 colour190
set -goq @powerline-color-main-3 colour107

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour125
set -goq @powerline-color-main-2 colour127
set -goq @powerline-color-main-3 colour129
set -goq @powerline-color-main-1 colour125
set -goq @powerline-color-main-2 colour127
set -goq @powerline-color-main-3 colour129

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour130
set -goq @powerline-color-main-2 colour166
set -goq @powerline-color-main-3 colour130
set -goq @powerline-color-main-1 colour130
set -goq @powerline-color-main-2 colour166
set -goq @powerline-color-main-3 colour130

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour90
set -goq @powerline-color-main-2 colour129
set -goq @powerline-color-main-3 colour141
set -goq @powerline-color-main-1 colour90
set -goq @powerline-color-main-2 colour129
set -goq @powerline-color-main-3 colour141

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour88
set -goq @powerline-color-main-2 colour160
set -goq @powerline-color-main-3 colour124
set -goq @powerline-color-main-1 colour88
set -goq @powerline-color-main-2 colour160
set -goq @powerline-color-main-3 colour124

View File

@@ -1,3 +1,3 @@
set -goq @powerline-color-main-1 colour227
set -goq @powerline-color-main-2 colour227
set -goq @powerline-color-main-3 colour229
set -goq @powerline-color-main-1 colour227
set -goq @powerline-color-main-2 colour227
set -goq @powerline-color-main-3 colour229

View File

@@ -1,27 +0,0 @@
# Themepack format options - Overrideable
set -goq @themepack-status-left-area-left-format "#S"
set -goq @themepack-status-left-area-left-prefix ""
set -goq @themepack-status-left-area-left-suffix ""
set -goq @themepack-status-left-area-middle-format "#(whoami)"
set -goq @themepack-status-left-area-middle-prefix ""
set -goq @themepack-status-left-area-middle-suffix ""
set -goq @themepack-status-left-area-right-format "#I:#P"
set -goq @themepack-status-left-area-right-prefix ""
set -goq @themepack-status-left-area-right-suffix ""
set -goq @themepack-status-right-area-left-format "%H:%M:%S"
set -goq @themepack-status-right-area-left-prefix ""
set -goq @themepack-status-right-area-left-suffix ""
set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
set -goq @themepack-status-right-area-middle-prefix ""
set -goq @themepack-status-right-area-middle-suffix ""
set -goq @themepack-status-right-area-right-format "#H"
set -goq @themepack-status-right-area-right-prefix ""
set -goq @themepack-status-right-area-right-suffix ""
set -goq @themepack-window-status-current-format "#I:#W#F"
set -goq @themepack-window-status-current-prefix ""
set -goq @themepack-window-status-current-suffix ""
set -goq @themepack-window-status-format "#I:#W#F"
set -goq @themepack-window-status-prefix ""
set -goq @themepack-window-status-suffix ""
#= include "_formats_combine"

View File

@@ -1,7 +1,4 @@
set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
set -goqF @theme-window-status-current-bg "#{@powerline-color-main-1}"
set -goqF @theme-window-status-current-fg "#{@powerline-color-black-1}"
set -goq @theme-window-status-separator ""
set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
set -goqF @theme-window-status-current-format " #{@themepack-window-status-current-format} "

View File

@@ -1,7 +1,5 @@
set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
set -goqF @theme-window-status-current-bg "#{@powerline-color-black-1}"
set -goqF @theme-window-status-current-fg "#{@powerline-color-main-2}"
set -goq @theme-window-status-separator ""
set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
set -goqF @theme-window-status-current-format "#[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg}]#[fg=#{@theme-window-status-current-fg},nobold] #{@themepack-window-status-current-format} #[fg=#{@theme-status-bg},bg=#{@theme-window-status-current-bg},nobold]"

View File

@@ -25,3 +25,6 @@ set -goqF @theme-status-right "#[fg=#{@powerline-status-right-area-left-bg},bg=#
set -goqF @theme-status-right-bg "#{@powerline-status-right-bg}"
set -goqF @theme-status-right-fg "#{@powerline-status-right-fg}"
set -goq @theme-status-right-length 150
set -goqF @theme-window-status-activity-bg "#{@theme-status-bg}"
set -goqF @theme-window-status-activity-fg "#{@powerline-color-activity-1}"
set -goq @theme-window-status-separator ""

View File

@@ -0,0 +1,11 @@
# Themepack format options
set -goq @themepack-status-left-area-left-format "#S"
set -goq @themepack-status-left-area-middle-format "#(whoami)"
set -goq @themepack-status-left-area-right-format "#I:#P"
set -goq @themepack-status-right-area-left-format "%H:%M:%S"
set -goq @themepack-status-right-area-middle-format "%d-%b-%y"
set -goq @themepack-status-right-area-right-format "#H"
set -goq @themepack-window-status-current-format "#I:#W#F"
set -goq @themepack-window-status-format "#I:#W#F"
#= include "_themepack-options-affixes"

View File

@@ -6,6 +6,6 @@ set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
#= include "powerline/_powerline-options"
#= include "powerline/_theme-options"
#= include "powerline/_window-status-block"
#= include "powerline/_theme-options-block"
#= include "_apply"

View File

@@ -2,7 +2,7 @@
# Powerline Blue Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/blue"

View File

@@ -2,7 +2,7 @@
# Powerline Cyan Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/cyan"

View File

@@ -2,7 +2,7 @@
# Powerline Gray Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/gray"

View File

@@ -2,7 +2,7 @@
# Powerline Green Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/green"

View File

@@ -2,7 +2,7 @@
# Powerline Magenta Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/magenta"

View File

@@ -2,7 +2,7 @@
# Powerline Orange Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/orange"

View File

@@ -2,7 +2,7 @@
# Powerline Purple Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/purple"

View File

@@ -2,7 +2,7 @@
# Powerline Red Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/red"

View File

@@ -2,7 +2,7 @@
# Powerline Yellow Block - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/yellow"

View File

@@ -3,6 +3,6 @@
#= include "powerline/_powerline-options"
#= include "powerline/_theme-options"
#= include "powerline/_window-status-default"
#= include "powerline/_theme-options-default"
#= include "_apply"

View File

@@ -2,7 +2,7 @@
# Powerline Blue - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/blue"

View File

@@ -2,7 +2,7 @@
# Powerline Cyan - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/cyan"

View File

@@ -2,7 +2,7 @@
# Powerline Gray - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/gray"

View File

@@ -2,7 +2,7 @@
# Powerline Green - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/green"

View File

@@ -2,7 +2,7 @@
# Powerline Magenta - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/magenta"

View File

@@ -2,7 +2,7 @@
# Powerline Orange - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/orange"

View File

@@ -2,7 +2,7 @@
# Powerline Purple - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/purple"

View File

@@ -2,7 +2,7 @@
# Powerline Red - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/red"

View File

@@ -2,7 +2,7 @@
# Powerline Yellow - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/yellow"

View File

@@ -6,6 +6,6 @@ set -goqF @powerline-status-right-area-right-bg "#{@powerline-color-main-1}"
#= include "powerline/_powerline-options"
#= include "powerline/_theme-options"
#= include "powerline/_window-status-default"
#= include "powerline/_theme-options-default"
#= include "_apply"

View File

@@ -2,7 +2,7 @@
# Powerline Double Blue - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/blue"

View File

@@ -2,7 +2,7 @@
# Powerline Double Cyan - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/cyan"

View File

@@ -2,7 +2,7 @@
# Powerline Double Green - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/green"

View File

@@ -2,7 +2,7 @@
# Powerline Double Magenta - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/magenta"

View File

@@ -2,7 +2,7 @@
# Powerline Double Orange - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/orange"

View File

@@ -2,7 +2,7 @@
# Powerline Double Purple - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/purple"

View File

@@ -2,7 +2,7 @@
# Powerline Double Red - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/red"

View File

@@ -2,7 +2,7 @@
# Powerline Double Yellow - Tmux Themepack
#= include "powerline/_info"
#= include "powerline/_formats"
#= include "powerline/_themepack-options"
# Powerline color options
#= include "powerline/_colors/yellow"