Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-06 03:23:41 -04:00
commit 80dc28f5fb

View File

@ -200,7 +200,6 @@ bindsym $mod+r mode "resize"
new_window 1pixel
new_float normal
gaps inner 8
smart_borders on
# border background text indicator
@ -224,8 +223,9 @@ bar {
urgent_workspace #ffffff #900000
}
}
bindsym $mod+b bar mode toggle
exec --no-startup-id compton -bcC --vsync opengl-swc --backend glx -f -D 5 -i 0.9 -o 0.6 -r 22 -l -25 -t -25 --shadow-blue 0.1 --config /dev/null
exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 -i 0.9 --config /dev/null
exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg
exec --no-startup-id seafile-applet
exec --no-startup-id xrdb -merge ~/.Xresources