Fixed merge conflict

This commit is contained in:
Ethan Edwards 2020-05-19 23:38:09 -04:00
commit 31e5422e30
6 changed files with 70 additions and 19 deletions

View 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

View file

@ -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 network functionality: `set -g @dracula-show-network false`
* 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`

View file

@ -14,6 +14,7 @@ Configuration and options can be found at [draculatheme.com/tmux](https://dracul
## Features ## Features
* Support for powerline
* Day, date, time, timezone * Day, date, time, timezone
* Current location based on network with temperature and forecast icon (if available) * Current location based on network with temperature and forecast icon (if available)
* Network connection status and SSID * Network connection status and SSID

View file

@ -1 +1 @@
☀ 18° Pleasanton, CA ☁ 57° Pleasanton, CA

View file

@ -1,11 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BAT=$(ls /sys/class/power_supply/BAT* | head -1)
battery_percent() battery_percent()
{ {
# Check OS # Check OS
case $(uname -s) in case $(uname -s) in
Linux) Linux)
cat /sys/class/power_supply/BAT0/capacity cat $BAT/capacity
;; ;;
Darwin) Darwin)
@ -26,7 +28,7 @@ battery_status()
# Check OS # Check OS
case $(uname -s) in case $(uname -s) in
Linux) Linux)
status=$(cat /sys/class/power_supply/BAT0/status) status=$(cat $BAT/status)
;; ;;
Darwin) Darwin)

View file

@ -1,5 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
get_tmux_option() { get_tmux_option() {
local option=$1 local option=$1
local default_value=$2 local default_value=$2
@ -21,6 +20,10 @@ main()
show_network=$(get_tmux_option "@dracula-show-network" true) show_network=$(get_tmux_option "@dracula-show-network" true)
show_weather=$(get_tmux_option "@dracula-show-weather" true) show_weather=$(get_tmux_option "@dracula-show-weather" true)
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
<<<<<<< HEAD
=======
show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
>>>>>>> 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d
show_military=$(get_tmux_option "@dracula-military-time" false) show_military=$(get_tmux_option "@dracula-military-time" false)
# Dracula Color Pallette # Dracula Color Pallette
@ -36,6 +39,10 @@ main()
pink='#ff79c6' pink='#ff79c6'
yellow='#f1fa8c' yellow='#f1fa8c'
if $show_powerline; then
right_sep=''
left_sep=''
fi
# start weather script in background # start weather script in background
if $show_weather; then if $show_weather; then
$current_dir/sleep_weather.sh $show_fahrenheit & $current_dir/sleep_weather.sh $show_fahrenheit &
@ -66,26 +73,54 @@ else
# status bar # status bar
tmux set-option -g status-style "bg=${gray},fg=${white}" 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}],} ☺ " 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}
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_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 -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 "
if $show_battery; then
tmux set-option -g status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
fi 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 "
tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W " tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W "
} }