summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-162-0/+3
|\ \ \ | | |/ | |/|
| * | xu: mount /bkutv2016-10-131-0/+5
| * | tv q: print TODOs firsttv2016-10-131-4/+5
| * | lib: don't define defaults that require configtv2016-10-134-13/+4
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-137-34/+28
|\ \ \
| * | | xu: mount /bkutv2016-10-131-0/+5
| * | | tv q: print TODOs firsttv2016-10-131-4/+5
| * | | lib: don't define defaults that require configtv2016-10-132-13/+1
| |/ /
| * | krebs lib: move {eq,ne,mod} to libtv2016-10-132-5/+4
| * | lib: inline has-default-nixtv2016-10-132-3/+1
| * | lib: remove addName*tv2016-10-132-6/+6
| * | krebs lib: with libtv2016-10-131-3/+6
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-132-65/+2
|\| |
| * | tv: security.hideProcessInformation = truetv2016-10-131-0/+1
| * | Merge remote-tracking branch 'prism/master'tv2016-10-1337-254/+405
| |\ \
| * | | exim: RIPtv2016-10-131-64/+0
| * | | tv nixpkgs: 45b2a6d -> 354fd37tv2016-10-131-1/+1
* | | | Revert "k 3 buildbot: remove override (upstream fix)"lassulus2016-10-131-2/+9
| |/ / |/| |
* | | l 2 nixpkgs: 0c022c4 -> 354fd37lassulus2016-10-131-1/+1
* | | l 5 xmonad-lass: use nix-path for i3locklassulus2016-10-131-1/+1
* | | l 2 websites domsen: disable apculassulus2016-10-121-3/+0
* | | l 1 uriel: fix duplicate definition of wirelesslassulus2016-10-121-3/+0
* | | l 1 mors: disable c-base vpnlassulus2016-10-121-1/+1
* | | remove comments from php config, phpfpm errorlassulus2016-10-124-5/+0
* | | l 2 nixpkgs: change url to github/nixoslassulus2016-10-121-1/+1
* | | Merge remote-tracking branch 'prism/master'lassulus2016-10-1119-49/+191
|\ \ \
| * \ \ Merge remote-tracking branch 'gum/master'lassulus2016-10-0616-43/+186
| |\ \ \ | | | |/ | | |/|
| | * | m 5 default: use cups from nixpkgs-stablemakefu2016-09-081-0/+7
| | * | k 3 repo-sync: add more explicit documentationmakefu2016-09-071-6/+34
| | * | m 2 default: remove trace, use || instead of ormakefu2016-09-071-3/+3
| | * | m 2 default: add trace for populatemakefu2016-09-071-2/+2
| | * | Merge remote-tracking branch 'prism/lassulus'makefu2016-09-0710-11/+51
| | |\ \
| | * | | m 5 qcma:initmakefu2016-09-032-0/+65
| | * | | m 1 gum: add sabnzbd configmakefu2016-09-021-0/+2
| | * | | m 1 x: add laptop-backupmakefu2016-09-021-3/+5
| | * | | m 2 x: add laptop-backupmakefu2016-09-021-0/+12
| | * | | m 2 sabnzbd: initmakefu2016-09-021-0/+16
| | * | | m udpt: update configmakefu2016-09-022-3/+10
| | * | | m 2 temp/share-samba: add groupmakefu2016-09-021-0/+2
| | * | | m 1 omo: replace torrentmakefu2016-09-021-7/+8
| | * | | m 2 omo-share: remove aio threadsmakefu2016-09-021-1/+0
| | * | | m 2 iodined: update to new revisionmakefu2016-09-021-4/+6
| | * | | m 2 urlwatch: remove overridemakefu2016-09-021-16/+0
| | * | | k 5 pwqgen: allow user-provided wordsetmakefu2016-08-242-2/+18
| * | | | Merge remote-tracking branch 'cd/master'lassulus2016-10-061-3/+3
| |\ \ \ \
| * | | | | l 1 mors: add macchanger to pkgslassulus2016-10-021-0/+2
| * | | | | l 3 umts: remove obsolete commentslassulus2016-10-011-4/+0
| * | | | | l 2 nixpkgs: 3fb009d -> 8a89481lassulus2016-10-011-1/+1
| * | | | | l 2 iodined: open the correct portlassulus2016-10-011-1/+1
| * | | | | l 2 iodined: add -c to running commandlassulus2016-10-011-1/+1