summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix18
-rw-r--r--customized/trivmix.nix10
2 files changed, 8 insertions, 20 deletions
diff --git a/bragi.nix b/bragi.nix
index 918ed068..ea074065 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -1,16 +1,6 @@
1{ config, pkgs, ... }: 1{ config, pkgs, ... }:
2let 2
3 makemix = (n: { 3{
4 wantedBy = [ "sound.target" ];
5 requires = [ "jack.service" ];
6 serviceConfig = {
7 Type = "simple";
8 ExecStart = "${pkgs.trivmix}/bin/trivmix --client mix --input 'in_${n}' --output 'out_${n}' --dir /run/jackmix_${n}";
9 User = "jack";
10 Group = "audio";
11 };
12 });
13in {
14 imports = 4 imports =
15 [ 5 [
16 ./bragi-hw.nix 6 ./bragi-hw.nix
@@ -68,6 +58,7 @@ in {
68 tmux 58 tmux
69 nfs-utils 59 nfs-utils
70 jack2 60 jack2
61 trivmix
71 ]; 62 ];
72 63
73 # List services that you want to enable: 64 # List services that you want to enable:
@@ -102,9 +93,6 @@ in {
102 }; 93 };
103 }; 94 };
104 95
105 systemd.services."trivmix_0" = (makemix "0");
106 systemd.services."trivmix_1" = (makemix "1");
107
108 services.mpd = { 96 services.mpd = {
109 enable = true; 97 enable = true;
110 musicDirectory = "/media/odin/music"; 98 musicDirectory = "/media/odin/music";
diff --git a/customized/trivmix.nix b/customized/trivmix.nix
index 6c4417fd..6be839eb 100644
--- a/customized/trivmix.nix
+++ b/customized/trivmix.nix
@@ -1,22 +1,22 @@
1# This file was auto-generated by cabal2nix. Please do NOT edit manually! 1# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2 2
3{ cabal, filepath, hinotify, jack, optparseApplicative 3{ cabal, filepath, hinotify, jack, optparseApplicative
4, transformers, explicitException
4, fetchgit 5, fetchgit
5, transformers
6}: 6}:
7 7
8cabal.mkDerivation (self: { 8cabal.mkDerivation (self: {
9 pname = "trivmix"; 9 pname = "trivmix";
10 version = "0.1.0"; 10 version = "0.2.0";
11 src = fetchgit { 11 src = fetchgit {
12 url = git://git.yggdrasil.li/trivmix; 12 url = git://git.yggdrasil.li/trivmix;
13 rev = "5e46af12608b35b73b7ac1f83e59585671d19e48"; 13 rev = "4e78ddb3a3118ac99f64a927cc3166e2c5b898ac31242ec7b5494d8efd3e8ec4";
14 sha256 = "4e78ddb3a3118ac99f64a927cc3166e2c5b898ac31242ec7b5494d8efd3e8ec4"; 14 sha256 = "495004dfe17f85d370b7f5237d5e71b367af98ca";
15 }; 15 };
16 isLibrary = false; 16 isLibrary = false;
17 isExecutable = true; 17 isExecutable = true;
18 buildDepends = [ 18 buildDepends = [
19 filepath hinotify jack optparseApplicative transformers 19 filepath hinotify jack optparseApplicative transformers explicitException
20 ]; 20 ];
21 meta = { 21 meta = {
22 license = self.stdenv.lib.licenses.publicDomain; 22 license = self.stdenv.lib.licenses.publicDomain;