diff options
| -rw-r--r-- | hm/conf/git.nix | 6 | ||||
| -rw-r--r-- | os/core/ssh.nix | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hm/conf/git.nix b/hm/conf/git.nix index a784234..b30e96e 100644 --- a/hm/conf/git.nix +++ b/hm/conf/git.nix @@ -13,8 +13,9 @@ in enable = true; lfs.enable = true; signing = { + format = "ssh"; + key = "~/.ssh/main_id_ed25519.pub"; signByDefault = true; - key = "EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94"; }; settings = { user = { @@ -33,6 +34,9 @@ in ".direnv/" "secrets/*.tmp" ]; + extraConfig = { + gpg.ssh.program = "ssh-keygen"; + }; }; }; } diff --git a/os/core/ssh.nix b/os/core/ssh.nix index 4f9b551..0b75dee 100644 --- a/os/core/ssh.nix +++ b/os/core/ssh.nix @@ -20,12 +20,12 @@ in }; }; - programs.ssh.startAgent = true; - services.gnome.gcr-ssh-agent.enable = false; + # programs.ssh.startAgent = true; + # services.gnome.gcr-ssh-agent.enable = false; programs.gnupg.agent = { enable = true; - enableSSHSupport = false; + enableSSHSupport = true; pinentryPackage = pkgs.pinentry-curses; }; |