summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-03-26 01:41:26 +0100
committerlassulus <lass@lassul.us>2017-03-26 01:41:26 +0100
commit3d46b5b9e667d6e740b397efe8a2d2a7cea9bdc1 (patch)
tree2b743f79e839c34de5965e2bb5071ea6e971ca00 /makefu/1systems
parente34d584feec9d123cc2fd8d3db417ede2b1bc437 (diff)
parent79737faaa693ee775f1b3e99ebb33a9729d95f9f (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/omo.nix12
-rw-r--r--makefu/1systems/wry.nix14
-rw-r--r--makefu/1systems/x.nix3
3 files changed, 15 insertions, 14 deletions
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;
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