From ad7cda697a6dd4f0af22c421af2425390a953ba4 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 1 May 2021 00:24:51 +0200
Subject: [PATCH] Remove pass-secret-service since it breaks dbus env variables

---
 configurations/gnupg.nix | 38 +++++++++++++++++++++-----------------
 configurations/pass.nix  |  3 +--
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/configurations/gnupg.nix b/configurations/gnupg.nix
index 1509fb25..44309b8e 100644
--- a/configurations/gnupg.nix
+++ b/configurations/gnupg.nix
@@ -10,24 +10,28 @@
     '';
   };
 
-  config.chvp.zfs.homeLinks = [
-    { path = ".gnupg/crls.d"; type = "data"; }
-    { path = ".gnupg/private-keys-v1.d"; type = "data"; }
-    { path = ".gnupg/pubring.kbx"; type = "data"; }
-    { path = ".gnupg/trustdb.gpg"; type = "data"; }
-  ];
-  config.programs.gnupg.agent.enable = true;
-  config.home-manager.users.charlotte = { lib, ... }: {
-    home.activation.fixPermissionsCommands = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-      mkdir -p /home/charlotte/.gnupg
-      chmod u=rwX,go= /home/charlotte/.gnupg
-    '';
-    programs.gpg.enable = true;
-    services.gpg-agent = {
+  config = {
+    chvp.zfs.homeLinks = [
+      { path = ".gnupg/crls.d"; type = "data"; }
+      { path = ".gnupg/private-keys-v1.d"; type = "data"; }
+      { path = ".gnupg/pubring.kbx"; type = "data"; }
+      { path = ".gnupg/trustdb.gpg"; type = "data"; }
+    ];
+    programs.gnupg.agent = {
       enable = true;
-      defaultCacheTtl = 7200;
-      maxCacheTtl = 99999;
-      pinentryFlavor = config.chvp.gnupg.pinentryFlavor;
+    };
+    home-manager.users.charlotte = { lib, ... }: {
+      home.activation.fixPermissionsCommands = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        mkdir -p /home/charlotte/.gnupg
+        chmod u=rwX,go= /home/charlotte/.gnupg
+      '';
+      programs.gpg.enable = true;
+      services.gpg-agent = {
+        enable = true;
+        defaultCacheTtl = 7200;
+        maxCacheTtl = 99999;
+        pinentryFlavor = config.chvp.gnupg.pinentryFlavor;
+      };
     };
   };
 }
diff --git a/configurations/pass.nix b/configurations/pass.nix
index 8c589544..ad47605f 100644
--- a/configurations/pass.nix
+++ b/configurations/pass.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ lib, ... }: {
   nixpkgs.overlays = [
     (self: super: {
       pass = (super.pass.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
@@ -11,6 +11,5 @@
       settings = { PASSWORD_STORE_DIR = "/home/charlotte/repos/passwords"; };
     };
     services.password-store-sync.enable = true;
-    services.pass-secret-service.enable = true;
   };
 }