summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'uriel/master'tv2015-10-0110-42/+80
|\
| * lass 5 firefoxPlugins: remove broken linklassulus2015-10-011-1/+0
| * Merge branch 'makefu'lassulus2015-10-013-11/+20
| |\
| * \ Merge branch 'tv'lassulus2015-10-0113-357/+387
| |\ \
| * | | lass 2 retiolum: connect to echelonlassulus2015-09-301-0/+1
| * | | krebs: new key for echelonlassulus2015-09-302-14/+14
| * | | krebs Zhosts: bump cloudkrebs Addresslassulus2015-09-301-1/+1
| * | | lass: install get only on morslassulus2015-09-302-2/+1
| * | | krebs 3: add fastpokelassulus2015-09-301-0/+30
| * | | lass 2 base: add get to pkgslassulus2015-09-301-0/+2
| * | | lass: make compatible with new krebs.buildlassulus2015-09-305-26/+33
| * | | Merge branch 'tv'lassulus2015-09-286-16/+190
| |\ \ \
| * \ \ \ Merge branch 'makefu'lassulus2015-09-2731-408/+668
| |\ \ \ \
| * | | | | lass 2 base: bump nixpkgs revlassulus2015-09-271-1/+1
* | | | | | Merge remote-tracking branch 'mors/master'tv2015-10-0112-9/+158
|\| | | | |
| * | | | | Merge branch 'tv' into newmasterlassulus2015-09-268-4/+89
| |\ \ \ \ \
| * | | | | | lass 2 browsers: use systemwide firefoxlassulus2015-09-261-1/+1
| * | | | | | lass 1 mors: activate firefoxPatchedlassulus2015-09-261-0/+1
| * | | | | | lass: add firefoxPatched + firefoxPluginslassulus2015-09-266-0/+142
| * | | | | | lass 2 texlive: add dependencies for moderncvlassulus2015-09-261-1/+6
| * | | | | | lass 2 zsh: fix space in promptlassulus2015-09-231-5/+3
| * | | | | | lass 2 zsh: add -R to vim pagerlassulus2015-09-231-1/+1
| * | | | | | lass 2 desktop-base: dont suspend on lid actionlassulus2015-09-231-0/+4
| * | | | | | lass 2 base: disable nscdlassulus2015-09-231-0/+1
| * | | | | | lass 2: configure mc globalylassulus2015-09-233-1/+347
* | | | | | | Merge remote-tracking branch 'pnp/master'tv2015-10-019-48/+160
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Reaktor: add extraEnviron for setting Channelmakefu2015-09-273-11/+20
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'before-merge'makefu2015-09-2730-403/+956
| |\ \ \ \ \
| | * | | | | add description for sources.dir.*.hostmakefu2015-09-271-0/+5
| | * | | | | merge in new sources definitionmakefu2015-09-273-19/+28
| | * | | | | fix wrymakefu2015-09-271-17/+16
| | * | | | | Merge remote-tracking branch 'cd/master' into before-mergemakefu2015-09-2727-367/+907
| | |\ \ \ \ \
| * | | | | | | add tor,virtualboxmakefu2015-09-272-0/+25
| * | | | | | | pnp: use new sourcesmakefu2015-09-271-6/+1
| |/ / / / / /
| * | | | | | 3modules: add wrymakefu2015-09-272-1/+76
* | | | | | | krebs lib.types: deprecate host.infest.{addr,port}tv2015-10-012-2/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | krebs lib.shell.escape: add safe chars: +:=tv2015-10-011-1/+1
* | | | | | mkdir: 104.233.84.{174 -> 215}tv2015-10-011-1/+1
* | | | | | wu nixpkgs: bd84eba -> e916273tv2015-10-011-1/+1
* | | | | | default out: filter unknown dirstv2015-10-011-8/+13
* | | | | | get: 1.2.0 -> 1.3.0tv2015-10-011-3/+3
* | | | | | move config scripts to krebstv2015-10-019-329/+358
* | | | | | get: 1.1.1 -> 1.2.0tv2015-10-011-3/+3
* | | | | | irc-announce: add add_messagetv2015-09-281-6/+9
* | | | | | irc-announce: omit $GIT_SSH_USERtv2015-09-281-6/+7
* | | | | | irc-announce: optimize diff --stat renderertv2015-09-281-4/+1
| |_|_|_|/ |/| | | |
* | | | | irc-announce: reverse git logtv2015-09-281-1/+4
* | | | | irc-announce: colorize diff --stattv2015-09-281-2/+12
* | | | | irc-announce: show diff/log rangetv2015-09-281-2/+2
* | | | | irc-announce: show more stufftv2015-09-281-1/+7