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

@ -37,9 +37,9 @@
cmake
coursier
curlFull
delta
deno
devenv
difftastic
discord
dua
fd
@ -170,6 +170,7 @@
enable = true;
settings = {
theme = "tokyonight";
editor.file-picker.hidden = false;
};
};
@ -185,48 +186,6 @@
enable = true;
};
programs.jujutsu = {
enable = true;
settings = {
signing = {
key = "~/.ssh/id_ed25519.pub";
};
user = {
name = "Salar Rahmanian";
email = "code@softinio.com";
};
aliases = {
l = [
"log"
"-r"
"(main..@):: | (main..@)-"
];
};
ui = {
diff.format = "git";
diff.tool = [
"delta"
"--color-only"
"--hyperlinks"
"--line-numbers"
"--side-by-side"
"$left"
"$right"
];
editor = "nvim";
merge-editor = [
"meld"
"$left"
"$base"
"$right"
"-o"
"$output"
];
pager = "delta";
};
};
};
programs.lazygit = {
enable = true;
};