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
2 changed files with 14 additions and 1 deletions

View file

@ -123,9 +123,21 @@ in
# Jujutsu (alternative DVCS (git-compatible)) # Jujutsu (alternative DVCS (git-compatible))
jujutsu = { jujutsu = {
enable = true; enable = true;
# Use the more up to date version of jj
package = pkgs.unstable.jujutsu; package = pkgs.unstable.jujutsu;
settings = { 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; fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
# mimic git commit --verbose by adding a diff # mimic git commit --verbose by adding a diff
templates.draft_commit_description = '' templates.draft_commit_description = ''

View file

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