summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'prism/master'tv2020-12-274-9/+38
|\| |
| * | nixpkgs-unstable: 83cbad9 -> e9158eclassulus2020-12-211-4/+4
| * | nixpkgs: 3a02dc9 -> 3d2d8f2lassulus2020-12-211-4/+4
| * | nixpkgs-unstable: a322b32 -> 83cbad9lassulus2020-12-081-4/+4
| * | nixpkgs: f41c0fc -> 3a02dc9lassulus2020-12-081-4/+7
| * | exim-retiolum: add system-aliases optionlassulus2020-12-041-0/+23
| * | realwallpaper: keep old markers if new ones are emptylassulus2020-11-261-1/+4
* | | Merge remote-tracking branch 'prism/master' into mastertv2020-12-0232-239/+314
|\| |
| * | Merge remote-tracking branch 'mic92/master' into masterlassulus2020-11-243-0/+6
| |\ \
| | * | mic92: add shannanJörg Thalheim2020-11-242-0/+5
| | * | add alertmanager.rJörg Thalheim2020-11-231-0/+1
| * | | nixpkgs-unstable: 34ad166 -> a322b32lassulus2020-11-231-4/+7
| |/ /
| * | Merge remote-tracking branch 'ni/master' into masterlassulus2020-11-231-0/+5
| |\ \
| * \ \ Merge remote-tracking branch 'mic92/master' into masterlassulus2020-11-231-2/+2
| |\ \ \
| | * | | mic92: fix bernie tinc addressJörg Thalheim2020-11-201-2/+2
| * | | | l: init styx.rlassulus2020-11-231-0/+39
| |/ / /
| * | | mic92: improve tinc cross-compilingJörg Thalheim2020-11-201-2/+4
| * | | mic92: add bernieJörg Thalheim2020-11-191-0/+28
| * | | mic92: add loki.r alias to rock.rJörg Thalheim2020-11-191-1/+4
| | |/ | |/|
| * | Merge remote-tracking branch 'gum/20.09' into 20.0920.09lassulus2020-11-182-4/+9
| |\ \
| | * | pkgs.alertmanager-bot-telegram: fix vendorSha256makefu2020-11-171-1/+1
| | * | puyak.r: disable newsbot for nowmakefu2020-11-171-3/+8
| * | | Merge remote-tracking branch 'ni/master' into 20.09lassulus2020-11-171-2/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'gum/20.09' into 20.09lassulus2020-11-173-49/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | shack/glados: disable dwd_pollenmakefu2020-11-172-48/+3
| | * | | Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-171-8/+8
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-171-8/+8
| | |\ \ \ \
| | * | | | | shack/mqtt_sub: use python3 instead of 3.5makefu2020-11-171-1/+1
| * | | | | | Merge branch 'master' into 20.09lassulus2020-11-171-13/+20
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Revert "tv: disable ci for all systems"lassulus2020-11-171-8/+8
| | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'gum/20.09' into 20.09lassulus2020-11-1712-128/+187
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | tor/initrd: fix typo in secrets-pathmakefu2020-11-171-1/+1
| | * | | | Merge remote-tracking branch 'lass/20.09' into 20.09makefu2020-11-164-27/+23
| | |\ \ \ \
| | * | | | | gitlab-runner-shackspace: replaced by shack/gitlab-runnermakefu2020-11-161-33/+0
| | * | | | | shack/gitlab-runner: use upstream gitlab modulemakefu2020-11-161-19/+43
| | * | | | | tor/initrd: use hostKeys instead of hostECDSAKeymakefu2020-11-161-1/+1
| | * | | | | ma secrets/initrd: add new openssh_host_ecdsa_keymakefu2020-11-161-0/+0
| | * | | | | Merge branch 'master' into 20.09makefu2020-11-169-76/+144
| | |\ \ \ \ \
| | | * | | | | puyak,wolf: add documentation for importsmakefu2020-11-163-9/+18
| | | * | | | | krebs dummy-secrets: add initrdmakefu2020-11-055-0/+0
| | | * | | | | puyak.r: initrd bootstrapping via tormakefu2020-11-052-0/+56
| | | * | | | | puyak.r: cleanup importsmakefu2020-11-041-5/+3
| | | * | | | | wolf.r: re-add shack ssh keysmakefu2020-11-041-0/+4
| | | * | | | | puyak.r,wolf.r: move all services from wolf to puyakmakefu2020-11-032-77/+78
| * | | | | | | tv: disable ci for all systemslassulus2020-11-171-8/+8
| | |_|/ / / / | |/| | | | |
| * | | | | | nixpkgs: 896270d -> f41c0fclassulus2020-11-161-3/+3
| * | | | | | Merge branch 'master' into 20.09lassulus2020-11-163-24/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | nixpkgs: 13d0c31 -> 896270dlassulus2020-11-121-3/+3
| * | | | | | Merge branch 'master' into 20.09lassulus2020-11-122-19/+71
| |\ \ \ \ \ \
| * | | | | | | filebitch.r: fix luks devices syntaxlassulus2020-11-051-15/+13