From 0e3649ddee95e65ce0c5958c3db71589de5f659c Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Wed, 10 Jan 2024 22:10:20 +0100
Subject: [PATCH] [Packages] fix issues with newer flake-utils-plus versions
 overriding nixpkgs.pkgs Will probably drop flake-utils-plus in the future
 because of that.

---
 flake.nix               |  2 ++
 hardware/amd/amdgpu.nix |  2 +-
 packages.nix            | 10 +++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 89a00a8..84bf33a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,8 @@
         default = aviallon;
       };
 
+      nixpkgsConfig = self.nixosModules.aviallon.aviallon.programs.config;
+
       specialArgs = inputs // { inherit myLib; };
     };
 }
diff --git a/hardware/amd/amdgpu.nix b/hardware/amd/amdgpu.nix
index 7df27ed..0a5444b 100644
--- a/hardware/amd/amdgpu.nix
+++ b/hardware/amd/amdgpu.nix
@@ -28,7 +28,7 @@ in {
       ]
     ;
 
-    nixpkgs.config.rocmSupport = mkDefault devCfg.enable;
+    aviallon.programs.config.rocmSupport = mkDefault devCfg.enable;
 
     services.xserver.videoDrivers = []
     ++ optional cfg.useProprietary "amdgpu-pro"
diff --git a/packages.nix b/packages.nix
index 4a90880..84ebbd2 100644
--- a/packages.nix
+++ b/packages.nix
@@ -27,13 +27,19 @@ in
       description = "Allow specific unfree software to be installed";
       type = types.listOf types.str;
     };
+    config = mkOption {
+      default = {};
+      type = types.attrs;
+      example = { cudaSupport = true; };
+      description = "nixpkgs config settings to be applied to all nixpkgs instances";
+    };
   };
 
   config = mkIf cfg.enable {
 
     programs.java.enable = mkDefault (!generalCfg.minimal);
 
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
+    aviallon.programs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
 
     environment.systemPackages = with pkgs; []
     ++ [
@@ -70,8 +76,6 @@ in
       newSession = true;
     };
 
-    aviallon.programs.allowUnfreeList = [];
-
     programs.ccache.enable = true;
     
     nix.settings.extra-sandbox-paths = [