Revert "refactor: explicitly allow unfree packages"

This reverts commit 5131641023.
This commit is contained in:
Oliver Davies 2025-07-28 23:47:15 +01:00
parent 5131641023
commit d818f3a2d7
12 changed files with 7 additions and 64 deletions

View file

@ -7,6 +7,7 @@
awesome-rss
bitwarden
darkreader
onetab
tree-style-tab
ublock-origin
videospeed

View file

@ -1,8 +1,3 @@
{
nixpkgs.allowedUnfreePackages = [
"steam"
"steam-unwrapped"
];
flake.modules.nixos.pc.programs.steam.enable = true;
}

View file

@ -1,5 +1,3 @@
{
nixpkgs.allowedUnfreePackages = [ "open-webui" ];
flake.modules.nixos.pc.services.open-webui.enable = true;
}

View file

@ -1,9 +0,0 @@
{
flake.modules.nixos."nixosConfigurations/t480" =
{ config, pkgs, ... }:
{
nixpkgs.allowedUnfreePackages = [ "slack" ];
users.users."${config.flake.meta.owner.username}".packages = [ pkgs.slack ];
};
}

View file

@ -1,9 +0,0 @@
{
flake.modules.nixos."nixosConfigurations/t480" =
{ config, pkgs, ... }:
{
nixpkgs.allowedUnfreePackages = [ "zoom-us" ];
users.users."${config.flake.meta.owner.username}".packages = [ pkgs.zoom-us ];
};
}

View file

@ -1,8 +1,6 @@
{ config, ... }:
{
nixpkgs.allowedUnfreePackages = [ "makemkv" ];
flake.modules.nixos.pc =
{ pkgs, ... }:
{

View file

@ -1,7 +0,0 @@
{ lib, ... }:
{
options.flake.meta = lib.mkOption {
type = lib.types.anything;
};
}

View file

@ -1,26 +0,0 @@
{ config, lib, ... }:
{
options.nixpkgs.allowedUnfreePackages = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
};
config.flake = {
modules =
let
predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages;
in
{
nixos.pc.nixpkgs.config.allowUnfreePredicate = predicate;
homeManager.base = args: {
nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) {
allowUnfreePredicate = predicate;
};
};
};
meta.nixpkgs.allowedUnfreePackages = config.nixpkgs.allowedUnfreePackages;
};
}

View file

@ -1,8 +1,4 @@
{
nixpkgs.allowedUnfreePackages = [
"zsh-abbr"
];
flake.modules.homeManager.base.programs.zsh.zsh-abbr.abbreviations = {
cl = "clear";
cs = "create-script";