modules/home/unfree: init

modules/home/default.nix

@@ -21,6 +21,7 @@ in
     ./desktop
     fishOverlayModule
     ./xdg.nix
+    ./unfree.nix
   ];
 
   programs.home-manager.enable = true;

modules/home/desktop/default.nix

@@ -23,6 +23,7 @@
       fontconfig
       signal-desktop
     ];
+    settei.unfree.allowedPackages = [ "signal-desktop" ];
 
     fonts.fontconfig.enable = true;
 

modules/home/unfree.nix

@@ -0,0 +1,19 @@
+# Copy of modules/system/unfree.nix
+{ config, lib, ... }:
+{
+  _file = ./unfree.nix;
+
+  options = {
+    settei.unfree.allowedPackages =
+      with lib;
+      mkOption {
+        type = types.listOf types.str;
+      };
+  };
+
+  config = {
+    nixpkgs.config.allowUnfreePredicate = lib.mkForce (
+      pkg: builtins.elem (lib.getName pkg) config.settei.unfree.allowedPackages
+    );
+  };
+}

modules/system/unfree.nix

@@ -1,4 +1,15 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  username,
+  ...
+}:
+let
+  # TODO: Maybe eventually support multi-user
+  userAllowedPackages =
+    lib.optionals config.settei.user.enable
+      config.home-manager.users.${username}.settei.unfree.allowedPackages;
+in
 {
   _file = ./unfree.nix;
 
@@ -8,12 +19,13 @@
       with lib;
       mkOption {
         type = types.listOf types.str;
+        default = [ ];
       };
   };
 
   config = {
     nixpkgs.config.allowUnfreePredicate = lib.mkForce (
-      pkg: builtins.elem (lib.getName pkg) config.settei.unfree.allowedPackages
+      pkg: builtins.elem (lib.getName pkg) (config.settei.unfree.allowedPackages ++ userAllowedPackages)
     );
   };
 }