summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'cd/master'lassulus2015-11-0944-572/+384
|\| |
| * | push: 1.1.0 -> 1.1.1tv2015-11-081-4/+3
| * | add null moduletv2015-11-081-0/+1
| * | tv configs: set NIX_PATHtv2015-11-081-0/+9
| * | tv: remove legacy userstv2015-11-086-324/+9
| * | xu: add unisontv2015-11-071-0/+2
| * | Merge remote-tracking branch 'nomic/master'tv2015-11-076-26/+41
| |\ \
| | * | tv: mv user xr to subtv2015-11-076-26/+38
| | * | Merge remote-tracking branch 'cd/master'tv2015-11-074-16/+10
| | |\ \
| | * | | xu nixpkgs: c44a593 -> 7ae05edtv2015-11-071-0/+3
| | | | |
| | \ \ \
| *-. \ \ \ Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-11-0747-138/+800
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | | |/ | | | |/|
| | | * | m 2: base -> default, rm base-sourcesmakefu2015-11-0610-85/+47
| | | * | Merge remote-tracking branch 'cd/master'makefu2015-11-0616-71/+106
| | | |\ \
| | | * \ \ Merge branch 'master' of pnp:stockholmmakefu2015-11-0619-40/+255
| | | |\ \ \
| | | | * | | k 5 krebspaste: resolve TODO, retiolum is always securemakefu2015-11-051-3/+1
| | | | * | | krebs 5 krebspaste: initial commitmakefu2015-11-052-0/+31
| | | | * | | k 3 makefu: wry handles blog and wikimakefu2015-11-051-1/+4
| | | | * | | m 2 nginx/euer*: prepare folders if they do not existmakefu2015-11-052-9/+38
| | | | * | | m 1 wry: use new import layout for CAC from tvmakefu2015-11-052-4/+7
| | | | * | | k 5 translate-shell: init at 0.9.0.9makefu2015-11-051-0/+43
| | | | * | | Merge remote-tracking branch 'cd/master'makefu2015-11-0511-26/+134
| | | | |\ \ \
| | | * | | | | m 1,2: refactor, remove overhead for fs/hw, add filepimpmakefu2015-11-068-30/+61
| | | * | | | | k 4 makefu: add filepimpmakefu2015-11-061-0/+24
| | | * | | | | update collectd targetsmakefu2015-11-052-3/+3
| | | |/ / / /
| | | * | | | k Zhosts gum: remove paste.krebsco.de aliasmakefu2015-11-051-1/+0
| * | | | | | tv: move X-based tools to xservertv2015-11-073-14/+7
| * | | | | | Merge remote-tracking branch 'cd/master'tv2015-11-0713-125/+111
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | tv: condense krebs.buildtv2015-11-066-76/+19
| | | |_|_|/ | | |/| | |
| | * | | | krebs.build.source.dir.host defaults to current.hosttv2015-11-067-13/+4
| | * | | | stockholm: import default user configtv2015-11-068-7/+4
| | * | | | tv base: tv@xu can roottv2015-11-061-0/+1
| | * | | | tv base: drop redundant with builtinstv2015-11-061-1/+0
| | * | | | tv: set environment.profileRelativeEnvVars.PATHtv2015-11-061-0/+2
| | * | | | tv: init user ztv2015-11-065-28/+45
| | * | | | {tv => krebs} per-usertv2015-11-063-3/+3
| | * | | | tv modules: add per-usertv2015-11-062-0/+36
| * | | | | xu: bump ssh keytv2015-11-071-1/+2
| * | | | | nomic: bump ssh keytv2015-11-071-1/+1
| |/ / / /
| * | | | tv: add users.tv_{wu,nomic}.pubkeytv2015-11-062-4/+11
| * | | | tv base: RIP old vimtv2015-11-061-16/+0
| * | | | tv vim: match strings harder!tv2015-11-061-1/+1
| * | | | tv vim: isk, INTs, and commentstv2015-11-061-2/+3
| | |_|/ | |/| |
| * | | tv vim: set et ts=2 sts=2 sw=2tv2015-11-051-0/+2
| * | | nomic: fix ssh.{priv,pub}keytv2015-11-021-1/+2
| * | | krebs.init: talk about ssh.privkey.pathtv2015-11-021-0/+1
| * | | wu: {/root => /var/src}/{nixpkgs,stockholm}tv2015-11-021-0/+2
| * | | krebs nix-install: softcode using target-pathtv2015-11-021-1/+1
* | | | 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