Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-14 19:14:55 -04:00
commit f79f1e39e4
2 changed files with 5 additions and 6 deletions

View File

@ -1,4 +1,3 @@
xautolock -time 10 -locker lock &
gpg-agent --daemon gpg-agent --daemon
xmodmap ~/.Xmodmap xmodmap ~/.Xmodmap
xrdb -merge ~/.Xresources xrdb -merge ~/.Xresources

View File

@ -198,14 +198,14 @@ bindsym $mod+Shift+e mode "$quit_msg"
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
new_window 1pixel new_window pixel 2
new_float normal new_float pixel 2
smart_borders on smart_borders on
# border background text indicator # border background text indicator
client.focused #660000 #880000 #ffffff #ff0000 client.focused #660000 #880000 #ffffff #ff0000
client.focused_inactive #252525 #888888 #222222 #000000 client.focused_inactive #252525 #252525 #222222 #000000
client.unfocused #252525 #222222 #888888 #000000 client.unfocused #252525 #252525 #888888 #000000
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
@ -225,7 +225,7 @@ bar {
} }
bindsym $mod+b bar mode toggle bindsym $mod+b bar mode toggle
exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 -i 0.9 --config /dev/null exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 --config /dev/null
exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg
exec --no-startup-id seafile-applet exec --no-startup-id seafile-applet
exec --no-startup-id xrdb -merge ~/.Xresources exec --no-startup-id xrdb -merge ~/.Xresources