From c2659206a0a4a24a74a055fc705a148c55f3044e Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 16 Mar 2025 17:18:24 +0000
Subject: [PATCH] hyprland: re-add system module

---
 hosts/odyssey/default.nix                 |  7 ++++---
 modules/nixos/default.nix                 |  1 +
 modules/nixos/system/desktop/hyprland.nix | 25 +++++++++++++++++++++++
 users/jordan/graphical/default.nix        |  3 +++
 users/jordan/graphical/hyprland.nix       |  7 +------
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 modules/nixos/system/desktop/hyprland.nix

diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix
index da51952..1a7b89f 100644
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -50,8 +50,6 @@
     capSysAdmin = true;
   };
 
-  services.displayManager.ly.enable = true;
-
   modules = {
     hardware.presonus-studio.enable = true;
     services = {
@@ -69,7 +67,10 @@
         repoPath = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo";
       };
     };
-    system.desktop.gnome.enable = lib.mkForce false;
+    system.desktop = {
+      gnome.enable = lib.mkForce false;
+      hyprland.enable = true;
+    };
   };
 
   system.stateVersion = "22.11";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f150ef0..b5f2b41 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,6 +6,7 @@
     ./services/postgresql.nix
     ./services/tailscale.nix
     ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
     ./system/desktop/mimeapps.nix
     ./system/wireless.nix
   ];
diff --git a/modules/nixos/system/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix
new file mode 100644
index 0000000..6988979
--- /dev/null
+++ b/modules/nixos/system/desktop/hyprland.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    ;
+  cfg = config.modules.system.desktop.hyprland;
+in
+{
+  options.modules.system.desktop.hyprland.enable = mkEnableOption "hyprland";
+
+  config = mkIf cfg.enable {
+    services.displayManager.ly.enable = true;
+
+    programs.hyprland = {
+      enable = true;
+      # withUWSM = true;
+    };
+  };
+}
diff --git a/users/jordan/graphical/default.nix b/users/jordan/graphical/default.nix
index 92a886b..ca97d31 100644
--- a/users/jordan/graphical/default.nix
+++ b/users/jordan/graphical/default.nix
@@ -13,6 +13,9 @@
     ]
     ++ lib.optionals osConfig.modules.system.desktop.gnome.enable [
       ./gnome.nix
+    ]
+    ++ lib.optionals osConfig.modules.system.desktop.hyprland.enable [
+      ./hyprland.nix
     ];
 
   home.packages = with pkgs; [
diff --git a/users/jordan/graphical/hyprland.nix b/users/jordan/graphical/hyprland.nix
index 33781c8..a21626b 100644
--- a/users/jordan/graphical/hyprland.nix
+++ b/users/jordan/graphical/hyprland.nix
@@ -4,15 +4,10 @@
 }:
 
 {
-  programs.hyprland = {
+  wayland.windowManager.hyprland = {
     enable = true;
-    # withUWSM = true;
   };
 
-  # programs.uwsm.enable = true;
-
-  networking.networkmanager.enable = true;
-
   home.packages = with pkgs.unstable; [
     adw-gtk3
     anyrun