wip: still broken

2025-11-06 17:14:39 -05:00
parent 717e8c452d
commit 6561e37119
3 changed files with 32 additions and 16 deletions
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -1,9 +1,20 @@
 { pkgs, lib, role, ... }:
 {
  imports =
-    [ ./common.nix ]
-    ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix
-    ++ lib.optional pkgs.stdenv.isLinux ./linux.nix
-    ++ lib.optional (role == "workstation") ./workstation.nix
-    ++ lib.optional (role == "server") ./server.nix;
+    [ ./common.nix ];
+
+  config = lib.mkMerge [
+    (lib.mkIf pkgs.stdenv.isDarwin {
+      imports = [ ./darwin.nix ];
+    })
+    (lib.mkIf pkgs.stdenv.isLinux {
+      imports = [ ./linux.nix ];
+    })
+    (lib.mkIf (role == "workstation") {
+      imports = [ ./workstation.nix ];
+    })
+    (lib.mkIf (role == "server") {
+      imports = [ ./server.nix ];
+    })
+  ];
 }