diff --git a/config/nvim/plugins/diffview.fnl b/config/nvim/plugins/diffview.fnl new file mode 100644 index 0000000..04fe5c1 --- /dev/null +++ b/config/nvim/plugins/diffview.fnl @@ -0,0 +1,3 @@ +(let [diffview (require :diffview)] + (diffview.setup {:signs {:fold_closed "" :fold_open ""}})) + diff --git a/config/nvim/plugins/neogit.fnl b/config/nvim/plugins/neogit.fnl index ba77d09..9428aef 100644 --- a/config/nvim/plugins/neogit.fnl +++ b/config/nvim/plugins/neogit.fnl @@ -2,4 +2,6 @@ (neogit.setup {:signs {; [ CLOSED, OPENED ] :section ["" ""] :item ["" ""] - :hunk ["" ""]}})) + :hunk ["" ""]} + :integrations {:diffview true}})) + diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index ddca529..c0e8af3 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -251,6 +251,12 @@ in type = "fennel"; } + { + plugin = diffview-nvim; + config = builtins.readFile ../../config/nvim/plugins/diffview.fnl; + type = "fennel"; + } + { plugin = neogit; config = builtins.readFile ../../config/nvim/plugins/neogit.fnl; diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index af5821e..6c16821 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -503,6 +503,17 @@ fetchSubmodules = false; }; }; + diffview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "diffview.nvim"; + version = "2022-06-12"; + src = pkgs.fetchFromGitHub { + owner = "sindrets"; + repo = "diffview.nvim"; + rev = "03deb5d379e3b2c2eb4111d7c65d8ee04b77028a"; + sha256 = "0fxh55lgc17awjd7msvhlkv7wgj8nksg1ag0m5lgsgp25vhz0y6h"; + fetchSubmodules = false; + }; + }; neogit = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "neogit"; version = "2022-06-09"; diff --git a/programs/nvim/plugins.yaml b/programs/nvim/plugins.yaml index 0ffdc24..962d381 100644 --- a/programs/nvim/plugins.yaml +++ b/programs/nvim/plugins.yaml @@ -82,6 +82,7 @@ - src: lukas-reineke/virt-column.nvim - src: akinsho/toggleterm.nvim - src: axieax/urlview.nvim +- src: sindrets/diffview.nvim - src: TimUntersberger/neogit - src: lewis6991/gitsigns.nvim - src: lewis6991/spellsitter.nvim