From 4660f79017a0985b1eeaeb695fd54397fd122318 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Fri, 24 Mar 2017 23:25:46 +0100
Subject: [PATCH] =?UTF-8?q?refactor=20de=20la=20configuration=20sp=C3=A9ci?=
 =?UTF-8?q?fique=20aux=20laptops?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/{ => configurations}/laptop.nix |  6 ++++++
 public/public.nix                      |  3 +--
 public/services/laptop.nix             | 19 -------------------
 3 files changed, 7 insertions(+), 21 deletions(-)
 rename public/{ => configurations}/laptop.nix (86%)
 delete mode 100644 public/services/laptop.nix

diff --git a/public/laptop.nix b/public/configurations/laptop.nix
similarity index 86%
rename from public/laptop.nix
rename to public/configurations/laptop.nix
index 86c592b..e9a47fb 100644
--- a/public/laptop.nix
+++ b/public/configurations/laptop.nix
@@ -24,4 +24,10 @@ mkIf cfg.laptop {
     networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
     wirelesstools           # fournis iwconfig
   ];
+
+  # Services
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+  };
 }
diff --git a/public/public.nix b/public/public.nix
index 69e4773..0521a27 100644
--- a/public/public.nix
+++ b/public/public.nix
@@ -38,14 +38,13 @@ in
     ./applications/jeux.nix                  # jouer, tout simplement ;)
     ./applications/virtualbox.nix            # activer virtualbox
     ./auto-upgrade.nix              # mise à jour automatique du système
-    ./laptop.nix                    # appli & configuration adaptée pour un PC portable
+    ./configurations/laptop.nix                    # appli & configuration adaptée pour un PC portable
     ./print.nix                     # configuration de base de cups
     ./services/elasticsearch.nix     # service de stockage et recher de données
     ./services/hoogle.nix            # service hoogle pour haskell
     ./services/hydra-build.nix       # service de construction de paquet. -> la machine compile des paquets
     ./services/hydra-core.nix        # service pour l'instance d'hydra
     ./services/kibana.nix            # service de visualisation de données stockées dans elasticsearch
-    ./services/laptop.nix            # services spécifiques aux pc portables
     ./services/locate.nix            # service locate
     ./swap.nix                      # définition de l'utilisation du swap
     ./xmonad/xmonad.nix             # pour le gestionaire de fenêtre xmonad
diff --git a/public/services/laptop.nix b/public/services/laptop.nix
deleted file mode 100644
index fe4c8c2..0000000
--- a/public/services/laptop.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-in
-
-mkIf cfg.laptop {
-
-  # Gestion spécifique pour PC portable
-
-  # Services
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-  };
-}