From c46d64cb70e488464d4b3fb794332cc14e746dc2 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Mon, 5 Apr 2021 01:48:48 +0200
Subject: [PATCH] [VIM] Change keybindings, remove weird chars, add
 vim-devicons and goyo

---
 vim/config/keybindings.vim  | 2 ++
 vim/config/pluginconfig.vim | 6 ++----
 vim/config/plugins.vim      | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/vim/config/keybindings.vim b/vim/config/keybindings.vim
index 7e7694a..506f633 100644
--- a/vim/config/keybindings.vim
+++ b/vim/config/keybindings.vim
@@ -45,6 +45,8 @@ nmap <silent> <C-P> <Plug>yankstack_substitute_older_paste
 inoremap <C-space> <C-N>
 imap <C-@> <C-Space>
 
+cmap w!! w !sudo tee > /dev/null %
+
 " Toggle Case
 nmap <C-c> g~iw
 
diff --git a/vim/config/pluginconfig.vim b/vim/config/pluginconfig.vim
index c9bf7d3..cce5f91 100644
--- a/vim/config/pluginconfig.vim
+++ b/vim/config/pluginconfig.vim
@@ -41,8 +41,6 @@ let g:NERDTrimTrailingWhitespace = 1
 
 " NerdTree
 let NERDTreeMinimalUI = 1
-let g:NERDTreeDirArrowExpandable = '🗀'
-let g:NERDTreeDirArrowCollapsible = '🗁'
 let g:NERDTreeHighlightFolders = 1
 let g:NERDTreeHighlightFoldersFullName = 1
 
@@ -126,8 +124,8 @@ inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 " inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
 
 " Use `[g` and `]g` to navigate diagnostics
-nmap <silent> [g <Plug>(coc-diagnostic-prev)
-nmap <silent> ]g <Plug>(coc-diagnostic-next)
+nmap <silent> gp <Plug>(coc-diagnostic-prev)
+nmap <silent> gn <Plug>(coc-diagnostic-next)
 
 " Remap keys for gotos
 nmap <silent> gd <Plug>(coc-definition)
diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim
index 666872e..e141473 100644
--- a/vim/config/plugins.vim
+++ b/vim/config/plugins.vim
@@ -14,8 +14,6 @@ Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 " Highlight and fix trailing whitespace
 Plug 'ntpeters/vim-better-whitespace'
-" Additional motion with visual highlighting
-Plug 'easymotion/vim-easymotion'
 " Yank History Cycling on meta-[shift]-p
 Plug 'maxbrunsfeld/vim-yankstack'
 " Auto indent
@@ -41,6 +39,9 @@ Plug 'jiangmiao/auto-pairs'
 Plug 'scrooloose/nerdtree'
 Plug 'jistr/vim-nerdtree-tabs'
 Plug 'Xuyuanp/nerdtree-git-plugin'
+Plug 'ryanoasis/vim-devicons'
+
+Plug 'junegunn/goyo.vim'
 
 " Snippets
 " Plug 'SirVer/ultisnips'