From 382da1692739131b8944d84824664493e4cd6e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Sat, 27 Apr 2024 00:28:32 +0200
Subject: [PATCH] changed agent

---
 home-manager/home.nix     | 21 ++++++++++++---------
 hosts/common/services.nix | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index ac7eb20..b1e95de 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -134,6 +134,9 @@
     lmstudio
     unstable.arduino-ide
     iwgtk
+    kwallet-pam
+    kwalletcli
+    kwalletmanager
   ];
 
   # services.gnome-keyring = {
@@ -145,16 +148,16 @@
   #   ];
   # };
   
-  programs.keychain = {
-    enable = true;
-    enableZshIntegration = true;
-    keys = [
-      "id_rsa"
-    ];
-    enableXsessionIntegration = true;
-  };
+  # programs.keychain = {
+  #   enable = true;
+  #   enableZshIntegration = true;
+  #   keys = [
+  #     "id_rsa"
+  #   ];
+  #   enableXsessionIntegration = true;
+  # };
 
-  systemd.user.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
+  # systemd.user.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
 
   home.sessionVariables = {
     EDITOR = "nvim";
diff --git a/hosts/common/services.nix b/hosts/common/services.nix
index 2617d3b..230288b 100644
--- a/hosts/common/services.nix
+++ b/hosts/common/services.nix
@@ -42,10 +42,10 @@
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   # enableSSHSupport = true;
-  # };
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
   # This setups a SSH server. Very important if you're setting up a headless system.
   # Feel free to remove if you don't need it.
@@ -59,15 +59,15 @@
     };
   };
 
-  security.pam.services.kwallet = {
-    name = "kwallet";
-    enableKwallet = true;
-  };
+  # security.pam.services.kwallet = {
+  #   name = "kwallet";
+  #   enableKwallet = true;
+  # };
 
   programs.ssh = {
-    startAgent = true;
+    # startAgent = true;
     forwardX11 = true;
-    enableAskPassword = true;
+    # enableAskPassword = true;
   };
 
   # Open ports in the firewall.