fix: deno + ts_ls

init.lua

@@ -17,7 +17,7 @@ vim.cmd("set linebreak")
 vim.cmd("set conceallevel=0") -- DONT hide characters in MD
 vim.cmd("set tabstop=4")
 vim.cmd("set shiftwidth=4")
-vim.cmd("set expandtab")
+vim.cmd("set noexpandtab") -- expandtab to use spaces instead of tabs
 vim.cmd("set wrap")
 vim.lsp.inlay_hint.enable(false)
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
@@ -25,7 +25,8 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,
 -- ╭─────────────╮
 -- │ Colorscheme │
 -- ╰─────────────╯
-vim.cmd("colorscheme rose-pine")
+vim.cmd("colorscheme rose-pine") -- rose-pine, gruvbox
+vim.o.background = "dark"        -- "dark" or "light"
 
 -- ╭───────────────────╮
 -- │ Default clipboard │
@@ -37,7 +38,7 @@ vim.cmd("set clipboard=unnamedplus")
 -- ╰───────╯
 vim.opt.fillchars = {
 	horiz = "━",
-	vert = "│",
+	vert = "▎", -- │ ▎▍▌▋▊▉█
 	stl = " ",
 	eob = " ",
 }

lazy-lock.json

@@ -1,5 +1,6 @@
 {
   "aerial.nvim": { "branch": "master", "commit": "c7cbbad40c2065fccfd1f1863bb2c08180c0533d" },
+  "autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" },
   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
   "blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
@@ -7,32 +8,31 @@
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
+  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "mini.clue": { "branch": "main", "commit": "2d361459de6a5fd7ea20a14ee4b95c6caec383b9" },
   "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
-  "monkey-alert": { "branch": "main", "commit": "213a39f8161f80ce43e1a164a54fe796432422b8" },
   "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" },
-  "no-neck-pain.nvim": { "branch": "main", "commit": "0463fbb77bcab4cc9716ba1e87255bbe4d002de7" },
+  "no-neck-pain.nvim": { "branch": "main", "commit": "76ccd195fb2195ae1b9b9f0d539c517fa3f8a2b9" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-scrollbar": { "branch": "main", "commit": "5b103ef0fd2e8b9b4be3878ed38d224522192c6c" },
-  "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
   "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
   "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
   "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
+  "overseer.nvim": { "branch": "master", "commit": "36298eab791cca87ac3a228933413d094423400e" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
   "smear-cursor.nvim": { "branch": "main", "commit": "4b86df8a0c5f46e708616b21a02493bb0e47ecbd" },
-  "snacks.nvim": { "branch": "main", "commit": "da230e3ca8146da4b73752daaf0a1d07d343c12d" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
 }

lsp/denols.lua

@@ -0,0 +1,6 @@
+return {
+	cmd = { 'deno', 'lsp' },
+	filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" },
+	root_markers = { "deno.json", "deno.jsonc" },
+	workspace_required = true,
+}

lsp/pyright.lua

@@ -1,5 +1,5 @@
 return {
-    cmd = { 'pyright-langserver', '--stdio' },
+    cmd = { 'pylsp' },
     filetypes = { 'python' },
-    root_markers = { 'setup.py', 'setup.cfg', 'requirements.txt', '.git' },
+    root_markers = { 'pyproject.toml', 'setup.py', 'setup.cfg', 'requirements.txt', '.git' },
 }

lsp/ts_ls.lua

@@ -0,0 +1,7 @@
+return {
+	cmd = { 'typescript-language-server', '--stdio' },
+	filetypes = { 'typescript', 'typescriptreact', 'typescript.tsx', 'javascript', 'javascriptreact', 'javascript.jsx', 'js', 'jsx', 'ts', 'tsx' },
+	root_markers = { 'package.json', 'tsconfig.json', 'jsconfig.json' },
+	single_file_support = false,
+	workspace_required = true,
+}

lsp/tsserver.lua

@@ -1,5 +0,0 @@
-return {
-    cmd = { 'typescript-language-server', '--stdio' },
-    filetypes = { 'typescript', 'typescriptreact', 'typescript.tsx', 'javascript', 'javascriptreact', 'javascript.jsx', 'js', 'jsx', 'ts','tsx' },
-    root_markers = { 'package.json', 'tsconfig.json', 'jsconfig.json', '.git' },
-}

lua/config/lsp.lua

@@ -9,10 +9,11 @@ vim.lsp.enable('emmet')
 vim.lsp.enable('gopls')
 vim.lsp.enable('html')
 vim.lsp.enable('jdtls')
+vim.lsp.enable('denols')
 vim.lsp.enable('luals')
 vim.lsp.enable('pyright')
 vim.lsp.enable('rust_analyzer')
 vim.lsp.enable('solargraph')
-vim.lsp.enable('tsserver')
+vim.lsp.enable('ts_ls')
 vim.lsp.enable('volar')
 vim.lsp.enable('jsonls')

lua/config/monkeylist.lua

@@ -0,0 +1 @@
+return "one,another"

lua/config/remap.lua

@@ -128,30 +128,8 @@ map("v", "<leader>ca", function()
 	vim.lsp.buf.code_action()
 end, { desc = "LSP code action" })
 map("n", "<leader>r", function()
-	-- when rename opens the prompt, this autocommand will trigger
-	-- it will "press" CTRL-F to enter the command-line window `:h cmdwin`
-	-- in this window I can use normal mode keybindings
-	local cmdId
-	cmdId = vim.api.nvim_create_autocmd({ "CmdlineEnter" }, {
-		callback = function()
-			local key = vim.api.nvim_replace_termcodes("<C-f>", true, false, true)
-			vim.api.nvim_feedkeys(key, "c", false)
-			vim.api.nvim_feedkeys("0", "n", false)
-			-- autocmd was triggered and so we can remove the ID and return true to delete the autocmd
-			cmdId = nil
-			return true
-		end,
-	})
 	vim.lsp.buf.rename()
-	-- if LPS couldn't trigger rename on the symbol, clear the autocmd
-	vim.defer_fn(function()
-		-- the cmdId is not nil only if the LSP failed to rename
-		if cmdId then
-			vim.api.nvim_del_autocmd(cmdId)
-		end
-	end, 500)
-end, { desc = "Rename symbol" })
-
+end, { desc = "LSP rename" })
 map("n", "<leader>wa", function()
 	vim.lsp.buf.add_workspace_folder()
 end, { desc = "Add workspace folder" })
@@ -178,6 +156,7 @@ map("n", "<Leader>cdo", ":DapStepOver<CR>")
 
 ---- Telescope find ----
 
+map("n", "<leader>F", "<cmd> Telescope resume <CR>", { desc = "Resume las search" })
 map("n", "<leader>ff", "<cmd> Telescope find_files <CR>", { desc = "Find files" })
 map("n", "<leader>fa", "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", { desc = "Find all" })
 map("n", "<leader>fw", "<cmd> Telescope live_grep <CR>", { desc = "Live grep" })
@@ -341,9 +320,7 @@ map("n", "<leader>w-", "<C-W>s", { desc = "Split Window Below", remap = true })
 map("n", "<leader>w|", "<C-W>v", { desc = "Split Window Right", remap = true })
 map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
 map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
-map("n", "<leader>wm", function()
-	LazyVim.toggle.maximize()
-end, { desc = "Maximize Toggle" })
+map("n", "<leader>m", "<cmd>NoNeckPain<cr>", { desc = "Toggle centered layout" })
 
 -- Move to window using the <ctrl> hjkl keys
 map("n", "<C-h>", "<C-w>h", { desc = "Go to Left Window", remap = true })

lua/plugins/code-utils.lua

@@ -60,6 +60,13 @@ return {
         end,
     },
 
+    {
+        'm4xshen/autoclose.nvim',
+        opts = function()
+            return require("plugins.opts.autoclose")
+        end,
+    },
+
     -- │ Diagnostics │
     {
         "folke/trouble.nvim",

lua/plugins/context.lua

@@ -85,8 +85,8 @@ return {
 				scope = {
 					char = "⋅",
 					enabled = true,
-					show_start = true,
-					show_end = true,
+					show_start = false,
+					show_end = false,
 					highlight = { "Function", "Label" },
 					priority = 500,
 					exclude = { language = { "css" } },

lua/plugins/git.lua

@@ -16,16 +16,16 @@ return {
 
 	{ "tpope/vim-fugitive" },
 
-	{
-		-- dir = "~/Documents/Code/monkey-alert.nvim",
-		"dqnid/monkey-alert.nvim",
-		name = "monkey-alert",
-		opts = {
-			monkey_mail_list = require("config.monkeylist"),
-			blame_text_color_hex = "#c0ffee",
-			blame_text = "- Monkey alert 🐒",
-			blame_position = "eol",
-			auto_attach = false,
-		},
-	},
+	-- {
+	-- 	-- dir = "~/Documents/Code/monkey-alert.nvim",
+	-- 	"dqnid/monkey-alert.nvim",
+	-- 	name = "monkey-alert",
+	-- 	opts = {
+	-- 		monkey_mail_list = require("config.monkeylist"),
+	-- 		blame_text_color_hex = "#c0ffee",
+	-- 		blame_text = "- Monkey alert 🐒",
+	-- 		blame_position = "eol",
+	-- 		auto_attach = false,
+	-- 	},
+	-- },
 }

lua/plugins/opts/autoclose.lua

@@ -0,0 +1,24 @@
+return {
+    keys = {
+        ["("] = { escape = false, close = true, pair = "()" },
+        ["["] = { escape = false, close = true, pair = "[]" },
+        ["{"] = { escape = false, close = true, pair = "{}" },
+
+        [">"] = { escape = true, close = false, pair = "<>" },
+        [")"] = { escape = true, close = false, pair = "()" },
+        ["]"] = { escape = true, close = false, pair = "[]" },
+        ["}"] = { escape = true, close = false, pair = "{}" },
+
+        ['"'] = { escape = true, close = true, pair = '""' },
+        ["'"] = { escape = true, close = true, pair = "''" },
+        ["`"] = { escape = true, close = true, pair = "``" },
+    },
+    options = {
+        disabled_filetypes = { "text" },
+        disable_when_touch = false,
+        touch_regex = "[%w(%[{]",
+        pair_spaces = false,
+        auto_indent = true,
+        disable_command_mode = false,
+    },
+}

lua/plugins/opts/bufferline.lua

@@ -31,7 +31,7 @@ local config = {
 		show_tab_indicators = true,
 		duplicates_across_groups = true, -- whether to consider duplicate paths in different groups as duplicates
 		persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
-		separator_style = { "▏", "" }, -- { "▏", "" } | "slant" | "slope" | "thick" | "thin" | { 'any', 'any' },
+		separator_style = { "▍", "" }, -- { "▏", "" } | "slant" | "slope" | "thick" | "thin" | { 'any', 'any' },
 		-- always_show_bufferline = false,
 		auto_toggle_bufferline = true,
 		show_close_icon = true,
@@ -43,9 +43,9 @@ local config = {
 		offsets = {
 			{
 				filetype = "neo-tree",
-				text = "",
+				text = "",
 				highlight = "Directory",
-				separator = "│", -- use a "true" to enable the default, or set your own character
+				separator = "▎", -- use a "true" to enable the default, or set your own character
 			},
 		},
 		groups = {
@@ -55,17 +55,19 @@ local config = {
 			items = {
 				{
 					name = "Tests",
-					highlight = { underline = false, sp = "blue" },
+					-- icon = "󰙨 ",
+					highlight = { underline = false },
 					priority = 2,
-					-- icon = " ",
 					matcher = function(buf)
-						return buf.path:match("%_test") or buf.path:match("%_spec")
+						return buf.path:match("%.test") or buf.path:match("%_test") or buf.path:match("%_spec")
 					end,
 				},
 				{
 					name = "Docs",
 					-- icon = "󰈙 ",
-					highlight = { undercurl = false, sp = "green" },
+					priority = 3,
+					-- highlight = { undercurl = false, sp = "grey" },
+					highlight = { undercurl = false },
 					auto_close = false,
 					matcher = function(buf)
 						return buf.path:match("%.md") or buf.path:match("%.txt")
@@ -76,8 +78,10 @@ local config = {
 				},
 				{
 					name = "Shells",
-					highlight = { undercurl = false, sp = "grey" },
+					-- icon = " ",
+					highlight = { undercurl = false },
 					auto_close = false,
+					priority = 4,
 					matcher = function(buf)
 						return buf.path:match("zsh")
 					end,
@@ -86,9 +90,10 @@ local config = {
 					},
 				},
 				{
-					name = "Docker",
-					highlight = { undercurl = false, sp = "blue" },
+					name = "Container",
+					highlight = { undercurl = false },
 					auto_close = false,
+					-- icon = " ",
 					matcher = function(buf)
 						return buf.path:match("dockerfile")
 							or buf.path:match("DOCKERFILE")

lua/plugins/preview.lua

@@ -1,12 +1,12 @@
 return {
-	{
-		"toppair/peek.nvim",
-		event = { "VeryLazy" },
-		build = "deno task --quiet build:fast",
-		config = function()
-			require("peek").setup()
-			vim.api.nvim_create_user_command("PeekOpen", require("peek").open, {})
-			vim.api.nvim_create_user_command("PeekClose", require("peek").close, {})
-		end,
-	},
+	-- {
+	-- 	"toppair/peek.nvim",
+	-- 	event = { "VeryLazy" },
+	-- 	build = "deno task --quiet build:fast",
+	-- 	config = function()
+	-- 		require("peek").setup()
+	-- 		vim.api.nvim_create_user_command("PeekOpen", require("peek").open, {})
+	-- 		vim.api.nvim_create_user_command("PeekClose", require("peek").close, {})
+	-- 	end,
+	-- },
 }

lua/plugins/qol.lua

@@ -17,6 +17,10 @@ local config = {
 			statuscolumn = { enabled = true },
 			words = { enabled = true },
 		},
+	},
+	{
+		'stevearc/overseer.nvim',
+		opts = {},
 	}
 }
 

lua/plugins/search.lua

@@ -29,8 +29,5 @@ return {
 			end
 		end,
 	},
-	-- Multi buffer search
-	{
-		"nvim-pack/nvim-spectre",
-	},
+	{ 'mbbill/undotree' }
 }

lua/plugins/style.lua

@@ -3,14 +3,44 @@
 -- ╰─────────╯
 return {
 	{
-		-- dir = "~/Documents/Code/plain-colors.nvim",
-		"rose-pine/neovim",
+		dir = "~/Documents/Code/plain-colors.nvim",
+		-- "rose-pine/neovim",
 		name = "rose-pine",
 		opts = {
-			variant = "dawn", -- dark, light, darker | dawn
+			variant = "darker", -- dark, light, darker | dawn
 		},
 	},
 
+	-- {
+	-- 	"ellisonleao/gruvbox.nvim",
+	-- 	priority = 1000,
+	-- 	config = true,
+	-- 	opts = {
+	--
+	-- 		terminal_colors = true, -- add neovim terminal colors
+	-- 		undercurl = true,
+	-- 		underline = true,
+	-- 		bold = true,
+	-- 		italic = {
+	-- 			strings = true,
+	-- 			emphasis = true,
+	-- 			comments = true,
+	-- 			operators = false,
+	-- 			folds = true,
+	-- 		},
+	-- 		strikethrough = true,
+	-- 		invert_selection = false,
+	-- 		invert_signs = false,
+	-- 		invert_tabline = false,
+	-- 		inverse = true, -- invert background for search, diffs, statuslines and errors
+	-- 		contrast = "", -- can be "hard", "soft" or empty string
+	-- 		palette_overrides = {},
+	-- 		overrides = {},
+	-- 		dim_inactive = false,
+	-- 		transparent_mode = false,
+	-- 	}
+	-- },
+
 	{ "echasnovski/mini.icons" },
 
 	{
@@ -38,7 +68,7 @@ return {
 		opts = {
 			smear_between_buffers = false,
 			smear_between_neighbor_lines = true,
-			scroll_buffer_space = true,
+			scroll_buffer_space = false,
 			-- Set to `true` if your font supports legacy computing symbols (block unicode symbols).
 			legacy_computing_symbols_support = false,
 			smear_insert_mode = true,