using bufferline, barbar had too many conflicts unfortunately

This commit is contained in:
christianchiarulli 2021-07-04 01:31:08 -04:00
parent 632e7bf194
commit c899acb744
4 changed files with 66 additions and 21 deletions

View file

@ -23,7 +23,8 @@ require'lspconfig'.sumneko_lua.setup {
[vim.fn.expand('$VIMRUNTIME/lua')] = true, [vim.fn.expand('$VIMRUNTIME/lua')] = true,
[vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true
}, },
maxPreload = 10000 maxPreload = 100000,
preloadFileSize = 1000
} }
} }
} }

View file

@ -1,3 +0,0 @@
vim.api.nvim_set_keymap('n', '<TAB>', ':BufferNext<CR>', { noremap = true, silent = true })
vim.api.nvim_set_keymap('n', '<S-TAB>', ':BufferPrevious<CR>', { noremap = true, silent = true })
vim.api.nvim_set_keymap('n', '<S-x>', ':BufferClose<CR>', { noremap = true, silent = true })

View file

@ -0,0 +1,52 @@
local M = {}
M.config = function()
require('bufferline').setup {
options = {
-- numbers = "none" | "ordinal" | "buffer_id" | "both",
-- number_style = "superscript" | "" | { "none", "subscript" }, -- buffer_id at index 1, ordinal at index 2
-- mappings = true | false,
-- close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
-- right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
-- left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions"
middle_mouse_command = nil, -- can be a string | function, see "Mouse actions"
indicator_icon = '',
buffer_close_icon = '',
modified_icon = '',
close_icon = '',
left_trunc_marker = '',
right_trunc_marker = '',
--- name_formatter can be used to change the buffer's label in the bufferline.
--- Please note some names can/will break the
--- bufferline so use this at your discretion knowing that it has
--- some limitations that will *NOT* be fixed.
-- name_formatter = function(buf) -- buf contains a "name", "path" and "bufnr"
-- -- remove extension from markdown files for example
-- if buf.name:match('%.md') then
-- return vim.fn.fnamemodify(buf.name, ':t:r')
-- end
-- end,
max_name_length = 18,
max_prefix_length = 15, -- prefix used when a buffer is de-duplicated
tab_size = 18,
-- diagnostics = "nvim_lsp",
offsets = {{filetype = "NvimTree", text = "File Explorer", text_align = "left", padding = 1}},
-- show_buffer_icons = true | false, -- disable filetype icons for buffers
show_buffer_close_icons = true
-- show_close_icon = true | false,
-- show_tab_indicators = true | false,
-- persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
-- can also be a table containing 2 custom separators
-- [focused and unfocused]. eg: { '|', '|' }
-- separator_style = "slant" | "thick" | "thin" | { 'any', 'any' },
-- enforce_regular_tabs = false | true,
-- always_show_bufferline = true | false,
-- sort_by = 'extension' | 'relative_directory' | 'directory' | function(buffer_a, buffer_b)
-- add custom logic
-- return buffer_a.modified > buffer_b.modified
-- end
}
}
end
return M

View file

@ -46,12 +46,12 @@ return require("packer").startup(function(use)
} }
-- Snap TODO disable for now, need to only install fzy when user specifies they want to use snap -- Snap TODO disable for now, need to only install fzy when user specifies they want to use snap
-- use { -- use {
-- "camspiers/snap", -- "camspiers/snap",
-- rocks = "fzy", -- rocks = "fzy",
-- config = function() -- config = function()
-- require("lv-snap").config() -- require("lv-snap").config()
-- end, -- end,
-- disable = not O.plugin.snap.active -- disable = not O.plugin.snap.active
-- } -- }
-- Autocomplete -- Autocomplete
use { use {
@ -114,15 +114,9 @@ return require("packer").startup(function(use)
use {"glepnir/galaxyline.nvim"} use {"glepnir/galaxyline.nvim"}
use { use {
"romgrk/barbar.nvim", "akinsho/nvim-bufferline.lua",
config = function() config = function()
vim.api.nvim_set_keymap('n', '<TAB>', ':BufferNext<CR>', require("lv-bufferline").config()
{noremap = true, silent = true})
vim.api.nvim_set_keymap('n', '<S-TAB>', ':BufferPrevious<CR>',
{noremap = true, silent = true})
vim.api.nvim_set_keymap('n', '<S-x>', ':BufferClose<CR>',
{noremap = true, silent = true})
end, end,
event = "BufRead" event = "BufRead"
@ -228,8 +222,9 @@ return require("packer").startup(function(use)
vim.g.indentLine_enabled = 1 vim.g.indentLine_enabled = 1
vim.g.indent_blankline_char = "" vim.g.indent_blankline_char = ""
vim.g.indent_blankline_filetype_exclude = vim.g.indent_blankline_filetype_exclude = {
{"help", "terminal", "dashboard"} "help", "terminal", "dashboard"
}
vim.g.indent_blankline_buftype_exclude = {"terminal"} vim.g.indent_blankline_buftype_exclude = {"terminal"}
vim.g.indent_blankline_show_trailing_blankline_indent = false vim.g.indent_blankline_show_trailing_blankline_indent = false
@ -401,7 +396,7 @@ return require("packer").startup(function(use)
use { use {
"rktjmp/lush.nvim", "rktjmp/lush.nvim",
-- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"}, -- cmd = {"LushRunQuickstart", "LushRunTutorial", "Lushify"},
disable = not O.plugin.lush.active, disable = not O.plugin.lush.active
} }
-- HTML preview -- HTML preview
use { use {