Merge branch 'master' into luma

config

@@ -15,7 +15,7 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # right-to-left text rendering, you should instead use pango for rendering and
 # chose a FreeType font, such as:
 # font pango:DejaVu Sans Mono 10
-font pango:DejaVu Sans 10
+font pango:Liberation Sans 10
 
 # Disable focus-follows-mouse
 focus_follows_mouse no
@@ -33,7 +33,7 @@ bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+d exec dmenu_run
-bindsym $modb+space exec exec dmenu_run -fn 'Monospace-10' &
+bindsym $modb+space exec exec dmenu_run -fn 'Liberation Mono-10' &
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -199,6 +199,7 @@ for_window [title="myNoise.net Minified Player"] floating enable
 for_window [class="Galculator"] floating enable
 for_window [class="Audacious"] floating enable
 for_window [class="Pinentry"] floating enable
+for_window [window_role="GvimNotes"] floating enable
 assign [window_role="conversation"] 3
 
 # multimedia keys
@@ -221,3 +222,5 @@ bindsym Print exec screenshot
 bindsym $modb+t exec exec passmenu
 bindsym $modb+g exec exec dmenu_snips
 bindsym $modb+XF86AudioPlay exec exec audacious
+bindsym $modb+v exec exec cachedpass ${USER}
+bindsym $modb+n exec exec gvimnotes