From 75ddc82de96738287191bba1aa23eb635d004917 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 29 Mar 2022 00:55:16 -0500 Subject: [PATCH] refactor(nvim): Replace nvim-tree with neotree, move lsp to core --- .config/nvim/lua/core/init.lua | 1 + .config/nvim/lua/core/lsp.lua | 15 ++++++++++++ .config/nvim/lua/plugins/configs/neotree.lua | 3 +++ .config/nvim/lua/plugins/configs/nvimtree.lua | 23 ------------------- .config/nvim/lua/plugins/mappings.lua | 2 +- .config/nvim/lua/plugins/plugins.lua | 12 ++++++---- 6 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 .config/nvim/lua/core/lsp.lua create mode 100644 .config/nvim/lua/plugins/configs/neotree.lua delete mode 100755 .config/nvim/lua/plugins/configs/nvimtree.lua diff --git a/.config/nvim/lua/core/init.lua b/.config/nvim/lua/core/init.lua index 78231de2..41127c92 100755 --- a/.config/nvim/lua/core/init.lua +++ b/.config/nvim/lua/core/init.lua @@ -2,3 +2,4 @@ require("core.disabled").setup() require("core.options").setup() require("core.mappings").setup() require("core.globals").setup() +require("core.lsp").setup() diff --git a/.config/nvim/lua/core/lsp.lua b/.config/nvim/lua/core/lsp.lua new file mode 100644 index 00000000..3fc4a474 --- /dev/null +++ b/.config/nvim/lua/core/lsp.lua @@ -0,0 +1,15 @@ +local M = {} + +M.setup = function() + local function lspSymbol(name, icon) + local hl = "DiagnosticSign" .. name + vim.fn.sign_define(hl, { text = icon, numhl = hl, texthl = hl }) + end + + lspSymbol("Error", "") + lspSymbol("Warn", "") + lspSymbol("Info", "") + lspSymbol("Hint", "") +end + +return M diff --git a/.config/nvim/lua/plugins/configs/neotree.lua b/.config/nvim/lua/plugins/configs/neotree.lua new file mode 100644 index 00000000..440dadc0 --- /dev/null +++ b/.config/nvim/lua/plugins/configs/neotree.lua @@ -0,0 +1,3 @@ +local neotree = require("neo-tree") + +neotree.setup({}) diff --git a/.config/nvim/lua/plugins/configs/nvimtree.lua b/.config/nvim/lua/plugins/configs/nvimtree.lua deleted file mode 100755 index 593c8b94..00000000 --- a/.config/nvim/lua/plugins/configs/nvimtree.lua +++ /dev/null @@ -1,23 +0,0 @@ -local nvimtree = require("nvim-tree") -local g = vim.g - -g.nvim_tree_add_trailing = 1 -g.nvim_tree_git_hl = 0 -g.nvim_tree_highlight_opened_files = 0 -g.nvim_tree_indent_markers = 1 -g.nvim_tree_root_folder_modifier = table.concat { ":t:gs?$?/..", string.rep(" ", 1000), "?:gs?^??" } - -g.nvim_tree_show_icons = { - folders = 1, - files = 1, - git = 1, -} - -local settings = { - git = { - enable = false, - ignore = false - } -} - -nvimtree.setup(settings) diff --git a/.config/nvim/lua/plugins/mappings.lua b/.config/nvim/lua/plugins/mappings.lua index 16e8ecee..f0fa19f6 100755 --- a/.config/nvim/lua/plugins/mappings.lua +++ b/.config/nvim/lua/plugins/mappings.lua @@ -81,4 +81,4 @@ map("n", "wc", ":Telescope commands") map("n", "ng", ":Neogen") -- Nvim Tree Mappings -map("n", "nt", ":NvimTreeToggle") +map("n", "nt", ":Neotree show toggle") diff --git a/.config/nvim/lua/plugins/plugins.lua b/.config/nvim/lua/plugins/plugins.lua index 20e25600..8396c5b2 100755 --- a/.config/nvim/lua/plugins/plugins.lua +++ b/.config/nvim/lua/plugins/plugins.lua @@ -141,7 +141,7 @@ return packer.startup({ "artart222/telescope_find_directories", }) - -- Telescope + -- Telescope use({ "nvim-telescope/telescope.nvim", config = function() @@ -151,10 +151,14 @@ return packer.startup({ -- File Tree use({ - "kyazdani42/nvim-tree.lua", - requires = "kyazdani42/nvim-web-devicons", + "nvim-neo-tree/neo-tree.nvim", + requires = { + "kyazdani42/nvim-web-devicons", + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim" + }, config = function() - require("plugins.configs.nvimtree") + require("plugins.configs.neotree") end, }) -- LSP, LSP Installer