summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-04-2318-25/+202
|\
| * reaktor2: add userlassulus2019-04-231-0/+5
| * nixpkgs: 5c52b25 -> 8ea36d7lassulus2019-04-231-3/+3
| * Merge remote-tracking branch 'ni/master'lassulus2019-04-181-2/+15
| |\
| | * krebs.permown: use named pipetv2019-04-181-2/+15
| * | Merge remote-tracking branch 'ni/master'lassulus2019-04-181-4/+6
| |\|
| | * krebs.permown: admit symlinkstv2019-04-181-3/+5
| | * Revert "krebs.permown: [] -> {}"tv2019-04-181-1/+1
| * | syncthing: listOf -> attrsOflassulus2019-04-181-4/+5
| |/
| * krebs.permown: [] -> {}tv2019-04-181-1/+1
| * krebs.permown: mkdirs on activationtv2019-04-181-0/+6
| * krebs.permown: listOf -> attrsOftv2019-04-181-38/+45
| * Merge remote-tracking branch 'gum/master'tv2019-04-173-1/+16
| |\
| | * Merge remote-tracking branch 'tv/master'makefu2019-04-172-0/+75
| | |\
| | * | l daedalus.r: add ublock originlassulus2019-04-171-0/+1
| | * | l shodan.r: add syncthing.idlassulus2019-04-171-0/+1
| | * | external: add ada.rlassulus2019-04-171-0/+13
| | * | realwallpaper: reduce log noiselassulus2019-04-171-1/+1
| | * | Merge remote-tracking branch 'ni/master'lassulus2019-04-142-4/+10
| | |\ \
| * | | | qrscan: inittv2019-04-171-0/+27
| | |_|/ | |/| |
| * | | krebs.permown: inittv2019-04-172-0/+75
| * | | Merge remote-tracking branch 'prism/master'tv2019-04-172-6/+8
| |\| | | | |/ | |/|
| | * Merge remote-tracking branch 'ni/master'lassulus2019-04-132-2/+4
| | |\
| | * | bepasty-server: use python2 againlassulus2019-04-131-4/+4
| | * | ci: create gcroot only if result existslassulus2019-04-131-2/+4
| * | | lass: move p from lassul.us to krebsco.detv2019-04-131-1/+1
| * | | krebspaste: print public URLtv2019-04-131-3/+9
| | |/ | |/|
| * | lass paste: add p.krebsco.detv2019-04-132-2/+4
| |/
| * Merge remote-tracking branch 'prism/master'tv2019-04-1342-820/+494
| |\
| | * bepasty: use python3lassulus2019-04-131-3/+3
| | * nixpkgs: 67bc63f -> 5c52b25lassulus2019-04-111-3/+3
| | * syncthing: fix permissions of keyslassulus2019-04-091-2/+10
| | * hotdog.r: don't set NIX_REMOTElassulus2019-04-081-1/+0
| | * nixpkgs: 2229509 -> 67bc63flassulus2019-04-081-3/+3
| | * email-header: add 19.03 compatibilitylassulus2019-04-081-0/+5
| | * blessings: add 19.03 compatibilitylassulus2019-04-081-0/+4
| | * 18.09 -> 19.03lassulus2019-04-081-1/+1
| * | krebs.setuid: propagate env by defaulttv2019-04-131-2/+2
* | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-095-9/+187
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'ni/master'lassulus2019-04-081-0/+126
| |\|
| | * q-power_supply: init from tv's qtv2019-03-291-0/+126
| * | l: add green.rlassulus2019-04-071-0/+40
| * | syncthing: add id optionlassulus2019-04-071-3/+7
| * | l phone.w: rotate all keyslassulus2019-04-072-3/+3
| * | l skynet.r: add wiregrilllassulus2019-04-071-0/+7
| * | l prism.r: add syncthing.idlassulus2019-04-071-0/+1
| * | nixpkgs: 8abca4b -> 2229509lassulus2019-04-071-3/+3
* | | :Merge branch 'master' of prism.r:stockholmjeschli2019-04-0248-859/+796
|\| |
| * | syncthing: increase rescanInterval to track upstreamlassulus2019-03-231-1/+1
| * | syncthing: wait for service startuplassulus2019-03-231-0/+2