diff --git a/flake.lock b/flake.lock
index 4c77b150..963c4a0f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719664005,
-        "narHash": "sha256-mont9ptsywvCe7bd4Qgkdsb8+RBOrQ35Xj18PCYcrCs=",
+        "lastModified": 1719703194,
+        "narHash": "sha256-Nm8YkN6gN/vFQwk6xto1EkxWTJSc1dLt4/xpsJxzKbA=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "8f2a5ece0ba53e9d6dfe3e72d887b2f93a140973",
+        "rev": "9483c07bc35c85a60a788de686de0bfca690375d",
         "type": "github"
       },
       "original": {
diff --git a/home/core/cnst.nix b/home/core/cnst.nix
index d1456f7d..30470ca5 100644
--- a/home/core/cnst.nix
+++ b/home/core/cnst.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./git
-    ./hypr
     ./shell/cnst.nix
     ./appearance
   ];
diff --git a/hosts/core/default.nix b/hosts/core/default.nix
index 6392a536..7a897748 100644
--- a/hosts/core/default.nix
+++ b/hosts/core/default.nix
@@ -11,6 +11,7 @@
     ./zsh.nix
     ./cnix-pkgs.nix
     ./fonts.nix
+    ./hypr
   ];
   home-manager = {
     # useGlobalPkgs = true;
diff --git a/hosts/core/hypr/default.nix b/hosts/core/hypr/default.nix
new file mode 100644
index 00000000..320c92a1
--- /dev/null
+++ b/hosts/core/hypr/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [../../../home/extra/mako];
+
+  xdg.portal = let
+    hyprland = config.wayland.windowManager.hyprland.package;
+    xdph = pkgs.xdg-desktop-portal-hyprland.override {inherit hyprland;};
+  in {
+    extraPortals = [xdph];
+    configPackages = [hyprland];
+  };
+
+  environment.systemPackages = with pkgs; [
+    grimblast
+    slurp
+    hyprpicker
+    swaybg
+    tofi
+    gnome.gnome-calculator
+  ];
+
+  environment.variables = {
+    BROWSER = "firefox";
+    NIXOS_OZONE_WL = 1;
+    SDL_VIDEODRIVER = "wayland";
+    QT_QPA_PLATFORM = "wayland";
+    XDG_SESSION_TYPE = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+  };
+
+  programs.hyprland = {
+    enable = true;
+    package = pkgs.hyprland;
+    xwayland.enable = true;
+    extraConfig = ''
+      ${builtins.readFile ./hyprland.conf}
+    '';
+    systemd = {
+      enable = true;
+      extraCommands = [
+        "systemctl --user stop graphical-session.target"
+        "systemctl --user start hyprland-session.target"
+      ];
+    };
+  };
+}
diff --git a/hosts/core/hypr/hyprland.conf b/hosts/core/hypr/hyprland.conf
new file mode 100644
index 00000000..d63e0e49
--- /dev/null
+++ b/hosts/core/hypr/hyprland.conf
@@ -0,0 +1,7 @@
+# HYPRLAND CONFIGURATION
+
+source=./land/appearance.conf
+source=./land/inputs.conf
+source=./land/keybinds.conf
+source=./land/rules.conf
+source=./land/startup.conf
diff --git a/hosts/extra/steam/default.nix b/hosts/extra/steam/default.nix
index 96cf7d3a..dc3dbb54 100644
--- a/hosts/extra/steam/default.nix
+++ b/hosts/extra/steam/default.nix
@@ -24,6 +24,12 @@
           ];
       };
     };
+    mangohud = {
+      enable = true;
+      settings = {
+        full = true;
+      };
+    };
     gamemode = {
       enable = true;
       settings = {