a

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;};

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,6 +22,7 @@ in {
     ./hypridle.nix
   ];
 
+  config = lib.mkIf cfg.settings.hyprland.useNixForConf {
     home.file = {
       ".config/hypr/scripts" = {
         source = builtins.path {
@@ -30,10 +31,5 @@ in {
         };
       };
     };
-
-  # wayland.windowManager.hyprland = {
-  #   enable = true;
-  #   xwayland.enable = true;
-  #   systemd.enable = true;
-  # };
+  };
 }