summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/x.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
committermakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
commit8eb9faea91abe315207289235fbaa612946ff63e (patch)
tree5943adb228ae3b1d6e59f06dc4f36e19afc87c38 /makefu/1systems/x.nix
parentd6c9edd9dc860d560d4ea7a727962aaf93d09322 (diff)
Apply stashed changes
sorry
Diffstat (limited to 'makefu/1systems/x.nix')
-rw-r--r--makefu/1systems/x.nix23
1 files changed, 17 insertions, 6 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 6fe3883a1..adbf372ab 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -12,22 +12,33 @@
../2configs/laptop-backup.nix
# testing
- #../2configs/elchos/search.nix
+ ../2configs/openvpn/vpngate.nix
#../2configs/temp/share-samba.nix
# ../2configs/mediawiki.nix
# ../2configs/wordpress.nix
# ../2configs/nginx/public_html.nix
# ../2configs/nginx/icecult.nix
+
+ # ../2configs/elchos/irc-token.nix
+ # ../2configs/elchos/log.nix
+
+ #../2configs/elchos/search.nix
+ #../2configs/elchos/stats.nix
+ #../2configs/elchos/test/ftpservers.nix
+
../2configs/laptop-backup.nix
+ # ../2configs/tinc/siem.nix
+ #../2configs/torrent.nix
+ # temporary modules
+
+ # ../2configs/torrent.nix
#../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
- ../2configs/tinc/siem.nix
- #../2configs/torrent.nix
# Krebs
- ../2configs/disable_v6.nix
+ # ../2configs/disable_v6.nix
../2configs/tinc/retiolum.nix
# applications
@@ -40,7 +51,7 @@
../2configs/rad1o.nix
# services
- ../2configs/git/brain-retiolum.nix
+ #../2configs/git/brain-retiolum.nix
../2configs/tor.nix
../2configs/steam.nix
# ../2configs/buildbot-standalone.nix
@@ -52,8 +63,8 @@
# mount points
../2configs/fs/sda-crypto-root-home.nix
- # temporary modules
];
+ makefu.server.primary-itf = "wlp2s0";
makefu.full-populate = true;
nixpkgs.config.allowUnfree = true;