diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 7710ebb..c897f0c 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -24,13 +24,14 @@
   "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
-  "orgmode": { "branch": "master", "commit": "e365b85b4a5bfea507d77a16a7b66d8c6860e9b7" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "telescope-vimwiki.nvim": { "branch": "main", "commit": "13a83b6107da17af9eb8a1d8e0fe49e1004dfeb4" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
   "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
   "vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" },
+  "vimwiki": { "branch": "dev", "commit": "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }
diff --git a/.config/nvim/lua/plugins/orgmode.lua b/.config/nvim/lua/plugins/orgmode.lua
deleted file mode 100644
index ab63329..0000000
--- a/.config/nvim/lua/plugins/orgmode.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  "nvim-orgmode/orgmode",
-  event = "VeryLazy",
-  ft = { "org" },
-  config = function()
-    require("orgmode").setup({
-      org_agenda_files = "~/org/**/*",
-      org_default_notes_file = "~/org/refile.org",
-    })
-  end
-}
diff --git a/.config/nvim/lua/plugins/vimwiki.lua b/.config/nvim/lua/plugins/vimwiki.lua
new file mode 100644
index 0000000..c112c99
--- /dev/null
+++ b/.config/nvim/lua/plugins/vimwiki.lua
@@ -0,0 +1,32 @@
+return {
+  "vimwiki/vimwiki",
+  dependencies = {
+    "ElPiloto/telescope-vimwiki.nvim",
+  },
+  init = function()
+    vim.g.vimwiki_list = {
+      {
+        path = "~/notes",
+        syntax = "markdown",
+        ext = ".md",
+        links_space_char = "_",
+        auto_tags = 1,
+      },
+    }
+    vim.g.vimwiki_syntax_plugins = {
+      codeblock = {
+        ["```lua"] = { parser = "lua" },
+        ["```python"] = { parser = "python" },
+        ["```javascript"] = { parser = "javascript" },
+        ["```bash"] = { parser = "bash" },
+        ["```html"] = { parser = "html" },
+        ["```css"] = { parser = "css" },
+        ["```c"] = { parser = "c" },
+        ["```ruby"] = { parser = "ruby" },
+      },
+    }
+    require("telescope").load_extension("vw")
+    vim.keymap.set('n', '<leader>vww', require('telescope').extensions.vimwiki.vimwiki, {})
+    vim.keymap.set('n', '<leader>vwg', require('telescope').extensions.vimwiki.live_grep, {})
+  end
+}