diff --git a/flake.lock b/flake.lock
index c037fd21..83ca3238 100644
--- a/flake.lock
+++ b/flake.lock
@@ -506,6 +506,26 @@
         "type": "github"
       }
     },
+    "hm": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722321190,
+        "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -528,26 +548,6 @@
       }
     },
     "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722321190,
-        "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
@@ -1028,7 +1028,7 @@
         "flake-compat": "flake-compat_4",
         "flake-parts": "flake-parts_3",
         "git-hooks": "git-hooks",
-        "home-manager": "home-manager_3",
+        "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
           "nixpkgs"
@@ -1132,7 +1132,7 @@
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils_2",
         "hardware": "hardware",
-        "home-manager": "home-manager_2",
+        "hm": "hm",
         "hyprland": "hyprland",
         "lanzaboote": "lanzaboote",
         "nix-gaming": "nix-gaming",
diff --git a/flake.nix b/flake.nix
index 3b75282d..69c13717 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
       inputs.systems.follows = "systems";
     };
     flake-compat.url = "github:edolstra/flake-compat";
-    home-manager = {
+    hm = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
diff --git a/home/cnst.nix b/home/cnst.nix
index 2aac2224..374da0fa 100644
--- a/home/cnst.nix
+++ b/home/cnst.nix
@@ -27,10 +27,4 @@
 
   # let HM manage itself when in standalone mode
   programs.home-manager.enable = true;
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      lib = prev.lib // {colors = import "${self}/lib/colors" lib;};
-    })
-  ];
 }
diff --git a/nixos/core/home-manager.nix b/nixos/core/home-manager.nix
new file mode 100644
index 00000000..0c861d94
--- /dev/null
+++ b/nixos/core/home-manager.nix
@@ -0,0 +1,10 @@
+{inputs, ...}: {
+  imports = [
+    inputs.hm.nixosModules.default
+  ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+  };
+}
diff --git a/nixos/default.nix b/nixos/default.nix
index e649cc76..915dc7df 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -3,6 +3,7 @@ let
     ./core/hyprland.nix
     ./core/zsh.nix
     ./core/fonts.nix
+    ./core/home-manager.nix
 
     ./locale
 
diff --git a/nixos/hosts/cnix/default.nix b/nixos/hosts/cnix/default.nix
index 96d92aa6..854140a7 100644
--- a/nixos/hosts/cnix/default.nix
+++ b/nixos/hosts/cnix/default.nix
@@ -36,7 +36,6 @@ in {
   programs.dconf.enable = true;
 
   imports = [
-    inputs.home-manager.nixosModules.home-manager
     ./system.nix
     ./hardware-configuration.nix
     ./substituters.nix