uncommitted firefox changes

modules/user/modules/firefox/default.nix

@@ -120,31 +120,31 @@ in {
 
     package = pkgs.firefox-devedition.overrideAttrs (pkg: let
       entries = {
-        im-firefox = {
+        firefox-im = {
           name = "IMs (Firefox)";
           profile = "im";
           nomime = true;
           noremote = true;
         };
 
-        trusted = {
+        firefox-trusted = {
           name = "Trusted Firefox";
           profile = "trusted";
           nomime = true;
         };
 
-        work = {
+        firefox-work = {
           name = "Work Firefox";
           profile = "work";
           nomime = true;
         };
 
-        general = {
+        firefox-general = {
           name = "Firefox";
           profile = "general";
         };
 
-        schizo = {
+        firefox-schizo = {
           name = "Schizo Firefox";
           profile = "schizo";
           nomime = true;
@@ -168,6 +168,17 @@ in {
       buildCommand = ''
         ${pkg.buildCommand}
         rm $out/share/applications/*
+
+        cat <<EOF > $out/share/applications/firefox.desktop
+        [Desktop Entry]
+        Version=1.4
+        Type=Application
+        Name=Firefox
+        Icon=firefox-devedition
+        NoDisplay=true
+        EOF
+
+
       '' + lib.strings.concatMapStrings (item: "\ncp ${item}/share/applications/* $out/share/applications") items;
     });
 
@@ -176,8 +187,10 @@ in {
         inherit id settings name extensions;
         path = name;
         userChrome = ''
+          ${builtins.readFile ./hide_drm_nagbar_chrome.css}
           ${builtins.readFile ./sideberry_chrome.css}
           ${builtins.readFile ./sideberry_hide_ext_button.css}
+          ${builtins.readFile ./hide_content_borders.css}
         '';
       };
     in {

modules/user/modules/firefox/hide_content_borders.css

@@ -0,0 +1,7 @@
+#sidebar {
+	border-inline: none !important;
+}
+
+#navigator-toolbox {
+	border-bottom: none !important;
+}

modules/user/modules/firefox/hide_drm_nagbar_chrome.css

@@ -0,0 +1,3 @@
+notification[value="drmContentDisabled"] {
+	display: none !important;
+}

modules/user/modules/firefox/prefgroups.nix

@@ -51,7 +51,6 @@ rec {
         "signon.rememberSignons" = false;
       };
 
-      # UNTESTED
       disable-cross-origin-auth-dialogs = {
         "network.auth.subresource-http-auth-allow" = 1;
       };
@@ -96,20 +95,6 @@ rec {
         "browser.xul.error_pages.expert_bad_cert" = true;
       };
 
-      cross-origin = {
-        trimming = {
-          "network.http.referer.XOriginTrimmingPolicy" = 2;
-        };
-
-        same-host = {
-          "network.http.referer.XOriginPolicy" = 2;
-        };
-
-        same-domain = {
-          "network.http.referer.XOriginPolicy" = 1;
-        };
-      };
-
       # No real reason to ever have this enabled
       disable-uitour = {
         "browser.uitour.enabled" = false;
@@ -167,11 +152,15 @@ rec {
         # "privacy.antitracking.enableWebcompat" = false;
       };
 
-      # UNTESTED
       partition-serviceworkers = {
         "privacy.partition.serviceWorkers" = true;
       };
 
+      partition-storage = {
+        "privacy.partition.always_partition_third_party_non_cookie_storage" = true;
+        "privacy.partition.always_partition_third_party_non_cookie_storage.exempt_sessionstorage" = true;
+      };
+
       disable-system-ui = {
         "browser.display.use_system_colors" = false;
         "widget.non-native-theme.enabled" = true;
@@ -196,9 +185,13 @@ rec {
         "security.tls.version.enable-deprecated" = false;
         "extensions.webcompat-reporter.enabled" = false;
       };
+
       disable-js-jit = {
         "javascript.options.baselinejit" = false;
         "javascript.options.ion" = false;
+      };
+
+      disable-wasm = {
         "javascript.options.wasm" = false;
         "javascript.options.asmjs" = false;
       };
@@ -238,7 +231,7 @@ rec {
         "javascript.use_us_english_locale" = true;
       };
 
-        # Uses google analytics
+      # Uses google analytics
       disable-addon-reccomendation = {
         "extensions.getAddons.showPane" = false;
         "extensions.htmlaboutaddons.recommendations.enabled" = false;
@@ -388,10 +381,14 @@ rec {
         "privacy.resistFingerprinting.letterboxing" = true;
       };
 
-      # Can break login pages
-      # Correction: Breaks a lot of shit. A LOT of shit.
       disable-referrer-headers = {
-        "network.http.sendRefererHeader" = 0;
+        "network.http.sendRefererHeader" = 1; # send when clicking links but not bg loads
+        "network.http.referrer.XOriginTrimmingPolicy" = 1; # remove query string but send
+        "network.http.referrer.XOriginPolicy" = 1; # base domains must match
+      };
+
+      disable-referrer-strict = {
+        "network.http.sendRefererHeader" = 0; # never send
       };
     };
 
@@ -520,7 +517,6 @@ rec {
     // misc.disable-autoplay
     // misc.disable-window-manipulation
     // misc.limited-popups
-    // privacy.disable-accessability
     // privacy.disable-beacon
     // security.disable-uitour
     // security.disable-middlemouse-paste
@@ -555,6 +551,7 @@ rec {
 
     minor-2 = {}
     // security.disable-webgl
+    // privacy.ephemeral-cookies
     // privacy.sanitize-on-shutdown
     // security.disable-sessionrestore
     ;
@@ -562,12 +559,12 @@ rec {
     annoying = {}
     // privacy.resist-fingerprinting
     // security.disable-js-jit
+    // security.disable-wasm
     // privacy.webrtc.hide-ip-trusted
     // privacy.ephemeral-cookies
     // privacy.webrtc.disable
-    // security.cross-origin.trimming
-    // security.cross-origin.same-host
-    // privacy.disable-referrer-headers
+    // privacy.disable-referrer-strict
+    // privacy.disable-accessability
     ;
 
     trusted = {}
@@ -579,7 +576,6 @@ rec {
     // modules.base
     // modules.minor-1
     // modules.minor-2
-    // privacy.ephemeral-cookies
     // privacy.disable-referrer-headers
     // privacy.webrtc.disable
     ;

modules/user/modules/firefox/sideberry_chrome.css

@@ -3,16 +3,10 @@
   visibility: collapse;
 }
 
-#main-window[titlepreface*="​​​​​"] .titlebar-button {
-  height: 40px;
+#main-window[titlepreface*="​​​​​"] #TabsToolbar {
+	display: none;
 }
 
-#main-window[titlepreface*="​​​​​"] #nav-bar {
-  margin-top: -40px;
-}
-#main-window[titlepreface*="​​​​​"][tabsintitlebar="true"] #nav-bar {
-  margin-right: 137px;
-}
 #main-window[titlepreface*="​​​​​"] #titlebar-spacer {
   background-color: var(--chrome-secondary-background-color);
 }
@@ -43,8 +37,7 @@ See the above repository for updates as well as full license text. */
   min-width: var(--uc-sidebar-width) !important;
   width: var(--uc-sidebar-width) !important;
   max-width: var(--uc-sidebar-width) !important;
-  z-index:1;
-  margin-top: -1px;
+  z-index: 10000;
 }
 
 #sidebar-box[positionend] {