diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix index 86ccdead..250359d8 100644 --- a/modules/programs/thunderbird.nix +++ b/modules/programs/thunderbird.nix @@ -32,7 +32,8 @@ let profilesIni = foldl recursiveUpdate { General = { StartWithLastProfile = 1; - Version = 2; + } // lib.optionalAttrs (cfg.profileVersion != null) { + Version = cfg.profileVersion; }; } (flip map profilesWithId (profile: { "Profile${profile.id}" = { @@ -145,6 +146,13 @@ in { 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 { type = with types; attrsOf (submodule ({ config, name, ... }: { @@ -360,13 +368,6 @@ in { this module to manage your accounts and profiles by setting 'programs.thunderbird.package' to a dummy value, for example using 'pkgs.runCommand'. - - Note that this module requires you to set the following environment - variables when using an installation of Thunderbird that is not provided - by Nix: - - export MOZ_LEGACY_PROFILES=1 - export MOZ_ALLOW_DOWNGRADE=1 ''; home.packages = [ cfg.package ]