Compare commits

...

2 commits

Author SHA1 Message Date
97fa750d59
feat(nvim): add hunk.nvim plugin
Some checks failed
/ check (push) Failing after 34s
/ check-renovaterc (push) Successful in 2s
/ build-packages (push) Has been skipped
/ build-vm (push) Has been skipped
/ report-size (push) Has been skipped
This should be a better diff editor for `jj`
2025-05-12 23:48:05 +02:00
4aeac7e7d1
chore(flake): update nixvim
Some checks failed
/ check (push) Successful in 38s
/ check-renovaterc (push) Successful in 2s
/ build-packages (push) Failing after 13m4s
/ build-vm (push) Has been cancelled
/ report-size (push) Has been cancelled
Nixvim added a `systems` input which we override, also this commit has
the `hunk.nvim` plugin which we want.
2025-05-12 23:47:25 +02:00
3 changed files with 11 additions and 5 deletions

11
flake.lock generated
View file

@ -339,14 +339,17 @@
"flake-parts" "flake-parts"
], ],
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nuschtosSearch": [] "nuschtosSearch": [],
"systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1746965641, "lastModified": 1747083534,
"narHash": "sha256-6+Cn5aMDSWvsk4nOXmea3whAI4v+PjYaEpcDkTEAlXc=", "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "02a85bd29333ce9fbde0d2c57a2378f47205bb21", "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -39,6 +39,7 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs = { inputs = {
flake-parts.follows = "flake-parts"; flake-parts.follows = "flake-parts";
systems.follows = "systems";
# disable optional inputs # disable optional inputs
nuschtosSearch.follows = ""; nuschtosSearch.follows = "";
}; };

View file

@ -2,10 +2,11 @@
lib, lib,
pkgs, pkgs,
config, config,
helpers,
... ...
}: }:
let let
helpers = if lib.hasAttrByPath [ "lib" "nixvim" ] config then config.lib.nixvim else lib.nixvim;
inherit (helpers) enableExceptInTests; inherit (helpers) enableExceptInTests;
inherit (lib.trivial) const; inherit (lib.trivial) const;
cfg = config.jhome.nvim; cfg = config.jhome.nvim;
@ -174,6 +175,7 @@ in
mode = "virtualtext"; mode = "virtualtext";
}; };
}; };
hunk.enable = true;
otter.enable = true; otter.enable = true;
}; };
} }