diff --git a/plugins/git/fugitive.nix b/plugins/git/fugitive.nix index 957bc5ee..4ea3dce1 100644 --- a/plugins/git/fugitive.nix +++ b/plugins/git/fugitive.nix @@ -6,6 +6,7 @@ mkPlugin attrs { name = "fugitive"; description = "Enable vim-fugitive"; extraPlugins = [ pkgs.vimPlugins.vim-fugitive ]; + extraPackages = [ pkgs.git ]; # In typical tpope fashin, this plugin has no config options options = {}; diff --git a/plugins/git/neogit.nix b/plugins/git/neogit.nix index 08f8923f..6a3dd3ba 100644 --- a/plugins/git/neogit.nix +++ b/plugins/git/neogit.nix @@ -221,6 +221,8 @@ in plenary-nvim ] ++ optional cfg.integrations.diffview diffview-nvim; + extraPackages = [ pkgs.git ]; + extraConfigLua = '' require('neogit').setup(${setupOptions}) ''; diff --git a/plugins/helpers.nix b/plugins/helpers.nix index d013a262..8bf9abae 100644 --- a/plugins/helpers.nix +++ b/plugins/helpers.nix @@ -2,7 +2,7 @@ with lib; rec { # vim dictionaries are, in theory, compatible with JSON - toVimDict = args: toJSON + toVimDict = args: toJSON (lib.filterAttrs (n: v: !isNull v) args); # Black functional magic that converts a bunch of different Nix types to their @@ -68,6 +68,7 @@ rec { name, description, extraPlugins ? [], + extraPackages ? [], options ? {}, ... }: let @@ -84,7 +85,7 @@ rec { } // pluginOptions; config = mkIf cfg.enable { - inherit extraPlugins globals; + inherit extraPlugins extraPackages globals; }; };