tv: reintroduce directory numbers

default.nix

@@ -9,8 +9,8 @@ let
     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;