From 6e52329462db4d76d5bc028412d932f73e56ed9d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 21 Jun 2015 15:12:22 +0200 Subject: Better trivmixService definitions --- bragi.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'bragi.nix') diff --git a/bragi.nix b/bragi.nix index bab90847..7fe311d9 100644 --- a/bragi.nix +++ b/bragi.nix @@ -21,7 +21,9 @@ networking.wireless.enable = true; nixpkgs.config.packageOverrides = pkgs: - { + let + trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out; + in { trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in pkgs.stdenv.mkDerivation { name = "trivmix-wrapper"; @@ -93,17 +95,17 @@ }; }; - systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; }).out; - systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; }).out; + systemd.services."mpdmix0" = trivmixService { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; }; + systemd.services."mpdmix1" = trivmixService { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; }).out; - systemd.services."passmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; }).out; - systemd.services."passmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; }).out; + systemd.services."passmix0" = trivmixService { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; }; + systemd.services."passmix1" = trivmixService { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; }; - systemd.services."passmix2" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; }).out; - systemd.services."passmix3" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; }).out; + systemd.services."passmix2" = trivmixService { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; }; + systemd.services."passmix3" = trivmixService { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; }; - systemd.services."passmix4" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "misc_out"; }).out; - systemd.services."passmix5" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "misc_out"; }).out; + systemd.services."passmix4" = trivmixService { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "misc_out"; }; + systemd.services."passmix5" = trivmixService { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "misc_out"; }; services.mpd = { enable = true; -- cgit v1.2.3