summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'nin2017-12-1426-1059/+942
|\
| * Merge remote-tracking branch 'ni/master'lassulus2017-12-131-1/+9
| |\
| | * tv urlwatch: add nix-difftv2017-12-131-0/+5
| | * tv urlwatch: filter simple-evcorr through jqtv2017-12-131-1/+4
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-121-1/+1
| |\|
| | * tv urlwatch: watch GitHub Metatv2017-12-121-1/+1
| * | jeschli: +bluetoothjeschli2017-12-121-0/+2
| * | jeschli:+ retiolum, +lass vimjeschli2017-12-066-102/+571
| * | Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lassjeschli2017-12-061-228/+2
| |\|
| | * stockholm: drop OLD_PATHtv2017-12-061-2/+1
| | * stockholm: export HOSTNAME and STOCKHOLM_VERSIONtv2017-12-051-13/+0
| | * stockholm: inittv2017-12-051-275/+3
| | * shell deploy: add --difftv2017-12-051-0/+60
| * | boomjeschli2017-12-057-0/+306
| |/
| * Merge branch 'prism/master' into HEADlassulus2017-12-051-1/+8
| |\
| | * tv backup: add nomic-pull-querel-hometv2017-11-291-0/+6
| | * types: use cidr only in tinc.subnetslassulus2017-11-291-1/+8
| * | tv xmonad: replace XMONAD_STATE by XMONAD_*_DIRtv2017-12-052-14/+13
| * | tv xserver: user -> cfg.usertv2017-12-051-5/+7
| * | tv backup: add nomic-pull-querel-hometv2017-11-261-0/+6
| |/
| * tv urlwatch: add rabbitmqtv2017-11-211-0/+2
| * withGetopt: replace \\>tv2017-11-151-2/+6
| * tv xmonad: make XMONAD_STARTUP_HOOK optionaltv2017-11-111-4/+6
| * tv bash: remove completion.shtv2017-11-091-779/+0
| * tv audit: RIPtv2017-11-093-11/+0
| * tv: RIP wvdialtv2017-11-021-9/+0
| * tv: use git-previewtv2017-11-021-0/+1
| * tv: use pidgin-with-plugins.overridetv2017-11-022-4/+6
| * tv querel: inittv2017-11-022-0/+98
* | n 2 default: add nixos binary cachenin2017-11-091-0/+1
* | Merge remote-tracking branch 'prism/master'nin2017-11-073-9/+33
|\|
| * tv: netzclub -> ppptv2017-10-273-38/+33
| * tv netzclub: simplify AT codetv2017-10-271-10/+2
| * tv netzclub: add missing "tv2017-10-261-1/+1
| * tv netzclub: fix exampletv2017-10-261-1/+1
| * tv netzclub: { -> pkgs.}ppptv2017-10-261-1/+1
| * tv modules: rm umtstv2017-10-261-1/+0
| * tv xu: lol wvdialtv2017-10-261-1/+0
| * tv netzclub: inittv2017-10-262-0/+46
| * tv umts: RIPtv2017-10-262-108/+0
| * Merge remote-tracking branch 'prism/master'tv2017-10-265-14/+55
| |\
| * | brscan4: init at 0.4.4-4tv2017-10-261-8/+0
| * | tv xu: enable umtstv2017-10-241-0/+9
| * | tv umts: cleanuptv2017-10-241-59/+46
| * | tv umts: import from lasstv2017-10-242-0/+113
* | | n nixpkgs: c99239b -> cfafd6fnin2017-11-071-1/+1
| |/ |/|
* | n nixpkgs: 9824ca6 -> c99239bnin2017-10-241-1/+1
* | n 2 default: add pavucontrolnin2017-10-241-0/+1
* | nin hiawatha firefox: remove flashnin2017-10-241-4/+0
* | n 2 default: update binary-cachenin2017-10-241-6/+1