summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'ni/master'lassulus2017-06-067-6/+37
|\| |
| * | xu: add gitconfigtv2017-06-041-0/+1
| * | tv gitconfig: inittv2017-06-046-4/+23
| * | tv/xu krebszones: add sane defaultstv2017-06-041-0/+12
| * | Merge remote-tracking branch 'prism/master'tv2017-06-0445-376/+415
| |\ \
| * | | krebsco.de MX: cd -> nitv2017-06-021-2/+1
* | | | l 2 nixpkgs: f8dfdd7 -> 8804775lassulus2017-06-061-1/+1
| |/ / |/| |
* | | Merge remote-tracking branch 'gum/master'lassulus2017-06-0133-87/+320
|\ \ \ | | |/ | |/|
| * | m 1 wbob: add stats clientmakefu2017-06-011-0/+1
| * | m 1 studio: add real-time audiomakefu2017-06-011-1/+3
| * | m 2 aralast:fix timingmakefu2017-06-011-1/+1
| * | s 2 graphite: add graphitemakefu2017-06-011-0/+38
| * | s 2 muell_caller: fix derivationmakefu2017-06-011-4/+4
| * | m: add hound to omo, wikisearch.krebsco.demakefu2017-06-013-1/+8
| * | Merge remote-tracking branch 'lass/master'makefu2017-06-0198-231/+406
| |\ \
| * | | shared: move shack config to shack/makefu2017-06-017-6/+110
| * | | s: enable save-diskspacemakefu2017-05-253-1/+14
| * | | m 2: rename stats and sharemakefu2017-05-2510-8/+11
| * | | m 2 gui/base: euro-signmakefu2017-05-241-1/+1
| * | | m 1 gum: use upstream taskserver configmakefu2017-05-241-2/+13
| * | | m 2 wiki-irc-bot: move to subdir, add patchmakefu2017-05-242-1/+32
| * | | m 2 games: include games-user-envmakefu2017-05-241-0/+1
| * | | s wolf: enable influx for rashmakefu2017-05-241-0/+3
| * | | m 2 led-fader: wait for mosquitto if defined locallymakefu2017-05-241-1/+2
| * | | m 2 jack-on-pulse: start as systemd user servicemakefu2017-05-241-5/+9
| * | | m 2 central-stats-server: redirect http://stats.makefu.r to grafanamakefu2017-05-241-1/+3
| * | | m 2 aralast: initmakefu2017-05-241-0/+38
| * | | m 2 time-machine: initmakefu2017-05-191-0/+31
| * | | m 2 zsh: enable autocompletion for nix commandsmakefu2017-05-191-0/+4
| * | | m 3 taskserver: ripmakefu2017-05-172-61/+0
* | | | lass: RIP helioslassulus2017-06-019-190/+1
| |/ / |/| |
* | | l: move Reaktor coders config to 2configslassulus2017-05-302-98/+93
* | | Merge remote-tracking branch 'ni/master'lassulus2017-05-2975-54/+79
|\ \ \ | | |/ | |/|
| * | {lass,makefu}: fix path to simple pkgstv2017-05-243-3/+3
| * | krebs/5pkgs: reformattv2017-05-241-23/+27
| * | krebs/5pkgs: import directory contents as overlaystv2017-05-241-5/+8
| * | krebs/5pkgs: move test stuff to a subdirtv2017-05-242-4/+10
| * | krebs/5pkgs: detect simple obsolete overridestv2017-05-242-23/+26
| * | krebs/5pkgs: move haskell stuff to a subdirtv2017-05-249-14/+16
| * | empty: move to krebs/5pkgs/simpletv2017-05-242-2/+2
| * | krebs/5pkgs: move simple pkgs to a subdirtv2017-05-2462-7/+14
| * | Merge remote-tracking branch 'prism/master'tv2017-05-2416-28/+121
| |\ \
* | | | l 2 nixpkgs: f469354 -> f8dfdd7lassulus2017-05-291-1/+1
* | | | Merge remote-tracking branch 'ni/master'lassulus2017-05-233-16/+8
|\| | | | |/ / |/| |
| * | turn krebs/5pkgs into an overlaytv2017-05-233-16/+8
* | | Merge remote-tracking branch 'prism/nin'lassulus2017-05-232-2/+2
|\ \ \
| * | | n 2 nixpkgs: 5b0c9d4 -> 0afb6d7nin2017-05-231-1/+1
| * | | n 2: change search-domain to rnin2017-05-231-1/+1
* | | | l 2 bepasty: allow write for externalslassulus2017-05-231-1/+1
* | | | Merge branch 'master' of ni:stockholmlassulus2017-05-231-5/+8
|\ \ \ \ | | |/ / | |/| |