diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix
index 63d346b..5d1bb04 100644
--- a/modules/hardware/audio.nix
+++ b/modules/hardware/audio.nix
@@ -1,11 +1,13 @@
 {
-  config = {
-    services.pulseaudio.support32Bit = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
+  services.pulseaudio.support32Bit = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  environment.variables = {
+    GST_PLUGIN_PATH = "/run/current-system/sw/lib/gstreamer-1.0/";
   };
 }
diff --git a/modules/software/default.nix b/modules/software/default.nix
index cf00177..909b93f 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -5,5 +5,6 @@
     ./keyd.nix
     ./usershell.nix
     ./xdg.nix
+    ./gstreamer.nix
   ];
 }
diff --git a/modules/software/gstreamer.nix b/modules/software/gstreamer.nix
new file mode 100644
index 0000000..0edaa3a
--- /dev/null
+++ b/modules/software/gstreamer.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+lib.mkIf config.module.gui.enable {
+  environment.systemPackages = with pkgs; [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-rs
+    gst_all_1.gst-libav
+    gst_all_1.gst-vaapi
+  ];
+
+  environment.variables = {
+    GST_PLUGIN_PATH = "/run/current-system/sw/lib/gstreamer-1.0/";
+  };
+}
diff --git a/modules/software/programs.nix b/modules/software/programs.nix
index 80ba12d..83c365c 100644
--- a/modules/software/programs.nix
+++ b/modules/software/programs.nix
@@ -52,12 +52,6 @@
         # Music
         spotify
         strawberry-qt6
-        gst_all_1.gstreamer
-        gst_all_1.gst-plugins-base
-        gst_all_1.gst-plugins-good
-        gst_all_1.gst-plugins-rs
-        gst_all_1.gst-libav
-        gst_all_1.gst-vaapi
 
         # Utilities
         gimp