Fix stupid monitor grepping

This commit is contained in:
Daniel Flanagan 2019-10-16 11:19:06 -05:00
parent 3490ebdd59
commit dbca36b91e
3 changed files with 10 additions and 2 deletions

View file

@ -6,8 +6,6 @@ export BAR_HEIGHT=40
export BAR_ON_TOP=0 export BAR_ON_TOP=0
export BAR_SIDE_MARGIN=200 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_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_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)}" 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" source "$HOME/.env_bar"
fi 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_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_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" export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:style=Regular:pixelsize=${BAR_ICON_FONT_SIZE};1"
@ -56,4 +56,10 @@ fi
# bspc # 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 polybar lytedev

View file

@ -9,6 +9,7 @@ else
fi fi
pacaur --needed -S \ pacaur --needed -S \
bluez bluz-libs bluez-utils bluez-tools \
pigz `# Multi-core gzipping` \ pigz `# Multi-core gzipping` \
arc-gtk-theme `# GTK Theme` \ arc-gtk-theme `# GTK Theme` \
elementary-icon-theme `# GUI File Explorer Icons` \ elementary-icon-theme `# GUI File Explorer Icons` \

View file

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
resrc resrc
source "$HOME/.workdock.env"
"${DOTFILES_PATH}/de/x/loadresources" lodpi "${DOTFILES_PATH}/de/x/loadresources" lodpi
autorandr --change autorandr --change
"${DOTFILES_PATH}/de/bspwm/bspwmrc" "${DOTFILES_PATH}/de/bspwm/bspwmrc"