Merge branch 'generator'

activation-manuelle/app-docker.nix

@@ -4,11 +4,13 @@
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; [
+  config = mkIf config.r6d.config-generator.docker {
-    # Ecosystème Docker
+    environment.systemPackages = with pkgs; [
-    docker
+      # Ecosystème Docker
-    python27Packages.docker_compose
+      docker
-  ];
+      python27Packages.docker_compose
+    ];
 
-  virtualisation.docker.enable = true;
+    virtualisation.docker.enable = true;
+  }
 }

activation-manuelle/app-jeux.nix

@@ -4,8 +4,10 @@
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; [
+  config = mkIf config.r6d.config-generator.jeux {
-    # Jeux
+    environment.systemPackages = with pkgs; [
-    urbanterror
+      # Jeux
-  ];
+      urbanterror
+    ];
+  }
 }

activation-manuelle/app-virtualbox.nix

@@ -4,11 +4,13 @@
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; [
+  config = mkIf config.r6d.config-generator.virtualbox {
-    linuxPackages.virtualbox
+    environment.systemPackages = with pkgs; [
-    linuxPackages.virtualboxGuestAdditions
+      linuxPackages.virtualbox
-  ];
+      linuxPackages.virtualboxGuestAdditions
-
+    ];
-  virtualisation.virtualbox.host.enable = true;
 
+    virtualisation.virtualbox.host.enable = true;
+  }
 }
+

activation-manuelle/laptop.nix

@@ -3,20 +3,22 @@
 {
   # Paquets spécifiques pour un ordinateur portable
 
-  networking = {
+  config = mkIf config.r6d.config-generator.laptop {
-    #wireless.enable = true;       # Enables wireless support via wpa_supplicant
-    networkmanager.enable = true; # Activation d'un gestionnaire de réseau
-  };
 
-  hardware.bluetooth.enable = true;
+    networking = {
+      #wireless.enable = true;       # Enables wireless support via wpa_supplicant
+      networkmanager.enable = true; # Activation d'un gestionnaire de réseau
+    };
 
-  environment.systemPackages = with pkgs;[
+    hardware.bluetooth.enable = true;
-    networkmanagerapplet
-  ];
 
-  services.xserver.synaptics = {
+    environment.systemPackages = with pkgs;[
-    enable = true;
+      networkmanagerapplet
-    twoFingerScroll = true;
+    ];
-  };
 
+    services.xserver.synaptics = {
+      enable = true;
+      twoFingerScroll = true;
+   };
+ }
 }