diff --git a/bin/desktop/feh/randomize-background.sh b/bin/desktop/feh/randomize-background.sh index 39542f2..22436b0 100755 --- a/bin/desktop/feh/randomize-background.sh +++ b/bin/desktop/feh/randomize-background.sh @@ -1,4 +1,4 @@ -WALLPAPER_DIR="$HOME/.config/wryn/wallpaper"; +source "$HOME/.config/wryn/env/env" -[ -d $WALLPAPER_DIR ] \ - && feh --recursive --randomize --bg-fill "$WALLPAPER_DIR"; +[ -d "$WALLPAPER_PATH" ] \ + && feh --recursive --randomize --bg-fill "$WALLPAPER_PATH"; diff --git a/config/xorg/screenlayout/gamedock.sh b/config/xorg/screenlayout/gamedock.sh index 91dc12d..d0710fb 100755 --- a/config/xorg/screenlayout/gamedock.sh +++ b/config/xorg/screenlayout/gamedock.sh @@ -1,4 +1,5 @@ #!/bin/sh +source "$HOME/.config/wryn/env/env" RESOLUTION='1920x1080'; @@ -17,6 +18,5 @@ for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$CURRENT_M xrandr --output $display --off; done; -feh --bg-fill --randomize $HOME/.config/wryn/wallpaper; - +"$DOTWRYN/bin/desktop/feh/randomize-background.sh" [ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx gamedock diff --git a/config/xorg/screenlayout/hdmidock.sh b/config/xorg/screenlayout/hdmidock.sh index 16a768f..37d8150 100755 --- a/config/xorg/screenlayout/hdmidock.sh +++ b/config/xorg/screenlayout/hdmidock.sh @@ -1,4 +1,6 @@ #!/bin/sh +source "$HOME/.config/wryn/env/env" + NATIVE_MONITOR='eDP1'; CONNECTED_MONITOR=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); @@ -28,5 +30,5 @@ for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$NATIVE_MO xrandr --output $display --off; done; -feh --recursive --bg-fill --randomize $HOME/.config/wryn/wallpaper; +"$DOTWRYN/bin/desktop/feh/randomize-background.sh" [ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx login diff --git a/config/xorg/screenlayout/homedock.sh b/config/xorg/screenlayout/homedock.sh index d5cf08b..740517d 100755 --- a/config/xorg/screenlayout/homedock.sh +++ b/config/xorg/screenlayout/homedock.sh @@ -1,4 +1,6 @@ #!/bin/sh +source "$HOME/.config/wryn/env/env" + NATIVE_MONITOR='eDP1'; HOMEDOCK_MONITOR=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); @@ -15,6 +17,5 @@ for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$HOMEDOCK_ xrandr --output $display --off; done; -feh --bg-fill --randomize $HOME/.config/wryn/wallpaper; - +"$DOTWRYN/bin/desktop/feh/randomize-background.sh" [ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx homedock diff --git a/config/xorg/screenlayout/tvdock.sh b/config/xorg/screenlayout/tvdock.sh index 5b66a28..fd41d5e 100755 --- a/config/xorg/screenlayout/tvdock.sh +++ b/config/xorg/screenlayout/tvdock.sh @@ -1,4 +1,6 @@ #!/bin/sh +source "$HOME/.config/wryn/env/env" + NATIVE_MONITOR='eDP1'; TV_DISPLAY=$(xrandr | grep ' connect' | awk '{print $1;}' | grep -v "$NATIVE_MONITOR" | head -n 1); @@ -15,6 +17,5 @@ for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$TV_DISPLA xrandr --output $display --off; done; -feh --bg-fill --randomize $HOME/.config/wryn/wallpaper; - +"$DOTWRYN/bin/desktop/feh/randomize-background.sh" [ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx gamedock diff --git a/config/xorg/screenlayout/undock.sh b/config/xorg/screenlayout/undock.sh index eae1517..44cb21e 100755 --- a/config/xorg/screenlayout/undock.sh +++ b/config/xorg/screenlayout/undock.sh @@ -1,4 +1,6 @@ #!/bin/sh +source "$HOME/.config/wryn/env/env" + NATIVE_MONITOR='eDP1'; NATIVE_MODE="$(xrandr | grep -A 2 "$NATIVE_MONITOR" | sed -n '2 p' | awk '{print $1;}')"; @@ -17,6 +19,5 @@ for display in $(xrandr | grep connect | awk '{print $1;}' | grep -v "$NATIVE_MO xrandr --output $display --off; done; -feh --bg-fill --randomize $HOME/.config/wryn/wallpaper; - +"$DOTWRYN/bin/desktop/feh/randomize-background.sh" [ -f $HOME/.config/wryn/sfx ] && $HOME/.config/wryn/sfx undock diff --git a/env/env b/env/env index 5fd09ea..1c82768 100755 --- a/env/env +++ b/env/env @@ -1,11 +1,13 @@ -#!/bin/sh + DOTWRYN="$HOME/.wryn" SCHOOL_PATH="$HOME/School" RD_PATH="$HOME/RentDynamics" + SFX_PATH="$HOME/Media/sfx" +WALLPAPER_PATH="$HOME/Pictures/bg" # ordered from least-preferred to most-preferred PREFERRED_EDITOR=(vi vim) # plays audio files located throughout the system -MEDIA_ENGINE="$(which canberra-gtk-play) -f" +MEDIA_ENGINE="canberra-gtk-play -f"