diff --git a/lazy-lock.json b/lazy-lock.json index 65cf898..05e1c15 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,7 +3,7 @@ "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "f4b4b980ce88d546aeb69d11463187c8f716a1a1" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -15,9 +15,9 @@ "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "github-nvim-theme": { "branch": "main", "commit": "66dcec1bd3d12f8b0bf3c885069888551a650049" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, - "indent-blankline.nvim": { "branch": "master", "commit": "98f85638a669fd7f42f59a7283676391ab9b9ca3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, - "lsp-progress.nvim": { "branch": "main", "commit": "a744d92ce7b3a15128ef9b08c6fdea0bff6f7d5f" }, + "lsp-progress.nvim": { "branch": "main", "commit": "07ca8eadf7d02ca33ff4d1e9e500910fe17aa14d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, @@ -26,21 +26,20 @@ "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "noice.nvim": { "branch": "main", "commit": "2c49d4a7fdeaca930bb08a8239bdf5bccc26507b" }, "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, - "none-ls.nvim": { "branch": "main", "commit": "10c976d633862b9fe16171f5f5f17732bc54e19f" }, + "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b0b79e42a28f09719a7da9534c3731fa37319d9b" }, - "nvim-cmp": { "branch": "main", "commit": "abacd4cb7ffd640b558845b617cfca1692dcb1a6" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, - "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, @@ -48,9 +47,9 @@ "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope.nvim": { "branch": "master", "commit": "96610122a40f0bb4ce2e452c6d2429bf093d6700" }, + "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" }, "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, - "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }, diff --git a/lua/custom/plugins/bufferline.lua b/lua/custom/plugins/bufferline.lua index 130d45c..63050ed 100644 --- a/lua/custom/plugins/bufferline.lua +++ b/lua/custom/plugins/bufferline.lua @@ -1,5 +1,6 @@ return { "akinsho/bufferline.nvim", + branch = "main", event = { "BufRead", "InsertEnter", "BufNewFile" }, config = function() local status_ok, bufferline = pcall(require, "bufferline") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index f11a9e0..778d059 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -261,6 +261,7 @@ return { { "lukas-reineke/indent-blankline.nvim", -- event = "BufWinEnter", + version = "3.5.4", event = { "BufRead", "InsertEnter", "BufNewFile" }, lazy = true, opts = { @@ -480,12 +481,12 @@ return { -- dependencies = "nvim-treesitter/nvim-treesitter", -- }, -- for git - { - "HiPhish/nvim-ts-rainbow2", - lazy = true, - event = "BufRead", - dependencies = "nvim-treesitter/nvim-treesitter", - }, + -- { + -- "HiPhish/nvim-ts-rainbow2", + -- lazy = true, + -- event = "BufRead", + -- dependencies = "nvim-treesitter/nvim-treesitter", + -- }, { "lewis6991/gitsigns.nvim", lazy = true, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 93a2713..13b9dde 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -52,15 +52,15 @@ return { lazy = true, -- event = "InsertEnter", }, - { - "akinsho/bufferline.nvim", - lazy = true, - -- event = "BufWinEnter", - event = { "BufRead", "InsertEnter", "BufNewFile" }, - config = function() - require("user.bufferline") - end, - }, + -- { + -- "akinsho/bufferline.nvim", + -- lazy = true, + -- -- event = "BufWinEnter", + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- config = function() + -- require("user.bufferline") + -- end, + -- }, -- for delete buffers (close files) without closing your windows or messing up your layout. -- { "moll/vim-bbye", event = "InsertEnter" }, -- for view terminal diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index 1481185..ebd37f4 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -19,11 +19,6 @@ M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities) M.setup = function() local signs = { - - -- { name = "DiagnosticSignError", text = "" }, - -- { name = "DiagnosticSignWarn", text = "" }, - -- { name = "DiagnosticSignHint", text = "" }, - -- { name = "DiagnosticSignInfo", text = "" }, { name = "DiagnosticSignError", text = icons.diagnostics.Error }, { name = "DiagnosticSignWarn", text = icons.diagnostics.Warning }, { name = "DiagnosticSignHint", text = icons.diagnostics.Hint }, @@ -97,12 +92,13 @@ M.on_attach = function(client, bufnr) client.server_capabilities.documentFormattingProvider = false end - if client.name == "sumneko_lua" then + if client.name == "lua_ls" then client.server_capabilities.documentFormattingProvider = false end if client.supports_method("textDocument/inlayHint") then - vim.lsp.inlay_hint.enable(bufnr, true) + -- vim.lsp.inlay_hint.enable(bufnr, true) + vim.lsp.inlay_hint.enable(true) end lsp_keymaps(bufnr) diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua index 2dbd9f5..6503b6f 100644 --- a/lua/user/treesitter.lua +++ b/lua/user/treesitter.lua @@ -28,11 +28,16 @@ configs.setup({ -- json = "", -- }, -- }, + -- rainbow = { + -- enable = true, + -- disable = { "html", "tsx" }, + -- equery = "rainbow-parens", + -- strategy = require("ts-rainbow").strategy.global, + -- }, rainbow = { - enable = true, - disable = { "html", "tsx" }, - equery = "rainbow-parens", - strategy = require("ts-rainbow").strategy.global, + enable = false, + extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean + max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int }, -- autotag = { enable = true, enable_rename = true, enable_close = true, enable_close_on_slash = true }, incremental_selection = { enable = true },