fix: tabs + cmp fixed
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
"conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
@@ -19,6 +20,7 @@
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
@@ -28,6 +30,6 @@
|
||||
"telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
"vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }
|
||||
}
|
||||
|
||||
@@ -15,17 +15,8 @@ map("n", "<S-h>", "<cmd>BufferLineMovePrev<cr>", { desc = "Move buffer to left"
|
||||
map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right" })
|
||||
map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
|
||||
map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
|
||||
map("n", "<leader>bd", function()
|
||||
-- Snacks.bufdelete()
|
||||
end, { desc = "Delete Buffer" })
|
||||
-- cant have C-w to delete buffer since in being used to navigate windows
|
||||
-- map("n", "<C-w>", function()
|
||||
-- Snacks.bufdelete()
|
||||
-- end, { desc = "Go to Left Window", remap = true })
|
||||
map("n", "<C-x>", function()
|
||||
-- Snacks.bufdelete()
|
||||
end, { desc = "Delete Buffer" })
|
||||
map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
|
||||
map("n", "<leader>bd", "<cmd>bdelete<cr>", { desc = "Delete Buffer" })
|
||||
map("n", "<leader>x", "<cmd>bdelete<cr>", { desc = "Delete Buffer" })
|
||||
-- tabpages
|
||||
map("n", "]<Tab>", "<cmd>:+tabnext<cr>", { desc = "Goes to the next tabpage" })
|
||||
map("n", "[<Tab>", "<cmd>:-tabnext<cr>", { desc = "Goes to the previous tabpage" })
|
||||
|
||||
@@ -24,58 +24,43 @@ return {
|
||||
-- │ Completion │
|
||||
{
|
||||
'saghen/blink.cmp',
|
||||
-- dependencies = { 'rafamadriz/friendly-snippets' },
|
||||
dependencies = { 'rafamadriz/friendly-snippets' },
|
||||
version = '1.*',
|
||||
opts = {
|
||||
-- All presets have the following mappings:
|
||||
-- C-space: Open menu or open docs if already open
|
||||
-- C-n/C-p or Up/Down: Select next/previous item
|
||||
-- C-e: Hide menu
|
||||
-- C-k: Toggle signature help (if signature.enabled = true)
|
||||
keymap = { preset = 'default' },
|
||||
keymap = {
|
||||
preset = 'default',
|
||||
['<Enter>'] = { 'accept', 'fallback' },
|
||||
['<Tab>'] = { 'select_next', 'fallback' },
|
||||
['<S-Tab>'] = { 'select_prev', 'fallback' },
|
||||
},
|
||||
appearance = {
|
||||
nerd_font_variant = 'mono'
|
||||
},
|
||||
-- (Default) Only show the documentation popup when manually triggered
|
||||
completion = { documentation = { auto_show = false } },
|
||||
-- Default list of enabled providers defined so that you can extend it
|
||||
-- elsewhere in your config, without redefining it, due to `opts_extend`
|
||||
sources = {
|
||||
default = { 'lsp', 'path', 'snippets', 'buffer' },
|
||||
},
|
||||
default = { 'lsp', 'path', 'snippets', 'buffer' },
|
||||
fuzzy = { implementation = "prefer_rust_with_warning" }
|
||||
},
|
||||
opts_extend = { "sources.default" }
|
||||
},
|
||||
-- {
|
||||
-- "L3MON4D3/LuaSnip",
|
||||
-- build = "make install_jsregexp",
|
||||
-- dependencies = { "rafamadriz/friendly-snippets" },
|
||||
-- },
|
||||
--
|
||||
|
||||
-- -- │ Auto close │
|
||||
-- {
|
||||
-- "m4xshen/autoclose.nvim",
|
||||
-- },
|
||||
--
|
||||
-- {
|
||||
-- "windwp/nvim-ts-autotag",
|
||||
-- config = function(_, opts)
|
||||
-- require('nvim-ts-autotag').setup({
|
||||
-- opts = {
|
||||
-- enable_close = true, -- Auto close tags
|
||||
-- enable_rename = true, -- Auto rename pairs of tags
|
||||
-- enable_close_on_slash = false -- Auto close on trailing </
|
||||
-- },
|
||||
-- per_filetype = {
|
||||
-- ["html"] = {
|
||||
-- enable_close = true
|
||||
-- }
|
||||
-- }
|
||||
-- })
|
||||
-- end,
|
||||
-- },
|
||||
--
|
||||
{
|
||||
"windwp/nvim-ts-autotag",
|
||||
config = function(_, opts)
|
||||
require('nvim-ts-autotag').setup({
|
||||
opts = {
|
||||
enable_close = true,
|
||||
enable_rename = true,
|
||||
enable_close_on_slash = false
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- │ Diagnostics │
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
return {
|
||||
-- {
|
||||
-- "folke/snacks.nvim",
|
||||
-- priority = 1000,
|
||||
-- lazy = false,
|
||||
-- ---@type snacks.Config
|
||||
-- opts = {
|
||||
-- animate = { enabled = false },
|
||||
-- bigfile = { enabled = true },
|
||||
-- bufdelete = { enabled = true },
|
||||
-- dashboard = { enabled = false },
|
||||
-- debug = { enabled = false },
|
||||
-- dim = { enabled = false },
|
||||
-- explorer = { enabled = false },
|
||||
-- git = { enabled = false },
|
||||
-- gitbrowse = { enabled = false },
|
||||
-- image = { enabled = false },
|
||||
-- indent = { enabled = false },
|
||||
-- input = { enabled = false },
|
||||
-- layout = { enabled = false },
|
||||
-- lazygit = { enabled = true },
|
||||
-- picker = { enabled = false },
|
||||
-- notifier = { enabled = false },
|
||||
-- profiler = { enabled = false },
|
||||
-- quickfile = { enabled = true },
|
||||
-- rename = { enabled = false },
|
||||
-- scope = { enabled = false },
|
||||
-- scroll = { enabled = true },
|
||||
-- scratch = { enabled = false },
|
||||
-- statuscolumn = { enabled = false },
|
||||
-- terminal = { enabled = false },
|
||||
-- toggle = { enabled = false },
|
||||
-- util = { enabled = false },
|
||||
-- win = { enabled = false },
|
||||
-- words = { enabled = true },
|
||||
-- zen = { enabled = true },
|
||||
-- }
|
||||
-- },
|
||||
}
|
||||
@@ -2,20 +2,22 @@
|
||||
-- │ Usage help │
|
||||
-- ╰────────────╯
|
||||
return {
|
||||
-- {
|
||||
-- "folke/which-key.nvim",
|
||||
-- event = "VeryLazy",
|
||||
-- opts = function()
|
||||
-- return require("plugins.opts.whichKey")
|
||||
-- end,
|
||||
-- keys = {
|
||||
-- {
|
||||
-- "<leader>?",
|
||||
-- function()
|
||||
-- require("which-key").show({ global = false })
|
||||
-- end,
|
||||
-- desc = "Buffer Local Keymaps (which-key)",
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
-- Breaks LSP attach
|
||||
-- {
|
||||
-- "folke/which-key.nvim",
|
||||
-- event = "VeryLazy",
|
||||
-- opts = function()
|
||||
-- return require("plugins.opts.whichKey")
|
||||
-- end,
|
||||
-- keys = {
|
||||
-- {
|
||||
-- "<leader>?",
|
||||
-- function()
|
||||
-- require("which-key").show({ global = false })
|
||||
-- end,
|
||||
-- desc = "Buffer Local Keymaps (which-key)",
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
{ 'ThePrimeagen/vim-be-good' }
|
||||
}
|
||||
|
||||
@@ -20,11 +20,10 @@ local config = {
|
||||
["_"] = { "trim_whitespace" }, -- run only on filetypes without formater
|
||||
-- ["*"] = { "trim_whitespace" }, -- run in all filetypes
|
||||
},
|
||||
-- Managed by lazyvim
|
||||
-- format_on_save = {
|
||||
-- timeout_ms = 500,
|
||||
-- lsp_format = "fallback",
|
||||
-- },
|
||||
format_on_save = {
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
-- Customize formatters
|
||||
formatters = {
|
||||
shfmt = {
|
||||
|
||||
Reference in New Issue
Block a user