From f0db7a90958cb197b6a0aab83777b734877b616b Mon Sep 17 00:00:00 2001
From: Warwick <warwick.l.e.new@gmail.com>
Date: Thu, 14 Dec 2023 16:24:01 +0000
Subject: [PATCH] Cleaned up code made orgmode work better

---
 lua/core/defaults.lua           |  3 +++
 lua/core/plugin_config/init.lua |  1 +
 lua/core/plugin_config/org.lua  | 26 ++++++++++++++++++++++++++
 lua/core/plugins.lua            | 30 +++++++++++++++---------------
 4 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 lua/core/plugin_config/org.lua

diff --git a/lua/core/defaults.lua b/lua/core/defaults.lua
index ec1550e..66f71f4 100644
--- a/lua/core/defaults.lua
+++ b/lua/core/defaults.lua
@@ -23,6 +23,9 @@ vim.wo.wrap = true
 vim.wo.linebreak = true
 vim.wo.list = false
 
+-- I want neovim to know I want british spellings
+vim.cmd('language en_GB.utf8')
+
 -- Use LSP to format bufer automatically just before write
 --vim.api.nvim_create_autocmd("BufWritePre", {
 --  buffer = buffer,
diff --git a/lua/core/plugin_config/init.lua b/lua/core/plugin_config/init.lua
index 8528458..e6fe890 100644
--- a/lua/core/plugin_config/init.lua
+++ b/lua/core/plugin_config/init.lua
@@ -8,3 +8,4 @@ require("core.plugin_config.completions")
 require("core.plugin_config.terminal")
 require("core.plugin_config.whichkey")
 require("core.plugin_config.indent-blankline")
+require("core.plugin_config.org")
diff --git a/lua/core/plugin_config/org.lua b/lua/core/plugin_config/org.lua
new file mode 100644
index 0000000..ced66f7
--- /dev/null
+++ b/lua/core/plugin_config/org.lua
@@ -0,0 +1,26 @@
+-- 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 = {'~/.vimwiki/**.org'},
+  org_default_notes_file = '~/.vimwiki/refile.org',
+})
+
+require('cmp').setup({
+  sources = {
+    { name = 'orgmode' }
+  }
+})
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
index ec05712..e00fa61 100644
--- a/lua/core/plugins.lua
+++ b/lua/core/plugins.lua
@@ -69,12 +69,12 @@ local plugins = {
     dependencies = {
       { 'nvim-treesitter/nvim-treesitter', lazy = true },
     },
-    event = 'VeryLazy',
-    config = function()
-      -- Load treesitter grammar for org
-      require('orgmode').setup_ts_grammar()
+    --event = 'VeryLazy',
+    --config = function()
+      ---- Load treesitter grammar for org
+      --require('orgmode').setup_ts_grammar()
 
-      -- Setup treesitter
+      ---- Setup treesitter
       --require('nvim-treesitter.configs').setup({
       --  highlight = {
       --    enable = true,
@@ -83,16 +83,16 @@ local plugins = {
       --  ensure_installed = { 'org' },
       --})
 
-      -- Setup orgmode
-      require('orgmode').setup({
-        org_agenda_files = '~/.vimwiki/**/*',
-        org_default_notes_file = '~/.vimwiki/refile.org',
-      })
-      -- Setup nvim-cmp
-      require('cmp').setup({
-        sources = { { name = 'orgmode' } }
-      })
-    end,
+      ---- Setup orgmode
+      --require('orgmode').setup({
+      --  org_agenda_files = '~/.vimwiki/**/*',
+      --  org_default_notes_file = '~/.vimwiki/refile.org',
+      --})
+      ---- Setup nvim-cmp
+      --require('cmp').setup({
+      --  sources = { { name = 'orgmode' } }
+      --})
+    --end,
   }
 }