summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'before-merge'makefu2015-09-2730-403/+956
|\
| * add description for sources.dir.*.hostmakefu2015-09-271-0/+5
| * merge in new sources definitionmakefu2015-09-273-19/+28
| * fix wrymakefu2015-09-271-17/+16
| * Merge remote-tracking branch 'cd/master' into before-mergemakefu2015-09-2727-367/+907
| |\
| | * get: 1.1.0 -> 1.1.1tv2015-09-271-3/+3
| | * nomic: systemPackages += gnupgtv2015-09-271-0/+1
| | * tv.wu: /home is btrfstv2015-09-271-0/+1
| | * tv.wu: bumblewhoo?tv2015-09-271-3/+0
| | * tv: reintroduce configs exim-smarthosttv2015-09-272-53/+56
| | * krebs.build: merge deploy and infesttv2015-09-2721-308/+458
| | * cac: ? -> 1.0.0tv2015-09-261-3/+3
| | * get: 1 -> 1.1.0tv2015-09-261-3/+3
| | * get: init at 1tv2015-09-254-0/+40
| | * make: don't try to run `make[1]:`tv2015-09-251-2/+2
| | * Merge remote-tracking branch 'pnp/master'tv2015-09-253-2/+47
| | |\
| | * | lass 2 base: disable nscdlassulus2015-09-231-0/+1
| | * | lass 2: configure mc globalylassulus2015-09-232-0/+347
* | | | add tor,virtualboxmakefu2015-09-272-0/+25
* | | | pnp: use new sourcesmakefu2015-09-271-6/+1
|/ / /
* | / 3modules: add wrymakefu2015-09-272-1/+76
| |/ |/|
* | Merge remote-tracking branch 'cloudkrebs/master' into pre-mergemakefu2015-09-2323-36/+640
|\|
| * lass 2 browsers: add create{Firefox,Chromium}Userlassulus2015-09-191-6/+28
| * lass 2: use zsh as defaultShelllassulus2015-09-192-0/+127
| * krebs 3: update echelon iplassulus2015-09-191-1/+1
| * krebs 3: update echelon iplassulus2015-09-181-1/+1
| * add "make infest"lassulus2015-09-186-0/+315
| * krebs Zhosts: add echelonlassulus2015-09-181-0/+12
| * lass 1 mors: install cac pkglassulus2015-09-181-0/+1
| * lass 1 echelon: use correct hostnamelassulus2015-09-181-1/+1
| * lass 1 echelon: get ip from krebslassulus2015-09-181-7/+10
| * lass 4: add getDefaultGateway helper functionlassulus2015-09-181-0/+4
| * krebs 5 cac: add inotifyTools as dependencylassulus2015-09-181-1/+2
| * Merge branch 'makefu'lassulus2015-09-132-2/+3
| |\
| * | lass 2 base: dont get a ipv4ll addresslassulus2015-09-131-0/+4
| * | lass 2 base: bump nixpkgs revlassulus2015-09-131-1/+1
| * | lass 2 desktop-base: bind backspace to capslocklassulus2015-09-131-0/+1
| * | Merge branch 'tv'lassulus2015-09-053-1/+39
| |\ \
| | * | krebs Zhosts: add xutv2015-09-041-0/+13
| | * | krebs types net.tinc: s/apply/default/tv2015-09-041-1/+1
| | * | krebs tv hosts: add xutv2015-09-041-0/+25
| * | | Merge branch 'makefu'lassulus2015-09-05182-87/+567
| |\ \ \
| * | | | lass: add echelonlassulus2015-09-052-0/+73
| * | | | lass 5: use autoimport ok pkgslassulus2015-09-051-2/+0
| * | | | move pubkey imports to krebs/Zpubkeyslassulus2015-09-053-4/+4
| * | | | lass 2 browsers: add browser-selectlassulus2015-09-051-0/+9
| * | | | krebs 3: make rsync work on retarted systemslassulus2015-09-051-2/+0
| * | | | lass 2 virtualbox: remove enablelassulus2015-09-051-1/+0
| * | | | lass 2 steam: move config to new firewalllassulus2015-09-051-10/+9
| * | | | Merge branch 'tv'lassulus2015-08-304-0/+19
| |\ \ \ \