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

mkFirefoxModule: revert userChrome changes (#6887)

Browse source 
Reverting all the recent userChrome changes because of too many issues
and bikeshedding.
This commit is contained in:
Austin Horstman 2025-04-22 18:44:48 -07:00 • committed by GitHub
parent b99e3e46b8
commit c42f04c83f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/programs/firefox/mkFirefoxModule.nix
View file

@ -397,19 +397,12 @@ in
};
userChrome = mkOption {
type = types.nullOr (
types.oneOf [
types.lines
types.path
]
);
default = null;
description = ''
Custom ${appName} user chrome CSS.
This can be a path to a file or directory in the Nix store,
or a derivation, or a verbatim multi-line string.
'';
type = types.oneOf [
types.lines
types.path
];
default = "";
description = "Custom ${appName} user chrome CSS.";
example = ''
/* Hide tab bar in FF Quantum */
@-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) {
@ -868,35 +861,21 @@ in
]
++ lib.flip mapAttrsToList cfg.profiles (
_: profile:
let
chromePath =
if ((i: (lib.isPath i && lib.pathIsDirectory i) || lib.isDerivation i) profile.userChrome) then
"chrome"
else
"chrome/userChrome.css";
sourcePath =
if ((i: (lib.isPath i && lib.types.path.check i) || lib.isDerivation i) profile.userChrome) then
profile.userChrome
else
null;
in
# Merge the regular profile settings with extension settings
mkMerge (
[
(mkIf (profile.userChrome != null) {
"${profilesPath}/${profile.path}/${chromePath}" =
if sourcePath == null then
{
text = profile.userChrome;
}
else
{
source = sourcePath;
};
})
{
"${profilesPath}/${profile.path}/.keep".text = "";
"${profilesPath}/${profile.path}/chrome/userChrome.css" = mkIf (profile.userChrome != "") (
let
key = if builtins.isString profile.userChrome then "text" else "source";
in
{
"${key}" = profile.userChrome;
}
);
"${profilesPath}/${profile.path}/chrome/userContent.css" = mkIf (profile.userContent != "") (
let
key = if builtins.isString profile.userContent then "text" else "source";