diff options
author | tv <tv@krebsco.de> | 2018-01-09 19:06:50 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-01-09 19:06:50 +0100 |
commit | 8ff5c5e992ebafeca5edb2b22a0ab700edc715a5 (patch) | |
tree | e141f28bca4e5494669282d41c1c8dbbc96b4ce8 /lass/1systems/mors | |
parent | fb0bbec70ae1a0dd4fdc3c9bc9ed47f2a8573fd9 (diff) | |
parent | 5ef3a2c6caa2f018c2adf795de992e0487dd2413 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors')
-rw-r--r-- | lass/1systems/mors/config.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index ad133802f..c231a0b10 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -30,6 +30,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/otp-ssh.nix> <stockholm/lass/2configs/c-base.nix> <stockholm/lass/2configs/br.nix> + <stockholm/lass/2configs/ableton.nix> { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ @@ -70,10 +71,6 @@ with import <stockholm/lib>; ]; } { - #ps vita stuff - boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; - } - { services.tor = { enable = true; client.enable = true; |