diff --git a/citrus.nix b/citrus.nix
index 4cbb574..80d4e09 100644
--- a/citrus.nix
+++ b/citrus.nix
@@ -8,10 +8,16 @@
   # Enables opengl support
   hardware.opengl.enable = true;
 
+  sound.enable = true;
+  services.jack.jackd.enable = true;
+  services.jack.alsa.enable = true;
+
   # Includes packages needed for startx
-  environment.systemPackages = with pkgs; [
-    xorg.xauth xorg.xinit
-  ];
+  services.xserver = {
+    enable = true;
+    displayManager.autoLogin.user = "appuser";
+    windowManager.fluxbox.enable = true;
+  };
   
   users = {
     # No need to edit users on a single-purpose system.
@@ -25,10 +31,10 @@
       # Unprivledged user for running the application.
       appuser = {
         isNormalUser = true;
-        group = "appuser";
+        extraGroups = [ "jackaudio" ];
         password = "";
         packages = with pkgs; [
-          graphfix
+          graphfix puredata
         ];
       };
     };
diff --git a/platforms/clementine.nix b/platforms/clementine.nix
index 6ab6198..b893868 100644
--- a/platforms/clementine.nix
+++ b/platforms/clementine.nix
@@ -6,7 +6,12 @@
       { from = "host"; host.port = 2222; guest.port = 22; }
     ];
     graphics = true;
-    qemu.options = [ "-bios" "${pkgs.OVMF.fd}/FV/OVMF.fd" ];
+    qemu.options = [
+      "-bios" "${pkgs.OVMF.fd}/FV/OVMF.fd"
+      "-audiodev" "driver=pa,id=default"
+      "-device" "intel-hda"
+      "-device" "hda-output,audiodev=default"
+    ];
   };
   services.qemuGuest.enable = true;
 }