NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-11 16:05:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins/git: build git-conflict-nvim ourselves

Browse source
This commit is contained in:
Ben Mayer 2025-02-14 12:51:02 +01:00
commit 56eec41a13
No known key found for this signature in database
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/plugins/git/git-conflict/config.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
@ -19,7 +18,7 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
{ {
vim = { vim = {
startPlugins = [pkgs.vimPlugins.git-conflict-nvim]; startPlugins = ["git-conflict-nvim"];
maps = { maps = {
normal = mkMerge [ normal = mkMerge [

12
npins/sources.json
View file

@ -423,6 +423,18 @@
"url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz", "url": "https://github.com/notomo/gesture.nvim/archive/dbd839bda337cb73911aeef06897eb29cb99f76f.tar.gz",
"hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d" "hash": "1cqiahc52xh113l8lgpz3k852vvqkv2srj9shdkyya76a2v2sf9d"
}, },
"git-conflict-nvim": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "akinsho",
"repo": "git-conflict.nvim"
},
"branch": "main",
"revision": "a1badcd070d176172940eb55d9d59029dad1c5a6",
"url": "https://github.com/akinsho/git-conflict.nvim/archive/a1badcd070d176172940eb55d9d59029dad1c5a6.tar.gz",
"hash": "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a"
},
"gitsigns-nvim": { "gitsigns-nvim": {
"type": "Git", "type": "Git",
"repository": { "repository": {