From 7e8a510f351b1d180df3795ecf1af3559f9a3c0c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 7 Jun 2015 21:48:20 +0200
Subject: Version bump in trivmix

---
 bragi.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'bragi.nix')

diff --git a/bragi.nix b/bragi.nix
index 918ed068..ea074065 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -1,16 +1,6 @@
 { config, pkgs, ... }:
-let
-  makemix = (n: {
-    wantedBy = [ "sound.target" ];
-    requires = [ "jack.service" ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.trivmix}/bin/trivmix --client mix --input 'in_${n}' --output 'out_${n}' --dir /run/jackmix_${n}";
-      User = "jack";
-      Group = "audio";
-    };
-  });
-in {
+
+{
   imports =
     [
       ./bragi-hw.nix
@@ -68,6 +58,7 @@ in {
     tmux
     nfs-utils
     jack2
+    trivmix
   ];
 
   # List services that you want to enable:
@@ -102,9 +93,6 @@ in {
     };
   };
 
-  systemd.services."trivmix_0" = (makemix "0");
-  systemd.services."trivmix_1" = (makemix "1");
-  
   services.mpd = {
     enable = true;
     musicDirectory = "/media/odin/music";
-- 
cgit v1.2.3