firefox uiCustomizations in nixHEADmaster

2 files changed, 23 insertions, 2 deletions

diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index cca4a19..7c95e56 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -31,6 +31,28 @@
 		force = true;  # Overwrite old
 	};
 	userChrome = builtins.readFile ./resources/firefox/userChrome.css;
+	uiCustomization = {
+		placements = {
+			nav-bar = [
+				"back-button"
+				"forward-button"
+				"stop-reload-button"
+				"vertical-spacer"
+				"home-button"
+				"urlbar-container"
+				"downloads-button"
+				"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"  # Bitwarden
+				"unified-extensions-button"
+			];
+			TabsToolbar = [ "tabbrowser-tabs" "new-tab-button" ];
+			# Ensure these extensions go to overflow menu instead of nav-bar
+			unified-extensions-area = [
+				"ublock0_raymondhill_net-browser-action"
+				"sponsorblocker_ajay_app-browser-action"
+			];
+		};
+		currentVersion = 23;  # Required
+	};
 	arkenfox = {
 		enable = true;
 		enableAllSections = true;
@@ -41,7 +63,7 @@
 	};
 	settings = {
 		"browser.compactmode.show" = true;
-		"browser.uiCustomization.state" = builtins.readFile ./resources/firefox/uiCustomization.json;  # Toolbar etc.
+		"browser.uiCustomization.state" = builtins.toJSON uiCustomization;  # Toolbar etc.
 		"browser.uidensity" = 1;  # Compact
 		"toolkit.legacyUserProfileCustomizations.stylesheets" = true;  # userchrome
 
diff --git a/home-manager/resources/firefox/uiCustomization.json b/home-manager/resources/firefox/uiCustomization.json
deleted file mode 100644
index fa6684c..0000000
--- a/home-manager/resources/firefox/uiCustomization.json
+++ /dev/null
@@ -1 +0,0 @@
-{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["ublock0_raymondhill_net-browser-action","sponsorblocker_ajay_app-browser-action","_e6e36c9a-8323-446c-b720-a176017e38ff_-browser-action","dearrow_ajay_app-browser-action","idcac-pub_guus_ninja-browser-action","addon_darkreader_org-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","addon_fastforward_team-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","_aecec67f-0d10-4fa7-b7c7-609a2db280cf_-browser-action","_d07ccf11-c0cd-4938-a265-2a4d6ad01189_-browser-action","_7653b5cb-d76d-442f-a98f-f3c83a118cf4_-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","vertical-spacer","home-button","urlbar-container","downloads-button","unified-extensions-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"vertical-tabs":[],"PersonalToolbar":["personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","dearrow_ajay_app-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_e6e36c9a-8323-446c-b720-a176017e38ff_-browser-action","sponsorblocker_ajay_app-browser-action","ublock0_raymondhill_net-browser-action","idcac-pub_guus_ninja-browser-action","addon_darkreader_org-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","addon_fastforward_team-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","_aecec67f-0d10-4fa7-b7c7-609a2db280cf_-browser-action","_d07ccf11-c0cd-4938-a265-2a4d6ad01189_-browser-action","_7653b5cb-d76d-442f-a98f-f3c83a118cf4_-browser-action","screenshot-button"],"dirtyAreaCache":["nav-bar","PersonalToolbar","unified-extensions-area","toolbar-menubar","TabsToolbar","vertical-tabs"],"currentVersion":23,"newElementCount":8}