Merge branch 'i3-fix-workspace'

Install/Templates/i3/config

@@ -14,19 +14,20 @@ font pango:monospace 8
 
 # use these keys for focus, movement, and resize directions when reaching for
 # the arrows is not convenient
-set $up k
-set $down j
+set $up n
+set $down t
 set $left h
-set $right l
+set $right s
 
-# use Mouse+Mod4 to drag floating windows to their wanted position
+# use Mouse+mod to drag floating windows to their wanted position
 floating_modifier $mod
 
 # start a terminal
+bindsym less exec i3-sensible-terminal
 bindsym $mod+Return exec i3-sensible-terminal
 
 # kill focused window
-bindsym $mod+Shift+t kill
+bindsym $mod+Shift+w kill
 
 # start dmenu (a program launcher)
 bindsym $mod+d exec dmenu_run
@@ -92,58 +93,84 @@ bindsym $mod+Shift+semicolon move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+semicolon scratchpad show
 
+# Workspace bindings
+set $work1 g
+set $work2 c
+set $work3 r
+set $work4 l
+set $work5 parenleft
+set $work6 equal
+set $work7 asterisk
+set $work8 parenright
+set $work9 plus
+set $work10 bracketright
+
+# Number keypad bindings
+set $KP_0 KP_Insert
+set $KP_1 KP_End
+set $KP_2 KP_Down
+set $KP_3 KP_Next
+set $KP_4 KP_Left
+set $KP_5 KP_Begin
+set $KP_6 KP_Right
+set $KP_7 KP_Home
+set $KP_8 KP_Up
+set $KP_9 KP_Prior
+set $KP_Decimal KP_Delete
+
 # switch to workspace
-bindsym $mod+ampersand workspace 1
-bindsym $mod+bracketleft workspace 2
-bindsym $mod+braceleft workspace 3
-bindsym $mod+braceright workspace 4
-bindsym $mod+parenleft workspace 5
-bindsym $mod+equal workspace 6
-bindsym $mod+asterisk workspace 7
-bindsym $mod+parenright workspace 8
-bindsym $mod+plus workspace 9
-bindsym $mod+bracketright workspace 10
+bindsym $mod+$work1 workspace 1
+bindsym $mod+$work2 workspace 2
+bindsym $mod+$work3 workspace 3
+bindsym $mod+$work4 workspace 4
+bindsym $mod+$work5 workspace 5
+bindsym $mod+$work6 workspace 6
+bindsym $mod+$work7 workspace 7
+bindsym $mod+$work8 workspace 8
+bindsym $mod+$work9 workspace 9
+bindsym $mod+$work10 workspace 10
 
 # switch to workspace with numpad
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
+bindsym $mod+$KP_1 workspace 1
+bindsym $mod+$KP_2 workspace 2
+bindsym $mod+$KP_3 workspace 3
+bindsym $mod+$KP_4 workspace 4
+bindsym $mod+$KP_5 workspace 5
+bindsym $mod+$KP_6 workspace 6
+bindsym $mod+$KP_7 workspace 7
+bindsym $mod+$KP_8 workspace 8
+bindsym $mod+$KP_9 workspace 9
+bindsym $mod+$KP_0 workspace 10
 
 # move focused container to workspace
-bindsym $mod+Shift+ampersand move container to workspace 1
-bindsym $mod+Shift+bracketleft move container to workspace 2
-bindsym $mod+Shift+braceleft move container to workspace 3
-bindsym $mod+Shift+braceright move container to workspace 4
-bindsym $mod+Shift+parenleft move container to workspace 5
-bindsym $mod+Shift+equal move container to workspace 6
-bindsym $mod+Shift+asterisk move container to workspace 7
-bindsym $mod+Shift+parenright move container to workspace 8
-bindsym $mod+Shift+plus move container to workspace 9
-bindsym $mod+Shift+bracketright move container to workspace 10
+bindsym $mod+Shift+$work1 move container to workspace 1
+bindsym $mod+Shift+$work2 move container to workspace 2
+bindsym $mod+Shift+$work3 move container to workspace 3
+bindsym $mod+Shift+$work4 move container to workspace 4
+bindsym $mod+Shift+$work5 move container to workspace 5
+bindsym $mod+Shift+$work6 move container to workspace 6
+bindsym $mod+Shift+$work7 move container to workspace 7
+bindsym $mod+Shift+$work8 move container to workspace 8
+bindsym $mod+Shift+$work9 move container to workspace 9
+bindsym $mod+Shift+$work10 move container to workspace 10
 
 # move focused container to workspace with numpad
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
+bindsym $mod+Shift+$KP_1 move container to workspace 1
+bindsym $mod+Shift+$KP_2 move container to workspace 2
+bindsym $mod+Shift+$KP_3 move container to workspace 3
+bindsym $mod+Shift+$KP_4 move container to workspace 4
+bindsym $mod+Shift+$KP_5 move container to workspace 5
+bindsym $mod+Shift+$KP_6 move container to workspace 6
+bindsym $mod+Shift+$KP_7 move container to workspace 7
+bindsym $mod+Shift+$KP_8 move container to workspace 8
+bindsym $mod+Shift+$KP_9 move container to workspace 9
+bindsym $mod+Shift+$KP_0 move container to workspace 10
 
 # reload the configuration file
-bindsym $mod+Shift+c reload
+bindsym $mod+Shift+y reload
+
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
+bindsym $mod+Shift+x restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Escape exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
@@ -171,7 +198,7 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
-bindsym $mod+g mode "resize"
+bindsym $mod+b mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)

Install/i3-install

@@ -1,4 +1,5 @@
-#!/bin/usr/fish
+#!/usr/bin/fish
+
 # Install i3 config
 # You must have installed the i3 package before