summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'makefu2016-06-2321-220/+664
|\
| * l 2 websites fritz: fix password protectionlassulus2016-06-221-2/+2
| * l 2 radio: update stream metadatalassulus2016-06-221-2/+2
| * l 2 vim: update vim configlassulus2016-06-221-11/+17
| * l 2: rename cbase to c-baselassulus2016-06-222-2/+1
| * l 2 mail: save send emails in notmuchlassulus2016-06-221-3/+4
| * l 2 vim: use tv's config with neovimlassulus2016-06-211-135/+322
| * l 5: use writeHaskelllassulus2016-06-215-27/+18
| * l 2 baseX: use hardware.pulseaudio againlassulus2016-06-191-1/+5
| * l 2 power-action: add low battery warninglassulus2016-06-191-0/+18
| * l 2 pulse: add /etc/pulse/daemon.conflassulus2016-06-191-0/+8
| * l 2 baseX: import power-action.nixlassulus2016-06-181-0/+1
| * l 2: add power-action.nixlassulus2016-06-181-0/+23
| * l 3 power-action: add charging checklassulus2016-06-181-1/+27
| * l 2 radio: remove unneeded sudo snippetlassulus2016-06-181-4/+0
| * l 3 power-action: fix some stuff (¯\_(ツ)_/¯)lassulus2016-06-181-3/+3
| * l 2 websites fritz: password protect some dirslassulus2016-06-181-1/+13
| * l 2 buildbot: build-all with method=buildlassulus2016-06-181-0/+1
| * l 2: bump nixpkgs f215f9e -> 7d93230lassulus2016-06-181-1/+1
| * l 2: override stockholm if dummy_secretslassulus2016-06-181-3/+4
| * l 2 buildbot-standalone: use make testlassulus2016-06-181-12/+48
| * l 2: use pulse.nixlassulus2016-06-182-5/+89
| * l 3: add power-actionlassulus2016-06-162-0/+68
| * l 2 radio: check remainingTime <150slassulus2016-06-161-1/+1
| * l 2 exim-smarthost: add nebenan@lassul.uslassulus2016-06-161-0/+1
| * k 3 l: add domsen-naslassulus2016-06-161-0/+12
| * k 3 l: RIP fastpokelassulus2016-06-161-31/+0
* | ma 2 save-diskspace: initmakefu2016-06-232-7/+11
* | ma 1 shoney: enable tinc_graphs for siem tincmakefu2016-06-231-15/+31
* | ma 1 pornocauster: add siem networkmakefu2016-06-231-0/+8
* | ma 1 darth: remove natmakefu2016-06-231-9/+3
* | add siem internal networkmakefu2016-06-232-4/+49
* | krebs 3 tinc_graphs: allow network different from retiolummakefu2016-06-231-22/+37
|/
* l 2 buildbot-standalone: add treeStableTimerlassulus2016-06-141-2/+2
* Merge remote-tracking branch 'wolf/master'lassulus2016-06-148-21/+80
|\
| * Merge remote-tracking branch 'cd/master'makefu2016-06-1425-122/+146
| |\
| * | s 1 wolf: use tcponly in shack networkmakefu2016-06-141-1/+1
| * | k 3 ma: update shoney ip after failed deploy :3makefu2016-06-141-1/+1
| * | ma 1 shoney: init siem tincmakefu2016-06-141-0/+2
| * | ma 1 dartH: fix nat from tincmakefu2016-06-141-6/+24
| * | s 1 buildbot: re-add treeStableTimermakefu2016-06-131-2/+2
| * | s 1 wolf: fix interface namemakefu2016-06-131-1/+1
| * | cp tv/2/*CAC -> makefu/2/makefu2016-06-134-10/+49
* | | Merge remote-tracking branch 'wolf/master'lassulus2016-06-131-0/+3
|\ \ \ | | |/ | |/|
| * | Makefile: assert existence of $(nixos-config)tv2016-06-131-0/+3
* | | l 2 websites domsen: generalize msmtp targetlassulus2016-06-131-2/+2
* | | l: add and use rs pkglassulus2016-06-133-0/+8
* | | l 2 umts: upgrade wvdial-defaultslassulus2016-06-131-1/+3
* | | l 2 fetchWallpaper: check for umtslassulus2016-06-131-0/+1
* | | l 1 dishfire: activate simple exim-smarthostlassulus2016-06-131-1/+30