summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'pnp/master'tv2015-10-0414-251/+156
|\|
| * makefu 5 tinc_graphs: bump versionmakefu2015-10-040-0/+0
| * makefu 3: add tinc_graphs modulemakefu2015-10-040-0/+0
| * configure graphs for wrymakefu2015-10-042-2/+12
| * m 3 tinc_graphs: make first working versionmakefu2015-10-041-13/+56
| * m 5 tinc_graphs: fix path for tinc callermakefu2015-10-041-2/+4
| * makefu 5 tinc_graphs: bump versionmakefu2015-10-042-2/+2
| * makefu 3: add tinc_graphs modulemakefu2015-10-042-17/+85
| * krebs 3 lass: bump echelon ip (again)lassulus2015-10-041-1/+1
| * lass 2: delete old stufflassulus2015-10-042-223/+0
| * lass 2: rename new-repos.nix to git.nixlassulus2015-10-044-3/+3
| * lass 2 new-repos: open http-port to retiolumlassulus2015-10-041-0/+4
| * lass 1 echelon: activate wp & proxy serviceslassulus2015-10-041-1/+2
| * krebs 3 lass: bump echelon iplassulus2015-10-041-1/+1
* | rmdir: bump ipaddrtv2015-10-041-1/+1
* | Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-10-040-0/+0
|\ \ | |/ |/|
| * add alsa-tools, working tinc_graphsmakefu2015-10-033-0/+60
* | krebs: fix curl (error 77) in infestlassulus2015-10-041-0/+1
* | uriel: import bitlbee & weechat cfglassulus2015-10-042-0/+24
* | lass 2: remove old git configlassulus2015-10-041-87/+0
* | lass 3: add wallpaper.nixlassulus2015-10-049-2/+176
* | add alsa-tools, working tinc_graphsmakefu2015-10-043-0/+60
* | lass 2 configs: add privoxy configslassulus2015-10-044-0/+38
* | lass 1 cloudkrebs: get ip from build hostlassulus2015-10-041-4/+10
* | krebs 3 lass: bump echelon iplassulus2015-10-041-1/+1
* | lass 1 cloudkrebs: install diclassulus2015-10-041-0/+4
* | lass 2 desktop-base: add sxivlassulus2015-10-031-0/+2
* | lass 2 browsers: stylelassulus2015-10-031-16/+12
* | lass 1 mors: add cac depslassulus2015-10-031-0/+2
* | Merge remote-tracking branch 'cd/master'lassulus2015-10-022-3/+17
|\ \
| * | default.nix: export gettv2015-10-021-0/+14
| * | get: 1.3.0 -> 1.3.1tv2015-10-021-3/+3
* | | lass 2 new-repos: verbose announce as cloudkrebslassulus2015-10-011-0/+1
* | | lass 2 base: add stockholm depslassulus2015-10-011-0/+5
* | | Merge branch 'tv'lassulus2015-10-014-14/+49
|\| |
| * | jq: init at 1.5tv2015-10-012-0/+34
| * | irc-announce: allow disabling just log and difftv2015-10-012-15/+16
| * | tv git: announce only via cdtv2015-10-011-1/+1
| |/
* | Merge branch 'makefu'lassulus2015-10-018-650/+681
|\|
| * krebs modules: finalize default.nix splittv2015-10-014-646/+654
| * Merge remote-tracking branch 'cd/master'makefu2015-10-0131-394/+611
| |\
| | * Merge remote-tracking branch 'uriel/master'tv2015-10-0110-42/+80
| | |\
| | * \ Merge remote-tracking branch 'mors/master'tv2015-10-0112-9/+158
| | |\ \
| | * \ \ Merge remote-tracking branch 'pnp/master'tv2015-10-019-48/+160
| | |\ \ \
| | * | | | krebs lib.types: deprecate host.infest.{addr,port}tv2015-10-012-2/+3
| * | | | | makefu/base" fix secrets pathmakefu2015-10-011-1/+1
| * | | | | fix wry ipmakefu2015-10-013-3/+25
| * | | | | Merge remote-tracking branch 'cd/master'makefu2015-09-306-19/+194
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | lass 2 browsers: disable pulseSupport in flashlassulus2015-10-011-1/+1
* | | | | | lass 2 virtualbox: enable virtualbox host modelassulus2015-10-011-0/+2