2 files changed, 11 insertions, 9 deletions
diff --git a/bragi.nix b/bragi.nix
index 8ba704dc..f1da0748 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -93,8 +93,8 @@
    };
  };
-  systemd.services."mpdmix0" = pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; };
+  systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; }).out;
-  systemd.services."mpdmix1" = pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; };
+  systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; }).out;
  services.mpd = {
    enable = true;
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 76b1af6f..da630670 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -31,12 +31,14 @@ let
    '';
  };
 in rec {
-  wantedBy = [ "sound.target" ];
+  out = {
-  requires = [ "jack.service" ];
+    wantedBy = [ "sound.target" ];
-  serviceConfig = {
+    requires = [ "jack.service" ];
-    Type = "simple";
+    serviceConfig = {
-    ExecStart = "${trivmix} --client ${name} --run ${genRun} --dir /run/${name}";
+      Type = "simple";
-    User = "jack";
+      ExecStart = "${trivmix} --client ${name} --run ${genRun} --dir /run/${name}";
-    Group = "audio";
+      User = "jack";
+      Group = "audio";
+    };
  };
 }

diff --git a/bragi.nix b/bragi.nix index 8ba704dc..f1da0748 100644 --- a/bragi.nix +++ b/bragi.nix
@@ -93,8 +93,8 @@
93	};	93	};
94	};	94	};
95		95
96	systemd.services."mpdmix0" = pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; };	96	systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; }).out;
97	systemd.services."mpdmix1" = pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; };	97	systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; }).out;
98		98
99	services.mpd = {	99	services.mpd = {
100	enable = true;	100	enable = true;


diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix index 76b1af6f..da630670 100644 --- a/custom/trivmix-service.nix +++ b/custom/trivmix-service.nix
@@ -31,12 +31,14 @@ let
31	'';	31	'';
32	};	32	};
33	in rec {	33	in rec {
34	wantedBy = [ "sound.target" ];	34	out = {
35	requires = [ "jack.service" ];	35	wantedBy = [ "sound.target" ];
36	serviceConfig = {	36	requires = [ "jack.service" ];
37	Type = "simple";	37	serviceConfig = {
38	ExecStart = "${trivmix} --client ${name} --run ${genRun} --dir /run/${name}";	38	Type = "simple";
39	User = "jack";	39	ExecStart = "${trivmix} --client ${name} --run ${genRun} --dir /run/${name}";
40	Group = "audio";	40	User = "jack";
		41	Group = "audio";
		42	};
41	};	43	};
42	}	44	}