summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-04-287-8/+171
|\
| * Merge remote-tracking branch 'ni/master'lassulus2019-04-285-5/+94
| |\
| | * flameshot-once: make timeout configurabletv2019-04-231-0/+9
| | * flameshot-once: fix _file in profile moduletv2019-04-231-1/+1
| | * flameshot-once: 1.1.0 -> 1.2.0tv2019-04-231-3/+3
| | * Merge remote-tracking branch 'prism/master'tv2019-04-191-4/+5
| | |\
| | * | krebs.shadow: inittv2019-04-192-0/+80
| | * | krebs.permown: fix typo in PrivateTmptv2019-04-191-1/+1
| * | | mb p1nk: fix tinc pubkeylassulus2019-04-281-1/+1
| * | | Merge branch 'mb'lassulus2019-04-282-0/+74
| |\ \ \
| | * | | mb: add p1nk.rmblassulus2019-04-261-0/+26
| | * | | mb orange: add more aliaseslassulus2019-04-261-0/+2
| | * | | init mblassulus2019-04-262-0/+46
| * | | | nixpkgs: 8ea36d7 -> cf3e277lassulus2019-04-271-3/+3
| |/ / /
* | | | 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