import des améliorations de la branche capgemini-cmb

.gitmodules

@@ -2,7 +2,3 @@
 	path = nixos-template-base
 	url = ssh://git@gogs.prunetwork.fr:10022/nixos-config/nixos-template-base.git
 	branch = nixos-unstable
-[submodule "capgemini-cmb"]
-	path = capgemini-cmb
-	url = ssh://git@gogs.prunetwork.fr:10022/Capgemini-CDS-Arkea/template-nixos.git
-    branch = master

capgemini-cmb

@@ -1 +0,0 @@
-Subproject commit 13a77dcccdd2aa0ef610ae86c7c31d2da70fda05

livecd-minimal.nix

@@ -1,15 +1,15 @@
 { config, lib, pkgs, ... }:
 let
   custom-generator = "generate-config.sh";
+  r6dLib = import ./nixos-template-base/lib.nix;
 in
 {
   imports = [
-    capgemini-cmb/default.nix
     /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
     nixos-template-base/base.nix
   ];
   # Custom name
-  isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-capgemini-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
+  isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-grudu.net-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
   # Avoid having the terminal flooded by kernel audit messages
   boot.kernelParams = [ "audit=0" ];
 
@@ -21,5 +21,23 @@ in
     }
   ];
   environment.shellAliases = { nixos-generate-custom-config = "/iso/custom/${custom-generator}";};
-  networking.hostName = "nixos-livecd.corp.capgemini.com";
+  networking.hostName = "nixos-livecd.grudu.net";
+  services.xserver.enable = true;
+
+  r6d.machines = r6dLib.applyProfilesToDirectory {} {
+    "nixos-livecd.grudu.net" = {
+      configurationFlags = {
+        dns_resolveur = true;
+        edition-photo = true;
+        jetbrains-licensed = true;
+      };
+      configurationOptions = {};
+      profiles = {
+        isDubronetwork = true;
+        isDubronetworkWorkstation = true;
+        isDesktopEnvironment = true;
+        isWorkstation = true;
+      };
+    };
+  };
 }

nixos-template-base

@@ -1 +1 @@
-Subproject commit 42db758638cae777f8141992d13a8c3a4e887ebf
+Subproject commit 4dbcc8ddc0dac9d927bbf5eb7712b7443d730195