From 7efdf8ad318f9d604b3bb8dbe7707ca4e9984fd7 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 8 Feb 2022 00:02:44 +0100 Subject: [PATCH] fix(rpi4): fix gpg config --- home/felschr-rpi4.nix | 9 ++++++--- home/felschr.nix | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/home/felschr-rpi4.nix b/home/felschr-rpi4.nix index e2e66fe..6a69005 100644 --- a/home/felschr-rpi4.nix +++ b/home/felschr-rpi4.nix @@ -9,6 +9,7 @@ home.packages = with pkgs; [ ncurses ]; + programs.gpg.enable = true; services.gpg-agent = { enable = true; enableSshSupport = true; @@ -18,16 +19,18 @@ defaultCacheTtlSsh = 600; pinentryFlavor = "curses"; }; + # 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.git.defaultProfile = "private"; home.sessionVariables = with pkgs; { EDITOR = "nvim"; }; programs.neovim.enable = true; programs.neovim.viAlias = true; programs.neovim.vimAlias = true; - programs.git.defaultProfile = "private"; - xdg.configFile."nixpkgs/config.nix".text = '' { allowUnfree = true; diff --git a/home/felschr.nix b/home/felschr.nix index b1e8085..5113743 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -30,7 +30,6 @@ }; programs.gpg.enable = true; - services.gpg-agent = { enable = true; enableSshSupport = true; @@ -50,7 +49,7 @@ programs.ssh.enable = true; - programs.git = { defaultProfile = "private"; }; + programs.git.defaultProfile = "private"; xdg.configFile."nixpkgs/config.nix".text = '' {