From 2178e4a1eec7df04342e44882f12b072c7d2af51 Mon Sep 17 00:00:00 2001
From: traxys <quentin@familleboyer.net>
Date: Tue, 14 May 2024 00:53:28 +0200
Subject: [PATCH] hostconfig: Try to correctly handle unfree packages

---
 hostconfig/ZeNixComputa/default.nix |  1 +
 hostconfig/default.nix              | 36 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/hostconfig/ZeNixComputa/default.nix b/hostconfig/ZeNixComputa/default.nix
index 64cebe8..d4b5e28 100644
--- a/hostconfig/ZeNixComputa/default.nix
+++ b/hostconfig/ZeNixComputa/default.nix
@@ -20,5 +20,6 @@
       personal-gui
       gaming
     ];
+    unfreePackages = [ "warcraftlogs" ];
   };
 }
diff --git a/hostconfig/default.nix b/hostconfig/default.nix
index 0599e9b..1998632 100644
--- a/hostconfig/default.nix
+++ b/hostconfig/default.nix
@@ -1,7 +1,6 @@
 {
   self,
   inputs,
-  lib,
   flakeOverlays,
   ...
 }:
@@ -21,30 +20,33 @@
         user,
         nixosModules,
         hmModules,
-        ...
+        unfreePackages ? [ ],
       }:
       inputs.nixpkgs.lib.nixosSystem {
         inherit system;
         modules = nixosModules ++ [
           ../nixos/configuration.nix
           inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs = {
-              overlays = flakeOverlays system;
-              config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "warcraftlogs" ];
-            };
+          (
+            { lib, ... }:
+            {
+              nixpkgs = {
+                overlays = flakeOverlays system;
+                config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) unfreePackages;
+              };
 
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.${user} = {
-                imports = hmModules ++ [ inputs.fioul.homeManagerModules.default ];
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                users.${user} = {
+                  imports = hmModules ++ [ inputs.fioul.homeManagerModules.default ];
+                };
+                extraSpecialArgs = {
+                  flake = self;
+                };
               };
-              extraSpecialArgs = {
-                flake = self;
-              };
-            };
-          }
+            }
+          )
         ];
       };
   };