From aea9b35aa6f3ef6f4722c08ce4970d5b9816d8b1 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:16:56 +0200
Subject: [PATCH] kwallet

---
 home-manager/home.nix     | 16 ++++++++--------
 hosts/common/services.nix | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 339c300..ac7eb20 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -136,14 +136,14 @@
     iwgtk
   ];
 
-  services.gnome-keyring = {
-    enable = true;
-    components = [
-      "ssh"
-      "secrets"
-      "pkcs11"
-    ];
-  };
+  # services.gnome-keyring = {
+  #   enable = true;
+  #   components = [
+  #     "ssh"
+  #     "secrets"
+  #     "pkcs11"
+  #   ];
+  # };
   
   programs.keychain = {
     enable = true;
diff --git a/hosts/common/services.nix b/hosts/common/services.nix
index d3ed722..2617d3b 100644
--- a/hosts/common/services.nix
+++ b/hosts/common/services.nix
@@ -14,7 +14,7 @@
   # Configure console keymap
   console.keyMap = "pl2";
   
-  services.gnome.gnome-keyring.enable = true;
+  # services.gnome.gnome-keyring.enable = true;
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
@@ -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,6 +59,11 @@
     };
   };
 
+  security.pam.services.kwallet = {
+    name = "kwallet";
+    enableKwallet = true;
+  };
+
   programs.ssh = {
     startAgent = true;
     forwardX11 = true;