All checks were successful
ci/woodpecker/push/check Pipeline was successful
137 lines
4.1 KiB
Nix
137 lines
4.1 KiB
Nix
{ config, pkgs, lib, ... }:
|
|
let
|
|
cfg = config.my.home.jujutsu;
|
|
|
|
inherit (lib.my) mkMailAddress;
|
|
in
|
|
{
|
|
options.my.home.jujutsu = with lib; {
|
|
enable = my.mkDisableOption "jujutsu configuration";
|
|
|
|
package = mkPackageOption pkgs "jujutsu" { };
|
|
};
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
assertions = [
|
|
{
|
|
# For `jj git` commands
|
|
assertion = cfg.enable -> config.my.home.git.enable;
|
|
message = ''
|
|
`config.my.home.jujutsu` relies on `config.my.home.git` being enabled.
|
|
'';
|
|
}
|
|
];
|
|
|
|
programs.jujutsu = {
|
|
enable = true;
|
|
|
|
inherit (cfg) package;
|
|
|
|
settings = {
|
|
# Who am I?
|
|
user = {
|
|
name = "Bruno BELANYI";
|
|
email = mkMailAddress "bruno" "belanyi.fr";
|
|
};
|
|
|
|
aliases = {
|
|
jj = [ ];
|
|
# FIXME:
|
|
# * still not a big fan of the template
|
|
lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
|
|
lola = [ "lol" "-r" "all()" ];
|
|
# FIXME: equivalent to `git switch -`
|
|
# See https://github.com/jj-vcs/jj/issues/2871
|
|
# Might be broken recently https://discord.com/channels/968932220549103686/1380272574709366989/1380432041983606855
|
|
# TODO:
|
|
# * `pick` (https://github.com/jj-vcs/jj/issues/5446): [ "util" "exec" "--" "bash" "-c" "jj log -p -r \"diff_contains($1)\"" "" ]
|
|
# * `root`: `jj workspace root` (barely necessary then)
|
|
};
|
|
|
|
ui = {
|
|
# Stop nagging me about it, though I am not a fan of its UI.
|
|
diff-editor = ":builtin";
|
|
# Stop nagging me about it, though I am not a fan of its UI.
|
|
merge-editor = ":builtin";
|
|
};
|
|
|
|
# FIXME: git equivalents
|
|
# I'd like a better formatted blame (more like delta's?)
|
|
# blame = {
|
|
# coloring = "repeatedLines";
|
|
# markIgnoredLines = true;
|
|
# markUnblamables = true;
|
|
# };
|
|
# FIXME: log colors should probably match git
|
|
# FIXME: patience diff?
|
|
# FIXME: fetch prune/pruneTags?
|
|
# FIXME: pull.rebase=true? Probably true TBH
|
|
# FIXME: push.default=simple? Probably true TBH
|
|
# FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
|
|
|
|
# FIXME: from ma_9's config, plus my own stuff
|
|
# snapshot = {
|
|
# auto-track = "none()";
|
|
# };
|
|
#
|
|
# ui = {
|
|
# movement = {
|
|
# edit = false;
|
|
# };
|
|
# };
|
|
|
|
templates = {
|
|
# Equivalent to `commit.verbose = true` in Git
|
|
draft_commit_description = "commit_description_verbose(self)";
|
|
};
|
|
|
|
template-aliases = {
|
|
"commit_description_verbose(commit)" = ''
|
|
concat(
|
|
commit_description(commit),
|
|
"JJ: ignore-rest\n",
|
|
diff.git(),
|
|
)
|
|
'';
|
|
# FIXME: use `diff.summary()` instead? Supported by syntax highlighting
|
|
# See https://github.com/jj-vcs/jj/issues/1946#issuecomment-2572986485
|
|
# FIXME: tree-sitter grammar isn't in `nvim-treesitter` (https://github.com/kareigu/tree-sitter-jjdescription)
|
|
"commit_description(commit)" = ''
|
|
concat(
|
|
commit.description(), "\n",
|
|
"JJ: This commit contains the following changes:\n",
|
|
indent("JJ: ", diff.stat(72)),
|
|
)
|
|
'';
|
|
};
|
|
|
|
"--scope" = [
|
|
# Multiple identities
|
|
{
|
|
"--when" = {
|
|
repositories = [ "~/git/EPITA/" ];
|
|
};
|
|
user = {
|
|
name = "Bruno BELANYI";
|
|
email = mkMailAddress "bruno.belanyi" "epita.fr";
|
|
};
|
|
}
|
|
{
|
|
"--when" = {
|
|
repositories = [ "~/git/work/" ];
|
|
};
|
|
user = {
|
|
name = "Bruno BELANYI";
|
|
email = mkMailAddress "ambroisie" "google.com";
|
|
};
|
|
}
|
|
];
|
|
};
|
|
};
|
|
|
|
# To drop in a `local.toml` configuration, not-versioned
|
|
xdg.configFile = {
|
|
"jj/conf.d/.keep".text = "";
|
|
};
|
|
};
|
|
}
|