From 4e4ad2e7a8a78faea45bdb3fb06e27d1b1c03ec4 Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <patrick@wanderingcrow.net>
Date: Sat, 21 Sep 2024 16:05:13 -0400
Subject: [PATCH] Combine config sections

---
 modules/hypr/default.nix | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/hypr/default.nix b/modules/hypr/default.nix
index 7602ba5..638e25f 100644
--- a/modules/hypr/default.nix
+++ b/modules/hypr/default.nix
@@ -3,12 +3,23 @@
     options.hyprland.enable = lib.mkEnableOption "enables hyprland";
     options.hypr.enable = lib.mkEnableOption "enables hypr";
 
-    config.programs.hyprland = lib.mkIf config.hyprland.enable {
-        enable = true;
-        package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-        portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+    config = {
+        programs.hyprland = lib.mkIf config.hyprland.enable {
+            enable = true;
+            package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+            portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+        };
+        
+        xserver = lib.mkIf config.hypr.enable {
+            enable = true;
+            windowManager.hypr = {
+                enable = true;
+            };
+            displayManager.startx.enable = true;
+        };
     };
-    
+
+
     config.environment = lib.mkIf config.hyprland.enable {
         sessionVariables = {
             NIXOS_OZONE_WL = "1";
@@ -18,14 +29,4 @@
             hyprcursor
         ];
     };
-    
-    config = lib.mkIf config.hypr.enable {
-        xserver = {
-            enable = true;
-            windowManager.hypr = {
-                enable = true;
-            };
-            displayManager.startx.enable = true;
-        };
-    };
 }