Merge remote-tracking branch 'gum/master'

4 files changed, 40 insertions, 10 deletions

diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index b8cc1b4a1..ba897a26e 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -101,6 +101,7 @@ in
 
   users.extraUsers.root.openssh.authorizedKeys.keys = [
     config.krebs.users.ulrich.pubkey
+    config.krebs.users.makefu-omo.pubkey
   ];
 
   time.timeZone = "Europe/Berlin";
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index aaddd8a68..bbb8cfe11 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -14,7 +14,7 @@ let
 in {
   imports = [
       <stockholm/makefu>
-       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
       <stockholm/makefu/2configs/headless.nix>
       <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
       # <stockholm/makefu/2configs/smart-monitor.nix>
@@ -33,6 +33,8 @@ in {
       <stockholm/makefu/2configs/tools/core.nix>
       <stockholm/makefu/2configs/tools/dev.nix>
       <stockholm/makefu/2configs/tools/sec.nix>
+      <stockholm/makefu/2configs/vim.nix>
+      <stockholm/makefu/2configs/zsh-user.nix>
 
       # services
       <stockholm/makefu/2configs/share/gum.nix>
@@ -106,7 +108,10 @@ in {
     bepasty-client-cli
     get
   ];
-  services.bitlbee.enable = true;
+  services.bitlbee = {
+    enable = true;
+    libpurple_plugins = [ pkgs.telegram-purple ];
+  };
 
   # Hardware
   boot.loader.grub.device = main-disk;
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 732f1d860..e43b203b4 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -53,14 +53,20 @@ in {
       <stockholm/makefu/2configs/share/omo.nix>
       <stockholm/makefu/2configs/tinc/retiolum.nix>
 
+
       # Logging
-      <stockholm/makefu/2configs/stats/server.nix #influx + grafana>
+      #influx + grafana
+      <stockholm/makefu/2configs/stats/server.nix>
       <stockholm/makefu/2configs/stats/client.nix>
-      <stockholm/makefu/2configs/stats/external/aralast.nix # logs to influx>
+      # logs to influx
+      <stockholm/makefu/2configs/stats/external/aralast.nix>
 
       # services
       <stockholm/makefu/2configs/syncthing.nix>
       <stockholm/makefu/2configs/mqtt.nix>
+
+      # security
+      <stockholm/makefu/2configs/sshd-totp.nix>
       # <stockholm/makefu/2configs/logging/central-logging-client.nix>
 
       # <stockholm/makefu/2configs/torrent.nix>
@@ -189,8 +195,29 @@ in {
   zramSwap.enable = true;
 
   krebs.Reaktor.reaktor = {
-    nickname = "Reaktor|bot";
-    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
+    nickname = "Reaktor|krebs";
+    workdir = "/var/lib/Reaktor/krebs";
+    channels = [ "#krebs" ];
+    plugins = with pkgs.ReaktorPlugins;[
+                               stockholm-issue
+                               nixos-version
+                               sed-plugin
+                               random-emoji ];
+  };
+  krebs.Reaktor.reaktor-shack = {
+    nickname = "Reaktor|shack";
+    workdir = "/var/lib/Reaktor/shack";
+    channels = [ "#shackspace" ];
+    plugins = with pkgs.ReaktorPlugins;[
+                               shack-correct
+                               # stockholm-issue
+                               sed-plugin
+                               random-emoji ];
+  };
+  krebs.Reaktor.reaktor-bgt = {
+    nickname = "Reaktor|bgt";
+    workdir = "/var/lib/Reaktor/bgt";
+    channels = [ "#binaergewitter" ];
     plugins = with pkgs.ReaktorPlugins;[
                                titlebot
                                # stockholm-issue
diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix
index af0f37809..f662653e7 100644
--- a/makefu/1systems/studio/source.nix
+++ b/makefu/1systems/studio/source.nix
@@ -1,7 +1,4 @@
 import <stockholm/makefu/source.nix> {
   name="studio";
-  override.musnix.git = {
-    url = https://github.com/musnix/musnix.git;
-    ref = "d8b989f";
-  };
+  musnix = true;
 }