From c53c0a99c508a31452acdfed5f219813766394a0 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@constantcontact.com>
Date: Wed, 11 Dec 2019 10:28:19 -0500
Subject: [PATCH] Fixed up

---
 tmux/tmux.conf      |  2 +-
 vim/vimrc           | 74 ---------------------------------------------
 zsh/zsh_plugins.txt |  1 -
 zsh/zshrc           | 14 +++++++++
 4 files changed, 15 insertions(+), 76 deletions(-)

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 96aa019..fe7effb 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -23,7 +23,7 @@ setw -g pane-base-index 1
 
 # Set titles
 set-option -g set-titles on
-set-option -g set-titles-string "#T - #W"
+# set-option -g set-titles-string "#T - #W"
 
 # Set status bar
 set -g status-bg black
diff --git a/vim/vimrc b/vim/vimrc
index 574737a..071b9ef 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -63,80 +63,6 @@ Plug 'prabirshrestha/async.vim'
 
 call plug#end()
 
-function! s:writebuffer(bufname, text) 
-    let l:bufnum = bufwinnr(a:bufname)
-    if l:bufnum == -1
-        execute "vsplit" a:bufname
-        setlocal buftype=nofile
-    else
-        execute l:bufnum . 'wincmd w'
-    endif
-
-    call append(0, a:text)
-endfunction
-
-function! s:handlegeneric(cmd, tech, job_id, data, event_type)
-    if a:event_type == 'exit'
-        echom a:cmd . ' completed successfully'
-    elseif a:event_type == 'stdout' && len(a:data) > 1
-        call s:writebuffer('__STDOUT_' . a:tech . '__', a:data)
-    elseif a:event_type == 'stderr' && len(a:data) > 1
-        call s:writebuffer('__STDERR_' . a:tech . '__', a:data)
-    endif
-endfunction
-
-"Setting up coc-tools
-function! s:handlepython(job_id, data, event_type)
-    call s:handlegeneric('pip install python-language-server pynvim rope', 'PYTHON', a:job_id, a:data, a:event_type)
-endfunction
-
-function! s:handleruby(job_id, data, event_type)
-    call s:handlegeneric('gem install solargraph neovim', 'RUBY', a:job_id, a:data, a:event_type)
-endfunction
-
-function! s:handlenode(job_id, data, event_type)
-    call s:handlegeneric('yarn global add neovim', 'NODE', a:job_id, a:data, a:event_type)
-endfunction
-
-function! s:cmdexitcode(cmd)
-    let l:output = system(a:cmd)
-    return v:shell_error
-endfunction
-
-function! s:asyncFunc(cmd, callbackfunc)
-    return async#job#start(a:cmd, {
-            \ 'on_stdout': function(a:callbackfunc),
-            \ 'on_stderr': function(a:callbackfunc),
-            \ 'on_exit': function(a:callbackfunc)
-      \ })
-endfunction
-
-
-function! s:ensurePython()
-    if (s:cmdexitcode('pyls -h') || s:cmdexitcode('python -c "import neovim"') || s:cmdexitcode('python -c "import rope"'))
-        let l:jobid = s:asyncFunc('pip install python-language-server pynvim rope', 's:handlepython')
-        au VimEnter *.py CocInstall coc-python
-    endif
-endfunction
-
-function! s:ensureRuby()
-    if (s:cmdexitcode('solargraph -v') || s:cmdexitcode('ruby -e "require \"neovim\""'))
-        let l:jobid = s:asyncFunc('gem install solargraph neovim', 's:handleruby')
-        au VimEnter *.rb CocInstall coc-solargraph
-    endif
-endfunction
-
-function! s:ensureNode()
-    if (s:cmdexitcode('neovim-node-host --version'))
-        let l:jobid = s:asyncFunc('yarn global add neovim', 's:handlenode')
-        au VimEnter *.js,*.ts CocInstall coc-tsserver
-    endif
-endfunction
-
-call s:ensurePython()
-call s:ensureRuby()
-call s:ensureNode()
-
 inoremap <silent><expr> <TAB>
       \ pumvisible() ? "\<C-n>" :
       \ <SID>check_back_space() ? "\<TAB>" :
diff --git a/zsh/zsh_plugins.txt b/zsh/zsh_plugins.txt
index eb154f9..b47a2aa 100644
--- a/zsh/zsh_plugins.txt
+++ b/zsh/zsh_plugins.txt
@@ -2,7 +2,6 @@ robbyrussell/oh-my-zsh path:plugins/git
 robbyrussell/oh-my-zsh path:plugins/vi-mode
 robbyrussell/oh-my-zsh path:plugins/fzf
 robbyrussell/oh-my-zsh path:plugins/gitignore
-robbyrussell/oh-my-zsh path:plugins/magic-enter
 robbyrussell/oh-my-zsh path:plugins/pass
 robbyrussell/oh-my-zsh path:plugins/ripgrep
 
diff --git a/zsh/zshrc b/zsh/zshrc
index fc87b9d..09275c5 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -71,6 +71,20 @@ function _send_to_pane {
 }
 compctl -K _send_to_pane send-to-pane
 
+if [[ -n $TMUX ]]; then
+    export NVIM_LISTEN_ADDRESS="/tmp/nvim_${USER}_$(tmux display -p '#{session_name}')"
+fi
+
+function nv() {
+  if [[ ! -z "$TMUX" ]]; then
+    local ids="$(tmux list-panes -a -F '#{pane_current_command} #{window_id} #{pane_id}' | awk '/^nvim / {print $2" "$3; exit}')"
+    local window_id="$ids[(w)1]"
+    local pane_id="$ids[(w)2]"
+    [[ ! -z "$pane_id" ]] && tmux select-window -t "$window_id" && tmux select-pane -t "$pane_id"
+  fi
+  nvr -s $@
+}
+
 # the following lines sourced from the fzf distribution files
 export FZF_TMUX=1