summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tv querel: drop chromiumtv2018-11-271-3/+0
* Merge remote-tracking branch 'prism/master'tv2018-11-270-0/+0
|\
| * Merge remote-tracking branch 'lass/master'makefu2018-11-204-2/+70
| |\
| | * Merge remote-tracking branch 'ni/master'lassulus2018-11-184-2/+70
| |/|
* | | tv disko: init at 16cd458tv2018-11-261-0/+13
* | | tv dnsmasq service: inittv2018-11-262-0/+58
| |/ |/|
* | 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-142-105/+0
|\|
| * remove remaining nin stufflassulus2018-11-112-105/+0
* | ejabberd: replaced by upstreamtv2018-11-131-1/+0
* | tv hc: init at 1.0.0tv2018-11-131-0/+37
* | tv gitrepos: add hctv2018-11-131-0/+1
|/
* Merge remote-tracking branch 'prism/master'tv2018-11-1016-1052/+0
|\
| * Merge remote-tracking branch 'lassul.us/master'makefu2018-11-059-7/+133
| |\
| | * Merge remote-tracking branch 'ni/master'lassulus2018-10-301-2/+1
| | |\
| | * \ Merge remote-tracking branch 'ni/master'lassulus2018-10-231-0/+19
| | |\ \
| * | \ \ Merge remote-tracking branch 'lass/18.09' into 18.09makefu2018-10-0743-1486/+644
| |\ \ \ \
| | * | | | remove ninlassulus2018-10-0718-1157/+0
| | * | | | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-071-0/+1
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-1/+0
| | |\ \ \ \ \
| | | * | | | | j emacs: remove melpaPackages.mmm-modejeschli2018-10-071-1/+0
| | * | | | | | Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-0/+1
| | |\| | | | |
| | | * | | | | j brauerei: +luis @ dev tmuxjeschli2018-10-051-0/+1
* | | | | | | | tv mu: replace disktv2018-11-081-6/+7
* | | | | | | | tv q: add utcdatetv2018-11-081-0/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge remote-tracking branch 'prism/master'tv2018-10-2711-259/+24
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'ni/master'lassulus2018-10-182-1/+2
| |\ \ \ \ \ \
| * | | | | | | nin games: remove dwarf_fortresslassulus2018-10-101-1/+0
| * | | | | | | Merge remote-tracking branch 'onondaga/master'lassulus2018-10-100-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "remove nin"nin2018-10-0918-0/+1157
| * | | | | | | | nin krops: force testlassulus2018-10-091-0/+1
| * | | | | | | | Revert "remove nin"lassulus2018-10-0918-0/+1157
| * | | | | | | | force test in krops.nixlassulus2018-10-092-0/+2
| |/ / / / / / /
| * | | | | | | Merge branch '18.09'lassulus2018-10-0933-1176/+321
| |\ \ \ \ \ \ \
| | * | | | | | | remove ninlassulus2018-10-0818-1157/+0
| | * | | | | | | tv: systemPackages += git-crypttv2018-10-081-0/+1
| | * | | | | | | j emacs: remove melpaPackages.mmm-modejeschli2018-10-081-1/+0
| | * | | | | | | j brauerei: +luis @ dev tmuxjeschli2018-10-081-0/+1
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-0716-44/+579
| | |\ \ \ \ \ \
| | * | | | | | | j brauerei.r: force lightdm offlassulus2018-10-071-0/+2
| * | | | | | | | Merge remote-tracking branch 'ni/master'lassulus2018-10-065-26/+262
| |\ \ \ \ \ \ \ \
| * | | | | | | | | force xserver valueslassulus2018-10-062-4/+4
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'enklave/master'lassulus2018-09-295-253/+14
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master'jeschli2018-09-2520-180/+2
| | |\ \ \ \ \ \ \
| | * | | | | | | | jeschli brauerei: dev user for jeschli and lassjeschli2018-09-251-0/+8
| | * | | | | | | | jeschli brauerei: krops deployjeschli2018-09-251-0/+5