diff --git a/symlinks/config/nvim/lua/esensar/init/plugins.lua b/symlinks/config/nvim/lua/esensar/init/plugins.lua
index 9856106..e87d2c0 100644
--- a/symlinks/config/nvim/lua/esensar/init/plugins.lua
+++ b/symlinks/config/nvim/lua/esensar/init/plugins.lua
@@ -63,7 +63,49 @@ return require("lazy").setup({
 	{ "c-brenn/phoenix.vim", ft = "elixir" }, -- Similar to vim-rails, but for phoenix
 	"Olical/conjure", -- Lisp languages REPL integration
 	"Olical/aniseed", -- Fennel nvim support
-	"vimwiki/vimwiki", -- Vimwiki - personal wiki in vim
+	{
+		"vimwiki/vimwiki",
+		init = function()
+			local personal_wiki = {
+				path = "~/vimwiki/",
+				ext = ".md",
+				index = "Home",
+				syntax = "markdown",
+				auto_diary_index = 1,
+				auto_generate_links = 1,
+				auto_toc = 1,
+			}
+			local work_wiki = {
+				path = "~/vimwiki_work/",
+				ext = ".md",
+				index = "Home",
+				syntax = "markdown",
+				auto_diary_index = 1,
+				auto_generate_links = 1,
+				auto_toc = 1,
+			}
+			local test_wiki = {
+				path = "/tmp/",
+			}
+			vim.g.vimwiki_list = { personal_wiki, work_wiki, test_wiki }
+			vim.g.vimwiki_global_ext = 0
+			vim.g.vimwiki_listsyms = "✗○◐●✓"
+
+			local augroup = vim.api.nvim_create_augroup("VimwikiBufEnterMarkdown", {})
+			vim.api.nvim_create_autocmd("BufEnter", {
+				pattern = "*.md",
+				command = "setl syntax=markdown",
+				group = augroup,
+			})
+
+			vim.api.nvim_create_user_command("VimwikiOpenSubdirectoryIndex", function(opts)
+				require("esensar.vimwiki_extensions").open_subdirectory_index_file(opts.count, opts.args)
+			end, {
+				count = 0,
+				nargs = 1,
+			})
+		end,
+	}, -- Vimwiki - personal wiki in vim
 	"https://codeberg.org/vimwiki-reviews/vimwiki-reviews-lua", -- Vimwiki extension for periodic reviews
 	{ "ledger/vim-ledger", ft = "ledger" }, -- Support for ledger-cli format
 	{ "tandrewnichols/vim-docile", ft = "help" }, -- Support for vim doc.txt format
diff --git a/symlinks/config/nvim/plugin/vimwiki.vim b/symlinks/config/nvim/plugin/vimwiki.vim
deleted file mode 100644
index 2fd32f6..0000000
--- a/symlinks/config/nvim/plugin/vimwiki.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" Must be set up before vimwiki plugin is initialized, can't be in after
-let personal_wiki = {}
-let personal_wiki.path = '~/vimwiki/'
-let personal_wiki.ext = '.md'
-let personal_wiki.index = 'Home'
-let personal_wiki.syntax = 'markdown'
-let personal_wiki.auto_diary_index = 1
-let personal_wiki.auto_generate_links = 1
-let personal_wiki.auto_toc = 1
-
-let work_wiki = {}
-let work_wiki.path = '~/vimwiki_work/'
-let work_wiki.index = 'Home'
-let work_wiki.syntax = 'markdown'
-let work_wiki.ext = '.md'
-let work_wiki.auto_diary_index = 1
-let work_wiki.auto_generate_links = 1
-let work_wiki.auto_toc = 1
-
-let test_wiki = {}
-let test_wiki.path = '/tmp'
-
-let g:vimwiki_list = [personal_wiki, work_wiki, test_wiki]
-
-" Disable vimwiki filetype on all markdown files
-let g:vimwiki_global_ext = 0
-
-" Prettier checkboxes
-let g:vimwiki_listsyms = '✗○◐●✓'
-
-augroup VimwikiBufEnterMarkdown
-	autocmd!
-	autocmd BufEnter *.md setl syntax=markdown
-augroup END
-
-
-command! -count=0 -nargs=1 VimwikiOpenSubdirectoryIndex :lua require('esensar.vimwiki_extensions').open_subdirectory_index_file(<count>, <f-args>)