summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | l domsen: add habsys mailslassulus2017-10-261-0/+2
| | |
* | | l: add tomtop@lassul.uslassulus2017-10-261-0/+1
| | |
* | | l screenlock: fix enableOptionlassulus2017-10-261-1/+1
|/ /
* | Merge remote-tracking branch 'prism/master'tv2017-10-2626-43/+204
|\ \
| * | n nixpkgs: 9824ca6 -> c99239bnin2017-10-241-1/+1
| | |
| * | n 2 default: add pavucontrolnin2017-10-241-0/+1
| | |
| * | nin hiawatha firefox: remove flashnin2017-10-241-4/+0
| | |
| * | n 2 default: update binary-cachenin2017-10-241-6/+1
| | |
| * | Merge remote-tracking branch 'prism/master'nin2017-10-2014-38/+84
| |\ \
| | * | l: make screenlock configureablelassulus2017-10-196-19/+42
| | | |
| | * | l nixpkgs: 68ef4b1 -> c99239blassulus2017-10-181-1/+1
| | | |
| | * | Merge remote-tracking branch 'ni/master'lassulus2017-10-181-12/+13
| | |\ \
| | * | | l dns: don't resolve local querieslassulus2017-10-181-0/+1
| | | | |
| | * | | l baseX: set default font to cleanlassulus2017-10-181-3/+3
| | | | |
| | * | | l: set ca-bundle to /etc/ssllassulus2017-10-181-1/+1
| | | | |
| | * | | l pkgs.xmonad: add color invertlassulus2017-10-181-0/+2
| | | | |