flake update,zed config update, git and jj tweaks

This commit is contained in:
Salar Rahmanian 2024-12-18 22:15:42 -08:00
parent f4ac5a2006
commit 1f636db477
7 changed files with 102 additions and 76 deletions

View file

@ -0,0 +1,44 @@
{ ... }:
let
MyAliases = {
l = [
"log"
"-r"
"(main..@):: | (main..@)-"
];
};
in
{
programs.jujutsu = {
enable = true;
settings = {
aliases = MyAliases;
signing = {
key = "~/.ssh/id_ed25519.pub";
};
ui = {
diff.format = "git";
diff.tool = [
"difft"
"--color=always"
"$left"
"$right"
];
editor = "nvim";
merge-editor = [
"meld"
"$left"
"$base"
"$right"
"-o"
"$output"
];
pager = "less -FRX";
};
user = {
name = "Salar Rahmanian";
email = "code@softinio.com";
};
};
};
}