summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/nextgum/config.nix
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-08 12:59:45 +0200
committerlassulus <lass@blue.r>2018-09-08 12:59:45 +0200
commit8639e4008a34e5e7d68202a621ef8c95fe3087f4 (patch)
tree730338125b0b095bd633aabeb67a832ff1b8f5b5 /makefu/1systems/nextgum/config.nix
parent68bf23466fcaf91df0f11ba0828ef41fc9f694bf (diff)
parentb4c96ad61109ac59fb90546d104aaeb7ac273c84 (diff)
Merge remote-tracking branch 'gum/master' into test
Diffstat (limited to 'makefu/1systems/nextgum/config.nix')
-rw-r--r--makefu/1systems/nextgum/config.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/makefu/1systems/nextgum/config.nix b/makefu/1systems/nextgum/config.nix
index 9761546e7..db22cf9b8 100644
--- a/makefu/1systems/nextgum/config.nix
+++ b/makefu/1systems/nextgum/config.nix
@@ -19,14 +19,15 @@ 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>
<stockholm/makefu/2configs/mosh.nix>
+ <stockholm/makefu/2configs/gui/xpra.nix>
<stockholm/makefu/2configs/git/cgit-retiolum.nix>
<stockholm/makefu/2configs/backup.nix>
<stockholm/makefu/2configs/exim-retiolum.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
+
# services
<stockholm/makefu/2configs/sabnzbd.nix>
@@ -51,12 +52,13 @@ in {
<stockholm/makefu/2configs/dnscrypt/server.nix>
<stockholm/makefu/2configs/binary-cache/server.nix>
<stockholm/makefu/2configs/iodined.nix>
+ <stockholm/makefu/2configs/bitlbee.nix>
## buildbot
<stockholm/makefu/2configs/remote-build/slave.nix>
# Removed until move: no extra mails
- # <stockholm/makefu/2configs/urlwatch>
+ <stockholm/makefu/2configs/urlwatch>
# Removed until move: avoid double-update of domain
# <stockholm/makefu/2configs/hub.nix>
# Removed until move: avoid letsencrypt ban
@@ -166,6 +168,8 @@ in {
networking.firewall.allowedTCPPorts = [ 5201 ];
}
+ # krebs infrastructure services
+ <stockholm/makefu/2configs/stats/server.nix>
];
makefu.dl-dir = "/var/download";
@@ -200,13 +204,8 @@ in {
environment.systemPackages = with pkgs;[
weechat
bepasty-client-cli
- get
tmux
];
- services.bitlbee = {
- enable = true;
- libpurple_plugins = [ pkgs.telegram-purple ];
- };
# Hardware