From: Mart Lubbers <mart@martlubbers.net>
Date: Sat, 20 Aug 2016 11:56:38 +0000 (+0200)
Subject: Merge branch 'laptop' of github.com:dopefishh/dotfiles into laptop
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=d024f87b879f30112212e28979481d049b8d94b7;p=dotfiles.git

Merge branch 'laptop' of github.com:dopefishh/dotfiles into laptop
---

d024f87b879f30112212e28979481d049b8d94b7
diff --cc x/.config/i3/config
index 2eb31db,ba92828..489bcfa
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@@ -14,13 -14,15 +14,14 @@@ set $font DejaVu Sans Mon
  set $fontsize 12
  
  # lock the screen after 10 minutes
 -exec display -window root /tmp/bg.png &\
 +exec xautolock -locker ~/.local/bin/lock.sh &\
  	dunst &\
 -	urxvtd -q -o -f &\
 -	mpd &\
 -	xrdb -merge ~/.Xresources &\
 +	~/.local/bin/bg &\
 +	urxvtd -q -o &\
  	setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
- # xrdb -merge ~/.Xresources &\
  
+ # Toggle playback
+ bindsym Pause exec mpc toggle
  # Printscreen current window
  bindsym Shift+Print exec ~/.local/bin/scr window
  # Printscreen