From 84ac1c05e2035aa02c3942021f2d343fe4499a4d Mon Sep 17 00:00:00 2001
From: kenji <kenji@hakase>
Date: Wed, 20 Aug 2025 13:23:21 -0500
Subject: [PATCH] a

---
 modules/desktop/desktop.nix          |  7 +------
 modules/desktop/hyprland/default.nix | 20 ++++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
index ee74709e3..0de0ed03e 100644
--- a/modules/desktop/desktop.nix
+++ b/modules/desktop/desktop.nix
@@ -9,6 +9,7 @@
 in {
   imports = [
     ../options.nix
+    ./hyprland/default.nix
   ];
   # ++ lib.optionals (cfg.enable && cfg.settings.hyprland.useNixForConf) [
   #   ./hyprland/default.nix
@@ -25,12 +26,6 @@ in {
 
     home.file = {
       ".config/quickshell".source = builtins.path {path = ../../.config/quickshell;};
-      ".config/hypr" = lib.mkIf (!cfg.settings.hyprland.useNixForConf) {
-        source = builtins.path {
-          path = ../../.config/hypr;
-          # executable = true;
-        };
-      };
 
       # dont forget hypridle and hyprlock!!!
       ".config/kitty".source = builtins.path {path = ../../.config/kitty;};
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index 62075ac01..9a68afc36 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -12,7 +12,7 @@ in {
     systemd.enable = true;
   };
 
-  imports = [
+  imports = lib.optionals cfg.settings.hyprland.useNixForConf [
     ./hypr/keybinds.nix
     ./hypr/execs.nix
     ./hypr/rules.nix
@@ -22,18 +22,14 @@ in {
     ./hypridle.nix
   ];
 
-  home.file = {
-    ".config/hypr/scripts" = {
-      source = builtins.path {
-        path = ../../.config/hypr/hyprland/scripts;
-        executable = true;
+  config = lib.mkIf cfg.settings.hyprland.useNixForConf {
+    home.file = {
+      ".config/hypr/scripts" = {
+        source = builtins.path {
+          path = ../../.config/hypr/hyprland/scripts;
+          executable = true;
+        };
       };
     };
   };
-
-  # wayland.windowManager.hyprland = {
-  #   enable = true;
-  #   xwayland.enable = true;
-  #   systemd.enable = true;
-  # };
 }