diff --git a/flake.nix b/flake.nix
index 4ab36f0..5e05aeb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,13 +63,6 @@
   outputs = { self, nixpkgs, nix-darwin, home-manager, ... } @ inputs:
   let
     blades = import ./hosts/servers/blades/systems.nix { inherit inputs; };
-    homeConf = home-manager.darwinModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      
-      # Pass the home.nix configuration to your specific user profile
-      home-manager.users."nyxerinys" = import ./modules/home/nyxerinys;
-    };
   in
   {
     nixosConfigurations = {
@@ -78,6 +71,7 @@
           ./hosts/base.nix
           ./hosts/apollo
           ./modules/home
+          home-manager.nixosModules.home-manager
         ];
         specialArgs = { inherit inputs; };
       };
@@ -109,6 +103,7 @@
         # ./hosts/base.nix
         ./hosts/artemis
         ./modules/home
+        home-manager.darwinModules.home-manager
       ];
       specialArgs = { inherit inputs; };
     };
diff --git a/hosts/apollo/default.nix b/hosts/apollo/default.nix
index d1931f5..d7713b4 100644
--- a/hosts/apollo/default.nix
+++ b/hosts/apollo/default.nix
@@ -9,6 +9,10 @@
     ./hyprland.nix
   ];
 
+  nyxs-nix.services = {
+    home.enable = true;
+  };
+
   networking.hostName = "apollo";
   networking.hostId = "40ced703";
   networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix
index 05c32f1..438d78b 100644
--- a/hosts/artemis/default.nix
+++ b/hosts/artemis/default.nix
@@ -26,10 +26,7 @@
   ];
 
   nyxs-nix.services = {
-    home ={
-      enable = true;
-      isMacOS = true;
-    };
+    home.enable = true;
   };
   
   security.pam.services.sudo_local.touchIdAuth = true;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 30f2439..8947437 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -3,11 +3,7 @@ with lib;
 let
   cfg = config.nyxs-nix.services.home;
 in {
-  imports = if pkgs.stdenv.isLinux
-  then [ inputs.home-manager.nixosModules.home-manager ]
-  else [ inputs.home-manager.darwinModules.home-manager ];
-
-  options.nyxs-nix.services.home = with types; {
+  options.nyxs-nix.services.home = with lib.types; {
     enable = mkEnableOption "Enable Home Manager";
   };
 
diff --git a/modules/home/nyxerinys/default.nix b/modules/home/nyxerinys/default.nix
index 609e345..14b8fa3 100644
--- a/modules/home/nyxerinys/default.nix
+++ b/modules/home/nyxerinys/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = if pkgs.stdenv.pkgs.stdenv.isLinux
+  imports = if pkgs.stdenv.isLinux
   then [ ./linux ]
   else [ ./mac ];