summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-05-281-1/+53
|\
| * mb sunshine.r: disable cimagenbluten2019-05-211-1/+1
| * Merge remote-tracking branch 'origin/master'magenbluten2019-05-218-7/+104
| |\
| * | mb: add new machinesmagenbluten2019-05-211-0/+52
* | | Merge remote-tracking branch 'prism/master'jeschli2019-05-211-3/+3
|\ \ \ | | |/ | |/|
| * | nixpkgs: 04954e3 -> 705986flassulus2019-05-201-3/+3
* | | Merge branch 'master' of prism.r:stockholmjeschli2019-05-146-5/+102
|\| |
| * | Merge remote-tracking branch 'gum/master'lassulus2019-05-052-0/+42
| |\ \
| | * \ Merge branch 'master' of prism:stockholmmakefu2019-04-265-45/+106
| | |\ \
| | * | | prison-break: move to krebsmakefu2019-04-262-0/+42
| * | | | Merge remote-tracking branch 'ni/master'lassulus2019-05-053-2/+57
| |\ \ \ \
| | * | | | treewide: nixpkgsVersion -> versiontv2019-04-302-2/+2
| | * | | | ssh-audit: init at 1.7.0tv2019-04-301-0/+55
| * | | | | nixpkgs: cf3e277 -> 04954e3lassulus2019-05-051-3/+3
| |/ / / /
* | | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-302-2/+2
|\| | | |
| * | | | allow multiple hostKeyslassulus2019-04-301-1/+1
| * | | | irc-announce: add _ to nick, for filteringlassulus2019-04-281-1/+1
| | |_|/ | |/| |
* | | | 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.rlassulus2019-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
| | |\ \