Update lvim, bsp, vscode

config/lvim/config.lua

@@ -1,5 +1,5 @@
 lvim.format_on_save = false
-lvim.lint_on_save = false
+lvim.lint_on_save = true
 lvim.colorscheme = "onedarker"
 
 -- Default fatures
@@ -14,15 +14,18 @@ lvim.builtin.gitsigns.opts.current_line_blame_opts = { delay = 200 }
 -- TreeSitter
 lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua", "go" }
 lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" }
-require("user.treesitter")
 
 -- Telescope
 lvim.builtin.telescope.defaults.layout_config.prompt_position = "top"
-lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" }
+lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env", ".bin" }
+
+-- NvimTree
+lvim.builtin.nvimtree.ignore = { ".git", "node_modules", ".bin", "env" }
 
 -- Mappings
 lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>"
 lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>"
+lvim.keys.visual_mode["jk"] = "<esc>"
 lvim.builtin.which_key.mappings.l.a = { "<cmd>Telescope lsp_code_actions<cr>", "Code Actions" }
 lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" }
 lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" }
@@ -43,16 +46,30 @@ end
 
 -- Pluginos
 lvim.plugins = {
-	{ "tpope/vim-surround", keys = { "c", "y", "d" } },
-	{ "andymass/vim-matchup", keys = { "%" } },
+	{ "tpope/vim-surround", keys = { "c", "y", "d" }, event = "BufRead" },
 	{ "tzachar/cmp-tabnine", run = "./install.sh", event = "InsertEnter" },
 	{ "folke/trouble.nvim", cmd = { "TroubleToggle" } },
 	{ "folke/todo-comments.nvim", event = "BufRead" },
-	{ "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" },
-	{ "vim-test/vim-test", cmd = { "TestNearest", "TestFile", "TestSuite", "TestLast", "TestVisit" } },
+	{ "editorconfig/editorconfig-vim" },
+	{ "theHamsta/nvim-dap-virtual-text", config = "vim.g.dap_virtual_text = true" },
+	{
+		"Smirnov-O/ts-unit.nvim",
+		keys = { "vip", "cip", "yip", "dip" },
+		config = function()
+			require("ts-unit").setup({ keymaps = true })
+		end,
+	},
+	{
+		"Olical/conjure",
+		ft = { "clojure", "fennel", "scheme" },
+		requires = { { "PaterJason/cmp-conjure", after = "conjure" } },
+		config = function()
+			require("user.conjure").setup()
+		end,
+	},
 	{
 		"rcarriga/vim-ultest",
-		requires = { "vim-test/vim-test" },
+		requires = { { "vim-test/vim-test", after = "vim-ultest" } },
 		cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },
 		run = ":UpdateRemotePlugins",
 	},

config/lvim/ftplugin/lua.lua

@@ -1,4 +1,3 @@
-lvim.format_on_save = true
 lvim.lang.lua.formatters = {
 	{ exe = "stylua" },
 }

config/lvim/lua/user/conjure.lua

@@ -0,0 +1,48 @@
+local M = {}
+
+M.setup = function()
+	vim.g.maplocalleader = ","
+	vim.g["conjure#mapping#doc_word"] = "K"
+
+	-- Clojure
+	vim.g["conjure#client#clojure#nrepl#eval#auto_require"] = false
+	vim.g["conjure#client#clojure#nrepl#connection#auto_repl#enabled"] = false
+
+	-- Scheme
+	vim.g["conjure#client#scheme#stdio#command"] = "chicken-csi -quiet -:c"
+	vim.g["conjure#client#scheme#stdio#prompt_pattern"] = "\n-#;%d-> "
+
+	lvim.builtin.cmp.sources = {
+		{ name = "nvim_lsp", max_item_count = 7 },
+		{ name = "cmp_tabnine", max_item_count = 3 },
+		{ name = "buffer", max_item_count = 3 },
+		{ name = "path", max_item_count = 5 },
+		{ name = "luasnip", max_item_count = 3 },
+		{ name = "nvim_lua" },
+		{ name = "conjure" },
+	}
+
+	lvim.builtin.cmp.formatting = {
+		format = function(entry, vim_item)
+			local cmp_kind = require("user.lsp_kind").cmp_kind
+			vim_item.kind = cmp_kind(vim_item.kind)
+			vim_item.menu = ({
+				buffer = "(Buffer)",
+				nvim_lsp = "(LSP)",
+				luasnip = "(Snip)",
+				spell = "(Spell)",
+				path = "(Path)",
+				conjure = "(Conjure)",
+				cmp_tabnine = "(Tabnine)",
+			})[entry.source.name]
+			vim_item.dup = ({
+				buffer = 1,
+				path = 1,
+				nvim_lsp = 0,
+			})[entry.source.name] or 0
+			return vim_item
+		end,
+	}
+end
+
+return M