diff --git a/home/hyprland.nix b/home/hyprland.nix
new file mode 100644
index 00000000..26d7cef7
--- /dev/null
+++ b/home/hyprland.nix
@@ -0,0 +1,49 @@
+{ config, pkgs, ... }:
+
+{
+    # Packages that should be installed to the user profile.
+    home.packages = with pkgs; [
+      bemenu
+      brightnessctl
+      hyprcursor
+      hypridle
+      hyprlock
+      hyprpaper
+      hyprshade
+      hyprshot
+      mako
+      overskride
+      udiskie
+      xfce.thunar
+    ];
+
+    wayland.windowManager.hyprland = {
+      enable = true;
+      extraConfig = builtins.readFile ./dotfiles/hyprland.conf;
+    };
+
+    xdg.configFile."hypr/hypridle.conf".source = ./dotfiles/hypridle.conf;
+    programs.waybar.enable = true;
+    programs.waybar.settings = {
+        mainBar = {
+            layer = "top";
+            position = "top";
+            height = 36;
+            output = [
+                "eDP-1"
+                "HDMI-A-1"
+            ];
+            modules-left = [ "hyprland/workspaces" "hyprland/mode" ];
+            modules-center = [ "hyprland/window" ];
+            modules-right = [ "tray" "battery" "clock"];
+
+            "hyprland/workspaces" = {
+                all-outputs = true;
+            };
+            "clock" = {
+                "interval" = 60;
+                "format" = "{:%I:%M}";
+            };
+        };
+    };
+}
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 4263dc90..a36767c9 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -11,20 +11,4 @@
     services.upower.enable = true;
 
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
-    environment.systemPackages = with pkgs; [
-      bemenu
-      brightnessctl
-      hyprcursor
-      hypridle
-      hyprlock
-      hyprpaper
-      hyprshade
-      hyprshot
-      mako
-      nheko
-      overskride
-      udiskie
-      waybar
-      xfce.thunar
-    ];
 }