summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-21 11:04:51 +0200
committerlassulus <lassulus@lassul.us>2017-07-21 11:04:51 +0200
commitd132500da6f1a73897c78ba3102bb9e1995b24cc (patch)
tree8737ac1cbf730f0056f0187f3d4933f70b428472 /makefu
parent81bb5cf5166c5470527532ec8ba7c6a2bf1d5134 (diff)
parent3395a2cfb216a1d36cd1f80f37359db1eb2e0276 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/gum/config.nix9
-rw-r--r--makefu/1systems/omo/config.nix35
-rw-r--r--makefu/1systems/studio/source.nix5
3 files changed, 39 insertions, 10 deletions
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;
}