update was needed

3 files changed, 187 insertions, 199 deletions

diff --git a/common/programs/firefox.nix b/common/programs/firefox.nix
index d393131..77d1b2e 100644
--- a/common/programs/firefox.nix
+++ b/common/programs/firefox.nix
@@ -6,57 +6,57 @@
 }:
 {
   programs.firefox = {
-    enable = false;
+    enable = true;
     package = pkgs.librewolf;
 
     policies = {
-      DisableTelemetry = true;
-      BlockAboutConfig = false;
-      DisableFirefoxAccounts = true;
-      DisablePocket = true;
-      DisableSetDesktopBackground = true;
-      DisableSystemAddonUpdate = true;
-      AutofillCreditCardEnabled = false;
-      AutofillAddressEnabled = false;
-      DisableFirefoxScreenshots = true;
-      DisableMasterPasswordCreation = true;
-      DontCheckDefaultBrowser = true;
-      NoDefaultBookmarks = true;
-      OfferToSaveLogins = false;
-      UserMessaging = {
-        WhatsNew = false;
-        ExtensionRecommendations = false;
-        FeatureRecommendations = false;
-        UrlbarInterventions = false;
-        SkipOnboarding = true;
-        MoreFromMozilla = false;
-        Locked = true;
-      };
-      FirefoxHome = {
-        Search = false;
-        TopSites = false;
-        SponsoredTopSites = false;
-        Highlights = false;
-        Pocket = false;
-        Stories = false;
-        SponsoredPocket = false;
-        SponsoredStories = false;
-        Snippets = false;
-        Locked = true;
-      };
-      FirefoxSuggest = {
-        WebSuggestions = false;
-        SponsoredSuggestions = false;
-        ImproveSuggest = false;
-        Locked = true;
-      };
+      # DisableTelemetry = true;
+      # BlockAboutConfig = false;
+      # DisableFirefoxAccounts = true;
+      # DisablePocket = true;
+      # DisableSetDesktopBackground = true;
+      # DisableSystemAddonUpdate = true;
+      # AutofillCreditCardEnabled = false;
+      # AutofillAddressEnabled = false;
+      # DisableFirefoxScreenshots = true;
+      # DisableMasterPasswordCreation = true;
+      # DontCheckDefaultBrowser = true;
+      # NoDefaultBookmarks = true;
+      # OfferToSaveLogins = false;
+      # UserMessaging = {
+      #   WhatsNew = false;
+      #   ExtensionRecommendations = false;
+      #   FeatureRecommendations = false;
+      #   UrlbarInterventions = false;
+      #   SkipOnboarding = true;
+      #   MoreFromMozilla = false;
+      #   Locked = true;
+      # };
+      # FirefoxHome = {
+      #   Search = false;
+      #   TopSites = false;
+      #   SponsoredTopSites = false;
+      #   Highlights = false;
+      #   Pocket = false;
+      #   Stories = false;
+      #   SponsoredPocket = false;
+      #   SponsoredStories = false;
+      #   Snippets = false;
+      #   Locked = true;
+      # };
+      # FirefoxSuggest = {
+      #   WebSuggestions = false;
+      #   SponsoredSuggestions = false;
+      #   ImproveSuggest = false;
+      #   Locked = true;
+      # };
       ExtensionSettings = {
-        "uBlock0@raymondhill.net" = {
-          default_area = "menupanel";
-          installation_mode = "force_installed";
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          private_browsing = true;
-        };
+        # "uBlock0@raymondhill.net" = {
+        #   default_area = "menupanel";
+        #   installation_mode = "force_installed";
+        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+        #   private_browsing = true;
+        # };
         "addon@darkreader.org" = {
           default_area = "menupanel";
           installation_mode = "force_installed";
@@ -68,16 +68,9 @@
 
     profiles.default = {
       settings = {
-        "browser.sessionstore.max_tabs_undo" = 0;
-        "browser.sessionstore.max_windows_undo" = 0;
-
-        # "browser.startup.page" = 1; # Blank page
-        # "browser.newtabpage.enabled" = false;
-
         "privacy.trackingprotection.enabled" = true;
         "privacy.trackingprotection.socialtracking.enabled" = true;
         "privacy.globalprivacycontrol.enabled" = true;
-        "network.cookie.cookieBehavior" = 2; # Block all cookies
         "browser.contentblocking.category" = "strict";
 
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
@@ -88,62 +81,56 @@
         # Performance
         "gfx.webrender.all" = true; # Enable WebRender
         "layers.acceleration.enabled" = true;
-        "browser.cache.disk.enable" = false; # Disable disk cache
-        "browser.cache.memory.enable" = true; # Use memory cache
-        "browser.cache.memory.capacity" = 1048576; # 1gb memory cache
-        "browser.preferences.defaultPerformanceSettings.enabled" = false;
+        # "browser.cache.disk.enable" = false; # Disable disk cache
+        # "browser.cache.memory.enable" = true; # Use memory cache
+        # "browser.cache.memory.capacity" = 1048576; # 1gb memory cache
+        # "browser.preferences.defaultPerformanceSettings.enabled" = false;
         "media.hardware-video-decoding.force-enabled" = true;
         "media.hardware-video-decoding.enabled" = true;
         "browser.tabs.unloadOnLowMemory" = true;
         "browser.low_commit_space_threshold_percent" = 100;
         "browser.tabs.min_inactive_duration_before_unload" = 3600000;
+        "gfx.webrender.all" = true;
+        "gfx.webrender.compositor" = true;
+        "gfx.x11-egl.force-enabled" = true;
+        "layers.acceleration.force-enabled" = true;
+        "media.ffmpeg.vaapi.enabled" = true;
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
 
         # Disable unnecessary features
-        "browser.aboutwelcome.enabled" = false;
-        "browser.discovery.enabled" = false;
-        "browser.onboarding.enabled" = false;
+        # "browser.aboutwelcome.enabled" = false;
+        # "browser.discovery.enabled" = false;
+        # "browser.onboarding.enabled" = false;
 
         "browser.tabs.inTitlebar" = 0;
         "browser.toolbars.bookmarks.visibility" = "never";
         "widget.use-xdg-desktop-portal.file-picker" = 1;
       };
 
-      search = {
-        force = true;
-        default = "ddg";
-        engines = {
-          duck-duck-go = {
-            name = "DuckDuckGo";
-            urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ];
-            iconMapObj."16" = "https://duckduckgo.com/favicon.ico";
-            definedAliases = [ ":ddg" ];
-          };
-          startpage = {
-            name = "Startpage";
-            urls = [ { template = "https://www.startpage.com/do/search?query={searchTerms}"; } ];
-            iconMapObj."16" = "https://www.startpage.com/favicon.ico";
-            definedAliases = [ ":sp" ];
-          };
-          nixos-packages = {
-            name = "NixOS Packages";
-            urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
-            iconMapObj."16" = "https://nixos.org/favicon.ico";
-            definedAliases = [ ":n" ];
-          };
-          nixos-wiki = {
-            name = "NixOS Wiki";
-            urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
-            iconMapObj."16" = "https://wiki.nixos.org/favicon.ico";
-            definedAliases = [ ":nw" ];
-          };
-          amazon.metaData.hidden = true;
-          ebay.metaData.hidden = true;
-          perplexity.metaData.hidden = true;
-
-          google.metaData.alias = ":g";
-          bing.metaData.alias = ":b";
-        };
-      };
+      # search = {
+      #   force = true;
+      #   default = "ddg";
+      #   engines = {
+      #     nixos-packages = {
+      #       name = "NixOS Packages";
+      #       urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
+      #       iconMapObj."16" = "https://nixos.org/favicon.ico";
+      #       definedAliases = [ ":n" ];
+      #     };
+      #     nixos-wiki = {
+      #       name = "NixOS Wiki";
+      #       urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
+      #       iconMapObj."16" = "https://wiki.nixos.org/favicon.ico";
+      #       definedAliases = [ ":nw" ];
+      #     };
+      #     amazon.metaData.hidden = true;
+      #     ebay.metaData.hidden = true;
+      #     perplexity.metaData.hidden = true;
+      #
+      #     google.metaData.alias = ":g";
+      #     bing.metaData.alias = ":b";
+      #   };
+      # };
     };
   };
 }
diff --git a/common/programs/fish.nix b/common/programs/fish.nix
index 8814a12..e45182a 100644
--- a/common/programs/fish.nix
+++ b/common/programs/fish.nix
@@ -3,7 +3,7 @@
   ...
 }:
 {
-  programs.fish.enable = true;
+  programs.fish.enable = false;
 
   home.packages = with pkgs; [
     fzf
diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix
index 3c24a0d..99f7723 100644
--- a/common/programs/zenBrowser.nix
+++ b/common/programs/zenBrowser.nix
@@ -1,8 +1,8 @@
 {
-  inputs,
-  pkgs,
-  lib,
-  ...
+inputs,
+pkgs,
+lib,
+...
 }:
 let
   extension = shortId: guid: {
@@ -36,121 +36,122 @@ let
     (extension "darkreader" "addon@darkreader.org")
   ];
 in
-{
-  home.packages = [
-    (pkgs.wrapFirefox
-      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped
-      {
-        extraPrefs = lib.concatLines (
-          lib.mapAttrsToList (
-            name: value: "lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});"
-          ) prefs
-        );
+  {
+  config = lib.mkIf !config.programs.firefox.enable {
+    home.packages = [
+      (pkgs.wrapFirefox
+        inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped
+        {
+          extraPrefs = lib.concatLines (
+            lib.mapAttrsToList (
+              name: value: "lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});"
+            ) prefs
+          );
 
-        extraPolicies = {
-          DisableTelemetry = true;
-          AutofillAddressEnabled = true;
-          AutofillCreditCardEnabled = false;
-          DisableAppUpdate = true;
-          DisableFeedbackCommands = true;
-          DisableFirefoxStudies = true;
-          DisablePocket = true;
-          DontCheckDefaultBrowser = true;
-          NoDefaultBookmarks = true;
-          DisableFirefoxScreenshots = true;
-          OfferToSaveLogins = false;
-          EnableTrackingProtection = {
-            Value = true;
-            Locked = true;
-            Cryptomining = true;
-            Fingerprinting = true;
-          };
-          DNSOverHTTPS = {
-            Enabled = true;
-            ProviderURL = "https://dns.quad9.net/dns-query";
-            Locked = true;
-            Fallback = true;
-          };
+          extraPolicies = {
+            DisableTelemetry = true;
+            AutofillAddressEnabled = true;
+            AutofillCreditCardEnabled = false;
+            DisableAppUpdate = true;
+            DisableFeedbackCommands = true;
+            DisableFirefoxStudies = true;
+            DisablePocket = true;
+            DontCheckDefaultBrowser = true;
+            NoDefaultBookmarks = true;
+            DisableFirefoxScreenshots = true;
+            OfferToSaveLogins = false;
+            EnableTrackingProtection = {
+              Value = true;
+              Locked = true;
+              Cryptomining = true;
+              Fingerprinting = true;
+            };
+            DNSOverHTTPS = {
+              Enabled = true;
+              ProviderURL = "https://dns.quad9.net/dns-query";
+              Locked = true;
+              Fallback = true;
+            };
 
-          ExtensionSettings = builtins.listToAttrs extensions;
+            ExtensionSettings = builtins.listToAttrs extensions;
 
-          SearchEngines = {
-            Default = "DuckDuckGo";
-            # Default = "Omnisearch";
-            PreventInstalls = true;
-            Remove = [
-              "Google"
-              "Bing"
-            ];
-            Add = [
-              # {
-              #   Name = "Omnisearch";
-              #   URLTemplate = "http://localhost:8087/search?q={searchTerms}";
-              #   IconURL = "http://localhost:8087/static/favicon.ico";
-              #   Alias = ":o";
-              # }
-              {
-                Name = "nixpkgs packages";
-                URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
-                IconURL = "https://wiki.nixos.org/favicon.ico";
-                Alias = ":np";
-              }
-              {
-                Name = "NixOS options";
-                URLTemplate = "https://search.nixos.org/options?query={searchTerms}";
-                IconURL = "https://wiki.nixos.org/favicon.ico";
-                Alias = ":no";
-              }
-              {
-                Name = "NixOS Wiki";
-                URLTemplate = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
-                IconURL = "https://wiki.nixos.org/favicon.ico";
-                Alias = ":nw";
-              }
-              {
-                Name = "noogle";
-                URLTemplate = "https://noogle.dev/q?term={searchTerms}";
-                IconURL = "https://noogle.dev/favicon.ico";
-                Alias = ":ng";
-              }
-            ];
+            SearchEngines = {
+              Default = "DuckDuckGo";
+              # Default = "Omnisearch";
+              PreventInstalls = true;
+              Remove = [
+                "Google"
+                "Bing"
+              ];
+              Add = [
+                # {
+                #   Name = "Omnisearch";
+                #   URLTemplate = "http://localhost:8087/search?q={searchTerms}";
+                #   IconURL = "http://localhost:8087/static/favicon.ico";
+                #   Alias = ":o";
+                # }
+                {
+                  Name = "nixpkgs packages";
+                  URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                  IconURL = "https://wiki.nixos.org/favicon.ico";
+                  Alias = ":np";
+                }
+                {
+                  Name = "NixOS options";
+                  URLTemplate = "https://search.nixos.org/options?query={searchTerms}";
+                  IconURL = "https://wiki.nixos.org/favicon.ico";
+                  Alias = ":no";
+                }
+                {
+                  Name = "NixOS Wiki";
+                  URLTemplate = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
+                  IconURL = "https://wiki.nixos.org/favicon.ico";
+                  Alias = ":nw";
+                }
+                {
+                  Name = "noogle";
+                  URLTemplate = "https://noogle.dev/q?term={searchTerms}";
+                  IconURL = "https://noogle.dev/favicon.ico";
+                  Alias = ":ng";
+                }
+              ];
+            };
           };
-        };
-      }
-    )
-  ];
+        }
+      )
+    ];
 
-  xdg.configFile = {
-    "userContent.css" = {
-      enable = false;
-      text =
-        # css
-        ''
+    xdg.configFile = {
+      "userContent.css" = {
+        enable = false;
+        text =
+          # css
+          ''
           img, canvas, video, .avatar, 
           [class*="avatar"], 
           [class*="ProfileAvatar"],
           [style*="border-radius"] {
-              border-radius: 0 !important;
-              clip-path: none !important;
-              mask-image: none !important;
-              -webkit-mask-image: none !important;
+            border-radius: 0 !important;
+            clip-path: none !important;
+            mask-image: none !important;
+            -webkit-mask-image: none !important;
           }
 
           /* 2. Reset standard rounding on all elements EXCEPT SVGs */
           :not(svg):not(circle):not(ellipse):not(path) {
-              border-radius: 0 !important;
+            border-radius: 0 !important;
           }
 
           /* 3. Handle variables that usually affect containers/images */
           :root {
-              --border-radius: 0px !important;
-              --radius: 0px !important;
-              --rounded-corner: 0px !important;
-              --avatar-radius: 0px !important;
-              --pfp-radius: 0px !important;
+            --border-radius: 0px !important;
+            --radius: 0px !important;
+            --rounded-corner: 0px !important;
+            --avatar-radius: 0px !important;
+            --pfp-radius: 0px !important;
           }
-        '';
+          '';
+      };
     };
   };
-
 }