From d4474ef5ce341308996067bd523f271dc23c0fb0 Mon Sep 17 00:00:00 2001
From: Till <till@ktiu.net>
Date: Wed, 4 Feb 2026 13:38:28 +0100
Subject: [PATCH] vimwiki and vim-pandoc

---
 home/nvim/config.vim   |  4 ----
 home/nvim/default.nix  | 38 +++++++++++++++++++++++++++-----------
 home/nvim/nvim-cmp.lua |  8 ++++----
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/home/nvim/config.vim b/home/nvim/config.vim
index 3d93a6e..2b3d0e5 100644
--- a/home/nvim/config.vim
+++ b/home/nvim/config.vim
@@ -34,10 +34,6 @@ nnoremap gx :! xdg-open <cfile><return>
 nnoremap <silent> <tab> :bnext<return>
 nnoremap <silent> <S-tab> :bnext<return>
 nnoremap <silent> Q :bdelete<return>
-nnoremap <c-h> <c-w>h
-nnoremap <c-j> <c-w>j
-nnoremap <c-k> <c-w>k
-nnoremap <c-l> <c-w>l
 nnoremap <c-q> :hide<return>
 
 nnoremap <leader>m :make<return>
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index c6903ad..1cec2fb 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -67,9 +67,9 @@
       {
         plugin = goyo;
         config = ''
-          nnoremap yog :Goyo<return>
-          nnoremap [og :Goyo 80<return>
-          nnoremap ]og :Goyo!<return>
+          nnoremap <silent> yog :Goyo<CR>
+          nnoremap <silent> [og :Goyo 80<return>
+          nnoremap <silent> ]og :Goyo!<return>
         '';
       }
       {
@@ -151,6 +151,14 @@
 
       vim-fish
       vim-nix
+
+      {
+        plugin = vim-pandoc;
+        config = ''
+          let g:pandoc#modules#disabled = ["completion", "command", "menu", "completion"]
+        '';
+      }
+
       vim-repeat
 
       {
@@ -170,17 +178,25 @@
       vim-snippets
       vim-speeddating
       vim-surround
-      vim-unimpaired
+ 
+      {
+        plugin = vim-unimpaired;
+        config = ''
+          nnoremap =p <Nop>
+          nnoremap =P <Nop>
+          nnoremap =s <Nop>
+        '';
+      }
+
       {
         plugin = vimwiki;
         config = ''
-          let g:vimwiki_list = [
-            {
-              'path': '~/notes/',
-              'syntax': 'markdown',
-              'ext': '.md'
-            }
-          ]
+          let g:vimwiki_list = [ { 'path': '~/notes/', 'syntax': 'markdown', 'ext': '.md' } ]
+          nnoremap <Leader>wt <Nop>
+          nnoremap <Leader>w<Leader>t <Nop>
+          nmap <C-j> <Plug>VimwikiNextLink
+          nmap <C-k> <Plug>VimwikiPrevLink
+          let g:vimwiki_key_mappings = { 'headers': 0, 'text_objs': 0, 'lists': 0, 'lists_return': 0, 'html': 0 }
         '';
       }
     ];
diff --git a/home/nvim/nvim-cmp.lua b/home/nvim/nvim-cmp.lua
index d6768a5..9d64ae5 100644
--- a/home/nvim/nvim-cmp.lua
+++ b/home/nvim/nvim-cmp.lua
@@ -67,7 +67,7 @@ cmp.setup.cmdline(':', {
 -- Set up lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
-vim.lsp.config('<YOUR_LSP_SERVER>', {
-  capabilities = capabilities
-})
-vim.lsp.enable('<YOUR_LSP_SERVER>')
+-- vim.lsp.config('<YOUR_LSP_SERVER>', {
+--   capabilities = capabilities
+-- })
+-- vim.lsp.enable('<YOUR_LSP_SERVER>')