diff --git a/home/core/cnst.nix b/home/core/cnst.nix
index 30470ca5..d1456f7d 100644
--- a/home/core/cnst.nix
+++ b/home/core/cnst.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./git
+    ./hypr
     ./shell/cnst.nix
     ./appearance
   ];
diff --git a/home/core/hypr/default.nix b/home/core/hypr/default.nix
index 6ee09ae4..cecfc1a1 100644
--- a/home/core/hypr/default.nix
+++ b/home/core/hypr/default.nix
@@ -13,7 +13,6 @@
     extraPortals = [xdph];
     configPackages = [hyprland];
   };
-
   home.packages = with pkgs; [
     grimblast
     slurp
@@ -22,29 +21,10 @@
     tofi
     gnome.gnome-calculator
   ];
-
-  home.sessionVariables = {
-    BROWSER = "firefox";
-    NIXOS_OZONE_WL = 1;
-    SDL_VIDEODRIVER = "wayland";
-    QT_QPA_PLATFORM = "wayland";
-    XDG_SESSION_TYPE = "wayland";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-  };
-
   wayland.windowManager.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/home/extra/cnst.nix b/home/extra/cnst.nix
index 052b81f3..edaad4ef 100644
--- a/home/extra/cnst.nix
+++ b/home/extra/cnst.nix
@@ -4,6 +4,7 @@
     ./firefox
     ./neovim
     ./lutris
+    ./mako
   ];
   home.packages = with pkgs; [
     # APPLICATIONS
diff --git a/hosts/core/default.nix b/hosts/core/default.nix
index 7a897748..29eac38c 100644
--- a/hosts/core/default.nix
+++ b/hosts/core/default.nix
@@ -11,7 +11,7 @@
     ./zsh.nix
     ./cnix-pkgs.nix
     ./fonts.nix
-    ./hypr
+    ./hyprland.nix
   ];
   home-manager = {
     # useGlobalPkgs = true;
diff --git a/hosts/core/hypr/hyprland.conf b/hosts/core/hypr/hyprland.conf
deleted file mode 100644
index d63e0e49..00000000
--- a/hosts/core/hypr/hyprland.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/core/hypr/default.nix b/hosts/core/hyprland.nix
similarity index 50%
rename from hosts/core/hypr/default.nix
rename to hosts/core/hyprland.nix
index 320c92a1..02f616f0 100644
--- a/hosts/core/hypr/default.nix
+++ b/hosts/core/hyprland.nix
@@ -1,28 +1,4 @@
-{
-  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
-  ];
-
+{pkgs, ...}: {
   environment.variables = {
     BROWSER = "firefox";
     NIXOS_OZONE_WL = 1;
@@ -36,9 +12,6 @@
     enable = true;
     package = pkgs.hyprland;
     xwayland.enable = true;
-    extraConfig = ''
-      ${builtins.readFile ./hyprland.conf}
-    '';
     systemd = {
       enable = true;
       extraCommands = [