From db442aa73a2d50ef84222f5d035997d37eeb12a4 Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Sun, 20 Apr 2025 13:16:07 +0100
Subject: [PATCH 1/2] vim: do not set pastetoggle in nvim

It's been removed.
---
 vim/vimrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vim/vimrc b/vim/vimrc
index 0a09c8a..402a980 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -451,7 +451,9 @@ set shiftround                  " round to 'shiftwidth' for "<<" and ">>"
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 
-set pastetoggle=<F11>           " key sequence to toggle paste mode
+if !has('nvim')
+  set pastetoggle=<F11>           " key sequence to toggle paste mode
+endif
 
 " folding {{{2
 set foldmethod=marker           " folding type
-- 
2.48.1


From e1fa1d1c9ec1c4080febc65a04347528804ceebb Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Wed, 14 May 2025 10:59:55 +0100
Subject: [PATCH 2/2] vim: packadd needs ! to avoid being loaded twice from
 vimrc

---
 vim/ftplugin/cpp.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 19850a7..d24f1ff 100644
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -60,7 +60,7 @@ setlocal errorformat+=%X%*\\a:\ Leaving\ directory\ [`']%f'
 setlocal errorformat+=%*[^[]\[%tRROR\]%m\ \[%f:%l\]
 setlocal errorformat+=%*[^[]\[%tARNING\]%m\ \[%f:%l\]
 
-packadd termdebug
+packadd! termdebug
 let g:termdebug_wide = 1
 function! s:Debug(...)
     tabedit %
-- 
2.48.1