From 4b8e6a99356a26c8f75b90ae34293e36c99e24d8 Mon Sep 17 00:00:00 2001
From: Bailey Stevens <me@mtxyz.me>
Date: Wed, 4 Oct 2023 08:42:32 -0400
Subject: [PATCH] Removes jack.

---
 configuration.nix        |  9 ++----
 flake.lock               | 66 +++++++++++++++++++++++++++++++++++++---
 platforms/melodypond.nix | 11 ++++++-
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index d2e1b55..8faae90 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,8 +9,6 @@
   hardware.opengl.enable = true;
 
   sound.enable = true;
-  services.jack.jackd.enable = true;
-  services.jack.alsa.enable = true;
 
   # Includes packages needed for startx
   services.xserver = {
@@ -32,7 +30,7 @@
       geekygay = {
         shell = pkgs.fish;
         isNormalUser = true;
-        extraGroups = [ "wheel" "dialout" "jackaudio" ];
+        extraGroups = [ "wheel" "audio" ];
         password = "";
         openssh.authorizedKeys.keyFiles = [
           ./authorized_keys
@@ -41,11 +39,8 @@
       # Unprivledged user for running the application.
       appuser = {
         isNormalUser = true;
-        extraGroups = [ "jackaudio" ];
+        extraGroups = [ "audio" ];
         password = "";
-        packages = with pkgs; [
-          puredata websocat
-        ];
       };
     };
   };
diff --git a/flake.lock b/flake.lock
index c841da1..ab3c367 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,20 +103,39 @@
         "type": "github"
       }
     },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "mmelodies": {
       "inputs": {
         "flake-utils": "flake-utils_3",
         "napalm": "napalm",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "phyzzy": "phyzzy"
       },
       "locked": {
-        "lastModified": 1696409911,
-        "narHash": "sha256-IFGbm0OH6EoQ/MB5uR9kWx2BWNqXEWZYCoemcq2/rv4=",
+        "lastModified": 1696423289,
+        "narHash": "sha256-pXepszy9V/dBoqfo58W5DSg41c4ZcOQ+bZICxtaqc+8=",
         "ref": "refs/heads/main",
-        "rev": "800af05329408c236a53683a8349d5de40cb6361",
-        "revCount": 50,
+        "rev": "001931a1faed321a50732a2f461c15a1c58bf6dd",
+        "revCount": 54,
         "type": "git",
         "url": "https://fem.mint.lgbt/mmelodies/mmelodies.git"
       },
@@ -195,6 +214,28 @@
         "type": "github"
       }
     },
+    "phyzzy": {
+      "inputs": {
+        "flake-utils": "flake-utils_5",
+        "nixpkgs": [
+          "mmelodies",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696417150,
+        "narHash": "sha256-9b9JcfaA9T7kDt0f31unUqYgTe5S7JMrcZMkHQdKZUE=",
+        "ref": "refs/heads/main",
+        "rev": "2097785400b5eadf9110167eba55290de98691c5",
+        "revCount": 22,
+        "type": "git",
+        "url": "https://fem.mint.lgbt/mmelodies/phyzzy.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://fem.mint.lgbt/mmelodies/phyzzy.git"
+      }
+    },
     "root": {
       "inputs": {
         "colmena": "colmena",
@@ -249,6 +290,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/platforms/melodypond.nix b/platforms/melodypond.nix
index acea4d0..a001cee 100644
--- a/platforms/melodypond.nix
+++ b/platforms/melodypond.nix
@@ -6,7 +6,16 @@
   nixpkgs.hostPlatform.system = "aarch64-linux";
   sdImage.imageName = "orange.img";
 
-  services.jack.jackd.extraOptions = [ "-dalsa" "--device" "hw:Device" ];
+  sound.extraConfig = ''
+    pcm.!default {
+      type hw
+      card Device
+    }
+    ctl.!default {
+      type hw
+      card Device
+    }
+  '';
 
   boot.loader.raspberryPi.version = 4;
   boot.supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];