From 1f14b6b02a9767e70b3d025f7c8d25680d9e2946 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 3 Jun 2024 23:20:43 +0200
Subject: [PATCH] Rid of gnome-keyring

---
 home/common-linux.nix                  | 11 +++++++++++
 modules/common/linux/default.nix       |  9 ++-------
 modules/services/pam/gnome-keyring.nix | 12 ------------
 nki-x1c1/configuration.nix             |  5 -----
 4 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 modules/services/pam/gnome-keyring.nix

diff --git a/home/common-linux.nix b/home/common-linux.nix
index 36ab420..56b5756 100644
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@@ -8,6 +8,16 @@ let
       SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
       SSH_ASKPASS_REQUIRE = "prefer";
     };
+    # Enable this for sway
+    wayland.windowManager.sway.config.startup = [
+      { command = "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"; }
+    ];
+    # Automatic dbus activation
+    xdg.dataFile."dbus-1/services/org.freedesktop.secrets.service".text = ''
+      [D-BUS Service]
+      Name=org.freedesktop.secrets
+      Exec=${pkgs.kdePackages.kwallet}/bin/kwalletd6
+    '';
   };
 in
 {
@@ -16,6 +26,7 @@ in
     ./modules/linux/graphical
     ./modules/X11/xfce4-notifyd.nix
     ./modules/programs/discord.nix
+    kwallet
   ];
   config = (mkIf pkgs.stdenv.isLinux {
     home.packages = with pkgs; [
diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index ab4b99a..de3824a 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -290,15 +290,11 @@ in
     hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
 
     ## Services
-    # gnome-keyring for storing keys
-    services.gnome.gnome-keyring.enable = true;
     # OpenSSH so you can SSH to me
     services.openssh.enable = true;
     # PAM
     security.pam.services.login.enableKwallet = true;
-    security.pam.services.login.enableGnomeKeyring = true;
     security.pam.services.lightdm.enableKwallet = true;
-    security.pam.services.lightdm.enableGnomeKeyring = true;
     security.pam.services.swaylock = { };
     # Printers
     services.printing.enable = true;
@@ -308,10 +304,9 @@ in
       wlr.enable = true;
       xdgOpenUsePortal = true;
       # gtk portal needed to make gtk apps happy
-      extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
 
-      config.sway."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
-      config.sway.default = [ "wlr" "gtk" ];
+      config.sway.default = [ "wlr" "kde" ];
     };
     # D-Bus
     services.dbus.packages = with pkgs; [ gcr ];
diff --git a/modules/services/pam/gnome-keyring.nix b/modules/services/pam/gnome-keyring.nix
deleted file mode 100644
index baff5cc..0000000
--- a/modules/services/pam/gnome-keyring.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, config, lib, ... }:
-with lib;
-let
-  cfg = config.nki.services.pam;
-in
-{
-  options.nki.services.pam.enableGnomeKeyring = mkEnableOption "Enable gnome-keyring on login";
-  config = mkIf cfg.enableGnomeKeyring {
-    security.pam.services.login.enableGnomeKeyring = true;
-    # security.pam.services.login.gnupg.enable = true;
-  };
-}
diff --git a/nki-x1c1/configuration.nix b/nki-x1c1/configuration.nix
index f8c624a..43d62e5 100644
--- a/nki-x1c1/configuration.nix
+++ b/nki-x1c1/configuration.nix
@@ -12,7 +12,6 @@
       # Fonts
       ../modules/personal/fonts
       # Some PAM stuff
-      ../modules/services/pam/gnome-keyring.nix
       ../modules/services/swaylock.nix
     ];
   # Use the latest kernel
@@ -116,9 +115,6 @@
     pciutils
   ];
 
-  # Gnome-keyring is useful
-  services.gnome.gnome-keyring.enable = true;
-
   ## Environment variables
   environment.variables = {
     # Input method overrides
@@ -145,7 +141,6 @@
   # };
 
   # List services that you want to enable:
-  nki.services.pam.enableGnomeKeyring = true;
   services.input-remapper.enable = true;
   services.swaylock.enable = true;