Merge branch 'master' of code.ghostdub.de:nebukadneza/config

i3/config

@@ -45,7 +45,7 @@ font pango:monospace 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec xfce4-terminal
 
 # start chromium
 bindsym $mod+BackSpace exec chromium
@@ -56,6 +56,10 @@ bindsym $mod+Delete exec scrot -s
 # kill focused window
 bindsym $mod+Shift+x kill
 
+bindsym Print exec pactl set-sink-volume 0 -5% ; exec pactl set-sink-volume 1 -5%
+bindsym Scroll_Lock exec pactl set-sink-volume 0 +5% ; exec pactl set-sink-volume 1 +5%
+bindsym Pause exec pactl set-sink-mute 0 toggle ; exec pactl set-sink-mute 1 toggle
+
 # start dmenu (a program launcher)
 #bindsym $mod+a exec dmenu_run
 # There also is the (new) i3-dmenu-desktop which only displays applications
@@ -156,6 +160,7 @@ bindsym $mod+Shift+l exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
 bindsym $mod+Tab exec rofi -show window
 bindsym $mod+a exec rofi -show drun
 bindsym $mod+F2 exec sh ~/config/lock.sh
+bindsym $mod+F4 exec sh ~/config/susp.sh
 bindsym $mod+F12 exec xfce4-terminal --drop-down
 #for_window [class="(?i)xfce4-terminal"] floating enable
 #for_window [class="(?i)xfce4-terminal"] border none

lock.sh

@@ -8,7 +8,7 @@ trap revert HUP INT TERM
 xset dpms 25 25 25
 
 scrot /tmp/screen.png
-convert /tmp/screen.png -scale 10% -scale 1000% /tmp/screen.png
+convert /tmp/screen.png -scale 5% -scale 2000% /tmp/screen.png
 i3lock -n -f -p win -i /tmp/screen.png
 
 revert

susp.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+revert() {
+	xset dpms 0 0 0
+}
+trap revert HUP INT TERM
+
+xset dpms 25 25 25
+
+scrot /tmp/screen.png
+convert /tmp/screen.png -scale 5% -scale 2000% /tmp/screen.png
+i3lock -f -p win -i /tmp/screen.png
+PID=$!
+
+systemctl suspend
+
+wait $PID
+
+revert
+