Switch to KeepassDX (but keep pass around for now for migration)

modules/graphical/firefox/default.nix

@@ -65,20 +65,15 @@ in
       { path = ".cache/mozilla"; type = "cache"; }
     ];
     home-manager.users.charlotte = { ... }: {
-      programs = {
+      programs.firefox = {
-        browserpass = {
-          enable = true;
-          browsers = [ "firefox" ];
-        };
-        firefox = {
         enable = true;
         package = ffPackage;
         profiles.default = {
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
             belgium-eid
-              browserpass
             decentraleyes
             ff2mpv
+            keepassxc-browser
             ublock-origin
             umatrix
             zotero-connector
@@ -104,5 +99,4 @@ in
       };
     };
   };
-  };
 }

modules/graphical/pass/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.chvp.graphical.pass.enable = lib.mkOption {
@@ -7,19 +7,12 @@
   };
 
   config = lib.mkIf config.chvp.graphical.pass.enable {
-    nixpkgs.overlays = [
-      (self: super: {
-        pass = (super.pass.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
-      })
-    ];
-
     chvp.base.emacs.extraConfig = [
       ''
-        (use-package auth-source-pass
+        (use-package secrets
          :ensure nil
          :custom
-         (auth-sources '(password-store))
+         (auth-sources '(default))
-         (auth-source-pass-filename "${config.home-manager.users.charlotte.programs.password-store.settings.PASSWORD_STORE_DIR}")
          )
       ''
     ];
@@ -30,6 +23,7 @@
         settings = { PASSWORD_STORE_DIR = "/home/charlotte/repos/passwords"; };
       };
       services.password-store-sync.enable = true;
+      home.packages = [ pkgs.keepassxc ];
     };
   };
 }

patches/236258.patch

@@ -1,21 +0,0 @@
-diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
-index 83f34e2f066f5..ee774172f9122 100644
---- a/pkgs/tools/security/browserpass/default.nix
-+++ b/pkgs/tools/security/browserpass/default.nix
-@@ -4,6 +4,7 @@
- , fetchFromGitHub
- , gnupg
- , makeWrapper
-+, autoPatchelfHook
- }:
- 
- buildGoModule rec {
-@@ -17,7 +18,7 @@ buildGoModule rec {
-     sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
-   };
- 
--  nativeBuildInputs = [ makeWrapper ];
-+  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
- 
-   vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
-