diff options
| -rw-r--r-- | .config/nvim/init.vim | 50 | ||||
| -rw-r--r-- | .vimrc | 33 |
2 files changed, 20 insertions, 63 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 99505ba..f182e5b 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,47 +1,3 @@ - -set nocompatible " be iMproved, required -filetype off " required - -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() -" alternatively, pass a path where Vundle should install plugins -"call vundle#begin('~/some/path/here') - -" let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' - -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-speeddating' - -Plugin 'zchee/deoplete-jedi' - -Plugin 'sirtaj/vim-openscad' - -Plugin 'nanotech/jellybeans.vim' - -Plugin 'Shougo/deoplete.nvim' - -Plugin 'agude/vim-eldar' - -call vundle#end() " required -filetype plugin indent on " required - - -colorscheme eldar - -syntax enable -set number relativenumber - -set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab - - -let g:deoplete#enable_at_startup = 1 - - -inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" -inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" - - -tnoremap <C-e> <C-\><C-n> +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc @@ -1,3 +1,4 @@ + set nocompatible " be iMproved, required filetype off " required @@ -14,33 +15,33 @@ Plugin 'tpope/vim-surround' Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-speeddating' +Plugin 'zchee/deoplete-jedi' + Plugin 'sirtaj/vim-openscad' -Plugin 'jceb/vim-orgmode' +Plugin 'nanotech/jellybeans.vim' +Plugin 'kien/ctrlp.vim' +Plugin 'Shougo/deoplete.nvim' -Plugin 'Valloric/YouCompleteMe' +Plugin 'agude/vim-eldar' -" All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required -" To ignore plugin indent changes, instead use: -"filetype plugin on -" -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal -" -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line +colorscheme eldar + syntax enable set number relativenumber set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab -" Org mode " -let g:org_agenda_files = ['/home/julian/Dropbox/Noter/2018.org'] +let g:deoplete#enable_at_startup = 1 + + +inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" +inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" + + +tnoremap <C-e> <C-\><C-n> |