summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmnin2017-07-0659-281/+912
|\
| * shared nixpkgs: 58e2270 -> 72c9ed7lassulus2017-07-041-1/+1
| * pkgs.ucspi-tcp: initlassulus2017-07-042-0/+101
| * Merge remote-tracking branch 'gum/master'lassulus2017-07-042-3/+2
| |\
| | * ma x230/pulseaudio: use extraConfigmakefu2017-07-031-2/+1
| | * Merge remote-tracking branch 'lass/master'makefu2017-07-0311-106/+301
| | |\
| | * | ma: nixpkgs -> 06734dmakefu2017-07-031-1/+1
| * | | l default.nix: don't set stockholm.filelassulus2017-07-041-1/+0
| * | | l domsen-websites: add some new domainslassulus2017-07-041-0/+5
| * | | l nixpkgs: 0a4db15 -> 2e983f1lassulus2017-07-041-1/+1
| * | | l mail: sort = threads as defaultlassulus2017-07-041-0/+2
| * | | l buildbot: refactor to use nix-shelllassulus2017-07-041-58/+18
| * | | l shodan.r: install winelassulus2017-07-041-0/+1
| | |/ | |/|
| * | l prism.r: fetch nixpkgs only once per daylassulus2017-07-031-0/+4
| * | Merge remote-tracking branch 'ni/master'lassulus2017-07-032-39/+53
| |\ \
| | * | tv: turn pkgs into an overlaytv2017-07-022-39/+53
| * | | Merge remote-tracking branch 'gum/master'lassulus2017-07-0312-70/+163
| |\ \ \ | | | |/ | | |/|
| | * | ma gum: use urlwatch foldermakefu2017-07-021-1/+1
| | * | ma urlwatch: refactormakefu2017-07-022-22/+36
| | * | urlwatch: filter _module with kvmakefu2017-07-021-1/+3
| | * | ma urlwatch: use hook for json apimakefu2017-07-022-0/+20
| | * | urlwatch: set dataDir to home of urlwatch usermakefu2017-07-021-11/+2
| | * | gum.r: provide iodine endpointmakefu2017-07-021-1/+1
| | * | ma x.r: enable 2fa for sshdmakefu2017-07-011-0/+5
| | * | ma vbob: enable totpmakefu2017-07-011-0/+1
| | * | ma: add gen-oath-safe to dev toolsmakefu2017-07-011-0/+1
| | * | ma lancache: retabmakefu2017-07-011-29/+30
| | * | ma 2fa: init and enable for gummakefu2017-06-302-0/+21
| | * | ma gen-oath-safe: initmakefu2017-06-301-0/+37
| * | | l buildbot: tests hosts in correct orderlassulus2017-06-301-3/+3
| * | | l mors: use new fileSystem layoutlassulus2017-06-301-33/+14
| * | | l icarus: use new fileSystem layoutlassulus2017-06-301-7/+10
| * | | l pkgs.init: use grub with EFI, remove /bkulassulus2017-06-301-14/+16
| * | | l exim: add polo@lassul.us & shack@lassul.uslassulus2017-06-301-0/+2
| | |/ | |/|
| * | shell: use stockholm libtv2017-06-301-4/+3
| * | shell: use getopttv2017-06-301-14/+15
| * | shell: use writeOut to create cmdspkgtv2017-06-301-6/+3
| * | shell: rename hook attribute to shelltv2017-06-301-11/+6
| * | shell: use writeDashtv2017-06-301-16/+8
| * | pkgs.whatsupnix: print gawk output ASAPtv2017-06-302-3/+3
| * | shell: use stockholm overlaytv2017-06-301-8/+4
| * | shell: inline qtargettv2017-06-301-3/+3
| * | shell: using proxy implies populated targettv2017-06-301-10/+6
| * | shell: mark shellHook as shtv2017-06-301-1/+1
| * | Revert "k 4 infest: prepare Regression for stockholm"tv2017-06-291-4/+10
| * | shell: inittv2017-06-291-0/+210
| * | Merge remote-tracking branch 'gum/master'tv2017-06-2922-51/+324
| |\|
| | * ma sources: bump musnixmakefu2017-06-291-1/+1
| | * ma audio: use latest kernel for musnixmakefu2017-06-291-1/+1
| | * ma jack-on-pulse: include jack_capturemakefu2017-06-291-1/+4