Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of prism.r:stockholm | jeschli | 2019-05-28 | 1 | -1/+53 |
|\ | |||||
| * | mb sunshine.r: disable ci | magenbluten | 2019-05-21 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'origin/master' | magenbluten | 2019-05-21 | 8 | -7/+104 |
| |\ | |||||
| * | | mb: add new machines | magenbluten | 2019-05-21 | 1 | -0/+52 |
* | | | Merge remote-tracking branch 'prism/master' | jeschli | 2019-05-21 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | nixpkgs: 04954e3 -> 705986f | lassulus | 2019-05-20 | 1 | -3/+3 |
* | | | Merge branch 'master' of prism.r:stockholm | jeschli | 2019-05-14 | 6 | -5/+102 |
|\| | | |||||
| * | | Merge remote-tracking branch 'gum/master' | lassulus | 2019-05-05 | 2 | -0/+42 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of prism:stockholm | makefu | 2019-04-26 | 5 | -45/+106 |
| | |\ \ | |||||
| | * | | | prison-break: move to krebs | makefu | 2019-04-26 | 2 | -0/+42 |
| * | | | | Merge remote-tracking branch 'ni/master' | lassulus | 2019-05-05 | 3 | -2/+57 |
| |\ \ \ \ | |||||
| | * | | | | treewide: nixpkgsVersion -> version | tv | 2019-04-30 | 2 | -2/+2 |
| | * | | | | ssh-audit: init at 1.7.0 | tv | 2019-04-30 | 1 | -0/+55 |
| * | | | | | nixpkgs: cf3e277 -> 04954e3 | lassulus | 2019-05-05 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of prism.r:stockholm | jeschli | 2019-04-30 | 2 | -2/+2 |
|\| | | | | |||||
| * | | | | allow multiple hostKeys | lassulus | 2019-04-30 | 1 | -1/+1 |
| * | | | | irc-announce: add _ to nick, for filtering | lassulus | 2019-04-28 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' of prism.r:stockholm | jeschli | 2019-04-28 | 7 | -8/+171 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'ni/master' | lassulus | 2019-04-28 | 5 | -5/+94 |
| |\ \ \ | |||||
| | * | | | flameshot-once: make timeout configurable | tv | 2019-04-23 | 1 | -0/+9 |
| | * | | | flameshot-once: fix _file in profile module | tv | 2019-04-23 | 1 | -1/+1 |
| | * | | | flameshot-once: 1.1.0 -> 1.2.0 | tv | 2019-04-23 | 1 | -3/+3 |
| | * | | | Merge remote-tracking branch 'prism/master' | tv | 2019-04-19 | 1 | -4/+5 |
| | |\ \ \ | |||||
| | * | | | | krebs.shadow: init | tv | 2019-04-19 | 2 | -0/+80 |
| | * | | | | krebs.permown: fix typo in PrivateTmp | tv | 2019-04-19 | 1 | -1/+1 |
| * | | | | | mb p1nk: fix tinc pubkey | lassulus | 2019-04-28 | 1 | -1/+1 |
| * | | | | | Merge branch 'mb' | lassulus | 2019-04-28 | 2 | -0/+74 |
| |\ \ \ \ \ | |||||
| | * | | | | | mb: add p1nk.r | lassulus | 2019-04-26 | 1 | -0/+26 |
| | * | | | | | mb orange: add more aliases | lassulus | 2019-04-26 | 1 | -0/+2 |
| | * | | | | | init mb | lassulus | 2019-04-26 | 2 | -0/+46 |
| | | |_|_|/ | | |/| | | | |||||
| * / | | | | nixpkgs: 8ea36d7 -> cf3e277 | lassulus | 2019-04-27 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of prism.r:stockholm | jeschli | 2019-04-23 | 18 | -25/+202 |
|\| | | | | |||||
| * | | | | reaktor2: add user | lassulus | 2019-04-23 | 1 | -0/+5 |
| * | | | | nixpkgs: 5c52b25 -> 8ea36d7 | lassulus | 2019-04-23 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
| * | | | Merge remote-tracking branch 'ni/master' | lassulus | 2019-04-18 | 1 | -2/+15 |
| |\| | | |||||
| | * | | krebs.permown: use named pipe | tv | 2019-04-18 | 1 | -2/+15 |
| * | | | Merge remote-tracking branch 'ni/master' | lassulus | 2019-04-18 | 1 | -4/+6 |
| |\| | | |||||
| | * | | krebs.permown: admit symlinks | tv | 2019-04-18 | 1 | -3/+5 |
| | * | | Revert "krebs.permown: [] -> {}" | tv | 2019-04-18 | 1 | -1/+1 |
| * | | | syncthing: listOf -> attrsOf | lassulus | 2019-04-18 | 1 | -4/+5 |
| |/ / | |||||
| * | | krebs.permown: [] -> {} | tv | 2019-04-18 | 1 | -1/+1 |
| * | | krebs.permown: mkdirs on activation | tv | 2019-04-18 | 1 | -0/+6 |
| * | | krebs.permown: listOf -> attrsOf | tv | 2019-04-18 | 1 | -38/+45 |
| * | | Merge remote-tracking branch 'gum/master' | tv | 2019-04-17 | 3 | -1/+16 |
| |\| | |||||
| | * | Merge remote-tracking branch 'tv/master' | makefu | 2019-04-17 | 2 | -0/+75 |
| | |\ | |||||
| | * | | l daedalus.r: add ublock origin | lassulus | 2019-04-17 | 1 | -0/+1 |
| | * | | l shodan.r: add syncthing.id | lassulus | 2019-04-17 | 1 | -0/+1 |
| | * | | external: add ada.r | lassulus | 2019-04-17 | 1 | -0/+13 |
| | * | | realwallpaper: reduce log noise | lassulus | 2019-04-17 | 1 | -1/+1 |
| | * | | Merge remote-tracking branch 'ni/master' | lassulus | 2019-04-14 | 2 | -4/+10 |
| | |\ \ |