From 7a35fcc2c878e54082497d3dfe4f712ec05934c3 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <yves+git@dubronetwork.fr>
Date: Mon, 9 May 2016 01:25:47 +0200
Subject: [PATCH] templates downloading via git and submodules

---
 Makefile.installation | 6 +++++-
 livecd-minimal.nix    | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.installation b/Makefile.installation
index 533a432..1a14949 100644
--- a/Makefile.installation
+++ b/Makefile.installation
@@ -1,3 +1,7 @@
 all:
 	nixos-generate-config --root /mnt
-	cp -r nixos-template-base /mnt/etc/nixos/
+	git config --global user.email "nixos-live@example.org"
+	git config --global user.name "NixOS Live"
+	cd /mnt/etc/nixos && git init . && git add . && git commit -m "initial commit"
+	cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-base.git base
+	cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-desktop.git desktop
diff --git a/livecd-minimal.nix b/livecd-minimal.nix
index f1e0f43..49d1320 100644
--- a/livecd-minimal.nix
+++ b/livecd-minimal.nix
@@ -16,9 +16,6 @@
       source = ./Makefile.installation;
       target = "/custom/Makefile";
     }
-    {
-      source = ./nixos-template-base;
-      target = "/custom/nixos-template-base";
-    }
   ];
+  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
 }