summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | xu nixpkgs: c44a593 -> 7ae05edtv2015-11-071-0/+3
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-11-0747-138/+800
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge remote-tracking branch 'cd/master'lassulus2015-11-019-24/+126
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'pnp/master'lassulus2015-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
| * | | | | | | 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
| * | | | | | | xu: bump ssh keytv2015-11-071-1/+2
| * | | | | | | nomic: bump ssh keytv2015-11-071-1/+1
* | | | | | | | m 2 vbox: up version numbermakefu2015-11-142-4/+4
* | | | | | | | m 1 gum: add swap to server configmakefu2015-11-142-0/+12
* | | | | | | | m 1 filepimp: remove legacy importsmakefu2015-11-141-2/+0
* | | | | | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-101-0/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | m 1 gum: add chat toolsmakefu2015-11-101-0/+6
* | | | | | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-103-10/+28
|\| | | | | | |
| * | | | | | | m 1 gum:update firewallmakefu2015-11-101-4/+22
| * | | | | | | infest: add curl to debian depsmakefu2015-11-101-0/+1
| * | | | | | | gum: prepare, add targetmakefu2015-11-101-12/+10
| * | | | | | | krebs: expose krebs.populatemakefu2015-11-101-0/+1
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | Reaktor: bump versionmakefu2015-11-081-2/+2
|/ / / / / /
* | | | | | m 2: base -> default, rm base-sourcesmakefu2015-11-0610-85/+47
* | | | | | Merge remote-tracking branch 'cd/master'makefu2015-11-0616-71/+106
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| |/ / / /
| * | | | 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
* | | | | 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
| |\| | | |