From f6280532947dd16bc9511b705f655932a17bf59d Mon Sep 17 00:00:00 2001 From: Steffen Rademacker Date: Mon, 26 Dec 2016 13:00:55 +0100 Subject: [PATCH] dein + cleanup --- install/_install.sh | 1 + nvim/bundles.vim | 11 +++-------- nvim/config.vim | 3 --- nvim/init.vim | 8 ++++++++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/install/_install.sh b/install/_install.sh index befb510..da5b59c 100755 --- a/install/_install.sh +++ b/install/_install.sh @@ -31,6 +31,7 @@ pip3 install neovim curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh > installer.sh sh installer.sh ~/.config/nvim/dein read -p "Press any key to continue... " -n1 -s +rm installer.sh # install fzf /usr/local/opt/fzf/install diff --git a/nvim/bundles.vim b/nvim/bundles.vim index 0692849..ad5193d 100644 --- a/nvim/bundles.vim +++ b/nvim/bundles.vim @@ -4,15 +4,13 @@ call dein#add('cakebaker/scss-syntax.vim', { 'on_ft': [ 'scss', 'css'] }) call dein#add('christoomey/vim-tmux-navigator') call dein#add('cocopon/lightline-hybrid.vim') call dein#add('editorconfig/editorconfig-vim') -" call dein#add('gcorne/vim-sass-lint') call dein#add('haya14busa/incsearch.vim') call dein#add('itchyny/lightline.vim') +call dein#add('itmammoth/doorboy.vim') call dein#add('junegunn/fzf', { 'merged': 0 }) call dein#add('junegunn/fzf.vim', { 'depends': 'fzf' }) call dein#add('justinmk/vim-sneak') call dein#add('moll/vim-node', { 'on_ft': 'javascript' }) -" call dein#add('mtscout6/syntastic-local-eslint.vim', { 'on_ft': 'javascript' }) -" call dein#add('scrooloose/syntastic') call dein#add('sheerun/vim-polyglot') call dein#add('tpope/vim-commentary') call dein#add('tpope/vim-fugitive') @@ -21,11 +19,8 @@ call dein#add('tpope/vim-repeat') call dein#add('tpope/vim-surround') call dein#add('tpope/vim-unimpaired') call dein#add('tpope/vim-vinegar') +call dein#add('tyru/open-browser.vim') call dein#add('w0ng/vim-hybrid') +call dein#add('w0rp/ale') call dein#add('webgefrickel/vim-snippets') call dein#add('wellle/tmux-complete.vim') -call dein#add('itmammoth/doorboy.vim') - -" test those -call dein#add('tyru/open-browser.vim') -call dein#add('w0rp/ale') diff --git a/nvim/config.vim b/nvim/config.vim index 164e13e..92fd4d2 100644 --- a/nvim/config.vim +++ b/nvim/config.vim @@ -1,6 +1,3 @@ -filetype plugin indent on -syntax on - set autoread " Automatically read a file that has changed on disk set backspace=indent,eol,start " Allow backspacing over everything in insert mode set cursorline " highlight current line diff --git a/nvim/init.vim b/nvim/init.vim index 699302a..b853d05 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,11 +1,19 @@ +if &compatible + set nocompatible +endif + set langmenu=en_US.UTF-8 set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim " let dein handle all the plugins and bundles call dein#begin(expand('~/.config/nvim/dein')) +call dein#add('Shougo/dein.vim') source ~/.config/nvim/bundles.vim call dein#end() +filetype plugin indent on +syntax on + " load the default config and mappings source ~/.config/nvim/config.vim source ~/.config/nvim/autocommands.vim