diff --git a/init.lua b/init.lua
index 9d35a654..5cd81ae0 100644
--- a/init.lua
+++ b/init.lua
@@ -187,6 +187,26 @@ require('lazy').setup({
   { import = 'custom.plugins' },
 }, {})
 
+-- Load custom treesitter grammar for org filetype
+require('orgmode').setup_ts_grammar()
+
+-- Treesitter configuration
+require('nvim-treesitter.configs').setup {
+  -- If TS highlights are not enabled at all, or disabled via `disable` prop,
+  -- highlighting will fallback to default Vim syntax highlighting
+  highlight = {
+    enable = true,
+    -- Required for spellcheck, some LaTex highlights and
+    -- code block highlights that do not have ts grammar
+    additional_vim_regex_highlighting = { 'org' },
+  },
+  ensure_installed = { 'org' }, -- Or run :TSUpdate org
+}
+
+require('orgmode').setup({
+  org_agenda_files = { '~/Notes/org/*', '~/my-orgs/**/*' },
+  org_default_notes_file = '~/Notes/org/refile.org',
+})
 
 -- [[ Setting options ]]
 -- See `:help vim.o`
diff --git a/lua/custom/plugins/orgomode.lua b/lua/custom/plugins/orgomode.lua
new file mode 100644
index 00000000..777dacf8
--- /dev/null
+++ b/lua/custom/plugins/orgomode.lua
@@ -0,0 +1,7 @@
+return {
+	'nvim-orgmode/orgmode',
+	ft = { 'org' },
+	config = function()
+		require('orgmode').setup {}
+	end
+}