geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Upgrade jj

Browse source 
"Unable to exchange encryption" the old one tells me.
This commit is contained in:
Geoffrey Frogeye 2025-04-25 00:58:12 +02:00
parent d3119db300
commit 37520496e6
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -64,6 +64,7 @@
in in
{ {
jjui = upkgs.jjui; jjui = upkgs.jjui;
jujutsu = upkgs.jujutsu; # 24.11 version of libgit2 doesn't work with newer GitLab
labelle = upkgs.labelle; labelle = upkgs.labelle;
orca-slicer = upkgs.orca-slicer; # Not prebuilt in 24.11 for some reason orca-slicer = upkgs.orca-slicer; # Not prebuilt in 24.11 for some reason
nextcloud-client = upkgs.nextcloud-client; # Need https://github.com/nextcloud/desktop/pull/7714 nextcloud-client = upkgs.nextcloud-client; # Need https://github.com/nextcloud/desktop/pull/7714

9
hm/git/default.nix
View file

@ -11,7 +11,6 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ home.packages = [
pkgs.jjui pkgs.jjui
pkgs.lazyjj
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "git-sync"; name = "git-sync";
text = ( text = (
@ -89,12 +88,8 @@ in
}; };
jujutsu = { jujutsu = {
enable = true; enable = true;
# Current version doesn't have the "none" signing backend
settings = { settings = {
git = { git.auto-local-bookmark = true;
auto-local-bookmark = true;
auto-local-branch = true;
};
user = { user = {
email = cfg.userEmail; email = cfg.userEmail;
name = cfg.userName; name = cfg.userName;
@ -106,7 +101,7 @@ in
merge-editor = "meld"; merge-editor = "meld";
}; };
signing = lib.mkIf (!builtins.isNull cfg.signing) { signing = lib.mkIf (!builtins.isNull cfg.signing) {
sign-all = true; behaviour = "own";
backend = "gpg"; backend = "gpg";
inherit (cfg.signing) key; inherit (cfg.signing) key;
backends.gpg.allow-expired-keys = false; backends.gpg.allow-expired-keys = false;

3
nod/common/default.nix
View file

@ -34,3 +34,6 @@
}/share/fonts/truetype/NerdFonts/DejaVuSansMNerdFont-Regular.ttf"; }/share/fonts/truetype/NerdFonts/DejaVuSansMNerdFont-Regular.ttf";
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
} }
# TODO SSH: https://github.com/nix-community/nix-on-droid/wiki/SSH-access#nix-on-droid-config but using /etc or something. ssh-keygen -A should work then
# TODO OpenKeyChain support. https://github.com/DDoSolitary/okc-agents compiles with nixpkgs#{cargo,gcc} and okc-gpg works out of the box.
# okc-ssh-agent doesn't seem to get/process answers from OkcAgent, despite connection being done (logs not printing is a different issue, s/tokio::Command/std::process::Command/ to fix).