Merge branch 'master' of https://github.com./Matir/skel

bin/i3lock.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 LOCKER="i3lock -c 000000"
-/usr/bin/xss-lock -- "${LOCKER}" &
+# intentionally want word splitting below
+/usr/bin/xss-lock -- ${LOCKER} &
 exec /usr/bin/xautolock \
   -time 5 \
   -detectsleep \

dotfiles/config/i3/config

@@ -130,6 +130,7 @@ bindsym $alt+Control+Left workspace prev
 
 # i3 lock
 exec --no-startup-id ~/bin/i3lock.sh &
+exec --no-startup-id xset dpms 600
 bindsym $mod+l exec \
   bash -c "i3lock -c 000000 && (sleep 2 && xset dpms force off) &"
 bindsym $alt+Control+l exec \

dotfiles/zshrc

@@ -59,7 +59,8 @@ bindkey '^r' history-incremental-search-backward
 # Source extras and aliases if interactive
 if [[ $- == *i* ]] ; then
   if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
-  for file in $HOME/.zshrc.d/* ; do source "$file" ; done
+  # zsh-only-ism to avoid error if glob doesn't expand
+  for file in $HOME/.zshrc.d/*(N) ; do source "$file" ; done
 fi
 
 # In case ack is named ack-grep