nvim: plugins: moving to lazy.nvim style plugin declaration

Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>

12 files changed, 485 insertions, 397 deletions

diff --git a/lua/plugins/autopair.lua b/lua/plugins/autopair.lua
index 0f77573..1102fbd 100644
--- a/lua/plugins/autopair.lua
+++ b/lua/plugins/autopair.lua
@@ -1 +1,9 @@
-require('nvim-autopairs').setup()
+return {
+	{
+		'windwp/nvim-autopairs',
+		event = "InsertEnter",
+		config = true
+		-- use opts = {} for passing setup options
+		-- this is equivalent to setup({}) function
+	}
+}
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index f28dcd9..212b550 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1 +1,5 @@
-vim.cmd[[colorscheme carbonfox]]
+return {
+	{ 
+		"EdenEast/nightfox.nvim" 
+	},
+}
diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua
index 42b1e7c..0340d23 100644
--- a/lua/plugins/completion.lua
+++ b/lua/plugins/completion.lua
@@ -1,148 +1,174 @@
-local has_words_before = function()
-	local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-	return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-end
-
--- luasnip setup
-local luasnip = require 'luasnip'
-
-local cmp_kinds = {
-	Text = "",
-	Method = "󰆧",
-	Function = "󰊕",
-	Constructor = "",
-	Field = "󰇽",
-	Variable = "󰂡",
-	Class = "󰠱",
-	Interface = "",
-	Module = "",
-	Property = "󰜢",
-	Unit = "",
-	Value = "󰎠",
-	Enum = "",
-	Keyword = "󰌋",
-	Snippet = "",
-	Color = "󰏘",
-	File = "󰈙",
-	Reference = "",
-	Folder = "󰉋",
-	EnumMember = "",
-	Constant = "󰏿",
-	Struct = "",
-	Event = "",
-	Operator = "󰆕",
-	TypeParameter = "󰅲",
-}
-
--- nvim-cmp setup
-local cmp = require('cmp')
-cmp.setup {
-	view = {
-		docs = {
-			auto_open = false
-		},
-	},
-	formatting = {
-		fields = { "kind", "abbr" },
-		format = function(_, vim_item)
-			vim_item.kind = cmp_kinds[vim_item.kind] or ""
-			return vim_item
-		end,
-	},
-	snippet = {
-		expand = function(args)
-			require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-		end,
+return {
+	{ "hrsh7th/cmp-nvim-lsp" },
+	{ "hrsh7th/cmp-buffer" },
+	{ "hrsh7th/cmp-path" },
+	{ "hrsh7th/cmp-cmdline" },
+	{ "hrsh7th/cmp-nvim-lsp-signature-help" },
+	{ "hrsh7th/cmp-nvim-lua" },
+	{ "saadparwaiz1/cmp_luasnip" },
+	{
+		"L3MON4D3/LuaSnip",
+		version = "v2.*",
+		build = "make install_jsregexp"
 	},
-	window = {
-		completion = cmp.config.window.bordered(),
-		documentation = cmp.config.window.bordered(),
+	{ "rafamadriz/friendly-snippets" },
+	{
+		"petertriho/cmp-git",
+		dependencies = "nvim-lua/plenary.nvim"
 	},
-	mapping = cmp.mapping.preset.insert({
-		['<C-d>'] = cmp.mapping.scroll_docs(-4),
-		['<C-f>'] = cmp.mapping.scroll_docs(4),
-		['<C-Space>'] = cmp.mapping.complete(),
-		['<CR>'] = cmp.mapping.confirm {
-			behavior = cmp.ConfirmBehavior.Insert,
-			select = true,
-		},
-		['<Tab>'] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_next_item()
-			elseif luasnip.expand_or_jumpable() then
-				luasnip.expand_or_jump()
-			elseif has_words_before() then
-				cmp.complete()
-			else
-				fallback()
+	{ "micangl/cmp-vimtex" },
+	{
+		"hrsh7th/nvim-cmp",
+		config = function()
+			local has_words_before = function()
+				local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+				return col ~= 0 and
+				vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
 			end
-		end, { "i", "s" }),
-		['<S-Tab>'] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_prev_item()
-			elseif luasnip.jumpable(-1) then
-				luasnip.jump(-1)
-			else
-				fallback()
-			end
-		end, { 'i', 's' }),
-	}),
-	sources = cmp.config.sources({
-		{ name = 'luasnip',                option = { use_show_condition = false } },
-		{ name = 'nvim_lsp' },
-		{ name = 'nvim_lsp_signature_help' },
-		{ name = 'path' },
-		{ name = 'buffer' },
-		{ name = 'nvim_lua' },
-		{ name = 'vimtex' },
-	}),
-}
 
--- Set configuration for specific filetype.
-cmp.setup.filetype('gitcommit', {
-	sources = cmp.config.sources({
-		{ name = 'git' }, -- You can specify the `cmp_git` source if you were installed it.
-		{ name = 'buffer' },
-	}),
-	require("cmp_git").setup(),
-})
+			-- luasnip setup
+			local luasnip = require 'luasnip'
+
+			local cmp_kinds = {
+				Text = "",
+				Method = "󰆧",
+				Function = "󰊕",
+				Constructor = "",
+				Field = "󰇽",
+				Variable = "󰂡",
+				Class = "󰠱",
+				Interface = "",
+				Module = "",
+				Property = "󰜢",
+				Unit = "",
+				Value = "󰎠",
+				Enum = "",
+				Keyword = "󰌋",
+				Snippet = "",
+				Color = "󰏘",
+				File = "󰈙",
+				Reference = "",
+				Folder = "󰉋",
+				EnumMember = "",
+				Constant = "󰏿",
+				Struct = "",
+				Event = "",
+				Operator = "󰆕",
+				TypeParameter = "󰅲",
+			}
+
+			-- nvim-cmp setup
+			local cmp = require 'cmp'
+			cmp.setup {
+				view = {
+					docs = {
+						auto_open = false
+					},
+				},
+				formatting = {
+					fields = { "kind", "abbr" },
+					format = function(_, vim_item)
+						vim_item.kind = cmp_kinds[vim_item.kind] or ""
+						return vim_item
+					end,
+				},
+				snippet = {
+					expand = function(args)
+						require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+					end,
+				},
+				window = {
+					completion = cmp.config.window.bordered(),
+					documentation = cmp.config.window.bordered(),
+				},
+				mapping = cmp.mapping.preset.insert({
+					['<C-d>'] = cmp.mapping.scroll_docs(-4),
+					['<C-f>'] = cmp.mapping.scroll_docs(4),
+					['<C-Space>'] = cmp.mapping.complete(),
+					['<CR>'] = cmp.mapping.confirm {
+						behavior = cmp.ConfirmBehavior.Insert,
+						select = true,
+					},
+					['<Tab>'] = cmp.mapping(function(fallback)
+						if cmp.visible() then
+							cmp.select_next_item()
+						elseif luasnip.expand_or_jumpable() then
+							luasnip.expand_or_jump()
+						elseif has_words_before() then
+							cmp.complete()
+						else
+							fallback()
+						end
+					end, { "i", "s" }),
+					['<S-Tab>'] = cmp.mapping(function(fallback)
+						if cmp.visible() then
+							cmp.select_prev_item()
+						elseif luasnip.jumpable(-1) then
+							luasnip.jump(-1)
+						else
+							fallback()
+						end
+					end, { 'i', 's' }),
+				}),
+				sources = cmp.config.sources({
+					{ name = 'luasnip',                option = { use_show_condition = false } },
+					{ name = 'nvim_lsp' },
+					{ name = 'nvim_lsp_signature_help' },
+					{ name = 'path' },
+					{ name = 'buffer' },
+					{ name = 'nvim_lua' },
+					{ name = 'vimtex' },
+				}),
+			}
 
--- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
-require 'cmp'.setup.cmdline('/', {
-	completion = { autocomplete = false },
-	sources = {
-		-- { name = 'buffer' }
-		{ name = 'buffer', opts = { keyword_pattern = [=[[^[:blank:]].*]=] } }
-	}
-})
+			-- Set configuration for specific filetype.
+			cmp.setup.filetype('gitcommit', {
+				sources = cmp.config.sources({
+					{ name = 'git' }, -- You can specify the `cmp_git` source if you were installed it.
+					{ name = 'buffer' },
+				}),
+				require("cmp_git").setup(),
+			})
 
--- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline(':', {
-	mapping = cmp.mapping.preset.cmdline(),
-	sources = cmp.config.sources({
-		{ name = 'path' }
-	}, {
-		{ name = 'cmdline' }
-	})
-})
+			-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
+			require 'cmp'.setup.cmdline('/', {
+				completion = { autocomplete = false },
+				sources = {
+					-- { name = 'buffer' }
+					{ name = 'buffer', opts = { keyword_pattern = [=[[^[:blank:]].*]=] } }
+				}
+			})
 
--- If you want insert `(` after select function or method item
-local cmp_autopairs = require('nvim-autopairs.completion.cmp')
-cmp.event:on(
-	'confirm_done',
-	cmp_autopairs.on_confirm_done()
-)
+			-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+			cmp.setup.cmdline(':', {
+				mapping = cmp.mapping.preset.cmdline(),
+				sources = cmp.config.sources({
+					{ name = 'path' }
+				}, {
+					{ name = 'cmdline' }
+				})
+			})
 
--- lazy loading to get in memory snippets of languages you use
-require("luasnip/loaders/from_vscode").lazy_load()
+			-- If you want insert `(` after select function or method item
+			local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+			cmp.event:on(
+				'confirm_done',
+				cmp_autopairs.on_confirm_done()
+			)
 
-vim.diagnostic.config({
-	virtual_text = false,
-	signs = true,
-	underline = false,
-	update_in_insert = true,
-	severity_sort = false,
-	float = {
-		source = true,
+			-- lazy loading to get in memory snippets of languages you use
+			require("luasnip/loaders/from_vscode").lazy_load()
+
+			vim.diagnostic.config({
+				virtual_text = false,
+				signs = true,
+				underline = false,
+				update_in_insert = true,
+				severity_sort = false,
+				float = {
+					source = true,
+				},
+			})
+		end,
 	},
-})
+}
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
index 1d8c1eb..a563fac 100644
--- a/lua/plugins/gitsigns.lua
+++ b/lua/plugins/gitsigns.lua
@@ -1,40 +1,47 @@
-require('gitsigns').setup{
-	on_attach = function(bufnr)
-		local gs = package.loaded.gitsigns
+return {
+	{ "tpope/vim-fugitive", },
+	{
+		'lewis6991/gitsigns.nvim',
+		event = { 'BufReadPre', 'BufNewFile' },
+		opts = {
+			on_attach = function(bufnr)
+				local gs = package.loaded.gitsigns
 
-		local function map(mode, l, r, opts)
-			opts = opts or {}
-			opts.buffer = bufnr
-			vim.keymap.set(mode, l, r, opts)
-		end
+				local function map(mode, l, r, opts)
+					opts = opts or {}
+					opts.buffer = bufnr
+					vim.keymap.set(mode, l, r, opts)
+				end
 
-		-- Navigation
-		map('n', ']c', function()
-			if vim.wo.diff then return ']c' end
-			vim.schedule(function() gs.next_hunk() end)
-			return '<Ignore>'
-		end, {expr=true})
+				-- Navigation
+				map('n', ']c', function()
+					if vim.wo.diff then return ']c' end
+					vim.schedule(function() gs.next_hunk() end)
+					return '<Ignore>'
+				end, { expr = true })
 
-		map('n', '[c', function()
-			if vim.wo.diff then return '[c' end
-			vim.schedule(function() gs.prev_hunk() end)
-			return '<Ignore>'
-		end, {expr=true})
+				map('n', '[c', function()
+					if vim.wo.diff then return '[c' end
+					vim.schedule(function() gs.prev_hunk() end)
+					return '<Ignore>'
+				end, { expr = true })
 
-		-- Actions
-		map({'n', 'v'}, '<leader>hs', ':Gitsigns stage_hunk<CR>')
-		map({'n', 'v'}, '<leader>hr', ':Gitsigns reset_hunk<CR>')
-		map('n', '<leader>hS', gs.stage_buffer)
-		map('n', '<leader>hu', gs.undo_stage_hunk)
-		map('n', '<leader>hR', gs.reset_buffer)
-		map('n', '<leader>hp', gs.preview_hunk)
-		map('n', '<leader>hb', function() gs.blame_line{full=true} end)
-		map('n', '<leader>tb', gs.toggle_current_line_blame)
-		map('n', '<leader>hd', gs.diffthis)
-		map('n', '<leader>hD', function() gs.diffthis('~') end)
-		map('n', '<leader>td', gs.toggle_deleted)
+				-- Actions
+				map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
+				map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
+				map('n', '<leader>hS', gs.stage_buffer)
+				map('n', '<leader>hu', gs.undo_stage_hunk)
+				map('n', '<leader>hR', gs.reset_buffer)
+				map('n', '<leader>hp', gs.preview_hunk)
+				map('n', '<leader>hb', function() gs.blame_line { full = true } end)
+				map('n', '<leader>tb', gs.toggle_current_line_blame)
+				map('n', '<leader>hd', gs.diffthis)
+				map('n', '<leader>hD', function() gs.diffthis('~') end)
+				map('n', '<leader>td', gs.toggle_deleted)
 
-		-- Text object
-		map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
-	end
+				-- Text object
+				map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+			end
+		}
+	}
 }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 33de12e..f528edd 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,127 +1,126 @@
--- Setup language servers
-local lspconfig = require('lspconfig')
-lspconfig.lua_ls.setup {
-	settings = {
-		Lua = {
-			runtime = {
-				-- Tell the language server which version of Lua you're using
-				-- (most likely LuaJIT in the case of Neovim)
-				version = 'LuaJIT',
-			},
-			diagnostics = {
-				-- Get the language server to recognize the `vim` global
-				globals = {
-					'vim',
-					'require'
+return {
+	{
+		"neovim/nvim-lspconfig",
+		event = { 'BufReadPre', 'BufNewFile' },
+		config = function()
+			local lspconfig = require('lspconfig')
+			lspconfig.lua_ls.setup {
+				settings = {
+					Lua = {
+						runtime = {
+							-- Tell the language server which version of Lua you're using
+							-- (most likely LuaJIT in the case of Neovim)
+							version = 'LuaJIT',
+						},
+						diagnostics = {
+							-- Get the language server to recognize the `vim` global
+							globals = {
+								'vim',
+								'require'
+							},
+						},
+						workspace = {
+							-- Make the server aware of Neovim runtime files
+							library = vim.api.nvim_get_runtime_file("", true),
+						},
+						-- Do not send telemetry data containing a randomized but unique identifier
+						telemetry = {
+							enable = false,
+						},
+					},
 				},
-			},
-			workspace = {
-				-- Make the server aware of Neovim runtime files
-				library = vim.api.nvim_get_runtime_file("", true),
-			},
-			-- Do not send telemetry data containing a randomized but unique identifier
-			telemetry = {
-				enable = false,
-			},
-		},
-	},
-}
-lspconfig.clangd.setup {}
+			}
+			lspconfig.clangd.setup {}
 
--- Global mappings.
--- See `:help vim.diagnostic.*` for documentation on any of the below functions
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
+			-- Use LspAttach autocommand to only map the following keys
+			-- after the language server attaches to the current buffer
+			vim.api.nvim_create_autocmd('LspAttach', {
+				group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+				callback = function(ev)
+					-- Enable completion triggered by <c-x><c-o>
+					vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
 
--- Use LspAttach autocommand to only map the following keys
--- after the language server attaches to the current buffer
-vim.api.nvim_create_autocmd('LspAttach', {
-	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
-	callback = function(ev)
-		-- Enable completion triggered by <c-x><c-o>
-		vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+					-- Buffer local mappings.
+					-- See `:help vim.lsp.*` for documentation on any of the below functions
+					local opts = { buffer = ev.buf }
+					vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+					vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+					vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+					vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+					vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+					vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+					vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+					vim.keymap.set('n', '<leader>wl', function()
+						print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+					end, opts)
+					vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+					vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
+					vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
+					vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+					vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
+						vim.lsp.buf.format { async = true }
+					end, opts)
+				end,
+			})
 
-		-- Buffer local mappings.
-		-- See `:help vim.lsp.*` for documentation on any of the below functions
-		local opts = { buffer = ev.buf }
-		vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
-		vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-		vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
-		vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
-		vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-		vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
-		vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
-		vim.keymap.set('n', '<leader>wl', function()
-			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-		end, opts)
-		vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
-		vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
-		vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
-		vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-		vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
-			vim.lsp.buf.format { async = true }
-		end, opts)
-	end,
-})
+			local signs = { Error = "󰅚 ", Warn = " ", Hint = " ", Info = " " }
+			vim.diagnostic.config({
+				signs = {
+					enable = true,
+					text = {
+						["ERROR"] = signs.Error,
+						["WARN"] = signs.Warn,
+						["HINT"] = signs.Hint,
+						["INFO"] = signs.Info,
+					},
+					texthl = {
+						["ERROR"] = "DiagnosticDefault",
+						["WARN"] = "DiagnosticDefault",
+						["HINT"] = "DiagnosticDefault",
+						["INFO"] = "DiagnosticDefault",
+					},
+					numhl = {
+						["ERROR"] = "DiagnosticDefault",
+						["WARN"] = "DiagnosticDefault",
+						["HINT"] = "DiagnosticDefault",
+						["INFO"] = "DiagnosticDefault",
+					},
+				}
+			})
 
+			vim.o.updatetime = 250
+			-- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})]]
+			-- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
+			vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#4c4f69]]
+			vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]]
 
-local signs = { Error = "󰅚 ", Warn = " ", Hint = " ", Info = " " }
-vim.diagnostic.config({
-	signs = {
-		enable = true,
-		text = {
-			["ERROR"] = signs.Error,
-			["WARN"] = signs.Warn,
-			["HINT"] = signs.Hint,
-			["INFO"] = signs.Info,
-		},
-		texthl = {
-			["ERROR"] = "DiagnosticDefault",
-			["WARN"] = "DiagnosticDefault",
-			["HINT"] = "DiagnosticDefault",
-			["INFO"] = "DiagnosticDefault",
-		},
-		numhl = {
-			["ERROR"] = "DiagnosticDefault",
-			["WARN"] = "DiagnosticDefault",
-			["HINT"] = "DiagnosticDefault",
-			["INFO"] = "DiagnosticDefault",
-		},
-	}
-})
+			local border = {
+				{ "╭", "FloatBorder" },
+				{ "─", "FloatBorder" },
+				{ "╮", "FloatBorder" },
+				{ "│", "FloatBorder" },
+				{ "╯", "FloatBorder" },
+				{ "─", "FloatBorder" },
+				{ "╰", "FloatBorder" },
+				{ "│", "FloatBorder" },
+			}
 
-vim.o.updatetime = 250
--- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})]]
--- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
-vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#4c4f69]]
-vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]]
+			-- To instead override globally
+			local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
+			function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
+				opts = opts or {}
+				opts.border = opts.border or border
+				return orig_util_open_floating_preview(contents, syntax, opts, ...)
+			end
 
-local border = {
-	{ "╭", "FloatBorder" },
-	{ "─", "FloatBorder" },
-	{ "╮", "FloatBorder" },
-	{ "│", "FloatBorder" },
-	{ "╯", "FloatBorder" },
-	{ "─", "FloatBorder" },
-	{ "╰", "FloatBorder" },
-	{ "│", "FloatBorder" },
+			--- In .nvim.lua of your project paste in this
+			---
+			--- require'lspconfig'.clangd.setup{
+				--- 	on_attach = require("plugins.lsp-config").on_attach,
+				--- 	cpabilities = require("plugins.lsp-config").cpabilities,
+				--- 	lsp_flags = require("plugins.lsp-config").lsp_flags,
+				--- 	cmd = {vim.fn.expand('~/esp/esp-clang/bin/clangd')}
+				--- }
+		end,
+	},
 }
-
--- To instead override globally
-local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
-function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
-	opts = opts or {}
-	opts.border = opts.border or border
-	return orig_util_open_floating_preview(contents, syntax, opts, ...)
-end
-
---- In .nvim.lua of your project paste in this
----
---- require'lspconfig'.clangd.setup{
---- 	on_attach = require("plugins.lsp-config").on_attach,
---- 	cpabilities = require("plugins.lsp-config").cpabilities,
---- 	lsp_flags = require("plugins.lsp-config").lsp_flags,
---- 	cmd = {vim.fn.expand('~/esp/esp-clang/bin/clangd')}
---- }
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index 9797e9e..2ae51e8 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -1,40 +1,46 @@
-require('lualine').setup {
-  options = {
-    icons_enabled = true,
-    theme = 'auto',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
-    disabled_filetypes = {
-      statusline = {},
-      winbar = {},
-    },
-    ignore_focus = {},
-    always_divide_middle = true,
-    globalstatus = false,
-    refresh = {
-      statusline = 1000,
-      tabline = 1000,
-      winbar = 1000,
-    }
-  },
-  sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-  tabline = {},
-  winbar = {},
-  inactive_winbar = {},
-  extensions = {}
+return {
+	{
+		'nvim-lualine/lualine.nvim',
+		event = { 'BufReadPre', 'BufNewFile' },
+		opts = {
+			options = {
+				icons_enabled = true,
+				theme = 'auto',
+				component_separators = { left = '', right = '' },
+				section_separators = { left = '', right = '' },
+				disabled_filetypes = {
+					statusline = {},
+					winbar = {},
+				},
+				ignore_focus = {},
+				always_divide_middle = true,
+				globalstatus = false,
+				refresh = {
+					statusline = 1000,
+					tabline = 1000,
+					winbar = 1000,
+				}
+			},
+			sections = {
+				lualine_a = { 'mode' },
+				lualine_b = { 'branch', 'diff', 'diagnostics' },
+				lualine_c = { 'filename' },
+				lualine_x = { 'encoding', 'fileformat', 'filetype' },
+				lualine_y = { 'progress' },
+				lualine_z = { 'location' }
+			},
+			inactive_sections = {
+				lualine_a = {},
+				lualine_b = {},
+				lualine_c = { 'filename' },
+				lualine_x = { 'location' },
+				lualine_y = {},
+				lualine_z = {}
+			},
+			tabline = {},
+			winbar = {},
+			inactive_winbar = {},
+			extensions = {},
+		}
+	},
 }
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
deleted file mode 100644
index 4cdec34..0000000
--- a/lua/plugins/nvim-tree.lua
+++ /dev/null
@@ -1,19 +0,0 @@
--- disable netrw at the very start of your init.lua (strongly advised)
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- OR setup with some options
-require("nvim-tree").setup({
-	sort = {
-		sorter = "case_sensitive",
-	},
-	view = {
-		width = 30,
-	},
-	renderer = {
-		group_empty = true,
-	},
-	filters = {
-		dotfiles = true,
-	},
-})
diff --git a/lua/plugins/productivity.lua b/lua/plugins/productivity.lua
new file mode 100644
index 0000000..df60d43
--- /dev/null
+++ b/lua/plugins/productivity.lua
@@ -0,0 +1,19 @@
+return {
+	{
+		"windwp/nvim-autopairs",
+		event = "InsertEnter",
+		config = true
+	},
+	{ "preservim/nerdcommenter" },
+	{
+		"dhruvasagar/vim-table-mode",
+		ft = { 'markdown', 'markdown.pandoc', 'pandoc' }
+	},
+	{
+		"junegunn/fzf",
+		build = ":call fzf#install()"
+	},
+	{ "junegunn/fzf.vim" },
+	{ "tpope/vim-surround" },
+	{ "junegunn/vim-easy-align" },
+}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 4a6a012..a96d883 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -1,33 +1,68 @@
-require 'nvim-treesitter.configs'.setup {
-	-- A list of parser names, or "all"
-	ensure_installed = { "c", "lua", "cpp", "markdown", "vimdoc" },
+return {
+	'nvim-treesitter/nvim-treesitter',
+	dependencies = {
+		{
+			'nvim-treesitter/nvim-treesitter-context',
+			opts = {
+				-- Avoid the sticky context from growing a lot.
+				max_lines = 3,
+				-- Match the context lines to the source code.
+				multiline_threshold = 1,
+				-- Disable it when the window is too small.
+				min_window_height = 20,
+			},
+			keys = {
+				{
+					'[c',
+					function()
+						-- Jump to previous change when in diffview.
+						if vim.wo.diff then
+							return '[c'
+						else
+							vim.schedule(function()
+								require('treesitter-context').go_to_context()
+							end)
+							return '<Ignore>'
+						end
+					end,
+					desc = 'Jump to upper context',
+					expr = true,
+				},
+			},
+		},
+	},
+	build = ':TSUpdate',
+	opts = {
+		-- A list of parser names, or "all"
+		ensure_installed = { "c", "lua", "cpp", "markdown", "markdown_inline", "vim", "regex", "vimdoc" },
 
-	-- Install parsers synchronously (only applied to `ensure_installed`)
-	sync_install = true,
+		-- Install parsers synchronously (only applied to `ensure_installed`)
+		sync_install = true,
 
-	-- Automatically install missing parsers when entering buffer
-	auto_install = false,
+		-- Automatically install missing parsers when entering buffer
+		auto_install = false,
 
-	-- List of parsers to ignore installing (for "all")
-	ignore_install = { "javascript" },
+		-- List of parsers to ignore installing (for "all")
+		ignore_install = { "javascript" },
 
-	highlight = {
-		-- `false` will disable the whole extension
-		enable = true,
+		highlight = {
+			-- `false` will disable the whole extension
+			enable = true,
 
-		-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-		-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-		-- the name of the parser)
-		-- list of language that will be disabled
-		-- disable = { "c", "rust" },
-		disable = { "markdown" },
+			-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+			-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+			-- the name of the parser)
+			-- list of language that will be disabled
+			-- disable = { "c", "rust" },
+			disable = { "markdown" },
 
-		-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-		-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-		-- Using this option may slow down your editor, and you may see some duplicate highlights.
-		-- Instead of true it can also be a list of languages
-		additional_vim_regex_highlighting = false,
-	},
+			-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+			-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+			-- Using this option may slow down your editor, and you may see some duplicate highlights.
+			-- Instead of true it can also be a list of languages
+			additional_vim_regex_highlighting = false,
+		},
 
-	indent = true,
+		indent = true,
+	},
 }
diff --git a/lua/plugins/usnippet.lua b/lua/plugins/usnippet.lua
deleted file mode 100644
index 431169d..0000000
--- a/lua/plugins/usnippet.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.g.UltiSnipsExpandTrigger = "<c-tab>"
-vim.g.UltiSnipsJumpForwardTrigger = "<nop>"
-vim.g.UltiSnipsJumpBackwardTrigger = "<nop>"
-
-vim.g.UltiSnipsSnippetDirectories = { 'UltiSnips', 'my_snippets' }
diff --git a/lua/plugins/vimtex.lua b/lua/plugins/vimtex.lua
deleted file mode 100644
index 70f9645..0000000
--- a/lua/plugins/vimtex.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-vim.g.vimtex_view_method = "general"
-vim.g.vimtex_view_general_viewer = "evince"
-vim.g.vimtex_view_forward_search_on_start = false
-vim.g.vimtex_toc_config = {
-	mode = 1,
-	fold_enable = 0,
-	hide_line_numbers = 1,
-	resize = 0,
-	refresh_always = 1,
-	show_help = 0,
-	show_numbers = 1,
-	split_pos = 'leftabove',
-	split_width = 30,
-	tocdeth = 3,
-	indent_levels = 1,
-	todo_sorted = 1,
-}
diff --git a/lua/plugins/writing.lua b/lua/plugins/writing.lua
new file mode 100644
index 0000000..0b5669f
--- /dev/null
+++ b/lua/plugins/writing.lua
@@ -0,0 +1,25 @@
+return {
+	{
+		"junegunn/goyo.vim",
+		ft = { 'markdown', 'markdown.pandoc', 'tex', 'c' }
+	},
+	{
+		"junegunn/limelight.vim",
+		ft = { 'markdown', 'markdown.pandoc', 'tex', 'c' }
+	},
+	{
+		"vim-pandoc/vim-pandoc",
+		ft = { 'markdown', 'markdown.pandoc' },
+		lazy = false
+	},
+	{
+		"vim-pandoc/vim-pandoc-syntax",
+		ft = { 'markdown', 'markdown.pandoc' },
+		lazy = false
+	},
+	{
+		"lervag/vimtex",
+		ft = { 'tex' },
+		lazy = false
+	},
+}