ajout outil wifi pour profil laptop

base/activation-manuelle/nix-serve-client.nix

@@ -16,7 +16,7 @@ mkIf cfg.nix-serve-client {
       (mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
 
       (mkIf profiles.isPrunetwork "https://cache.nixos.org/")
-      (mkIf (profiles.isPrunetwork && !profiles.isServer) "http://192.168.1.20:5000")
+      (mkIf (profiles.isPrunetwork && !profiles.isServer) "http://nix-cache.dubronetwork.fr:5001")
     ];
     extraOptions = ''
     connect-timeout = 5

config-generator.nix

@@ -181,6 +181,7 @@ in
       };
 
       r6d.config-generator = {
+        print = true;
         virtualbox = true;
       };
     })
@@ -251,6 +252,8 @@ in
 
       r6d.config-generator = {
         nix-serve-server = true;
+        laptop = true;
+        edition-photo = true;
       };
     })
     (mkIf comp.isRollo {

desktop/desktop.nix

@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
-  mkIf = pkgs.lib.mkIf;
+  mkIf = lib.mkIf;
 in
 
 {

public/app-network.nix

@@ -7,7 +7,8 @@ let
   profiles = config.r6d.profiles;
 in
 
-mkIf profiles.isDesktop {
+mkIf true {
+#mkIf profiles.isDesktop {
 
   # Paquets
   environment.systemPackages = with pkgs; [
@@ -19,7 +20,7 @@ mkIf profiles.isDesktop {
 
     ## Diagnostic
     arp-scan
-    wireshark
+    #wireshark
     whois
   ];
 

public/environment.nix

@@ -14,6 +14,9 @@ in
   # The NixOS release to be compatible with for stateful data such as databases.
   system.stateVersion = "16.03";
 
+  #  copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
+  system.copySystemConfiguration = true;
+
   # On autorise les paquets non-libres
   nixpkgs.config.allowUnfree = true;
 
@@ -36,6 +39,7 @@ in
       p7zip         # compression de fichier
       parted        # partitionnement de disque
       pciutils
+      psmisc        # fournis les utilitaires comme killall, fuser, pstree
       python        # python -- python -m SimpleHTTPServer 8000
       python34Packages.glances # monitoring
       pwgen         # générateur de mot de passe

public/laptop.nix

@@ -21,6 +21,7 @@ mkIf cfg.laptop {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    networkmanagerapplet
+    networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
+    wirelesstools           # fournis iwconfig
   ];
 }