From 3be9b64dd7d2913087310138f5afdc1d9df23d39 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Fri, 25 Apr 2025 21:25:22 +0100
Subject: [PATCH] hyprland: use uwsm

---
 modules/nixos/system/desktop/hyprland.nix    | 4 +---
 users/jordan/graphical/hyprland/default.nix  | 2 --
 users/jordan/graphical/hyprland/hypridle.nix | 2 +-
 users/jordan/graphical/hyprland/hyprlock.nix | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/nixos/system/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix
index 2480e1c..014f51a 100644
--- a/modules/nixos/system/desktop/hyprland.nix
+++ b/modules/nixos/system/desktop/hyprland.nix
@@ -16,13 +16,11 @@ in
   options.modules.system.desktop.hyprland.enable = mkEnableOption "hyprland";
 
   config = mkIf cfg.enable {
-    services.displayManager.ly.enable = true;
-
     networking.networkmanager.enable = true;
 
     programs.hyprland = {
       enable = true;
-      # withUWSM = true;
+      withUWSM = true;
     };
 
     nixpkgs.config.allowUnfree = true;
diff --git a/users/jordan/graphical/hyprland/default.nix b/users/jordan/graphical/hyprland/default.nix
index 05bfd31..fda18e1 100644
--- a/users/jordan/graphical/hyprland/default.nix
+++ b/users/jordan/graphical/hyprland/default.nix
@@ -117,8 +117,6 @@ in
         ];
       };
 
-      exec-once = "waybar";
-
       monitor = "desc:Dell Inc. DELL U3219Q HPTP413, preferred, auto, 1.2";
 
       input = {
diff --git a/users/jordan/graphical/hyprland/hypridle.nix b/users/jordan/graphical/hyprland/hypridle.nix
index 16c5fd6..b3d2c4f 100644
--- a/users/jordan/graphical/hyprland/hypridle.nix
+++ b/users/jordan/graphical/hyprland/hypridle.nix
@@ -4,7 +4,7 @@
 
 {
   services.hypridle = {
-    enable = false;
+    enable = true;
     settings = {
       general = {
         after_sleep_cmd = "hyprctl dispatch dpms on";
diff --git a/users/jordan/graphical/hyprland/hyprlock.nix b/users/jordan/graphical/hyprland/hyprlock.nix
index dbe35f6..ee217ef 100644
--- a/users/jordan/graphical/hyprland/hyprlock.nix
+++ b/users/jordan/graphical/hyprland/hyprlock.nix
@@ -4,7 +4,7 @@
 
 {
   programs.hyprlock = {
-    enable = false;
+    enable = true;
     settings = {
       general = {
         disable_loading_bar = false;