diff options
| author | Soispha <soispha@vhack.eu> | 2023-04-10 13:01:08 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-05-09 19:30:11 +0200 |
| commit | 832b796d1e8730aa0ce16c23a4d6f0b6755a59df (patch) | |
| tree | 0750ca228b003b1f39f46855c2d9d2b8d88d45d9 /system | |
| parent | Fix(system/services/nix): Use correct values (diff) | |
| download | nixos-config-832b796d1e8730aa0ce16c23a4d6f0b6755a59df.tar.gz nixos-config-832b796d1e8730aa0ce16c23a4d6f0b6755a59df.zip | |
Fix(system/nixpkgs): Configure at a system level
Diffstat (limited to 'system')
| -rw-r--r-- | system/default.nix | 4 | ||||
| -rw-r--r-- | system/nixpkgs/default.nix | 15 | ||||
| -rw-r--r-- | system/services/default.nix | 2 | ||||
| -rw-r--r-- | system/services/steam/default.nix | 5 |
4 files changed, 16 insertions, 10 deletions
diff --git a/system/default.nix b/system/default.nix index 64073fb8..1c8d0900 100644 --- a/system/default.nix +++ b/system/default.nix @@ -11,9 +11,9 @@ ./hardware ./services ./tempfiles - ./nixpkgs + #./nixpkgs already at flake level imported ]; - # remove all bloat, nixos installs by default + # remove all the bloat, which nixos installs by default environment = { defaultPackages = []; }; diff --git a/system/nixpkgs/default.nix b/system/nixpkgs/default.nix index f226faa2..40a67d50 100644 --- a/system/nixpkgs/default.nix +++ b/system/nixpkgs/default.nix @@ -1,6 +1,17 @@ # vim: ts=2 -{lib, ...}: { - nixpkgs.config = { +{ + lib, + system, + ... +}: { + inherit system; + config = { #contentAddressedByDefault = true; + + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + ]; }; } diff --git a/system/services/default.nix b/system/services/default.nix index 92150ea3..63f0e733 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -3,7 +3,7 @@ ./printing ./nix ./snapper - #./steam + ./steam ./dconf ./openssh ]; diff --git a/system/services/steam/default.nix b/system/services/steam/default.nix index d2cc62a7..2efa54e2 100644 --- a/system/services/steam/default.nix +++ b/system/services/steam/default.nix @@ -3,9 +3,4 @@ programs.steam = { enable = true; }; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - ]; } |