diff --git a/.gitmodules b/.gitmodules index c7d1cc4..2ea072f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "init/Smyck-Color-Scheme"] - path = init/Smyck-Color-Scheme - url = https://github.com/hukl/Smyck-Color-Scheme.git [submodule "init/FiraCode"] path = init/FiraCode url = https://github.com/tonsky/FiraCode.git diff --git a/.vimrc b/.vimrc index a93f71b..4dc9503 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,20 @@ +" Install vim-plug +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif + +" Specify a directory for plugins +" Install plugins +call plug#begin('~/.vim/plugged') + + Plug 'elzr/vim-json' + Plug 'arcticicestudio/nord-vim' + +" Initialize plugin system +call plug#end() + set nocompatible " Vim defaults rather than vi ones. Keep at top. filetype plugin indent on " Enable filetype-specific settings. syntax on " Enable syntax highlighting. @@ -63,20 +80,3 @@ au BufNewFile,BufRead *.json set ft=javascript " make Python follow PEP8 ( http://www.python.org/dev/peps/pep-0008/ ) au FileType python set softtabstop=4 tabstop=4 shiftwidth=4 textwidth=79 - -" Install vim-plug -if empty(glob('~/.vim/autoload/plug.vim')) - silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs - \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - autocmd VimEnter * PlugInstall --sync | source $MYVIMRC -endif - -" Specify a directory for plugins -" Install plugins -call plug#begin('~/.vim/plugged') - - Plug 'elzr/vim-json' - Plug 'arcticicestudio/nord-vim' - -" Initialize plugin system -call plug#end()