diff --git a/modules/fish/default.nix b/modules/fish/default.nix index 6e28fbb..944a2c0 100644 --- a/modules/fish/default.nix +++ b/modules/fish/default.nix @@ -222,8 +222,8 @@ ''; shellAbbrs = { - lg = "nvim +Neogit"; - gg = "nvim +Neogit"; + lg = "lazygit"; + gg = "lazygit"; g = "git"; frc = "source ~/.config/fish/**/*.fish"; }; diff --git a/modules/nvim/config/lua/plugins/neogit.lua b/modules/nvim/config/lua/plugins/neogit.lua deleted file mode 100644 index 8955ec7..0000000 --- a/modules/nvim/config/lua/plugins/neogit.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", - "sindrets/diffview.nvim", - "folke/snacks.nvim", - }, - lazy = false, - opts = {}, - keys = { - { "gg", "Neogit", desc = "Open neogit", mode = "n" }, - { "gc", "Neogit commit", desc = "Open neogit commit UI", mode = "n" }, - { "gp", "Neogit push", desc = "Open neogit push UI", mode = "n" }, - { "gf", "Neogit pull", desc = "Open neogit pull UI", mode = "n" }, - { "gm", "Neogit merge", desc = "Open neogit merge UI", mode = "n" }, - { "ghb", "DiffviewFileHistory", desc = "Show history for current branch", mode = "n" }, - { "ghf", "DiffviewFileHistory %", desc = "Show file history", mode = "n" }, - }, -} diff --git a/modules/nvim/config/lua/plugins/snacks.lua b/modules/nvim/config/lua/plugins/snacks.lua index 64906f7..aa356f8 100644 --- a/modules/nvim/config/lua/plugins/snacks.lua +++ b/modules/nvim/config/lua/plugins/snacks.lua @@ -39,7 +39,7 @@ return { keys = { -- Git { - "g_", + "gg", function() Snacks.lazygit() end,