diff --git a/nvim/autocommands.vim b/nvim/autocommands.vim
index db4d5e2a..c1351bdf 100644
--- a/nvim/autocommands.vim
+++ b/nvim/autocommands.vim
@@ -11,7 +11,7 @@ augroup init
   autocmd FileType mail,markdown setlocal spell
   autocmd FileType mail,markdown setlocal wrap
   autocmd FileType mail,markdown setlocal spelllang=en,de
-  autocmd FileType mail,markdown setlocal textwidth=80
+  autocmd FileType mail,markdown setlocal textwidth=70
   autocmd FileType mail,markdown setlocal formatoptions+=q
 
   " correctly indent comments/quoted text in mails
@@ -23,7 +23,3 @@ augroup init
   autocmd BufNewFile,BufRead *.{json5,css,scss} set iskeyword+=-
   autocmd BufNewFile,BufRead *.scss set ft=scss.css
 augroup END
-
-if &diff
-  syntax off
-endif
diff --git a/nvim/config.vim b/nvim/config.vim
index 5690dff6..11b5fe64 100644
--- a/nvim/config.vim
+++ b/nvim/config.vim
@@ -1,33 +1,22 @@
 set breakindent
 set cmdheight=2
 set cpoptions+=$ " Add a $ to the end of a selection
-set cpoptions+=J " 2 spaces after a sentence for easier text manupulation
 set cursorline
-set expandtab
-set fileformat=unix
-set fillchars=
-set foldignore=
-set foldlevelstart=1 " deactivate folding on fileload
-set foldnestmax=20 " max 20 levels of folding
 set foldmethod=expr
 set foldexpr=nvim_treesitter#foldexpr()
 set gdefault
-set grepprg=ag " use ag for grepping
+set grepprg=rg " use ag for grepping
 set hidden
 set ignorecase
 set infercase
 set lazyredraw
 set list!
 set listchars=extends:»,precedes:«,tab:▸\ ,trail:·
-set mouse=a
-set nobackup
-set noerrorbells
 set nofoldenable
 set noshowmode
 set noswapfile
 set nowrap
 set nowritebackup 
-set pastetoggle=<F2>
 set relativenumber
 set scrolljump=5
 set scrolloff=3
@@ -39,13 +28,10 @@ set showmatch
 set sidescroll=10
 set sidescrolloff=5
 set smartcase
-set softtabstop=2
-set tabstop=2
 set updatetime=300
 set virtualedit=all
 set visualbell
 set wildmode=list:longest,list:full
-set wrapscan
 
 " language and colorscheme
 set background=dark
diff --git a/nvim/init.vim b/nvim/init.vim
index f1df0a48..6320d435 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -11,7 +11,6 @@ Plug 'tpope/vim-apathy'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-ragtag'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-surround'
@@ -22,7 +21,7 @@ Plug 'wellle/tmux-complete.vim'
 Plug 'wincent/terminus'
 
 " colorscheme
-Plug 'rktjmp/lush.nvim' " for gruvbox.nvim
+Plug 'rktjmp/lush.nvim'
 Plug 'npxbr/gruvbox.nvim'
 
 call plug#end()
diff --git a/nvim/keymappings.vim b/nvim/keymappings.vim
index 4fd121e2..1d1bcf7d 100644
--- a/nvim/keymappings.vim
+++ b/nvim/keymappings.vim
@@ -29,9 +29,6 @@ nnoremap <down> :blast<cr>
 nnoremap <left> :bp<cr>
 nnoremap <right> :bn<cr>
 
-" fix a bug in neovim/tmux-navigator
-nnoremap <silent> <BS> :TmuxNavigateLeft<cr>
-
 " Bubble/indent lines using unimpaired
 " using left alt + hjkl on mac usgerman keyboard
 " those are some weird mappings, but they work!