nvim: update a few plugins from flake

4 files changed, 25 insertions, 59 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 1dbf9bc..54cef55 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -5,8 +5,8 @@
 local cmd = vim.cmd
 local opt = vim.opt
 
-vim.g.use_lsp_plugins = false
-vim.g.use_mason = false
+vim.g.use_lsp_plugins = true
+vim.g.use_mason = true
 
 require("getchoo")
 
diff --git a/.config/nvim/lua/getchoo/plugins/general.lua b/.config/nvim/lua/getchoo/plugins/general.lua
index 93cd720..44ef698 100644
--- a/.config/nvim/lua/getchoo/plugins/general.lua
+++ b/.config/nvim/lua/getchoo/plugins/general.lua
@@ -16,7 +16,6 @@ require("catppuccin").setup({
 	compile_path = compile_path,
 	flavour = "mocha", -- mocha, macchiato, frappe, latte
 	integrations = {
-		barbar = true,
 		cmp = true,
 		gitsigns = true,
 		leap = true,
@@ -36,9 +35,12 @@ vim.api.nvim_command("colorscheme catppuccin")
 ---- bufferline
 require("bufferline").setup({
 	options = {
+		always_show_bufferline = false,
 		highlights = require("catppuccin.groups.integrations.bufferline").get(),
 		diagnostics = "nvim_lsp",
+		mode = "buffers",
 		numbers = "ordinal",
+		separator_style = "slant",
 	},
 })
 
diff --git a/.config/nvim/lua/getchoo/plugins/init.lua b/.config/nvim/lua/getchoo/plugins/init.lua
index b76f4c5..617eb32 100644
--- a/.config/nvim/lua/getchoo/plugins/init.lua
+++ b/.config/nvim/lua/getchoo/plugins/init.lua
@@ -61,6 +61,7 @@ require("packer").startup(function(use)
 				require("nvim-treesitter.install").update({ with_sync = true })
 			end,
 		})
+		use("IndianBoy42/tree-sitter-just")
 
 		use("hrsh7th/nvim-cmp")
 		use("hrsh7th/cmp-nvim-lsp")
diff --git a/.config/nvim/lua/getchoo/plugins/lsp.lua b/.config/nvim/lua/getchoo/plugins/lsp.lua
index e141759..7719318 100644
--- a/.config/nvim/lua/getchoo/plugins/lsp.lua
+++ b/.config/nvim/lua/getchoo/plugins/lsp.lua
@@ -7,72 +7,37 @@ local cmp = require("cmp")
 local luasnip = require("luasnip")
 local mapping = cmp.mapping
 
-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
-
-local feedkey = function(key, mode)
-	vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
-end
-local cmp_on_attach = function(_, bufnr)
-	vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-end
-
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-capabilities.textDocument.completion.completionItem.snippetSupport = true
-
 require("cmp").setup({
+	completion = {
+		completeopt = "menu,menuone,noinsert",
+	},
+
 	snippet = {
 		expand = function(args)
-			vim.fn["vsnip#anonymous"](args.body)
 			luasnip.lsp_expand(args.body)
 		end,
 	},
 
 	mapping = mapping.preset.insert({
-		["<Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
-				cmp.select_next_item()
-			elseif luasnip.expand_or_jumpable() then
-				luasnip.expand_or_jump()
-			elseif vim.fn["vsnip#available"](1) == 1 then
-				feedkey("<Plug>(vsnip-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)
-			elseif vim.fn["vsnip#available"](-1) == 1 then
-				feedkey("<Plug>(vsnip-jump-prev)", "")
-			else
-				fallback()
-			end
-		end, { "i", "s" }),
+		["<C-n>"] = mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+		["<C-p>"] = mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
 		["<C-b>"] = mapping.scroll_docs(-4),
 		["<C-f>"] = mapping.scroll_docs(4),
 		["<C-Space>"] = mapping.complete(),
 		["<C-e>"] = mapping.abort(),
 		["<CR>"] = mapping.confirm({ select = true }),
+		["<S-CR>"] = mapping.confirm({
+			behavior = cmp.ConfirmBehavior.Replace,
+			select = true,
+		}),
 	}),
 
 	sources = cmp.config.sources({
 		{ name = "nvim_lsp" },
 		{ name = "luasnip" },
-		{ name = "vsnip" },
-		{ name = "buffer" },
 		{ name = "path" },
+		{ name = "buffer" },
 	}),
-
-	capabilities = capabilities,
-
-	on_attach = cmp_on_attach,
 })
 
 ---- fidget
@@ -93,25 +58,19 @@ local sources = {
 		"eslint",
 		"pyright",
 		"rust_analyzer",
-		"tsserver",
 		"tailwindcss",
-		"nimls",
+		"tsserver",
 	},
 	null_ls = {
 		diagnostics.actionlint,
 		diagnostics.alex,
 		diagnostics.codespell,
-		diagnostics.deadnix,
-		diagnostics.markdownlint,
+		diagnostics.eslint,
 		diagnostics.pylint,
 		diagnostics.shellcheck,
-		diagnostics.statix,
-		formatting.alejandra,
 		formatting.beautysh,
 		formatting.codespell,
 		formatting.just,
-		formatting.markdownlint,
-		formatting.nimpretty,
 		formatting.prettier,
 		formatting.rustfmt,
 		formatting.stylua,
@@ -138,9 +97,11 @@ local sources = {
 }
 
 --- lsp config
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+
 local all_config = {
 	capabilities = capabilities,
-	on_attach = cmp_on_attach,
 }
 
 local servers = {}
@@ -150,7 +111,6 @@ end
 
 servers["lua_ls"] = {
 	capabilities = capabilities,
-	on_attach = cmp_on_attach,
 	settings = {
 		Lua = {
 			runtime = {
@@ -226,4 +186,7 @@ require("nvim-treesitter.configs").setup({
 		enable = true,
 		additional_vim_regex_highlighting = false,
 	},
+	indent = { enable = true },
 })
+
+require("tree-sitter-just").setup({})