6 files changed, 31 insertions(+), 7 deletions(-)

M flake.nix
A modules/default.nix
A modules/unfree.nix
M roles/steam.nix
M systems/profiles/desktop/default.nix
M systems/profiles/laptop/default.nix

@@ 34,7 34,6 @@
   outputs = inputs:
     inputs.flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
-        #./hm-modules
         ./systems
       ];
 

@@ 0,0 1,5 @@
+{
+  imports = [
+    ./unfree.nix
+  ];
+}

@@ 0,0 1,19 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.arta.unfree;
+in {
+  options.arta.unfree = {
+    allow = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+    };
+  };
+
+  config = {
+    nixpkgs.config.allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) cfg.allow;
+  };
+}

@@ 11,12 11,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-        "steam-run"
-        "steam-original"
-        "steam"
-      ];
+    arta.unfree.allow = [
+      "steam-run"
+      "steam-original"
+      "steam"
+    ];
 
     programs.steam = {
       enable = true;

@@ 9,6 9,7 @@ inputs @ {
     impermanence.nixosModules.impermanence
     home-manager.nixosModules.home-manager
 
+    ../../../modules
     ../../../roles
   ];
   specialArgs = {

@@ 9,6 9,7 @@ inputs @ {
     impermanence.nixosModules.impermanence
     home-manager.nixosModules.home-manager
 
+    ../../../modules
     ../../../roles
   ];
   specialArgs = {