feat(plugins): update plugins list

init.lua

@@ -6,6 +6,8 @@ local vanila_vim_autostart_commands = {
 	"set tabstop=4",
 }
 
+vim.opt.fillchars = { eob = " " }
+
 for _, cmd in pairs(vanila_vim_autostart_commands) do
 	vim.cmd(cmd)
 end
@@ -15,7 +17,6 @@ if vim.lsp.inlay_hint then
 end
 
 require("config.lazy")
-require("config.plugins.nvimufo")
 require("config.plugins.acmp")
 require("config.plugins.autotag")
 require("config.plugins.autocomplete")
@@ -24,11 +25,7 @@ require("config.plugins.colorizer")
 require("config.plugins.comment")
 require("config.plugins.dap")
 require("config.plugins.gitsigns")
-require("ibl").setup({
+require("config.plugins.ibl")
-	exclude = {
-		filetypes = { "dashboard" },
-	}
-})
 require("config.plugins.hover_actions")
 require("config.plugins.lsp_config")
 require("config.plugins.lsp_diagnostic")

lua/config/plugins/bufferline.lua

@@ -1,27 +1,89 @@
 vim.opt.termguicolors = true
 
-require("bufferline").setup({
+local utils = require("config.utils.bufferline")
-  highlights = {
-    background = {
-      italic = false,
-    },
-    buffer_selected = {
-      bold = true,
-    },
-  },
-  options = {
-    mode = "buffers",
-    persist_buffer_sort = true,
-    enforce_regular_tabs = false,
-    always_show_bufferline = false,    
-    offsets = {
-      {
-        filetype = "NeoTree",
-        text = "File Explorer",
-        highlight = "Directory",
-        separator = true,
-      }
-    }
-  }
-})
 
+require("bufferline").setup({
+	highlights = {
+		background = {
+			italic = false,
+		},
+		buffer_selected = {
+			bold = true,
+		},
+	},
+	options = {
+		themable = true,
+		get_element_icon = nil,
+		show_duplicate_prefix = true,
+		duplicates_across_groups = true,
+		auto_toggle_bufferline = true,
+		move_wraps_at_ends = false,
+		groups = { items = {}, options = { toggle_hidden_on_enter = true } },
+		mode = "buffers",
+		numbers = "none",
+		close_command = function(bufnr)
+			utils.buf_kill("bd", bufnr, false)
+		end,
+		right_mouse_command = "vert sbuffer %d",
+		left_mouse_command = "buffer %d",
+		middle_mouse_command = nil,
+		name_formatter = function(buf)
+			if buf.name:match "%.md" then
+				return vim.fn.fnamemodify(buf.name, ":t:r")
+			end
+		end,
+		max_name_length = 18,
+		max_prefix_length = 15,
+		truncate_names = true,
+		tab_size = 18,
+		diagnostics = "nvim_lsp",
+		diagnostics_update_in_insert = false,
+		custom_filter = utils.custom_filter,
+		offsets = {
+			{
+				filetype = "undotree",
+				text = "Undotree",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "NvimTree",
+				text = "Explorer",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "DiffviewFiles",
+				text = "Diff View",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "flutterToolsOutline",
+				text = "Flutter Outline",
+				highlight = "PanelHeading",
+			},
+			{
+				filetype = "lazy",
+				text = "Lazy",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+		},
+		color_icons = true,
+		show_close_icon = false,
+		show_tab_indicators = true,
+		persist_buffer_sort = true,
+		separator_style = "thin",
+		enforce_regular_tabs = false,
+		always_show_bufferline = false,
+		hover = {
+			enabled = false,
+			delay = 200,
+			reveal = { "close" },
+		},
+		sort_by = "id",
+		debug = { logging = false },
+	},
+
+})

lua/config/plugins/hover_actions.lua

@@ -1,23 +1,15 @@
 require("hover").setup {
-    init = function()
+	init = function()
-	-- Require providers
+		require("hover.providers.lsp")
-	require("hover.providers.lsp")
+		require('hover.providers.diagnostic')
-	-- require('hover.providers.gh')
+	end,
-	-- require('hover.providers.gh_user')
+	preview_opts = {
-	-- require('hover.providers.jira')
+		border = 'single'
-	-- require('hover.providers.dap')
+	},
-	-- require('hover.providers.fold_preview')
+	preview_window = false,
-	require('hover.providers.diagnostic')
+	title = true,
-	-- require('hover.providers.man')
+	mouse_providers = {
-	-- require('hover.providers.dictionary')
+		'LSP'
-    end,
+	},
-    preview_opts = {
+	mouse_delay = 1000
-	border = 'single'
-    },
-    preview_window = false,
-    title = true,
-    mouse_providers = {
-	'LSP'
-    },
-    mouse_delay = 1000
 }

lua/config/plugins/ibl.lua

@@ -0,0 +1,5 @@
+require("ibl").setup({
+	exclude = {
+		filetypes = { "dashboard" },
+	}
+})

lua/config/plugins/rustaceanvim.lua

@@ -1,37 +1,36 @@
 local navic = require("nvim-navic")
 
 vim.g.rustaceanvim = {
-  tools = {
+	tools = {
-    autoSetHints = true,
+		autoSetHints = true,
-    inlay_hints = {
+		inlay_hints = {
-      show_parameter_hints = true,
+			show_parameter_hints = true,
-      parameter_hints_prefix = "in: ",       -- "<- "
+			parameter_hints_prefix = "in: ", -- "<- "
-      other_hints_prefix = "out: "           -- "=> "
+			other_hints_prefix = "out: " -- "=> "
-    }
+		}
-  },
+	},
-  server = {
+	server = {
-    on_attach = function(client, bufnr)
+		on_attach = function(client, bufnr)
-      navic.attach(client, bufnr)      
+			navic.attach(client, bufnr)
-    end,
+		end,
-    settings = {
+		settings = {
-      ['rust-analyzer'] = {
+			['rust-analyzer'] = {
-        assist = {
+				assist = {
-          importEnforceGranularity = true,
+					importEnforceGranularity = true,
-          importPrefix = "create"
+					importPrefix = "create"
-        },
+				},
-        cargo = { allFeatures = true },
+				cargo = { allFeatures = true },
-        checkOnSave = {
+				checkOnSave = {
-          -- default: `cargo check`
+					command = "clippy",
-          command = "clippy",
+					allFeatures = true
-          allFeatures = true
+				},
-        },
+				inlayHints = {
-        inlayHints = {
+					lifetimeElisionHints = {
-          lifetimeElisionHints = {
+						enable = true,
-            enable = true,
+						useParameterNames = true
-            useParameterNames = true
+					}
-          }
+				}
-        }
+			}
-      }
+		}
-    }
+	}
-  }
 }

lua/config/utils/bufferline.lua

@@ -0,0 +1,95 @@
+local Utils = {}
+
+function Utils.is_ft(b, ft)
+	return vim.bo[b].filetype == ft
+end
+
+function Utils.custom_filter(buf, buf_nums)
+	local logs = vim.tbl_filter(function(b)
+		return Utils.is_ft(b, "log")
+	end, buf_nums or {})
+	if vim.tbl_isempty(logs) then
+		return true
+	end
+	local tab_num = vim.fn.tabpagenr()
+	local last_tab = vim.fn.tabpagenr "$"
+	local is_log = Utils.is_ft(buf, "log")
+	if last_tab == 1 then
+		return true
+	end
+	-- only show log buffers in secondary tabs
+	return (tab_num == last_tab and is_log) or (tab_num ~= last_tab and not is_log)
+end
+
+function Utils.buf_kill(kill_command, bufnr, force)
+	local bo = vim.bo
+	local api = vim.api
+	local fmt = string.format
+	local fn = vim.fn
+
+	if bufnr == 0 or bufnr == nil then
+		bufnr = api.nvim_get_current_buf()
+	end
+
+	local bufname = api.nvim_buf_get_name(bufnr)
+
+	if not force then
+		local choice
+		if bo[bufnr].modified then
+			choice = fn.confirm(fmt([[Save changes to "%s"?]], bufname), "&Yes\n&No\n&Cancel")
+			if choice == 1 then
+				vim.api.nvim_buf_call(bufnr, function()
+					vim.cmd("w")
+				end)
+			elseif choice == 2 then
+				force = true
+			else
+				return
+			end
+		elseif api.nvim_get_option_value("buftype", { buf = 0 }) == "terminal" then
+			choice = fn.confirm(fmt([[Close "%s"?]], bufname), "&Yes\n&No\n&Cancel")
+			if choice == 1 then
+				force = true
+			else
+				return
+			end
+		end
+	end
+
+	-- Get list of windows IDs with the buffer to close
+	local windows = vim.tbl_filter(function(win)
+		return api.nvim_win_get_buf(win) == bufnr
+	end, api.nvim_list_wins())
+
+	if force then
+		kill_command = kill_command .. "!"
+	end
+
+	-- Get list of active buffers
+	local buffers = vim.tbl_filter(function(buf)
+		return api.nvim_buf_is_valid(buf) and bo[buf].buflisted
+	end, api.nvim_list_bufs())
+
+	-- If there is only one buffer (which has to be the current one), vim will
+	-- create a new buffer on :bd.
+	-- For more than one buffer, pick the previous buffer (wrapping around if necessary)
+	if #buffers > 1 and #windows > 0 then
+		for i, v in ipairs(buffers) do
+			if v == bufnr then
+				local prev_buf_idx = i == 1 and #buffers or (i - 1)
+				local prev_buffer = buffers[prev_buf_idx]
+				for _, win in ipairs(windows) do
+					api.nvim_win_set_buf(win, prev_buffer)
+				end
+			end
+		end
+	end
+
+	-- Check if buffer still exists, to ensure the target buffer wasn't killed
+	-- due to options like bufhidden=wipe.
+	if api.nvim_buf_is_valid(bufnr) and bo[bufnr].buflisted then
+		vim.cmd(string.format("%s %d", kill_command, bufnr))
+	end
+end
+
+return Utils

lua/mappings.lua

@@ -1,5 +1,8 @@
 local map = vim.keymap.set
 
+local bl_utils = require("config.utils.bufferline")
+local hover = require "hover"
+
 map("n", ";", ":", { desc = "CMD enter command mode" })
 
 map("i", "<C-h>", "<Left>", { desc = "move left" })
@@ -32,26 +35,40 @@ map("i", "<C-s>", "<cmd>w!<cr>")
 map("n", "<", "<cmd><gv<cr>")
 map("n", ">", "<cmd>>gv<cr>")
 
-map("n", "<leader>dr", "<cmd> DapContinue <cr>", { desc = "Continue debug" } )
+map("n", "<leader>c", function(bufnr)
+	bl_utils.buf_kill("bd", bufnr, true)
+end)
+
+map("n", "<leader>dr", "<cmd> DapContinue <cr>", { desc = "Continue debug" })
 
 map("n", "do", function()
-  require("dapui").open()
+	require("dapui").open()
 end, { desc = "Open DAP ui" })
 map("n", "dc", function()
-  require("dapui").close()
+	require("dapui").close()
 end, { desc = "Start or continue debug" })
 map("n", "dt", function()
-  require("dapui").toggle()
+	require("dapui").toggle()
 end, { desc = "Toggle DAP ui" })
 
-map("n", "<leader>rn", "<cmd>set relativenumber<cr>")
+map("n", "<A-j>", "<cmd>m .+1<CR>==")
+map("n", "<A-k>", "<cmd>m .-2<CR>==")
+map("i", "<A-j>", "<Esc><cmd>m .+1<CR>==gi")
+map("i", "<A-k>", "<Esc><cmd>m .-2<CR>==gi")
+
+map("n", "<C-Up>", "<cmd>resize -2<CR>")
+map("n", "<C-Down>", "<cmd>resize +2<CR>")
+map("n", "<C-Right>", "<cmd>vertical resize -2<CR>")
+map("n", "<C-Left>", "<cmd>vertical resize +2<CR>")
+
 map("n", "<leader>an", "<cmd>set norelativenumber<cr>")
+map("n", "<leader>rn", "<cmd>set relativenumber<cr>")
 map("n", "tt", "<cmd>ToggleTerm<cr>")
 map("n", "<C-{>", "<cmd>foldopen<cr>")
 map("n", "<C-}>", "<cmd>foldclose<cr>")
 
-map("n", "hh", require("hover").hover, {desc = "hover.nvim"})
+map("n", "hh", hover.hover)
-map("n", "hs", require("hover").hover_select, {desc = "hover.nvim (select)"})
+map("n", "hs", hover.hover_select)
-map("n", "<C-Tab>", function() require("hover").hover_switch("previous") end, {desc = "hover.nvim (previous source)"})
-map("n", "<C-S-Tab>", function() require("hover").hover_switch("next") end, {desc = "hover.nvim (next source)"})
 
+map("n", "vs", "<cmd> vsplit <cr>")
+map("n", "ss", "<cmd> split <cr>")

lua/plugins/core/init.lua

@@ -1,152 +1,149 @@
 return {
-  {
+	{
-    'simrat39/inlay-hints.nvim',
+		'simrat39/inlay-hints.nvim',
-  },
+	},
-  {
+	{
-    "LunarVim/breadcrumbs.nvim",
+		"LunarVim/breadcrumbs.nvim",
-  },
+	},
-  {
+	{
-    "akinsho/bufferline.nvim",
+		"akinsho/bufferline.nvim",
-  },
+	},
-  {
+	{
-    "lewis6991/gitsigns.nvim"
+		"lewis6991/gitsigns.nvim"
-  },
+	},
-  {
+	{
-    "lewis6991/hover.nvim",
+		"lewis6991/hover.nvim",
-  },
+	},
-  {
+	{
-    "nvim-lualine/lualine.nvim",
+		"nvim-lualine/lualine.nvim",
-  },
+	},
-  {
+	{
-    "akinsho/toggleterm.nvim",
+		"windwp/nvim-autopairs",
-  },
+	},
-  {
+	{
-    "windwp/nvim-autopairs",
+		'kevinhwang91/promise-async',
-  },
+	},
-  {
+	{
-    'kevinhwang91/promise-async',
+		'theHamsta/nvim-dap-virtual-text',
-  },
+	},
-  {
+	{
-    'theHamsta/nvim-dap-virtual-text',
+		"hrsh7th/cmp-nvim-lsp",
-  },
+	},
-  {
+	{
-    "hrsh7th/cmp-nvim-lsp",
+		"SmiteshP/nvim-navic",
-  },
+	},
-  {
+	{
-    "SmiteshP/nvim-navic",
+		"kyazdani42/nvim-web-devicons"
-  },
+	},
-  {
+	{
-    "kyazdani42/nvim-web-devicons"
+		'NvChad/nvim-colorizer.lua',
-  },
+	},
-  {
+	{
-    'NvChad/nvim-colorizer.lua',
+		'numToStr/Comment.nvim'
-  },
+	},
-  {
+	{
-    'numToStr/Comment.nvim'
+		"nvim-treesitter/nvim-treesitter",
-  },
+	},
-  {
+	{
-    "nvim-treesitter/nvim-treesitter",
+		"catppuccin/nvim"
-  },
+	},
-  {
+	{
-    "vague2k/huez.nvim",
+		"vague2k/huez.nvim",
-  },
+	},
-  {
+	{
-    "nvim-telescope/telescope.nvim",
+		"nvim-telescope/telescope.nvim",
-  },
+	},
-  {
+	{
-    "williamboman/mason-lspconfig.nvim",
+		"williamboman/mason-lspconfig.nvim",
-  },
+	},
-  {
+	{
-    "neovim/nvim-lspconfig",
+		"neovim/nvim-lspconfig",
-  },
+	},
-  {
+	{
-    "mfussenegger/nvim-dap",
+		"mfussenegger/nvim-dap",
-    event = "VeryLazy",
+		event = "VeryLazy",
-  },
+	},
-  {
+	{
-    "L3MON4D3/LuaSnip",
+		"L3MON4D3/LuaSnip",
-    lazy = true,
+		lazy = true,
-  },
+	},
-  {
+	{
-    'folke/lazydev.nvim',
+		'folke/lazydev.nvim',
-    ft = "lua",
+		ft = "lua",
-  },
+	},
-  {
+	{
-    'Bekaboo/dropbar.nvim',
+		'Bekaboo/dropbar.nvim',
-    dependencies = {
+		dependencies = {
-      'nvim-telescope/telescope-fzf-native.nvim',
+			'nvim-telescope/telescope-fzf-native.nvim',
-      build = 'make'
+			build = 'make'
-    },
+		},
-    config = function()
+		config = function()
-      local dropbar_api = require('dropbar.api')
+			local dropbar_api = require('dropbar.api')
-      vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
+			vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
-      vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
+			vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
-      vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
+			vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
-    end
+		end
-  },
+	},
-  {
+	{
-    "folke/noice.nvim",
+		"folke/noice.nvim",
-    event = "VeryLazy",
+		event = "VeryLazy",
-    dependencies = {
+		dependencies = {
-      "MunifTanjim/nui.nvim",
+			"MunifTanjim/nui.nvim",
-      "rcarriga/nvim-notify",
+			"rcarriga/nvim-notify",
-    },
+		},
-  },
+	},
-  {
+	{
-    "nvim-neo-tree/neo-tree.nvim",
+		"nvim-neo-tree/neo-tree.nvim",
-    branch = "v2.x",
+		branch = "v2.x",
-    dependencies = {
+		dependencies = {
-      "nvim-lua/plenary.nvim",
+			"nvim-lua/plenary.nvim",
-      "nvim-tree/nvim-web-devicons",
+			"nvim-tree/nvim-web-devicons",
-      "MunifTanjim/nui.nvim",
+			"MunifTanjim/nui.nvim",
-    },
+		},
-  },
+	},
-  {
+	{
-    "williamboman/mason.nvim",
+		"williamboman/mason.nvim",
-    opts = {
+		opts = {
-      ensure_installed = {
+			ensure_installed = {
-        "eslint-lsp",
+				"eslint-lsp",
-        "js-debug-adapter",
+				"js-debug-adapter",
-        "prettier",
+				"prettier",
-        "tinymist",
+				"tinymist",
-        "typescript-language-server",
+				"typescript-language-server",
-      }
+			}
-    }
+		}
-  },
+	},
-  {
+	{
-    "rcarriga/nvim-dap-ui",
+		"rcarriga/nvim-dap-ui",
-    dependencies = {
+		dependencies = {
-      "nvim-neotest/nvim-nio",
+			"nvim-neotest/nvim-nio",
-      "mfussenegger/nvim-dap",
+			"mfussenegger/nvim-dap",
-    },
+		},
-    event = "VeryLazy",
+		event = "VeryLazy",
-    config = function()
+		config = function()
-      require("dapui").setup()
+			require("dapui").setup()
-    end
+		end
-  },
+	},
-  {
+	{
-    "hrsh7th/nvim-cmp",
+		"hrsh7th/nvim-cmp",
-    event = "InsertEnter",
+		event = "InsertEnter",
-    dependencies = {
+		dependencies = {
-      {
+			{
-        "L3MON4D3/LuaSnip",
+				"L3MON4D3/LuaSnip",
-        dependencies = "rafamadriz/friendly-snippets",
+				dependencies = "rafamadriz/friendly-snippets",
-        opts = { history = true, updateevents = "TextChanged,TextChangedI" },
+				opts = { history = true, updateevents = "TextChanged,TextChangedI" },
-        config = function(_, opts)
+				config = function(_, opts)
-          require("luasnip").config.set_config(opts)
+					require("luasnip").config.set_config(opts)
-          require "config.plugins.luasnip"
+					require "config.plugins.luasnip"
-        end,
+				end,
-      },
+			},
-      {
+			{
-        "saadparwaiz1/cmp_luasnip",
+				"saadparwaiz1/cmp_luasnip",
-        "hrsh7th/cmp-nvim-lua",
+				"hrsh7th/cmp-nvim-lua",
-        "hrsh7th/cmp-nvim-lsp",
+				"hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
+				"hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
+				"hrsh7th/cmp-path",
-      },
+			},
-    },
+		},
-  },
+	},
-  {
-    'kevinhwang91/nvim-ufo',
-  },
 }

lua/plugins/secondary/init.lua

@@ -1,50 +1,54 @@
 return {
-  {
+	{
-    'nvimdev/dashboard-nvim',
+		'nvimdev/dashboard-nvim',
-    event = 'VimEnter',
+		event = 'VimEnter',
-    dependencies = { { 'nvim-tree/nvim-web-devicons' } }
+		dependencies = { { 'nvim-tree/nvim-web-devicons' } }
-  },
+	},
-  {
+	{
-    "kaarmu/typst.vim",
+		"kaarmu/typst.vim",
-    lazy = true,
+		lazy = true,
-  },
+	},
-  {
+	{
-    'MunifTanjim/prettier.nvim',
+		'MunifTanjim/prettier.nvim',
-    lazy = true,
+		lazy = true,
-  },
+	},
-  {
+	{
-    "savq/melange-nvim"
+		"savq/melange-nvim"
-  },
+	},
-  {
+	{
-    "mlaursen/vim-react-snippets",
+		'akinsho/toggleterm.nvim', version = "*", config = true
-    lazy = true,
+	},
-  },
+	{
-  {
+		"mlaursen/vim-react-snippets",
-    "windwp/nvim-ts-autotag",
+		lazy = true,
-    lazy = true,
+	},
-  },
+	{
-  {
+		"windwp/nvim-ts-autotag",
-    "lukas-reineke/indent-blankline.nvim"
+		lazy = true,
-  },
+	},
-  {
+	{
-    "mxsdev/nvim-dap-vscode-js",
+		"lukas-reineke/indent-blankline.nvim"
-    lazy = true,
+	},
-  },
+	{
-  {
+		"mxsdev/nvim-dap-vscode-js",
-    "windwp/nvim-autopairs",
+		lazy = true,
-    lazy = true,
+	},
-    event = "InsertEnter",
+	{
-    config = true
+		"windwp/nvim-autopairs",
-  },
+		lazy = true,
-  {
+		event = "InsertEnter",
-    "microsoft/vscode-js-debug",
+		config = true
-    lazy = true,
+	},
-    build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
+	{
-  },
+		"microsoft/vscode-js-debug",
-  {
+		lazy = true,
-    "mrcjkb/rustaceanvim",
+		build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
-    version = '^4', -- Recommended
+	},
-    lazy = false,   -- This plugin is already lazy
+	{
-    ft = { "rust" },
+		"mrcjkb/rustaceanvim",
-  },
+		version = '^4', -- Recommended
+		lazy = false, -- This plugin is already lazy
+		ft = { "rust" },
+	},
+
 }