From 7456435f95a00429f8d7cd85e50e2a07c1a17b14 Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Tue, 31 Oct 2017 23:17:28 +0100
Subject: [PATCH] Fixes for nvim, remove unused config-options

---
 nvim/config.vim | 14 +++-----------
 nvim/init.vim   |  9 +++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/nvim/config.vim b/nvim/config.vim
index d834cba..1eb1a44 100644
--- a/nvim/config.vim
+++ b/nvim/config.vim
@@ -1,12 +1,8 @@
-set autoindent
-set autoread                     " Automatically read a file that has changed on disk
-set backspace=indent,eol,start   " Allow backspacing over everything in insert mode
 set breakindent
 set cmdheight=2                  " command window is 2 high
 set cpoptions+=$                 " Add a $ to the end of a selection
 set cpoptions+=J                 " 2 spaces after a sentence for easier text manupulation
 set cursorline                   " highlight current line
-set display+=lastline            " shorten long lastlines
 set expandtab
 set fileformat=unix
 set fillchars=
@@ -14,13 +10,10 @@ set foldignore=
 set foldlevelstart=1             " deactivate folding on fileload
 set foldmethod=indent            " indent folding
 set foldnestmax=20               " max 20 levels of folding
-set formatoptions+=j             " Delete comment character when joining commented lines
 set gdefault                     " search & replace is always global
 set grepprg=ag                   " use ag for grepping
 set hidden                       " allows for switching buffers without writing
-set hlsearch
 set infercase
-set laststatus=2                 " statusbar is 2 high
 set lazyredraw                   " Don't redraw while executing macros
 set list!                        " nice Whitespace chars
 set listchars=extends:»,precedes:«,tab:▸\ ,trail:·
@@ -34,24 +27,20 @@ set nowrap                       " dont wrap lines around
 set nowritebackup                " no stupid backup files
 set pastetoggle=<F2>             " toggle paste-mode for c&p with F2
 set relativenumber               " relative line numbers are mothereffin awesome -- see how far your commands will go
-set ruler                        " show where you are in the document
 set scrolljump=5                 " Lines to scroll when cursor leaves screen
 set scrolloff=3                  " Minimum lines to keep above and below cursor
 set shiftround
 set shiftwidth=2
 set showbreak=\\\\\
-set showcmd                      " show me what im doing. helps alot
 set showmatch
 set sidescroll=10                " smoother side-scrolling
 set sidescrolloff=5              " jump by 5 when scrolling sideways
 set smartcase
-set smarttab
 set softtabstop=2
 set tabstop=2
 set timeout ttimeoutlen=100      " get rid of the delay when pressing O (for example)
 set virtualedit=all              " every mode active from v V to StrgV
 set visualbell                   " don't flicker
-set wildmenu
 set wildmode=list:longest,list:full
 set wrapscan
 
@@ -61,6 +50,9 @@ let g:hybrid_custom_term_colors = 1
 set background=dark
 colorscheme hybrid
 
+filetype plugin indent on
+syntax on
+
 " deactivate syntax highlighting when diffing
 if &diff
   syntax off
diff --git a/nvim/init.vim b/nvim/init.vim
index 09646fe..bb4c43f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,6 +1,6 @@
-if &compatible
-  set nocompatible
-endif
+" if &compatible
+"   set nocompatible
+" endif
 
 language en_US.UTF-8
 set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim
@@ -31,9 +31,6 @@ call dein#add('wellle/targets.vim')
 call dein#add('wellle/tmux-complete.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