diff --git a/home/base/desktop/editors/neovim/astronvim_user/init.lua b/home/base/desktop/editors/neovim/astronvim_user/init.lua
index 4df325c3..f2c94df0 100644
--- a/home/base/desktop/editors/neovim/astronvim_user/init.lua
+++ b/home/base/desktop/editors/neovim/astronvim_user/init.lua
@@ -128,7 +128,7 @@ return {
       build = "cargo build --release",
       ft = { "scm", "scheme" },
     },
-    { "Olical/nfnl", ft = "fennel" },
+    { "Olical/nfnl",                                       ft = "fennel" },
     {
       "Olical/conjure",
       ft = { "clojure", "fennel", "python", "scheme" }, -- etc
@@ -160,6 +160,32 @@ return {
         vim.g["conjure#debug"] = true
       end,
     },
+    {
+      "nvim-orgmode/orgmode",
+      dependencies = {
+        { "nvim-treesitter/nvim-treesitter", lazy = true },
+      },
+      event = "VeryLazy",
+      config = function()
+        -- Load treesitter grammar for org
+        require("orgmode").setup_ts_grammar()
+
+        -- Setup treesitter
+        require("nvim-treesitter.configs").setup({
+          highlight = {
+            enable = true,
+            additional_vim_regex_highlighting = { "org" },
+          },
+          ensure_installed = { "org" },
+        })
+
+        -- Setup orgmode
+        require("orgmode").setup({
+          org_agenda_files = "~/org/**/*",
+          org_default_notes_file = "~/org/refile.org",
+        })
+      end,
+    },
 
     -- Lua implementation of CamelCaseMotion, with extra consideration of punctuation.
     { import = "astrocommunity.motion.nvim-spider" },