From 6aee450ef6ee1cf342e30d2184884fe143675f45 Mon Sep 17 00:00:00 2001 From: gameloader Date: Wed, 5 Apr 2023 17:45:09 +0800 Subject: [PATCH] change file browser to neotree --- init.lua | 2 +- lua/keybindings.lua | 4 ++-- lua/lsp/init.lua | 2 +- lua/plugin-config/jaq.lua | 4 ++-- lua/plugins.lua | 14 ++++++++++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 693c29b..74cf420 100644 --- a/init.lua +++ b/init.lua @@ -4,7 +4,7 @@ require("plugins") require("keybindings") -require("plugin-config/nvim-tree") +-- require("plugin-config/nvim-tree") require("plugin-config/buffer_line") require("plugin-config/treesitter") require("plugin-config/telescope") diff --git a/lua/keybindings.lua b/lua/keybindings.lua index 3cb2297..1502eb9 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -93,8 +93,8 @@ wk.register({ map("v", "<", "", ">gv", opt) --- nvimTree -map("n", "T", ":NvimTreeToggle", opt) +-- neoTree +map("n", "T", ":NeoTreeFocusToggle", opt) -- Packer wk.register({ diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 98250ea..65f3d47 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -5,7 +5,7 @@ local lspconfig = require("lspconfig") -- key 必须为下列网址列出的 server name,不可以随便写 -- https://github.com/williamboman/nvim-lsp-installer#available-lsps local servers = { - sumneko_lua = require("lsp.config.lua"), -- lua/lsp/config/lua.lua + lua_ls = require("lsp.config.lua"), -- lua/lsp/config/lua.lua clangd = require("lsp.config.clangd"), gopls = require("lsp.config.gopls"), eslint = require("lsp.config.eslint"), diff --git a/lua/plugin-config/jaq.lua b/lua/plugin-config/jaq.lua index 1da931b..229253a 100644 --- a/lua/plugin-config/jaq.lua +++ b/lua/plugin-config/jaq.lua @@ -12,8 +12,8 @@ require("jaq-nvim").setup({ python = "python3 %", go = "go run %", sh = "sh %", - c = "cd $dir && gcc $file -o $fileBase -g && $fileBase", - cpp = "cd $dir && g++ $file -o $fileBase -g -w -std=c++11 && $fileBase", + c = "cd $dir && gcc $file -o $fileBase -g && cd $dir && $fileBase", + cpp = "cd $dir && g++ $file -o $fileBase -g -w -std=c++11 && cd $dir && $fileBase", }, }, diff --git a/lua/plugins.lua b/lua/plugins.lua index f16ab3e..f5adc80 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -62,9 +62,19 @@ return require("packer").startup(function() use({ "nvim-orgmode/orgmode" }) -- nvim-tree for file manage + -- use({ + -- "kyazdani42/nvim-tree.lua", + -- requires = "kyazdani42/nvim-web-devicons", + -- }) + use({ - "kyazdani42/nvim-tree.lua", - requires = "kyazdani42/nvim-web-devicons", + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + requires = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + }, }) -- vim dashboard