5 files changed, 19 insertions, 39 deletions

diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim
new file mode 100644
index 0000000..e6d07ee
--- /dev/null
+++ b/nvim/autocmd.vim
@@ -0,0 +1,5 @@
+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/init.vim b/nvim/init.vim
index 416134f..8acf529 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,6 +1,4 @@
-" nvim/init.vim
-
 source $HOME/.config/nvim/settings.vim
+source $HOME/.config/nvim/autocmd.vim
 source $HOME/.config/nvim/keymaps.vim
 source $HOME/.config/nvim/plugins.vim
-
diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim
index 6d9b818..10bc0b8 100644
--- a/nvim/keymaps.vim
+++ b/nvim/keymaps.vim
@@ -1,17 +1,14 @@
-" nvim/key-bindings.vim
-
 let mapleader=','
 
-nnoremap <silent> <C-Left> :tabprevious<CR>
-nnoremap <silent> <C-Right> :tabnext<CR>
-nnoremap <silent> <C-PageUp> :tabprevious<CR>
+" mit <CTRL>+<Page*> durch die Tabs schalten
+nnoremap <silent> <C-PageUp>   :tabprevious<CR>
 nnoremap <silent> <C-PageDown> :tabnext<CR>
 
-" besseres Verhalten von <PageUp> und <PageDown>
+" besseres Verhalten von <Page*>
 " https://vimrc-dissection.blogspot.com/2009/02/fixing-pageup-and-pagedown.html
-map <silent> <PageUp> 1000<C-U>
-map <silent> <PageDown> 1000<C-D>
-imap <silent> <PageUp> <C-O>1000<C-U>
+map  <silent> <PageUp>        1000<C-U>
+map  <silent> <PageDown>      1000<C-D>
+imap <silent> <PageUp>   <C-O>1000<C-U>
 imap <silent> <PageDown> <C-O>1000<C-D>
 
 " Verschiebe Zeilen mit ALT+j oder ALT+k
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 66c8d90..8796619 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -1,45 +1,27 @@
-" nvim/plugins.vim
-
+" automatische Installation vom vim-plug
 let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
 if empty(glob(data_dir . '/autoload/plug.vim'))
   silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 endif
 
+" vim-plug
 call plug#begin()
   Plug 'mattn/emmet-vim'
   Plug 'romainl/vim-cool'
-  Plug 'preservim/nerdtree' |
-    \ Plug 'Xuyuanp/nerdtree-git-plugin'
+  Plug 'preservim/nerdtree' | Plug 'Xuyuanp/nerdtree-git-plugin'
   Plug 'tpope/vim-repeat'
   Plug 'tpope/vim-surround'
 call plug#end()
 
-
 " EMMET
-" =====
-" https://github.com/mattn/emmet-vim
-
-" Nur für HTML und CSS Dateien aktivieren
-let g:user_emmet_install_global = 0
-autocmd FileType html,css EmmetInstall
-
+let g:user_emmet_install_global=0
 let g:user_emmet_leader_key='<C-y>'
 
-"let g:user_emmet_mode='n'    "only enable normal mode functions.
-"let g:user_emmet_mode='inv'  "enable all functions, which is equal to
-"let g:user_emmet_mode='a'    "enable all function in all mode.
-
-
 " NERDTree
-" ========
-
 let NERDTreeMinimalUI=1
 let NERDTreeShowHidden=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
+let g:NERDTreeGitStatusUntrackedFilesMode='all'
+let g:NERDTreeGitStatusShowClean=1
+let g:NERDTreeGitStatusConcealBrackets=1
 
-let g:NERDTreeGitStatusUntrackedFilesMode = 'all' " a heavy feature too. default: normal
-let g:NERDTreeGitStatusShowClean = 1 " default: 0
-let g:NERDTreeGitStatusConcealBrackets = 1 " default: 0
diff --git a/nvim/settings.vim b/nvim/settings.vim
index ec68c5e..ad5f175 100644
--- a/nvim/settings.vim
+++ b/nvim/settings.vim
@@ -1,5 +1,3 @@
-" nvim/settings.vim
-
 set number
 set cursorline
 set shortmess+=I