summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-12-21 12:34:57 +0100
committermakefu <github@syntax-fehler.de>2016-12-21 12:34:57 +0100
commit933ba962019300c0cd590956ad96cc0fe862fe21 (patch)
tree31248468f973c58b87ad1d604a288159641bce30 /lass/1systems
parentc7f2a0d7d99c8e7aa0145fc033ddab1678a103d9 (diff)
parentdeaef40bdfb1da44c7daf59d2a4b833cb7581730 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/mors.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 9f2cec9a1..594f342db 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -18,13 +18,13 @@ with import <stockholm/lib>;
../2configs/wine.nix
../2configs/git.nix
../2configs/skype.nix
- ../2configs/teamviewer.nix
../2configs/libvirt.nix
../2configs/fetchWallpaper.nix
#../2configs/c-base.nix
../2configs/mail.nix
../2configs/krebs-pass.nix
../2configs/repo-sync.nix
+ ../2configs/ircd.nix
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [