a few tweaks to some plugins
This commit is contained in:
parent
2faba1bcba
commit
46d6d74b17
3
init.lua
3
init.lua
|
@ -3,6 +3,8 @@
|
||||||
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
vim.g.maplocalleader = ' '
|
vim.g.maplocalleader = ' '
|
||||||
|
vim.g.loaded_netrw = 1
|
||||||
|
vim.g.loaded_netrwPlugin = 1
|
||||||
|
|
||||||
-- Install package manager
|
-- Install package manager
|
||||||
-- https://github.com/folke/lazy.nvim
|
-- https://github.com/folke/lazy.nvim
|
||||||
|
@ -165,6 +167,7 @@ require('lazy').setup({
|
||||||
require 'lornest.plugins.fugitive',
|
require 'lornest.plugins.fugitive',
|
||||||
require 'lornest.plugins.harpoon',
|
require 'lornest.plugins.harpoon',
|
||||||
require 'lornest.plugins.copilot',
|
require 'lornest.plugins.copilot',
|
||||||
|
require 'lornest.plugins.nvim-tree',
|
||||||
-- require 'kickstart.plugins.autoformat',
|
-- require 'kickstart.plugins.autoformat',
|
||||||
-- require 'kickstart.plugins.debug',
|
-- require 'kickstart.plugins.debug',
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
return {
|
return {
|
||||||
'tpope/vim-fugitive',
|
'tpope/vim-fugitive',
|
||||||
config = function()
|
config = function()
|
||||||
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
|
vim.keymap.set("n", "<leader>gs", vim.cmd.Git, {desc = "[g]it [s]tatus"})
|
||||||
|
|
||||||
local Lornest_Fugitive = vim.api.nvim_create_augroup("Lornest_Fugitive", {})
|
local Lornest_Fugitive = vim.api.nvim_create_augroup("Lornest_Fugitive", {})
|
||||||
|
|
||||||
|
@ -15,20 +15,14 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
local bufnr = vim.api.nvim_get_current_buf()
|
||||||
local opts = {buffer = bufnr, remap = false}
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>P", function()
|
vim.keymap.set("n", "<leader>P", function()
|
||||||
vim.cmd.Git('push')
|
vim.cmd.Git('push')
|
||||||
end, opts)
|
end, {buffer = bufnr, remap = false, desc = "git [P]ush"})
|
||||||
|
|
||||||
-- rebase always
|
|
||||||
vim.keymap.set("n", "<leader>p", function()
|
vim.keymap.set("n", "<leader>p", function()
|
||||||
vim.cmd.Git('pull')
|
vim.cmd.Git('pull')
|
||||||
end, opts)
|
end, {buffer = bufnr, remap = false, desc = "git [p]ull"})
|
||||||
|
|
||||||
-- 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", "<leader>t", ":Git push -u origin ", opts);
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
|
@ -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", "<C-h>", ":NvimTreeToggle<cr>", {silent = true, noremap = true})
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
}
|
Loading…
Reference in New Issue