From 29ae81812764991b29e66ceb4981acb4f908e0b7 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 24 Apr 2024 18:16:04 +0300 Subject: [PATCH] Firefox : Refactor. --- module/common/Firefox.nix | 92 ++++++++++++--------------------------- 1 file changed, 27 insertions(+), 65 deletions(-) diff --git a/module/common/Firefox.nix b/module/common/Firefox.nix index 1854d47..ff8c78c 100644 --- a/module/common/Firefox.nix +++ b/module/common/Firefox.nix @@ -1,11 +1,19 @@ { pkgs, util, ... } @args: let firefox = import ./firefox args; + + mkExtension = url: { + installation_mode = "force_installed"; + install_url = url; + }; + + mkBookmark = name: url: { inherit name; inherit url; }; in { # Disable profile switching on rebuild. environment.variables = { MOZ_LEGACY_PROFILES = "1"; MOZ_ENABLE_WAYLAND = "1"; }; + programs.firefox = { enable = true; package = pkgs.firefox-esr; @@ -13,39 +21,17 @@ in { autoConfig = firefox.config; policies = { ManagedBookmarks = [ - { - toplevel_name = "Pin"; - } { - url = "https://home.voronind.com"; - name = "Dashboard"; - } { - url = "https://music.yandex.ru"; - name = "Music"; - } { - url = "https://web.telegram.org"; - name = "Telegram"; - } { - url = "https://discord.com"; - name = "Discord"; - } { - url = "https://mail.fsight.ru"; - name = "Work Mail"; - } { - url = "https://git.voronind.com"; - name = "Git"; - } { - url = "https://git.fmp.fsight.world"; - name = "Work Git"; - } { - url = "https://support.fsight.ru"; - name = "Work Board"; - } { - url = "https://iot.voronind.com"; - name = "Hass"; - } { - url = "https://cloud.voronind.com"; - name = "Cloud"; - } + { toplevel_name = "Pin"; } + (mkBookmark "Dashboard" "https://home.voronind.com") + (mkBookmark "Music" "https://music.yandex.ru") + (mkBookmark "Telegram" "https://web.telegram.org") + (mkBookmark "Discord" "https://discord.com") + (mkBookmark "WorkMail" "https://mail.fsight.ru") + (mkBookmark "Git" "https://git.voronind.com") + (mkBookmark "WorkGit" "https://git.fmp.fsight.world") + (mkBookmark "WorkBoard" "https://support.fsight.ru") + (mkBookmark "Hass" "https://iot.voronind.com") + (mkBookmark "Cloud" "https://cloud.voronind.com") ]; ExtensionUpdate = true; ExtensionSettings = { @@ -53,38 +39,14 @@ in { install_sources = [ "*" ]; installation_mode = "blocked"; }; - # "queryamoid@kaply.com" = { - # installation_mode = "force_installed"; - # install_url = "https://github.com/mkaply/queryamoid/releases/download/v0.1/query_amo_addon_id-0.1-fx.xpi"; - # }; - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; - }; - "cliget@zaidabdulla.com" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/cliget/latest.xpi"; - }; - "addon@darkreader.org" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; - }; - "{e7625f06-e252-479d-ac7a-db68aeaff2cb}" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/togglefonts/latest.xpi"; - }; - "uBlock0@raymondhill.net" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - }; - "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = { - installation_mode = "force_installed"; - install_url = "https://addons.mozilla.org/firefox/downloads/latest/vimium-ff/latest.xpi"; - }; - # "{08d5243b-4236-4a27-984b-1ded22ce01c3}" = { - # installation_mode = "force_installed"; - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/gruvboxgruvboxgruvboxgruvboxgr/latest.xpi"; - # }; + "addon@darkreader.org" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi"; + "cliget@zaidabdulla.com" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/cliget/latest.xpi"; + "uBlock0@raymondhill.net" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/vimium-ff/latest.xpi"; + "{e7625f06-e252-479d-ac7a-db68aeaff2cb}" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/togglefonts/latest.xpi"; + # "queryamoid@kaply.com" = mkExtension "https://github.com/mkaply/queryamoid/releases/download/v0.1/query_amo_addon_id-0.1-fx.xpi"; + # "{08d5243b-4236-4a27-984b-1ded22ce01c3}" = mkExtension "https://addons.mozilla.org/firefox/downloads/latest/gruvboxgruvboxgruvboxgruvboxgr/latest.xpi"; }; SearchEngines = { Default = "Whoogle";