summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'jeschli2018-07-093-10/+18
|\
| * nixpkgs: 91b286c -> 56fad14lassulus2018-07-071-1/+1
| * Reaktor url-title: show 450 chars maxlassulus2018-07-071-8/+7
| * l helios.r: add tensorflowWithCudaprism/cudalassulus2018-07-061-0/+3
| * Reaktor url-title: fix some issues with weird urlslassulus2018-07-061-9/+15
* | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-0966-409/+838
|\ \
| * | Reaktor taskwarrior: touch if no taskrc existsjeschli2018-07-031-3/+9
| |/
| * 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'prism/makefu'lassulus2018-06-2812-40/+494
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | ma gum.r: remove retroshare importmakefu2018-06-251-1/+1
| | * | | | ma nextgum.r: in preparation to move nextgum -> gummakefu2018-06-246-2/+342
| | * | | | ma kexec: init dummy host for deploying kexec tarballsmakefu2018-06-242-0/+28
| | * | | | Merge branch 'master' of prism:stockholmmakefu2018-06-2433-343/+74
| | |\ \ \ \
| | * | | | | ma source: cherry-pick forecastio and uhub/sqlitemakefu2018-06-241-1/+3
| | * | | | | onebutton.r: add mpc-bootermakefu2018-06-242-1/+31
| | * | | | | nextgum.r: initmakefu2018-06-241-0/+32
| | * | | | | ma gum.r: split sw/hw configmakefu2018-06-172-36/+58
| * | | | | | l xjails: add vglrun optionlassulus2018-06-271-2/+8
| * | | | | | l wine: add winetrickslassulus2018-06-271-0/+1
| * | | | | | l serveWordpress: addSSL -> forceSSLlassulus2018-06-271-1/+1
| * | | | | | l vbox: add to group videolassulus2018-06-271-1/+1
| * | | | | | l xmonad: reenable rhombuslassulus2018-06-271-3/+23
| * | | | | | l urxvt: save more lineslassulus2018-06-271-1/+1
| * | | | | | l repo-sync: sync nix-writerslassulus2018-06-271-0/+1
| * | | | | | l repo-sync: lass-mors is admin userlassulus2018-06-271-0/+1
| * | | | | | l reaktor-coders: add !shrug commandlassulus2018-06-271-0/+6
| * | | | | | l logf: mails now arrive on bluelassulus2018-06-271-1/+1
| * | | | | | l git: set xmonad-stockholm as publiclassulus2018-06-271-0/+4
| * | | | | | l dcso-dev: add nightwatch stufflassulus2018-06-271-1/+5
| * | | | | | l dunst: set timeout to 1lassulus2018-06-271-3/+3