.luarc.json

@@ -1,3 +0,0 @@
-{
-    "workspace.checkThirdParty": false
-}

after/plugin/colour.lua

@@ -3,28 +3,5 @@ if not ok then
 	return
 end
 
--- default colourscheme settings
 vim.o.background = "dark"
 vim.cmd.colorscheme('gruvbox')
-
-local function invertTheme()
-	if vim.o.background == "dark" then
-		vim.o.background = "light"
-	else
-		vim.o.background = "dark"
-	end
-end
-
-vim.keymap.set('n','<leader>i',invertTheme,{desc='Invert colourscheme'})
-
-
-if vim.fn.executable('theme.sh') and vim.fn.exists('~/.config/.theme_history') then
-	local currentTheme = vim.fn.system('theme.sh -l | tail -n1', 'silent'):gsub('\n','')
-	local lightThemes = vim.fn.systemlist('theme.sh --light -l')
-
-	if vim.tbl_contains(lightThemes,currentTheme) then
-		vim.o.background = "light"
-	else
-		vim.o.background = "dark"
-	end
-end

after/plugin/treesitter.lua

@@ -1,25 +1,30 @@
-local ok = pcall(require, 'nvim-treesitter')
-
-if not ok then
+if not pcall(require, 'nvim-treesitter') then
 	return
 end
 
-local config = {
-	ensure_installed = {
-		"c",
-		"cpp",
+require('nvim-treesitter.configs').setup {
+
+	ensure_installed = { 
+		"c", 
+		"cpp", 
 		"c_sharp",
 		"markdown",
 		"latex",
 		"go",
 		"rust"
-	},
+	}, 
 	sync_install = false,
 
 	highlight = {
 		enable = true,
 	},
 
+	rainbow = {
+		enable = true,
+		extended_mode = true,
+		max_file_lines = nil
+	},
+
 	incremental_selection = {
 		enable = true,
 		keymaps = {
@@ -30,85 +35,3 @@ local config = {
 		}
 	}
 }
-
----@diagnostic disable-next-line: redefined-local -- Readability/conciseness over correctness.
-local ok, ts_rainbow = pcall(require, 'ts-rainbow')
-
-if ok then
-	local rainbow = {
-		enable = true,
-		query = {
-			'rainbow-parens',
-			html = 'rainbow-tags',
-			latex = 'rainbow-blocks'
-		},
-		strategy = ts_rainbow.strategy.global
-	}
-
-	config.rainbow = rainbow
-end
-
-if pcall(require,'nvim-treesitter-textobjects') then
-	local textobjects = {
-		select = {
-			enable = true,
-			lookahead = true,
-
-			keymaps = {
-				["af"] = { query = "@function.outer", desc = "Select outer part of function"},
-				["if"] = { query = "@function.inner", desc = "Select inner part of function"},
-				["ac"] = { query = "@class.outer" , desc = "Select outer part of class"},
-				["ic"] = { query = "@class.inner" , desc = "Select inner part of class"}
-
-			}
-		},
-
-		move = {
-			enable = true,
-			set_jumps = true,
-
-			goto_next_start = {
-				["]m"] = { query = "@function.outer", desc = "Next Function start"},
-				["]]"] = { query = "@class.outer", desc = "Next class start"},
-				["]o"] = { query = "@loop.*", desc = "Next loop component"},
-				["]z"] = { query = "@fold", query_group = "folds" , desc = "Next Fold"}
-			},
-			goto_next_end = {
-				["]M"] = { query = "@function.outer", desc = "Next Function end"},
-				["]["] = { query = "@class.outer", desc = "Next class end"},
-			},
-			goto_previous_start = {
-				["[m"] = { query = "@function.outer", desc = "Previous Function start"},
-				["[]"] = { query = "@class.outer", desc = "Previous class start"},
-				["[o"] = { query = "@loop.*", desc = "Previous loop component"},
-				["[z"] = { query = "@fold", query_group = "folds" , desc = "Previous Fold"}
-			},
-			goto_previous_end = {
-				["[M"] = { query = "@function.outer", desc = "Previous Function end"},
-				["[["] = { query = "@class.outer", desc = "Previous class end"},
-			},
-
-			goto_next = {
-				["]d"] = { query = "@conditional.*", desc = "Next Conditional"}
-			},
-			goto_previous = {
-				["[d"] = { query = "@conditional.*", desc = "previous Conditional"}
-			}
-		},
-
-		lsp_interop = {
-			enable = true,
-			border = 'none',
-			floating_preview_opts = {},
-
-			peek_definition_code = {
-				["<leader>df"] = { query = "@function.outer", desc = "Peek function definition"},
-				["<leader>dF"] = { query = "@class.outer", desc = "Peek class definition"}
-			}
-		}
-
-	}
-	config.textobjects = textobjects
-end
-
-require('nvim-treesitter.configs').setup(config)

lua/sherlock5512/plugins.lua

@@ -101,7 +101,7 @@ return require('packer').startup(function(use)
 	use {'nvim-treesitter/nvim-treesitter',
 		run = ':TSUpdate'
 		}
-	use	{'HiPhish/nvim-ts-rainbow2',
+	use	{'p00f/nvim-ts-rainbow',
 		requires = 'nvim-treesitter/nvim-treesitter'}
 	use {'nvim-treesitter/nvim-treesitter-textobjects',
 		requires = 'nvim-treesitter/nvim-treesitter'}
@@ -138,7 +138,7 @@ return require('packer').startup(function(use)
 		}
 
 	-- Language / Project specific
-	use {'folke/neodev.nvim'}
+	use 'folke/neodev.nvim'
 
 	if Packer_bootstapping then
 		require('packer').sync() -- install plugins on first run