Merge branch 'master' into mac

1 files changed, 5 insertions, 10 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 812bf3e..01156b5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,10 +13,8 @@ set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
 set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
 set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
 
-if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif
-
 " vimplugs {{{
-call plug#begin('~/.config/nvim/plugged')
+call plug#begin('~/.config/vim/plugged')
 " colorschemes {{{
 Plug 'tomasiser/vim-code-dark'                          " codedark color scheme
 Plug 'flazz/vim-colorschemes'                           " meta-color scheme package
@@ -52,9 +50,9 @@ Plug 'ryanoasis/vim-devicons'                           " dev icons for nerdtree
 call plug#end()
 
 " }}}
-" nvim options {{{
+" vim options {{{
 
-"" nvimrc:
+"" vimrc:
 "" General
 
 set showmatch " Highlight matching brace
@@ -80,9 +78,6 @@ set undolevels=1000             " Number of undo levels
 set backspace=indent,eol,start  " Backspace behaviour
 filetype plugin indent on
  
-"" GUI Config
-set guifont=mononoki\ Nerd\ Font\ Mono:h12
-
 "hi Normal guibg=NONE ctermbg=NONE
 "hi NonText guibg=NONE ctermbg=NONE
 "set background=dark
@@ -260,7 +255,7 @@ nnoremap <leader>wk :resize +1<CR>
 nnoremap <leader>wl :vertical resize +1<CR>
 
 " config
-nnoremap <leader>en :e ~/.config/nvim/init.vim<CR>
+nnoremap <leader>en :e ~/.config/vim/vimrc<CR>
 nnoremap <leader>ec :source %<CR>
 
 " write as root
@@ -303,4 +298,4 @@ nnoremap <leader>pc :PlugClean<CR>
 nnoremap <leader>gp :G pull<CR>
 nnoremap <leader>gd :G diff %<CR>
 
-" }}}
+" }}