Merge remote-tracking branch 'gum/master' into HEAD

7 files changed, 102 insertions, 19 deletions

diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index 9d0c7af61..32dedbde2 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -26,7 +26,8 @@ in {
       # <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
       # <stockholm/makefu/2configs/audio/realtime-audio.nix>
       # <stockholm/makefu/2configs/vncserver.nix>
-      <stockholm/makefu/2configs/logging/server.nix>
+      ## no need for dns logs anymore
+      # <stockholm/makefu/2configs/logging/server.nix>
 
       # Services
       # <stockholm/makefu/2configs/hydra/stockholm.nix>
@@ -48,6 +49,7 @@ in {
 
       <stockholm/makefu/2configs/bureautomation> # new hass entry point
       <stockholm/makefu/2configs/bureautomation/led-fader.nix>
+      <stockholm/makefu/2configs/bureautomation/kalauerbot.nix>
       # <stockholm/makefu/2configs/bureautomation/visitor-photostore.nix>
       # <stockholm/makefu/2configs/bureautomation/mpd.nix> #mpd is only used for TTS, this is the web interface
       <stockholm/makefu/2configs/mqtt.nix>
diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md
index a26b2f042..690ce236e 100644
--- a/makefu/2configs/deployment/docker/template.md
+++ b/makefu/2configs/deployment/docker/template.md
@@ -1,15 +1,20 @@
 # 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
+1. studio-link aufnehmen drücken, schauen ob file größer wird (wichtig)
+  - markus      6407eb63@studio-link.de
+  - Felix1      1f1021b2@studio-link.de
+  - L33tFelix   842f85eb@studio-link.de
+  - Ingo        03b33b4a@studio-link.de
 2. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig)
+  * alternativ:
+    `$ pacmd list-sources | grep -e device.string -e 'name:' # keins der "monitor" devices`
+    `$ parecord --channels=1 -d alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo bgt.wav`
 3. obs starten und aufnehmen drücken (eher unwichtig)
-4. darkice starten (wichtig)
-4. klatschen
-5. Hallo und herzlich Willkommen
+5. darkice starten (wichtig)
+6. klatschen
+7. Hallihallo und Herzlich Willkommen
+8. chapter-marker starten mit ctrl-u auf "H" von "Halli" (wichtig)
+9. Blast markieren und ctrl-j drücken für neuen Eintrag
 
 ## Vorschläge
 ### Backlog von Picks und Lesefoo aus der letzten Woche
@@ -31,3 +36,5 @@
 ## Lesefoo
 
 ## Picks
+
+## Ende
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 276ed6cdc..2acdcf69c 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -13,8 +13,7 @@
     gi
     flashrom
     mosquitto
-    nodemcu-uploader
-    esptool
+    esphome
     # nix related
     nix-index
     nix-review
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index d96b61ad6..86b401cfa 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -376,6 +376,12 @@ globalkeys = awful.util.table.join(
     awful.key({ }, "XF86AudioMute", function ()
         awful.util.spawn("@alsaUtils@/bin/amixer -q -D default sset Master toggle", false) end),
 
+    -- chapter-marker
+    awful.key({ "Control" }, "u", function () awful.spawn("@chaptermarker@/bin/chapter-start") end,
+              {description = "start the chapter marker",}),
+    awful.key({ "Control" }, "j", function () awful.spawn("@chaptermarker@/bin/chapter-mark") end,
+              {description = "create a chapter mark",}),
+
     -- Prompt
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
@@ -492,9 +498,16 @@ awful.rules.rules = {
       properties = { floating = true } },
     --{ rule = { class = "gimp" },
     --  properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { tag = tags[1][2] } },
+    { rule = { class = "Firefox" },
+       properties = { tag = tags[3] } },
+    { rule = { class = "signal-desktop" },
+       properties = { tag = tags[4] } },
+    { rule = { class = "telegram-desktop" },
+       properties = { tag = tags[4] } },
+    { rule = { class = "mutt" },
+       properties = { tag = tags[5] } },
+    { rule = { class = "mosh" },
+       properties = { tag = tags[2] } },
 }
 -- }}}
 
@@ -569,7 +582,7 @@ local os = {
 
 -- {{{ autostart
 do
-  awful.spawn("urxvt", { tag = tags[1] }) -- dev shell
+  -- awful.spawn("urxvt", { tag = tags[1] }) -- dev shell
   awful.spawn("urxvt -e mosh makefu@gum.i", { tag = tags[2] })
   awful.spawn("firefox", { tag = tags[3] })
   awful.spawn("telegram-desktop", { tag = tags[4] })
diff --git a/makefu/5pkgs/chapter-marker/default.nix b/makefu/5pkgs/chapter-marker/default.nix
index fe3e48142..5ffb63ae9 100644
--- a/makefu/5pkgs/chapter-marker/default.nix
+++ b/makefu/5pkgs/chapter-marker/default.nix
@@ -1,4 +1,4 @@
-{ coreutils, fetchFromGitHub, makeWrapper, xdotool, stdenv, ... }:
+{ coreutils, fetchFromGitHub, makeWrapper, xclip, libnotify, stdenv, ... }:
 
 stdenv.mkDerivation rec {
   name = "chapter-marker-${version}";
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "makefu";
     repo = "chapter-marker";
-    rev = "7602b611fb3d67fdb8a86db23220074dfa9dfa1e";
-    sha256 = "0cwh650c3qhdrcvrqfzgrwpsnj4lbq64fw2sfwvnbxz94b4q36av";
+    rev = "71b9bb8bc4d6fa87de6bea8f42d5486d05cf5443";
+    sha256 = "13cvk24pwwyv9i21h57690s5niwkcrcvn8l24zfxwbgq0wwzw38x";
   };
 
   buildInputs = [ makeWrapper ];
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     let
       path = stdenv.lib.makeBinPath [
         coreutils
-        xdotool
+        libnotify
+        xclip
       ];
     in
     ''
diff --git a/makefu/5pkgs/nsrenamer/default.nix b/makefu/5pkgs/nsrenamer/default.nix
new file mode 100644
index 000000000..16b9a4f20
--- /dev/null
+++ b/makefu/5pkgs/nsrenamer/default.nix
@@ -0,0 +1,3 @@
+{ pkgs,... }:
+# TODO: dependencies: coreutils, nx_game_info,
+pkgs.writeScriptBin "nsrenamer" (builtins.readFile ./nsrenamer.sh)
diff --git a/makefu/5pkgs/nsrenamer/nsrenamer.sh b/makefu/5pkgs/nsrenamer/nsrenamer.sh
new file mode 100755
index 000000000..16aec3113
--- /dev/null
+++ b/makefu/5pkgs/nsrenamer/nsrenamer.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+set -euf
+indir=$(dirname "$1")
+inname=$(basename "$1")
+out=$(nxgameinfo_cli "$1")
+ext=${1##*.}
+id=$(awk -F: '/├ Title ID:/{print $2}' <<<"$out" |xargs)
+baseid=$(awk -F: '/Base Title ID:/{print $2}' <<<"$out" |xargs)
+version=$(awk -F: '/├ Version:/{print $2}' <<<"$out" |xargs)
+name=$(awk -F: '/Title Name/{print $2}' <<<"$out" | sed "s/[:']//g" | xargs )
+type=$(awk -F: '/Type:/{print $2}' <<<"$out" | xargs)
+
+! test -n "$id" && echo "Title ID cannot be empty!" && exit 1
+! test -n "$type" && echo "type cannot be empty!" && exit 1
+
+if test "$type" == Base;then
+  ! test -n "$name" && echo "Title Name cannot be empty!" && exit 1
+  NAME="$name [$id][v$version].$ext"
+elif test "$type" == Update;then
+  ! test -n "$name" && echo "Title Name cannot be empty!" && exit 1
+  ! test -n "$version" && echo "Version cannot be empty!" && exit 1
+  NAME="$name [UPD][$id][v$version].$ext"
+elif test "$type" == DLC;then
+  dlcname=$(jq -r --arg id "$id" '.[$id].name' < ~/.switch/titles.US.en.json | sed "s/[:']//g")
+  if test -n "$dlcname" ;then
+    NAME="$dlcname [DLC][$id][v$version].$ext"
+  else
+    ! test -n "$name" && echo "dlcname cannot be found in titles.US.en.json and $name is empty!" && exit 1
+    NAME="$dlcname [DLC][$id][v$version].$ext"
+  fi
+else
+  echo "unknown type '$type'"
+  exit 1
+fi
+newname=$indir/$NAME
+
+if test "$NAME" == "${inname}";then
+  echo "name didn't change,doing nothing"
+  exit 0
+fi
+if test -e "$newname" ;then
+  echo "'$NAME' already exists, will not override"
+  exit 1
+fi
+
+if test -n "${FORCE:-}" ;then
+  CONFIRM=y
+else
+  read -p "rename '$inname' to '$NAME' - [y/N]" CONFIRM
+fi
+
+if test -n "${FORCE:-}" -o "$CONFIRM" == "y" -o "$CONFIRM" == "Y";then
+  mv -nv "$1" "$newname"
+else
+  echo "bailing out"
+  exit 1
+fi
+