diff --git a/.gitmodules b/.gitmodules index d1b5e8b..1f4d6fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,6 @@ path = nixos-template-base url = ssh://git@gogs.prunetwork.fr:10022/nixos-config/nixos-template-base.git branch = master +[submodule "template-nixos"] + path = capgemini-cmb + url = ssh://git@gogs.prunetwork.fr:10022/Capgemini-CDS-Arkea/template-nixos.git diff --git a/capgemini-cmb b/capgemini-cmb new file mode 160000 index 0000000..e4e00a4 --- /dev/null +++ b/capgemini-cmb @@ -0,0 +1 @@ +Subproject commit e4e00a44ccf3ed473db62788f7a4b6dadc6e40a4 diff --git a/livecd-minimal.nix b/livecd-minimal.nix index 49d1320..6749e97 100644 --- a/livecd-minimal.nix +++ b/livecd-minimal.nix @@ -2,6 +2,7 @@ { imports = [ + capgemini-cmb/default.nix nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix nixos-template-base/base.nix ]; @@ -18,4 +19,6 @@ } ]; environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";}; + services.xserver.enable = true; + networking.hostName = "nixos-livecd.corp.capgemini.com"; } diff --git a/nixos-template-base b/nixos-template-base index 93254f4..e74a182 160000 --- a/nixos-template-base +++ b/nixos-template-base @@ -1 +1 @@ -Subproject commit 93254f45c0c8f8f51f7975ada1d53fbc7cf391bb +Subproject commit e74a1825d9636db49d903294a18c5804548b143a