summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-102-11/+25
|\
| * Reaktor: +plugins: task-{add, delete, list} -taskwarriorjeschli2018-07-101-1/+3
| |
| * Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-101-0/+2
| |\
| * | Reaktor: taskwarrior -> task-{add,delete,list}jeschli2018-07-101-10/+22
| | |
* | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-092-3/+11
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-0966-409/+838
| |\|
| | * Reaktor taskwarrior: touch if no taskrc existsjeschli2018-07-031-3/+9
| | |
| * | j bln: enable redisjeschli2018-07-091-0/+2
| | |
* | | Merge remote-tracking branch 'gum/master'lassulus2018-07-091-1/+2
|\ \ \
| * | | ma nextgum: enable remote buildmakefu2018-07-031-1/+2
| | | |
* | | | l vim: add lsp supportlassulus2018-07-091-5/+23
| | | |
* | | | l mails: add zazzle@lassul.uslassulus2018-07-091-0/+1
| | | |
* | | | l dcso-dev: add stuff for new projectlassulus2018-07-091-0/+7
| | | |
* | | | l browsers: add cr to video grouplassulus2018-07-091-1/+1
| | | |
* | | | l prism.r: disable forwarding to bluelassulus2018-07-091-15/+0
| | | |
* | | | l mors.r: RIP mongodblassulus2018-07-091-3/+0
| | | |
* | | | l git: add cholerablassulus2018-07-081-0/+4
| | | |
* | | | l prism.r: activate earlyoomlassulus2018-07-081-0/+4
| | | |
* | | | nixpkgs: 91b286c -> 56fad14lassulus2018-07-071-1/+1
| | | |
* | | | Reaktor url-title: show 450 chars maxlassulus2018-07-071-8/+7
| | | |
* | | | l helios.r: add tensorflowWithCudalassulus2018-07-061-0/+3
| | | |
* | | | Reaktor url-title: fix some issues with weird urlslassulus2018-07-061-9/+15
| |_|/ |/| | | | | | | | ref: https://irc-bot-science.clsr.net/
* | | Reaktor taskwarrior: fix path to taskwarriorlassulus2018-07-031-1/+1
| | |
* | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-032-0/+8
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-031-8/+17
| |\ \ \ | | | |/ | | |/|
| * | | reaktor-krebs: +taskwarriorjeschli2018-07-031-0/+1
| | | |
| * | | Reaktor plugins: +taskwarriorjeschli2018-07-031-0/+7
| | | |
* | | | l websites: add some picture dumpslassulus2018-07-031-0/+16
| | | |
* | | | l mors: add earlyoomlassulus2018-07-031-0/+5
| | | |
* | | | l dcso-dev: remove rabbitmqlassulus2018-07-031-1/+0
| | | |
* | | | l dcso-dev: add dev to vboxuserslassulus2018-07-031-1/+1
| |_|/ |/| |
* | | Merge remote-tracking branch 'ni/master'lassulus2018-07-011-3/+3
|\ \ \
| * | | pass: 1.7.1 -> 1.7.2tv2018-07-011-3/+3
| | | |
* | | | Merge remote-tracking branch 'gum/master'lassulus2018-07-012-0/+1
|\ \ \ \
| * | | | ma secrets: uhub.sqlmakefu2018-06-281-0/+0
| | | | |
| * | | | ma 0data: add nsupdate-hub.nixmakefu2018-06-281-0/+1
| | | | |
* | | | | add buildbotSlave pubkeylassulus2018-07-011-0/+3
| | | | |
* | | | | Merge remote-tracking branch 'gum/master'lassulus2018-06-283-1/+104
|\| | | |
| * | | | ma hub: initmakefu2018-06-281-0/+102
| | | | |
| * | | | ma source: bump to latest sourcemakefu2018-06-281-1/+1
| | | | |
| * | | | ma git: add fenkinsmakefu2018-06-261-0/+1
| | | | |
* | | | | cholerab: 4031072 -> 25d7ef05lassulus2018-06-281-2/+2
| | | | |
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-06-286-68/+140
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | j bln: fix xserver servicejeschli2018-06-271-8/+17
| | |_|/ | |/| |
| * | | j: services.xserver removed from 2configjeschli2018-06-271-20/+0
| | | |
| * | | j vim: +fileline ; cosmeticsjeschli2018-06-271-12/+22
| | | |
| * | | j brauerei: xserverjeschli2018-06-271-21/+16
| | | |
| * | | j brauerei: vagrant fixjeschli2018-06-271-2/+12
| | | |
| * | | j brauerei: +vagrantjeschli2018-06-191-0/+1
| | | |
| * | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-06-19199-1882/+2651
| |\ \ \