diff --git a/neovim/default.nix b/neovim/default.nix
index 26cdcb8..5cc7c1f 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -81,7 +81,7 @@
         lsp-status-nvim
         rustaceanvim
         neodev-nvim
-        null-ls-nvim
+        none-ls-nvim
         lsp_lines-nvim
         lsp-inlayhints-nvim
 
@@ -92,6 +92,9 @@
         # neorg
         neorg
         neorg-telescope
+
+        # vim-wiki
+        vimwiki
       ];
 
       withNodeJs = true;
@@ -102,8 +105,8 @@
         terraform-ls
         tflint
         bash-language-server
+        prettierd
         nodePackages.yaml-language-server
-        nodePackages.prettier
         nodePackages.eslint_d
         nodePackages.typescript-language-server
         nodePackages.typescript
@@ -128,6 +131,9 @@
 
         #clipboard
         xclip
+
+        #vimwiki
+        vimwiki-markdown
       ];
 
       extraLuaPackages = luaPackages: [
@@ -164,6 +170,7 @@
             ${builtins.readFile ./neorg.lua }
             ${builtins.readFile ./illuminate.lua }
             ${builtins.readFile ./wilder.lua }
+            ${builtins.readFile ./vimwiki.lua }
 
             vim.g.gitblame_date_format = "%r"
 
diff --git a/neovim/lspconfig.lua b/neovim/lspconfig.lua
index 5c63236..db4b8a4 100644
--- a/neovim/lspconfig.lua
+++ b/neovim/lspconfig.lua
@@ -161,8 +161,9 @@ vim.g.rustaceanvim = {
 local null_ls = require("null-ls")
 null_ls.setup({
   sources = {
-    null_ls.builtins.formatting.prettier,
-    null_ls.builtins.diagnostics.tsc,
+    null_ls.builtins.formatting.prettierd.with({
+      extra_filetypes = { "vimwiki" },
+    }),
   },
   on_attach = on_attach,
 })
diff --git a/neovim/vimwiki.lua b/neovim/vimwiki.lua
new file mode 100644
index 0000000..bad0f9c
--- /dev/null
+++ b/neovim/vimwiki.lua
@@ -0,0 +1,12 @@
+vim.g.vimwiki_list = {
+  {
+    path = "~/vimwiki",
+    syntax = "markdown",
+    ext = ".md",
+    path_html = "~/vimwiki_html",
+    custom_wiki2html = "vimwiki_markdown",
+  }
+}
+
+-- disable global markdown hijacking
+vim.g.vimwiki_global_ext = 0