logistic-bot/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(jujusu): sign commits + add some fix tools

Browse source
This commit is contained in:
Khaïs COLIN 2025-02-10 16:17:09 +01:00
parent 786a8cb186
commit fb848d40d7
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
home.nix
View file

@ -123,21 +123,33 @@ in {
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
ediff = true;
settings = { settings = {
user = { user = {
email = "khais.colin@gmail.com"; email = "khais.colin@gmail.com";
name = "Khaïs COLIN"; name = "Khaïs COLIN";
}; };
signing = {
sign-all = true;
backend = "ssh";
key = "/home/khais/.ssh/id_ed25519.pub";
};
ui = { ui = {
editor = "emacsclient"; editor = "emacsclient -a ''";
default-command = "log"; default-command = "log";
movement.edit = true; movement.edit = true;
# do not page if output fits on one screen # do not page if output fits on one screen
pager = "less -FRX"; pager = "less -FRX";
}; };
merge-tools.ediff = { fix.tools = {
program = "sh"; clang-format = {
merge-args = ["-c" "emacsclient -c --eval (ediff-merge-files-with-anscestor \"$0\" \"$1\" \"$2\" nil \"$3\")" "$left" "$right" "$base" "$output"]; command = ["${pkgs.clang-tools}/bin/clang-format" "--assume-filename=$path"];
patterns = ["glob:'**/*.cpp'" "glob:'**/*.hpp'"];
};
whitespace = {
command = ["${pkgs.perl}/bin/perl" "-p" "-e" "s/ +$//" "$path"];
patterns = ["glob:'**/*'"];
};
}; };
}; };
}; };

2
wm/river.nix
View file

@ -165,10 +165,12 @@ in {
"None Scroll_Lock" = "spawn 'playerctl previous'"; "None Scroll_Lock" = "spawn 'playerctl previous'";
"None XF86AudioNext" = "spawn 'playerctl next'"; "None XF86AudioNext" = "spawn 'playerctl next'";
"None Pause" = "spawn 'cmus-remote -C player-next-album'"; "None Pause" = "spawn 'cmus-remote -C player-next-album'";
"None XF86Bluetooth" = "spawn 'playerctl play-pause'"; "None XF86Bluetooth" = "spawn 'playerctl play-pause'";
"None XF86Tools" = "spawn 'playerctl previous'"; "None XF86Tools" = "spawn 'playerctl previous'";
"None XF86Keyboard" = "spawn 'playerctl next'"; "None XF86Keyboard" = "spawn 'playerctl next'";
"None XF86Favorites" = "spawn 'cmus-remote -C player-next-album'"; "None XF86Favorites" = "spawn 'cmus-remote -C player-next-album'";
"None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_SINK@ toggle'"; "None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_SINK@ toggle'";
}; };
}; };