From ff575b88f8320f37cc84c68f8acf687b647902a0 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 21 Sep 2024 13:45:49 -0400
Subject: [PATCH] Revert "firefox: only add Version = 2 on non-darwin"

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 b5e09b85f22675923a61ef75e6e9188bd113a6e1.
---
 modules/programs/firefox/mkFirefoxModule.nix | 10 +---------
 modules/programs/thunderbird.nix             | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix
index 3f5bdd9e9..cfff826b6 100644
--- a/modules/programs/firefox/mkFirefoxModule.nix
+++ b/modules/programs/firefox/mkFirefoxModule.nix
@@ -62,8 +62,7 @@ let
     }) // {
       General = {
         StartWithLastProfile = 1;
-      } // lib.optionalAttrs (cfg.profileVersion == null) {
-        Version = cfg.profileVersion;
+        Version = 2;
       };
     };
 
@@ -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 {
       inherit visible;
       type = types.attrsOf (types.submodule ({ config, name, ... }: {
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index a5b91b3eb..ca132d44d 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -37,8 +37,7 @@ let
   profilesIni = foldl recursiveUpdate {
     General = {
       StartWithLastProfile = 1;
-    } // lib.optionalAttrs (cfg.profileVersion != null) {
-      Version = cfg.profileVersion;
+      Version = 2;
     };
   } (flip map profilesWithId (profile: {
     "Profile${profile.id}" = {
@@ -151,13 +150,6 @@ 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, ... }: {