Upgrade jj
"Unable to exchange encryption" the old one tells me.
This commit is contained in:
parent
d3119db300
commit
37520496e6
3 changed files with 6 additions and 7 deletions
|
@ -64,6 +64,7 @@
|
|||
in
|
||||
{
|
||||
jjui = upkgs.jjui;
|
||||
jujutsu = upkgs.jujutsu; # 24.11 version of libgit2 doesn't work with newer GitLab
|
||||
labelle = upkgs.labelle;
|
||||
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
|
||||
|
|
|
@ -11,7 +11,6 @@ in
|
|||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [
|
||||
pkgs.jjui
|
||||
pkgs.lazyjj
|
||||
(pkgs.writeShellApplication {
|
||||
name = "git-sync";
|
||||
text = (
|
||||
|
@ -89,12 +88,8 @@ in
|
|||
};
|
||||
jujutsu = {
|
||||
enable = true;
|
||||
# Current version doesn't have the "none" signing backend
|
||||
settings = {
|
||||
git = {
|
||||
auto-local-bookmark = true;
|
||||
auto-local-branch = true;
|
||||
};
|
||||
git.auto-local-bookmark = true;
|
||||
user = {
|
||||
email = cfg.userEmail;
|
||||
name = cfg.userName;
|
||||
|
@ -106,7 +101,7 @@ in
|
|||
merge-editor = "meld";
|
||||
};
|
||||
signing = lib.mkIf (!builtins.isNull cfg.signing) {
|
||||
sign-all = true;
|
||||
behaviour = "own";
|
||||
backend = "gpg";
|
||||
inherit (cfg.signing) key;
|
||||
backends.gpg.allow-expired-keys = false;
|
||||
|
|
|
@ -34,3 +34,6 @@
|
|||
}/share/fonts/truetype/NerdFonts/DejaVuSansMNerdFont-Regular.ttf";
|
||||
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).
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue