Compare commits

...

3 commits

Author SHA1 Message Date
e962441ce1
chore(deps): lock file maintenance
All checks were successful
/ check (push) Successful in 8s
/ check-renovaterc (push) Successful in 3s
/ build-packages (push) Successful in 14s
/ build-vm (push) Successful in 2s
/ report-size (push) Successful in 4s
2025-05-13 00:40:16 +02:00
77c73c2ea9
feat(jj): configure to use hunk.nvim if available
All checks were successful
/ check (push) Successful in 9s
/ check-renovaterc (push) Successful in 3s
/ build-packages (push) Successful in 15s
/ build-vm (push) Successful in 2s
/ report-size (push) Successful in 4s
This should keep me inside of nvim for longer c:
2025-05-13 00:28:28 +02:00
fe00695bde
feat(nvim): add hunk.nvim plugin
Some checks are pending
/ check (push) Successful in 9s
/ check-renovaterc (push) Successful in 2s
/ build-packages (push) Successful in 14s
/ build-vm (push) Waiting to run
/ report-size (push) Blocked by required conditions
This should be a better diff editor for `jj`
2025-05-13 00:26:36 +02:00
3 changed files with 20 additions and 7 deletions

12
flake.lock generated
View file

@ -226,11 +226,11 @@
]
},
"locked": {
"lastModified": 1746171682,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
"lastModified": 1747020534,
"narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675",
"rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
"type": "github"
},
"original": {
@ -303,11 +303,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1746810718,
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
"lastModified": 1746957726,
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
"type": "github"
},
"original": {

View file

@ -123,9 +123,21 @@ in
# Jujutsu (alternative DVCS (git-compatible))
jujutsu = {
enable = true;
# Use the more up to date version of jj
package = pkgs.unstable.jujutsu;
settings = {
ui.pager = "bat";
ui = lib.mkMerge [
# If `bat` is available use it as the pager
(lib.mkIf config.programs.bat.enable { pager = "bat"; })
# if hunk.nvim is enabled use it as a diff editor
(lib.mkIf config.programs.nixvim.plugins.hunk.enable {
diff-editor = [
"nvim"
"-c"
"DiffEditor $left $right $output"
];
})
];
fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
# mimic git commit --verbose by adding a diff
templates.draft_commit_description = ''

View file

@ -174,6 +174,7 @@ in
mode = "virtualtext";
};
};
hunk.enable = true;
otter.enable = true;
};
}