diff --git a/INSTALL.md b/INSTALL.md index c261f76..aa4fdd3 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -22,4 +22,5 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi * Enable powerline symbols: `set -g @dracula-show-powerline true` * Switch powerline symbols `set -g @dracula-show-left-sep ` for left and `set -g @dracula-show-right-sep ` for right symbol (can set any symbol you like as seperator) * Enable military time: `set -g @dracula-military-time true` -* Switch the left smiley icon `set -g @dracula-show-left-icon session` it can accept `session`, `smiley`, or any character. +* Switch the left smiley icon `set -g @dracula-show-left-icon session` it can accept `session`, `smiley`, `window`, or any character. +* Enable high contrast pane border: `set -g @dracula-border-contrast true` diff --git a/data/weather.txt b/data/weather.txt index f4a4c99..da28569 100644 --- a/data/weather.txt +++ b/data/weather.txt @@ -1 +1 @@ -☀ 100° Pleasanton, CA +Loading... diff --git a/scripts/dracula.sh b/scripts/dracula.sh index acd362e..269d756 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + get_tmux_option() { local option=$1 local default_value=$2 @@ -25,6 +26,8 @@ main() show_military=$(get_tmux_option "@dracula-military-time" false) show_left_sep=$(get_tmux_option "@dracula-show-left-sep" ) show_right_sep=$(get_tmux_option "@dracula-show-right-sep" ) + show_border_contrast=$(get_tmux_option "@dracula-border-contrast" false) + # Dracula Color Pallette white='#f8f8f2' gray='#44475a' @@ -38,28 +41,35 @@ main() pink='#ff79c6' yellow='#f1fa8c' + + # Handle left icon configuration case $show_left_icon in smiley) left_icon="☺ ";; session) - left_icon="#W ";; + left_icon="#S ";; + window) + left_icon="#W ";; *) left_icon=$show_left_icon;; esac + # Handle powerline option if $show_powerline; then right_sep="$show_right_sep" left_sep="$show_left_sep" fi + # start weather script in background if $show_weather; then $current_dir/sleep_weather.sh $show_fahrenheit & fi - # set refresh interval + + # sets refresh interval to every 5 seconds tmux set-option -g status-interval 5 - # set clock + # set clock to 12 hour by default tmux set-option -g clock-mode-style 12 # set length @@ -67,7 +77,11 @@ main() tmux set-option -g status-right-length 100 # pane border styling - tmux set-option -g pane-active-border-style "fg=${dark_purple}" + if $show_border_contrast; then + tmux set-option -g pane-active-border-style "fg=${light_purple}" + else + tmux set-option -g pane-active-border-style "fg=${dark_purple}" + fi tmux set-option -g pane-border-style "fg=${gray}" # message styling @@ -76,6 +90,8 @@ main() # status bar tmux set-option -g status-style "bg=${gray},fg=${white}" + + # Powerline Configuration if $show_powerline; then tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon} #[fg=${green},bg=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep}" @@ -97,38 +113,38 @@ main() powerbg=${orange} fi - if $show_military; then + if $show_military; then # military time 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 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}" + + # Non Powerline Configuration else tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}" tmux set-option -g status-right "" - if $show_battery; then + if $show_battery; then # battery tmux set-option -g status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " fi - if $show_network; then + if $show_network; then # network 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) " + if $show_weather; then # weather + tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt)" fi - if $show_military; then + if $show_military; then # military time 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 tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W " fi diff --git a/scripts/network.sh b/scripts/network.sh index 41a4cc1..f95afda 100755 --- a/scripts/network.sh +++ b/scripts/network.sh @@ -7,8 +7,9 @@ get_ssid() # Check OS case $(uname -s) in Linux) - if iw dev | grep ssid | cut -d ' ' -f 2 &> /dev/null; then - echo "$(iw dev | grep ssid | cut -d ' ' -f 2)" + SSID=$(iw dev | sed -nr 's/^\t\tssid (.*)/\1/p') + if [ -n "$SSID" ]; then + printf '%s' "$SSID" else echo 'Ethernet' fi