From 46d6d74b1719435ebed663d7691299b637e6ddd8 Mon Sep 17 00:00:00 2001 From: Lorne Stalker Date: Tue, 15 Aug 2023 08:30:35 +0100 Subject: [PATCH] a few tweaks to some plugins --- init.lua | 3 +++ lua/lornest/plugins/fugitive.lua | 12 +++--------- lua/lornest/plugins/nvim-tree.lua | 13 +++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 lua/lornest/plugins/nvim-tree.lua diff --git a/init.lua b/init.lua index ddde6f6b..14722ac7 100644 --- a/init.lua +++ b/init.lua @@ -3,6 +3,8 @@ -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 -- Install package manager -- https://github.com/folke/lazy.nvim @@ -165,6 +167,7 @@ require('lazy').setup({ require 'lornest.plugins.fugitive', require 'lornest.plugins.harpoon', require 'lornest.plugins.copilot', + require 'lornest.plugins.nvim-tree', -- require 'kickstart.plugins.autoformat', -- require 'kickstart.plugins.debug', diff --git a/lua/lornest/plugins/fugitive.lua b/lua/lornest/plugins/fugitive.lua index ee98fc3f..3d10264b 100644 --- a/lua/lornest/plugins/fugitive.lua +++ b/lua/lornest/plugins/fugitive.lua @@ -1,7 +1,7 @@ return { 'tpope/vim-fugitive', config = function() - vim.keymap.set("n", "gs", vim.cmd.Git) + vim.keymap.set("n", "gs", vim.cmd.Git, {desc = "[g]it [s]tatus"}) local Lornest_Fugitive = vim.api.nvim_create_augroup("Lornest_Fugitive", {}) @@ -15,20 +15,14 @@ return { end local bufnr = vim.api.nvim_get_current_buf() - local opts = {buffer = bufnr, remap = false} vim.keymap.set("n", "P", function() vim.cmd.Git('push') - end, opts) + end, {buffer = bufnr, remap = false, desc = "git [P]ush"}) - -- rebase always vim.keymap.set("n", "p", function() vim.cmd.Git('pull') - end, opts) - - -- NOTE: It allows me to easily set the branch i am pushing and any tracking - -- needed if i did not set the branch up correctly - vim.keymap.set("n", "t", ":Git push -u origin ", opts); + end, {buffer = bufnr, remap = false, desc = "git [p]ull"}) end, }) end diff --git a/lua/lornest/plugins/nvim-tree.lua b/lua/lornest/plugins/nvim-tree.lua new file mode 100644 index 00000000..968462f5 --- /dev/null +++ b/lua/lornest/plugins/nvim-tree.lua @@ -0,0 +1,13 @@ +return { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup { + vim.api.nvim_set_keymap("n", "", ":NvimTreeToggle", {silent = true, noremap = true}) + } + end, +}