From c447ef82823ded77dc8dc370520133cc4c8329e9 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Tue, 6 Jul 2021 14:26:25 +0300 Subject: [PATCH] neovim: add bufferline and nvim-tree plugins --- home/.config/nvim/lua/colors/nord.lua | 2 +- home/.config/nvim/lua/colors/onedark.lua | 2 +- home/.config/nvim/lua/modules/bufferline.lua | 14 ++++++++++++++ home/.config/nvim/lua/modules/tree.lua | 15 +++++++++++++++ home/.config/nvim/lua/options.lua | 4 ++-- home/.config/nvim/lua/plugins.lua | 19 ++++++++++++++++++- 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 home/.config/nvim/lua/modules/bufferline.lua create mode 100644 home/.config/nvim/lua/modules/tree.lua diff --git a/home/.config/nvim/lua/colors/nord.lua b/home/.config/nvim/lua/colors/nord.lua index b49fc83..480aa10 100644 --- a/home/.config/nvim/lua/colors/nord.lua +++ b/home/.config/nvim/lua/colors/nord.lua @@ -39,7 +39,7 @@ M.colors = { } function M.highlight() - hi('ModeMsg', M.colors.blue, '', '', '') + hi('ModeMsg', M.colors.green, '', '', '') end return M diff --git a/home/.config/nvim/lua/colors/onedark.lua b/home/.config/nvim/lua/colors/onedark.lua index f47ca6b..2196a9d 100644 --- a/home/.config/nvim/lua/colors/onedark.lua +++ b/home/.config/nvim/lua/colors/onedark.lua @@ -40,7 +40,7 @@ M.colors = { } function M.highlight() - hi('ModeMsg', M.colors.blue, '', '', '') + hi('ModeMsg', M.colors.green, '', '', '') end return M diff --git a/home/.config/nvim/lua/modules/bufferline.lua b/home/.config/nvim/lua/modules/bufferline.lua new file mode 100644 index 0000000..746a048 --- /dev/null +++ b/home/.config/nvim/lua/modules/bufferline.lua @@ -0,0 +1,14 @@ +return require('bufferline').setup { + options = { + mappings = true, + max_name_length = 18, + max_prefix_length = 16, + tab_size = 18, + diagnostics = 'nvim_lsp', + show_tab_indicators = true, + enforce_regular_tabs = false, + show_buffer_close_icons = true, + always_show_bufferline = true, + separator_style = 'thin' + } +} diff --git a/home/.config/nvim/lua/modules/tree.lua b/home/.config/nvim/lua/modules/tree.lua new file mode 100644 index 0000000..7e55d91 --- /dev/null +++ b/home/.config/nvim/lua/modules/tree.lua @@ -0,0 +1,15 @@ +local function tree_options() + vim.g.nvim_tree_width = 35 + vim.g.nvim_tree_ignore = { '.git', '.hg', '.svn', 'node_modules' } + vim.g.nvim_tree_auto_open = 1 + vim.g.nvim_tree_auto_close = 1 + vim.g.nvim_tree_auto_ignore_ft = { 'dashboard' } + vim.g.nvim_tree_follow = 1 + vim.g.nvim_tree_indent_markers = 1 + vim.g.nvim_tree_git_hl = 1 + vim.g.nvim_tree_auto_resize = 0 + -- vim.g.nvim_tree_add_trailing = 1 + vim.g.nvim_tree_lsp_diagnostics = 1 +end + +tree_options() diff --git a/home/.config/nvim/lua/options.lua b/home/.config/nvim/lua/options.lua index 9a329b3..2fcbc81 100644 --- a/home/.config/nvim/lua/options.lua +++ b/home/.config/nvim/lua/options.lua @@ -8,7 +8,7 @@ local function load_options() -- General settings opt.termguicolors = true -- opt.background = 'dark' - opt.mouse = 'nv' + opt.mouse = 'a' opt.errorbells = false opt.visualbell = false opt.hidden = true @@ -36,6 +36,7 @@ local function load_options() -- opt.cursorline = true -- opt.backspace = 'indent,eol,start' opt.showcmd = false + opt.inccommand = 'nosplit' -- opt.cmdheight = 2 -- opt.cmdwinheight = 6 opt.showtabline = 2 @@ -92,7 +93,6 @@ local function load_options() -- Window rules opt.splitbelow = true opt.splitright = true - opt.inccommand = 'nosplit' opt.switchbuf = 'useopen' opt.winwidth = 30 opt.winminwidth = 10 diff --git a/home/.config/nvim/lua/plugins.lua b/home/.config/nvim/lua/plugins.lua index cf0fb48..71b6859 100644 --- a/home/.config/nvim/lua/plugins.lua +++ b/home/.config/nvim/lua/plugins.lua @@ -13,7 +13,7 @@ return packer.startup( function(use) use 'wbthomason/packer.nvim' - -- Appearance/UI + -- UI elements use { 'glepnir/dashboard-nvim', setup = function() @@ -28,6 +28,21 @@ return packer.startup( require('modules.statusline') end } + use { + 'akinsho/nvim-bufferline.lua', + config = function() + require('modules.bufferline') + end + } + use { + 'kyazdani42/nvim-tree.lua', + cmd = 'NvimTreeToggle', + setup = function() + require('modules.tree') + end + } + + -- Editing use { 'norcalli/nvim-colorizer.lua', event = 'BufRead', @@ -36,5 +51,7 @@ return packer.startup( vim.cmd('ColorizerReloadAllBuffers') end } + + -- LSP end )