From 9a9c0769242f9ad7ca7eb24ee1352b2567d3cd7c Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 17 Feb 2022 08:29:53 -0800
Subject: sway: configure correctly dbus / keyring

---
 hosts/common/desktop/xserver.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'hosts/common/desktop')

diff --git a/hosts/common/desktop/xserver.nix b/hosts/common/desktop/xserver.nix
index ba7647c..d7cbcd8 100644
--- a/hosts/common/desktop/xserver.nix
+++ b/hosts/common/desktop/xserver.nix
@@ -13,10 +13,6 @@
       wl-clipboard
     ];
     extraSessionCommands = ''
-      export SDL_VIDEODRIVER=wayland
-      export QT_QPA_PLATFORM=wayland
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-      export _JAVA_AWT_WM_NONREPARENTING=1
       export MOZ_ENABLE_WAYLAND=1
     '';
   };
@@ -34,8 +30,17 @@
   };
 
   services = {
-    dbus.packages = [ pkgs.gnome3.dconf ];
-    udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
+    dbus = {
+      enable = true;
+      packages = [
+        pkgs.gcr
+        pkgs.gnome3.dconf
+        pkgs.gnome3.gnome-keyring
+      ];
+    };
+    udev.packages = [
+      pkgs.gnome3.gnome-settings-daemon
+    ];
     gnome.gnome-keyring.enable = true;
     gvfs.enable = true;
 
@@ -45,8 +50,11 @@
     };
   };
 
-  # enable gnome keyring unlock on login
-  security.pam.services = { login.enableGnomeKeyring = true; };
+  security = {
+    polkit.enable = true;
+    # enable gnome keyring unlock on login
+    pam.services.gdm.enableGnomeKeyring = true;
+  };
 
   environment = {
     pathsToLink = [ "/libexec" ];
-- 
cgit 1.4.1