kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-20 12:01:06 +01:00
Code Releases Activity

feat: reenable ssh agent, gpg did not work

Browse Source
This commit is contained in:
Kierán Meinhardt
2022-12-17 10:03:00 +01:00
parent bc8a035451
commit 547d59ee2c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configs/default.nix
View File

@@ -189,12 +189,9 @@ in {
home-manager.users.me = { home-manager.users.me = {
services.gpg-agent = rec { services.gpg-agent = rec {
enable = true; enable = true;
enableSshSupport = true;
enableZshIntegration = true; enableZshIntegration = true;
defaultCacheTtl = 2 * 60 * 60; defaultCacheTtl = 2 * 60 * 60;
defaultCacheTtlSsh = defaultCacheTtl;
maxCacheTtl = 4 * defaultCacheTtl; maxCacheTtl = 4 * defaultCacheTtl;
maxCacheTtlSsh = maxCacheTtl;
}; };
}; };

12
configs/ssh.nix
View File

@@ -7,7 +7,19 @@
inherit (import <niveum/lib>) sshPort kieran; inherit (import <niveum/lib>) sshPort kieran;
externalNetwork = import <niveum/lib/external-network.nix>; externalNetwork = import <niveum/lib/external-network.nix>;
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}"; sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
ssh-passphrase = lib.strings.fileContents <system-secrets/ssh/passphrase>;
in { in {
services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
#!${pkgs.expect}/bin/expect -f
spawn ${pkgs.openssh}/bin/ssh-add
expect "Enter passphrase for *:"
send "${ssh-passphrase}\n";
expect "Identity added: *"
interact
'');
programs.ssh.startAgent = true;
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
home-manager.users.me.programs.ssh = { home-manager.users.me.programs.ssh = {