From a465b981df20a5d5ee79420bf80a2d642d7d03be Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 3 Sep 2017 23:41:22 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom/trivmix-service.nix | 60 ++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index e3eae70e..8c316e67 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -6,40 +6,42 @@ let
   cfg = config.services.trivmix;
 
   mixerModule = {
-    connectIn = mkOption {
-      type = with types; coercedTo str singleton (listOf str);
-      default = [];
-      description = "Ports to connect mixer input to";
-    };
+    options = {
+      connectIn = mkOption {
+        type = with types; coercedTo str singleton (listOf str);
+        default = [];
+        description = "Ports to connect mixer input to";
+      };
 
-    connectOut = mkOption {
-      type = with types; coercedTo str singleton (listOf str);
-      default = [];
-      description = "Ports to connect mixer output to";
-    };
+      connectOut = mkOption {
+        type = with types; coercedTo str singleton (listOf str);
+        default = [];
+        description = "Ports to connect mixer output to";
+      };
 
-    onConnect = mkOption {
-      type = types.lines;
-      default = "";
-      description = "Additional shell commands to run after connections are set up";
-    };
+      onConnect = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional shell commands to run after connections are set up";
+      };
 
-    adjustable = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Should the volume on this mixer be adjustable?";
-    };
+      adjustable = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Should the volume on this mixer be adjustable?";
+      };
 
-    group = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      description = "Volumes of mixers that share a group name are synchronised";
-    };
+      group = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Volumes of mixers that share a group name are synchronised";
+      };
 
-    initial = mkOption {
-      type = types.str;
-      default = "1";
-      description = "Initial volume";
+      initial = mkOption {
+        type = types.str;
+        default = "1";
+        description = "Initial volume";
+      };
     };
   };
 
-- 
cgit v1.2.3