From b840707a87f6a35a5c24ea6edf8846741d924616 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 24 May 2021 11:28:12 -0400
Subject: [PATCH] firefox: Always create profile directories

Write ".keep" file in profile dir for each profile regardless of any
other settings to creare profile dir.
---
 modules/programs/firefox.nix                        | 2 ++
 tests/modules/programs/firefox/profile-settings.nix | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 72f6b983c..d474f5b80 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -318,6 +318,8 @@ in
         };
       }]
       ++ flip mapAttrsToList cfg.profiles (_: profile: {
+        "${profilesPath}/${profile.path}/.keep".text = "";
+
         "${profilesPath}/${profile.path}/chrome/userChrome.css" =
           mkIf (profile.userChrome != "") {
             text = profile.userChrome;
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
index 8c5fb4ec1..b90fd9192 100644
--- a/tests/modules/programs/firefox/profile-settings.nix
+++ b/tests/modules/programs/firefox/profile-settings.nix
@@ -6,7 +6,12 @@ with lib;
   config = {
     programs.firefox = {
       enable = true;
-      profiles.test.settings = { "general.smoothScroll" = false; };
+      profiles.basic.isDefault = true;
+
+      profiles.test = {
+        id = 1;
+        settings = { "general.smoothScroll" = false; };
+      };
     };
 
     nixpkgs.overlays = [
@@ -28,6 +33,8 @@ with lib;
         home-path/bin/firefox \
         MOZ_APP_LAUNCHER
 
+      assertDirectoryExists home-files/.mozilla/firefox/basic
+
       assertFileContent \
         home-files/.mozilla/firefox/test/user.js \
         ${./profile-settings-expected-user.js}