From 3b17e61aba8f4b1d3a8928e62f43e2f9026ffa89 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <yves+git@dubronetwork.fr>
Date: Fri, 23 Jun 2017 22:14:23 +0200
Subject: [PATCH] =?UTF-8?q?import=20des=20am=C3=A9liorations=20de=20la=20b?=
 =?UTF-8?q?ranche=20capgemini-cmb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules         |  4 ----
 capgemini-cmb       |  1 -
 livecd-minimal.nix  | 24 +++++++++++++++++++++---
 nixos-template-base |  2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)
 delete mode 160000 capgemini-cmb

diff --git a/.gitmodules b/.gitmodules
index f2b5953..ab0d79a 100644
--- a/.gitmodules
+++ b/.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
diff --git a/capgemini-cmb b/capgemini-cmb
deleted file mode 160000
index 13a77dc..0000000
--- a/capgemini-cmb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 13a77dcccdd2aa0ef610ae86c7c31d2da70fda05
diff --git a/livecd-minimal.nix b/livecd-minimal.nix
index 324aae7..980737e 100644
--- a/livecd-minimal.nix
+++ b/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;
+      };
+    };
+  };
 }
diff --git a/nixos-template-base b/nixos-template-base
index 42db758..4dbcc8d 160000
--- a/nixos-template-base
+++ b/nixos-template-base
@@ -1 +1 @@
-Subproject commit 42db758638cae777f8141992d13a8c3a4e887ebf
+Subproject commit 4dbcc8ddc0dac9d927bbf5eb7712b7443d730195