From 6561e37119ca7ca2d6bea6e4be37b3ca4ed62742 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@auctioneersoftware.com>
Date: Thu, 6 Nov 2025 17:14:39 -0500
Subject: [PATCH] wip: still broken

---
 flake.nix                     | 21 ++++++++++++++-------
 home/packages/default.nix     | 21 ++++++++++++++++-----
 home/packages/workstation.nix |  6 ++----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4770e28..e9a541e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,8 @@
     myOverlays = { ... }: {
       nixpkgs.overlays = [
         rust-overlay.overlays.default
-      ] ++ (nixpkgs.lib.attrValues self.common.overlays);
+        self.common.overlays
+      ];
     };
   in {
     meta = import ./meta;
@@ -154,17 +155,23 @@
     # generic non-NixOS Linux machine
     homeConfigurations."generic" = let
       hostname = builtins.getEnv "HOSTNAME";
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      system = "x86_64-linux";
     in home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      # system = "x86_64-linux";
-      extraSpecialArgs = extraSpecialArgs // { 
+      pkgs = nixpkgs.legacyPackages.${system};
+      
+      extraSpecialArgs = {
+        inherit userName userEmail hostname;
+        ghostty = ghostty.packages.${system}.default;
         isNixOS = false; 
-        hostname = hostname;
         role = "workstation";
       };
       modules = [
-        myOverlays
+        {
+          nixpkgs.overlays = [
+            rust-overlay.overlays.default
+            self.common.overlays
+          ];
+        }
         ./home
       ];
     };
diff --git a/home/packages/default.nix b/home/packages/default.nix
index aad9bb1..b824755 100644
--- 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 ];
+    })
+  ];
 }
\ No newline at end of file
diff --git a/home/packages/workstation.nix b/home/packages/workstation.nix
index ec9d438..7a97699 100644
--- a/home/packages/workstation.nix
+++ b/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