mass migration

modules/desktop/desktop.nix

@@ -9,41 +9,51 @@
 in {
   imports = [
     ../options.nix
-    ./hyprland/default.nix
   ];
-  # ++ lib.optionals (cfg.enable && cfg.settings.hyprland.useNixForConf) [
-  #   ./hyprland/default.nix
-  # ];
 
   config = lib.mkIf cfg.enable {
     wayland.windowManager.hyprland = {
       enable = true;
       xwayland.enable = true;
       systemd.enable = true;
+
+      settings = lib.mkMerge [
+        (import ./hyprland/hypr/keybinds.nix {inherit config pkgs;})
+        (import ./hyprland/hypr/execs.nix {inherit config pkgs;})
+        (import ./hyprland/hypr/rules.nix {inherit config pkgs;})
+        (import ./hyprland/hypr/env.nix {inherit config pkgs;})
+        (import ./hyprland/hypr/colours.nix {inherit config pkgs;})
+      ];
     };
-    # imports = lib.optionals cfg.settings.hyprland.useNixForConf [
-    #   ./hyprland/hypr/keybinds.nix
-    #   ./hyprland/hypr/execs.nix
-    #   ./hyprland/hypr/rules.nix
-    #   ./hyprland/hypr/env.nix
-    #   ./hyprland/hypr/colours.nix
-    # ];
 
-    home.file = {
+    home.file = lib.mkMerge [
+      (lib.mkIf cfg.settings.hyprland.useNixForConf {
+        ".config/hypr/scripts" = {
+          source = builtins.path {
+            path = ../../.config/hypr/hyprland/scripts;
+            executable = true;
+          };
+        };
+      })
+      (lib.mkIf (!cfg.settings.hyprland.useNixForConf) {
+        ".config/hypr" = {
+          source = builtins.path {
+            path = ../../.config/hypr;
+          };
+        };
+      })
+      {
         ".config/quickshell".source = builtins.path {path = ../../.config/quickshell;};
-
-      # dont forget hypridle and hyprlock!!!
         ".config/kitty".source = builtins.path {path = ../../.config/kitty;};
         ".config/foot".source = builtins.path {path = ../../.config/foot;};
         ".config/matugen".source = builtins.path {path = ../../.config/matugen;};
-
-      # wont modify these in nix format, coz im lazy
         ".config/qt5ct".source = builtins.path {path = ../../.config/qt5ct;};
         ".config/qt6ct".source = builtins.path {path = ../../.config/qt6ct;};
         ".config/wlogout".source = builtins.path {path = ../../.config/wlogout;};
         ".config/Kvantum".source = builtins.path {path = ../../.config/Kvantum;};
         ".config/xdg-desktop-portal".source = builtins.path {path = ../../.config/xdg-desktop-portal;};
-    };
+      }
+    ];
 
     home.packages =
       import ../packages.nix {inherit pkgs;}

modules/desktop/hyprland/default.nix

@@ -6,8 +6,7 @@
 }: let
   cfg = config.programs.illogical-impulse;
 in {
-
-  imports = lib.optionals cfg.settings.hyprland.useNixForConf [
+  imports = [
     ./hypr/keybinds.nix
     ./hypr/execs.nix
     ./hypr/rules.nix

modules/desktop/hyprland/hypr/env.nix

@@ -3,28 +3,22 @@
   pkgs,
   ...
 }: {
-  wayland.windowManager.hyprland.settings = {
+  # This file only defines the `env` attribute, which is a part of the settings.
   env = [
-      # Input method
     "QT_IM_MODULE, fcitx"
     "XMODIFIERS, @im=fcitx"
     "SDL_IM_MODULE, fcitx"
     "GLFW_IM_MODULE, ibus"
     "INPUT_METHOD, fcitx"
 
-      # Wayland
     "ELECTRON_OZONE_PLATFORM_HINT, auto"
 
-      # Themes
     "QT_QPA_PLATFORM, wayland"
     "QT_QPA_PLATFORMTHEME, kde"
     "XDG_MENU_PREFIX, plasma-"
 
-      # Virtual environment
     "ILLOGICAL_IMPULSE_VIRTUAL_ENV, ~/.local/state/quickshell/.venv"
 
-      # Terminal application
     "TERMINAL, kitty -1"
   ];
-  };
 }

modules/desktop/hyprland/hypr/general.nix

@@ -3,7 +3,6 @@
   pkgs,
   ...
 }: {
-  wayland.windowManager.hyprland.settings = {
   monitor = [
     ",preferred,auto,1,transform, 0"
     # "HDMI-A-1,1920x1080@60,1920x0,1,mirror,eDP-1"
@@ -151,5 +150,4 @@
     gesture_distance = 300;
     gesture_positive = false;
   };
-  };
 }

modules/desktop/hyprland/hypr/keybinds.nix

@@ -3,7 +3,6 @@
   pkgs,
   ...
 }: {
-  wayland.windowManager.hyprland.settings = {
   # Shell keybinds
   bindi = [
     "Super, Super_L, Toggle overview, global, quickshell:overviewToggleRelease"
@@ -185,5 +184,4 @@
     "Super, Minus, exec, qs -c $qsConfig ipc call TEST_ALIVE || ~/.config/hypr/hyprland/scripts/zoom.sh decrease 0.1"
     "Super, Equal, exec, qs -c $qsConfig ipc call TEST_ALIVE || ~/.config/hypr/hyprland/scripts/zoom.sh increase 0.1"
   ];
-  };
 }

modules/desktop/hyprland/hypr/rules.nix

@@ -3,7 +3,6 @@
   pkgs,
   ...
 }: {
-  wayland.windowManager.hyprland.settings = {
   windowrulev2 = [
     # Uncomment to apply global transparency to all windows:
     # "opacity 0.89 override 0.89 override, class:.*"
@@ -149,5 +148,4 @@
     "blur, shell:notifications"
     "ignorealpha 0.1, shell:notifications"
   ];
-  };
 }