:Merge branch 'master' of prism.r:stockholm

119 files changed, 2052 insertions, 1251 deletions

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 7ac4cc2c..b9bb021b 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -103,7 +103,9 @@ in
     gotools
   # rust
     cargo
-    rustc
+    rustracer
+    rustup
+    vscode
   # orga tools
     taskwarrior
   # xorg
@@ -143,19 +145,11 @@ in
         '';
         }
       ];
-#      xmonad = {
-#        enable = true;
-#        enableContribAndExtras = true;
-#        extraPackages = haskellPackages: [
-#          haskellPackages.xmonad-contrib
-#          haskellPackages.xmonad-extras
-#          haskellPackages.xmonad
-#        ];
-#      }
-
     };
   };
 
+  services.xserver.windowManager.i3.enable = true;
+
   users.extraUsers.jeschli = { # TODO: define as krebs.users
     isNormalUser = true;
     extraGroups = ["docker" "vboxusers" "audio"];
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index ff6b539b..4d90ae3d 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -61,7 +61,7 @@ let
       ];
       hooks.PRIVMSG = [
         {
-          pattern = "^bier bal(ance)*$";
+          pattern = "^bier bal(an(ce)?)?$";
           activate = "match";
           command = {
             env = {
@@ -134,6 +134,7 @@ in {
     };
     r = {
       nick = "reaktor2|krebs";
+      sendDelaySec = null;
       plugins = [
         {
           plugin = "register";
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9303a81f..567c077e 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -45,10 +45,10 @@ let
       ./reaktor2.nix
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
-      ./retiolum-hosts.nix
       ./rtorrent.nix
       ./secret.nix
       ./setuid.nix
+      ./syncthing.nix
       ./tinc.nix
       ./tinc_graphs.nix
       ./urlwatch.nix
@@ -101,6 +101,7 @@ let
     { krebs = import ./krebs  { inherit config; }; }
     { krebs = import ./lass   { inherit config; }; }
     { krebs = import ./makefu { inherit config; }; }
+    { krebs = import ./external/palo.nix { inherit config; }; }
     { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 089113ac..c9715cb8 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -16,7 +16,33 @@ with import <stockholm/lib>;
   tinc-for = name: builtins.readFile (./tinc + "/${name}.pub");
 
 in {
+
   hosts = mapAttrs hostDefaults {
+    catullus = {
+      owner = config.krebs.users.kmein;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.2.3";
+          aliases = [ "catullus.r" ];
+          tinc.pubkey = ''
+            -----BEGIN PUBLIC KEY-----
+            MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2tRtskPP6391+ZX9xzsx
+            CUotXuqYucYmnUbrRSIlxASVqTmAf3nDOE5EDBBcTdSwnb02JcJW4Zh7+BGgMxjF