2 files changed, 40 insertions, 27 deletions

diff --git a/.config/nvim/after/plugin/abolish.vim b/.config/nvim/after/plugin/abolish.vim
new file mode 100644
index 0000000..cfb6233
--- /dev/null
+++ b/.config/nvim/after/plugin/abolish.vim
@@ -0,0 +1,11 @@
+Abolish {despa,sepe}rat{e,es,ed,ing,ely,ion,ions,or} {despe,sepa}rat{}
+Abolish persistan{ce,t,tly} persisten{}
+Abolish despara{te,tely,tion} despera{}
+Abolish seperat{e,es,ed,ing,ely,ion,ions,or} separat{}
+Abolish teh the
+Abolish {,un}nec{ce,ces,e}sar{y,ily} {}nec{es}sar{}
+Abolish {,ir}releven{ce,cy,t,tly} {}relevan{}
+
+iabbrev <silent> longdate <C-R>=strftime("%a %b %d %T %Z %Y")<CR>
+iabbrev <silent> todaydatetime <C-R>=strftime("%F %T")<CR>
+iabbrev <silent> todaydate <C-R>=strftime("%F")<CR>
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index f3ce6d5..756480f 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -27,6 +27,7 @@ Plug 'bling/vim-airline'
 
 " color theme.
 Plug 'arcticicestudio/nord-vim'
+Plug 'aonemd/kuroi.vim'
 
 "Personal wiki
 Plug 'vimwiki/vimwiki'
@@ -43,10 +44,8 @@ Plug 'godlygeek/tabular'
 Plug 'dbeniamine/cheat.sh-vim'
 "color code highlight
 Plug 'chrisbra/Colorizer'
-
-"comment helper
-"Plug 'scrooloose/nerdcommenter'
-Plug 'tpope/vim-commentary'
+"move selections up and down
+Plug 'matze/vim-move'
 
 "folding ledger files
 Plug 'ledger/vim-ledger'
@@ -80,6 +79,8 @@ Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-abolish'
 "provides ga, show unicode stuff of char under cursor
 Plug 'tpope/vim-characterize'
+"comment helper
+Plug 'tpope/vim-commentary'
 
 "fancy start screen
 Plug 'mhinz/vim-startify'
@@ -98,6 +99,10 @@ autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif
 
 " Close vim if the only window left open is NERDTree
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+
+" Resize all windows proportionally when the terminal is resized
+" let terminal resize scale the internal windows
+autocmd VimResized * :wincmd =
 "}}}
 
 "{{{Misc Settings
@@ -160,22 +165,22 @@ endfunction
 "}}}
 
 "{{{Theme Rotating
-"let themeindex=0
-"function! RotateColorTheme()
-    "let y = -1
-    "while y == -1
-        "let colorstring = "#gotham#"
-        "let x = match( colorstring, "#", g:themeindex )
-        "let y = match( colorstring, "#", x + 1 )
-        "let g:themeindex = x + 1
-        "if y == -1
-            "let g:themeindex = 0
-        "else
-            "let themestring = strpart(colorstring, x + 1, y - x - 1)
-            "return ":colorscheme ".themestring
-        "endif
-    "endwhile
-"endfunction
+let themeindex=0
+function! RotateColorTheme()
+    let y = -1
+    while y == -1
+        let colorstring = "#nord#kuroi#"
+        let x = match( colorstring, "#", g:themeindex )
+        let y = match( colorstring, "#", x + 1 )
+        let g:themeindex = x + 1
+        if y == -1
+            let g:themeindex = 0
+        else
+            let themestring = strpart(colorstring, x + 1, y - x - 1)
+            return ":colorscheme ".themestring
+        endif
+    endwhile
+endfunction
 " }}}
 
 "}}}
@@ -194,7 +199,7 @@ nnoremap <silent> <C-Left> :tabprevious<CR>
 " New Tab
 nnoremap <silent> <C-t> :tabnew<CR>
 " Rotate Color Scheme <F8>
-"nnoremap <silent> <F8> :execute RotateColorTheme()<CR>
+nnoremap <silent> <F8> :execute RotateColorTheme()<CR>
 " FixIt from YCM
 map <F9> :YcmCompleter FixIt<CR>
 " Edit vimrc \ev
@@ -213,17 +218,14 @@ nnoremap <C-k> <C-w>k
 nnoremap <C-h> <C-w>h
 nnoremap <C-l> <C-w>l
 " Disable highlight when <leader><cr> is pressed
-map <silent> <leader><cr> :noh<cr>
+nnoremap <Leader><cr> :set hls!<cr>
 " Space will toggle folds!
 nnoremap <space> za
 " Search mappings: These will make it so that going to the next one in a
 " search will center on the line it's found in.
 map N Nzz
 map n nzz
-"Insert timestamp
-nnoremap <F5> "=strftime("%F %T")<CR>P
-inoremap <F5> <C-R>=strftime("%F %T")<CR>
-nnoremap <Leader>t "=strftime("%F")<CR>P
+
 "}}}
 
 "{{{Tagbar
@@ -372,5 +374,5 @@ let g:vimtex_view_method = 'zathura'
 " }}}
 
 " {{{ rainbow
-let g:rainbow_active = 1
+let g:rainbow_active = 0
 " }}}