From 679a03403f0b5152c091f23c4dc1b94625f5771b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 17 Mar 2017 01:21:20 +0100
Subject: m 1 x: re-enable virtualbox

want to test 3d acceleration
---
 makefu/1systems/x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 9666f50ff..9cedc04a8 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -8,6 +8,7 @@
     [ # base
       ../.
       ../2configs/main-laptop.nix
+      ../2configs/extra-fonts.nix
       ../2configs/tools/all.nix
       ../2configs/laptop-backup.nix
       ../2configs/dnscrypt.nix
@@ -46,7 +47,7 @@
       ../2configs/mail-client.nix
       ../2configs/printer.nix
       ../2configs/virtualization.nix
-      # ../2configs/virtualization-virtualbox.nix
+      ../2configs/virtualization-virtualbox.nix
       ../2configs/wwan.nix
       ../2configs/rad1o.nix
 
-- 
cgit v1.2.3


From 5a004c891096b805f26fef818fa75227fe1d071f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:03:46 +0100
Subject: m 1 wry: mv Reaktor to omo

---
 makefu/1systems/omo.nix | 12 ++++++++++++
 makefu/1systems/wry.nix | 14 +-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index a6a336fed..f77a19c11 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -182,5 +182,17 @@ in {
 
   zramSwap.enable = true;
 
+  krebs.Reaktor.reaktor = {
+    nickname = "Reaktor|bot";
+    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
+    plugins = with pkgs.ReaktorPlugins;[
+                               titlebot
+                               # stockholm-issue
+                               nixos-version
+                               shack-correct
+                               sed-plugin
+                               random-emoji ];
+  };
+
   krebs.build.host = config.krebs.hosts.omo;
 }
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 2457ab92e..c403d2352 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -33,18 +33,6 @@ in {
 
   krebs.build.host = config.krebs.hosts.wry;
 
-  krebs.Reaktor.reaktor = {
-    nickname = "Reaktor|bot";
-    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
-    plugins = with pkgs.ReaktorPlugins;[
-                               titlebot
-                               # stockholm-issue
-                               nixos-version
-                               shack-correct
-                               sed-plugin
-                               random-emoji ];
-  };
-
   # prepare graphs
   services.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
@@ -64,7 +52,7 @@ in {
             return 403;
           }
         '';
-        serverAliases = [  "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
+        serverAliases = [  "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
       };
       anonymous = {
         enableSSL = true;
-- 
cgit v1.2.3