From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 20 Jul 2016 14:45:32 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=f2a1c89978a8ec6f129660a28f5c424b5f55bcd2;p=dotfiles.git

merge
---

f2a1c89978a8ec6f129660a28f5c424b5f55bcd2
diff --cc x/.config/i3/config
index 9fd78e6,ba92828..568190d
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@@ -13,14 -13,15 +13,15 @@@ set $mod Mod
  set $font DejaVu Sans Mono
  set $fontsize 12
  
--# lock the screen after 10 minutes
- exec xautolock -locker 'echo RELOADAGENT | gpg-connect-agent; i3lock'
- # set a background
- exec ~/.local/bin/bg
- # start steam
- exec steam
- 
- # Toggle music playback
+ exec display -window root /tmp/bg.png &\
+ 	dunst &\
+ 	urxvtd -q -o -f &\
+ 	mpd &\
+ 	xrdb -merge ~/.Xresources &\
++	steam &\
+ 	setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
+ 
+ # Toggle playback
  bindsym Pause exec mpc toggle
  # Printscreen current window
  bindsym Shift+Print exec ~/.local/bin/scr window