From 95b1b92b4b904548edbba680eaabe7d6989aea5c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 15 Nov 2023 08:05:44 +0800 Subject: [PATCH] nixos,anti-feature: deny non-source packages --- nixos/packages/anti-feature.nix | 36 +++++++++++++++++++++++++++++++ nixos/packages/default.nix | 2 +- nixos/packages/unfree/default.nix | 5 ----- nixos/packages/unfree/unfree.nix | 20 ----------------- 4 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 nixos/packages/anti-feature.nix delete mode 100644 nixos/packages/unfree/default.nix delete mode 100755 nixos/packages/unfree/unfree.nix diff --git a/nixos/packages/anti-feature.nix b/nixos/packages/anti-feature.nix new file mode 100644 index 0000000..a10a082 --- /dev/null +++ b/nixos/packages/anti-feature.nix @@ -0,0 +1,36 @@ +{lib, ...}: { + nixpkgs.config = { + allowBroken = false; + allowUnsupportedSystem = false; + + allowNonSource = false; + allowNonSourcePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "vscodium" + "spotify" + "adoptopenjdk-hotspot-bin" + "osu-lazer-bin-2023.1026.0" + "protonup-qt-2.8.2" + "cef-binary" + "virtualbox" + "virtualbox-modules" + "open-watcom-bin" + "open-watcom-bin-unwrapped" + "sof-firmware" + ]; + + allowUnfree = false; + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "nvidia-x11" + #"nvidia-settings" + #"nvidia-persistenced" + #"xow_dongle-firmware" + #"facetimehd-firmware" + "osu-lazer-bin-2023.1026.0" + "spotify" + "steam" + "steam-original" + ]; + }; +} diff --git a/nixos/packages/default.nix b/nixos/packages/default.nix index 08fd07a..2e10076 100755 --- a/nixos/packages/default.nix +++ b/nixos/packages/default.nix @@ -4,6 +4,6 @@ # TODO: should this be considered user-specific? ./overlays - ./unfree + ./anti-feature.nix ]; } diff --git a/nixos/packages/unfree/default.nix b/nixos/packages/unfree/default.nix deleted file mode 100644 index 756f8b4..0000000 --- a/nixos/packages/unfree/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ./unfree.nix - ]; -} diff --git a/nixos/packages/unfree/unfree.nix b/nixos/packages/unfree/unfree.nix deleted file mode 100755 index f688d58..0000000 --- a/nixos/packages/unfree/unfree.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, ...}: { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "nvidia-x11" # ../hardware/gpu/nvidia.nix - #"nvidia-settings" - #"nvidia-persistenced" - "xow_dongle-firmware" # ../hardware/accessories/xbox.nix - "facetimehd-firmware" # ../hardware/hardwares/imac-2017.nix - - "osu-lazer-bin-2023.1026.0" # what? - "spotify" - "steam" - "steam-original" - #"discord" - #"google-chrome" - #"lunar-client" - #"microsoft-edge-stable" - #"qq" - ]; -}