4 files changed, 13 insertions, 6 deletions

diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim
index e00153f..4e33bf0 100644
--- a/nvim/autocmd.vim
+++ b/nvim/autocmd.vim
@@ -1,5 +1 @@
-"autocmd VimEnter * NERDTree | wincmd p
-"autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
-"autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif
-
 autocmd FileType html,css EmmetInstall
diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim
index 6c2ee1b..a94533b 100644
--- a/nvim/keymaps.vim
+++ b/nvim/keymaps.vim
@@ -23,9 +23,15 @@ vnoremap <A-k> :m '<-2<CR>gv=gv
 map j gj
 map k gk
 
+" Vernünftige Tastenbelegungen für Autocomplete
+inoremap <expr> <CR>  pumvisible() ? "\<C-y>" : "\<CR>"
+inoremap <expr> <Tab> pumvisible() ? "\<C-y>" : "\<Tab>"
+inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>"
+inoremap <expr> <C-j> pumvisible() ? "\<C-n>" : "\<Down>"
+inoremap <expr> <C-k> pumvisible() ? "\<C-p>" : "\<Up>"
+
 " Funktionstasten
 nnoremap <F4> :NERDTreeToggle<CR>
 nnoremap <F5> :make<CR>
 nnoremap <F7> :MundoToggle<CR>
 nnoremap <F8> :TagbarToggle<CR>
-
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 1386eca..3111f6a 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -48,6 +48,8 @@ let g:mundo_preview_height=30
 
 " Autopairs
 let b:autopairs_enabled=1
+let g:AutoPairsMapBS=1
+let g:AutoPairsPrefix='<M-P>'
 
 " Treesitter
 lua << EOF
diff --git a/nvim/settings.vim b/nvim/settings.vim
index 2a582e0..9fa0508 100644
--- a/nvim/settings.vim
+++ b/nvim/settings.vim
@@ -10,6 +10,7 @@ set noshowcmd
 set splitright
 set splitbelow
 set hidden
+set signcolumn=no
 
 " Rechtsschreibprüfung
 set spell
@@ -50,6 +51,9 @@ set cindent
 set foldlevel=1000
 set foldcolumn=0
 
+" Autovervollständigung
+set completeopt=longest,menuone
+
 " externe Programme
 set makeprg=gmake
 
@@ -73,4 +77,3 @@ filetype plugin indent on
 set termguicolors
 colorscheme habamax
 highlight MatchParen gui=bold,underline cterm=bold,underline
-