moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add jj profile

Browse source
This commit is contained in:
Moritz Böhme 2025-06-12 09:47:22 +02:00
parent 0211aa9d0a
commit 8de1521ec9
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
3 changed files with 44 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
machines/moritz-desktop/configuration.nix
View file

@ -34,6 +34,7 @@
personal.contacts = true; personal.contacts = true;
impermanence.enable = true; impermanence.enable = true;
webis.enable = true; webis.enable = true;
jujutsu.enable = true;
}; };
programs.prismlauncher.enable = true; programs.prismlauncher.enable = true;
programs.aider.enable = true; programs.aider.enable = true;
@ -47,37 +48,6 @@
networking.firewall.allowedTCPPorts = [9090]; networking.firewall.allowedTCPPorts = [9090];
# TODO: make this its own module!
home-manager.users.moritz.programs.jujutsu = {
enable = true;
settings = {
user = {
email = "mail@moritzboeh.me";
name = "Moritz Böhme";
};
ui.paginate = "never";
ui.default-command = "log";
signing = {
behavior = "drop";
backend = "gpg";
key = "0x970C6E89EB0547A9";
};
git.sign-on-push = true;
aliases = {
tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"];
mm-update = ["rebase" "--source" "closest_merge(@)" "--destination" "all:closest_merge(@)-"];
mm-rebase = ["rebase" "--source" "all:roots(trunk()..closest_merge(@))"];
};
revset-aliases = {
"closest_bookmark(to)" = "heads(::to & bookmarks())";
"closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:'') & (~empty() | merges()) & ~private())";
"closest_merge(to)" = "heads(::to & merges())";
"private()" = "description(glob:'wip:*') | description(glob:'private:*')";
};
git.private-commits = "private()";
};
};
home-manager.users.moritz.services.kanshi.settings = [ home-manager.users.moritz.services.kanshi.settings = [
{ {
profile.name = "default"; profile.name = "default";

1
machines/moritz-laptop/configuration.nix
View file

@ -35,6 +35,7 @@
personal.contacts = true; personal.contacts = true;
personal.calendar = true; personal.calendar = true;
impermanence.enable = true; impermanence.enable = true;
jujutsu.enable = true;
}; };
programs.aider.enable = true; programs.aider.enable = true;
}; };

42
modules/moritz/profiles/jujutsu.nix Normal file
View file

@ -0,0 +1,42 @@
{
lib,
config,
...
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.my.profiles.jujutsu;
in {
options.my.profiles.jujutsu.enable = mkEnableOption "jujutsu profile";
config = mkIf cfg.enable {
home-manager.users.moritz.programs.jujutsu = {
enable = true;
settings = {
user = {
email = "mail@moritzboeh.me";
name = "Moritz Böhme";
};
ui.paginate = "never";
ui.default-command = "log";
signing = {
behavior = "drop";
backend = "gpg";
key = "0x970C6E89EB0547A9";
};
git.sign-on-push = true;
aliases = {
tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"];
mm-update = ["rebase" "--source" "closest_merge(@)" "--destination" "all:closest_merge(@)-"];
mm-rebase = ["rebase" "--source" "all:roots(trunk()..closest_merge(@))"];
};
revset-aliases = {
"closest_bookmark(to)" = "heads(::to & bookmarks())";
"closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:'') & (~empty() | merges()) & ~private())";
"closest_merge(to)" = "heads(::to & merges())";
"private()" = "description(glob:'wip:*') | description(glob:'private:*')";
};
git.private-commits = "private()";
};
};
};
}