From c31de323707fce2f5d0638fb7dd76221366c6a40 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Fri, 20 Jan 2017 15:07:45 +0100
Subject: [PATCH] Firefox style update for VimFX

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 dotfiles/gitignore   | 3 +++
 dotfiles/tmux.conf   | 4 +---
 lib/tmux/custom.tmux | 9 +++++++++
 lib/vim/base16-vim   | 2 +-
 lib/vim/ultisnips    | 2 +-
 lib/vim/vim-snippets | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100755 lib/tmux/custom.tmux

diff --git a/dotfiles/gitignore b/dotfiles/gitignore
index a8f395c2..99a0abd9 100644
--- a/dotfiles/gitignore
+++ b/dotfiles/gitignore
@@ -24,6 +24,8 @@ tags
 .tags
 .tags1
 gtags.files
+tags.lock
+tags.temp
 GTAGS
 GRTAGS
 GPATH
@@ -41,5 +43,6 @@ Session.vim
 *~
 
 # Misc
+.editorconfig
 .yangcp/
 nohup.out
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index c511d645..07292d87 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -47,9 +47,6 @@
   # Clear screen fix
   bind C-l send-keys 'C-l'
 
-  # Pipe entire current buffer to vim and load copied text to tmux buffer
-  bind e run-shell 'tmux capture-pane -S - && tmux split-window -v "tmux show-buffer | sed \'/^\s*$/d\' | reattach-to-user-namespace view - +$ +\"set clipboard=unnamed\"; reattach-to-user-namespace pbpaste | tmux load-buffer -"'
-
 # }}}
 
 # User interface {{{
@@ -103,6 +100,7 @@
 
 # Plugins {{{
 
+  run-shell "$DOTHOME/lib/tmux/custom.tmux"
   run-shell "$DOTHOME/lib/tmux/tmux-sensible/sensible.tmux"
   run-shell "$DOTHOME/lib/tmux/vim-tmux-navigator/vim-tmux-navigator.tmux"
   run-shell "$DOTHOME/lib/tmux/tmux-yank/yank.tmux"
diff --git a/lib/tmux/custom.tmux b/lib/tmux/custom.tmux
new file mode 100755
index 00000000..04b7c2f0
--- /dev/null
+++ b/lib/tmux/custom.tmux
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Pipe entire current buffer to vim and load copied text to tmux buffer
+if [ "$(uname -s)" = Darwin]; then
+  tmux bind e capture-pane -S - '\;' split-window -v "tmux show-buffer | sed '/^\s*$/d' | reattach-to-user-namespace view
+  - +'$' +'set clipboard=unnamed'; reattach-to-user-namespace pbpaste | tmux load-buffer -"
+else
+  tmux bind e capture-pane -S - '\;' split-window -v "tmux show-buffer | sed '/^\s*$/d' | view - +'$' +'set clipboard=unnamed'; pbpaste | tmux load-buffer -"
+fi
diff --git a/lib/vim/base16-vim b/lib/vim/base16-vim
index 09c3fbb0..f6e70df4 160000
--- a/lib/vim/base16-vim
+++ b/lib/vim/base16-vim
@@ -1 +1 @@
-Subproject commit 09c3fbb0edf5b40bf13177b487640106f832652d
+Subproject commit f6e70df4c43cda3f895ff07bdad2dc7cccc43966
diff --git a/lib/vim/ultisnips b/lib/vim/ultisnips
index f974e031..5352d98f 160000
--- a/lib/vim/ultisnips
+++ b/lib/vim/ultisnips
@@ -1 +1 @@
-Subproject commit f974e0317f549c7cf54fa231ee0501206aed6882
+Subproject commit 5352d98f212e273b3e8b1d84efdbe2d6a6d557e9
diff --git a/lib/vim/vim-snippets b/lib/vim/vim-snippets
index 8f5a51ac..ff501974 160000
--- a/lib/vim/vim-snippets
+++ b/lib/vim/vim-snippets
@@ -1 +1 @@
-Subproject commit 8f5a51ac2581a4b81e5be79f9c330fa204a3759a
+Subproject commit ff5019746af5ab1f0ae96475db33b7921ef6d3ab