summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l mors.r: also blue-hostlassulus2018-11-201-0/+1
* l archprism.r: disable reaktorlassulus2018-11-201-1/+0
* Merge remote-tracking branch 'ni/master'lassulus2018-11-1811-161/+100
|\
| * tv vim elixir: b916c00 -> 0a847f0tv2018-11-161-1/+8
| * tv vim: neaten fzf plugintv2018-11-161-2/+2
| * tv vim: set timeoutlen=0tv2018-11-161-0/+1
| * tv vim: M-a edits alternate buffertv2018-11-151-0/+4
| * tv vim: add fzftv2018-11-151-0/+19
| * Merge remote-tracking branch 'prism/master'tv2018-11-144-132/+1
| |\
| | * l: add osmocom@lassul.uslassulus2018-11-111-0/+1
| * | Merge remote-tracking branch 'gum/master'tv2018-11-1410-27/+32
| |\ \
| | * | ma hw/smartcard: disable ifdnfc for nowmakefu2018-11-111-2/+5
| * | | krops: 1.6.0 -> 1.7.1tv2018-11-141-0/+0
| * | | ci: register GC rootstv2018-11-131-1/+24
| * | | ci.nix: fix usagetv2018-11-131-1/+1
| * | | ejabberd: replaced by upstreamtv2018-11-134-156/+0
| * | | tv hc: init at 1.0.0tv2018-11-131-0/+37
| * | | tv gitrepos: add hctv2018-11-131-0/+1
* | | | l: add osmocom@lassul.uslassulus2018-11-181-0/+1
| |_|/ |/| |
* | | remove remaining nin stufflassulus2018-11-113-125/+0
* | | Merge remote-tracking branch 'gum/master'lassulus2018-11-104-15/+15
|\ \ \ | | |/ | |/|
| * | Revert "Revert "ma nixpkgs: 86fb1e9 -> bf46294" ... for now"makefu2018-11-101-4/+4
| * | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-1023-107/+110
| |\ \
| * | | ma: disable some host cimakefu2018-11-101-10/+10
| * | | ma secrets: add hass/darksy.apikeymakefu2018-11-101-0/+0
| * | | airdcpp module: after local-fs.targetmakefu2018-11-101-1/+1
* | | | l prism.r: RIP ninlassulus2018-11-101-7/+0
| |/ / |/| |
* | | l realwallpaper: chmod +xlassulus2018-11-101-1/+4
* | | l binary-cache: serve under cache.{krebsco.de,lassul.us}lassulus2018-11-101-1/+1
* | | l & m: fetchWallpaper: fetch realwallpaper-krebs.pnglassulus2018-11-102-2/+2
* | | l realwallpaper: serve realwallpaper-krebs.pnglassulus2018-11-101-4/+1
* | | l dns-stuff: sortlassulus2018-11-101-4/+4
* | | Merge remote-tracking branch 'ni/master'lassulus2018-11-103-6/+14
|\ \ \ | | |/ | |/|
| * | krebs: add youtube@eloop.orgtv2018-11-101-0/+1
| * | Merge remote-tracking branch 'prism/master'tv2018-11-10107-2424/+1570
| |\ \
| * | | tv mu: replace disktv2018-11-081-6/+7
| * | | tv q: add utcdatetv2018-11-081-0/+6
* | | | 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-1091-2340/+998
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-0530-79/+766
| |\ \
| | * | nixpkgs: 06fb025 -> bf7930dlassulus2018-11-051-3/+3
| * | | ma gum.r: bye transfer-configmakefu2018-11-052-8/+0
| * | | Revert "ma nixpkgs: 86fb1e9 -> bf46294" ... for nowmakefu2018-11-051-4/+4
| * | | ma nextgum.r becomes gum.rmakefu2018-11-059-431/+184
| * | | ma wbob: cleanup config, minor tweaksmakefu2018-11-054-3/+9
| * | | ma homeautomation: more sensorsmakefu2018-11-051-6/+48
| * | | ma wbob-kiosk: trying to get xset working ...makefu2018-11-051-9/+13
| * | | ma wbob.r: more automationmakefu2018-11-053-28/+124