summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/audio/jack-on-pulse.nix
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-01 12:49:36 +0200
committerlassulus <lass@lassul.us>2017-06-01 12:49:36 +0200
commite50bc4f3eb3dac13bba4ae6158e839a52455c3c3 (patch)
treeb3c1fc1f3e00312e92e4ab747c31839db665eebd /makefu/2configs/audio/jack-on-pulse.nix
parent73b073c3fe037f31e05828a1071c9b4b19f7a2ff (diff)
parent9e04d0132133840fba14aca194f18925e3f353d5 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/audio/jack-on-pulse.nix')
-rw-r--r--makefu/2configs/audio/jack-on-pulse.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/makefu/2configs/audio/jack-on-pulse.nix b/makefu/2configs/audio/jack-on-pulse.nix
index 09d03ea9f..49b61d5a2 100644
--- a/makefu/2configs/audio/jack-on-pulse.nix
+++ b/makefu/2configs/audio/jack-on-pulse.nix
@@ -2,6 +2,7 @@
let
pulse = pkgs.pulseaudioFull;
user = config.makefu.gui.user;
+ wait_time = 30;
in
{
sound.enable = true;
@@ -13,16 +14,17 @@ in
environment.systemPackages = with pkgs; [ jack2Full ];
# from http://anderspapitto.com/posts/2015-11-26-overtone-on-nixos-with-jack-and-pulseaudio.html
- systemd.services = {
+ systemd.user.services = {
jackdbus = {
description = "Runs jack, and points pulseaudio at it";
serviceConfig = {
- User = user;
Type = "oneshot";
ExecStart = pkgs.writeScript "start_jack.sh" ''
#! ${pkgs.bash}/bin/bash
. ${config.system.build.setEnvironment}
- sleep 5 # wait for the gui to load
+
+ # TODO: correctly wait for pulseaudio, cannot use pulseaudio.service
+ sleep ${toString wait_time} # wait for the gui to load
${pkgs.jack2Full}/bin/jack_control start
sleep 3 # give some time for sources/sinks to be created
@@ -37,9 +39,11 @@ in
${pkgs.jack2Full}/bin/jack_control stop
'';
RemainAfterExit = true;
+ Restart = "always";
+ RestartSec = "5";
};
- after = [ "display-manager.service" "sound.target" ];
- wantedBy = [ "multi-user.target" ];
+ # after = [ "display-manager.service" "sound.target" ];
+ wantedBy = [ "default.target" ];
};
};
}