From 0ed6db880460ce9cd22fdbec3ffcece0b9b49af3 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Mon, 15 Apr 2019 10:33:51 -0600
Subject: [PATCH] Update nvim config

---
 .bash_aliases         | 3 ++-
 .config/nvim/init.vim | 6 ++++++
 .gitconfig            | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.bash_aliases b/.bash_aliases
index 618d850..50f2434 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -24,7 +24,8 @@ alias ls="ls -h --color=auto"
 export CC=gcc
 export CXX=g++
 alias nv="nvim"
-alias did="vim +'normal Go' +'r!date' ~/Documents/did.txt"
+alias vim="nvim"
+alias did="nvim +'normal Go' +'r!date' ~/Documents/did.txt"
 
 alias lcat='pygmentize -g -O style=colorful,linenos=1 | grep -P "^\d\d\d\d:"'
 alias ccat='pygmentize -g'
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ad0670b..0df8998 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -2,6 +2,7 @@ map <ESC>[1;5A <C-Up>
 map <ESC>[1;5B <C-Down>
 map <ESC>[1;5C <C-Right>
 map <ESC>[1;5D <C-Left>
+nnoremap gm m
 
 " Live updating substitution!
 set inccommand=nosplit
@@ -215,6 +216,9 @@ inoremap <A-j> <Esc>:tabl<cr>i
 inoremap <A-h> <Esc>gTi
 inoremap <A-l> <Esc>gti
 
+set clipboard=
+let g:EasyClipShareYanks = 1
+
 
 "set statusline+=%#warningmsg#
 "set statusline+=%{SyntasticStatuslineFlag()}
@@ -270,6 +274,7 @@ Plug 'kana/vim-textobj-user'
 Plug 'kana/vim-textobj-line'
 Plug 'Julian/vim-textobj-brace'
 Plug 'bps/vim-textobj-python'
+Plug 'svermeulen/vim-easyclip'
 "Plug 'baabelfish/nvim-nim'
 call plug#end()
 
@@ -279,6 +284,7 @@ set termguicolors
 nnoremap <F6> :MundoToggle<CR>
 nnoremap riW ciW<C-r>0<ESC>
 nnoremap riw ciw<C-r>0<ESC>
+let g:EasyClipShareYanks = 1
 
 "let base16colorspace=256
 " set background=dark
diff --git a/.gitconfig b/.gitconfig
index 22723d1..a3ac576 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,3 +5,5 @@
 	editor = vim
 [color]
 	ui = auto
+[push]
+	default = current