Merge branch 'master' of ssh://git.warwicknew.co.uk:2222/Warwick/NeoVimConfiguration

lua/core/defaults.lua

@@ -28,6 +28,7 @@ vim.opt.conceallevel = 2
 
 -- I want neovim to know I want british spellings
 vim.cmd('language en_GB.utf8')
+vim.opt.spelllang='en_gb'
 
 -- Use LSP to format bufer automatically just before write
 --vim.api.nvim_create_autocmd("BufWritePre", {
@@ -36,3 +37,8 @@ vim.cmd('language en_GB.utf8')
 --    vim.lsp.buf.format { async = false }
 --  end
 --})
+
+-- Use treesitter for folds
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+vim.opt.foldenable = false

lua/core/plugin_config/lsp_config.lua

@@ -75,7 +75,7 @@ require("lspconfig").lua_ls.setup {
 }
 require("lspconfig").clangd.setup { capabilities = capabilities }
 require("lspconfig").cmake.setup { capabilities = capabilities }
-require("lspconfig").ltex.setup { capabilities = capabilities }
+require("lspconfig").ltex.setup { capabilities = capabilities, settings = { ltex = { language = "en-GB" } } }
 require("lspconfig").ts_ls.setup { capabilities = capabilities }
 require("lspconfig").jsonls.setup { capabilities = capabilities }
 require("lspconfig").rust_analyzer.setup { capabilities = capabilities }

lua/core/plugin_config/obsidian.lua

@@ -41,7 +41,7 @@ require("telescope").setup({
     extensions = {
         obsidian_todo = {
             search_path = vaultLocation,
-            search_pattern = "- [ ] #todo", -- This is the default value
+            search_pattern = "- [ ] #todo",
         },
     },
 })

lua/core/plugins.lua

@@ -1,13 +1,17 @@
+-- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-    "git",
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-    "clone",
+  if vim.v.shell_error ~= 0 then
-    "--filter=blob:none",
+    vim.api.nvim_echo({
-    "https://github.com/folke/lazy.nvim.git",
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-    "--branch=stable", -- latest stable release
+      { out, "WarningMsg" },
-    lazypath,
+      { "\nPress any key to exit..." },
-  })
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
 end
 vim.opt.rtp:prepend(lazypath)
 

spell/en.utf-8.add

@@ -1,2 +0,0 @@
-Rasterising
-rasterisation