summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2018-11-2010-159/+95
|\
| * 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
| | |\
| | * \ Merge remote-tracking branch 'gum/master'tv2018-11-1410-27/+32
| | |\ \
| | * | | 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
* | | | | ma nixpkgs: bf46294 -> 9728b2emakefu2018-11-191-3/+3
* | | | | Merge remote-tracking branch 'lassul.us/master'makefu2018-11-144-132/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | l: add osmocom@lassul.uslassulus2018-11-111-0/+1
| |/ /
| * | remove remaining nin stufflassulus2018-11-113-125/+0
| * | Merge remote-tracking branch 'gum/master'lassulus2018-11-104-15/+15
| |\ \
| * | | l prism.r: RIP ninlassulus2018-11-101-7/+0
* | | | ma hw/smartcard: disable ifdnfc for nowmakefu2018-11-111-2/+5
| |/ / |/| |
* | | 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
|\| |
| * | 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 'prism/master'lassulus2018-11-1017-84/+543
| |\ \ \
| | * | | l ejabberd: allow registrationlassulus2018-11-101-2/+2
| | * | | l sqlBackup: remove mysql_passwordlassulus2018-11-101-1/+0
| | * | | l mail: add nix@lassul.us to nix mllassulus2018-11-101-1/+1
| | * | | l git: chmod +x /var/spoollassulus2018-11-101-0/+4
| | * | | l games: add steam-run & dolphinEmu to pkgslassulus2018-11-101-0/+2
| | * | | l: add neocron@lassul.uslassulus2018-11-101-0/+1
| | * | | l ciko: chmod +xlassulus2018-11-101-0/+4
| | * | | l blue: add l-gen-secretslassulus2018-11-101-0/+1
| | * | | l prism.r: new physical hostlassulus2018-11-101-70/+49
| | * | | l prism.r: remove deprecated grub workaroundlassulus2018-11-101-2/+0