From 76b34bb277ed3555b96c848d17dae2f49646b898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 1 Feb 2026 00:27:27 +0100 Subject: [PATCH] tree-wide: remove zen-browser npins: remove zen-browser The fucked up https://github.com/zen-browser/desktop/discussions/12025 --- nix/configurations/vanadium.nix | 5 - .../vanadium/home/zen-browser.nix | 166 ------------------ nix/homeModules/common/firefox.nix | 2 +- nix/homeModules/common/zen-browser.nix | 68 ------- npins/sources.json | 13 -- 5 files changed, 1 insertion(+), 253 deletions(-) delete mode 100644 nix/configurations/vanadium/home/zen-browser.nix delete mode 100644 nix/homeModules/common/zen-browser.nix diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 6be7ec17..ac6cd805 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -150,7 +150,6 @@ in ./vanadium/home/misc.nix ./vanadium/home/gtk.nix - ./vanadium/home/zen-browser.nix ./vanadium/home/firefox.nix ./vanadium/home/xmobar.nix @@ -169,7 +168,6 @@ in ../homeModules/common/atuin.nix ../homeModules/common/direnv.nix ../homeModules/common/feh.nix - ../homeModules/common/zen-browser.nix ../homeModules/common/firefox.nix ../homeModules/common/fzf.nix ../homeModules/common/git.nix @@ -191,9 +189,6 @@ in # (sources.agenix + "/modules/age-home.nix") sources.wired-notify.asFlake.homeManagerModules.default - - # non official one uses reuploaded artifacts, are they audited? - sources.zen-browser.asFlake.homeModules.beta ]; } diff --git a/nix/configurations/vanadium/home/zen-browser.nix b/nix/configurations/vanadium/home/zen-browser.nix deleted file mode 100644 index 0e2ecd9f..00000000 --- a/nix/configurations/vanadium/home/zen-browser.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ - pkgs, - config, - ... -}: -let - inherit (pkgs) nur; -in -{ - programs.zen-browser = { - enable = false; - - policies.SearchEngines.Add = [ - # Forges - { - Name = "GitHub"; - Alias = "@gh"; - IconURL = "https://github.com/favicon.ico"; - Description = "Your code yum yum"; - URLTemplate = "https://github.com/search?q={searchTerms}&type=repositories"; - } - { - Name = "GitHub (Code Search)"; - Alias = "@ghc"; - IconURL = "https://github.com/favicon.ico"; - Description = "Your code yum yum"; - URLTemplate = "https://github.com/search?q={searchTerms}&type=code"; - } - { - Name = "Codeberg"; - Alias = "@cb"; - IconURL = "https://codeberg.org/favicon.ico"; - Description = "Software development, but free!"; - URLTemplate = "https://codeberg.org/explore/repos?q={searchTerms}"; - } - { - Name = "?C"; - Alias = "@cc"; - IconURL = "https://git.confusedcompiler.org/favicon.ico"; - URLTemplate = "https://git.confusedcompiler.org/explore/repos?q={searchTerms}"; - } - - # Nix{,OS,pkgs} - { - Name = "NixOS Search (Package)"; - Alias = "@np"; - IconURL = "https://nixos.org/favicon.ico"; - Description = "Search in nixpkgs"; - URLTemplate = "https://search.nixos.org/packages?query={searchTerms}"; - } - { - Name = "NixOS Search (Options)"; - Alias = "@no"; - IconURL = "https://nixos.org/favicon.ico"; - Description = "Search in NixOS options"; - URLTemplate = "https://search.nixos.org/options?query={searchTerms}"; - } - - # Haskell - { - Name = "Flora"; - Alias = "@hs"; - IconURL = "https://flora.pm/static/icons/favicon-32x32.png"; - URLTemplate = "https://flora.pm/search?q={searchTerms}"; - } - - # Discourse - { - Name = "NixOS Discourse"; - Alias = "@nd"; - IconURL = "https://nixos.org/favicon.ico"; - URLTemplate = "https://discourse.nixos.org/search?q={searchTerms}"; - } - { - Name = "Framework Discourse"; - Alias = "@fd"; - IconURL = "https://frame.work/favicon.ico"; - URLTemplate = "https://community.frame.work/search?q={searchTerms}"; - } - - # Misc - { - Name = "YouTube"; - Alias = "@yt"; - IconURL = "https://youtube.com/favicon.ico"; - SuggestURLTemplate = "http://suggestqueries.google.com/complete/search?q={searchTerms}&ds=yt"; - URLTemplate = "https://www.youtube.com/results?search_query={searchTerms}"; - } - { - Name = "Genius"; - Alias = "@geni"; - IconURL = "https://genius.com/favicon.ico"; - URLTemplate = "https://genius.com/search?q={searchTerms}"; - } - ]; - - profiles = { - default = { - settings = { - # "full-screen-api.ignore-widgets" = true; # limit fullscreen mode to window - }; - userChrome = '' - /* monofont tweak */ - #statuspanel-label { - font-family: monospace; - } - .urlbar-input-box { - font-family: monospace; - } - ''; - extensions.packages = - let - addons = nur.repos.rycee.firefox-addons; - in - [ - addons.sponsorblock - addons.return-youtube-dislikes - addons.shinigami-eyes - addons.consent-o-matic - ]; - }; - - junk = { - id = 1; - inherit (config.programs.zen-browser.profiles.default) - settings - userChrome - ; - - extensions.packages = - let - addons = nur.repos.rycee.firefox-addons; - in - [ addons.multi-account-containers ]; - - containers = { - raisin = { - color = "purple"; - icon = "fruit"; - id = 1; - }; - pomme = { - color = "red"; - icon = "fruit"; - id = 2; - }; - }; - }; - - # Isolate it because it's proprietary - tampermonkey = { - id = 2; - inherit (config.programs.zen-browser.profiles.default) - settings - userChrome - ; - - extensions.packages = - let - addons = nur.repos.rycee.firefox-addons; - in - [ addons.tampermonkey ]; - }; - }; - }; -} diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index eb586087..a56d4256 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -141,7 +141,7 @@ in "x-scheme-handler/unknown" = "firefox.desktop"; }; in - lib.mkIf (cfg.enable && !config.programs.zen-browser.enable) { + lib.mkIf cfg.enable { enable = true; associations.added = associations; defaultApplications = associations; diff --git a/nix/homeModules/common/zen-browser.nix b/nix/homeModules/common/zen-browser.nix deleted file mode 100644 index 4a691331..00000000 --- a/nix/homeModules/common/zen-browser.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - config, - lib, - ... -}: -let - cfg = config.programs.zen-browser; - - firefoxCfg = config.programs.firefox; -in -{ - programs.zen-browser = { - policies = firefoxCfg.policies; - - # "locked" semantic from zen (doesn't seem to be doing anything, attempted for zen-twilight 1.18t) - # https://github.com/0xc000022070/zen-browser-flake/tree/main#preferences - # - # To check which option is mapped to which about:config - # - back preference file - # cp .zen/default/prefs.js{,.bk} - # - click the buttons - # - diff it - # diff .zen/default/prefs.js{.bk,} - profiles.default = lib.mkMerge [ - firefoxCfg.profiles.default - { - # Zen specific - settings = { - "zen.theme.content-element-separation" = 0; # Remove "borders" around window - "zen.tabs.show-newtab-vertical" = false; - "zen.view.compact.toolbar-flash-popup" = true; - "zen.view.show-newtab-button-top" = false; - "zen.view.use-single-toolbar" = false; - "zen.tabs.ctrl-tab.ignore-pending-tabs" = true; # ctrl-tab ignore unloaded tabs - - # https://github.com/zen-browser/desktop/discussions/12025 - # This makes tabs sync across windows, which as annoying af - "zen.window-sync.enabled" = false; - }; - } - ]; - }; - - xdg.mimeApps = - let - associations = lib.genAttrs [ - "application/x-extension-shtml" - "application/x-extension-xhtml" - "application/x-extension-html" - "application/x-extension-xht" - "application/x-extension-htm" - # "x-scheme-handler/unknown" - # "x-scheme-handler/mailto" - "x-scheme-handler/chrome" - "x-scheme-handler/about" - "x-scheme-handler/https" - "x-scheme-handler/http" - "application/xhtml+xml" - # "application/json" - # "text/plain" - "text/html" - ] (_: cfg.package.meta.desktopFileName); - in - lib.mkIf cfg.enable { - associations.added = associations; - defaultApplications = associations; - }; -} diff --git a/npins/sources.json b/npins/sources.json index 15e6974a..6f3edaf9 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -368,19 +368,6 @@ "revision": "491197a6a5ef9c65a85c3eb1531786f32ffff5b3", "url": "https://github.com/Toqozz/wired-notify/archive/491197a6a5ef9c65a85c3eb1531786f32ffff5b3.tar.gz", "hash": "sha256-wxkeSF0/3FI0HSBKhZ2mlAAmFviNrZzdhjHqTfWP6h0=" - }, - "zen-browser": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "0xc000022070", - "repo": "zen-browser-flake" - }, - "branch": "main", - "submodules": false, - "revision": "0fac05e4b604c3304e7710a95572e78350fe9968", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/0fac05e4b604c3304e7710a95572e78350fe9968.tar.gz", - "hash": "sha256-jejW3u1bkqz0ObXZeiZqLQNwC7+MXb8/KMwf3VPQpRI=" } }, "version": 7