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

diff --cc shell/.bashrc
Simple merge

diff --cc x/.config/i3/config
index 2eb31db,ba92828..489bcfa
--- 1/x/.config/i3/config
--- 2/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