From 65758519cb5cbbeed8b4de134f98cf2eba864f8f Mon Sep 17 00:00:00 2001 From: Ian Date: Tue, 30 Jun 2026 00:04:03 +0200 Subject: [PATCH] feat: add neogit and refactor lua config loading --- init.vim | 5 +---- lua/config/init.lua | 6 ++++++ lua/config/keybinds.lua | 3 +-- lua/config/neogit.lua | 2 ++ lua/config/pack.lua | 1 + nvim-pack-lock.json | 4 ++++ 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 lua/config/init.lua create mode 100644 lua/config/neogit.lua diff --git a/init.vim b/init.vim index 64bfebb..fca8dc4 100644 --- a/init.vim +++ b/init.vim @@ -1,7 +1,4 @@ -lua require('config.settings') -lua require('config.keybinds') -lua require('config.pack') -lua require('config.theme') +lua require('config.init') " vim.fn.stdpath("data") "lua require('plugins') diff --git a/lua/config/init.lua b/lua/config/init.lua new file mode 100644 index 0000000..804a482 --- /dev/null +++ b/lua/config/init.lua @@ -0,0 +1,6 @@ +require('config.settings') +require('config.keybinds') +require('config.pack') + +require('config.theme') +require('config.neogit') diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua index 2c48c31..d7d30cc 100644 --- a/lua/config/keybinds.lua +++ b/lua/config/keybinds.lua @@ -5,7 +5,7 @@ local bind = vim.keymap.set vim.g.mapleader = "," bind('n', 'v', 'vspl', { desc = 'Vertical split' }) ---bind('n', 'e', 'e .set relativenumber', { desc = 'Netrw file manager' }) +bind('n', 'e', 'e .set relativenumber', { desc = 'Netrw file manager' }) -- Buffer navigation bind('n', '', 'bp', { desc = 'Buffer previous' }) @@ -37,7 +37,6 @@ bind('n', 'w', '%s/\\s\\+$/nohlsearch', { desc = 'Dele bind('n', 'cc', 'cclose') bind('n', 'co', 'copen') - -- Telescope -- bind('n', 'ff', 'Telescope find_files') -- bind('n', 'fg', 'Telescope live_grep') diff --git a/lua/config/neogit.lua b/lua/config/neogit.lua new file mode 100644 index 0000000..3d1a38d --- /dev/null +++ b/lua/config/neogit.lua @@ -0,0 +1,2 @@ +local neogit = require('neogit') +vim.keymap.set("n", "gg", "Neogit", { desc = "Open Neogit UI" }) diff --git a/lua/config/pack.lua b/lua/config/pack.lua index 8c1f29d..f00c3b7 100644 --- a/lua/config/pack.lua +++ b/lua/config/pack.lua @@ -1,3 +1,4 @@ vim.pack.add({ { src = "https://github.com/catppuccin/nvim", name = "catppuccin" }, +{ src = "https://github.com/neogitorg/neogit", name = "neogit" }, }) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 636c4a9..bc1f3fc 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -3,6 +3,10 @@ "catppuccin": { "rev": "e068ab5f8261f23f6f71ffd8791ae40315b77b9c", "src": "https://github.com/catppuccin/nvim" + }, + "neogit": { + "rev": "43ea1a0854052e583f647e0b35879f0158a70a78", + "src": "https://github.com/neogitorg/neogit" } } }