wip: still broken

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 ];
+    })
+  ];
 }

home/packages/workstation.nix

@@ -8,7 +8,7 @@
   isNixOS,
   ...
 }: {
-  imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [
+  imports = [
     ../terminal.nix
     ../broswer.nix
     ../zellij.nix
@@ -16,9 +16,7 @@
     ../k9s.nix
     ../krew.nix
     ../direnv.nix
-  ] ++ lib.optional isNixOS [
-    ../sway.nix
-  ];
+  ] ++ lib.optional isNixOS ../sway.nix;
 
   home.packages = with pkgs; [
     fh