jj, fish, better kanata, etc

This commit is contained in:
Jonathan Dönszelmann 2024-12-30 09:33:16 +01:00
parent 52b1728e2e
commit d030ebe744
No known key found for this signature in database
17 changed files with 1642 additions and 938 deletions

49
programs/jj/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ pkgs, ... }:
{
programs.jujutsu = {
enable = true;
package = pkgs.custom.jujutsu;
settings = {
user = {
email = "jonathan@donsz.nl";
name = "Jonathan Dönszelmann";
};
ui = {
pager = "${pkgs.delta}/bin/delta";
# for delta
diff.format = "git";
default-command = [
"log"
"--reversed"
"--no-pager"
];
merge-editor = [
"${pkgs.meld}/bin/meld"
"$left"
"$base"
"$right"
"-o"
"$output"
"--auto-merge"
];
# diff-editor = "${pkgs.meld}/bin/meld";
};
revsets.log = "@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()";
signing = {
sign-all = true;
backend = "ssh";
key = "~/.ssh/id_ed25519.pub";
};
git = {
push-bookmark-prefix = "jdonszelmann/";
private-commits = "description(glob:'wip:*')";
};
};
};
}