summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master' into hydramakefu2017-12-309-2/+183
|\
| * Merge remote-tracking branch 'gum/master'lassulus2017-12-3013-36/+154
| |\
| * | l nixpkgs: 53e6d67 -> 3aec59classulus2017-12-291-1/+1
| * | Merge remote-tracking branch 'prism/staging/test'tv2017-12-2733-568/+990
| |\ \
| | * \ Merge remote-tracking branch 'ni/master' into staging/testlassulus2017-12-254-0/+37
| | |\ \
| | * | | l nixpkgs: ed3b1bc -> 53e6d67lassulus2017-12-251-1/+1
| | * | | l nixpkgs: af7e479 -> ed3b1bclassulus2017-12-201-1/+1
| | * | | add populate testlassulus2017-12-193-0/+144
| * | | | tv nixpkgs: d0f0657 -> 53e6d67tv2017-12-271-1/+1
| | |/ / | |/| |
| * | | tv querel: add chromium with flashtv2017-12-221-0/+3
| * | | tv exim-*: add eximlogtv2017-12-212-0/+6
| * | | eximlog: inittv2017-12-211-0/+28
* | | | ma tools: add tigmakefu2017-12-291-0/+2
* | | | ma mosh: initmakefu2017-12-294-0/+6
* | | | ma torrent: set workDir instead of downloadDirmakefu2017-12-281-7/+6
* | | | ma stats.airsensor: generate Topic receivermakefu2017-12-281-3/+33
* | | | ma wbob.r: receive bamstatsmakefu2017-12-281-0/+3
* | | | ma vbob.source: do not deploy musnixmakefu2017-12-281-1/+1
* | | | ma vbob.r: prepare pppdmakefu2017-12-281-23/+41
* | | | ma gum.r: use wireguard, vpnwsmakefu2017-12-281-10/+16
* | | | ma fileleech: retab, use torrentmakefu2017-12-281-35/+40
* | | | forticlientsslvpn: use archive.orgmakefu2017-12-281-2/+2
* | | | pkgs.Reaktor: add help for shack-correctmakefu2017-12-281-1/+1
* | | | ma vpn-ws: fix sha256makefu2017-12-281-1/+1
* | | | ma hw: add kvm-intelmakefu2017-12-281-0/+5
| |_|/ |/| |
* | | ma source: use official nixos-hardwaremakefu2017-12-281-2/+2
* | | hw/exfat-nofuse -> tools/mobilitymakefu2017-12-274-5/+11
* | | x: use nixos-hardwaremakefu2017-12-264-28/+24
* | | ma remote-build: update to only use hotdogmakefu2017-12-181-3/+3
* | | ma vpn: add vpnws client and servermakefu2017-12-182-5/+21
* | | ma stats: add bamstatsmakefu2017-12-181-0/+35
* | | ma nginx: add vpn-ws prototypemakefu2017-12-181-0/+35
* | | Merge branch 'master' of prism:stockholmmakefu2017-12-1860-132/+1409
|\ \ \ | | |/ | |/|
| * | l: hledger -> banklassulus2017-12-182-1/+12
| * | l helios.r: ignore lidswitchlassulus2017-12-182-1/+4
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2017-12-182-1/+8
| |\ \
| | * | jeschli brauerei: +user.jamiejeschli2017-12-161-0/+4
| | * | jeschli urxvt: *font-sizejeschli2017-12-161-1/+1
| | * | jeschli brauerei: +jetbrainsjeschli2017-12-161-0/+3
| * | | l nixpkgs: cb751f9 -> af7e479lassulus2017-12-181-1/+1
| * | | l: get secrets from passlassulus2017-12-181-3/+6
| * | | l prism.r: add git to containerslassulus2017-12-181-0/+3
| * | | l domsen: cleanup websiteslassulus2017-12-151-19/+4
| * | | l dcso-dev: add roblassulus2017-12-151-1/+2
| * | | l helios.r: add /tmplassulus2017-12-151-14/+20
| * | | l prism.r: enable git for all jeschlislassulus2017-12-151-1/+5
| |/ /
| * | Merge branch 'staging/jeschli' of https://cgit.lassul.us/stockholmjeschli2017-12-150-0/+0
| |\ \
| | * | jeschli:+brauereiMarkus Hihn2017-12-151-0/+3
| * | | jeschli: add jeschli-brauerei userjeschli2017-12-151-0/+3
| * | | jeschli urxvt: enable xressourcesjeschli2017-12-151-1/+1