summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lassul.us/master'makefu2018-11-105-5/+13
|\
| * l dns-stuff: sortlassulus2018-11-101-4/+4
| * Merge remote-tracking branch 'ni/master'prism/masterlassulus2018-11-101-0/+1
| |\
| | * krebs: add youtube@eloop.orgtv2018-11-101-0/+1
| * | l: add cache.krebsco.de & cache.lassul.uslassulus2018-11-101-0/+2
| |/
| * Merge remote-tracking branch 'ni/master'lassulus2018-11-101-0/+6
| |\
| | * krebs.tinc: add tincUpExtratv2018-10-301-0/+6
| * | Merge remote-tracking branch 'nextgum/master'lassulus2018-11-105-177/+140
| |\ \
| * | | realwallpaper: e056328 -> 847faeblassulus2018-11-101-2/+2
| * | | hotdog.r: remove import of gitlab-runner-shackspacelassulus2018-11-101-1/+0
| * | | nixpkgs: 06fb025 -> bf7930dlassulus2018-11-051-3/+3
* | | | ma: disable some host cimakefu2018-11-101-10/+10
* | | | airdcpp module: after local-fs.targetmakefu2018-11-101-1/+1
| |/ / |/| |
* | | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-056-9/+121
|\ \ \
| * | | nixpkgs: 06fb025 -> bf7930dprism/nixpkgslassulus2018-11-051-3/+3
| |/ /
| * | nixpkgs: 81f5c26 -> 06fb025lassulus2018-11-041-3/+3
| * | l: prism.r -> archprism.r, new prism.rlassulus2018-11-041-1/+41
| * | Merge remote-tracking branch 'ni/master'lassulus2018-10-301-1/+5
| |\|
| | * Merge remote-tracking branch 'prism/master'tv2018-10-2726-66/+391
| | |\
| | * | git-preview: add GIT_PREVIEW_MERGE_STRATEGYtv2018-10-231-1/+5
| * | | l: adopt kruck.r (palo)lassulus2018-10-301-0/+29
| | |/ | |/|
| * | nixpkgs: 21293d2 -> 81f5c26lassulus2018-10-181-3/+3
| * | l: add eve.rlassulus2018-10-111-0/+38
| * | Revert "remove nin"lassulus2018-10-092-0/+112
| * | force test in krops.nixlassulus2018-10-091-0/+1
| * | Reaktor: 0.6.1 -> 0.6.2lassulus2018-10-091-2/+2
| * | update-channel.sh: follow 18.09lassulus2018-10-081-1/+1
| * | nixpkgs: 862fb52 -> 21293d2lassulus2018-10-081-4/+4
| * | remove ninlassulus2018-10-082-112/+0
| * | krops: import from submoduleslassulus2018-10-081-4/+1
* | | ma nextgum.r becomes gum.rmakefu2018-11-051-64/+28
* | | remove ninlassulus2018-10-072-112/+0
* | | krops: import from submoduleslassulus2018-10-071-4/+1
* | | add charybdis module until it's fixed in 18.09lassulus2018-10-073-1/+112
|/ /
* | repo-sync: remove deprecated isPylassulus2018-10-071-1/+0
* | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-078-313/+38
|\|
| * tv: add 18.09 compatibilitytv2018-10-077-296/+38
| * hyphenation: RIP; nixpkgs is good enoughtv2018-10-061-17/+0
| * email-header: 0.3.0 -> 0.4.1-tv1tv2018-10-061-4/+4
| * blessings: 1.1.0 -> 1.2.0tv2018-10-061-2/+2
* | buildbot: use dateutillassulus2018-10-071-1/+1
* | nixpkgs: d16a7ab -> 6a3f5bc (18.09)lassulus2018-10-061-3/+3
* | buildbot-stockholm: test kropslassulus2018-09-291-0/+6
* | Merge remote-tracking branch 'enklave/master'lassulus2018-09-291-37/+0
|\ \
| * | krebs: remove blnjeschli2018-09-251-37/+0
* | | Merge remote-tracking branch 'gum/master'lassulus2018-09-2914-11/+333
|\ \ \
| * | | Merge remote-tracking branch 'lass/master'makefu2018-09-2613-14/+30
| |\| |
| * | | ma default.nix: nextgum -> backup.makefu.rmakefu2018-09-251-0/+1
| * | | airdcpp.mod: add DownloadDirectorymakefu2018-09-251-0/+7
| * | | ma: move ssh pubkeys to filesmakefu2018-09-2411-11/+25