faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: format using nixfmt

Browse source 
Signed-off-by: Bloxx12 <charlie@charlieroot.dev>
Change-Id: I6a6a69641c36f9763e104087a559c148d0449f00
This commit is contained in:
Bloxx12 2025-07-20 01:23:48 +02:00
commit e641dfa114
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
113 changed files with 1545 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

73
modules/programs/cli/jj.mod.nix
View file

@ -3,10 +3,11 @@
lib,
pkgs,
...
}: let
}:
let
inherit (lib.meta) getExe;
toml = pkgs.formats.toml {};
toml = pkgs.formats.toml { };
jj-config = toml.generate "config.toml" {
user = {
name = "Bloxx12";
@ -14,11 +15,20 @@
};
ui = {
pager = ["${getExe pkgs.bat}" "--plain"];
pager = [
"${getExe pkgs.bat}"
"--plain"
];
default-command = "log";
movement.edit = true;
diff.tool = ["${getExe pkgs.difftastic}" "--color" "always" "$left" "$right"];
diff.tool = [
"${getExe pkgs.difftastic}"
"--color"
"always"
"$left"
"$right"
];
};
# FIXME: do this with agenix
# "--scope" = [
@ -44,26 +54,52 @@
signing = {
behaviour = "own";
backend = "ssh";
key = ["ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw=="];
key = [
"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw=="
];
};
aliases = {
c = ["commit"];
ci = ["commit" "--interactive"];
c = [ "commit" ];
ci = [
"commit"
"--interactive"
];
e = ["edit"];
e = [ "edit" ];
# "new bookmark"
nb = ["bookmark" "create" "-r @-"];
nb = [
"bookmark"
"create"
"-r @-"
];
pull = ["git" "fetch"];
push = ["git" "push" "--allow-new"];
pull = [
"git"
"fetch"
];
push = [
"git"
"push"
"--allow-new"
];
r = ["rebase"];
s = ["squash"];
si = ["squash" "--interactive"];
r = [ "rebase" ];
s = [ "squash" ];
si = [
"squash"
"--interactive"
];
tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@-)"
"--to"
"@-"
];
};
revset-aliases = {
"closest_bookmark(to)" = "heads(::to & bookmarks())";
@ -89,14 +125,15 @@
jj-wrapped = pkgs.symlinkJoin {
name = "jj-wrapped";
paths = [pkgs.jj];
nativeBuildInputs = [pkgs.makeWrapper];
paths = [ pkgs.jj ];
nativeBuildInputs = [ pkgs.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/mako --add-flags "\
--config ${jj-config}
'';
};
in {
in
{
# environment.systemPackages = [jj-wrapped];
}