diff --git a/default.nix b/default.nix
index 0ee1c3d05..59a76f81b 100644
--- a/default.nix
+++ b/default.nix
@@ -7,7 +7,7 @@ let
modules = map (p: ./. + "/${p}") [
"${user-name}/1systems/${system-name}.nix"
"${user-name}/3modules"
- "3modules/krebs"
+ "krebs/3modules"
];
};
diff --git a/3modules/krebs/default.nix b/krebs/3modules/default.nix
similarity index 97%
rename from 3modules/krebs/default.nix
rename to krebs/3modules/default.nix
index a53597fbe..668d66ccf 100644
--- a/3modules/krebs/default.nix
+++ b/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-----
diff --git a/3modules/krebs/git.nix b/krebs/3modules/git.nix
similarity index 98%
rename from 3modules/krebs/git.nix
rename to krebs/3modules/git.nix
index 604645189..64b7820b2 100644
--- a/3modules/krebs/git.nix
+++ b/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)
diff --git a/3modules/krebs/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
similarity index 91%
rename from 3modules/krebs/github-hosts-sync.nix
rename to krebs/3modules/github-hosts-sync.nix
index c3b56ef94..0274b9d15 100644
--- a/3modules/krebs/github-hosts-sync.nix
+++ b/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
diff --git a/3modules/krebs/nginx.nix b/krebs/3modules/nginx.nix
similarity index 100%
rename from 3modules/krebs/nginx.nix
rename to krebs/3modules/nginx.nix
diff --git a/3modules/krebs/retiolum.nix b/krebs/3modules/retiolum.nix
similarity index 100%
rename from 3modules/krebs/retiolum.nix
rename to krebs/3modules/retiolum.nix
diff --git a/3modules/krebs/urlwatch.nix b/krebs/3modules/urlwatch.nix
similarity index 100%
rename from 3modules/krebs/urlwatch.nix
rename to krebs/3modules/urlwatch.nix
diff --git a/4lib/krebs/default.nix b/krebs/4lib/default.nix
similarity index 100%
rename from 4lib/krebs/default.nix
rename to krebs/4lib/default.nix
diff --git a/4lib/krebs/dns.nix b/krebs/4lib/dns.nix
similarity index 100%
rename from 4lib/krebs/dns.nix
rename to krebs/4lib/dns.nix
diff --git a/4lib/krebs/listset.nix b/krebs/4lib/listset.nix
similarity index 100%
rename from 4lib/krebs/listset.nix
rename to krebs/4lib/listset.nix
diff --git a/4lib/krebs/tree.nix b/krebs/4lib/tree.nix
similarity index 100%
rename from 4lib/krebs/tree.nix
rename to krebs/4lib/tree.nix
diff --git a/4lib/krebs/types.nix b/krebs/4lib/types.nix
similarity index 100%
rename from 4lib/krebs/types.nix
rename to krebs/4lib/types.nix
diff --git a/Zpkgs/krebs/default.nix b/krebs/5pkgs/default.nix
similarity index 100%
rename from Zpkgs/krebs/default.nix
rename to krebs/5pkgs/default.nix
diff --git a/Zpkgs/krebs/dic.nix b/krebs/5pkgs/dic.nix
similarity index 100%
rename from Zpkgs/krebs/dic.nix
rename to krebs/5pkgs/dic.nix
diff --git a/Zpkgs/krebs/genid.nix b/krebs/5pkgs/genid.nix
similarity index 100%
rename from Zpkgs/krebs/genid.nix
rename to krebs/5pkgs/genid.nix
diff --git a/Zpkgs/krebs/github-hosts-sync.nix b/krebs/5pkgs/github-hosts-sync.nix
similarity index 100%
rename from Zpkgs/krebs/github-hosts-sync.nix
rename to krebs/5pkgs/github-hosts-sync.nix
diff --git a/Zpkgs/krebs/github-known_hosts.nix b/krebs/5pkgs/github-known_hosts.nix
similarity index 100%
rename from Zpkgs/krebs/github-known_hosts.nix
rename to krebs/5pkgs/github-known_hosts.nix
diff --git a/Zpkgs/krebs/hashPassword.nix b/krebs/5pkgs/hashPassword.nix
similarity index 100%
rename from Zpkgs/krebs/hashPassword.nix
rename to krebs/5pkgs/hashPassword.nix
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index e0a295f17..352689af4 100644
--- a/tv/4lib/default.nix
+++ b/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;
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 50625f868..7b5d10a60 100644
--- a/tv/5pkgs/default.nix
+++ b/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 {};