Expand user customizability (jimeh#33)

Expand user customizability
aleeraser · Dec 22, 2019 · 7c59902 · 7c59902
2 parents bb24b39 + d47e108
commit 7c59902
Show file tree

Hide file tree

Showing 84 changed files with 1,746 additions and 1,062 deletions.
diff --git a/basic.tmuxtheme b/basic.tmuxtheme
@@ -2,33 +2,35 @@
 # Basic theme
 #
 
-# Themepack format options - Overrideable
+# Themepack format options
 set -goq @themepack-status-left-area-left-format "#S"
+set -goq @themepack-status-left-area-middle-format "#I"
+set -goq @themepack-status-left-area-right-format "#P"
+set -goq @themepack-status-right-area-left-format "#H"
+set -goq @themepack-status-right-area-middle-format "%H:%M:%S"
+set -goq @themepack-status-right-area-right-format "%d-%b-%y"
+set -goq @themepack-window-status-current-format "#I:#W#F"
+set -goq @themepack-window-status-format "#I:#W#F"
+
+# 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-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 ""
 
-# Themepack format options - combine prefixes, formats, and suffixes
+# 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}"
@@ -73,20 +75,36 @@ set -goqF @theme-window-status-current-format " #{@themepack-window-status-curre
 set -goqF @theme-window-status-format " #{@themepack-window-status-format} "
 set -goq  @theme-window-status-separator ""
 
-# 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}"

diff --git a/default.tmuxtheme b/default.tmuxtheme
@@ -41,20 +41,36 @@ set -goq @theme-window-status-current-format "#I:#W#F"
 set -goq @theme-window-status-format "#I:#W#F"
 set -goq @theme-window-status-separator " "
 
-# 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}"

diff --git a/powerline/block/blue.tmuxtheme b/powerline/block/blue.tmuxtheme
@@ -8,33 +8,35 @@
 # https://github.com/powerline/fonts
 #
 
-# Themepack format options - Overrideable
+# 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"
+
+# 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-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 ""
 
-# Themepack format options - combine prefixes, formats, and suffixes
+# 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}"
@@ -45,16 +47,16 @@ set -gqF @themepack-window-status-current-format "#{@themepack-window-status-cur
 set -gqF @themepack-window-status-format "#{@themepack-window-status-prefix}#{@themepack-window-status-format}#{@themepack-window-status-suffix}"
 
 # Powerline color options
-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-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-main-1 colour24
+set -goq @powerline-color-main-2 colour33
+set -goq @powerline-color-main-3 colour31
+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
 
 # Powerline Block Override
 set -goqF @powerline-color-activity-1 "#{@powerline-color-main-3}"
@@ -109,26 +111,42 @@ 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 ""
 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} "
 
-# 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}"