diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-21 15:12:22 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-21 15:12:22 +0200 |
| commit | 6e52329462db4d76d5bc028412d932f73e56ed9d (patch) | |
| tree | 5c0e90ca2da55f86babe67961d51b6687031c9ff | |
| parent | a9fa981aad72fc84982629f688245e7309d1c5c8 (diff) | |
| download | nixos-6e52329462db4d76d5bc028412d932f73e56ed9d.tar nixos-6e52329462db4d76d5bc028412d932f73e56ed9d.tar.gz nixos-6e52329462db4d76d5bc028412d932f73e56ed9d.tar.bz2 nixos-6e52329462db4d76d5bc028412d932f73e56ed9d.tar.xz nixos-6e52329462db4d76d5bc028412d932f73e56ed9d.zip | |
Better trivmixService definitions
| -rw-r--r-- | bragi.nix | 20 |
1 files changed, 11 insertions, 9 deletions
| @@ -21,7 +21,9 @@ | |||
| 21 | networking.wireless.enable = true; | 21 | networking.wireless.enable = true; |
| 22 | 22 | ||
| 23 | nixpkgs.config.packageOverrides = pkgs: | 23 | nixpkgs.config.packageOverrides = pkgs: |
| 24 | { | 24 | let |
| 25 | trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out; | ||
| 26 | in { | ||
| 25 | trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in | 27 | trivmix = let trivmix = pkgs.haskellPackages.callPackage ./custom/trivmix.nix {}; in |
| 26 | pkgs.stdenv.mkDerivation { | 28 | pkgs.stdenv.mkDerivation { |
| 27 | name = "trivmix-wrapper"; | 29 | name = "trivmix-wrapper"; |
| @@ -93,17 +95,17 @@ | |||
| 93 | }; | 95 | }; |
| 94 | }; | 96 | }; |
| 95 | 97 | ||
| 96 | systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; }).out; | 98 | systemd.services."mpdmix0" = trivmixService { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; }; |
| 97 | systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; }).out; | 99 | systemd.services."mpdmix1" = trivmixService { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; }).out; |
| 98 | 100 | ||
| 99 | systemd.services."passmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; }).out; | 101 | systemd.services."passmix0" = trivmixService { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; }; |
| 100 | systemd.services."passmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; }).out; | 102 | systemd.services."passmix1" = trivmixService { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; }; |
| 101 | 103 | ||
| 102 | systemd.services."passmix2" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; }).out; | 104 | systemd.services."passmix2" = trivmixService { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; }; |
| 103 | systemd.services."passmix3" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; }).out; | 105 | systemd.services."passmix3" = trivmixService { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; }; |
| 104 | 106 | ||
| 105 | systemd.services."passmix4" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "misc_out"; }).out; | 107 | systemd.services."passmix4" = trivmixService { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "misc_out"; }; |
| 106 | systemd.services."passmix5" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "misc_out"; }).out; | 108 | systemd.services."passmix5" = trivmixService { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "misc_out"; }; |
| 107 | 109 | ||
| 108 | services.mpd = { | 110 | services.mpd = { |
| 109 | enable = true; | 111 | enable = true; |