Merge branch 'master' of https://cgit.lassul.us/stockholm

117 files changed, 2189 insertions, 1086 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ff991aa4..4a7a4e605 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
   # prepare git fetching of secrets
   - echo "$gitlab_deploy_privkey" > ~/.ssh/gitlab_deploy.key
   - chmod 600 ~/.ssh/gitlab_deploy.key
-  - ssh-keyscan -H 'ssh.git.shackspace.de' >> ~/.ssh/known_hosts
+  - echo "$ssh_git_shackspace_serverkey" >> ~/.ssh/known_hosts
   # import secret key for secrets
   - echo "$secrets_gpg_key" | gpg --import
 deployment test:
diff --git a/.gitmodules b/.gitmodules
index e9b098519..a0eb20951 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,9 @@
 [submodule "lass/5pkgs/autowifi"]
 	path = lass/5pkgs/autowifi
 	url = https://github.com/Lassulus/autowifi
-[submodule "jeschli/2configs/misc-elisp-scripts"]
-	path = jeschli/2configs/misc-elisp-scripts
-	url = git@github.com:Jeschli/misc-elisp-scripts.git
 [submodule "jeschli/2configs/elisp"]
 	path = jeschli/2configs/elisp
 	url = git@github.com:Jeschli/misc-elisp-scripts.git
+[submodule "submodules/brockman"]
+	path = submodules/brockman
+	url = https://github.com/kmein/brockman.git
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 797a397ba..7400663a2 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -4,7 +4,7 @@ let
   pkgsWithOverlay = import <nixpkgs-unstable> {
     overlays = [
       (import (builtins.fetchTarball {
-        url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+        url = https://github.com/nix-community/emacs-overlay/archive/403c14c23be188b58c0b1bc197b428041d8a0cea.tar.gz;
       }))
     ];
   };
diff --git a/krebs/0tests/data/secrets/hass/darksky.apikey b/krebs/0tests/data/secrets/hass/darksky.apikey
new file mode 100644
index 000000000..4932cd639
--- /dev/null
+++ b/krebs/0tests/data/secrets/hass/darksky.apikey
@@ -0,0 +1 @@
+LOL
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index ca6e0922a..43dd96919 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -26,14 +26,12 @@
         "http://cgit.hotdog.r/krops"
         "http://cgit.ni.r/krops"
         "http://cgit.prism.r/krops"
-        "https://git.ingolf-wagner.de/krebs/krops.git"
         "https://github.com/krebs/krops.git"
       ];
       nix_writers.urls = [
         "http://cgit.hotdog.r/nix-writers"
         "http://cgit.ni.r/nix-writers"
         "http://cgit.prism.r/nix-writers"
-        "https://git.ingolf-wagner.de/krebs/nix-writers.git"
       ];
       stockholm.urls = [
         "http://cgit.enklave.r/stockholm"
diff --git a/krebs/2configs/shack/glados/automation/hass-restart.nix b/krebs/2configs/shack/glados/automation/hass-restart.nix
index e87354978..1b380204d 100644
--- a/krebs/2configs/shack/glados/automation/hass-restart.nix
+++ b/krebs/2configs/shack/glados/automation/hass-restart.nix
@@ -6,12 +6,13 @@
       platform = "homeassistant";
       event = "start";
     };
+    # trigger good/bad air
     action = [
       { service = "light.turn_on";
         data = {
           entity_id = "light.fablab_led";
           effect = "Rainbow";
-          color_name = "yellow";
+          color_name = "purple";
         };
       }
     ];
diff --git a/krebs/2configs/shack/glados/automation/shack-startup.nix b/krebs/2configs/shack/glados/automation/shack-startup.nix
new file mode 100644
index 000000000..35314923b
--- /dev/null
+++ b/krebs/2configs/shack/glados/automation/shack-startup.nix
@@ -0,0 +1,82 @@
+# needs:
+#   binary_sensor.portal_lock
+#   sensor.keyholder
+#   media_player.lounge
+let
+  glados = import ../lib;
+in
+[
+  {
+    alias = "Greet new keyholder for key exchange";
+    initial_state = true;
+    trigger = {
+      platform = "state";
+      entity_id = "sensor.keyholder";
+    };
+    condition = {
+      condition = "template";
+      value_template = "{{ trigger.from_state.state != 'No Keyholder' }}";
+    };
+    action = glados.say.kiosk "Danke {{trigger.to_state.state}} für das Übernehmen des Keys von {{trigger.from_state.state}}";
+    # action = [];
+  }
+
+  {
+    alias = "Start Music on portal lock on";