From ef39c00b0d794999d2edc18b6b88a949e76f6b9b Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 7 Oct 2022 09:22:41 -0300 Subject: [PATCH] remove misleading nixpkgs.config.*, set allowUnfree by default --- minimal/flake.nix | 4 ++-- minimal/home-manager/home.nix | 3 --- minimal/nixos/configuration.nix | 3 --- standard/flake.nix | 4 ++-- standard/home-manager/home.nix | 3 --- standard/nixos/configuration.nix | 3 --- 6 files changed, 4 insertions(+), 16 deletions(-) diff --git a/minimal/flake.nix b/minimal/flake.nix index 3f34bec..9cd138d 100644 --- a/minimal/flake.nix +++ b/minimal/flake.nix @@ -24,11 +24,11 @@ legacyPackages = nixpkgs.lib.genAttrs [ "x86_64-linux" "x86_64-darwin" ] (system: import inputs.nixpkgs { inherit system; + # NOTE: Using `nixpkgs.config` in your NixOS config won't work # Instead, you should set nixpkgs configs here # (https://nixos.org/manual/nixpkgs/stable/#idm140737322551056) - - # config.allowUnfree = true; + config.allowUnfree = true; } ); diff --git a/minimal/home-manager/home.nix b/minimal/home-manager/home.nix index 1891b22..bafc020 100644 --- a/minimal/home-manager/home.nix +++ b/minimal/home-manager/home.nix @@ -9,9 +9,6 @@ # Feel free to split up your configuration and import pieces of it here. ]; - # Comment out if you wish to disable unfree packages for your system - nixpkgs.config.allowUnfree = true; - # TODO: Set your username home = { username = "your-username"; diff --git a/minimal/nixos/configuration.nix b/minimal/nixos/configuration.nix index 52a6006..27ec31f 100644 --- a/minimal/nixos/configuration.nix +++ b/minimal/nixos/configuration.nix @@ -37,9 +37,6 @@ }; }; - # Remove if you wish to disable unfree packages for your system - nixpkgs.config.allowUnfree = true; - # FIXME: Add the rest of your current configuration # TODO: Set your hostname diff --git a/standard/flake.nix b/standard/flake.nix index 6d015f3..3d06afd 100644 --- a/standard/flake.nix +++ b/standard/flake.nix @@ -54,11 +54,11 @@ inherit system; # This adds our overlays to pkgs overlays = builtins.attrValues overlays; + # NOTE: Using `nixpkgs.config` in your NixOS config won't work # Instead, you should set nixpkgs configs here # (https://nixos.org/manual/nixpkgs/stable/#idm140737322551056) - - # config.allowUnfree = true; + config.allowUnfree = true; } ); diff --git a/standard/home-manager/home.nix b/standard/home-manager/home.nix index 1891b22..bafc020 100644 --- a/standard/home-manager/home.nix +++ b/standard/home-manager/home.nix @@ -9,9 +9,6 @@ # Feel free to split up your configuration and import pieces of it here. ]; - # Comment out if you wish to disable unfree packages for your system - nixpkgs.config.allowUnfree = true; - # TODO: Set your username home = { username = "your-username"; diff --git a/standard/nixos/configuration.nix b/standard/nixos/configuration.nix index 52a6006..27ec31f 100644 --- a/standard/nixos/configuration.nix +++ b/standard/nixos/configuration.nix @@ -37,9 +37,6 @@ }; }; - # Remove if you wish to disable unfree packages for your system - nixpkgs.config.allowUnfree = true; - # FIXME: Add the rest of your current configuration # TODO: Set your hostname