summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2017-11-1010-75/+125
|\
| * Merge remote-tracking branch 'lass/master'makefu2017-11-105-12/+12
| |\
| * | ma backup: also backup /var/download from gummakefu2017-11-081-0/+13
| * | ma tsp.r: is now acer aspire timeline 1810tzmakefu2017-11-081-5/+37
| * | ma lanparty/lancache-dns: add documentationmakefu2017-11-081-0/+2
| * | ma darth: use for lan partyingmakefu2017-11-081-30/+11
| * | ma lanparty: add mumble-servermakefu2017-11-081-0/+12
| * | ma tools: use upstream u3-toolmakefu2017-11-081-1/+1
| * | ma lanparty/samba: update pathmakefu2017-11-081-1/+1
| * | ma lancache: make statedir a variablemakefu2017-11-081-1/+8
| * | ma lancache-dns: refactormakefu2017-11-081-9/+13
| * | ma tools: add lsofmakefu2017-11-081-12/+17
| * | ma lanparty/samba: add new writeable sharemakefu2017-11-031-1/+8
| * | ma lancache-dns: fix local-ip variablemakefu2017-11-031-3/+3
| * | ma lancache-dns: add storage server namesmakefu2017-11-031-1/+10
| * | ma pkgs.u3-tool: now in upstreammakefu2017-11-031-22/+0
* | | Merge remote-tracking branch 'gum/master'lassulus2017-11-108-15/+96
|\| | | |/ |/|
| * ma source: add snapraid fixmakefu2017-11-031-1/+2
| * ma source: add nixpkgs cherry-picked fixesmakefu2017-11-031-2/+5
| * rtorrent module: replace legacy commandsmakefu2017-11-021-2/+2
| * ma source: bump to 2017-11-02makefu2017-11-021-2/+1
| * ma pkgs.pwqgen-ger: add archive.org mirrormakefu2017-11-021-1/+4
| * ma gum.r: update hw specificsmakefu2017-11-021-4/+11
| * ma: update gum ipmakefu2017-11-021-2/+2
| * wolf.r: add extra mibs for telegrafmakefu2017-11-021-3/+7
| * Merge remote-tracking branch 'lass/master'makefu2017-11-0226-58/+211
| |\
| * | mv makefu/{slog,internetarchive} krebs/makefu2017-10-273-33/+45
| * | ma pkgs.slog: initmakefu2017-10-271-0/+20
| * | ma pkgs.internetarchive: initmakefu2017-10-261-0/+32
* | | nixpkgs: 07ca7b6 -> 0c5a587lassulus2017-11-101-1/+1
* | | l nixpkgs: e53e9a2 -> 0c5a587lassulus2017-11-101-1/+1
* | | l audit: RIPlassulus2017-11-092-10/+0
* | | l nixpkgs: 6a0a00d -> e53e9a2lassulus2017-11-071-1/+1
* | | l helios.r: add office related stufflassulus2017-11-021-0/+10
| |/ |/|
* | l nixpkgs: ac2bb56 -> 6a0a00dlassulus2017-11-011-1/+1
* | Merge remote-tracking branch 'ni/master'lassulus2017-10-273-46/+33
|\ \
| * | tv: netzclub -> ppptv2017-10-273-38/+33
| * | tv netzclub: simplify AT codetv2017-10-271-10/+2
| * | tv netzclub: add missing "tv2017-10-261-1/+1
| * | tv netzclub: fix exampletv2017-10-261-1/+1
* | | l nixpkgs: c99239b -> ac2bb56lassulus2017-10-271-1/+1
* | | Merge remote-tracking branch 'ni/master'lassulus2017-10-262-2/+1
|\| |
| * | tv netzclub: { -> pkgs.}ppptv2017-10-261-1/+1
| * | tv modules: rm umtstv2017-10-261-1/+0
* | | Merge remote-tracking branch 'ni/master'lassulus2017-10-263-109/+46
|\| |
| * | tv xu: lol wvdialtv2017-10-261-1/+0
| * | tv netzclub: inittv2017-10-262-0/+46
| * | tv umts: RIPtv2017-10-262-108/+0
* | | l: steal br from tvlassulus2017-10-262-0/+49
* | | l: allow dns requests from retiolumlassulus2017-10-261-0/+1