summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'lassulus2015-11-2117-14/+1181
|\
| * mv pkgs ff: don't sudotv2015-11-202-9/+5
| * krebs: add cgit.stro.retiolumtv2015-11-181-0/+1
| * mv: add stockholm repotv2015-11-182-0/+59
| * mv: s/tv/mv/tv2015-11-1810-8/+1119
| * krebs pkgs: s/retiolum/internet/tv2015-11-186-6/+6
* | Merge remote-tracking branch 'cd/master'lassulus2015-11-1714-0/+1260
|\|
| * Zhosts: add strotv2015-11-171-0/+10
| * mv: inittv2015-11-1713-0/+1250
* | l 3 dnsmasq: remove dead codelassulus2015-11-141-7/+0
* | k 3 l: bump echelon internet addrlassulus2015-11-141-1/+1
* | l 3: remove bitlbeelassulus2015-11-142-154/+0
* | shared: add os templates to 2lassulus2015-11-132-0/+94
* | l 1 prism: import weechat.nixlassulus2015-11-131-0/+1
* | l 2 weechat: bring everything up2datelassulus2015-11-131-8/+23
* | l: use bitlbee plugin architecture from nixpkgslassulus2015-11-135-135/+6
* | l 2 base: nixpkgs 7ae05ed -> 8d1ce12lassulus2015-11-131-1/+1
* | l 5 go -> k 5 golassulus2015-11-133-4/+3
* | move testhosts to shared from lasslassulus2015-11-135-42/+38
* | shared: move stuff from 1/wolf.nix to 2/base.nixlassulus2015-11-132-70/+75
* | l 2 base: add monitoring toolslassulus2015-11-131-0/+4
* | l 2 git: make prism verbose hostlassulus2015-11-131-1/+1
* | l 2 go: adapt to lass.go -> krebs.golassulus2015-11-131-4/+1
* | l 3 go -> k 3 golassulus2015-11-133-3/+3
* | l 1 mors: open risk of rain port for lanlassulus2015-11-131-0/+6
* | l 1 mors: use new wordpress testlassulus2015-11-131-1/+22
* | l: use new xserver architecturelassulus2015-11-1310-29/+527
* | l 1 prism: add stuff for oneline httpserverlassulus2015-11-131-0/+8
* | l 1 echelon: disable redislassulus2015-11-131-1/+1
* | l 2 base: nixpkgs rev 6d31e9b -> 7ae05edlassulus2015-11-131-1/+1
* | l 2 browsers: add simpleScriptlassulus2015-11-131-1/+9
* | l 4: remove simpleScriptlassulus2015-11-131-11/+1
* | l 3 go: activate redis via mkDefaultlassulus2015-11-131-0/+5
* | l 2 configs: use krebs.per-userlassulus2015-11-131-5/+1
* | l 2 git: get secrets the new waylassulus2015-11-131-1/+1
* | l 2 git: adapt to new lib architecturelassulus2015-11-131-1/+1
* | l 2 git: get irc-announce from pkgslassulus2015-11-131-1/+1
* | Merge remote-tracking branch 'pnp/master'lassulus2015-11-123-10/+34
|\ \
| * | m 1 gum: add chat toolsmakefu2015-11-101-0/+6
| * | 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
* | | Merge remote-tracking branch 'cd/master'lassulus2015-11-1021-1069/+285
|\ \ \ | | |/ | |/|
| * | tv: add shell aliases for systemdtv2015-11-101-0/+6
| * | tv: setup XDG_RUNTIME_DIR for userstv2015-11-101-0/+8
| * | tv vim hs: hi quasi quotestv2015-11-091-0/+4
| * | stockholm: overhaul lib generationtv2015-11-091-22/+16
| * | Revert "stockholm: check harder if user lib exists"tv2015-11-091-3/+2
| * | stockholm: check harder if user lib existstv2015-11-091-2/+3