summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tv nixpkgs-overlays: inittv2017-09-194-5/+30
* Merge remote-tracking branch 'prism/master'tv2017-09-169-221/+310
|\
| * puyak.r: allow vnclassulus2017-09-111-0/+1
| * set certificateslassulus2017-09-091-0/+7
| * nixpkgs: 56da88a -> 8ed299flassulus2017-09-091-1/+1
| * Revert "puyak.r: add Mic92 to authorized root keys"lassulus2017-09-091-1/+0
| * puyak.r: add zsh to systemPackageslassulus2017-09-091-0/+1
| * puyak.r: add kvm-intel to kernelModuleslassulus2017-09-091-0/+1
| * puyak.r: add joerg userlassulus2017-09-091-0/+5
| * puyak.r: add Mic92 to authorized root keyslassulus2017-09-091-0/+1
| * l git: add populatelassulus2017-09-091-0/+3
| * l hosts: adopt turingmachine (Mic92)lassulus2017-09-091-0/+28
| * l hosts: adopt Mic92 userlassulus2017-09-091-0/+4
| * l prism.r: add onondaga containerlassulus2017-09-091-0/+16
| * puyak.r: add news-spamlassulus2017-09-091-0/+1
| * news: banish the spam to #snewslassulus2017-09-092-157/+170
| * newsbot-js: add multiple instanceslassulus2017-09-091-63/+72
* | shell: use withGetopttv2017-09-151-75/+47
* | withGetopt: inittv2017-09-151-0/+106
* | tv charybdis: after network-online.targettv2017-09-121-1/+1
|/
* Merge remote-tracking branch 'prism/master'tv2017-09-0744-204/+427
|\
| * l nixpkgs: fe46ffc -> d151161lassulus2017-09-071-1/+1
| * Merge remote-tracking branch 'gum/master'lassulus2017-09-077-7/+0
| |\
| | * ma nginx-config: forceSSL implies enableSSLmakefu2017-09-067-7/+0
| | * Merge remote-tracking branch 'lass/master'makefu2017-09-066-67/+88
| | |\
| | | * ma source: add tpm-fixmakefu2017-09-061-1/+2
| | | * ma source: apply mitmproxymakefu2017-09-061-1/+2
| | | * ma drozer: re-enable with protbuf3_2makefu2017-09-062-3/+3
| | | * ma gen-oath-safe: do not build with yubikey-managermakefu2017-09-061-2/+3
| | | * ma gen-oath-safe: fix typomakefu2017-09-061-1/+1
| | | * ma android-pentest: disable due to broken dependencymakefu2017-09-061-1/+2
| | | * ma zsh-user: krebs.per-user -> users.usersmakefu2017-09-061-1/+1
| | | * ma configs: use buildCores with maxJobsmakefu2017-09-061-2/+2
| | | * ma tools: add sec-guimakefu2017-09-064-1/+11
| | | * ma hw: add tpm to x2x0makefu2017-09-063-1/+10
| | | * ma umts module: add missing module from stablemakefu2017-09-062-0/+71
| | | * ma x: enable tpmmakefu2017-09-061-0/+2
| | | * ma x: use new dnscrypt clientmakefu2017-09-061-1/+1
| | | * ma gum: enable dnscrypt servermakefu2017-09-061-2/+1
| | | * ma dnscrypt: provide client and server configmakefu2017-09-062-3/+41
| | | * ma source: bump to latest unstablemakefu2017-09-061-3/+1
| | | * ma dnscrypt: prepare client/servermakefu2017-09-061-0/+0
| | | * ma omo: Rip Reaktor|krebsmakefu2017-09-061-10/+0
| | | * ma pkgs.u3_tool: init at 0.3makefu2017-09-061-0/+22
| | | * ma tools/studio: initmakefu2017-09-061-0/+10
| | | * ma default: remove nix-defexpr activationmakefu2017-09-061-9/+0
| | | * gitlab-runner: use PrivateTmp to avoid clash with buildbotmakefu2017-09-061-0/+1
| | | * gitlab-ci: test envmakefu2017-09-061-0/+1
| | | * gitlab-runner-shackspace: initmakefu2017-09-063-0/+35
| | | * gitlab-ci: initmakefu2017-09-061-0/+4