From 0a231108eb91d0f2b606c93433e4178ea4a0581a Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <eclarkboman@gmail.com>
Date: Tue, 29 Jul 2025 14:09:56 +1000
Subject: [PATCH] source hyprland from nixpkgs not flake dependency

also implements recommendation that hyprland.withUSWM be enabled
---
 flake.nix                    | 3 ---
 hosts/lolcathost/default.nix | 5 +----
 hosts/myputer/default.nix    | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index fc69002..b538d4a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,6 @@
 
     grub2-themes.url = "github:vinceliuice/grub2-themes";
 
-    # is this necessary? (aren't I enabling it in `configuration.nix` anyways?)
-    hyprland.url = "github:hyprwm/Hyprland";
-
     ags.url = "github:Aylur/ags";
 
     colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a";
diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix
index e3a67eb..0fad2e7 100755
--- a/hosts/lolcathost/default.nix
+++ b/hosts/lolcathost/default.nix
@@ -291,13 +291,10 @@ in {
     prismlauncher # minecraft
   ];
 
-  # Enable the use of certain programs
   programs = {
     hyprland = {
       enable = true;
-      #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      #portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-
+      withUWSM = true; # Universal Wayland Session Manager
       xwayland.enable = true;
     };
 
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 42f32f5..3bb4736 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -261,10 +261,7 @@ in {
   programs = {
     hyprland = {
       enable = true;
-      # TODO: uncomment, I did this when hyprland wasn't working
-      #package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      #portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-
+      withUWSM = true; # Universal Wayland Session Manager
       xwayland.enable = true;
     };