From 1d47f59e8f446f0c9e774114138e9881e6f85742 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 18 Jun 2016 13:28:15 +0200
Subject: l 2: use pulse.nix

---
 lass/2configs/pulse.nix | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 lass/2configs/pulse.nix

(limited to 'lass/2configs/pulse.nix')

diff --git a/lass/2configs/pulse.nix b/lass/2configs/pulse.nix
new file mode 100644
index 000000000..e86ea3b94
--- /dev/null
+++ b/lass/2configs/pulse.nix
@@ -0,0 +1,88 @@
+{ config, lib, pkgs, ... }:
+
+with config.krebs.lib;
+let
+  pkg = pkgs.pulseaudioLight;
+  runDir = "/run/pulse";
+
+  alsaConf = pkgs.writeText "asound.conf" ''
+    ctl_type.pulse {
+      libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so;
+    }
+    pcm_type.pulse {
+      libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so;
+    }
+    ctl.!default {
+      type pulse
+    }
+    pcm.!default {
+      type pulse
+    }
+  '';
+
+  clientConf = pkgs.writeText "client.conf" ''
+    autospawn=no
+    default-server = unix:${runDir}/socket
+  '';
+
+  configFile = pkgs.writeText "default.pa" ''
+    .include ${pkg}/etc/pulse/default.pa
+    load-module ${toString [
+      "module-native-protocol-unix"
+      "auth-anonymous=1"
+      "socket=${runDir}/socket"
+    ]}
+  '';
+in
+
+{
+  environment = {
+    etc = {
+      "asound.conf".source = alsaConf;
+      # XXX mkForce is not strong enough (and neither is mkOverride) to create
+      # /etc/pulse/client.conf, see pulseaudio-hack below for a solution.
+      #"pulse/client.conf" = mkForce { source = clientConf; };
+      #"pulse/client.conf".source = mkForce clientConf;
+      "pulse/default.pa".source = configFile;
+    };
+    systemPackages = [
+      pkg
+    ] ++ optionals config.services.xserver.enable [
+      pkgs.pavucontrol
+    ];
+  };
+
+  # Allow PulseAudio to get realtime priority using rtkit.
+  security.rtkit.enable = true;
+
+  system.activationScripts.pulseaudio-hack = ''
+    ln -fns ${clientConf} /etc/pulse/client.conf
+  '';
+
+  systemd.services.pulse = {
+    wantedBy = [ "sound.target" ];
+    before = [ "sound.target" ];
+    environment = {
+      PULSE_RUNTIME_PATH = "${runDir}/home";
+    };
+    serviceConfig = {
+      ExecStart = "${pkg}/bin/pulseaudio";
+      ExecStartPre = pkgs.writeDash "pulse-start" ''
+        install -o pulse -g audio -m 0750 -d ${runDir}
+        install -o pulse -g audio -m 0700 -d ${runDir}/home
+      '';
+      PermissionsStartOnly = "true";
+      User = "pulse";
+    };
+  };
+
+  users = {
+    groups.pulse.gid = config.users.users.pulse.uid;
+    users.pulse = {
+      uid = genid "pulse";
+      group = "pulse";
+      extraGroups = [ "audio" ];
+      home = "${runDir}/home";
+    };
+  };
+}
-- 
cgit v1.2.3


From fa139f638e07be78393637b049a195b9abf01c30 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 19 Jun 2016 00:26:00 +0200
Subject: l 2 pulse: add /etc/pulse/daemon.conf

---
 lass/2configs/pulse.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lass/2configs/pulse.nix')

diff --git a/lass/2configs/pulse.nix b/lass/2configs/pulse.nix
index e86ea3b94..3be482191 100644
--- a/lass/2configs/pulse.nix
+++ b/lass/2configs/pulse.nix
@@ -25,6 +25,13 @@ let
     default-server = unix:${runDir}/socket
   '';
 
+  daemonConf = pkgs.writeText "daemon.conf" ''
+    exit-idle-time=0
+    flat-volumes = no
+    default-fragments = 4
+    default-fragment-size-msec = 25
+  '';
+
   configFile = pkgs.writeText "default.pa" ''
     .include ${pkg}/etc/pulse/default.pa
     load-module ${toString [
@@ -44,6 +51,7 @@ in
       #"pulse/client.conf" = mkForce { source = clientConf; };
       #"pulse/client.conf".source = mkForce clientConf;
       "pulse/default.pa".source = configFile;
+      "pulse/daemon.pa".source = daemonConf;
     };
     systemPackages = [
       pkg
-- 
cgit v1.2.3