From da83aef72ea74dad7cdb366e887115b5867744e8 Mon Sep 17 00:00:00 2001
From: Joseph Ferano <joseph@ferano.io>
Date: Thu, 7 May 2020 16:15:52 +0700
Subject: [PATCH] New vim plugins

---
 .config/fish/config.fish |  5 ++++-
 .tmux.conf               |  5 +++--
 .vimrc                   | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0204252..10686a8 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,7 +1,7 @@
 set -g fish_user_paths $fish_user_paths ~/bin ~/.cargo/bin ~/.local/bin
 
 set -g MANPAGER "sh -c 'col -bx | bat -l man -p'"
-set EDITOR vim
+set EDITOR vi
 set -U FZF_COMPLETE 0
 set -U FZF_LEGACY_KEYBINDINGS 0
 set -U FZF_DEFAULT_OPTS "--height 40% --reverse --border"
@@ -20,6 +20,7 @@ alias ls "exa --group-directories-first"
 alias ll "exa -la --group-directories-first"
 alias lc "exa -1 --group-directories-first"
 alias lt "exa -l --sort=modified"
+alias vi "vim -u ~/.vimrc.basic"
 
 alias xdg-open wsl-open
 
@@ -31,3 +32,5 @@ alias restart-tmux "not pgrep tmux && tmux new -d -s delete-me \
                     && tmux run-shell ~/.tmux/plugins/tmux-resurrect/scripts/restore.sh \
                     && tmux kill-session -t delete-me \
                     && tmux attach || tmux attach "
+
+source /home/joe/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
diff --git a/.tmux.conf b/.tmux.conf
index 9bfc22d..dc69453 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -76,8 +76,9 @@ set-window-option -g window-status-current-format '#[bg=colour254,fg=black] [#I]
 set -g status-right '#[bg=cyan]  %H:%M  #[bg=green]  %A, %e %b %Y   '
 set -g status-left-length 100
 
-set -g window-style 'fg=colour248,bg=colour233'
-set -g window-active-style 'fg=colour255,bg=colour235'
+# set -g window-style 'fg=colour248,bg=colour233'
+set -g window-style 'fg=colour248,bg=black'
+set -g window-active-style 'fg=colour255,bg=colour236'
 set -g pane-border-style 'fg=colour235,bg=default' 
 set -g pane-active-border-style 'fg=white,bg=default'
 
diff --git a/.vimrc b/.vimrc
index 8eebb7f..4badca0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,12 @@
+call plug#begin('~/.vim/plugged')
+
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-repeat'
+
+Plug 'dag/vim-fish', { 'for' : 'fish' }
+
+call plug#end()
+
 set nocompatible
 syntax on
 set number
@@ -33,8 +42,8 @@ nnoremap ' `
 nnoremap ` '
 
 nnoremap <Leader>w :w<CR>
-nnoremap <Leader>rl :so $MYVIMRC<CR>
 nnoremap <Leader>q :q<CR>
+nnoremap <Leader>rl :so $MYVIMRC<CR>
 
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
@@ -47,3 +56,6 @@ if system('uname -r') =~ "Microsoft"
     autocmd TextYankPost * :call system('clip.exe ',@")
   augroup END
 endif
+ 
+let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
+execute "set rtp+=" . g:opamshare . "/merlin/vim"