diff options
| -rw-r--r-- | modules/terminal/hjem/programs/git.nix | 30 | ||||
| -rw-r--r-- | modules/terminal/nixos/github_ssh.nix | 6 | ||||
| -rw-r--r-- | secrets.nix | 2 |
3 files changed, 26 insertions, 12 deletions
diff --git a/modules/terminal/hjem/programs/git.nix b/modules/terminal/hjem/programs/git.nix index d196f26..1c557bc 100644 --- a/modules/terminal/hjem/programs/git.nix +++ b/modules/terminal/hjem/programs/git.nix @@ -6,17 +6,25 @@ }: let cfg = config.collinux.terminal.programs.git; - git_config = { - alias = { - stage = "add"; - unstage = "restore --staged"; - }; - init.defaultBranch = "main"; - user = { - email = cfg.userEmail; - name = cfg.userName; - }; - }; + git_config = lib.mkMerge [ + { + alias = { + stage = "add"; + unstage = "restore --staged"; + }; + init.defaultBranch = "main"; + user = { + email = cfg.userEmail; + name = cfg.userName; + }; + } + (lib.mkIf cfg.installKey { + # commit signing + gpg.format = "ssh"; + user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3SjzIs3YI8PWJaNrAuaEeRcTcvIVHOKyCh2VwHTHEF"; + commit.gpgsign = "true"; + }) + ]; in { files = { ".config/git/config" = { diff --git a/modules/terminal/nixos/github_ssh.nix b/modules/terminal/nixos/github_ssh.nix index 0d30b64..4d8912c 100644 --- a/modules/terminal/nixos/github_ssh.nix +++ b/modules/terminal/nixos/github_ssh.nix @@ -13,14 +13,20 @@ in }; }; + hjem.users.${config.collinux.user.name}.files.".ssh/id_ed25519_github.pub".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3SjzIs3YI8PWJaNrAuaEeRcTcvIVHOKyCh2VwHTHEF 96917990+bluedragon1221@users.noreply.github.com + ''; + programs.ssh = { knownHosts."github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; + startAgent = true; extraConfig = '' Host github.com User git IdentityFile ${config.collinux.secrets."github-ssh-key".path} IdentitiesOnly yes + AddKeysToAgent yes ''; }; } diff --git a/secrets.nix b/secrets.nix index 7d7cb19..eca8da4 100644 --- a/secrets.nix +++ b/secrets.nix @@ -6,5 +6,5 @@ let in { "caddy-tailscale-authkey.age".publicKeys = [ganymede]; "williams-psk.age".publicKeys = [ganymede]; - "github-ssh-key.age".publicKeys = [mercury ganymede jupiter]; + "github-ssh-key.age".publicKeys = [mercury jupiter]; } |