Merge remote-tracking branch 'cd/user-toplevel' into user-toplevel

Makefile

@@ -2,7 +2,7 @@
 # usage:
 #		make system=foo
 #		make systems='foo bar'
-#		make eval system=foo get=config.networking.extraHosts
+#		make eval system=foo get=config.networking.extraHosts [filter=json]
 #
 
 .ONESHELL:
@@ -17,91 +17,30 @@ $(systems):
 		--tagstring {} \
 		-q make systems= system={} ::: $(systems)
 else ifdef system
-include 0make/$(LOGNAME)/$(system).makefile
 .PHONY: deploy
 deploy:;@
-	system_name=$(system)
+	make eval system=$(system) get=config.krebs.build.script filter=json | sh
-	deploy_host=$(deploy_host)
-	nixpkgs_url=$(nixpkgs_url)
-	nixpkgs_rev=$(nixpkgs_rev)
-	secrets_dir=$(secrets_dir)
-
-	prepush(){(
-		dst=$$1
-		src=$$2
-		rsync \
-			--exclude .git \
-			--exclude .graveyard \
-			--exclude old \
-			--rsync-path="mkdir -p \"$$dst\" && rsync" \
-			--usermap=\*:0 \
-			--groupmap=\*:0 \
-			--delete-excluded \
-			-vrLptgoD \
-			"$$src/" "$$deploy_host:$$dst"
-	)}
-
-	prepush /root/src/stockholm "$$PWD"
-	prepush /root/src/secrets "$$secrets_dir"
-
-	ssh -S none "$$deploy_host" -T env \
-			nixpkgs_url="$$nixpkgs_url" \
-			nixpkgs_rev="$$nixpkgs_rev" \
-			system_name="$$system_name" \
-			user_name="$$LOGNAME" \
-		sh -euf \
-	<<-\EOF
-		prefetch(){(
-			dst=$$1
-			url=$$2
-			rev=$$3
-			mkdir -p "$$dst"
-			cd "$$dst"
-			if ! test -e .git; then
-				git init
-			fi
-			if ! cur_url=$$(git config remote.origin.url 2>/dev/null); then
-				git remote add origin "$$url"
-			elif test "$$cur_url" != "$$url"; then
-				git remote set-url origin "$$url"
-			fi
-			if test "$$(git rev-parse --verify HEAD 2>/dev/null)" != "$$rev"; then
-				git fetch origin
-				git checkout "$$rev" -- .
-				git checkout -q "$$rev"
-				git submodule init
-				git submodule update
-			fi
-			git clean -dxf
-		)}
-
-		prefetch /root/src/nixpkgs "$$nixpkgs_url" "$$nixpkgs_rev"
-
-		echo build system...
-		NIX_PATH=/root/src \
-		nix-build \
-			-Q \
-			-A system \
-			'<stockholm>' \
-			--argstr user-name "$$user_name" \
-			--argstr system-name "$$system_name"
-
-		result/bin/switch-to-configuration switch
-	EOF
 
 .PHONY: eval
 eval:
 	@
+ifeq ($(filter),json)
+	extraArgs=--json
+	filter() { jq -r .; }
+else
+	filter() { cat; }
+endif
 	NIX_PATH=stockholm=$$PWD:$$NIX_PATH \
 	nix-instantiate \
-		--json \
+		$${extraArgs-} \
+		$${json+--json} \
+		$${json+--strict} \
 		--eval \
-		--strict \
 		-A "$$get" \
 		'<stockholm>' \
 		--argstr user-name "$$LOGNAME" \
 		--argstr system-name "$$system" \
-		| jq -r .
+		| filter
 else
 $(error unbound variable: system[s])
 endif

default.nix

@@ -1,16 +1,12 @@
 { user-name, system-name }:
 
 let
-  lib = import 4lib/krebs {
-    lib = import <nixpkgs/lib>;
-  };
 
   eval = import <nixpkgs/nixos/lib/eval-config.nix> {
-    inherit lib;
     system = builtins.currentSystem;
     modules = map (p: ./. + "/${p}") [
-      "${user-name}/systems/${system-name}.nix"
+      "${user-name}/1systems/${system-name}.nix"
-      "${user-name}/modules"
+      "${user-name}/3modules"
       "3modules/krebs"
     ];
   };

tv/1systems/cd.nix

@@ -3,7 +3,7 @@
 with lib;
 
 let
-  tvpkgs = import ../pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit pkgs; };
 in
 
 {
@@ -26,14 +26,14 @@ in
   };
 
   imports = [
-    ../configs/CAC-Developer-2.nix
+    ../2configs/CAC-Developer-2.nix
-    ../configs/CAC-CentOS-7-64bit.nix
+    ../2configs/CAC-CentOS-7-64bit.nix
-    ../configs/base.nix
+    ../2configs/base.nix
-    ../configs/consul-server.nix
+    ../2configs/consul-server.nix
-    ../configs/exim-smarthost.nix
+    ../2configs/exim-smarthost.nix
-    ../configs/git.nix
+    ../2configs/git.nix
     {
-      imports = [ ../configs/charybdis.nix ];
+      imports = [ ../2configs/charybdis.nix ];
       tv.charybdis = {
         enable = true;
         sslCert = ../../Zcerts/charybdis_cd.crt.pem;

tv/1systems/mkdir.nix

@@ -22,12 +22,12 @@ with lib;
   };
 
   imports = [
-    ../configs/CAC-Developer-1.nix
+    ../2configs/CAC-Developer-1.nix
-    ../configs/CAC-CentOS-7-64bit.nix
+    ../2configs/CAC-CentOS-7-64bit.nix
-    ../configs/base.nix
+    ../2configs/base.nix
-    ../configs/consul-server.nix
+    ../2configs/consul-server.nix
-    ../configs/exim-smarthost.nix
+    ../2configs/exim-smarthost.nix
-    ../configs/git.nix
+    ../2configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/1systems/nomic.nix

@@ -22,11 +22,11 @@ with lib;
   };
 
   imports = [
-    ../configs/AO753.nix
+    ../2configs/AO753.nix
-    ../configs/base.nix
+    ../2configs/base.nix
-    ../configs/consul-server.nix
+    ../2configs/consul-server.nix
-    ../configs/exim-retiolum.nix
+    ../2configs/exim-retiolum.nix
-    ../configs/git.nix
+    ../2configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/1systems/rmdir.nix

@@ -22,12 +22,12 @@ with lib;
   };
 
   imports = [
-    ../configs/CAC-Developer-1.nix
+    ../2configs/CAC-Developer-1.nix
-    ../configs/CAC-CentOS-7-64bit.nix
+    ../2configs/CAC-CentOS-7-64bit.nix
-    ../configs/base.nix
+    ../2configs/base.nix
-    ../configs/consul-server.nix
+    ../2configs/consul-server.nix
-    ../configs/exim-smarthost.nix
+    ../2configs/exim-smarthost.nix
-    ../configs/git.nix
+    ../2configs/git.nix
     {
       tv.iptables = {
         enable = true;

tv/1systems/wu.nix

@@ -3,7 +3,7 @@
 with lib;
 
 let
-  tvpkgs = import ../pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit pkgs; };
 in
 
 {
@@ -26,15 +26,15 @@ in
   };
 
   imports = [
-    ../configs/w110er.nix
+    ../2configs/w110er.nix
-    ../configs/base.nix
+    ../2configs/base.nix
-    ../configs/consul-client.nix
+    ../2configs/consul-client.nix
-    ../configs/exim-retiolum.nix
+    ../2configs/exim-retiolum.nix
-    ../configs/git.nix
+    ../2configs/git.nix
-    ../configs/mail-client.nix
+    ../2configs/mail-client.nix
-    ../configs/xserver.nix
+    ../2configs/xserver.nix
-    ../configs/synaptics.nix # TODO w110er if xserver is enabled
+    ../2configs/synaptics.nix # TODO w110er if xserver is enabled
-    ../configs/urlwatch.nix
+    ../2configs/urlwatch.nix
     {
       environment.systemPackages = with pkgs; [
 

tv/2configs/AO753.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../configs/smartd.nix
+    ../2configs/smartd.nix
   ];
 
   boot.loader.grub = {

tv/2configs/charybdis.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  tvpkgs = import ../pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit pkgs; };
 in
 
 with builtins;

tv/2configs/git.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import ../lib { inherit lib pkgs; };
+with import ../4lib { inherit lib pkgs; };
 let
 
   out = {

tv/2configs/mail-client.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-with import ../pkgs { inherit pkgs; };
+with import ../5pkgs { inherit pkgs; };
 
 {
   environment.systemPackages = [

tv/2configs/w110er.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../configs/smartd.nix
+    ../2configs/smartd.nix
   ];
 
   boot.extraModprobeConfig = ''

tv/2configs/xserver.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../configs/urxvt.nix # TODO via xserver
+    ../2configs/urxvt.nix # TODO via xserver
   ];
 
   services.xserver.enable = true;

tv/3modules/consul.nix

@@ -5,7 +5,7 @@
 # TODO consul-bootstrap HOST  that actually does is
 # TODO tools to inspect state of a cluster in outage state
 
-with import ../lib { inherit lib pkgs; };
+with import ../4lib { inherit lib pkgs; };
 let
   cfg = config.tv.consul;
 

tv/4lib/default.nix

@@ -1,11 +1,16 @@
 { lib, pkgs, ... }:
 
-with lib;
+let
+  krebs = import ../../4lib/krebs { inherit lib; };
+in
 
-lib // rec {
+with krebs;
+
+krebs // rec {
 
   git = import ./git.nix {
-    inherit lib pkgs;
+    lib = krebs;
+    inherit pkgs;
   };
 
   # "7.4.335" -> "74"