overlays: Fix allowUnfree

This commit is contained in:
PapaTutuWawa 2021-10-22 21:42:36 +02:00
parent 8aa0c19ba6
commit 2bdb6d7f76
2 changed files with 12 additions and 7 deletions

View File

@ -131,6 +131,8 @@ let
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
# CJK fonts # CJK fonts
source-han-sans source-han-serif source-han-sans source-han-serif
# Coding fonts
source-code-pro
]; ];
# We don't tolerate non-free software, except for Steam and Linux firmware # We don't tolerate non-free software, except for Steam and Linux firmware
@ -139,7 +141,6 @@ let
"steam" "steam-original" "steam-runtime" "steam" "steam-original" "steam-runtime"
"discord" "discord"
]; ];
nixpkgs.config.allowUnfree = true;
services = { services = {
connman = { connman = {

View File

@ -1,5 +1,7 @@
# NOTE: pkgs is unused but there for consistency with nur.nix # NOTE: pkgs is unused but there for consistency with nur.nix
pkgs: final: prev: {
lib, ...
}: final: prev:
let let
unstableTarball = unstableTarball =
@ -8,10 +10,12 @@ let
in { in {
unstable = import unstableTarball { unstable = import unstableTarball {
# TODO # TODO
#allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ config = {
# "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
# "steam" "steam-original" "steam-runtime" "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel"
# "discord" "steam" "steam-original" "steam-runtime"
#]; "discord"
];
};
}; };
} }