From a015e13171aca5aea139f7aafabd63e51e195373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 25 Apr 2023 18:20:49 +0200
Subject: [PATCH] feat(home): export mkConfig from firefox modules

---
 home/modules/firefox/common.nix      | 11 ++++++++---
 home/modules/firefox/tor-browser.nix |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/home/modules/firefox/common.nix b/home/modules/firefox/common.nix
index ea95bcf..7bc8e38 100644
--- a/home/modules/firefox/common.nix
+++ b/home/modules/firefox/common.nix
@@ -15,6 +15,11 @@ let
     else
       builtins.toJSON pref);
 
+  mkConfig = prefs:
+    concatStrings (mapAttrsToList (name: value: ''
+      user_pref("${name}", ${userPrefValue value});
+    '') prefs);
+
   mkUserJs = prefs: extraPrefs: bookmarks:
     let
       prefs' = lib.optionalAttrs ([ ] != bookmarks) {
@@ -24,9 +29,7 @@ let
     in ''
       // Generated by Home Manager.
 
-      ${concatStrings (mapAttrsToList (name: value: ''
-        user_pref("${name}", ${userPrefValue value});
-      '') prefs')}
+      ${mkConfig prefs'}
 
       ${extraPrefs}
     '';
@@ -80,6 +83,8 @@ let
       </p></DL>
     '';
 in {
+  inherit mkConfig;
+
   mkModule = browser:
     let
       cfg = config.programs.${browser.name};
diff --git a/home/modules/firefox/tor-browser.nix b/home/modules/firefox/tor-browser.nix
index c042787..3d0f525 100644
--- a/home/modules/firefox/tor-browser.nix
+++ b/home/modules/firefox/tor-browser.nix
@@ -4,7 +4,6 @@ let common = import ./common.nix { inherit config lib pkgs; };
 in common.mkModule {
   name = "tor-browser";
   displayName = "Tor Browser";
-  # @TODO is this correct?
   dataConfigPath = ".local/share/tor-browser/TorBrowser/Data/Browser";
   defaultPackage = pkgs.tor-browser-bundle-bin;
   defaultPackageName = "pkgs.tor-browser-bundle-bin";