diff --git a/flake.lock b/flake.lock index d961db0..c1e8139 100644 --- a/flake.lock +++ b/flake.lock @@ -174,11 +174,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1677243766, - "narHash": "sha256-a+2V68cLjb951pYBEGbQGEVBcgti40uWtxTVnzvGFhY=", + "lastModified": 1682446307, + "narHash": "sha256-WtvLBaH/Ma+of/JpZLFjz35SXZ5xbNAYmc30FE2LByQ=", "owner": "nix-community", "repo": "NUR", - "rev": "9bde3171aeb5954b7955fcb09b231f53caf76b54", + "rev": "bf4f1d29e517aef123b936c65c2be7d296ed99b2", "type": "github" }, "original": { diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index 9156f6f..3cdf6ba 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -17,12 +17,14 @@ in with lib; package = ffPkgs; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden + pkgs.bypass-paywalls-clean foxyproxy-standard multi-account-containers octotree refined-github tree-style-tab ublock-origin + unpaywall ]; profiles = { default.settings = { diff --git a/overlays/default.nix b/overlays/default.nix index 6bc2fbe..addddd2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -29,6 +29,26 @@ let (super.callPackage file {}) else super."${og}"; + buildFirefoxXpiAddon = super.lib.makeOverridable ({ stdenv ? super.stdenv + , fetchurl ? super.fetchurl, pname, version, addonId, url, sha256, meta, ... + }: + stdenv.mkDerivation { + name = "${pname}-${version}"; + + inherit meta; + + src = fetchurl { inherit url sha256; }; + + preferLocalBuild = true; + allowSubstitutes = true; + + buildCommand = '' + dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" + mkdir -p "$dst" + install -v -m644 "$src" "$dst/${addonId}.xpi" + ''; + }); + in rec { gregpy = myPython; @@ -58,6 +78,21 @@ in rec { xonsh-direnv = cp ./xonsh-direnv.nix {}; }; + bypass-paywalls-clean = let version = "3.1.5.0"; + in buildFirefoxXpiAddon { + pname = "bypass-paywalls-clean"; + inherit version; + addonId = "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}"; + url = "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-${version}.xpi"; + sha256 = "sha256-mBJkX8neimU5nwr1GEccCEr6Zy1Ku3JEH2A3LmPF3SU="; + meta = with super.lib; { + homepage = "https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean"; + description = "Bypass Paywalls of (custom) news sites"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + enwiki-dump = super.callPackage ./enwiki-dump.nix {}; hms = super.callPackage ./hms.nix { pkgs = self.pkgs;