summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-12-02 00:45:50 +0100
committertv <tv@krebsco.de>2020-12-02 00:45:50 +0100
commitd60b1b793f3a1635c1fe30aa11b64831fd665b4f (patch)
treed484b1315dab9b6c3d230118f6e33b0888f0aca5
parent29827720520b6a4885dbdcb3237070e6e45dd910 (diff)
parent813eefa3c55fd1cd234b0adb1da7286bd761b579 (diff)
Merge remote-tracking branch 'prism/master' into master
-rw-r--r--krebs/0tests/data/secrets/initrd/host_ecdsa.pub (renamed from lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem)0
-rw-r--r--krebs/0tests/data/secrets/initrd/host_ecdsa_key (renamed from lass/2configs/tests/dummy-secrets/dcsovpn/cert.key)0
-rw-r--r--krebs/0tests/data/secrets/initrd/hostname (renamed from lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem)0
-rw-r--r--krebs/0tests/data/secrets/initrd/hs_ed25519_public_key (renamed from lass/2configs/tests/dummy-secrets/dcsovpn/login.txt)0
-rw-r--r--krebs/0tests/data/secrets/initrd/hs_ed25519_secret_key0
-rw-r--r--krebs/0tests/data/secrets/initrd/openssh_host_ecdsa_key0
-rw-r--r--krebs/1systems/filebitch/hardware-configuration.nix28
-rw-r--r--krebs/1systems/hotdog/config.nix1
-rw-r--r--krebs/1systems/puyak/config.nix96
-rw-r--r--krebs/1systems/wolf/config.nix80
-rw-r--r--krebs/2configs/default.nix1
-rw-r--r--krebs/2configs/gitlab-runner-shackspace.nix33
-rw-r--r--krebs/2configs/nscd-fix.nix24
-rw-r--r--krebs/2configs/reaktor2.nix2
-rw-r--r--krebs/2configs/shack/gitlab-runner.nix62
-rw-r--r--krebs/2configs/shack/glados/default.nix19
-rw-r--r--krebs/2configs/shack/glados/deps/dwd_pollen.nix32
-rw-r--r--krebs/2configs/shack/mqtt_sub.nix2
-rw-r--r--krebs/2configs/shack/share.nix3
-rw-r--r--krebs/2configs/tor/initrd.nix50
-rw-r--r--krebs/3modules/external/default.nix4
-rw-r--r--krebs/3modules/external/mic92.nix34
-rw-r--r--krebs/3modules/external/ssh/shannan.pub1
-rw-r--r--krebs/3modules/github-hosts-sync.nix4
-rw-r--r--krebs/3modules/jeschli/default.nix3
-rw-r--r--krebs/3modules/lass/default.nix39
-rw-r--r--krebs/3modules/tinc.nix6
-rw-r--r--krebs/5pkgs/haskell/reaktor2/default.nix8
-rw-r--r--krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix2
-rw-r--r--krebs/nixpkgs-unstable.json11
-rw-r--r--krebs/nixpkgs.json6
-rwxr-xr-xkrebs/update-nixpkgs.sh2
-rw-r--r--lass/1systems/icarus/config.nix1
-rw-r--r--lass/1systems/morpheus/physical.nix5
-rw-r--r--lass/1systems/prism/config.nix9
-rw-r--r--lass/1systems/shodan/config.nix1
-rw-r--r--lass/1systems/styx/config.nix80
-rw-r--r--lass/1systems/styx/physical.nix34
-rw-r--r--lass/1systems/uriel/physical.nix2
-rw-r--r--lass/2configs/copyq.nix3
-rw-r--r--lass/2configs/dcso-vpn.nix44
-rw-r--r--lass/2configs/default.nix2
-rw-r--r--lass/2configs/hass/default.nix2
-rw-r--r--lass/2configs/hass/rooms/bett.nix62
-rw-r--r--lass/2configs/hass/rooms/essen.nix2
-rw-r--r--lass/2configs/hass/rooms/nass.nix2
-rw-r--r--lass/2configs/hass/zigbee.nix2
-rw-r--r--lass/2configs/websites/domsen.nix1
-rw-r--r--lass/2configs/websites/lassulus.nix2
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/hass.nix51
-rw-r--r--makefu/1systems/gum/config.nix6
-rw-r--r--makefu/1systems/omo/config.nix2
-rw-r--r--makefu/1systems/sdev/config.nix9
-rw-r--r--makefu/2configs/bgt/download.binaergewitter.de.nix19
-rw-r--r--makefu/2configs/bureautomation/automation/bureau-shutdown.nix157
-rw-r--r--makefu/2configs/bureautomation/automation/hass-restart.nix65
-rw-r--r--makefu/2configs/bureautomation/automation/nachtlicht.nix71
-rw-r--r--makefu/2configs/bureautomation/automation/schlechteluft.nix130
-rw-r--r--makefu/2configs/bureautomation/binary_sensor/buttons.nix9
-rw-r--r--makefu/2configs/bureautomation/binary_sensor/motion.nix27
-rw-r--r--makefu/2configs/bureautomation/camera/comic.nix23
-rw-r--r--makefu/2configs/bureautomation/camera/stuttgart.nix42
-rw-r--r--makefu/2configs/bureautomation/camera/verkehrskamera.nix31
-rw-r--r--makefu/2configs/bureautomation/default.nix116
-rw-r--r--makefu/2configs/bureautomation/deps/dwd_pollen.nix32
-rw-r--r--makefu/2configs/bureautomation/device_tracker/openwrt.nix29
-rw-r--r--makefu/2configs/bureautomation/kalauerbot.nix3
-rw-r--r--makefu/2configs/bureautomation/light/buzzer.nix12
-rw-r--r--makefu/2configs/bureautomation/light/statuslight.nix14
-rw-r--r--makefu/2configs/bureautomation/multi/10h_timers.nix16
-rw-r--r--makefu/2configs/bureautomation/multi/README.md3
-rw-r--r--makefu/2configs/bureautomation/multi/aramark.nix21
-rw-r--r--makefu/2configs/bureautomation/multi/daily-standup.nix83
-rw-r--r--makefu/2configs/bureautomation/multi/frosch.nix158
-rw-r--r--makefu/2configs/bureautomation/multi/matrix.nix106
-rw-r--r--makefu/2configs/bureautomation/multi/mittagessen.nix93
-rw-r--r--makefu/2configs/bureautomation/person/team.nix153
-rw-r--r--makefu/2configs/bureautomation/script/multi_blink.nix73
-rw-r--r--makefu/2configs/bureautomation/sensor/airquality.nix21
-rw-r--r--makefu/2configs/bureautomation/sensor/espeasy.nix12
-rw-r--r--makefu/2configs/bureautomation/sensor/influxdb.nix18
-rw-r--r--makefu/2configs/bureautomation/sensor/outside.nix54
-rw-r--r--makefu/2configs/bureautomation/sensor/tasmota_firmware.nix5
-rw-r--r--makefu/2configs/bureautomation/switch/rfbridge.nix16
-rw-r--r--makefu/2configs/bureautomation/switch/tasmota_switch.nix17
-rw-r--r--makefu/2configs/default.nix3
-rw-r--r--makefu/2configs/deployment/owncloud.nix28
-rw-r--r--makefu/2configs/editor/vim.nix4
-rw-r--r--makefu/2configs/gui/base.nix6
-rw-r--r--makefu/2configs/ham/automation/firetv_restart.nix52
-rw-r--r--makefu/2configs/ham/calendar/nextcloud.nix11
-rw-r--r--makefu/2configs/ham/default.nix72
-rw-r--r--makefu/2configs/ham/device_tracker/openwrt.nix23
-rw-r--r--makefu/2configs/ham/light/groups.nix41
-rw-r--r--makefu/2configs/ham/multi/fliegen-couter.nix100
-rw-r--r--makefu/2configs/ham/multi/kurzzeitwecker.nix223
-rw-r--r--makefu/2configs/ham/multi/the_playlist.nix139
-rw-r--r--makefu/2configs/ham/multi/zigbee2mqtt.nix127
-rw-r--r--makefu/2configs/ham/sensor/outside.nix45
-rw-r--r--makefu/2configs/ham/zigbee2mqtt/default.nix31
-rw-r--r--makefu/2configs/ham/zigbee2mqtt/hass.nix130
-rw-r--r--makefu/2configs/ham/zigbee2mqtt/osram.nix14
-rw-r--r--makefu/2configs/hw/droidcam.nix7
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix25
-rw-r--r--makefu/2configs/minimal.nix1
-rw-r--r--makefu/2configs/printer.nix16
-rw-r--r--makefu/2configs/remote-build/gum.nix8
-rw-r--r--makefu/2configs/share/omo.nix3
-rw-r--r--makefu/2configs/sickbeard/sickgear.nix6
-rw-r--r--makefu/2configs/urlwatch/default.nix3
-rw-r--r--makefu/2configs/wireguard/server.nix2
-rw-r--r--makefu/3modules/snapraid.nix2
-rw-r--r--makefu/5pkgs/droidcam/default.nix55
-rw-r--r--makefu/5pkgs/hactool/default.nix30
-rw-r--r--makefu/5pkgs/kalauerbot/badsync.patch14
-rw-r--r--makefu/5pkgs/kalauerbot/default.nix7
-rw-r--r--makefu/5pkgs/navi/default.nix37
-rw-r--r--makefu/5pkgs/v4l2loopback-dc/default.nix36
-rw-r--r--makefu/krops.nix2
120 files changed, 2021 insertions, 1787 deletions
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem b/krebs/0tests/data/secrets/initrd/host_ecdsa.pub
index e69de29bb..e69de29bb 100644
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/ca.pem
+++ b/krebs/0tests/data/secrets/initrd/host_ecdsa.pub
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.key b/krebs/0tests/data/secrets/initrd/host_ecdsa_key
index e69de29bb..e69de29bb 100644
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.key
+++ b/krebs/0tests/data/secrets/initrd/host_ecdsa_key
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem b/krebs/0tests/data/secrets/initrd/hostname
index e69de29bb..e69de29bb 100644
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/cert.pem
+++ b/krebs/0tests/data/secrets/initrd/hostname
diff --git a/lass/2configs/tests/dummy-secrets/dcsovpn/login.txt b/krebs/0tests/data/secrets/initrd/hs_ed25519_public_key
index e69de29bb..e69de29bb 100644
--- a/lass/2configs/tests/dummy-secrets/dcsovpn/login.txt
+++ b/krebs/0tests/data/secrets/initrd/hs_ed25519_public_key
diff --git a/krebs/0tests/data/secrets/initrd/hs_ed25519_secret_key b/krebs/0tests/data/secrets/initrd/hs_ed25519_secret_key
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/