diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index 0d7d225..6cb4daa 100644
--- a/home/editors/neovim/default.nix
+++ b/home/editors/neovim/default.nix
@@ -52,7 +52,7 @@ in {
       nvim-dap
       nvim-dap-virtual-text
 
-      vim-orgmode
+      orgmode
     ];
     extraConfig = with builtins;
     # readFile ./vim-surround-fix.vim +
@@ -69,6 +69,7 @@ in {
         ./dap/dap.lua
         ./dap/mappings.lua
         ./treesitter.lua
+        ./orgmode.lua
       ]);
     withNodeJs = false;
     withPython3 = false;
diff --git a/home/editors/neovim/orgmode.lua b/home/editors/neovim/orgmode.lua
new file mode 100644
index 0000000..4fb52a1
--- /dev/null
+++ b/home/editors/neovim/orgmode.lua
@@ -0,0 +1,6 @@
+require("orgmode").setup_ts_grammar()
+
+require("orgmode").setup {
+  org_agenda_files = {"~/org/**/*"},
+  org_default_notes_file = "~/org/notes.org",
+}
diff --git a/home/editors/neovim/treesitter.lua b/home/editors/neovim/treesitter.lua
index d93dc13..13417da 100644
--- a/home/editors/neovim/treesitter.lua
+++ b/home/editors/neovim/treesitter.lua
@@ -1,6 +1,8 @@
 require'nvim-treesitter.configs'.setup {
   highlight = {
     enable = true,
+    disable = {"org"},
+    additional_vim_regex_highlighting = {"org"},
   },
   indent = {
     enable = true,