120 files changed, 2145 insertions, 2023 deletions

diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix
index 5e236d574..f98521e25 100644
--- a/kartei/makefu/default.nix
+++ b/kartei/makefu/default.nix
@@ -104,7 +104,8 @@ in {
       nets = {
         retiolum.ip4.addr = "10.243.0.91";
         wiregrill = {
-          # defaults
+          ip4.addr = "10.243.245.6";
+          aliases = [ "x.w" ];
         };
       };
 
@@ -120,6 +121,12 @@ in {
       ci = true;
       syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK";
       nets = {
+        wiregrill = {
+          aliases =  ["omo.w" "hass.omo.w" "jelly.omo.w" "jelly.makefu.w" ];
+          ip6.addr = (krebs.genipv6