diff --git a/.vim/after/ftplugin/pandoc/sandwich.vim b/.config/nvim/after/ftplugin/pandoc/sandwich.vim.lua
similarity index 98%
rename from .vim/after/ftplugin/pandoc/sandwich.vim
rename to .config/nvim/after/ftplugin/pandoc/sandwich.vim.lua
index 5dc31e0..2b111dd 100644
--- a/.vim/after/ftplugin/pandoc/sandwich.vim
+++ b/.config/nvim/after/ftplugin/pandoc/sandwich.vim.lua
@@ -1,3 +1,4 @@
+vim.cmd([[
 function GetClozeNumber()
   let REGEX_CLOZE_START = '{{c\d\+::'
 
@@ -33,3 +34,4 @@ let g:sandwich#recipes += [
       \     'nesting':  1
       \   }
       \ ]
+]])
diff --git a/.vim/after/plugin/md-img-paste.vim b/.config/nvim/after/plugin/md-img-paste.vim.lua
similarity index 93%
rename from .vim/after/plugin/md-img-paste.vim
rename to .config/nvim/after/plugin/md-img-paste.vim.lua
index df5e68c..edbe386 100644
--- a/.vim/after/plugin/md-img-paste.vim
+++ b/.config/nvim/after/plugin/md-img-paste.vim.lua
@@ -1,3 +1,5 @@
+vim.cmd([[
 " Paste clipboard images
 au FileType pandoc nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
 au FileType markdown nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
+]])
diff --git a/.vim/after/plugin/sandwich.vim b/.config/nvim/after/plugin/sandwich.vim.lua
similarity index 85%
rename from .vim/after/plugin/sandwich.vim
rename to .config/nvim/after/plugin/sandwich.vim.lua
index f923ec7..7e01eec 100644
--- a/.vim/after/plugin/sandwich.vim
+++ b/.config/nvim/after/plugin/sandwich.vim.lua
@@ -1,3 +1,5 @@
+vim.cmd([[
 nmap s <Nop>
 xmap s <Nop>
 let g:sandwich#recipes = deepcopy(g:sandwich#default_recipes)
+]])
diff --git a/.vim/after/plugin/taskwiki.vim b/.config/nvim/after/plugin/taskwiki.vim.lua
similarity index 91%
rename from .vim/after/plugin/taskwiki.vim
rename to .config/nvim/after/plugin/taskwiki.vim.lua
index 98ba633..8f64eff 100644
--- a/.vim/after/plugin/taskwiki.vim
+++ b/.config/nvim/after/plugin/taskwiki.vim.lua
@@ -1,4 +1,6 @@
+vim.cmd([[
 let g:taskwiki_taskrc_location='/home/h/.config/task/taskrc'
 let g:taskwiki_disable_concealcursor=1
 let g:taskwiki_dont_preserve_folds=1
 let g:taskwiki_dont_fold=1
+]])
diff --git a/.vim/after/plugin/vim-javascript.vim b/.config/nvim/after/plugin/vim-javascript.vim.lua
similarity index 94%
rename from .vim/after/plugin/vim-javascript.vim
rename to .config/nvim/after/plugin/vim-javascript.vim.lua
index b74903e..c64c8a2 100644
--- a/.vim/after/plugin/vim-javascript.vim
+++ b/.config/nvim/after/plugin/vim-javascript.vim.lua
@@ -1,6 +1,8 @@
+vim.cmd([[
 let g:javascript_plugin_jsdoc = 1 " jsdoc syntax highlighting
 let g:javascript_plugin_flow = 1 " flow syntax highlighting
 let g:javascript_conceal_function = "ƒ"
 let g:javascript_conceal_return = "⇖"
 let g:svelte_indent_script = 0
 let g:svelte_indent_style = 0
+]])
diff --git a/.vim/after/plugin/vim-pandoc-syntax.vim b/.config/nvim/after/plugin/vim-pandoc-syntax.vim.lua
similarity index 96%
rename from .vim/after/plugin/vim-pandoc-syntax.vim
rename to .config/nvim/after/plugin/vim-pandoc-syntax.vim.lua
index 0e1ef9a..f909087 100644
--- a/.vim/after/plugin/vim-pandoc-syntax.vim
+++ b/.config/nvim/after/plugin/vim-pandoc-syntax.vim.lua
@@ -1,3 +1,4 @@
+vim.cmd([[
 let g:pandoc#syntax#conceal#urls=1
 let g:pandoc#syntax#codeblocks#embeds#langs=[
   \ 'python',
@@ -13,3 +14,4 @@ let g:pandoc#syntax#codeblocks#embeds#langs=[
 let g:pandoc#syntax#style#emphases=0 " Bug workaround
 let g:pandoc#syntax#conceal#cchar_overrides = { "atx": " ", "li": "·" }
 let g:pandoc#syntax#conceal#blacklist=[]
+]])
diff --git a/.vim/after/plugin/vim-pandoc.vim b/.config/nvim/after/plugin/vim-pandoc.vim.lua
similarity index 95%
rename from .vim/after/plugin/vim-pandoc.vim
rename to .config/nvim/after/plugin/vim-pandoc.vim.lua
index ac72619..3380812 100644
--- a/.vim/after/plugin/vim-pandoc.vim
+++ b/.config/nvim/after/plugin/vim-pandoc.vim.lua
@@ -1,3 +1,4 @@
+vim.cmd([[
 au FileType pandoc call pandoc#completion#Init()
 let g:pandoc#filetypes#pandoc_markdown=0
 let g:pandoc#spell#enabled=0
@@ -5,3 +6,4 @@ let g:pandoc#spell#default_langs=['en_us', 'nl_be']
 let g:pandoc#formatting#mode='a'
 let g:pandoc#formatting#textwidth=90
 let g:pandoc#modules#disabled = ["formatting", "dashes", "yaml", "metadata"]
+]])
diff --git a/.vim/after/plugin/vim-tidal.vim b/.config/nvim/after/plugin/vim-tidal.vim.lua
similarity index 97%
rename from .vim/after/plugin/vim-tidal.vim
rename to .config/nvim/after/plugin/vim-tidal.vim.lua
index 0705fa8..3a2fd2f 100644
--- a/.vim/after/plugin/vim-tidal.vim
+++ b/.config/nvim/after/plugin/vim-tidal.vim.lua
@@ -1,3 +1,4 @@
+vim.cmd([[
 " Tidalcycles (sclang and vim-tidal)
 let g:tidal_default_config = {"socket_name": "default", "target_pane": "tidal:1.1"}
 let g:tidal_no_mappings = 1
@@ -12,3 +13,4 @@ au FileType tidal com! -nargs=0 H :TidalHush
 " SuperCollider
 au BufEnter,BufWinEnter,BufNewFile,BufRead *.sc,*.scd se filetype=supercollider
 au Filetype supercollider packadd scvim
+]])
diff --git a/.vim/after/plugin/vimtex.vim b/.config/nvim/after/plugin/vimtex.vim.lua
similarity index 88%
rename from .vim/after/plugin/vimtex.vim
rename to .config/nvim/after/plugin/vimtex.vim.lua
index 4bfb858..478d5c3 100644
--- a/.vim/after/plugin/vimtex.vim
+++ b/.config/nvim/after/plugin/vimtex.vim.lua
@@ -1,4 +1,6 @@
+vim.cmd([[
 let g:vimtex_view_method='zathura'
 let g:tex_flavor='latex'
 let g:tex_conceal='abdmgs'
 let g:vimtex_quickfix_mode=0
+]])
diff --git a/.vim/after/plugin/wiki.vim b/.config/nvim/after/plugin/wiki.vim.lua
similarity index 99%
rename from .vim/after/plugin/wiki.vim
rename to .config/nvim/after/plugin/wiki.vim.lua
index 289810b..6a8492d 100644
--- a/.vim/after/plugin/wiki.vim
+++ b/.config/nvim/after/plugin/wiki.vim.lua
@@ -1,3 +1,4 @@
+vim.cmd([[
 " Change local buffer to directory of current file after the plugin has loaded
 autocmd VimEnter * lcd %:p:h
 
@@ -106,3 +107,4 @@ let g:wiki_write_on_nav=1
 let g:wiki_zotero_root='~/.local/share/zotero'
 " ... mappings and commands
 " ...
+]])