From 1756bb07cb00812661c75369b38153dd6d3d7661 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 9 Aug 2024 03:36:36 -0500
Subject: [PATCH] Fix ff crash on Jude

---
 home/modules/gui.nix      | 13 +++++--------
 modules/nixos/default.nix |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/home/modules/gui.nix b/home/modules/gui.nix
index c57a9bf..0dc0d18 100644
--- a/home/modules/gui.nix
+++ b/home/modules/gui.nix
@@ -8,12 +8,9 @@ let
 	);
 
 	# For now, we ignore this and don't install it
-	ffPkgs = if ( pkgs.stdenv.hostPlatform.isDarwin )
-		then pkgs.firefox-bin
-		else pkgs.firefox-wayland.override { cfg.enableGnomeExtensions = true; };
+	ffPkgs = pkgs.firefox.override { cfg.enableGnomeExtensions = true; };
 
 	vars = {
-		MOZ_ENABLE_WAYLAND = "1";
 		XDG_CURRENT_DESKTOP = "GNOME";
 	};
 in {
@@ -56,9 +53,12 @@ in {
 
 		programs.firefox = {
 			enable = (! pkgs.stdenv.hostPlatform.isDarwin);
-			#package = ffPkgs;
+			package = ffPkgs;
 			profiles = {
 				default = {
+					isDefault = true;
+					id = 0;
+					search.default = "DuckDuckGo";
 					settings = {
 						"app.update.auto" = false;
 						"browser.ctrlTab.sortByRecentlyUsed" = true;
@@ -70,16 +70,13 @@ in {
 					};
 					extensions = with pkgs.nur.repos.rycee.firefox-addons; [
 						bitwarden
-						#bypass-paywalls-clean
 						gsconnect
 						foxyproxy-standard
 						multi-account-containers
-						plasma-integration
 						octotree
 						refined-github
 						tree-style-tab
 						ublock-origin
-						unpaywall
 					];
 				};
 			};
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 62b89a6..103892f 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -20,6 +20,7 @@
 		./vmdev.nix
 	];
 
+	environment.sessionVariables.MOZ_ENABLE_WAYLAND = "0";
 	environment.systemPackages = with pkgs; [
 		coreutils-full
 		efibootmgr