From 7a657d84f142b9934f34fc7ca121b6192152bb6c Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Wed, 21 Aug 2024 01:09:58 +0200 Subject: [PATCH] Fix gpg agent --- modules/core/programs.nix | 6 ++++++ modules/home/hyprland/variables.nix | 1 - modules/home/packages.nix | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/core/programs.nix b/modules/core/programs.nix index 07b9407..cea015e 100644 --- a/modules/core/programs.nix +++ b/modules/core/programs.nix @@ -5,11 +5,17 @@ }: { programs.dconf.enable = true; programs.zsh.enable = true; + programs.gnupg.agent = { enable = true; enableSSHSupport = true; # pinentryFlavor = ""; }; + environment.shellInit = '' + gpg-connect-agent /bye + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + ''; + programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; []; programs.adb.enable = true; diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 7c22466..703c16e 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -9,7 +9,6 @@ __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "0"; _JAVA_AWT_WM_NONEREPARENTING = "1"; - SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; DISABLE_QT5_COMPAT = "0"; GDK_BACKEND = "wayland"; ANKI_WAYLAND = "1"; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 10ec11e..e4f88c2 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -26,6 +26,7 @@ gtrash # rm replacement, put deleted files in system trash imagemagick inkscape + kleopatra # Gpg GUI lazygit libreoffice cinnamon.nemo-with-extensions # file manager