From a8ab770bec6705c911fc85dccc928ede2cae53a7 Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Mon, 11 May 2020 23:38:13 +0530 Subject: [PATCH 1/5] Added powerline symbols Changed it so that battery can be read from BAT1 and BAT0 --- scripts/battery.sh | 6 ++++-- scripts/dracula.sh | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/scripts/battery.sh b/scripts/battery.sh index 21c01ff..30b3b3e 100755 --- a/scripts/battery.sh +++ b/scripts/battery.sh @@ -1,11 +1,13 @@ #!/usr/bin/env bash +BAT=$(ls /sys/class/power_supply/BAT* | head -1) + battery_percent() { # Check OS case $(uname -s) in Linux) - cat /sys/class/power_supply/BAT0/capacity + cat $BAT/capacity ;; Darwin) @@ -26,7 +28,7 @@ battery_status() # Check OS case $(uname -s) in Linux) - status=$(cat /sys/class/power_supply/BAT0/status) + status=$(cat $BAT/status) ;; Darwin) diff --git a/scripts/dracula.sh b/scripts/dracula.sh index a5e6f79..80e72bb 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash - get_tmux_option() { local option=$1 local default_value=$2 @@ -21,7 +20,8 @@ main() show_network=$(get_tmux_option "@dracula-show-network" true) show_weather=$(get_tmux_option "@dracula-show-weather" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) - + right_sep='' + left_sep='' # Dracula Color Pallette white='#f8f8f2' gray='#44475a' @@ -34,7 +34,7 @@ main() red='#ff5555' pink='#ff79c6' yellow='#f1fa8c' - + # start weather script in background if $show_weather; then $current_dir/sleep_weather.sh $show_fahrenheit & @@ -60,26 +60,31 @@ main() # status bar tmux set-option -g status-style "bg=${gray},fg=${white}" - tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ " + tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ #[fg=${green},bg=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep} " tmux set-option -g status-right "" + powerbg=${gray} + if $show_battery; then - tmux set-option -g status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " + tmux set-option -g status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " + powerbg=${pink} fi if $show_network; then - tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " + tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " + powerbg=${cyan} fi if $show_weather; then - tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " + tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " + powerbg=${orange} fi - tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) " + 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) " # 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 "#[bg=${dark_purple},fg=${gray}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[bg=${dark_purple},fg=${gray}]${right_sep}" tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W " } From a936b9638bfd3c12931a77b64eb661c302d66d59 Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Tue, 12 May 2020 00:54:00 +0530 Subject: [PATCH 2/5] Added option to set set -g @dracula-show-powerline false --- scripts/dracula.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 80e72bb..4bd0197 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -20,8 +20,7 @@ main() show_network=$(get_tmux_option "@dracula-show-network" true) show_weather=$(get_tmux_option "@dracula-show-weather" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) - right_sep='' - left_sep='' + show_powerline=$(get_tmux_option "@dracula-show-powerline" true) # Dracula Color Pallette white='#f8f8f2' gray='#44475a' @@ -35,6 +34,10 @@ main() pink='#ff79c6' yellow='#f1fa8c' + if $show_powerline; then + right_sep='' + left_sep='' + fi # start weather script in background if $show_weather; then $current_dir/sleep_weather.sh $show_fahrenheit & From a005d37fb2ed437c64e197bd9a781957759181c9 Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Fri, 15 May 2020 11:08:33 +0530 Subject: [PATCH 3/5] Revert to the old theme when powerline is set to false --- scripts/dracula.sh | 59 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 4bd0197..1c32ecf 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -63,31 +63,54 @@ main() # status bar tmux set-option -g status-style "bg=${gray},fg=${white}" - tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ #[fg=${green},bg=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep} " + if $show_powerline; then - tmux set-option -g status-right "" + tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ #[fg=${green},bg=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep} " + tmux set-option -g status-right "" + powerbg=${gray} - powerbg=${gray} + if $show_battery; then + tmux set-option -g status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " + powerbg=${pink} + fi - if $show_battery; then - tmux set-option -g status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " - powerbg=${pink} - fi + if $show_network; then + tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " + powerbg=${cyan} + fi - if $show_network; then - tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " - powerbg=${cyan} - fi + if $show_weather; then + tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " + powerbg=${orange} + fi - if $show_weather; then - tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " - powerbg=${orange} - 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) " + # 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}" + else + tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ " - 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) " + tmux set-option -g status-right "" + + if $show_battery; then + tmux set-option -g status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " + fi + + if $show_network; then + tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " + fi + + if $show_weather; then + tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " + fi + + tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) " + + # window tabs + tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W " + + fi - # window tabs - tmux set-window-option -g window-status-current-format "#[bg=${dark_purple},fg=${gray}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[bg=${dark_purple},fg=${gray}]${right_sep}" tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W " } From 52022a22a395dec672680f35e3d3a83c7f4ffdd0 Mon Sep 17 00:00:00 2001 From: Dane Williams Date: Thu, 14 May 2020 23:47:21 -0700 Subject: [PATCH 4/5] fine tune after powerline PR --- INSTALL.md | 1 + README.md | 1 + data/weather.txt | 2 +- scripts/dracula.sh | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 0885555..9ccb56b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -19,3 +19,4 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi * Disable network functionality: `set -g @dracula-show-network false` * Disable weather functionality: `set -g @dracula-show-weather false` * Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false` +* Enable powerline symbols: `set -g @dracula-show-powerline true` diff --git a/README.md b/README.md index 94fcca8..cefd29f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Configuration and options can be found at [draculatheme.com/tmux](https://dracul ## Features +* Support for powerline * Day, date, time, timezone * Current location based on network with temperature and forecast icon (if available) * Network connection status and SSID diff --git a/data/weather.txt b/data/weather.txt index 0536cf7..33ebd70 100644 --- a/data/weather.txt +++ b/data/weather.txt @@ -1 +1 @@ -☀ 18° Pleasanton, CA +☁ 57° Pleasanton, CA diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 1c32ecf..99457e4 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -20,7 +20,8 @@ main() show_network=$(get_tmux_option "@dracula-show-network" true) show_weather=$(get_tmux_option "@dracula-show-weather" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) - show_powerline=$(get_tmux_option "@dracula-show-powerline" true) + show_powerline=$(get_tmux_option "@dracula-show-powerline" false) + # Dracula Color Pallette white='#f8f8f2' gray='#44475a' From 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d Mon Sep 17 00:00:00 2001 From: Dane Williams Date: Tue, 19 May 2020 19:03:31 -0700 Subject: [PATCH 5/5] Create pull_request_template.md --- .../PULL_REQUEST_TEMPLATE/pull_request_template.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 0000000..ccd83bd --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -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