eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2025-02-07 00:35:04 +01:00
Code Issues Releases Wiki Activity

Revert "firefox: only add Version = 2 on non-darwin"

Browse source 
launchd module now creates a service that will initialize gui app
environment with sessionVariables injected by modules. Firefox module
will inject MOZ_* variables needed to handle Version=2 in the
profiles.ini config now. This makes special handling for darwin here
unnecessary.

This reverts commit b5e09b85f2.
This commit is contained in:
Ihar Hrachyshka 2024-09-21 13:45:49 -04:00
parent 8bfa7b024b
commit ff575b88f8
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,8 +62,7 @@ let
}) // { }) // {
General = { General = {
StartWithLastProfile = 1; StartWithLastProfile = 1;
} // lib.optionalAttrs (cfg.profileVersion == null) { Version = 2;
Version = cfg.profileVersion;
}; };
}; };
@ -344,13 +343,6 @@ in {
}; };
}); });
profileVersion = mkOption {
internal = true;
type = types.nullOr types.ints.unsigned;
default = if isDarwin then null else 2;
description = "profile version, set null for nix-darwin";
};
profiles = mkOption { profiles = mkOption {
inherit visible; inherit visible;
type = types.attrsOf (types.submodule ({ config, name, ... }: { type = types.attrsOf (types.submodule ({ config, name, ... }: {

10
modules/programs/thunderbird.nix
View file

@ -37,8 +37,7 @@ let
profilesIni = foldl recursiveUpdate { profilesIni = foldl recursiveUpdate {
General = { General = {
StartWithLastProfile = 1; StartWithLastProfile = 1;
} // lib.optionalAttrs (cfg.profileVersion != null) { Version = 2;
Version = cfg.profileVersion;
}; };
} (flip map profilesWithId (profile: { } (flip map profilesWithId (profile: {
"Profile${profile.id}" = { "Profile${profile.id}" = {
@ -151,13 +150,6 @@ in {
description = "The Thunderbird package to use."; description = "The Thunderbird package to use.";
}; };
profileVersion = mkOption {
internal = true;
type = types.nullOr types.ints.unsigned;
default = if isDarwin then null else 2;
description = "profile version, set null for nix-darwin";
};
profiles = mkOption { profiles = mkOption {
type = with types; type = with types;
attrsOf (submodule ({ config, name, ... }: { attrsOf (submodule ({ config, name, ... }: {