1 files changed, 17 insertions, 16 deletions

diff --git a/bragi.nix b/bragi.nix
index 4d61b61a..40c71def 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 let
-  trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
-  thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant;
   inherit (pkgs) lib;
 in rec {
   imports =
@@ -11,6 +9,7 @@ in rec {
       ./custom/zsh.nix
       ./users.nix
       ./custom/unit-status-mail.nix
+      ./custom/trivmix-service.nix
     ];
 
   boot.loader.grub.enable = true;
@@ -145,26 +144,28 @@ in rec {
     };
   };
 
-  systemd.services."mpdmix0" = trivmixService { name = "mpdmix0"; connectOut = "outnode0:in"; group = "mpd"; initial = "-35dB"; };
-  systemd.services."mpdmix1" = trivmixService { name = "mpdmix1"; connectOut = "outnode1:in"; group = "mpd"; initial = "-35dB"; };
+  services.trivmix = {
+    mpdmix0 = { connectOut = "outnode0:in"; group = "mpd"; initial = "-35dB"; };
+    mpdmix1 = { connectOut = "outnode1:in"; group = "mpd"; initial = "-35dB"; };
 
-  systemd.services."passmix0" = trivmixService { name = "passmix0"; connectOut = "outnode0:in"; connectIn = "system:capture_5"; group = "vali_out"; initial = "-5dB"; };
-  systemd.services."passmix1" = trivmixService { name = "passmix1"; connectOut = "outnode1:in"; connectIn = "system:capture_6"; group = "vali_out"; initial = "-5dB"; };
+    passmix0 = { connectOut = "outnode0:in"; connectIn = "system:capture_5"; group = "vali_out"; initial = "-5dB"; };
+    passmix1 = { connectOut = "outnode1:in"; connectIn = "system:capture_6"; group = "vali_out"; initial = "-5dB"; };
 
-  systemd.services."passmix2" = trivmixService { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "mic_out"; initial = "1"; };
-  systemd.services."passmix3" = trivmixService { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "mic_out"; initial = "1"; };
+    passmix2 = { connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "mic_out"; initial = "1"; };
+    passmix3 = { connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "mic_out"; initial = "1"; };
 
-  systemd.services."passmix4" = trivmixService { name = "passmix4"; connectOut = "outnode0:in"; connectIn = "system:capture_7"; group = "hel_out"; initial = "-5dB"; };
-  systemd.services."passmix5" = trivmixService { name = "passmix5"; connectOut = "outnode1:in"; connectIn = "system:capture_8"; group = "hel_out"; initial = "-5dB"; };
+    passmix4 = { connectOut = "outnode0:in"; connectIn = "system:capture_7"; group = "hel_out"; initial = "-5dB"; };
+    passmix5 = { connectOut = "outnode1:in"; connectIn = "system:capture_8"; group = "hel_out"; initial = "-5dB"; };
 
-  systemd.services."outnode0" = trivmixService { name = "outnode0"; initial = "1"; };
-  systemd.services."outnode1" = trivmixService { name = "outnode1"; initial = "1"; };
+    outnode0 = { initial = "1"; };
+    outnode1 = { initial = "1"; };
 
-  systemd.services."headphones0" = trivmixService { name = "heaphones0"; connectOut = "system:playback_3"; connectIn = "outnode0:out"; group = "headphones"; initial = "1"; };
-  systemd.services."headphones1" = trivmixService { name = "heaphones1"; connectOut = "system:playback_4"; connectIn = "outnode1:out"; group = "headphones"; initial = "1"; };
+    headphones0 = { connectOut = "system:playback_3"; connectIn = "outnode0:out"; group = "headphones"; initial = "1"; };
+    headphones1 = { connectOut = "system:playback_4"; connectIn = "outnode1:out"; group = "headphones"; initial = "1"; };
 
-  systemd.services."speakers0" = trivmixService { name = "speakers0"; connectOut = "system:playback_7"; connectIn = "outnode0:out"; group = "speakers"; initial = "0"; };
-  systemd.services."speakers1" = trivmixService { name = "speakers1"; connectOut = "system:playback_8"; connectIn = "outnode1:out"; group = "speakers"; initial = "0"; };
+    speakers0 = { connectOut = "system:playback_7"; connectIn = "outnode0:out"; group = "speakers"; initial = "0"; };
+    speakers1 = { connectOut = "system:playback_8"; connectIn = "outnode1:out"; group = "speakers"; initial = "0"; };
+  };
 
   services.mpd = {
     enable = true;