link vimrc to nvim config

1 files changed, 17 insertions, 16 deletions

diff --git a/.vimrc b/.vimrc
index 78cb001..5490029 100644
--- a/.vimrc
+++ b/.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>