felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(home): export mkConfig from firefox modules

Browse source
This commit is contained in:
Felix Schröter 2023-04-25 18:20:49 +02:00
parent 71bec5afc9
commit a015e13171
Signed by: felschr
GPG key ID: 671E39E6744C807D
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
home/modules/firefox/common.nix
View file

@ -15,6 +15,11 @@ let
else else
builtins.toJSON pref); builtins.toJSON pref);
mkConfig = prefs:
concatStrings (mapAttrsToList (name: value: ''
user_pref("${name}", ${userPrefValue value});
'') prefs);
mkUserJs = prefs: extraPrefs: bookmarks: mkUserJs = prefs: extraPrefs: bookmarks:
let let
prefs' = lib.optionalAttrs ([ ] != bookmarks) { prefs' = lib.optionalAttrs ([ ] != bookmarks) {
@ -24,9 +29,7 @@ let
in '' in ''
// Generated by Home Manager. // Generated by Home Manager.
${concatStrings (mapAttrsToList (name: value: '' ${mkConfig prefs'}
user_pref("${name}", ${userPrefValue value});
'') prefs')}
${extraPrefs} ${extraPrefs}
''; '';
@ -80,6 +83,8 @@ let
</p></DL> </p></DL>
''; '';
in { in {
inherit mkConfig;
mkModule = browser: mkModule = browser:
let let
cfg = config.programs.${browser.name}; cfg = config.programs.${browser.name};

1
home/modules/firefox/tor-browser.nix
View file

@ -4,7 +4,6 @@ let common = import ./common.nix { inherit config lib pkgs; };
in common.mkModule { in common.mkModule {
name = "tor-browser"; name = "tor-browser";
displayName = "Tor Browser"; displayName = "Tor Browser";
# @TODO is this correct?
dataConfigPath = ".local/share/tor-browser/TorBrowser/Data/Browser"; dataConfigPath = ".local/share/tor-browser/TorBrowser/Data/Browser";
defaultPackage = pkgs.tor-browser-bundle-bin; defaultPackage = pkgs.tor-browser-bundle-bin;
defaultPackageName = "pkgs.tor-browser-bundle-bin"; defaultPackageName = "pkgs.tor-browser-bundle-bin";