diff --git a/.flake.nix.swp b/.flake.nix.swp
index 69ea3c7..1102150 100644
Binary files a/.flake.nix.swp and b/.flake.nix.swp differ
diff --git a/flake.nix b/flake.nix
index 43b5d6b..8420527 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,7 @@
         ./configuration.nix # FIXME: MODULARIZE
         ./env-vars.nix
         #./hardware-configuration.nix
+        ./hyprland-system.nix
         ./theme.nix
       ];
     };
diff --git a/hyprland-system.nix b/hyprland-system.nix
new file mode 100644
index 0000000..cb0213a
--- /dev/null
+++ b/hyprland-system.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  # hypr packages
+  environment.systemPackages = with pkgs; [
+    hyprland
+    hypridle
+    hyprlock
+    hyprpaper
+    hyprpolkitagent
+    hyprcursor
+  ];
+}
diff --git a/hyprland.nix b/hyprland.nix
index ecc6cbe..c42e910 100644
--- a/hyprland.nix
+++ b/hyprland.nix
@@ -16,16 +16,6 @@
     WLR_NO_HARDWARE_CURSORS = "1";
   };
   
-  # hypr packages
-  environment.systemPackages = with pkgs; [
-    hyprland
-    hypridle
-    hyprlock
-    hyprpaper
-    hyprpolkitagent
-    hyprcursor
-  ];
-
   # hyprland config
   wayland.windowManager.hyprland = {
     enable = true;