From 3359426c486b96aa3a3f2bff7874adf6e6f6739d Mon Sep 17 00:00:00 2001
From: hektor <hektor.misplon@pm.me>
Date: Tue, 3 Feb 2026 19:40:35 +0100
Subject: [PATCH] fix: integrate keepassxc browser on all firefox-based
 browsers

---
 home/modules/browser/firefox-base.nix | 15 +++++++++++----
 home/modules/browser/firefox.nix      | 10 ++++++++--
 home/modules/browser/librewolf.nix    | 10 ++++++++--
 home/modules/keepassxc.nix            |  1 -
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/home/modules/browser/firefox-base.nix b/home/modules/browser/firefox-base.nix
index cbd409f..048909b 100644
--- a/home/modules/browser/firefox-base.nix
+++ b/home/modules/browser/firefox-base.nix
@@ -1,13 +1,20 @@
-{ inputs, pkgs }:
+{
+  config,
+  inputs,
+  pkgs,
+}:
 
 let
   bookmarks = import ./bookmarks.nix;
 in
 
 {
-  nativeMessagingHosts = with pkgs; [
-    tridactyl-native
-  ];
+  nativeMessagingHosts =
+    with pkgs;
+    [
+      tridactyl-native
+    ]
+    ++ lib.optionals config.programs.keepassxc.enable [ keepassxc ];
   profiles = {
     default = {
       settings = {
diff --git a/home/modules/browser/firefox.nix b/home/modules/browser/firefox.nix
index f547144..87444b6 100644
--- a/home/modules/browser/firefox.nix
+++ b/home/modules/browser/firefox.nix
@@ -1,10 +1,16 @@
-{ config, lib, inputs, pkgs, ... }:
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
 
 {
   config = lib.mkIf (config.browser.primary == "firefox" || config.browser.secondary == "firefox") {
     programs.firefox = {
       enable = true;
     }
-    // (import ./firefox-base.nix { inherit inputs pkgs; });
+    // (import ./firefox-base.nix { inherit config inputs pkgs; });
   };
 }
diff --git a/home/modules/browser/librewolf.nix b/home/modules/browser/librewolf.nix
index 523fe85..c77066b 100644
--- a/home/modules/browser/librewolf.nix
+++ b/home/modules/browser/librewolf.nix
@@ -1,4 +1,10 @@
-{ config, lib, inputs, pkgs, ... }:
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
 
 {
   config =
@@ -7,6 +13,6 @@
         programs.librewolf = {
           enable = true;
         }
-        // (import ./firefox-base.nix { inherit inputs pkgs; });
+        // (import ./firefox-base.nix { inherit config inputs pkgs; });
       };
 }
diff --git a/home/modules/keepassxc.nix b/home/modules/keepassxc.nix
index f8259d2..8150a83 100644
--- a/home/modules/keepassxc.nix
+++ b/home/modules/keepassxc.nix
@@ -7,5 +7,4 @@
       Browser.Enabled = true;
     };
   };
-  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file $HOME/.config/keepassxc/keepassxc.ini' error
 }