Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-06 08:26:25 -04:00
commit 09cb97d30a

View File

@ -10,7 +10,7 @@
set $mod Mod4 set $mod Mod4
set $lock lock set $lock lock
set $run_passmenu ~/.i3/passmenu --type -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 28 set $run_passmenu ~/.i3/passmenu --type -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
# Font for window titles. Will also be used by the bar unless a different font # Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. ISO 10646 = Unicode # is used in the bar {} block below. ISO 10646 = Unicode
@ -33,10 +33,10 @@ bindsym $mod+Shift+Return exec terminator
bindsym $mod+q kill bindsym $mod+q kill
# start dmenu (a program launcher) # start dmenu (a program launcher)
#bindsym $mod+d exec dmenu_run -sb "#880000" #bindsym $mod+d exec dmenu_run -sb "#880000"
bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 28" bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26"
bindsym $mod+Shift+d exec --no-startup-id dmenu_run -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 28 bindsym $mod+Shift+d exec --no-startup-id dmenu_run -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26
bindsym $mod+p exec --no-startup-id $run_passmenu bindsym $mod+p exec --no-startup-id $run_passmenu
bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 28 bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
# There also is the (new) i3-dmenu-desktop which only displays applications # 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 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed. # installed.