Merge branch 'next' into master

[i3/i3] / i3.config.keycodes

diff --git a/i3.config.keycodes b/i3.config.keycodes
index 27398515b1de5757b0815ed16434c29ea2b59ef0..e606d34702c004669ef507ff2ddb4e29fd3c36b8 100644 (file)
--- a/i3.config.keycodes
+++ b/i3.config.keycodes
@@ -12,9 +12,12 @@ set $mod Mod1
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
+font pango:monospace 8
+
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 8
+#font pango:DejaVu Sans Mono 8
+
 # Before i3 v4.8, we used to recommend this one as the default:
 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 # The font above is very space-efficient, that is, it looks good, sharp and
@@ -69,7 +72,7 @@ bindcode $mod+43 split h
 bindcode $mod+55 split v
 
 # enter fullscreen mode for the focused container
-bindcode $mod+41 fullscreen
+bindcode $mod+41 fullscreen toggle
 
 # change container layout (stacked, tabbed, toggle split)
 bindcode $mod+39 layout stacking
@@ -149,4 +152,5 @@ bindcode $mod+27 mode "resize"
 # finds out, if available)
 bar {
         status_command i3status
+        tray_output primary
 }