Merge branch 'master' of github.com:dracula/tmux
pulled from upsteam
This commit is contained in:
commit
46ee6f75a4
3 changed files with 26 additions and 3 deletions
12
.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
vendored
Normal file
12
.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
## Issue
|
||||||
|
|
||||||
|
Please reference the issue that this PR is solving
|
||||||
|
Closes #[issue id goes here]
|
||||||
|
|
||||||
|
## Description of Changes
|
||||||
|
|
||||||
|
Please briefly describe the changes being made
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Please explain how you tested these changes and how a maintainer should reproduce the test
|
|
@ -20,3 +20,4 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi
|
||||||
* Disable weather functionality: `set -g @dracula-show-weather false`
|
* Disable weather functionality: `set -g @dracula-show-weather false`
|
||||||
* Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false`
|
* Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false`
|
||||||
* Enable powerline symbols: `set -g @dracula-show-powerline true`
|
* Enable powerline symbols: `set -g @dracula-show-powerline true`
|
||||||
|
* Enable military time: `set -g @dracula-military-time true`
|
||||||
|
|
|
@ -22,6 +22,7 @@ main()
|
||||||
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
|
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
|
||||||
show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
|
show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
|
||||||
show_left_icon=$(get_tmux_option "@dracula-show-left-icon" smiley)
|
show_left_icon=$(get_tmux_option "@dracula-show-left-icon" smiley)
|
||||||
|
show_military=$(get_tmux_option "@dracula-military-time" false)
|
||||||
|
|
||||||
# Dracula Color Pallette
|
# Dracula Color Pallette
|
||||||
white='#f8f8f2'
|
white='#f8f8f2'
|
||||||
|
@ -95,7 +96,12 @@ main()
|
||||||
powerbg=${orange}
|
powerbg=${orange}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
|
if $show_military; then
|
||||||
|
tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R #(date +%Z) "
|
||||||
|
else
|
||||||
|
tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
|
||||||
|
fi
|
||||||
|
|
||||||
# window tabs
|
# window tabs
|
||||||
tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[fg=${dark_purple},bg=${gray}]${left_sep}"
|
tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[fg=${dark_purple},bg=${gray}]${left_sep}"
|
||||||
else
|
else
|
||||||
|
@ -115,7 +121,11 @@ main()
|
||||||
tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) "
|
tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
|
if $show_military; then
|
||||||
|
tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R #(date +%Z) "
|
||||||
|
else
|
||||||
|
tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
|
||||||
|
fi
|
||||||
|
|
||||||
# window tabs
|
# window tabs
|
||||||
tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "
|
tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "
|
||||||
|
|
Loading…
Reference in a new issue