4 files changed, 38 insertions, 32 deletions
diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index b20dcf4..07805f0 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -1,24 +1,6 @@
 {
-  environment = {
-    variables = {
-      LIBVA_DRIVER_NAME = "nvidia";
-      XDG_SESSION_TYPE = "wayland";
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-      __GL_GSYNC_ALLOWED = "1";
-      __GL_VRR_ALLOWED = "0";
-      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-      CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
-    };
-
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
-      WLR_NO_HARDWARE_CURSORS = "1";
-    };
-
-    shellAliases = {
-      nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
-    };
-  };
+  imports = [
+    ./system-packages.nix
+    ./variables.nix
+  ];
 }
diff --git a/modules/environment/system-packages.nix b/modules/environment/system-packages.nix
new file mode 100644
index 0000000..2432ba7
--- /dev/null
+++ b/modules/environment/system-packages.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    git
+    gtk2
+    gtk3
+    gtk4
+    mediastreamer-openh264
+  ];
+}
diff --git a/modules/environment/variables.nix b/modules/environment/variables.nix
new file mode 100644
index 0000000..d28c806
--- /dev/null
+++ b/modules/environment/variables.nix
@@ -0,0 +1,22 @@
+{
+  environment = {
+    variables = {
+      LIBVA_DRIVER_NAME = "nvidia";
+      XDG_SESSION_TYPE = "wayland";
+      GBM_BACKEND = "nvidia-drm";
+      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+      __GL_GSYNC_ALLOWED = "1";
+      __GL_VRR_ALLOWED = "0";
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
+    };
+
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+      WLR_NO_HARDWARE_CURSORS = "1";
+    };
+
+    shellAliases.nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";
+  };
+}
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index f4fc813..c4ce8ca 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -2,16 +2,6 @@
 {
   imports = [ ./hyprland.nix ];
 
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    git
-    gtk2
-    gtk3
-    gtk4
-    mediastreamer-openh264
-  ];
-
   programs = {
     fish.enable = true;
     mtr.enable = true;