From 1fce800268f8b352d60334ff49ab69cff7054935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 18 Feb 2026 10:21:44 -0800 Subject: [PATCH 1/2] Add wBlock package --- hosts/Rhizome/programs.nix | 1 + overlays/custom-packages.nix | 3 +++ packages/wblock/package.nix | 38 ++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 packages/wblock/package.nix diff --git a/hosts/Rhizome/programs.nix b/hosts/Rhizome/programs.nix index dbbda581..851c6dda 100644 --- a/hosts/Rhizome/programs.nix +++ b/hosts/Rhizome/programs.nix @@ -14,6 +14,7 @@ mochi slack the-unarchiver + wblock zoom-us ]; diff --git a/overlays/custom-packages.nix b/overlays/custom-packages.nix index c8694841..10be28c7 100644 --- a/overlays/custom-packages.nix +++ b/overlays/custom-packages.nix @@ -21,4 +21,7 @@ self: super: { # Ungoogled Chromium with privacy enhancements ungoogled-chromium = super.callPackage ./../packages/ungoogled-chromium/package.nix {}; + + # wBlock Safari extension + wblock = super.callPackage ./../packages/wblock/package.nix {}; } diff --git a/packages/wblock/package.nix b/packages/wblock/package.nix new file mode 100644 index 00000000..e6668e67 --- /dev/null +++ b/packages/wblock/package.nix @@ -0,0 +1,38 @@ +# TODO: Build from source and upstream +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "wblock"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/0xCUB3/wBlock/releases/download/${finalAttrs.version}/wBlock.dmg"; + hash = "sha256-emcEURH/G6Laph4/P4vGJ+Ht6QvOjijrDh1qgstGMVo="; + }; + + # Use 7zz to work around APFS: https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura/25873/9 + nativeBuildInputs = [_7zz]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" + + runHook postInstall + ''; + + meta = with lib; { + description = "Next-generation ad blocker for Safari"; + homepage = "https://github.com/0xCUB3/wBlock"; + license = lib.licenses.gpl3Only; + platforms = platforms.darwin; + sourceProvenance = with sourceTypes; [binaryNativeCode]; + }; +}) From 7ec3da4f05ebce5d9be9721226d0c801ac63cebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 18 Feb 2026 10:23:57 -0800 Subject: [PATCH 2/2] Remove Adguard --- hosts/Rhizome/programs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/Rhizome/programs.nix b/hosts/Rhizome/programs.nix index 851c6dda..f61f051c 100644 --- a/hosts/Rhizome/programs.nix +++ b/hosts/Rhizome/programs.nix @@ -21,7 +21,6 @@ homebrew = { enable = true; casks = [ - "adguard" "boltai" "dash" "legcord"