fix merge

This commit is contained in:
Ray Elliott 2020-04-07 17:07:33 +01:00
commit 6e0b3de35b
1 changed files with 7 additions and 8 deletions

View File

@ -10,11 +10,11 @@ if [ "$(hostname)" = Patricia ] ; then
sxhkd -c ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc.bspwm ~/.config/sxhkd/sxhkdrc.bspwm.patricia & sxhkd -c ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc.bspwm ~/.config/sxhkd/sxhkdrc.bspwm.patricia &
elif [ "$(hostname)" = Pamela ] ; then elif [ "$(hostname)" = Pamela ] ; then
# AOC # AOC
bspc monitor HDMI-1-1 -n pam-2 -d I II III IV V VI xVII xVIII bspc monitor HDMI-1-1 -n pam-2 -d I II III IV V VI VII VIII IX X
# samsung # samsung
bspc monitor VGA-1-1 -n pam-1 -d 0111 1000 1001 x1010 x1011 bspc monitor VGA-1-1 -n pam-1 -d 001 010 011 100 101 110 111
# laptop # laptop
bspc monitor eDP-1-1 -n pam-0 -d ∞ α β γ δ bspc monitor eDP-1-1 -n pam-0 -d α β γ δ ε ζ η
sxhkd -c ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc.bspwm ~/.config/sxhkd/sxhkdrc.bspwm.pamela & sxhkd -c ~/.config/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc.bspwm ~/.config/sxhkd/sxhkdrc.bspwm.pamela &
fi fi
@ -40,4 +40,3 @@ xsetroot -cursor_name left_ptr
bspc config normal_border_color '#170808' bspc config normal_border_color '#170808'
bspc config focused_border_color '#ea7607' bspc config focused_border_color '#ea7607'
bspc config active_border_color '#170808' bspc config active_border_color '#170808'