5 files changed, 17 insertions, 11 deletions
diff --git a/flake.nix b/flake.nix
index 466b7d01..d1837b7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,7 +88,7 @@
   }: let
     sysLib = import ./lib {inherit pkgs shell-library;};
     system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
+    pkgs = import nixpkgs (import ./system/nixpkgs {inherit (nixpkgs) lib; inherit system;});
   in {
     nixosConfigurations = import ./flake/nixosConfigurations {
       inherit
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"
-    ];
 }