From 1462142487ae55a72b4d1c2bb9d6c7df60d4be42 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Sun, 1 Mar 2020 21:25:57 +0300
Subject: [PATCH] Update modules/users.nix modules/workspace/i3/default.nix
 modules/workspace/misc.nix

---
 modules/users.nix                | 29 +----------------------------
 modules/workspace/i3/default.nix |  6 +-----
 modules/workspace/misc.nix       |  3 ++-
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/modules/users.nix b/modules/users.nix
index 8c0aeab..60b22e6 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -49,34 +49,7 @@
     enable = true;
   };
 
-  security.pam.services = builtins.listToAttrs (builtins.map (name: {
-    inherit name;
-    value = { unixAuth = false; };
-  }) [
-    "chpasswd"
-    "chsh"
-    "groupadd"
-    "groupdel"
-    "groupmems"
-    "groupmod"
-    "i3lock"
-    "i3lock-color"
-    "login"
-    "passwd"
-    "polkit-1"
-    "runuser"
-    "runuser-l"
-    "su"
-    "sudo"
-    "swaylock"
-    "systemd-user"
-    "useradd"
-    "userdel"
-    "usermod"
-    "vlock"
-    "xlock"
-    "xscreensaver"
-  ]);
+  security.pam.services.default.unixAuth = false;
 
   security.sudo = {
     enable = true;
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index 1eba9a8..a06c9ba 100755
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -61,10 +61,6 @@ in {
             command = "border pixel 2px";
             criteria = { window_role = "popup"; };
           }
-          {
-            command = "floating enable";
-            criteria = { app_id = "org.kde.polkit-kde-authentication-1"; };
-          }
           {
             command = "sticky enable";
             criteria = { floating = ""; };
@@ -76,7 +72,7 @@ in {
         { command = "${pkgs.kdeconnect}/libexec/kdeconnectd"; }
         {
           command =
-            "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
+            "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
         }
         {
           command =
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index daa9272..27e450d 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -15,6 +15,7 @@
     NIX_AUTO_RUN = "1";
   };
   services.atd.enable = true;
+  services.dbus.packages = [ pkgs.gcr ];
 
   home-manager.users.balsoft = {
     xdg.enable = true;
@@ -38,7 +39,7 @@
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryFlavor = "qt";
+      pinentryFlavor = "gnome3";
       sshKeys = [ "0819BD05AB506F55109B8418B7809DF496AD3C7B" ];
     };
     programs.gpg.enable = true;