From 1cdc94df3364cb492e36ba918a2d5911f6666c7a Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Sun, 3 Mar 2024 09:46:45 +0100 Subject: [PATCH] I actually forgot to make the key configurable what is wrong with me --- hosts/del/configuration.nix | 2 +- hosts/niks/configuration.nix | 2 +- modules/cli/git.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 33a9a6a7..18cd3c50 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -141,7 +141,7 @@ enable = true; userName = "jacekpoz"; userEmail = "jacekpoz@cock.li"; - signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C"; + signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB"; defaultBranch = "master"; }; starship.enable = true; diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 76bae6a0..85ffd704 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -112,7 +112,7 @@ enable = true; userName = "jacekpoz"; userEmail = "jacekpoz@cock.li"; - signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C"; + signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB"; defaultBranch = "master"; }; starship.enable = true; diff --git a/modules/cli/git.nix b/modules/cli/git.nix index d462896f..5a03996b 100644 --- a/modules/cli/git.nix +++ b/modules/cli/git.nix @@ -49,7 +49,7 @@ in { gpgsign = true; }; gpg.format = "ssh"; - user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB"; + user.signingkey = "key::${cfg.signingKey}"; merge.conflictstyle = "zdiff3"; interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; diff.algorithm = "histogram";