feat(flake): improve firefox-addons & arkenfox-userjs inputs

- replace full rycee/nur-expressions input with firefox-addons flake
- use arkenfox user.js directly from github:arkenfox/user.js as input
This commit is contained in:
Felix Schröter 2023-09-30 03:31:46 +02:00
parent 025b9a46dd
commit 4a09825289
Signed by: felschr
GPG key ID: 671E39E6744C807D
7 changed files with 84 additions and 36 deletions

View file

@ -1,14 +1,14 @@
{ config, nixosConfig, pkgs, lib, ... }:
{ inputs, config, pkgs, lib, ... }:
with lib;
let
firefox-addons = pkgs.nur.repos.rycee.firefox-addons
// (import ./firefoxAddons.nix { inherit pkgs lib; });
firefox-addons = inputs.firefox-addons.packages.${pkgs.system}
// (import ./firefoxAddons.nix { inherit inputs pkgs lib; });
inherit (import ../modules/firefox/common.nix { inherit config lib pkgs; })
mkConfig;
arkenfoxConfig = builtins.readFile pkgs.nur.repos.slaier.arkenfox-userjs;
arkenfoxConfig = builtins.readFile "${inputs.arkenfox-userjs}/user.js";
# Relax some arkenfox settings, to get a less strict
# alternative to Mullvad Browser to fallback on.

View file

@ -1,8 +1,8 @@
{ pkgs, lib, ... }:
{ inputs, pkgs, lib, ... }:
let inherit (pkgs.nur.repos.rycee) firefox-addons;
let inherit (inputs.firefox-addons.lib.${pkgs.system}) buildFirefoxXpiAddon;
in {
german-dictionary = firefox-addons.buildFirefoxXpiAddon rec {
german-dictionary = buildFirefoxXpiAddon rec {
pname = "german-dictionary";
version = "2.1";
addonId = "de-DE@dictionaries.addons.mozilla.org";
@ -16,7 +16,7 @@ in {
platforms = platforms.all;
};
};
zotero-connector = firefox-addons.buildFirefoxXpiAddon rec {
zotero-connector = buildFirefoxXpiAddon rec {
pname = "zotero-connector";
version = "5.0.108";
addonId = "zotero@chnm.gmu.edu";
@ -30,7 +30,7 @@ in {
platforms = platforms.all;
};
};
ddg-bangs-but-faster = firefox-addons.buildFirefoxXpiAddon rec {
ddg-bangs-but-faster = buildFirefoxXpiAddon rec {
pname = "ddg-bangs-but-faster";
version = "0.2.2";
addonId = "{55bf0dfc-ebd5-4705-a68d-61c6ac6ecad0}";

View file

@ -1,8 +1,8 @@
{ config, nixosConfig, pkgs, lib, ... }:
{ inputs, pkgs, lib, ... }:
let
firefox-addons = pkgs.nur.repos.rycee.firefox-addons
// (import ./firefoxAddons.nix { inherit pkgs lib; });
firefox-addons = inputs.firefox-addons.packages.${pkgs.system}
// (import ./firefoxAddons.nix { inherit inputs pkgs lib; });
commonSettings = {
# Disable DNS over HTTPS (use system DNS, i.e. VPN's DNS)