From 930b8eaf78fb6f19b73e1b9723f896db8cb61093 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 23 Jan 2017 16:13:16 +0100
Subject: Bump thermoprint

---
 custom/thermoprint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/thermoprint b/custom/thermoprint
index e95dac74..99fc4947 160000
--- a/custom/thermoprint
+++ b/custom/thermoprint
@@ -1 +1 @@
-Subproject commit e95dac748371afcad3ffddf5c98e5fcb0a8302b7
+Subproject commit 99fc4947543c1916e9fec952526a688eb7753490
-- 
cgit v1.2.3


From 8fd86a7fb98c5c8dfc114bbc9322110ffc53dff0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Wed, 25 Jan 2017 15:55:24 +0100
Subject: Bump Thermoprint

---
 custom/thermoprint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/thermoprint b/custom/thermoprint
index 99fc4947..75d9fe61 160000
--- a/custom/thermoprint
+++ b/custom/thermoprint
@@ -1 +1 @@
-Subproject commit 99fc4947543c1916e9fec952526a688eb7753490
+Subproject commit 75d9fe614dca572aa1d7cfa53553e9c103eb2dd0
-- 
cgit v1.2.3


From b74f82dc6d7f2c56d933177fafed38d8f67b91bc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 26 Jan 2017 16:57:33 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 72467d55..9d6d8e86 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 72467d55a7b6e3afcafc2cd1527da10574cf6366
+Subproject commit 9d6d8e865951d76b518e2cf11358ecec7e8adbb7
-- 
cgit v1.2.3


From 8b156718f742c4eda1f929dfe1b5c6b616bc9386 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 26 Jan 2017 16:59:41 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 9d6d8e86..649796f4 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 9d6d8e865951d76b518e2cf11358ecec7e8adbb7
+Subproject commit 649796f438107a0229a57cbbb6248c5801270ac8
-- 
cgit v1.2.3


From 1c25a3a1c10604f77ea88ca5b85e38e137373e0b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 26 Jan 2017 17:05:24 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 649796f4..80541308 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 649796f438107a0229a57cbbb6248c5801270ac8
+Subproject commit 805413081bcb33f6918e69350fabc5ab0ce57742
-- 
cgit v1.2.3


From ad0f8ccc4e588033589b54c51da5ed00bdc2ea76 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 26 Jan 2017 17:06:36 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 80541308..c22d1fba 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 805413081bcb33f6918e69350fabc5ab0ce57742
+Subproject commit c22d1fbab9ffd09d461b82b096d9cac0edea7775
-- 
cgit v1.2.3


From 1f3884269170ee6bd90a4d0c773cf09d5f517185 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 27 Jan 2017 10:36:04 +0100
Subject: UUCP is not initial user submission

---
 custom/uucp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index d7c2aae2..b5e5a0aa 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -246,7 +246,7 @@ in {
             *) from="$from@$relay";;
           esac
 
-          exec /var/setuid-wrappers/sendmail -i -f "$from" -- "$@"
+          exec /var/setuid-wrappers/sendmail -G -i -f "$from" -- "$@"
         '';
     };
 
-- 
cgit v1.2.3


From 65924ba6e9a34aac5d5ab51db4cfb43d08825269 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 01:45:04 +0100
Subject: Bump setuid wrappers

---
 custom/uucp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index b5e5a0aa..2fbba8f9 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -208,7 +208,7 @@ in {
       text = config.services.uucp.extraSys + "\n" + concatStringsSep "\n" (map sysSpec config.services.uucp.remoteNodes);
     };
 
-    security.setuidOwners = map (p: {program = p; owner = "root"; group = "root"; setuid = true; setgid = false;}) ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"];
+    security.wrappers = listToAttrs (map (p: {source = "${pkgs.uucp}/bin/${p}"; owner = "root"; group = "root"; setuid = true; setgid = false;}) ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"]);
 
     nixpkgs.config.packageOverrides = pkgs: with pkgs; {
       uucp = stdenv.lib.overrideDerivation uucp (oldAttrs: {
-- 
cgit v1.2.3


From 47a2a43ad79edea3465f97e6bf307871e1fc5e23 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 01:47:15 +0100
Subject: Syntax

---
 custom/uucp.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index 2fbba8f9..0e38f4d2 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -208,7 +208,9 @@ in {
       text = config.services.uucp.extraSys + "\n" + concatStringsSep "\n" (map sysSpec config.services.uucp.remoteNodes);
     };
 
-    security.wrappers = listToAttrs (map (p: {source = "${pkgs.uucp}/bin/${p}"; owner = "root"; group = "root"; setuid = true; setgid = false;}) ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"]);
+    security.wrappers = let
+      wrapper = p: { name = p; source = "${pkgs.uucp}/bin/${p}"; owner = "root"; group = "root"; setuid = true; setgid = false; };
+    in listToAttrs (map wrapper ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"]);
 
     nixpkgs.config.packageOverrides = pkgs: with pkgs; {
       uucp = stdenv.lib.overrideDerivation uucp (oldAttrs: {
-- 
cgit v1.2.3


From 24fd13099b8eb92d8ee73b29843f882fe95f5254 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 01:48:17 +0100
Subject: Syntax

---
 custom/uucp.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index 0e38f4d2..c69d15c5 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -209,7 +209,15 @@ in {
     };
 
     security.wrappers = let
-      wrapper = p: { name = p; source = "${pkgs.uucp}/bin/${p}"; owner = "root"; group = "root"; setuid = true; setgid = false; };
+      wrapper = p: { name = p;
+                     value = {
+                       source = "${pkgs.uucp}/bin/${p}";
+                       owner = "root";
+                       group = "root";
+                       setuid = true;
+                       setgid = false;
+                     };
+                   };
     in listToAttrs (map wrapper ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"]);
 
     nixpkgs.config.packageOverrides = pkgs: with pkgs; {
-- 
cgit v1.2.3


From 2d7616fb3070fc5aeb2b3f5cc7082dcf21714a6f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 22:39:19 +0100
Subject: Fix setuid-wrappers path

---
 custom/tinc/def.nix | 2 +-
 custom/uucp.nix     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'custom')

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 58c5237c..a3bb00a0 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -18,7 +18,7 @@ in
 
       networks = mkOption {
         default = { };
-        type = types.loaOf types.optionSet;
+        type = types.loaOf types.submodule;
         description = ''
           Defines the tinc networks which will be started.
           Each network invokes a different daemon.
diff --git a/custom/uucp.nix b/custom/uucp.nix
index c69d15c5..0b4b1306 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -237,7 +237,7 @@ in {
                 choices as appropriate.  */
              #if 1
             -#define MAIL_PROGRAM "/usr/lib/sendmail -t"
-            +#define MAIL_PROGRAM "/var/setuid-wrappers/sendmail -t"
+            +#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
              /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
              #define MAIL_PROGRAM_TO_BODY 1
              #define MAIL_PROGRAM_SUBJECT_BODY 1
@@ -256,7 +256,7 @@ in {
             *) from="$from@$relay";;
           esac
 
-          exec /var/setuid-wrappers/sendmail -G -i -f "$from" -- "$@"
+          exec ${config.security.wrapperDir}/sendmail -G -i -f "$from" -- "$@"
         '';
     };
 
@@ -264,6 +264,6 @@ in {
       uucp
     ];
 
-    services.cron.systemCronJobs = (map (name: "${config.services.uucp.interval} /var/setuid-wrappers/uucico -D -S ${name}") (if (config.services.uucp.interval != null) then config.services.uucp.remoteNodes else []));
+    services.cron.systemCronJobs = (map (name: "${config.services.uucp.interval} ${config.security.wrapperDir}/uucico -D -S ${name}") (if (config.services.uucp.interval != null) then config.services.uucp.remoteNodes else []));
   };
 }
-- 
cgit v1.2.3


From cf4568d2f5e131a29efaac141fde1ade8e47dd7d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 22:45:20 +0100
Subject: use submodule properly

---
 custom/tinc/def.nix | 145 ++++++++++++++++++++++++++--------------------------
 1 file changed, 72 insertions(+), 73 deletions(-)

(limited to 'custom')

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index a3bb00a0..98174eb6 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -6,6 +6,77 @@ let
 
   cfg = config.services.customTinc;
 
+  networkModule = {
+    extraConfig = mkOption {
+      default = ''
+        PingTimeout = 10
+      '';
+      type = types.lines;
+      description = ''
+        Extra lines to add to the tinc service configuration file.
+      '';
+    };
+
+    name = mkOption {
+      default = null;
+      type = types.nullOr types.str;
+      description = ''
+        The name of the node which is used as an identifier when communicating
+        with the remote nodes in the mesh. If null then the hostname of the system
+        is used.
+      '';
+    };
+
+    debugLevel = mkOption {
+      default = 0;
+      type = types.addCheck types.int (l: l >= 0 && l <= 5);
+      description = ''
+        The amount of debugging information to add to the log. 0 means little
+        logging while 5 is the most logging. <command>man tincd</command> for
+        more details.
+      '';
+    };
+
+    hosts = mkOption {
+      default = { };
+      type = types.loaOf types.lines;
+      description = ''
+        The name of the host in the network as well as the configuration for that host.
+        This name should only contain alphanumerics and underscores.
+      '';
+    };
+
+    interfaceType = mkOption {
+      default = "tun";
+      type = types.addCheck types.str (n: n == "tun" || n == "tap");
+      description = ''
+        The type of virtual interface used for the network connection
+      '';
+    };
+
+    interfaceConfig = mkOption {
+      default = { };
+      description = ''
+        Additional configuration for the generated network interface
+      '';
+    };
+
+    package = mkOption {
+      default = pkgs.tinc_pre;
+      description = ''
+        The package to use for the tinc daemon's binary.
+      '';
+    };
+
+    scripts = mkOption {
+      default = { };
+      type = types.loaOf (types.nullOr types.str);
+      description = ''
+        Hook scripts
+      '';
+    };
+
+  };
 in
 
 {
@@ -18,83 +89,11 @@ in
 
       networks = mkOption {
         default = { };
-        type = types.loaOf types.submodule;
+        type = types.loaOf (types.submodule networkModule);
         description = ''
           Defines the tinc networks which will be started.
           Each network invokes a different daemon.
         '';
-        options = {
-
-          extraConfig = mkOption {
-            default = ''
-              PingTimeout = 10
-            '';
-            type = types.lines;
-            description = ''
-              Extra lines to add to the tinc service configuration file.
-            '';
-          };
-
-          name = mkOption {
-            default = null;
-            type = types.nullOr types.str;
-            description = ''
-              The name of the node which is used as an identifier when communicating
-              with the remote nodes in the mesh. If null then the hostname of the system
-              is used.
-            '';
-          };
-
-          debugLevel = mkOption {
-            default = 0;
-            type = types.addCheck types.int (l: l >= 0 && l <= 5);
-            description = ''
-              The amount of debugging information to add to the log. 0 means little
-              logging while 5 is the most logging. <command>man tincd</command> for
-              more details.
-            '';
-          };
-
-          hosts = mkOption {
-            default = { };
-            type = types.loaOf types.lines;
-            description = ''
-              The name of the host in the network as well as the configuration for that host.
-              This name should only contain alphanumerics and underscores.
-            '';
-          };
-
-          interfaceType = mkOption {
-            default = "tun";
-            type = types.addCheck types.str (n: n == "tun" || n == "tap");
-            description = ''
-              The type of virtual interface used for the network connection
-            '';
-          };
-
-          interfaceConfig = mkOption {
-            default = { };
-            description = ''
-              Additional configuration for the generated network interface
-            '';
-          };
-
-          package = mkOption {
-            default = pkgs.tinc_pre;
-            description = ''
-              The package to use for the tinc daemon's binary.
-            '';
-          };
-
-          scripts = mkOption {
-            default = { };
-            type = types.loaOf (types.nullOr types.str);
-            description = ''
-              Hook scripts
-            '';
-          };
-
-        };
       };
     };
 
-- 
cgit v1.2.3


From bb20dfd761b9ad171e62270bc7d7c874b88f9e74 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 20 Feb 2017 22:47:56 +0100
Subject: Syntax

---
 custom/tinc/def.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 98174eb6..563335ad 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -89,7 +89,7 @@ in
 
       networks = mkOption {
         default = { };
-        type = types.loaOf (types.submodule networkModule);
+        type = types.loaOf (types.submodule { options = networkModule; });
         description = ''
           Defines the tinc networks which will be started.
           Each network invokes a different daemon.
-- 
cgit v1.2.3


From 9ec4494121da0d1bc7485c516c428cad1c71722f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 7 Mar 2017 14:17:44 +0100
Subject: Bump thermoprint

---
 custom/thermoprint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/thermoprint b/custom/thermoprint
index 75d9fe61..7065a8cc 160000
--- a/custom/thermoprint
+++ b/custom/thermoprint
@@ -1 +1 @@
-Subproject commit 75d9fe614dca572aa1d7cfa53553e9c103eb2dd0
+Subproject commit 7065a8cc1b8b01cd32d4b1d5317b323fec5238bd
-- 
cgit v1.2.3


From 8a865390e31f4b6ded8cdbb711a50924c72da00c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 7 Mar 2017 14:22:01 +0100
Subject: Bump thermoprint

---
 custom/thermoprint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/thermoprint b/custom/thermoprint
index 7065a8cc..ba2e44af 160000
--- a/custom/thermoprint
+++ b/custom/thermoprint
@@ -1 +1 @@
-Subproject commit 7065a8cc1b8b01cd32d4b1d5317b323fec5238bd
+Subproject commit ba2e44af40746f339e1ed652ea233c739790556b
-- 
cgit v1.2.3


From c16c1e973412260d0a849d227bc6e79ed69984fd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 8 Mar 2017 19:06:23 +0100
Subject: Bump trivmix

---
 custom/trivmix             | 2 +-
 custom/trivmix-service.nix | 3 ++-
 custom/trivmix.nix         | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 120000 custom/trivmix.nix

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index c22d1fba..6454da50 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit c22d1fbab9ffd09d461b82b096d9cac0edea7775
+Subproject commit 6454da50559e0eee810f81d33365a621857d8068
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 3c3cded7..09a6dd3b 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -3,6 +3,7 @@
 , connectOut ? null
 , connectIn ? null
 , group ? null
+, initial ? null
 , trivmix
 , stdenv
 , makeWrapper
@@ -39,7 +40,7 @@ in rec {
     before = [ "mpd.service" ];
     serviceConfig = {
       Type = "simple";
-      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}'';
+      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun}${optionalString (initial != null) " --level ${initial}"} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}'';
       User = "jack";
       Group = "audio";
       Nice = "-10";
diff --git a/custom/trivmix.nix b/custom/trivmix.nix
deleted file mode 120000
index c2f64840..00000000
--- a/custom/trivmix.nix
+++ /dev/null
@@ -1 +0,0 @@
-trivmix/package.nix
\ No newline at end of file
-- 
cgit v1.2.3


From 6fe2b6698f801d8f1e3d9b8a6a5b8db321481a45 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 8 Mar 2017 19:07:30 +0100
Subject: Bring optionalString into scope

---
 custom/trivmix-service.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'custom')

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 09a6dd3b..5e0e5b47 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -33,6 +33,7 @@ let
         --prefix PATH : ${jack2Full}/bin
     '';
   };
+  inherit (stdenv.lib) optionalString;
 in rec {
   out = {
     wantedBy = [ "sound.target" ];
-- 
cgit v1.2.3


From 0631b6b91d79c55a4b3527719c6dc6b851369f3c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 13:52:21 +0100
Subject: Bump trivmix

---
 custom/trivmix             |  2 +-
 custom/trivmix-service.nix | 59 ++++++++++++++++++++--------------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 6454da50..2f5f8801 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 6454da50559e0eee810f81d33365a621857d8068
+Subproject commit 2f5f880136f3411e7e8d919631e71ef05d0ae9ad
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 5e0e5b47..56b26b6f 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -9,44 +9,35 @@
 , makeWrapper
 , jack2Full
 , coreutils
+, writeScript
 }:
 
 let
-  genRun = if ! isNull run then run else (
-    "${derivRun}/bin/run.sh"
-  );
-  derivRun = stdenv.mkDerivation {
-    name = "trivmix-run";
-    src = builtins.toFile "run.sh" ''
-      #!/bin/sh
+  connect = (! isNull connectOut) || (! isNull connectIn);
+  connectScript = writeScript "connect" ''
+    #!${stdenv.shell}
 
-      ${if ! isNull connectIn then "jack_connect ${connectIn} $1" else ""}
-      ${if ! isNull connectOut then "jack_connect $2 ${connectOut}" else ""}
-    '';
-    unpackPhase = "cat";
-    buildInputs = [ makeWrapper ];
-    installPhase = ''
-      mkdir -p $out/bin
-      cp $src $out/bin/run.sh
-      chmod 755 $out/bin/run.sh
-      wrapProgram $out/bin/run.sh \
-        --prefix PATH : ${jack2Full}/bin
-    '';
-  };
+    ${optionalString (! isNull connectIn) "jack_connect ${connectIn} $1"}
+    ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOu}"}
+  '';
   inherit (stdenv.lib) optionalString;
-in rec {
-  out = {
-    wantedBy = [ "sound.target" ];
-    requires = [ "jack.service" ];
-    before = [ "mpd.service" ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun}${optionalString (initial != null) " --level ${initial}"} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}'';
-      User = "jack";
-      Group = "audio";
-      Nice = "-10";
-      LimitRTPRIO = "95:95";
-      LimitMEMLOCK = "infinity";
-    };
+in {
+  wantedBy = [ "sound.target" ];
+  requires = [ "jack.service" ];
+  before = [ "mpd.service" ];
+  serviceConfig = {
+    Type = "simple";
+    ExecStart = ''${trivmix}/bin/trivmix --client ${name} \
+      ${optionalString connect "--run ${connectScript}"} \
+      ${optionalString (! isNull run) "--run ${run}"} \
+      ${optionalString (! isNull initial) "--level ${initial}"} \
+      /dev/shm/mix/${name}/level \
+      ${optionalString (! isNull group) "/dev/shm/mix/${group}/level"}
+    '';
+    User = "jack";
+    Group = "audio";
+    Nice = "-10";
+    LimitRTPRIO = "95:95";
+    LimitMEMLOCK = "infinity";
   };
 }
-- 
cgit v1.2.3


From 12d03d700f4b6b756111d6088dbd5db7ffbb7e7b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 14:14:09 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 2f5f8801..10ed6c7c 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 2f5f880136f3411e7e8d919631e71ef05d0ae9ad
+Subproject commit 10ed6c7c73ac455b3dbfbbae2dd522f1581e68dc
-- 
cgit v1.2.3


From 879e4d4df3de9cd634f911cf320221b41dfa0427 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 14:36:13 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 10ed6c7c..96954e57 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 10ed6c7c73ac455b3dbfbbae2dd522f1581e68dc
+Subproject commit 96954e570a1143c25cd7674d4551e9813afd1416
-- 
cgit v1.2.3


From a75cb731911c5b7fcd194d78010847f14f0f69fe Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 16:41:04 +0100
Subject: Fix typo

---
 custom/trivmix-service.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 56b26b6f..7243f5e1 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -18,7 +18,7 @@ let
     #!${stdenv.shell}
 
     ${optionalString (! isNull connectIn) "jack_connect ${connectIn} $1"}
-    ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOu}"}
+    ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOut}"}
   '';
   inherit (stdenv.lib) optionalString;
 in {
-- 
cgit v1.2.3


From d88973bfbfc285fe2291ed606a271db26e0b51e8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 16:42:35 +0100
Subject: Fix trivmix-service

---
 custom/trivmix-service.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'custom')

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 7243f5e1..04f1634b 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -17,6 +17,8 @@ let
   connectScript = writeScript "connect" ''
     #!${stdenv.shell}
 
+    PATH=${jack2Full}/bin:$PATH
+
     ${optionalString (! isNull connectIn) "jack_connect ${connectIn} $1"}
     ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOut}"}
   '';
-- 
cgit v1.2.3


From fd5865d6f7fcd39ab1a1a2c0cb57c98c16e1ae9e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 16:46:33 +0100
Subject: revert to having .out

---
 custom/trivmix-service.nix | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'custom')

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 04f1634b..e9120f88 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -24,22 +24,24 @@ let
   '';
   inherit (stdenv.lib) optionalString;
 in {
-  wantedBy = [ "sound.target" ];
-  requires = [ "jack.service" ];
-  before = [ "mpd.service" ];
-  serviceConfig = {
-    Type = "simple";
-    ExecStart = ''${trivmix}/bin/trivmix --client ${name} \
-      ${optionalString connect "--run ${connectScript}"} \
-      ${optionalString (! isNull run) "--run ${run}"} \
-      ${optionalString (! isNull initial) "--level ${initial}"} \
-      /dev/shm/mix/${name}/level \
-      ${optionalString (! isNull group) "/dev/shm/mix/${group}/level"}
-    '';
-    User = "jack";
-    Group = "audio";
-    Nice = "-10";
-    LimitRTPRIO = "95:95";
-    LimitMEMLOCK = "infinity";
+  out = {
+    wantedBy = [ "sound.target" ];
+    requires = [ "jack.service" ];
+    before = [ "mpd.service" ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = ''${trivmix}/bin/trivmix --client ${name} \
+        ${optionalString connect "--run ${connectScript}"} \
+        ${optionalString (! isNull run) "--run ${run}"} \
+        ${optionalString (! isNull initial) "--level ${initial}"} \
+        /dev/shm/mix/${name}/level \
+        ${optionalString (! isNull group) "/dev/shm/mix/${group}/level"}
+      '';
+      User = "jack";
+      Group = "audio";
+      Nice = "-10";
+      LimitRTPRIO = "95:95";
+      LimitMEMLOCK = "infinity";
+    };
   };
 }
-- 
cgit v1.2.3


From 05e002206e42b703411294890fd07d3f3bd7d545 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 16:57:44 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 96954e57..6dd4d256 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 96954e570a1143c25cd7674d4551e9813afd1416
+Subproject commit 6dd4d2560b7a50b3d9415983560e2a1aa9046381
-- 
cgit v1.2.3


From 16f52b7974da86c916bf8048b02178c3da820c49 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 17:05:02 +0100
Subject: Bump trivmix

---
 custom/trivmix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index 6dd4d256..70e60034 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit 6dd4d2560b7a50b3d9415983560e2a1aa9046381
+Subproject commit 70e600346fb5875defe14d578883c9838695d533
-- 
cgit v1.2.3