summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'gum/master'lassulus2017-04-305-7/+56
|\|
| * Merge remote-tracking branch 'lass/master'makefu2017-04-284-28/+3
| |\
| * | m 2 qemu-guest: initmakefu2017-04-281-0/+4
| | |
| * | m 2 deployment: add boot-euermakefu2017-04-281-0/+28
| | |
| * | k 3 m: gum add ghook.krebsco.demakefu2017-04-281-2/+4
| | |
| * | m 1 gum: add wiki-irc hookmakefu2017-04-281-2/+4
| | |
| * | m 2 wiki-irc: use git.io shortenermakefu2017-04-281-3/+16
| | |
* | | l 2 xresources: add better black colorlassulus2017-04-301-0/+2
| | |
* | | l 1 prism: add stuff for dritterlassulus2017-04-301-1/+17
| | |
* | | l 2 hfos: raise iptables restart delaylassulus2017-04-301-1/+1
| | |
* | | Merge remote-tracking branch 'ni/master'lassulus2017-04-306-33/+35
|\ \ \ | |_|/ |/| |
| * | much: 1.0.0 -> 1.1.0tv2017-04-302-29/+30
| | |
| * | xu: +texlive.combined.scheme-fulltv2017-04-271-1/+1
| | |
| * | types.user.mail: str -> nullOr strtv2017-04-271-2/+2
| | |
| * | xu: add cgit aliastv2017-04-271-0/+1
| | |
| * | tv nixpkgs: 67c6638 -> 99dfb6dtv2017-04-251-1/+1
| | |
* | | l 2 nixpkgs: 992b6da -> aa03833lassulus2017-04-271-1/+1
| | |
* | | Merge remote-tracking branch 'gum/master'lassulus2017-04-275-3/+71
|\ \ \ | | |/ | |/|
| * | m 2 wiki-irc: add logstash config for github hookmakefu2017-04-261-0/+49
| | |
| * | Merge remote-tracking branch 'lass/master'makefu2017-04-255-3/+83
| |\ \
| * | | m 2 torrent: mkdefault downloadmakefu2017-04-241-2/+2
| | | |
| * | | m 1 gum: add newsbot deploymentmakefu2017-04-242-0/+19
| | | |
| * | | k 3 m: bump x to 4 coresmakefu2017-04-241-1/+1
| | | |
* | | | l 2 websites domsen: remove old restart wrapperslassulus2017-04-271-27/+0
| | | |
* | | | l 2 repo-sync: add nixos-wikilassulus2017-04-271-0/+1
| | | |
* | | | l 2: add logify to pkgslassulus2017-04-271-0/+1
| |/ / |/| |
* | | weechat: init at 1.7.1lassulus2017-04-251-0/+80
| | |
* | | k 3 hidden-ssh: wait for irc portlassulus2017-04-241-1/+2
| | |
* | | l 2 vim: set customized vim to hiPriolassulus2017-04-241-1/+1
| | |
* | | move untilport: l/5 -> k/5lassulus2017-04-242-1/+0
|/ /
* | m 2 hw/stk1160: initmakefu2017-04-242-0/+16
| |
* | l 2 nixpkgs: 2080f51 -> 992b6dalassulus2017-04-231-1/+1
| |
* | l 2 websites util: give more power to wordpresslassulus2017-04-231-4/+5
| |
* | k 5 realwallpaper: b8408cf -> e056328lassulus2017-04-231-2/+2
| |
* | l 2 nixpkgs: c85f39e -> 2080f51lassulus2017-04-221-1/+1
| |
* | l 5 xmonad-lass: use new wallpaper locationlassulus2017-04-221-1/+1
|/
* Revert "irc-announce: fix cat2 on live systems"tv2017-04-191-1/+1
| | | | | | | | This reverts commit 6187206a02ed9bc7b21fdfd9c32e0b57f6f23365. Lol, no. Yes, /dev/stderr isn't POSIX (only fd 2 is and gawk has that path hardcoded to the fd and thus it works), but the error is somewhere else and "fixing" it like this doesn't help anyone.
*-. Merge remote-tracking branches 'gum/master' and 'prism/master'tv2017-04-1941-72/+319
|\ \
| | * k 3 realwallpaper: graphs.r -> graph.rlassulus2017-04-191-1/+1
| | |
| * | m 2 fetchwallpaper: use prismmakefu2017-04-191-1/+1
| | |
| * | s 2 buildbot: configure nginx for buildbotmakefu2017-04-192-1/+14
| | |
| * | m 2 stats-server: also open ports for v6makefu2017-04-191-0/+7
| | |
| * | s 1 wolf: send stats to omomakefu2017-04-192-0/+69
| | |
| * | m 2 dnscrypt: change resolvermakefu2017-04-191-0/+1
| | |
| * | m 1 x: rm krebs.nginxmakefu2017-04-191-5/+0
| | |
| * | Merge remote-tracking branch 'lass/master'makefu2017-04-1912-237/+51
| |\|
| | * l 1 iso: hack around buggy /dev/stderr in live isolassulus2017-04-191-0/+21
| | |
| | * l 2 nixpkgs: 5acb454 -> c85f39elassulus2017-04-181-1/+1
| | |
| | * l 1 iso: enable copytoramlassulus2017-04-181-0/+3
| | |
| | * m 1 shoney: graphs -> graphmakefu2017-04-181-1/+1
| | |