Merge remote-tracking branch 'cd/master' into newmaster2

default.nix

@@ -7,7 +7,7 @@ let
     modules = map (p: ./. + "/${p}") [
       "${user-name}/1systems/${system-name}.nix"
       "${user-name}/3modules"
-      "3modules/krebs"
+      "krebs/3modules"
     ];
   };
 

krebs/3modules/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with import ../../4lib/krebs { inherit lib; };
+with import ../4lib { inherit lib; };
 let
   cfg = config.krebs;
 
@@ -167,11 +167,6 @@ let
         de.krebsco = "ovh";
         internet = "hosts";
         retiolum = "hosts";
-        de.habsys = "hosts";
-        de.pixelpocket = "hosts";
-        de.karlaskop = "hosts";
-        de.ubikmedia = "hosts";
-        de.apanowicz = "hosts";
       };
 
       # XXX This overlaps with krebs.retiolum
@@ -210,11 +205,6 @@ let
             aliases = [
               "cloudkrebs.retiolum"
               "cgit.cloudkrebs.retiolum"
-              "habsys.de"
-              "pixelpocket.de"
-              "karlaskop.de"
-              "ubikmedia.de"
-              "apanowicz.de"
             ];
             tinc.pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----

krebs/3modules/git.nix

@@ -6,15 +6,11 @@
 # TODO when authorized_keys changes, then restart ssh
 #       (or kill already connected users somehow)
 
-with import ../../4lib/krebs { inherit lib; };
+with import ../4lib { inherit lib; };
 let
   cfg = config.krebs.git;
 
   out = {
-    # TODO don't import krebs.nginx here
-    imports = [
-      ../../3modules/krebs/nginx.nix
-    ];
     options.krebs.git = api;
     config = mkIf cfg.enable (mkMerge [
       (mkIf cfg.cgit cgit-imp)

krebs/3modules/github-hosts-sync.nix

@@ -61,9 +61,9 @@ let
             ${cfg.ssh-identity-file} \
             "$ssh_identity_file_target"
 
-          ln -snf ${Zpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
+          ln -snf ${kpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
         '';
-        ExecStart = "${Zpkgs.github-hosts-sync}/bin/github-hosts-sync";
+        ExecStart = "${kpkgs.github-hosts-sync}/bin/github-hosts-sync";
       };
     };
 
@@ -78,6 +78,6 @@ let
     uid = 3220554646; # genid github-hosts-sync
   };
 
-  Zpkgs = import ../../Zpkgs/krebs { inherit pkgs; };
+  kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
 in
 out

tv/4lib/default.nix

@@ -1,7 +1,7 @@
 { lib, pkgs, ... }:
 
 let
-  krebs = import ../../4lib/krebs { inherit lib; };
+  krebs = import ../../krebs/4lib { inherit lib; };
 in
 
 with krebs;

tv/5pkgs/default.nix

@@ -2,10 +2,10 @@
 
 let
   inherit (pkgs) callPackage;
-  krebs = import ../../Zpkgs/krebs { inherit pkgs; };
+  kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
 in
 
-krebs // {
+kpkgs // {
   charybdis = callPackage ./charybdis {};
   lentil = callPackage ./lentil {};
   much = callPackage ./much.nix {};