diff --git a/flake.lock b/flake.lock
index ec9f4ea..242e4a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -26,16 +26,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "lastModified": 1716457508,
+        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -57,6 +56,22 @@
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1716361217,
+        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1716061101,
         "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
@@ -72,13 +87,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716137900,
-        "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
+        "lastModified": 1716330097,
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
         "type": "github"
       },
       "original": {
@@ -88,22 +103,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1716218643,
-        "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
         "lastModified": 1713248628,
@@ -160,7 +159,7 @@
         "ghettoptt": "ghettoptt",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-stable": "nixpkgs-stable",
         "notlistener": "notlistener",
         "sops-nix": "sops-nix"
       }
@@ -168,7 +167,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
         "lastModified": 1716244104,
diff --git a/flake.nix b/flake.nix
index ddefb40..10180c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,9 +6,10 @@
     nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager?ref=release-23.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     sops-nix.url = "github:Mic92/sops-nix";
     notlistener.url = "git+https://git.t-juice.club/torjus/notlistener?ref=master";
     ghettoptt.url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";
@@ -18,6 +19,7 @@
     { self
     , nixpkgs
     , nixpkgs-stable
+    , hyprland
     , sops-nix
     , notlistener
     , ghettoptt
diff --git a/hosts/common/cachix.nix b/hosts/common/cachix.nix
new file mode 100644
index 0000000..edd6d9c
--- /dev/null
+++ b/hosts/common/cachix.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  nix.settings = {
+    substituters = [ "https://hyprland.cachix.org" ];
+    trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
+  };
+}
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
new file mode 100644
index 0000000..9f92d24
--- /dev/null
+++ b/hosts/common/default.nix
@@ -0,0 +1,5 @@
+{ inputs, self, pks, ... }: {
+  imports = [
+    ./cachix.nix
+  ];
+}
diff --git a/hosts/gunter/configuration.nix b/hosts/gunter/configuration.nix
index 70a12c6..7824e6b 100644
--- a/hosts/gunter/configuration.nix
+++ b/hosts/gunter/configuration.nix
@@ -4,6 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../system/monitoring.nix
+    ../common
   ];
 
   # Sops stuff
@@ -93,6 +94,7 @@
   services.xserver.windowManager.i3.enable = true;
   programs.hyprland = {
     enable = true;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };
diff --git a/hosts/magicman/configuration.nix b/hosts/magicman/configuration.nix
index 50c3dc0..615d0a5 100644
--- a/hosts/magicman/configuration.nix
+++ b/hosts/magicman/configuration.nix
@@ -1,7 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ];
+  imports = [
+    ./hardware-configuration.nix
+    ../common
+  ];
 
   # Bootloader stuff
   boot.kernelParams = [