users/jordan/graphical/default.nix

@@ -15,7 +15,7 @@
       ./gnome.nix
     ]
     ++ lib.optionals osConfig.modules.system.desktop.hyprland.enable [
-      ./hyprland
+      ./hyprland.nix
     ];
 
   home.packages = with pkgs; [

users/jordan/graphical/hyprland.nix

@@ -1,41 +1,12 @@
 {
-  lib,
   pkgs,
-  osConfig,
   ...
 }:
-let
-  inherit (lib)
-    elem
-    optionals
-    ;
-in
-{
-  imports = [
-    ./hypridle.nix
-    ./hyprlock.nix
-    ./hyprpaper.nix
-  ];
 
+{
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
-      env =
-        optionals (elem "nvidia" osConfig.services.xserver.videoDrivers) [
-          "GBM_BACKEND,nvidia-drm"
-          "LIBVA_DRIVER_NAME,nvidia"
-        ]
-        ++ [
-          "_JAVA_AWT_WM_NONREPARENTING,1"
-          "GDK_BACKEND,wayland"
-          "MOZ_ENABLE_WAYLAND,1"
-          "NIXOS_OZONE_WL,1"
-          "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
-          "QT_QPA_PLATFORM,wayland"
-          "SDL_VIDEODRIVER,wayland"
-          "XDG_SESSION_TYPE,wayland"
-        ];
-
       general = {
         gaps_in = 5;
         gaps_out = 20;
@@ -196,6 +167,76 @@ in
     };
   };
 
+  services.hypridle = {
+    enable = false;
+    settings = {
+      general = {
+        after_sleep_cmd = "hyprctl dispatch dpms on";
+        ignore_dbus_inhibit = false;
+        lock_cmd = "hyprlock";
+      };
+
+      listener = [
+        {
+          timeout = 900;
+          on-timeout = "hyprlock";
+        }
+        {
+          timeout = 1200;
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
+      ];
+    };
+  };
+
+  programs.hyprlock = {
+    enable = false;
+    settings = {
+      general = {
+        disable_loading_bar = false;
+        grace = 300;
+        hide_cursor = true;
+        no_fade_in = false;
+      };
+
+      background = [
+        {
+          path = "screenshot";
+          blur_passes = 3;
+          blur_size = 8;
+        }
+      ];
+
+      input-field = [
+        {
+          size = "200, 50";
+          position = "0, -80";
+          monitor = "";
+          dots_center = true;
+          fade_on_empty = false;
+          font_color = "rgb(202, 211, 245)";
+          inner_color = "rgb(91, 96, 120)";
+          outer_color = "rgb(24, 25, 38)";
+          outline_thickness = 5;
+          placeholder_text = "Password...";
+          shadow_passes = 2;
+        }
+      ];
+    };
+  };
+
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      ipc = "on";
+      splash = false;
+      wallpaper = [
+        ",/home/jordan/Pictures/Aurora.png"
+      ];
+    };
+  };
+
   home.packages = with pkgs.unstable; [
     adw-gtk3
     anyrun

users/jordan/graphical/hyprland/hypridle.nix

@@ -1,28 +0,0 @@
-{
-  ...
-}:
-
-{
-  services.hypridle = {
-    enable = false;
-    settings = {
-      general = {
-        after_sleep_cmd = "hyprctl dispatch dpms on";
-        ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
-      };
-
-      listener = [
-        {
-          timeout = 900;
-          on-timeout = "hyprlock";
-        }
-        {
-          timeout = 1200;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
-      ];
-    };
-  };
-}

users/jordan/graphical/hyprland/hyprlock.nix

@@ -1,41 +0,0 @@
-{
-  ...
-}:
-
-{
-  programs.hyprlock = {
-    enable = false;
-    settings = {
-      general = {
-        disable_loading_bar = false;
-        grace = 300;
-        hide_cursor = true;
-        no_fade_in = false;
-      };
-
-      background = [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
-
-      input-field = [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          placeholder_text = "Password...";
-          shadow_passes = 2;
-        }
-      ];
-    };
-  };
-}

users/jordan/graphical/hyprland/hyprpaper.nix

@@ -1,21 +0,0 @@
-{
-  ...
-}:
-
-{
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-      splash = false;
-
-      preload = [
-        "/home/jordan/Pictures/Aurora.png"
-      ];
-
-      wallpaper = [
-        ",/home/jordan/Pictures/Aurora.png"
-      ];
-    };
-  };
-}