Merge branch 'master' into next

[i3/i3] / i3.config

diff --git a/i3.config b/i3.config
index 4b72201f79094434a546634d3827aaf5cd6a5791..1a457fcab01d57c1634bd59f906bb421cd7945b8 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -16,13 +16,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 floating_modifier Mod1
 
 # start a terminal
-bindsym Mod1+Return exec /usr/bin/urxvt
+bindsym Mod1+Return exec i3-sensible-terminal
 
 # kill focused window
 bindsym Mod1+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym Mod1+d exec /usr/bin/dmenu_run
+bindsym Mod1+d exec dmenu_run
 
 # change focus
 bindsym Mod1+j focus left
@@ -87,16 +87,16 @@ bindsym Mod1+9 workspace 9
 bindsym Mod1+0 workspace 10
 
 # move focused container to workspace
-bindsym Mod1+Shift+1 move workspace 1
-bindsym Mod1+Shift+2 move workspace 2
-bindsym Mod1+Shift+3 move workspace 3
-bindsym Mod1+Shift+4 move workspace 4
-bindsym Mod1+Shift+5 move workspace 5
-bindsym Mod1+Shift+6 move workspace 6
-bindsym Mod1+Shift+7 move workspace 7
-bindsym Mod1+Shift+8 move workspace 8
-bindsym Mod1+Shift+9 move workspace 9
-bindsym Mod1+Shift+0 move workspace 10
+bindsym Mod1+Shift+1 move container to workspace 1
+bindsym Mod1+Shift+2 move container to workspace 2
+bindsym Mod1+Shift+3 move container to workspace 3
+bindsym Mod1+Shift+4 move container to workspace 4
+bindsym Mod1+Shift+5 move container to workspace 5
+bindsym Mod1+Shift+6 move container to workspace 6
+bindsym Mod1+Shift+7 move container to workspace 7
+bindsym Mod1+Shift+8 move container to workspace 8
+bindsym Mod1+Shift+9 move container to workspace 9
+bindsym Mod1+Shift+0 move container to workspace 10
 
 # reload the configuration file
 bindsym Mod1+Shift+c reload
@@ -109,34 +109,20 @@ bindsym Mod1+Shift+e exit
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
 
-        # They resize the border in the direction you pressed, e.g.
-        # when pressing left, the window is resized so that it has
-        # more space on its left
-
-        bindsym j               resize shrink left 10 px or 10 ppt
-        bindsym Shift+j         resize grow   left 10 px or 10 ppt
-
-        bindsym k               resize shrink down 10 px or 10 ppt
-        bindsym Shift+k         resize grow   down 10 px or 10 ppt
-
-        bindsym l               resize shrink up 10 px or 10 ppt
-        bindsym Shift+l         resize grow   up 10 px or 10 ppt
-
-        bindsym semicolon       resize shrink right 10 px or 10 ppt
-        bindsym Shift+semicolon resize grow   right 10 px or 10 ppt
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j           resize shrink width 10 px or 10 ppt
+        bindsym k           resize grow height 10 px or 10 ppt
+        bindsym l           resize shrink height 10 px or 10 ppt
+        bindsym semicolon   resize grow width 10 px or 10 ppt
 
         # same bindings, but for the arrow keys
-        bindsym Left        resize shrink left 10 px or 10 ppt
-        bindsym Shift+Left  resize grow   left 10 px or 10 ppt
-
-        bindsym Down        resize shrink down 10 px or 10 ppt
-        bindsym Shift+Down  resize grow   down 10 px or 10 ppt
-
-        bindsym Up          resize shrink up 10 px or 10 ppt
-        bindsym Shift+Up    resize grow   up 10 px or 10 ppt
-
-        bindsym Right       resize shrink right 10 px or 10 ppt
-        bindsym Shift+Right resize grow   right 10 px or 10 ppt
+        bindsym Left        resize shrink width 10 px or 10 ppt
+        bindsym Down        resize grow height 10 px or 10 ppt
+        bindsym Up          resize shrink height 10 px or 10 ppt
+        bindsym Right       resize grow width 10 px or 10 ppt
 
         # back to normal: Enter or Escape
         bindsym Return mode "default"
@@ -145,6 +131,12 @@ mode "resize" {
 
 bindsym Mod1+r mode "resize"
 
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status
+}
+
 #######################################################################
 # automatically start i3-config-wizard to offer the user to create a
 # keysym-based config which used his favorite modifier (alt or windows)