diff --git a/modules/base/neovim.nix b/modules/base/neovim.nix index c753dfa..b5d6d1b 100644 --- a/modules/base/neovim.nix +++ b/modules/base/neovim.nix @@ -23,7 +23,6 @@ nixd alejandra statix - libgit2.lib zls vimPlugins.nvim-treesitter.withAllGrammars @@ -32,25 +31,21 @@ plugins.catppuccin = '' return { "LazyVim/LazyVim", opts = { colorscheme = "catppuccin" } } ''; - plugins.fugit = '' + plugins.neogit = '' return { - 'SuperBo/fugit2.nvim', - build = true, - opts = { - libgit2_path = "${pkgs.libgit2.lib}/lib/libgit2.so" - }, + "NeogitOrg/neogit", + lazy = true, dependencies = { - 'MunifTanjim/nui.nvim', - 'nvim-tree/nvim-web-devicons', - 'nvim-lua/plenary.nvim', - { - 'chrisgrieser/nvim-tinygit', - dependencies = { 'stevearc/dressing.nvim' } - }, + "nvim-lua/plenary.nvim", -- required + + "sindrets/diffview.nvim", -- optional + "esmuellert/codediff.nvim", -- optional + + "folke/snacks.nvim", -- optional }, - cmd = { 'Fugit2', 'Fugit2Diff', 'Fugit2Graph' }, + cmd = "Neogit", keys = { - { 'gg', mode = 'n', 'Fugit2' } + { "gg", "Neogit", desc = "Show Neogit UI" } } } '';