From dbca36b91e096e54f2686bb3d37d3e72e112eea2 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 16 Oct 2019 11:19:06 -0500 Subject: [PATCH] Fix stupid monitor grepping --- de/bar/bar.bash | 10 ++++++++-- scripts/arch-linux/provisioning/3-extras.bash | 1 + scripts/bin/workdock | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/de/bar/bar.bash b/de/bar/bar.bash index b35bbb9..b1dd719 100755 --- a/de/bar/bar.bash +++ b/de/bar/bar.bash @@ -6,8 +6,6 @@ export BAR_HEIGHT=40 export BAR_ON_TOP=0 export BAR_SIDE_MARGIN=200 -MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1) - export BAR_FONT="${BAR_FONT:-$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)}" export BAR_ICON_FONT="${BAR_ICON_FONT:-"Font Awesome 5 Free"}" export BAR_FONT_SIZE="${BAR_FONT_SIZE:-$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-,]*\=\([0-9]*\).*$/\1/p' | head -n 1)}" @@ -28,6 +26,8 @@ if [ -f "$HOME/.env_bar" ]; then source "$HOME/.env_bar" fi +export MONITOR_WIDTH=$(xrandr | grep "^$BAR_MONITOR " | grep -Po ' \d+' | head -n 1) + export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1" export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:style=Solid:pixelsize=${BAR_ICON_FONT_SIZE};1" export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:style=Regular:pixelsize=${BAR_ICON_FONT_SIZE};1" @@ -56,4 +56,10 @@ fi # bspc +echo "Monitor: $BAR_MONITOR" +echo "Bottom?: $BAR_BOTTOM" +echo "Dimensions: $POS_X $POS_Y $BAR_WIDTH $BAR_HEIGHT" +echo "EHeight: $EHEIGHT" +echo "Margin: $BAR_SIDE_MARGIN" + polybar lytedev diff --git a/scripts/arch-linux/provisioning/3-extras.bash b/scripts/arch-linux/provisioning/3-extras.bash index 9d016c4..a59b8f5 100755 --- a/scripts/arch-linux/provisioning/3-extras.bash +++ b/scripts/arch-linux/provisioning/3-extras.bash @@ -9,6 +9,7 @@ else fi pacaur --needed -S \ + bluez bluz-libs bluez-utils bluez-tools \ pigz `# Multi-core gzipping` \ arc-gtk-theme `# GTK Theme` \ elementary-icon-theme `# GUI File Explorer Icons` \ diff --git a/scripts/bin/workdock b/scripts/bin/workdock index 964a033..b44d954 100755 --- a/scripts/bin/workdock +++ b/scripts/bin/workdock @@ -1,6 +1,7 @@ #!/usr/bin/env bash resrc +source "$HOME/.workdock.env" "${DOTFILES_PATH}/de/x/loadresources" lodpi autorandr --change "${DOTFILES_PATH}/de/bspwm/bspwmrc"