From 2df8cf6695dc9d9486ec0096becfe872e8a4c516 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 9 Aug 2016 13:36:34 +0200
Subject: [PATCH] extraction de pulseaudio comme service

---
 desktop/desktop.nix           |  7 -------
 public/public.nix             |  1 +
 public/service-pulseaudio.nix | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 public/service-pulseaudio.nix

diff --git a/desktop/desktop.nix b/desktop/desktop.nix
index 51dfac5..f394ea7 100644
--- a/desktop/desktop.nix
+++ b/desktop/desktop.nix
@@ -54,11 +54,4 @@ in
     clawsMail = pkgs.clawsMail.override { enablePluginFancy = true; };
     mumble = pkgs.mumble.override { pulseSupport = true; };
   };
-
-  # Pulse Audio
-  hardware.pulseaudio = mkIf profiles.isDesktop {
-    enable = true;
-    support32Bit = true;
-  };
-  environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
 }
diff --git a/public/public.nix b/public/public.nix
index 0807aa7..77473be 100644
--- a/public/public.nix
+++ b/public/public.nix
@@ -32,6 +32,7 @@
     ./app-multimedia.nix        # pour gérer le son, l'image et la vidéo
     ./app-network.nix           # de gestion, de diagnostique & surveillance réseau
     ./app-securite.nix          # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
+    ./service-pulseaudio.nix    # activation du serveur audio
     ./service-x11.nix           # activation du serveur graphique X
   ];
 }
diff --git a/public/service-pulseaudio.nix b/public/service-pulseaudio.nix
new file mode 100644
index 0000000..a538108
--- /dev/null
+++ b/public/service-pulseaudio.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+let
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+  mkIf = pkgs.lib.mkIf;
+in
+
+{
+  # Pulse Audio
+  hardware.pulseaudio = mkIf profiles.isDesktop {
+    enable = true;
+    support32Bit = true;
+  };
+  environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
+}