merge with work (f65ac98)

.i3/config

@@ -9,7 +9,7 @@
 #
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
-set $mod Mod1
+set $mod Mod4
 
 # font for window titles. ISO 10646 = Unicode
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@@ -48,30 +48,16 @@ bindsym $mod+d exec dmenu_run
 bindsym $mod+Escape exec i3lock -c 000000
 
 # change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+Shift+J move left
-bindsym $mod+Shift+K move down
-bindsym $mod+Shift+L move up
-bindsym $mod+Shift+colon move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-#client.orientation	 #ff0000
+bindsym $mod+Shift+Left move left 25 px
+bindsym $mod+Shift+Down move down 25 px
+bindsym $mod+Shift+Up move up 25 px
+bindsym $mod+Shift+Right move right 25 px
 
 # split in horizontal orientation
 bindsym $mod+h split h
@@ -93,10 +79,6 @@ bindsym $mod+Shift+space floating toggle
 # change focus between tiling / floating windows
 bindsym $mod+space focus mode_toggle
 
-#focus mouse on/off
-#focus_follows_mouse yes
-#bindsym $mod+m focus_follows_mouse mode_toggle
-
 # focus the parent container
 bindsym $mod+a focus parent
 
@@ -129,8 +111,10 @@ bindsym $mod+Shift+parenright move container to workspace 10
 
 # reload the configuration file
 bindsym $mod+Shift+C reload
+
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+R restart
+
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+E exit
 
@@ -138,16 +122,6 @@ bindsym $mod+Shift+E exit
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
 
-        # 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 Right 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
@@ -157,12 +131,13 @@ mode "resize" {
         bindsym Return mode "default"
         bindsym Escape mode "default"
 }
-
 bindsym $mod+r mode "resize"
 
-# colours
+# colors
 client.focused #000000 #009900 #ffffff #ff0000
+#client.focused_inactive
 client.unfocused #000000 #005500 #000000 #ff0000
+#client.urgent
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -171,7 +146,7 @@ bar {
 	position		top
 	tray_output		primary
 	workspace_buttons	yes
-	mode			hide
+	mode			dock
 	modifier		$mod
 
         colors {
@@ -179,7 +154,6 @@ bar {
 
           focused_workspace #00cc00 #00ff00 #000000
           inactive_workspace #00cc00 #008b00 #cccccc
+	  #client.orientation #ff0000
         }
 }
-
-exec i3-msg split vertical

.i3/i3status

@@ -5,7 +5,7 @@ general {
 
 order += "ipv6"
 order += "ethernet eth0"
-order += "wireless wlan1"
+order += "wireless wlan0"
 order += "battery 0"
 order += "cpu_usage"
 order += "load"