From dcae05d4c0f81ec44f0cc634fb43331359ece79e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Wed, 5 Jul 2017 22:11:49 +0200
Subject: [PATCH] =?UTF-8?q?m=C3=A9nage=20(suite)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/client-internet.nix |  3 +--
 applications/graphical/multimedia.nix      |  5 -----
 applications/terminal/client-internet.nix  |  8 ++++----
 configuration/environment.nix              |  4 ----
 services/dbus.nix                          | 13 +++++++++++++
 services/default.nix                       |  1 +
 services/pulseaudio.nix                    |  6 ++++++
 7 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 services/dbus.nix

diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index 5f9edf1..d5c1f98 100644
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -6,7 +6,7 @@ let
   currentMachine = annuaire."${config.networking.hostName}";
   flags = currentMachine.configurationFlags;
 in
-# TODO: ménage
+
 mkIf (flags.internetSuite && flags.graphical) {
 
 # Paquets
@@ -20,7 +20,6 @@ environment.systemPackages = with pkgs; [
     ## Mail & Discussion (texte, audio)
     clawsMail
     hexchat
-    quassel
     quasselClient
     mumble
     pidgin
diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix
index b76387d..1ea891a 100644
--- a/applications/graphical/multimedia.nix
+++ b/applications/graphical/multimedia.nix
@@ -7,15 +7,10 @@ let
   flags = currentMachine.configurationFlags;
 in
 
-# TODO ranger le spécifique pulseaudio
 mkIf (flags.multimediaSuite && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    ## Audio
-    paprefs       # préferences pulseaudio
-    pavucontrol   # mixer pulseaudio
-
     ## Video
     smplayer      # lecteur vidéo
     vlc           # lecteur vidéo
diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix
index 188a23d..6c56c6a 100644
--- a/applications/terminal/client-internet.nix
+++ b/applications/terminal/client-internet.nix
@@ -6,7 +6,7 @@ let
   currentMachine = annuaire."${config.networking.hostName}";
   flags = currentMachine.configurationFlags;
 in
-# TODO: ménage
+
 mkIf flags.internetSuite {
 
 # Paquets
@@ -15,14 +15,14 @@ environment.systemPackages = with pkgs; [
 
     ## Réseaux sociaux
     #python27Packages.turses           # client twitter en ncurse
-    python27Packages.rainbowstream    # client twitter en console
-    rtv                               # client reddit en console
+    #python27Packages.rainbowstream    # client twitter en console
+    #rtv                               # client reddit en console
 
     ## Mail & Discussion (texte, audio)
     mutt
 
     ## Sauvegarde nuagique (cloud storage)
-    rclone
+    #rclone
 
     ## P2P
     rtorrent      # outil de téléchargement de torrent & magnet
diff --git a/configuration/environment.nix b/configuration/environment.nix
index f29117e..6d657e3 100644
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -7,7 +7,6 @@ let
   flags = currentMachine.configurationFlags;
 in
 
-# TODO: ménage
 {
   # Nombre de process d'installation en parrallèle effectués par Nix
   nix.buildCores = 0;
@@ -21,9 +20,6 @@ in
   # On autorise les paquets non-libres
   nixpkgs.config.allowUnfree = true;
 
-  # Lancement de dbus pour les utilisateurs
-  services.dbus.socketActivated = true;
-
   # NixOS Hardening
   #security.grsecurity.enable = true;
 
diff --git a/services/dbus.nix b/services/dbus.nix
new file mode 100644
index 0000000..78faab8
--- /dev/null
+++ b/services/dbus.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+  # Lancement de dbus pour les utilisateurs
+  services.dbus.socketActivated = true;
+}
diff --git a/services/default.nix b/services/default.nix
index 74b9d0a..8f86e92 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -10,6 +10,7 @@ in
 {
   imports = [
     # installées systématiquement
+    ./dbus.nix
     ./gpm.nix
     ./haveged.nix
     ./monitoring-munin.nix
diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix
index e0c7e9c..8f47776 100644
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.nix
@@ -9,6 +9,12 @@ in
 
 mkIf flags.pulseaudio {
 
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    paprefs       # préferences pulseaudio
+    pavucontrol   # mixer pulseaudio
+  ];
+
   # Pulse Audio
   hardware.pulseaudio = {
     enable = true;