working? plus cleanup and fallbacks

home/packages/default.nix

@@ -1,20 +1,11 @@
-{ pkgs, lib, role, ... }:
+{ lib, role, ... }:
 {
   imports =
-    [ ./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 ];
-    })
-  ];
-}
+    [
+      ./common.nix
+      ./darwin.nix
+      ./linux.nix
+    ]
+    ++ lib.optional (role == "workstation") ./workstation.nix
+    ++ lib.optional (role == "server") ./server.nix;
+}