From e93552623309fe0487e89a9682755f2f69577582 Mon Sep 17 00:00:00 2001 From: caem Date: Sat, 25 Jan 2025 02:33:52 +0100 Subject: [PATCH] wait can I just do this --- modules/home/caem/multimedia/web/firefox.nix | 70 +------------------- modules/nixos/multimedia/web/firefox.nix | 66 +++++++++++++++++- 2 files changed, 67 insertions(+), 69 deletions(-) diff --git a/modules/home/caem/multimedia/web/firefox.nix b/modules/home/caem/multimedia/web/firefox.nix index 8df9172..d8147ea 100644 --- a/modules/home/caem/multimedia/web/firefox.nix +++ b/modules/home/caem/multimedia/web/firefox.nix @@ -1,71 +1,5 @@ -{ config, ... }: +{ ... }: { - home.file."${config.xdg.configHome}/mozilla/firefox/policies/policies.json" = { - text = '' - { - "policies": { - "EnableTrackingProtection": { - "Value": true, - "Cryptomining": true, - "Fingerprinting": true, - "EmailTracking": true, - "Level": "strict" - }, - "DisableTelemetry": true, - "DisablePocket": true, - "DisableFirefoxStudies": true, - "DisableFirefoxAccounts": false, - "DisableAccounts": false, - "DontCheckDefaultBrowser": true, - "OverrideFirstRunPage": "", - "OverridePostUpdatePage": "", - "NoDefaultBookmarks": true, - "Cookies": { - "Behavior": "reject-foreign", - "BehaviorPrivateBrowsing": "reject-foreign" - }, - "UserMessaging": { - "WhatsNew": false, - "ExtensionRecommendations": false, - "FeatureRecommendations": false, - "UrlbarInterventions": false, - "SkipOnboarding": true, - "MoreFromMozilla": false - }, - "FirefoxHome": { - "Search": true, - "TopSites": true, - "SponsoredTopSites": false, - "Highlights": false, - "Pocket": false, - "SponsoredPocket": false, - "Snippets": false, - "Locked": true - }, - "SearchSuggestEnabled": false, - "ShowSearchSuggestionsFirst": false, - "NewTabPage": false, - "SearchEngines": { - "Add": [ - { - "Name": "Kagi", - "URLTemplate": "https://kagi.com/search?q={searchTerms}", - "Method": "GET", - "IconURL": "https://kagi.com/favicon.ico", - "Alias": "@k", - "Default": true - } - ], - "Remove": [ - "Bing", - "Google", - "DuckDuckGo", - "Wikipedia (en)" - ] - } - } - } - ''; - }; + } diff --git a/modules/nixos/multimedia/web/firefox.nix b/modules/nixos/multimedia/web/firefox.nix index dca700b..f161df1 100644 --- a/modules/nixos/multimedia/web/firefox.nix +++ b/modules/nixos/multimedia/web/firefox.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - firefox-esr + tor-browser ]; environment.persistence."/nix/config" = { @@ -10,4 +10,68 @@ ".config/mozilla" ]; }; + + programs.firefox = { + enable = true; + policies = { + EnableTrackingProtection = { + Value = true; + Cryptomining = true; + Fingerprinting = true; + EmailTracking = true; + Level = "strict"; + }; + DisableTelemetry = true; + DisablePocket = true; + DisableFirefoxStudies = true; + DisableFirefoxAccounts = false; + DisableAccounts = false; + DontCheckDefaultBrowser = true; + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + NoDefaultBookmarks = true; + Cookies = { + Behaviour = "reject-foreign"; + BehaviourPrivateBrowsing = "reject-foreign"; + }; + + UserMessaging = { + WhatsNew = false; + ExtensionRecommendations = false; + FeatureRecommendations = false; + UrlbarInterventions = false; + SkipOnboarding = true; + MoreFromMozilla = false; + }; + + FirefoxHome = { + Search = true; + TopSites = true; + SponsoredTopSites = false; + Highlights = false; + Pocket = false; + SponsoredPocket = false; + Snippets = false; + Locked = true; + }; + + SearchSuggestEnabled = false; + ShowSearchSuggestionsFirst = false; + NewTabPage = false; + + SearchEngines = { # ESR only + Add = [ + { + Name = "Kagi"; + URLTemplate = "https://kagi.com/search?q={searchTerms}"; + Method = "GET"; + IconURL = "https://kagi.com/favicon.ico"; + Alias = "@k"; + Default = true; + } + ]; + Remove = [ "Bing" "Google" "DuckDuckGo" "Wikipedia (en)" ]; + }; + }; + }; }