Merge branch 'development'

i3/config

@@ -121,10 +121,10 @@ bindsym $mod+l focus right
 
 # container focusing (with fallback for case where window is direct child of workspace container)
 # NOTE: requires xdotool
-bindsym $mod+Ctrl+h exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus left; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus left\\"; fi"
-bindsym $mod+Ctrl+j exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus down; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus down\\"; fi"
-bindsym $mod+Ctrl+k exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus up; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus up\\"; fi"
-bindsym $mod+Ctrl+l exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus right; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus right\\"; fi"
+#bindsym $mod+Ctrl+h exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus left; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus left\\"; fi"
+#bindsym $mod+Ctrl+j exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus down; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus down\\"; fi"
+#bindsym $mod+Ctrl+k exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus up; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus up\\"; fi"
+#bindsym $mod+Ctrl+l exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus right; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus right\\"; fi"
 
 # move focused window
 bindsym $mod+Shift+Left move left 100px

tmux/.tmux.conf

@@ -2,27 +2,23 @@
 set -g terminal-overrides "xterm*:kLFT5=\eOD:kRIT5=\eOC:kUP5=\eOA:kDN5=\eOB:smkx@:rmkx@"
 
 # create (h)orizontal and (v)ertical panes without prefix
-bind -n M-n split-window -h
-bind -n M-m split-window -v
+bind -n C-M-n split-window -h
+bind -n C-M-m split-window -v
 
 # Resize panes without prefix
-bind -n M-Down resize-pane -D
-bind -n M-Up resize-pane -U
-bind -n M-Left resize-pane -L
-bind -n M-Right resize-pane -R
+bind -n C-M-Down resize-pane -D
+bind -n C-M-Up resize-pane -U
+bind -n C-M-Left resize-pane -L
+bind -n C-M-Right resize-pane -R
 
 # zoom into pane
-bind -n M-f resize-pane -Z
+bind -n C-M-f resize-pane -Z
 
 # Use Alt-hjkl without prefix key to switch panes
-bind -n M-h select-pane -L
-bind -n M-l select-pane -R
-bind -n M-k select-pane -U
-bind -n M-j select-pane -D
-
-# Shift arrow to switch windows
-bind -n C-M-h previous-window
-bind -n C-M-l next-window
+bind -n C-M-h select-pane -L
+bind -n C-M-l select-pane -R
+bind -n C-M-k select-pane -U
+bind -n C-M-j select-pane -D
 
 # No delay for escape key press
 set -sg escape-time 0