Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

firefox: Support paths for userChrome & userContent

Browse source 
A path may be preferred for some uses, and allowing it avoids the user
needing to `builtins.readFile`, thus creating duplicates and making it
more difficult to determine the actual store path.
This commit is contained in:
Andrew Marshall 2023-04-07 12:56:00 -04:00
parent b00d0e4fe9
commit 7284e905a3
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/programs/firefox.nix
View file

@ -343,7 +343,7 @@ in {
}; };
userChrome = mkOption { userChrome = mkOption {
type = types.lines; type = types.oneOf [ types.lines types.path ];
default = ""; default = "";
description = "Custom Firefox user chrome CSS."; description = "Custom Firefox user chrome CSS.";
example = '' example = ''
@ -362,7 +362,7 @@ in {
}; };
userContent = mkOption { userContent = mkOption {
type = types.lines; type = types.oneOf [ types.lines types.path ];
default = ""; default = "";
description = "Custom Firefox user content CSS."; description = "Custom Firefox user content CSS.";
example = '' example = ''
@ -749,10 +749,16 @@ in {
"${profilesPath}/${profile.path}/.keep".text = ""; "${profilesPath}/${profile.path}/.keep".text = "";
"${profilesPath}/${profile.path}/chrome/userChrome.css" = "${profilesPath}/${profile.path}/chrome/userChrome.css" =
mkIf (profile.userChrome != "") { text = profile.userChrome; }; mkIf (profile.userChrome != "") (let
key =
if builtins.isString profile.userChrome then "text" else "source";
in { "${key}" = profile.userChrome; });
"${profilesPath}/${profile.path}/chrome/userContent.css" = "${profilesPath}/${profile.path}/chrome/userContent.css" =
mkIf (profile.userContent != "") { text = profile.userContent; }; mkIf (profile.userContent != "") (let
key =
if builtins.isString profile.userContent then "text" else "source";
in { "${key}" = profile.userContent; });
"${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { } "${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { }
|| profile.extraConfig != "" || profile.bookmarks != [ ]) { || profile.extraConfig != "" || profile.bookmarks != [ ]) {