diff --git a/flake.lock b/flake.lock index 1bc273a..7aa0420 100644 --- a/flake.lock +++ b/flake.lock @@ -47,29 +47,6 @@ "type": "github" } }, - "firefox-addons": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "dir": "pkgs/firefox-addons", - "lastModified": 1753157005, - "narHash": "sha256-fTdJ2yYjR8O3kEWsveBGu/d8ilEFxVnGkF4wS3N1Was=", - "owner": "rycee", - "repo": "nur-expressions", - "rev": "a38f383959d8bf0c1d5d555469a4c63c4632701f", - "type": "gitlab" - }, - "original": { - "dir": "pkgs/firefox-addons", - "owner": "rycee", - "ref": "master", - "repo": "nur-expressions", - "type": "gitlab" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -336,7 +313,6 @@ "inputs": { "agenix": "agenix", "colmena": "colmena", - "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", diff --git a/flake.nix b/flake.nix index 0298a96..39bf975 100644 --- a/flake.nix +++ b/flake.nix @@ -55,11 +55,6 @@ flake = false; }; - firefox-addons = { - url = "gitlab:rycee/nur-expressions?ref=master&dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - scoutshonour = { url = "git+https://git.qenya.tel/qenya/nix-scoutshonour?ref=main"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/home/qenya/firefox.nix b/home/qenya/firefox.nix index 216a0f4..13872ee 100644 --- a/home/qenya/firefox.nix +++ b/home/qenya/firefox.nix @@ -9,13 +9,45 @@ in enable = true; languagePacks = [ "en-GB" ]; - profiles.default = { - extensions.packages = with inputs.firefox-addons.packages.${pkgs.hostPlatform.system}; [ - onepassword-password-manager - bitwarden - ublock-origin - ]; + policies = { + ExtensionSettings = { + # uBlock Origin + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + private_browsing = true; + }; + # Bitwarden + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + installation_mode = "force_installed"; + default_area = "navbar"; + }; + # 1Password + "{d634138d-c276-4fc8-924b-40a0ea21d284}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi"; + installation_mode = "force_installed"; + default_area = "navbar"; + }; + # Disqus Auto-Expander + "disqus-auto-expander@john30013.com" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/disqus-auto-expander/latest.xpi"; + installation_mode = "force_installed"; + }; + # Indie Wiki Buddy + "{cb31ec5d-c49a-4e5a-b240-16c767444f62}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/indie-wiki-buddy/latest.xpi"; + installation_mode = "force_installed"; + }; + # SteamDB + "firefox-extension@steamdb.info" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/steam-database/latest.xpi"; + installation_mode = "force_installed"; + }; + }; + }; + profiles.default = { settings = { "browser.startup.page" = 3; # resume previous session "browser.newtabpage.activity-stream.showSponsored" = false; diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix index 5b338e3..7dd0414 100644 --- a/home/qenya/packages.nix +++ b/home/qenya/packages.nix @@ -24,7 +24,8 @@ in _1password-gui bitwarden discord - gimp-with-plugins + # https://github.com/NixOS/nixpkgs/issues/427155 + # gimp-with-plugins jellyfin-media-player tor-browser-bundle-bin zoom-us