Just in case you wanted to see/take any of these changes

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "vim/.vim/autoload"]
 	path = vim/.vim/autoload
 	url = https://github.com/junegunn/vim-plug
+[submodule "tmux/.tmux/plugins/tpm"]
+	path = tmux/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm

git/.gitconfig

@@ -4,10 +4,10 @@
 [hub]
         protocol = https
 [user]
-        name = Chris Seto
-        email = chriskseto@gmail.com
+        name = Fabian von Feilitzsch
+        email = fabian@fabianism.us
 [credential]
-        helper = osxkeychain
+	helper = cache
 [alias]
         st = status
         co = checkout

packages.txt

@@ -1,4 +1,6 @@
+ruby
 stow
 zsh
 tmux
 vim
+fasd

setup.sh

@@ -1,6 +1,13 @@
+echo "Initializing submodules"
 git submodule init
 git submodule update
+echo "Linking zsh configuration"
 stow zsh
+echo "Linking vim configuration"
 stow vim
+echo "Linking git configuration"
 stow git
+echo "Linking tmux configuration"
 stow tmux
+echo "Installing tmuxinator"
+gem install --user-install tmuxinator

tmux/.tmux.conf

@@ -15,12 +15,12 @@ set -g default-terminal "screen-256color"
 # Use vim keybindings
 setw -g mode-keys vi
 set -g status-keys vi
-setw -g utf8 on
+# setw -g utf8 on
 # use mouse in copy mode
-setw -g mode-mouse on
+setw -g mouse on
 
 # status line
-set -g status-utf8 on
+# set -g status-utf8 on
 set -g status-justify left
 set -g status-bg colour2
 set -g status-fg colour0
@@ -29,8 +29,8 @@ set -g status-interval 2
 set -g status-left-length 32
 set -g status-right-length 150
 
-set -g pane-border-fg colour255
-set -g pane-active-border-fg colour2
+# set -g pane-border-fg colour255
+# set -g pane-active-border-fg colour2
 
 set -g status-right "#(date +\"%c\")"
 set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(hostname -s) #[fg=colour238,bg=colour2,nobold]⮀'
@@ -92,20 +92,18 @@ bind + select-layout main-horizontal
 ############
 
 # Toggle mouse on
+unbind m
 bind m \
-    set -g mode-mouse on \;\
-    set -g mouse-resize-pane on \;\
-    set -g mouse-select-pane on \;\
-    set -g mouse-select-window on \;\
-    display 'Mouse: ON'
-
-# Toggle mouse off
-bind M \
-    set -g mode-mouse off \;\
-    set -g mouse-resize-pane off \;\
-    set -g mouse-select-pane off \;\
-    set -g mouse-select-window off \;\
-    display 'Mouse: OFF'
+    set -g mouse on
+    # set -g set-clipboard off
+    # set -g mouse-utf8 on
+    # set -g select-pane on
+    # set-option -g -q mouse on \;\
+    # bind-key -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M" \;\
+    # bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M" \;\
+    # bind-key -t vi-copy WheelUpPane halfpage-up \;\
+    # bind-key -t vi-copy WheelDownPane halfpage-down \;\
+    # display 'Mouse: ON'
 
 # Navigate panes
 ################
@@ -118,7 +116,7 @@ bind-key v split-window -h -c "#{pane_current_path}"
 bind-key s split-window -v -c "#{pane_current_path}"
 
 # smart pane switching with awareness of vim splits
-is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?x?)(diff)?$"'
 bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
 bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
 bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
@@ -158,16 +156,24 @@ bind C-q confirm kill-server
 
 bind tab choose-window
 
-# Make copy-n-paste work on OSX
-###############################
-
 # Setup 'v' to begin selection as in Vim
-bind-key -t vi-copy v begin-selection
-bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
-
-# Make vim yanking work with OSX system clipboard
-set-option -g default-command "reattach-to-user-namespace -l zsh"
+bind-key -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
 
 # Remove lag from esc + key -> alt code
 # IE make neovim usable
 set -sg escape-time 0
+
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
+# Resurrect/Continuum options
+set -g @resurrect-capture-pane-contents 'on'
+set -g @continuum-boot 'on'
+set -g @continuum-restore 'on'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'

tmux/tmuxinator.zsh

@@ -0,0 +1,30 @@
+#compdef tmuxinator mux
+
+_tmuxinator() {
+  local commands projects
+  commands=(${(f)"$(tmuxinator commands zsh)"})
+  projects=(${(f)"$(tmuxinator completions start)"})
+
+  if (( CURRENT == 2 )); then
+    _describe -t commands "tmuxinator subcommands" commands
+    _describe -t projects "tmuxinator projects" projects
+  elif (( CURRENT == 3)); then
+    case $words[2] in
+      copy|debug|delete|open|start)
+        _arguments '*:projects:($projects)'
+      ;;
+    esac
+  fi
+
+  return
+}
+
+_tmuxinator
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et