summaryrefslogtreecommitdiffstats
path: root/2configs/lass
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-07-19 11:18:15 +0200
committertv <tv@krebsco.de>2015-07-19 11:18:15 +0200
commit1f747580290cb71b64d7f714601e9084f52eaf50 (patch)
treec109e79f39e87c9a190c9bbc351bcd51fb2e747f /2configs/lass
parent09b16855722c368b429867279d62895de7e441ec (diff)
parent1691f1b780924d1416bc340b1ab268e7efa70e39 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to '2configs/lass')
-rw-r--r--2configs/lass/git-repos.nix10
-rw-r--r--2configs/lass/ircd.nix4
-rw-r--r--2configs/lass/steam.nix1
3 files changed, 15 insertions, 0 deletions
diff --git a/2configs/lass/git-repos.nix b/2configs/lass/git-repos.nix
index 94ab631..c0c305b 100644
--- a/2configs/lass/git-repos.nix
+++ b/2configs/lass/git-repos.nix
@@ -121,10 +121,20 @@ in
{
imports = [
../../3modules/tv/git.nix
+ ../../3modules/lass/iptables.nix
];
tv.git = {
enable = true;
inherit repos rules users;
};
+
+ lass.iptables = {
+ tables = {
+ filter.INPUT.rules = [
+ { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; }
+ ];
+ };
+ };
+
}
diff --git a/2configs/lass/ircd.nix b/2configs/lass/ircd.nix
index c57f7dd..f71b769 100644
--- a/2configs/lass/ircd.nix
+++ b/2configs/lass/ircd.nix
@@ -83,6 +83,10 @@
channel_target_change = yes;
disable_local_channels = no;
};
+ general {
+ #maybe we want ident someday?
+ disable_auth = yes;
+ };
'';
};
}
diff --git a/2configs/lass/steam.nix b/2configs/lass/steam.nix
index d54873b..7d088fc 100644
--- a/2configs/lass/steam.nix
+++ b/2configs/lass/steam.nix
@@ -12,6 +12,7 @@
##TODO: make steam module
hardware.opengl.driSupport32Bit = true;
+ nixpkgs.config.steam.java = true;
environment.systemPackages = with pkgs; [
steam
];