diff options
| author | makefu <github@syntax-fehler.de> | 2017-11-28 20:28:35 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-11-28 20:28:35 +0100 |
| commit | 7180f25b35b0cd5f853356ba635c5b8366c4da63 (patch) | |
| tree | 43eb31e59e8f7718214cd8746e15d3914cdc6678 /lass/1systems/mors | |
| parent | 65825bd5ce47504ec9596c0f951eb752999e75f4 (diff) | |
| parent | 635543efe237e79202cc95db6f303699cadd0c85 (diff) | |
Merge remote-tracking branch 'lass/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" ]; } |