From e284da85a4dfc2f65ecf9c0ca257487eb90baf06 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 6 Apr 2020 10:13:24 +0200
Subject: ma feed.euer.krebsco.de: init

---
 .../deployment/feed.euer.krebsco.de/default.nix    | 52 ++++++++++++++++++++++
 .../deployment/feed.euer.krebsco.de/filter.yml     | 49 ++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 makefu/2configs/deployment/feed.euer.krebsco.de/default.nix
 create mode 100644 makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/feed.euer.krebsco.de/default.nix b/makefu/2configs/deployment/feed.euer.krebsco.de/default.nix
new file mode 100644
index 000000000..de072092b
--- /dev/null
+++ b/makefu/2configs/deployment/feed.euer.krebsco.de/default.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+let
+  filter-file = ./filter.yml;
+  pkg = with pkgs.python3Packages;buildPythonPackage rec {
+    version = "d16ce227dc68c9f60f6dd06e6835bab7cdfdf61b";
+    pname = "ebk-notify";
+    propagatedBuildInputs = [
+      docopt
+      pyyaml
+      requests
+      beautifulsoup4
+      dateutil
+      feedgen
+    ];
+    src = pkgs.fetchgit {
+      url = "http://cgit.euer.krebsco.de/ebk-notify";
+      rev = version;
+      sha256 = "15dlhp17alm01fw7mzdyh2z9zwz8psrs489lxs3hgg1p5wa0kzsp";
+    };
+  };
+  domain = "feed.euer.krebsco.de";
+  path = "/var/www/feed.euer.krebsco.de";
+in
+{
+  systemd.tmpfiles.rules = [
+    "d ${path} nginx nogroup - -"
+  ];
+  krebs.secret.files.ebknotify = {
+    path = "/etc/ebk-notify.yml";
+    owner.name = "nginx";
+    source-path = "${<secrets/ebk-notify.yml>}";
+  };
+  systemd.services.ebk-notify = {
+    startAt = "*:0/10";
+    serviceConfig = {
+      User = "nginx"; # TODO better permission setting
+      # PrivateTmp = true;
+      ExecStart = "${pkg}/bin/ebk-notify --atom --outdir ${path} --config /etc/ebk-notify.yml --cache /tmp/ebk-cache.json --filter ${filter-file} --wait 30";
+    };
+  };
+  systemd.timers.ebk-notify.timerConfig.RandomizedDelaySec = "120";
+  services.nginx = {
+    virtualHosts."${domain}" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        root = path;
+        index = "root.atom";
+      };
+    };
+  };
+}
diff --git a/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml b/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml
new file mode 100644
index 000000000..036f67e5b
--- /dev/null
+++ b/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml
@@ -0,0 +1,49 @@
+- name: Free Stuff by Category
+  zipcode: 70378
+  distance: 2
+  categoryId: 192
+- name: Kies
+  zipcode: 70378
+  q: grobkies
+  distance: 2
+- name: pflanzkübel
+  zipcode: 70378
+  q: Pflanzkübel
+  distance: 3
+- name: Ikea Samla
+  zipcode: 70378
+  q: samla
+  distance: 5
+- name: Duplo
+  zipcode: 70378
+  q: Duplo
+  distance: 10
+- name: Valve Index
+  q: Valve Index
+  maxPrice: 1300
+  minPrice: 500
+  locationId: 3331
+- name: Baby Gummistiefel
+  zipcode: 70378
+  q: Gummistiefel
+  distance: 5
+- name: Werkbank
+  zipcode: 70378
+  q: Werkbank
+  distance: 5
+- name: Stirnthermometer
+  zipcode: 70378
+  q: Stirnthermometer
+  distance: 5
+- name: Ohrthermometer
+  zipcode: 70378
+  q: Ohrthermometer
+  distance: 5
+- name: Fieberthermometer
+  zipcode: 70378
+  q: Fieberthermometer
+  distance: 5
+- name: Einhell
+  zipcode: 70378
+  q: Einhell
+  distance: 5
-- 
cgit v1.2.3


From 2dfadc18518900d48bd367c18d894a91b7bf2a77 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 6 Apr 2020 10:14:41 +0200
Subject: ma feed.euer: remove valve

---
 makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml b/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml
index 036f67e5b..50058f32b 100644
--- a/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml
+++ b/makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml
@@ -18,11 +18,6 @@
   zipcode: 70378
   q: Duplo
   distance: 10
-- name: Valve Index
-  q: Valve Index
-  maxPrice: 1300
-  minPrice: 500
-  locationId: 3331
 - name: Baby Gummistiefel
   zipcode: 70378
   q: Gummistiefel
-- 
cgit v1.2.3


From 0b371833e9ef68fd891fac65a657d8e38b5b3fad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 19 Apr 2020 21:24:52 +0200
Subject: ma ham: add the_playlist

---
 makefu/2configs/ham/default.nix            |  2 ++
 makefu/2configs/ham/multi/the_playlist.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 makefu/2configs/ham/multi/the_playlist.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index 53723299c..6b2867c2d 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -14,6 +14,7 @@ let
   #flurlicht = import ./multi/flurlicht.nix;
   kurzzeitwecker = import ./multi/kurzzeitwecker.nix;
   firetv_restart = import ./multi/firetv_restart.nix;
+  the_playlist = import ./multi/the_playlist.nix;
 #   switch
 #   automation
 #   binary_sensor
@@ -131,6 +132,7 @@ in {
         # https://www.home-assistant.io/cookbook/automation_for_rainy_days/
       ]
       ++ ((import ./sensor/outside.nix) {inherit lib;})
+      ++ the_playlist.sensor
       ++ zigbee.sensor ;
       frontend = { };
       # light = flurlicht.light;
diff --git a/makefu/2configs/ham/multi/the_playlist.nix b/makefu/2configs/ham/multi/the_playlist.nix
new file mode 100644
index 000000000..aa5ce85dc
--- /dev/null
+++ b/makefu/2configs/ham/multi/the_playlist.nix
@@ -0,0 +1,26 @@
+{
+  sensor =  [
+    { platform = "rest";
+      name = "pl";
+      resource = "http://prism.r:8001/current";
+      scan_interval = 30;
+      json_attributes = [ "name" "filename" "youtube" ];
+    }
+    { platform = "template";
+      sensors = {
+        the_playlist_song = {
+          friendly_name = "Current Song";
+          value_template = ''{{ states.sensor.pl.attributes['name'] }}'';
+        };
+        the_playlist_url = {
+          friendly_name = "Song Youtube URL";
+          value_template = ''{{ states.sensor.pl.attributes['youtube'] }}'';
+        };
+        the_playlist_filename = {
+          friendly_name = "Song Filename";
+          value_template = ''{{ states.sensor.pl.attributes['filename'] }}'';
+        };
+      };
+    }
+  ];
+}
-- 
cgit v1.2.3


From 1bd21834de66f52bc4b003cf71abda39b68a9055 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:21:45 +0200
Subject: ma cgit: add ebk-notify

---
 makefu/2configs/git/cgit-retiolum.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 2a6e41ad8..639994674 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -18,6 +18,7 @@ let
     yacos-backend = {
       cgit.desc = "Yet Another Check-Out System";
     };
+    ebk-notify.cgit.desc = "Ebay Kleinanzeigen Notify";
   };
 
   krebs-repos = mapAttrs make-krebs-repo {
-- 
cgit v1.2.3


From 7e77e6a637bba4a6efd4d046d68d477f6c19fe96 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:33:55 +0200
Subject: ma gui/base: use lightdm, enable corefonts via fonts.fonts

---
 makefu/2configs/gui/base.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 5b46c7e2d..854fbfa52 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -32,8 +32,11 @@ in
       default = "awesome";
     };
 
-    displayManager.auto.enable = true;
-    displayManager.auto.user = mainUser;
+    displayManager.lightdm = {
+      enable = true;
+      autoLogin.enable = true;
+      autoLogin.user = mainUser;
+    };
     desktopManager.xterm.enable = false;
   };
   environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
@@ -43,10 +46,9 @@ in
   i18n.consoleFont = "Lat2-Terminus16";
 
   fonts = {
-    enableCoreFonts = true;
     enableFontDir = true;
     enableGhostscriptFonts = true;
-    fonts = [ pkgs.terminus_font ];
+    fonts = [ pkgs.terminus_font pkgs.corefonts ];
   };
 
   users.users.${mainUser} = {
-- 
cgit v1.2.3


From 91d94ddbb7ce6e211e79122da3e7f7a1193d582c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:35:17 +0200
Subject: ma ham/androidtv: bump python libs to correct version

---
 makefu/2configs/ham/androidtv/adbshell.nix      | 4 ++--
 makefu/2configs/ham/androidtv/default.nix       | 4 ++--
 makefu/2configs/ham/androidtv/purepythonadb.nix | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/ham/androidtv/adbshell.nix b/makefu/2configs/ham/androidtv/adbshell.nix
index f5b96c859..0fadeeb05 100644
--- a/makefu/2configs/ham/androidtv/adbshell.nix
+++ b/makefu/2configs/ham/androidtv/adbshell.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "adb_shell";
-  version = "0.0.8";
+  version = "0.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01f9jinhfyjldg9793gz2i7gcd9xyx0a62r7a5ijssklcnn2rwnm";
+    sha256 = "0a4mjrnw2lrhsakb1vjb5l6m3cr1ii7fibs7020nwv08cyx6pq6q";
   };
 
   propagatedBuildInputs = [
diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix
index 8f3bdc1f3..b7d397db4 100644
--- a/makefu/2configs/ham/androidtv/default.nix
+++ b/makefu/2configs/ham/androidtv/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "androidtv";
-  version = "0.0.34";
+  version = "0.0.38";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13078i2a9hglpv4ldycph5n5485np21vs6z2qn830hybmx8kfxsw";
+    sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k";
   };
 
   propagatedBuildInputs = [
diff --git a/makefu/2configs/ham/androidtv/purepythonadb.nix b/makefu/2configs/ham/androidtv/purepythonadb.nix
index d4e763b70..c9b1ff5e8 100644
--- a/makefu/2configs/ham/androidtv/purepythonadb.nix
+++ b/makefu/2configs/ham/androidtv/purepythonadb.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "pure-python-adb";
-  version = "0.2.3.dev0";
+  version = "0.2.2.dev0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88e5a4578435197799aa368fb1a5d87fe43e02a888cb7e85c2ad66173b383c89";
+    sha256 = "1xigv6c8xyb4g852nr3smz0137rnp81jvlikza071y7rc6pdzwza";
   };
 
   meta = with lib; {
@@ -18,4 +18,4 @@ buildPythonPackage rec {
     license = licenses.mit;
     # maintainers = [ maintainers. ];
   };
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 8fb99675fb4e813accee6c3258160f6cb7059cb8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:35:59 +0200
Subject: ma ham/the_playlist: init

---
 makefu/2configs/ham/default.nix            |  3 ++
 makefu/2configs/ham/multi/the_playlist.nix | 57 ++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index 6b2867c2d..ddcf65b5a 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -50,6 +50,8 @@ in {
       logger = {
         default = "info";
       };
+      rest_command = {}
+      // the_playlist.rest_command;
       tts = [
         { platform = "google_translate";
           language = "de";
@@ -142,6 +144,7 @@ in {
         ++ (import ./automation/firetv_restart.nix)
         ++ kurzzeitwecker.automation
         #++ flurlicht.automation
+        ++ the_playlist.automation
         ++ zigbee.automation;
         script =
         { }
diff --git a/makefu/2configs/ham/multi/the_playlist.nix b/makefu/2configs/ham/multi/the_playlist.nix
index aa5ce85dc..ad090938c 100644
--- a/makefu/2configs/ham/multi/the_playlist.nix
+++ b/makefu/2configs/ham/multi/the_playlist.nix
@@ -1,9 +1,66 @@
+# Inputs:
+#  binary_sensor.playlist_button_good
+#  binary_sensor.playlist_button_bad
+
+# outputs
+#  rest_command
+#  automation
+#  sensor
 {
+  rest_command = {
+    good_song = {
+      url = "http://prism.r:8001/good";
+      method = "POST";
+    };
+    bad_song = {
+      url = "http://prism.r:8001/skip";
+      method = "POST";
+    };
+  };
+  automation = [
+    {
+      alias = "playlist song publish";
+      trigger = {
+        #platform = "event";
+        #event_data.entity_id = "sensor.the_playlist_song";
+        platform = "state";
+        entity_id = "sensor.the_playlist_song";
+      };
+      action = {
+        service = "mqtt.publish";
+        data = {
+          topic = "/ham/the_playlist/song";
+          payload_template = "{{ states.sensor.the_playlist_song.state }}";
+        };
+      };
+    }
+    {
+      alias = "playlist upvote on button";
+      trigger = {
+        platform = "state";
+        entity_id = "binary_sensor.playlist_button_good";
+        from = "off";
+        to = "on";
+      };
+      action.service = "rest_command.good_song";
+    }
+    {
+      alias = "playlist downvote on button";
+      trigger = {
+        platform = "state";
+        entity_id = "binary_sensor.playlist_button_bad";
+        from = "off";
+        to = "on";
+      };
+      action.service = "rest_command.bad_song";
+    }
+  ];
   sensor =  [
     { platform = "rest";
       name = "pl";
       resource = "http://prism.r:8001/current";
       scan_interval = 30;
+      value_template = "1";
       json_attributes = [ "name" "filename" "youtube" ];
     }
     { platform = "template";
-- 
cgit v1.2.3


From 0ab05578b3ff853920b83204fe36146af2f303be Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:40:46 +0200
Subject: ma zsh: use bat as cat but without indentation

it makes copy-pasting with the mouse easier if only header and snip is enabled
---
 makefu/2configs/home-manager/zsh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 4cd9becc7..0dc7f256b 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -8,7 +8,7 @@
     { # bat
     home-manager.users.makefu.home.packages = [ pkgs.bat ];
       home-manager.users.makefu.programs.zsh.shellAliases = {
-        cat = "bat";
+        cat = "bat --style=header,snip";
         catn = "${pkgs.coreutils}/bin/cat";
         ncat = "${pkgs.coreutils}/bin/cat";
       };
-- 
cgit v1.2.3


From 4c0fffbcf833ea5494329369cedda68779c9abd7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:41:07 +0200
Subject: ma nur: bump to latest tarball

---
 makefu/2configs/nur.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/nur.nix b/makefu/2configs/nur.nix
index 891144957..65cf836c4 100644
--- a/makefu/2configs/nur.nix
+++ b/makefu/2configs/nur.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:{
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import (builtins.fetchTarball {
-    url = "https://github.com/nix-community/NUR/archive/7bfd0117b359d0f72d086ff7e1f0ba3aeaf8d91e.tar.gz";
-      sha256 = "0gb2np1r2m9kkz1s374gxdqrwhkzx48iircy00y6mjr7h14rhyxk";
+    url = "https://github.com/nix-community/NUR/archive/b7f7e072b3fa56aa0d86dfe3689cb13f0615bbbe.tar.gz";
+      sha256 = "0slxxg3r460aa1rc83j0rklmr0i1hyzfbjy0kn30fyh1l3lqb22m";
     }
   ){
       inherit pkgs;
-- 
cgit v1.2.3


From dbfc2dc3430008dc2660decf828643d9fd2b59b5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:41:21 +0200
Subject: ma share/omo: enable anime and serien

---
 makefu/2configs/share/omo.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix
index ed5066787..929e5c601 100644
--- a/makefu/2configs/share/omo.nix
+++ b/makefu/2configs/share/omo.nix
@@ -42,6 +42,18 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
+      anime = {
+        path = "/media/cryptX/anime";
+        "read only" = "yes";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+      serien = {
+        path = "/media/cryptX/series";
+        "read only" = "yes";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
       crypX-games = {
         path = "/media/cryptX/games";
         "read only" = "yes";
-- 
cgit v1.2.3


From 4fc2235ab0a8a11ea21965c86e5ba17279384db4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 21 Apr 2020 21:41:42 +0200
Subject: ma tools/dev: add hydra-check

---
 makefu/2configs/tools/dev.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 43892ed2c..f184b5be5 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -21,6 +21,7 @@
     brain
     whatsupnix
     nixpkgs-pytools
+    hydra-check
     # git-related
     git-preview
     tig
-- 
cgit v1.2.3


From 95aff447719270f0816ac6d2db3a003c585ac0a4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 08:11:00 +0200
Subject: ma urxvtd: rxvt_unicode_with-plugins -> rxvt_unicode-with-plugins

---
 makefu/2configs/gui/urxvtd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/urxvtd.nix b/makefu/2configs/gui/urxvtd.nix
index 286b87ab3..cb6c25840 100644
--- a/makefu/2configs/gui/urxvtd.nix
+++ b/makefu/2configs/gui/urxvtd.nix
@@ -10,7 +10,7 @@ in {
     serviceConfig = {
       SyslogIdentifier = "urxvtd";
       ExecReload = "${pkgs.coreutils}/bin/echo NOP";
-      ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd";
+      ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd";
       Restart = "always";
       RestartSec = "2s";
       StartLimitBurst = 0;
-- 
cgit v1.2.3


From e7caceb6df27615f33083ae9430b61ffebcff5a7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 08:16:49 +0200
Subject: ma zsh.nix: mirage -> sxiv

---
 makefu/2configs/home-manager/zsh.nix | 1 +
 makefu/2configs/tools/extra-gui.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 0dc7f256b..1f4ceea6c 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -9,6 +9,7 @@
     home-manager.users.makefu.home.packages = [ pkgs.bat ];
       home-manager.users.makefu.programs.zsh.shellAliases = {
         cat = "bat --style=header,snip";
+        mirage = "sxiv"; # only available when tools/extra-gui is in use
         catn = "${pkgs.coreutils}/bin/cat";
         ncat = "${pkgs.coreutils}/bin/cat";
       };
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 7c01104a0..49b36a5d7 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -4,7 +4,7 @@
   users.users.makefu.packages = with pkgs;[
     # media
     gimp
-    mirage
+    # mirage - last time available in 19.09
     inkscape
     libreoffice
     # skype
-- 
cgit v1.2.3


From 2a84f65e4acb0c389136dd29f706696c5e4ba6e0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 08:44:48 +0200
Subject: ma wbob-kiosk: set default session to xfce

---
 makefu/2configs/gui/wbob-kiosk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 6da1a37e7..5d409b8df 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -12,7 +12,7 @@
 
     windowManager = lib.mkForce {
       awesome.enable = false;
-      default = "none";
+      default = "xfce";
     };
     desktopManager.xfce = {
       extraSessionCommands = ''
-- 
cgit v1.2.3


From 18b3df8741c7fd00252e5f41094844955f6e2294 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 09:31:38 +0200
Subject: ma tools/studio: whitelist openssl_1.0.2

---
 makefu/2configs/tools/studio.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index 2c8ca399d..0998a695e 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 
 {
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.0.2u" # required for studio-link
+  ];
   users.users.makefu.packages = with pkgs; [
     obs-studio
     studio-link
-- 
cgit v1.2.3


From c80ca049f1db5725a10f7110aeb5e63eb5b88611 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 16:36:44 +0200
Subject: ma default: accept acme terms

---
 makefu/2configs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 0cbb5efe7..6166b87c3 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -85,4 +85,8 @@ with import <stockholm/lib>;
     RuntimeMaxUse=128M
     '';
   environment.pathsToLink = [ "/share" ];
+  security.acme = {
+    email = "letsencrypt@syntax-fehler.de";
+    acceptTerms = true;
+  };
 }
-- 
cgit v1.2.3


From 89cf2fdfa82b994679a96f420461b593393a84ff Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 19:14:14 +0200
Subject: ma virtualbox: disable extensionPack

---
 makefu/2configs/virtualisation/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/virtualisation/virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix
index a8a50939f..dc14b33ae 100644
--- a/makefu/2configs/virtualisation/virtualbox.nix
+++ b/makefu/2configs/virtualisation/virtualbox.nix
@@ -2,7 +2,7 @@
 
 {
   virtualisation.virtualbox.host.enable = true;
-  virtualisation.virtualbox.host.enableExtensionPack = true;
+  #virtualisation.virtualbox.host.enableExtensionPack = true;
   # virtualisation.virtualbox.host.enableHardening = false;
   users.extraGroups.vboxusers.members = [ config.krebs.build.user.name ];
 }
-- 
cgit v1.2.3


From 3a378b3f785ea681ec44786313a6e1b1d222ca22 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 19:54:44 +0200
Subject: ma owncloud: pkgs.nextcloud -> nextcloud

---
 makefu/2configs/deployment/owncloud.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index ed3155efc..753fc963b 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -15,6 +15,7 @@ with lib;
 
 let
   # TODO: copy-paste from lass/2/websites/util.nix
+  nextcloud = nextcloud18;
   serveCloud = domains:
     let
       domain = head domains;
@@ -23,9 +24,9 @@ let
     in {
       system.activationScripts."prepare-nextcloud-${domain}" = ''
         if test ! -e ${root} ;then
-          echo "copying latest ${pkgs.nextcloud.name} release to ${root}"
+          echo "copying latest ${nextcloud.name} release to ${root}"
           mkdir -p $(dirname "${root}")
-          cp -r  ${pkgs.nextcloud} "${root}"
+          cp -r  ${nextcloud} "${root}"
           chown -R nginx:nginx "${root}"
           chmod 770 "${root}"
         fi
-- 
cgit v1.2.3


From 575b514c9db74b69f91af19439db3c6b7a93687b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 23:40:45 +0200
Subject: ma 2 default: use stable kernel instead of latest

better chance for virtualbox to work
---
 makefu/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 6166b87c3..0219e9bb7 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -30,7 +30,7 @@ with import <stockholm/lib>;
   };
   nix.trustedUsers = [ config.krebs.build.user.name ];
 
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
 
   nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
 
-- 
cgit v1.2.3


From bd7e97477b0529f0f758df197d2f52860564700f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Apr 2020 23:41:21 +0200
Subject: ma virtualbox: re-enable extensionpack

---
 makefu/2configs/virtualisation/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/virtualisation/virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix
index dc14b33ae..a8a50939f 100644
--- a/makefu/2configs/virtualisation/virtualbox.nix
+++ b/makefu/2configs/virtualisation/virtualbox.nix
@@ -2,7 +2,7 @@
 
 {
   virtualisation.virtualbox.host.enable = true;
-  #virtualisation.virtualbox.host.enableExtensionPack = true;
+  virtualisation.virtualbox.host.enableExtensionPack = true;
   # virtualisation.virtualbox.host.enableHardening = false;
   users.extraGroups.vboxusers.members = [ config.krebs.build.user.name ];
 }
-- 
cgit v1.2.3


From d71182a1bb1894acab5b44ddce6df0c682dfe2f4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 10:23:25 +0200
Subject: ma gum.r: fix owncloud

---
 makefu/2configs/deployment/owncloud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index 753fc963b..1cfda6fc5 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -15,7 +15,7 @@ with lib;
 
 let
   # TODO: copy-paste from lass/2/websites/util.nix
-  nextcloud = nextcloud18;
+  nextcloud = pkgs.nextcloud18;
   serveCloud = domains:
     let
       domain = head domains;
-- 
cgit v1.2.3


From 525f575f42934ec6f5d734731e19fbd5f1cdff23 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 10:31:29 +0200
Subject: ma gui: update with refactored xserver options

---
 makefu/2configs/gui/base.nix       | 11 +++--------
 makefu/2configs/gui/wbob-kiosk.nix |  9 ++++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 854fbfa52..8aee1bdc3 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -29,21 +29,16 @@ in
       awesome.enable = true;
       awesome.noArgb = true;
       awesome.luaModules = [ pkgs.luaPackages.vicious ];
-      default = "awesome";
-    };
-
-    displayManager.lightdm = {
-      enable = true;
-      autoLogin.enable = true;
-      autoLogin.user = mainUser;
     };
+    displayManager.defaultSession = lib.mkDefault "awesome";
+    displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; };
     desktopManager.xterm.enable = false;
   };
   environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
   # lid switch is handled via button presses
   services.logind.lidSwitch = lib.mkDefault "ignore";
   makefu.awesome.enable = true;
-  i18n.consoleFont = "Lat2-Terminus16";
+  console.font = "Lat2-Terminus16";
 
   fonts = {
     enableFontDir = true;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 5d409b8df..1a5e6d04f 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -12,16 +12,15 @@
 
     windowManager = lib.mkForce {
       awesome.enable = false;
-      default = "xfce";
     };
     desktopManager.xfce = {
-      extraSessionCommands = ''
+      enable = true;
+    };
+    displayManager.defaultSession = "xfce";
+    displayManager.sessionCommands = ''
         ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
         ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
       '';
-      enable = true;
-    };
-
     # xrandrHeads = [ "HDMI1" "HDMI2" ];
     # prevent screen from turning off, disable dpms
   };
-- 
cgit v1.2.3


From aeb7d5e972cd69f4de9c20bcbd0e1d91312b74b6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 15:36:05 +0200
Subject: ma gui/base: awesome -> none+awesome

---
 makefu/2configs/gui/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 8aee1bdc3..9c1d560a0 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -30,7 +30,7 @@ in
       awesome.noArgb = true;
       awesome.luaModules = [ pkgs.luaPackages.vicious ];
     };
-    displayManager.defaultSession = lib.mkDefault "awesome";
+    displayManager.defaultSession = lib.mkDefault "none+awesome";
     displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; };
     desktopManager.xterm.enable = false;
   };
-- 
cgit v1.2.3


From 9341a6e3a2a9f62dc4eba5de23351f48b0846129 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 16:44:10 +0200
Subject: ma vim: disable utilsnips

---
 makefu/2configs/editor/vim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/editor/vim.nix b/makefu/2configs/editor/vim.nix
index 52ccd0ddd..3954dc0f3 100644
--- a/makefu/2configs/editor/vim.nix
+++ b/makefu/2configs/editor/vim.nix
@@ -22,7 +22,8 @@ in {
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
         { names = [ "undotree"
-          "YouCompleteMe" "UltiSnips"
+        "YouCompleteMe"
+        #"UltiSnips"
           "vim-better-whitespace" ]; }
         # vim-nix handles indentation better but does not perform sanity
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
-- 
cgit v1.2.3


From 0c3b57081d8439debb67d041e72815c5be5cc3f5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 16:44:47 +0200
Subject: ma zsh: disable home-manager gpg-agent and use programs.gpg-agent

---
 makefu/2configs/home-manager/cli.nix | 9 ---------
 makefu/2configs/home-manager/zsh.nix | 9 +++++++--
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/home-manager/cli.nix b/makefu/2configs/home-manager/cli.nix
index 6b5d26111..5d5673b81 100644
--- a/makefu/2configs/home-manager/cli.nix
+++ b/makefu/2configs/home-manager/cli.nix
@@ -1,15 +1,6 @@
 {pkgs, ... }: {
   imports = [ ./zsh.nix ];
   home-manager.users.makefu = {
-    services.gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 900;
-      maxCacheTtl = 7200;
-      defaultCacheTtlSsh = 3600;
-      maxCacheTtlSsh = 86400;
-      enableSshSupport = true;
-      enableScDaemon = true;
-    };
     programs.direnv = {
       stdlib = ''
 use_nix() {
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 1f4ceea6c..f972e98b4 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -1,5 +1,12 @@
 { pkgs, ... }:
 {
+  programs = {
+    ssh.startAgent = false;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
   imports = [
     { #direnv
       home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
@@ -54,8 +61,6 @@
         setopt HIST_IGNORE_SPACE
         setopt HIST_FIND_NO_DUPS
 
-        unset SSH_AGENT_PID
-        export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
         compdef _pass brain
         zstyle ':completion::complete:brain::' prefix "$HOME/brain"
         compdef _pass secrets
-- 
cgit v1.2.3


From 5b0d6c30d0bde6254d995a0c9b58b2ef70f16594 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 16:45:08 +0200
Subject: ma minimal: consoleKeyMap -> console.keyMap

---
 makefu/2configs/minimal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/minimal.nix b/makefu/2configs/minimal.nix
index ad4c128ec..78a9dcfa6 100644
--- a/makefu/2configs/minimal.nix
+++ b/makefu/2configs/minimal.nix
@@ -69,9 +69,9 @@
 
   # the only locale you will ever need
   i18n = {
-    consoleKeyMap = "us";
     defaultLocale = "en_US.UTF-8";
   };
+  console.keyMap = "us";
 
   # suppress chrome autit event messages
   security.audit.rules = [ "-a task,never" ];
-- 
cgit v1.2.3


From 5ccd86776ec41e479a1069bfe27a283241fcaafd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 23 Apr 2020 17:07:43 +0200
Subject: ma home-manager: bump, fix deprecations

---
 makefu/2configs/home-manager/desktop.nix | 1 -
 makefu/2configs/hw/bluetooth.nix         | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix
index 406f7f0d1..cf20af1b1 100644
--- a/makefu/2configs/home-manager/desktop.nix
+++ b/makefu/2configs/home-manager/desktop.nix
@@ -7,7 +7,6 @@
     programs.browserpass = { browsers = [ "firefox" ] ; enable = true; };
     programs.firefox = {
       enable = true;
-      enableIcedTea = true;
     };
     programs.obs-studio.enable = true;
     xdg.enable = true;
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
index e6a534b7b..411121556 100644
--- a/makefu/2configs/hw/bluetooth.nix
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -33,11 +33,7 @@
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = false;
-
-    extraConfig = ''
-      [general]
-      Enable=Source,Sink,Media,Socket
-    '';
+    config.general.Enable = "Source,Sink,Media,Socket";
   };
   services.dbus.packages = [ pkgs.blueman ];
 }
-- 
cgit v1.2.3


From f0f0bc51bf02b94894a5e64e1ea6e0536bdece92 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 2 May 2020 22:57:45 +0200
Subject: ma gum.r: enable etherpad via docker-container

---
 .../deployment/docker/etherpad.euer.krebsco.de.nix | 39 ++++++++++++++++++++++
 makefu/2configs/deployment/docker/template.md      | 34 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix
 create mode 100644 makefu/2configs/deployment/docker/template.md

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix
new file mode 100644
index 000000000..a01f924e7
--- /dev/null
+++ b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix
@@ -0,0 +1,39 @@
+{ lib, ... }:
+let
+  port = 19201;
+in {
+  #services.nginx.virtualHosts."euer.krebsco.de".serverAliases = [ "etherpad.euer.krebsco.de" ];
+  services.nginx.virtualHosts."etherpad.euer.krebsco.de" = {
+    # useACMEHost = "euer.krebsco.de";
+    enableACME = true;
+    forceSSL = true;
+    locations."/".proxyPass = "http://localhost:${toString port}";
+  };
+  docker-containers."etherpad-lite" = {
+    image = "makefoo/bgt-etherpad:2020-05-02.5";
+    ports = [ "127.0.0.1:${toString port}:9001" ];
+    volumes = [
+      "/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt"
+      "etherpad_data:/opt/etherpad-lite/var" # persistent dirtydb
+    ];
+  # for postgres
+  #DB_TYPE=postgres
+  #DB_HOST=db.local
+  #DB_PORT=4321
+  #DB_NAME=etherpad
+  #DB_USER=dbusername
+  #DB_PASS=mypassword
+    environment = {
+      # ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort";
+      SUPPRESS_ERRORS_IN_PAD_TEXT = "true";
+      TITLE = "Binärgewitter Etherpad";
+      SKIN_NAME = "no-skin";
+      DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md);
+      PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
+      PAD_OPTIONS_USER_NAME = "true";
+      PAD_OPTIONS_USER_COLOR = "true";
+      PAD_OPTIONS_CHAT_AND_USERS = "true";
+      PAD_OPTIONS_LANG = "en-US";
+    };
+  };
+}
diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md
new file mode 100644
index 000000000..6cf20b1f5
--- /dev/null
+++ b/makefu/2configs/deployment/docker/template.md
@@ -0,0 +1,34 @@
+# BGT<NUMBER>
+
+1. studio-link aufnehmen drücken (wichtig)
+  - markus 6407eb63@studio-link.de
+  - Felix1 1f1021b2@studio-link.de
+  - L33tFelix 4d47a82a@studio-link.de
+  - Ingo  03b33b4a@studio-link.de
+2. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig)
+3. obs starten und aufnehmen drücken (eher unwichtig)
+4. darkice starten (wichtig)
+4. klatschen
+5. Hallo und herzlich Willkommen
+
+### Backlog von Picks und Lesefoo aus der letzten Woche
+
+
+
+## Blast from the Past
+
+## Vorschläge
+
+## Toter der Woche
+
+## Untoter der Woche
+
+## News
+
+## Themen
+
+## Mimimi der Woche
+
+## Lesefoo
+
+## Picks
-- 
cgit v1.2.3


From f58fd301fd4e60b9d43d04b9a86cb857cc786c92 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 2 May 2020 23:09:54 +0200
Subject: ma gecloudpad: use config parameters to set baseurl

---
 makefu/2configs/deployment/gecloudpad/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/gecloudpad/default.nix b/makefu/2configs/deployment/gecloudpad/default.nix
index e13ec6ae6..8b88626a3 100644
--- a/makefu/2configs/deployment/gecloudpad/default.nix
+++ b/makefu/2configs/deployment/gecloudpad/default.nix
@@ -4,12 +4,14 @@ let
   wsgi-sock = "${workdir}/uwsgi-gecloudpad.sock";
   workdir = config.services.uwsgi.runDir;
   gecloudpad = pkgs.python3Packages.callPackage ./gecloudpad.nix {};
+  gecloudpad_settings = pkgs.writeText "gecloudpad_settings" ''
+    BASEURL = "https://etherpad.euer.krebsco.de"
+  '';
 in {
 
   services.uwsgi = {
     enable = true;
     user = "nginx";
-    # runDir = "/var/lib/photostore";
     plugins = [ "python3" ];
     instance = {
       type = "emperor";
@@ -18,6 +20,7 @@ in {
           type = "normal";
           pythonPackages = self: with self; [ gecloudpad ];
           socket = wsgi-sock;
+          env = ["GECLOUDPAD_SETTINGS=${gecloudpad_settings}"];
         };
       };
     };
-- 
cgit v1.2.3


From ab0906f7aab8a49186e64c4942a516686a132558 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 2 May 2020 23:16:26 +0200
Subject: ma etherpad: update template

---
 makefu/2configs/deployment/docker/template.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md
index 6cf20b1f5..a26b2f042 100644
--- a/makefu/2configs/deployment/docker/template.md
+++ b/makefu/2configs/deployment/docker/template.md
@@ -11,14 +11,13 @@
 4. klatschen
 5. Hallo und herzlich Willkommen
 
+## Vorschläge
 ### Backlog von Picks und Lesefoo aus der letzten Woche
 
-
+---
 
 ## Blast from the Past
 
-## Vorschläge
-
 ## Toter der Woche
 
 ## Untoter der Woche
-- 
cgit v1.2.3


From 84172b9484e3e0544cc9b9e0cd7455bb23d8259c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 May 2020 10:57:25 +0200
Subject: ma ham/androidtv: bump dependency from 0.0.37 to 0.0.38

---
 makefu/2configs/ham/androidtv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix
index b7d397db4..9899b2dd3 100644
--- a/makefu/2configs/ham/androidtv/default.nix
+++ b/makefu/2configs/ham/androidtv/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "androidtv";
-  version = "0.0.38";
+  version = "0.0.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k";
+    sha256 = "06lrjj74g2f3pkhsn3c8h13mkykgqqf4g9q6x5yv23z6ghjnk2dz";
   };
 
   propagatedBuildInputs = [
-- 
cgit v1.2.3


From 6eb00a342fc674b698ed0296391364e773113cfd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 May 2020 10:58:00 +0200
Subject: ma home-assistant: requires empty config to start up ui

---
 makefu/2configs/bureautomation/default.nix | 1 +
 makefu/2configs/ham/default.nix            | 1 +
 2 files changed, 2 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix
index 3c1659558..c115bcb6c 100644
--- a/makefu/2configs/bureautomation/default.nix
+++ b/makefu/2configs/bureautomation/default.nix
@@ -41,6 +41,7 @@ in {
     };
     autoExtraComponents = true;
     config = {
+      config = {};
       discovery = {};
       homeassistant = {
         name = "Bureautomation";
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index ddcf65b5a..2db4ad4de 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -35,6 +35,7 @@ in {
       ];
     };
     config = {
+      config = {};
       input_select = zigbee.input_select; # dict
       timer = zigbee.timer // kurzzeitwecker.timer; # dict
       homeassistant = {
-- 
cgit v1.2.3


From 2f244cf3a85c82a57d34b42e3aaf80162bdf65a7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 May 2020 10:58:53 +0200
Subject: ma zigbee2mqtt: start up after network is available

---
 makefu/2configs/ham/zigbee2mqtt/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/ham/zigbee2mqtt/default.nix b/makefu/2configs/ham/zigbee2mqtt/default.nix
index 7c55326f9..84d32c872 100644
--- a/makefu/2configs/ham/zigbee2mqtt/default.nix
+++ b/makefu/2configs/ham/zigbee2mqtt/default.nix
@@ -17,4 +17,5 @@
     volumes = ["/var/lib/zigbee2mqtt:/app/data"];
   };
   state = [ "/var/lib/zigbee2mqtt/configuration.yaml" "/var/lib/zigbee2mqtt/state.json" ];
+  systemd.services.docker-zigbee2mqtt.after = [ "home-assistant.service" "docker.service" "network-online.target" ];
 }
-- 
cgit v1.2.3


From 4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 May 2020 11:03:32 +0200
Subject: ma omo,x.r: disable ipv6 until studio-link issue is resolved

---
 makefu/2configs/legacy_only.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 makefu/2configs/legacy_only.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/legacy_only.nix b/makefu/2configs/legacy_only.nix
new file mode 100644
index 000000000..3d40471ba
--- /dev/null
+++ b/makefu/2configs/legacy_only.nix
@@ -0,0 +1,8 @@
+{ networking.enableIPv6 = false;
+  boot.kernel.sysctl = {
+    "net.ipv6.conf.all.disable_ipv6" = 1;
+    "net.ipv6.conf.default.disable_ipv6" = 1;
+    "net.ipv6.conf.lo.disable_ipv6" = 1;
+  };
+  boot.kernelParams = [ "ipv6.disable=1" ];
+}
-- 
cgit v1.2.3