From e3a8c9d2fe299107e6d09dcd2730bce6ea20a3f3 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Fri, 29 Oct 2021 20:38:31 +0200 Subject: [PATCH] fix: fix gpg issues --- home/felschr-work.nix | 10 +++++++--- home/felschr.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/home/felschr-work.nix b/home/felschr-work.nix index 714bfd8..964b660 100644 --- a/home/felschr-work.nix +++ b/home/felschr-work.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: with pkgs; { imports = [ @@ -19,7 +19,7 @@ with pkgs; { longitude = "10.4014691"; }; - programs.ssh = { enable = true; }; + programs.gpg.enable = true; services.gpg-agent = { enable = true; @@ -29,8 +29,12 @@ with pkgs; { defaultCacheTtlSsh = 600; pinentryFlavor = "gnome3"; }; + # https://github.com/nix-community/home-manager/issues/667#issuecomment-902236379 + # https://github.com/nix-community/home-manager/pull/2253 + home.sessionVariables.SSH_AUTH_SOCK = + "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"; - programs.gpg.enable = true; + programs.ssh.enable = true; programs.git = { defaultProfile = "work"; }; diff --git a/home/felschr.nix b/home/felschr.nix index 42bcdc2..7ef0039 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ @@ -29,7 +29,7 @@ }; }; - programs.ssh = { enable = true; }; + programs.gpg.enable = true; services.gpg-agent = { enable = true; @@ -39,8 +39,12 @@ defaultCacheTtlSsh = 600; pinentryFlavor = "gnome3"; }; + # https://github.com/nix-community/home-manager/issues/667#issuecomment-902236379 + # https://github.com/nix-community/home-manager/pull/2253 + home.sessionVariables.SSH_AUTH_SOCK = + "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"; - programs.gpg.enable = true; + programs.ssh.enable = true; programs.git = { defaultProfile = "private"; };