diff --git a/flake.lock b/flake.lock
index 3b73363..b32b233 100644
--- a/flake.lock
+++ b/flake.lock
@@ -413,11 +413,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735053786,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "lastModified": 1735381016,
+        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
         "type": "github"
       },
       "original": {
@@ -542,11 +542,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1735318145,
-        "narHash": "sha256-TBtdzTTdlYLX+KJ3tQw1JQeJ4q8xGzzVD+BGn8YvaWQ=",
+        "lastModified": 1735336272,
+        "narHash": "sha256-kPRvGB80n5Nmqw17z+im4+ssDFGOfQSnP2LKQNdprBs=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "534adad6b1940fcf0929a59be62dc78e5effaccc",
+        "rev": "c600e1aaff293303c8256aca7d2889fc4289e8c2",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734796073,
-        "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
+        "lastModified": 1735316583,
+        "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
+        "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8",
         "type": "github"
       },
       "original": {
@@ -833,11 +833,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1735291276,
+        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
         "type": "github"
       },
       "original": {
@@ -865,11 +865,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1735291276,
+        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
         "type": "github"
       },
       "original": {
@@ -926,11 +926,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735331663,
-        "narHash": "sha256-iku/Rn9blbz0LCLq0MvB8ezuB4FCtep9hjP9QzGTt/4=",
+        "lastModified": 1735378670,
+        "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "60e88b870c8477bcb043792025eca4c9bb4974e3",
+        "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 35bf0a6..c011a92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
 pkgs = import nixpkgs {
 	system = x86;
 	overlays = [
+	inputs.hyprland.overlays.default
         ];
 	config = {
 	    allowBroken = true;
@@ -93,6 +94,7 @@ pkgs = import nixpkgs {
 pkgs = import nixpkgs {
 	system = arm;
 	overlays = [
+	    inputs.hyprland.overlays.default
 	    #(import ./nixos/macos/widevine.nix)
 	];
 	config = {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 77124ed..b0d0952 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -7,7 +7,6 @@
   imports =
     [
 	inputs.sops-nix.nixosModules.sops
-	inputs.home-manager.nixosModules.default
 	inputs.stylix.nixosModules.stylix
 	inputs.nixos-facter-modules.nixosModules.facter
 	inputs.home-manager.nixosModules.default
@@ -277,6 +276,8 @@
   };
 
   home-manager = {
+	useGlobalPkgs = true;
+	useUserPackages = true;
 	extraSpecialArgs = {inherit pkgs; inherit hwconfig; inherit first-nixos-install; inherit inputs;};
   };
   stylix = {
diff --git a/nixos/hardware/apple-silicon-linux/default.nix b/nixos/hardware/apple-silicon-linux/default.nix
index 5b5f3df..afd2b8d 100644
--- a/nixos/hardware/apple-silicon-linux/default.nix
+++ b/nixos/hardware/apple-silicon-linux/default.nix
@@ -21,9 +21,12 @@ in
 	#    powertop.enable = true;
 	#};
 	#hardware.graphics.enable32Bit = lib.mkForce false;
-	environment.systemPackages = with pkgs; [mesa mesa.drivers 
-	#widevine-cdm 
-	#widevinecdm-aarch64
+	environment.systemPackages = with pkgs; [
+	    #mesa
+	    #mesa.drivers
+	    mesa-asahi-edge
+	    #widevine-cdm 
+	    #widevinecdm-aarch64
 	];
 
 }
diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix
index 698055b..1f3314b 100644
--- a/nixos/modules/hyprland/default.nix
+++ b/nixos/modules/hyprland/default.nix
@@ -85,7 +85,7 @@
 	    };
 	};
 	configPackages = with pkgs; [
-	    inputs.hyprland.packages.${hwconfig.system}.xdg-desktop-portal-hyprland
+	    xdg-desktop-portal-hyprland
 	    kdePackages.xdg-desktop-portal-kde
 	];
     };
@@ -100,8 +100,6 @@
 
     programs.hyprland = {
 	enable = true;
-  	package = inputs.hyprland.packages."${hwconfig.system}".hyprland;
-	portalPackage = inputs.hyprland.packages.${hwconfig.system}.xdg-desktop-portal-hyprland;
   	xwayland.enable = true;
 	systemd.setPath.enable = true;
     };