mirror/vincentbernat.i3wm-configuration
1
0
Fork 0
mirror of https://github.com/vincentbernat/i3wm-configuration.git synced 2025-06-25 03:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallpaper: use a per-display wallpaper

Browse source 
Just to be coherent with having a per-display service and timer.
This commit is contained in:
Vincent Bernat 2020-02-07 09:58:02 +01:00
parent e3ad1d73f0
commit a42edf621a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/xss-lock
View file

@ -3,6 +3,7 @@
me="$(readlink -f "$0")" me="$(readlink -f "$0")"
timeout=300 timeout=300
notify=10 notify=10
display=$(systemd-escape -- "$DISPLAY")
configure() { configure() {
xset s $((timeout - notify)) $notify xset s $((timeout - notify)) $notify
@ -20,8 +21,8 @@ case "$1" in
;; ;;
dim|notify) dim|notify)
echo "notify: start" echo "notify: start"
systemctl --user kill -s STOP redshift@$(systemd-escape -- "$DISPLAY").service systemctl --user kill -s STOP redshift@${display}.service
trap "systemctl --user kill -s CONT redshift@$(systemd-escape -- "$DISPLAY").service" EXIT trap "systemctl --user kill -s CONT redshift@${display}.service" EXIT
trap 'echo notify: user activity; kill %% 2> /dev/null; exit 0' HUP # user activity trap 'echo notify: user activity; kill %% 2> /dev/null; exit 0' HUP # user activity
trap 'echo notify: locker started; kill %% 2> /dev/null; exit 0' TERM # locker started trap 'echo notify: locker started; kill %% 2> /dev/null; exit 0' TERM # locker started
outputs=($(xrandr --current | sed -n 's/\([^ ]*\) connected .*/\1/p')) outputs=($(xrandr --current | sed -n 's/\([^ ]*\) connected .*/\1/p'))
@ -39,9 +40,9 @@ case "$1" in
xdotool key XF86AudioStop xdotool key XF86AudioStop
# Then, lock screen # Then, lock screen
echo "lock: lock screen" echo "lock: lock screen"
systemctl --user stop compton@$(systemd-escape -- "$DISPLAY").service systemctl --user stop compton@${display}.service
i3lock -n -e -i $HOME/.cache/awesome/current-wallpaper.png -t -f i3lock -n -e -i $HOME/.cache/awesome/current-wallpaper-${display}.png -t -f
systemctl --user start compton@$(systemd-escape -- "$DISPLAY").service systemctl --user start compton@${display}.service
echo "lock: unlock screen" echo "lock: unlock screen"
;; ;;
esac esac

2
systemd/wallpaper@.service
View file

@ -5,7 +5,7 @@ PartOf=graphical-session@%i.target
[Service] [Service]
Environment=DISPLAY=%I Environment=DISPLAY=%I
Environment=WALLPAPER_DIRECTORY=%h/.config/awesome/wallpapers Environment=WALLPAPER_DIRECTORY=%h/.config/awesome/wallpapers
Environment=WALLPAPER_OUTPUT=%h/.cache/awesome/current-wallpaper.png Environment=WALLPAPER_OUTPUT=%h/.cache/awesome/current-wallpaper-%i.png
ExecStart=%h/.config/awesome/bin/build-wallpaper --crop \ ExecStart=%h/.config/awesome/bin/build-wallpaper --crop \
--directory $WALLPAPER_DIRECTORY \ --directory $WALLPAPER_DIRECTORY \
--target $WALLPAPER_OUTPUT --target $WALLPAPER_OUTPUT