adaptation pour que les expression de desktop se lancent que dans desktop

desktop/app-adminsys.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Adminsys

desktop/app-bureautique.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Bureautique

desktop/app-cao.nix

@@ -1,10 +1,15 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
-  environment.systemPackages = with pkgs; [
+environment.systemPackages = with pkgs; [
     # CAO
     ## Modélisation 3D
     freecad   # modélisation de pièces en 3D

desktop/app-client-internet.nix

@@ -1,10 +1,15 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
-  environment.systemPackages = with pkgs; [
+environment.systemPackages = with pkgs; [
     # Clients Internet
 
     ## Navigateur & Réseaux sociaux

desktop/app-dev.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Base de données

desktop/app-geo.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Gestion de données géographiques

desktop/app-multimedia.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Multimedia

desktop/app-network.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Outils réseau
@@ -25,6 +30,8 @@
     tinc
   ];
 
-  networking.firewall.allowedTCPPorts = [5201]; # iperf
+  networking.firewall = {
-  networking.firewall.allowedUDPPorts = [5201]; # iperf
+    allowedTCPPorts = [5201]; # iperf
+    allowedUDPPorts = [5201]; # iperf
+  };
 }

desktop/app-securite.nix

@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  imports = [
+  inherit (lib) mkIf;
-  ];
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Securité

desktop/desktop.nix

@@ -1,5 +1,12 @@
 { config, pkgs, ... }:
 
+let
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+  mkIf = pkgs.lib.mkIf;
+in
+
 {
   imports = [                   # applications :
     # commandées par config-generator
@@ -21,7 +28,7 @@
     ./app-securite.nix          # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
   ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; mkIf profiles.isDesktop [
     # Environement de bureau
     wmname        # pour définir le nom du gestionnaire de fenêtre (utile pour java)
     kde4.ksnapshot# capture d'écran
@@ -55,7 +62,7 @@
   };
 
   # Enable the X11 windowing system.
-  services.xserver = {
+  services.xserver = mkIf profiles.isDesktop {
     enable = true;
     layout = "fr";
     xkbOptions = "eurosign:e";
@@ -89,7 +96,8 @@
     ''];
   };
   
-  hardware.pulseaudio = {
+  # Pulse Audio
+  hardware.pulseaudio = mkIf profiles.isDesktop {
     enable = true;
     support32Bit = true;
   };