summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | l 3: add wordpress_nginx.nixlassulus2015-11-092-0/+196
* | | | l 2 mc: fix image + pdf integrationlassulus2015-11-091-20/+8
* | | | l 1 prism: add stuff for juhulianlassulus2015-11-091-0/+19
* | | | l 1 prism: activate bitlbeelassulus2015-11-091-0/+1
* | | | l 2 baseX: add zathura to pkgslassulus2015-11-091-0/+1
| |/ / |/| |
* | | Merge remote-tracking branch 'cd/master'lassulus2015-11-019-24/+126
|\| |
| * | nomic nixpkgs: 4z3/03130ec -> NixOS/c44a593tv2015-11-011-2/+2
| * | mkdir nixpkgs: e57024f -> c44a593tv2015-11-011-1/+1
| * | rmdir nixpkgs: 68bd8e4 -> c44a593tv2015-11-011-1/+1
| * | cd nixpkgs: 4z3/03130ec -> NixOS/c44a593tv2015-11-011-2/+2
| * | wu nixpkgs: e916273 -> c44a593tv2015-11-011-1/+1
| * | xu nixpkgs: e57024f -> c44a593tv2015-11-011-1/+1
| * | tv: what's majmin?tv2015-11-011-4/+0
| * | tv vim: decouple vimrc from ENVtv2015-11-011-14/+5
| * | tv vim: use upstream industry colors + modstv2015-11-011-52/+3
| * | tv base: import vimtv2015-11-014-16/+9
| * | tv vim: no backup & co for /dev/shm/*tv2015-11-011-0/+2
| * | tv vim: colorize tabs and trailing spacetv2015-11-011-1/+4
| * | tv vim: set norulertv2015-11-011-0/+1
| * | tv vim: so vimrc via VIMINITtv2015-11-011-5/+6
| * | tv vim: ru pkg.vim sharetv2015-11-011-1/+2
| * | tv vim: use industry colorstv2015-11-011-1/+3
| * | tv vim: don't ru ~/vimtv2015-11-011-2/+0
| * | tv vim: colorize nixtv2015-11-011-0/+19
| * | tv vim industry: hi Normal ctermfg=Whitetv2015-11-011-2/+1
| * | tv vim industry: retab & co.tv2015-11-011-26/+29
| * | tv vim: import industry colorstv2015-11-011-0/+46
| * | tv: cherry-pick vim from hotwip!tv2015-11-011-0/+96
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-11-011-2/+2
|\ \ \ | | |/ | |/|
| * | collectd-connect-time: bump to 0.3.0makefu2015-11-011-2/+2
* | | l 1 prism: allowUnfree for ts3lassulus2015-11-011-0/+3
* | | l 1 mors: add hashPassword to systemPackageslassulus2015-11-011-0/+1
* | | l 1 prism: activate ts3 serverlassulus2015-11-011-0/+1
* | | l 2: add ts3.nixlassulus2015-11-011-0/+19
* | | k 3 l: use rsa keys in prismlassulus2015-11-011-2/+2
* | | l 2 downloading: get rpc-password from secretslassulus2015-10-311-3/+5
* | | l 2: get ssh-keys via apilassulus2015-10-312-6/+6
* | | l 1 prism: add git.nixlassulus2015-10-311-0/+1
|/ /
* | Merge remote-tracking branch 'pnp/master'lassulus2015-10-3120-26/+352
|\ \
| * | shared wolf: enable collectd towards heidimakefu2015-10-302-0/+42
| * | m 2 *: s,/root/secrets,<secrets>,makefu2015-10-293-10/+16
| * | m 2 euer.blog: init (untested)makefu2015-10-291-0/+29
| * | Merge branch 'master' of pnp:stockholmmakefu2015-10-284-1/+60
| |\ \
| | * | krebs 5 collectd-connect-time: bump version (again)makefu2015-10-281-2/+2
| | * | k 5 collectd-connect-time: bump to 0.2.0makefu2015-10-271-2/+2
| | * | Merge branch 'master' of pnp:stockholmmakefu2015-10-2771-438/+2499
| | |\ \
| | * | | m 12 collectd: wry uses cherry-picked collectd to enable python supportmakefu2015-10-272-1/+4
| | * | | m 2 collectd: add first sample howto configure collectd with collectd-connect...makefu2015-10-271-0/+42
| | * | | k 5 collectd-connect-time: initial commitmakefu2015-10-271-0/+15
| * | | | m 1 wry: serve euer wikimakefu2015-10-283-4/+121