diff --git a/flake.nix b/flake.nix
index 235c233..9ef3ffd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,20 +57,16 @@
     };
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    ...
-  }: {
+  outputs = {nixpkgs, ...} @ inputs: {
     nixosConfigurations = {
       wildfire = nixpkgs.lib.nixosSystem {
-        specialArgs = {inputs = self.inputs // {inherit self;};};
+        specialArgs = {inherit inputs;};
         modules = [
           ./hosts/wildfire/configuration.nix
         ];
       };
       hurricane = nixpkgs.lib.nixosSystem {
-        specialArgs = {inputs = self.inputs // {inherit self;};};
+        specialArgs = {inherit inputs;};
         modules = [
           ./hosts/hurricane/configuration.nix
         ];
diff --git a/modules/desktops/hyprland-desktop.nix b/modules/desktops/hyprland-desktop.nix
index ea7b024..25d9462 100644
--- a/modules/desktops/hyprland-desktop.nix
+++ b/modules/desktops/hyprland-desktop.nix
@@ -11,10 +11,19 @@
     power-profiles-daemon.enable = true;
   };
 
+  nix.settings = {
+    substituters = ["https://hyprland.cachix.org"];
+    trusted-substituters = ["https://hyprland.cachix.org"];
+    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+  };
+
   programs = {
     hyprland = {
       enable = true;
       withUWSM = true;
+      # Only enable the flake packages after Cachix has already been enabled
+      #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      #portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     };
     regreet.enable = true;
     uwsm = {