summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/x.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-06 07:45:31 +0200
committerlassulus <lass@aidsballs.de>2016-10-06 07:45:31 +0200
commitfa5816431ce0314b1c3260c763a87922b0ad485b (patch)
tree89f2f942ccdac038706ae6ac890a4111b42ca87d /makefu/1systems/x.nix
parent61ada606d8ee39c7f3f00be156af7843a6dfc16b (diff)
parent1daec454eb524925eebf407c54a0e9d925b2bb7a (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x.nix')
-rw-r--r--makefu/1systems/x.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 4829aaabd..0243856ab 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -9,6 +9,7 @@
../.
../2configs/main-laptop.nix #< base-gui + zsh
../2configs/laptop-utils.nix
+ ../2configs/laptop-backup.nix
# Krebs
#../2configs/disable_v6.nix
@@ -42,13 +43,14 @@
../2configs/tinc/retiolum.nix
# temporary modules
../2configs/temp/share-samba.nix
- ../2configs/temp/elkstack.nix
+ ../2configs/laptop-backup.nix
+ # ../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
../2configs/tinc/siem.nix
- ../2configs/torrent.nix
+ #../2configs/torrent.nix
];
makefu.full-populate = true;
- makefu.deluge.web.enable = true;
+
krebs.nginx = {
default404 = false;
servers.default.listen = [ "80 default_server" ];