diff options
| author | tv <tv@krebsco.de> | 2017-11-28 19:06:54 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-11-28 19:06:54 +0100 |
| commit | 05bc20b893ff6d441d7e8e10802134d2192e724a (patch) | |
| tree | 1c34434d71eb2e3e3ced9ade09ee4b5879cc63cd /lass/1systems/mors | |
| parent | 5163d8eba27976ccccf7703b52eb1b8f4c0295af (diff) | |
| parent | 10a96c644898d9498e9f75fa543ebb395ffbca20 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors')
| -rw-r--r-- | lass/1systems/mors/config.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 6a61ce1fa..fee43f8cd 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -29,7 +29,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/syncthing.nix> <stockholm/lass/2configs/otp-ssh.nix> <stockholm/lass/2configs/c-base.nix> - <stockholm/tv/2configs/br.nix> + <stockholm/lass/2configs/br.nix> { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ @@ -135,6 +135,8 @@ with import <stockholm/lib>; macchanger dpass + + dnsutils ]; #TODO: fix this shit @@ -192,4 +194,8 @@ with import <stockholm/lib>; exec nix-shell -I stockholm="$PWD" --run 'test --system="$SYSTEM" --target="$SYSTEM/var/test/" --force-populate' ''; }; + + #nix.package = pkgs.nixUnstable; + programs.adb.enable = true; + users.users.mainUser.extraGroups = [ "adbusers" ]; } |