From 4a0e27488e80935719f3dc41a1c337f94068e450 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 2 Feb 2023 19:27:00 +0100
Subject: l mail: remove empty newlines

---
 lass/2configs/mail.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index f5b2e22b7..85259176b 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -92,8 +92,6 @@ let
 
   tag-new-mails = pkgs.writeDashBin "nm-tag-init" ''
     ${pkgs.notmuch}/bin/notmuch new
-    ${lib.concatMapStringsSep "\n" (i: ''
-    '') (lib.mapAttrsToList lib.nameValuePair mailboxes)}
     ${lib.concatMapStringsSep "\n" (i: ''
       mkdir -p "$HOME/Maildir/.${i.name}/cur"
       for mail in $(${pkgs.notmuch}/bin/notmuch search --output=files 'tag:inbox and (${lib.concatMapStringsSep " or " (f: "${f}") i.value})'); do
-- 
cgit v1.2.3


From b3ccfd3a789e59f16d2e1ef616cc23e89bab1598 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 2 Feb 2023 19:27:13 +0100
Subject: l mail: retry muchsync until success

---
 lass/2configs/mail.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 85259176b..0adef8f8c 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -184,7 +184,9 @@ let
     "<enter-command>unset wait_key<enter> \
     <shell-escape>${pkgs.writeDash "muchsync" ''
       set -efu
-      ${pkgs.muchsync}/bin/muchsync -F lass@green.r
+      until ${pkgs.muchsync}/bin/muchsync -F lass@green.r; do
+        sleep 1
+      done
     ''}<enter> \
     'run muchsync to green.r'
 
-- 
cgit v1.2.3


From 2fa9f8601ed3f5c81316b9b780a03d414b4de9b3 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 3 Feb 2023 13:25:44 +0100
Subject: l baseX: flameshot-once -> flameshot

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

(limited to 'lass/2configs')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index efd6c8a24..79777429a 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -91,11 +91,11 @@ in {
     xorg.xhost
     xsel
     zathura
-    flameshot-once
+    flameshot
     (pkgs.writeDashBin "screenshot" ''
       set -efu
 
-      ${pkgs.flameshot-once}/bin/flameshot-once
+      ${pkgs.flameshot}/bin/flameshot gui
       ${pkgs.klem}/bin/klem
     '')
   ];
-- 
cgit v1.2.3


From 55d3bb391f32f1abe27f1e0f58a8baac82b703cc Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 4 Feb 2023 18:46:51 +0100
Subject: l jitsi: more configs for bigger groups

---
 lass/2configs/jitsi.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/jitsi.nix b/lass/2configs/jitsi.nix
index fa41f6634..2c148dcdd 100644
--- a/lass/2configs/jitsi.nix
+++ b/lass/2configs/jitsi.nix
@@ -8,6 +8,16 @@
       enableWelcomePage = true;
       requireDisplayName = true;
       analytics.disabled = true;
+      startAudioOnly = true;
+      channelLastN = 4;
+      stunServers = [
+        # - https://www.kuketz-blog.de/jitsi-meet-server-einstellungen-fuer-einen-datenschutzfreundlichen-betrieb/
+        { urls = "turn:turn.matrix.org:3478?transport=udp"; }
+        { urls = "turn:turn.matrix.org:3478?transport=tcp"; }
+        # - services.coturn:
+        #{ urls = "turn:turn.${domainName}:3479?transport=udp"; }
+        #{ urls = "turn:turn.${domainName}:3479?transport=tcp"; }
+      ];
     };
     interfaceConfig = {
       SHOW_JITSI_WATERMARK = false;
@@ -17,6 +27,10 @@
     };
   };
 
+  services.jitsi-videobridge.config = {
+    org.jitsi.videobridge.TRUST_BWE = false;
+  };
+
   krebs.iptables.tables.filter.INPUT.rules = [
     { predicate = "-p tcp --dport 4443"; target = "ACCEPT"; }
     { predicate = "-p udp --dport 10000"; target = "ACCEPT"; }
-- 
cgit v1.2.3


From 6c982d0487ae438b3766a6cf8a9c96fa2a2398a4 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Mon, 6 Feb 2023 12:48:11 +0100
Subject: l print: enable avahi

---
 lass/2configs/print.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/print.nix b/lass/2configs/print.nix
index c2b3e8377..5769f9b15 100644
--- a/lass/2configs/print.nix
+++ b/lass/2configs/print.nix
@@ -6,5 +6,19 @@
       pkgs.foomatic-filters
       pkgs.gutenprint
     ];
+    browsing = true;
+    browsedConf = ''
+      BrowseDNSSDSubTypes _cups,_print
+      BrowseLocalProtocols all
+      BrowseRemoteProtocols all
+      CreateIPPPrinterQueues All
+
+      BrowseProtocols all
+    '';
+  };
+  services.avahi = {
+    enable = true;
+    openFirewall = true;
+    nssmdns = true;
   };
 }
-- 
cgit v1.2.3


From 9e059195325e61e38a31a7905b1fe08656f49aba Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 16 Feb 2023 13:58:33 +0100
Subject: l mumble-reminder: move to 17:00

---
 lass/2configs/mumble-reminder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/mumble-reminder.nix b/lass/2configs/mumble-reminder.nix
index fe75a96a6..c4cc60dc5 100644
--- a/lass/2configs/mumble-reminder.nix
+++ b/lass/2configs/mumble-reminder.nix
@@ -23,7 +23,7 @@
     Kois
     Faulaffen
     Schraubenziegen
-    Nachtigalle
+    Nachtigallen
     Okapis
     Stachelschweine
     Kurzschwanzkängurus
@@ -49,7 +49,7 @@
           pattern = "^nerv nicht$";
           activate = "match";
           command = {
-            filename = pkgs.writeDash "add_remind" ''
+            filename = pkgs.writeDash "del_remind" ''
               ${pkgs.gnused}/bin/sed -i "/$_from/d" /var/lib/reaktor2-mumble-reminder/users
               echo "okok, Ich werde $_from nich mehr errinern"
             '';
@@ -80,7 +80,7 @@ in {
   };
   systemd.services.mumble-reminder-nixos = {
     description = "weekly reminder for nixos mumble";
-    startAt = "Thu *-*-* 19:00:00 Europe/Berlin";
+    startAt = "Thu *-*-* 17:00:00 Europe/Berlin";
     serviceConfig = {
       ExecStart = pkgs.writers.writeDash "mumble_reminder" ''
         animals='
-- 
cgit v1.2.3


From 92cfeace5435e09b203a1e4f91eee28bd5d198ce Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 19 Feb 2023 10:01:55 +0100
Subject: l aergia.r: add antimicrox for gamepad mouse mode

---
 lass/2configs/antimicrox/default.nix |  33 +++++
 lass/2configs/antimicrox/empty.amgp  |  20 +++
 lass/2configs/antimicrox/mouse.amgp  | 272 +++++++++++++++++++++++++++++++++++
 lass/2configs/xmonad.nix             |   6 +-
 4 files changed, 328 insertions(+), 3 deletions(-)
 create mode 100644 lass/2configs/antimicrox/default.nix
 create mode 100644 lass/2configs/antimicrox/empty.amgp
 create mode 100644 lass/2configs/antimicrox/mouse.amgp

(limited to 'lass/2configs')

diff --git a/lass/2configs/antimicrox/default.nix b/lass/2configs/antimicrox/default.nix
new file mode 100644
index 000000000..16f546ce6
--- /dev/null
+++ b/lass/2configs/antimicrox/default.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+{
+  systemd.services.antimicrox = {
+    wantedBy = [ "multi-user.target" ];
+    environment = {
+      DISPLAY = ":0";
+    };
+    serviceConfig = {
+      User = config.users.users.mainUser.name;
+      ExecStartPre = lib.singleton (pkgs.writeDash "init_state" "echo 0 > /tmp/gamepad.state");
+      ExecStart = "${pkgs.antimicrox}/bin/antimicrox --no-tray --hidden --profile ${./mouse.amgp}";
+    };
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "gamepad_mouse_disable" ''
+      echo 1 > /tmp/gamepad.state
+      ${pkgs.antimicrox}/bin/antimicrox --profile ${./empty.amgp}
+    '')
+    (pkgs.writers.writeDashBin "gamepad_mouse_enable" ''
+      echo 0 > /tmp/gamepad.state
+      ${pkgs.antimicrox}/bin/antimicrox --profile ${./mouse.amgp}
+    '')
+    (pkgs.writers.writeDashBin "gamepad_mouse_toggle" ''
+      state=$(${pkgs.coreutils}/bin/cat /tmp/gamepad.state)
+      if [ "$state" = 1 ]; then
+        /run/current-system/sw/bin/gamepad_mouse_enable
+      else
+        /run/current-system/sw/bin/gamepad_mouse_disable
+      fi
+    '')
+  ];
+}
diff --git a/lass/2configs/antimicrox/empty.amgp b/lass/2configs/antimicrox/empty.amgp
new file mode 100644
index 000000000..0257bfe71
--- /dev/null
+++ b/lass/2configs/antimicrox/empty.amgp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gamecontroller configversion="19" appversion="3.3.2">
+    <!--The SDL name for a joystick is included for informational purposes only.-->
+    <sdlname>XInput Controller</sdlname>
+    <!--The Unique ID for a joystick is included for informational purposes only.-->
+    <uniqueID>030000005e0400008e020000010100001118654</uniqueID>
+    <stickAxisAssociation index="2" xAxis="3" yAxis="4"/>
+    <stickAxisAssociation index="1" xAxis="1" yAxis="2"/>
+    <vdpadButtonAssociations index="1">
+        <vdpadButtonAssociation axis="0" button="12" direction="1"/>
+        <vdpadButtonAssociation axis="0" button="13" direction="4"/>
+        <vdpadButtonAssociation axis="0" button="14" direction="8"/>
+        <vdpadButtonAssociation axis="0" button="15" direction="2"/>
+    </vdpadButtonAssociations>
+    <names>
+        <controlstickname index="2">R Stick</controlstickname>
+        <controlstickname index="1">L Stick</controlstickname>
+    </names>
+    <sets/>
+</gamecontroller>
diff --git a/lass/2configs/antimicrox/mouse.amgp b/lass/2configs/antimicrox/mouse.amgp
new file mode 100644
index 000000000..313e598de
--- /dev/null
+++ b/lass/2configs/antimicrox/mouse.amgp
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gamecontroller configversion="19" appversion="3.3.2">
+    <!--The SDL name for a joystick is included for informational purposes only.-->
+    <sdlname>XInput Controller</sdlname>
+    <!--The Unique ID for a joystick is included for informational purposes only.-->
+    <uniqueID>030000005e0400008e020000010100001118654</uniqueID>
+    <stickAxisAssociation index="2" xAxis="3" yAxis="4"/>
+    <stickAxisAssociation index="1" xAxis="1" yAxis="2"/>
+    <vdpadButtonAssociations index="1">
+        <vdpadButtonAssociation axis="0" button="12" direction="1"/>
+        <vdpadButtonAssociation axis="0" button="13" direction="4"/>
+        <vdpadButtonAssociation axis="0" button="14" direction="8"/>
+        <vdpadButtonAssociation axis="0" button="15" direction="2"/>
+    </vdpadButtonAssociations>
+    <names>
+        <controlstickname index="2">Stick 2</controlstickname>
+        <controlstickname index="1">Stick 1</controlstickname>
+    </names>
+    <sets>
+        <set index="1">
+            <stick index="2">
+                <deadZone>1</deadZone>
+                <maxZone>29501</maxZone>
+                <modifierZone>1412</modifierZone>
+                <diagonalRange>90</diagonalRange>
+                <stickbutton index="7">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                    <accelerationmultiplier>4</accelerationmultiplier>
+                    <startaccelmultiplier>20</startaccelmultiplier>
+                    <minaccelthreshold>3</minaccelthreshold>
+                    <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
+                    <slots>
+                        <slot>
+                            <code>3</code>
+                            <mode>mousemovement</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="6">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                </stickbutton>
+                <stickbutton index="5">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                    <accelerationmultiplier>4</accelerationmultiplier>
+                    <startaccelmultiplier>20</startaccelmultiplier>
+                    <minaccelthreshold>3</minaccelthreshold>
+                    <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
+                    <slots>
+                        <slot>
+                            <code>2</code>
+                            <mode>mousemovement</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="4">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                </stickbutton>
+                <stickbutton index="3">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                    <accelerationmultiplier>4</accelerationmultiplier>
+                    <startaccelmultiplier>20</startaccelmultiplier>
+                    <minaccelthreshold>3</minaccelthreshold>
+                    <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
+                    <slots>
+                        <slot>
+                            <code>4</code>
+                            <mode>mousemovement</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="2">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                </stickbutton>
+                <stickbutton index="1">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                    <accelerationmultiplier>4</accelerationmultiplier>
+                    <startaccelmultiplier>20</startaccelmultiplier>
+                    <minaccelthreshold>3</minaccelthreshold>
+                    <extraaccelerationcurve>easeoutquad</extraaccelerationcurve>
+                    <slots>
+                        <slot>
+                            <code>1</code>
+                            <mode>mousemovement</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="8">
+                    <mousespeedx>74</mousespeedx>
+                    <mousespeedy>74</mousespeedy>
+                </stickbutton>
+            </stick>
+            <stick index="1">
+                <deadZone>2578</deadZone>
+                <maxZone>30799</maxZone>
+                <stickbutton index="7">
+                    <mouseacceleration>linear</mouseacceleration>
+                    <slots>
+                        <slot>
+                            <code>6</code>
+                            <mode>mousebutton</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="6">
+                    <mouseacceleration>linear</mouseacceleration>
+                </stickbutton>
+                <stickbutton index="5">
+                    <mouseacceleration>linear</mouseacceleration>
+                    <slots>
+                        <slot>
+                            <code>5</code>
+                            <mode>mousebutton</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="4">
+                    <mouseacceleration>linear</mouseacceleration>
+                </stickbutton>
+                <stickbutton index="3">
+                    <mouseacceleration>linear</mouseacceleration>
+                    <slots>
+                        <slot>
+                            <code>7</code>
+                            <mode>mousebutton</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="2">
+                    <mouseacceleration>linear</mouseacceleration>
+                </stickbutton>
+                <stickbutton index="1">
+                    <mouseacceleration>linear</mouseacceleration>
+                    <slots>
+                        <slot>
+                            <code>4</code>
+                            <mode>mousebutton</mode>
+                        </slot>
+                    </slots>
+                </stickbutton>
+                <stickbutton index="8">
+                    <mouseacceleration>linear</mouseacceleration>
+                </stickbutton>
+            </stick>
+            <dpad index="1">
+                <dpadbutton index="6">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                </dpadbutton>
+                <dpadbutton index="4">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                    <slots>
+                        <slot>
+                            <code>0x1000017</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+                <dpadbutton index="3">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                </dpadbutton>
+                <dpadbutton index="2">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                    <slots>
+                        <slot>
+                            <code>0x1000011</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+                <dpadbutton index="1">
+                    <wheelspeedx>10</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                    <slots>
+                        <slot>
+                            <code>0x1000016</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+                <dpadbutton index="12">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                </dpadbutton>
+                <dpadbutton index="9">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                </dpadbutton>
+                <dpadbutton index="8">
+                    <wheelspeedx>2</wheelspeedx>
+                    <wheelspeedy>10</wheelspeedy>
+                    <slots>
+                        <slot>
+                            <code>0x1000010</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+            </dpad>
+            <trigger index="6">
+                <deadZone>2000</deadZone>
+                <throttle>positivehalf</throttle>
+                <triggerbutton index="1">
+                    <mousespeedx>100</mousespeedx>
+                    <mousespeedy>100</mousespeedy>
+                </triggerbutton>
+                <triggerbutton index="2">
+                    <mousespeedx>100</mousespeedx>
+                    <mousespeedy>100</mousespeedy>
+                    <slots>
+                        <slot>
+                            <code>250</code>
+                            <mode>mousespeedmod</mode>
+                        </slot>
+                    </slots>
+                </triggerbutton>
+            </trigger>
+            <trigger index="5">
+                <throttle>positivehalf</throttle>
+            </trigger>
+            <button index="11">
+                <slots>
+                    <slot>
+                        <code>1</code>
+                        <mode>mousebutton</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="5">
+                <slots>
+                    <slot>
+                        <code>1</code>
+                        <mode>mousebutton</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="3">
+                <slots>
+                    <slot>
+                        <code>2</code>
+                        <mode>mousebutton</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="2">
+                <slots>
+                    <slot>
+                        <code>3</code>
+                        <mode>mousebutton</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="1">
+                <slots>
+                    <slot>
+                        <code>1</code>
+                        <mode>mousebutton</mode>
+                    </slot>
+                </slots>
+            </button>
+        </set>
+    </sets>
+</gamecontroller>
diff --git a/lass/2configs/xmonad.nix b/lass/2configs/xmonad.nix
index b506e026d..1789725d1 100644
--- a/lass/2configs/xmonad.nix
+++ b/lass/2configs/xmonad.nix
@@ -159,14 +159,14 @@ myKeyMap =
       ${pkgs.clipmenu}/bin/clipmenu
     ''}")
 
-    , ("M4-<F2>", windows copyToAll)
-
-    , ("M4-<F4>", spawn "${pkgs.nm-dmenu}/bin/nm-dmenu")
     , ("M4-<Insert>", spawn "${pkgs.writeDash "paste" ''
       ${pkgs.coreutils}/bin/sleep 0.4
       ${pkgs.xclip}/bin/xclip -o | ${pkgs.xdotool}/bin/xdotool type -f -
     ''}")
 
+    , ("M4-<F1>", spawn "/run/current-system/sw/bin/gamepad_mouse_toggle")
+    , ("M4-<F2>", windows copyToAll)
+    , ("M4-<F4>", spawn "${pkgs.nm-dmenu}/bin/nm-dmenu")
     , ("M4-<F5>", spawn "${pkgs.acpilight}/bin/xbacklight -set 1")
     , ("M4-<F6>", spawn "${pkgs.acpilight}/bin/xbacklight -set 10")
     , ("M4-<F7>", spawn "${pkgs.acpilight}/bin/xbacklight -set 33")
-- 
cgit v1.2.3


From 0ea072393307e5cd250b412dd0026bf8f6f1251b Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 21 Feb 2023 07:35:27 +0100
Subject: l browsers: use firefox directly, RIP xjails

---
 lass/2configs/browsers.nix | 14 +++++---------
 lass/2configs/xdg-open.nix | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 00a5d2db0..ea6fb644b 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -1,12 +1,8 @@
 { config, lib, pkgs, ... }:
 {
-  lass.browser.config = {
-    cr = { groups = [ "audio" "video" ]; precedence = 9; };
-  };
-  programs.chromium = {
-    enable = true;
-    extensions = [
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-    ];
-  };
+  programs.firefox.nativeMessagingHosts.tridactyl = true;
+  environment.variables.BROWSER = "${pkgs.firefox}/bin/firefox";
+  environment.systemPackages = [
+    pkgs.firefox
+  ];
 }
diff --git a/lass/2configs/xdg-open.nix b/lass/2configs/xdg-open.nix
index 88ea7ba59..02c551a2b 100644
--- a/lass/2configs/xdg-open.nix
+++ b/lass/2configs/xdg-open.nix
@@ -1,12 +1,13 @@
 { config, pkgs, lib, ... }: with import <stockholm/lib>; let
 
   xdg-open-wrapper = pkgs.writeDashBin "xdg-open" ''
-    /run/wrappers/bin/sudo -u lass ${xdg-open} "$@"
+     exec ${xdg-open}/bin/xdg-open "$@" >> /tmp/xdg-debug.log 2>&1
   '';
 
-  xdg-open = pkgs.writeBash "xdg-open" ''
-    set -e
+  xdg-open = pkgs.writeBashBin "xdg-open" ''
+    set -xe
     FILE="$1"
+    PATH=/run/current-system/sw/bin
     mime=
 
     case "$FILE" in
@@ -35,15 +36,13 @@
 
     case "$mime" in
       special/mailaddress)
-        urxvtc --execute vim "$FILE" ;;
-      ${optionalString (hasAttr "browser" config.lass) ''
+        alacritty --execute vim "$FILE" ;;
       text/html)
-        ${config.lass.browser.select}/bin/browser-select "$FILE" ;;
+        firefox "$FILE" ;;
       text/xml)
-        ${config.lass.browser.select}/bin/browser-select "$FILE" ;;
-      ''}
+        firefox "$FILE" ;;
       text/*)
-        urxvtc --execute vim "$FILE" ;;
+        alacritty --execute vim "$FILE" ;;
       image/*)
         sxiv "$FILE" ;;
       application/x-bittorrent)
@@ -51,17 +50,18 @@
       application/pdf)
         zathura "$FILE" ;;
       inode/directory)
-        sudo -u lass -i urxvtc --execute mc "$FILE" ;;
+        alacritty --execute mc "$FILE" ;;
       *)
         # open dmenu and ask for program to open with
-        $(dmenu_path | dmenu) "$FILE";;
+        runner=$(print -rC1 -- ''${(ko)commands} | dmenu)
+        exec $runner "$FILE";;
     esac
   '';
 in {
   environment.systemPackages = [ xdg-open-wrapper ];
 
   security.sudo.extraConfig = ''
-    cr ALL=(lass) NOPASSWD: ${xdg-open} *
-    ff ALL=(lass) NOPASSWD: ${xdg-open} *
+    cr ALL=(lass) NOPASSWD: ${xdg-open}/bin/xdg-open *
+    ff ALL=(lass) NOPASSWD: ${xdg-open}/bin/xdg-open *
   '';
 }
-- 
cgit v1.2.3


From 5bab00f73d27a96f6ce319040b69e4d83a81e52a Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 21 Feb 2023 10:10:53 +0100
Subject: l radio: move to 2/services

---
 lass/2configs/radio/container-host.nix          |  23 --
 lass/2configs/radio/controls.html               |  83 ------
 lass/2configs/radio/default.nix                 | 328 ------------------------
 lass/2configs/radio/news.nix                    | 106 --------
 lass/2configs/radio/radio.liq                   | 112 --------
 lass/2configs/radio/shell.nix                   |   7 -
 lass/2configs/radio/weather.nix                 |  60 -----
 lass/2configs/radio/weather_for_ips.py          |  48 ----
 lass/2configs/services/radio/container-host.nix |  23 ++
 lass/2configs/services/radio/controls.html      |  83 ++++++
 lass/2configs/services/radio/default.nix        | 328 ++++++++++++++++++++++++
 lass/2configs/services/radio/news.nix           | 106 ++++++++
 lass/2configs/services/radio/radio.liq          | 112 ++++++++
 lass/2configs/services/radio/shell.nix          |   7 +
 lass/2configs/services/radio/weather.nix        |  60 +++++
 lass/2configs/services/radio/weather_for_ips.py |  48 ++++
 16 files changed, 767 insertions(+), 767 deletions(-)
 delete mode 100644 lass/2configs/radio/container-host.nix
 delete mode 100644 lass/2configs/radio/controls.html
 delete mode 100644 lass/2configs/radio/default.nix
 delete mode 100644 lass/2configs/radio/news.nix
 delete mode 100644 lass/2configs/radio/radio.liq
 delete mode 100644 lass/2configs/radio/shell.nix
 delete mode 100644 lass/2configs/radio/weather.nix
 delete mode 100644 lass/2configs/radio/weather_for_ips.py
 create mode 100644 lass/2configs/services/radio/container-host.nix
 create mode 100644 lass/2configs/services/radio/controls.html
 create mode 100644 lass/2configs/services/radio/default.nix
 create mode 100644 lass/2configs/services/radio/news.nix
 create mode 100644 lass/2configs/services/radio/radio.liq
 create mode 100644 lass/2configs/services/radio/shell.nix
 create mode 100644 lass/2configs/services/radio/weather.nix
 create mode 100644 lass/2configs/services/radio/weather_for_ips.py

(limited to 'lass/2configs')

diff --git a/lass/2configs/radio/container-host.nix b/lass/2configs/radio/container-host.nix
deleted file mode 100644
index de0ea9afe..000000000
--- a/lass/2configs/radio/container-host.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-{
-  krebs.sync-containers3.containers.radio = {
-    sshKey = "${toString <secrets>}/radio.sync.key";
-  };
-  containers.radio = {
-    bindMounts."/var/music" = {
-      hostPath = "/var/music";
-      isReadOnly = false;
-    };
-  };
-  krebs.iptables.tables.filter.INPUT.rules = [
-    { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
-  ];
-  krebs.htgen.radio-redirect = {
-    port = 8000;
-    scriptFile = pkgs.writers.writeDash "redir" ''
-      printf 'HTTP/1.1 301 Moved Permanently\r\n'
-      printf "Location: http://radio.lassul.us''${Request_URI}\r\n"
-      printf '\r\n'
-    '';
-  };
-}
diff --git a/lass/2configs/radio/controls.html b/lass/2configs/radio/controls.html
deleted file mode 100644
index 858dc3656..000000000
--- a/lass/2configs/radio/controls.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <title>The_Playlist Voting!</title>
-<style>
-#good {
-    display: block;
-  width: 100%;
-  border: none;
-  background-color: #04AA6D;
-  padding: 14px;
-  margin: 14px 0 0 0;
-  height: 100px;
-  font-size: 16px;
-  cursor: pointer;
-  text-align: center;
-}
-#bad {
-    display: block;
-  width: 100%;
-  border: none;
-  background-color: red;
-  padding: 14px;
-    height: 100px;
-
-  margin: 14px 0 0 0;
-  font-size: 16px;
-  cursor: pointer;
-  text-align: center;
-}
-</style>
-
-</head>
-
-<body>
-  <div id=votenote></div>
-  <button id=good type="button"> GUT </button>
-
-  <button id=bad type="button"> SCHLECHT </button>
-  <center>
-    Currently Running: <br/><div>
-      <b id=current></b>
-    </div>
-    <div id=vote>
-    </div>
-    <audio controls autoplay="autoplay">
-      <source src="https://radio.lassul.us/radio.ogg" type="audio/ogg">
-      Your browser does not support the audio element.
-    </audio>
-  </center>
-
-  <script>
-    document.getElementById("good").onclick=async ()=>{
-      let result = await fetch("https://radio.lassul.us/good", {"method": "POST"})
-      document.getElementById("vote").textContent =  "Dieses Lied findest du gut"
-    };
-    document.getElementById("bad").onclick=async ()=>{
-      let result = await fetch("https://radio.lassul.us/skip", {"method": "POST"})
-      document.getElementById("vote").textContent =  "Dieses Lied findest du schlecht"
-      document.getElementById("bad").disabled = true
-      window.setTimeout(function(){
-        document.getElementById("bad").disabled = false
-      }, 100000)
-
-    };
-
-    async function current() {
-      let result = await fetch("https://radio.lassul.us/current", {"method": "GET"})
-      let data = await result.json()
-      document.getElementById("current").textContent = data.name
-    }
-    window.onload = function() {
-      window.setInterval('current()', 10000)
-      current()
-    }
-
-  </script>
-</body>
-</html>
diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix
deleted file mode 100644
index a511196fd..000000000
--- a/lass/2configs/radio/default.nix
+++ /dev/null
@@ -1,328 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  name = "radio";
-
-  music_dir = "/var/music";
-
-  skip_track = pkgs.writers.writeBashBin "skip_track" ''
-    set -eu
-
-    # TODO come up with new rating, without moving files
-    # current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename)
-    # track_infos=$(${print_current}/bin/print_current)
-    # skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0)
-    # if [[ "$current_track" =~ .*/the_playlist/music/.* ]] && [ "$skip_count" -le 2 ]; then
-    #   skip_count=$((skip_count+1))
-    #   ${pkgs.attr}/bin/setfattr -n user.skip_count -v "$skip_count" "$current_track"
-    #   echo skipping: "$track_infos" skip_count: "$skip_count"
-    # else
-    #   mkdir -p "$music_dir"/the_playlist/.graveyard/
-    #   mv "$current_track" "$music_dir"/the_playlist/.graveyard/
-    #   echo killing: "$track_infos"
-    # fi
-    ${pkgs.curl}/bin/curl -fSs -X POST http://localhost:8002/skip |
-      ${pkgs.jq}/bin/jq -r '.filename'
-  '';
-
-  good_track = pkgs.writeBashBin "good_track" ''
-    set -eu
-
-    current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename)
-    track_infos=$(${print_current}/bin/print_current)
-    # TODO come up with new rating, without moving files
-    # if [[ "$current_track" =~ .*/the_playlist/music/.* ]]; then
-    #   ${pkgs.attr}/bin/setfattr -n user.skip_count -v 0 "$current_track"
-    # else
-    #   mv "$current_track" "$music_dir"/the_playlist/music/ || :
-    # fi
-    echo good: "$track_infos"
-  '';
-
-  print_current = pkgs.writeDashBin "print_current" ''
-    file=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current |
-      ${pkgs.jq}/bin/jq -r '.filename' |
-      ${pkgs.gnused}/bin/sed 's,^${music_dir},,'
-    )
-    link=$(${pkgs.curl}/bin/curl http://localhost:8002/current |
-      ${pkgs.jq}/bin/jq -r '.filename' |
-      ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@https://youtu.be/\1@'
-    )
-    echo "$file": "$link"
-  '';
-
-  set_irc_topic = pkgs.writeDash "set_irc_topic" ''
-    ${pkgs.curl}/bin/curl -fsS --unix-socket /home/radio/reaktor.sock http://z/ \
-      -H content-type:application/json \
-      -d "$(${pkgs.jq}/bin/jq -n \
-        --arg text "$1" '{
-          command:"TOPIC",
-          params:["#the_playlist",$text]
-        }'
-      )"
-  '';
-
-  write_to_irc = pkgs.writeDash "write_to_irc" ''
-    ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \
-      -H content-type:application/json \
-      -d "$(${pkgs.jq}/bin/jq -n \
-        --arg text "$1" '{
-          command:"PRIVMSG",
-          params:["#the_playlist",$text]
-        }'
-      )"
-  '';
-
-in {
-  imports = [
-    ./news.nix
-    ./weather.nix
-  ];
-
-  users.users = {
-    "${name}" = rec {
-      inherit name;
-      createHome = lib.mkForce false;
-      group = name;
-      uid = pkgs.stockholm.lib.genid_uint31 name;
-      description = "radio manager";
-      home = "/home/${name}";
-      useDefaultShell = true;
-      openssh.authorizedKeys.keys = with config.krebs.users; [
-        lass.pubkey
-      ];
-    };
-  };
-
-  users.groups = {
-    "radio" = {};
-  };
-
-  krebs.per-user.${name}.packages = with pkgs; [
-    good_track
-    skip_track
-    print_current
-  ];
-
-  services.liquidsoap.streams.radio = ./radio.liq;
-  systemd.services.radio = {
-    environment = {
-      RADIO_PORT = "8002";
-      HOOK_TRACK_CHANGE = pkgs.writers.writeDash "on_change" ''
-        set -xefu
-        LIMIT=1000 #how many tracks to keep in the history
-        HISTORY_FILE=/var/lib/radio/recent
-
-        listeners=$(${pkgs.curl}/bin/curl -fSs http://localhost:8000/status-json.xsl |
-          ${pkgs.jq}/bin/jq '[.icestats.source[].listeners] | add' || echo 0)
-        echo "$(${pkgs.coreutils}/bin/date -Is)" "$filename" | ${pkgs.coreutils}/bin/tee -a "$HISTORY_FILE"
-        echo "$(${pkgs.coreutils}/bin/tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
-        ${set_irc_topic} "playing: $filename listeners: $listeners"
-      '';
-      MUSIC = "${music_dir}/the_playlist";
-      ICECAST_HOST = "localhost";
-    };
-    path = [
-      pkgs.yt-dlp
-    ];
-    serviceConfig.User = lib.mkForce "radio";
-  };
-
-  nixpkgs.config.packageOverrides = opkgs: {
-    icecast = opkgs.icecast.overrideAttrs (old: rec {
-      version = "2.5-beta3";
-
-      src = pkgs.fetchurl {
-        url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz";
-        sha256 = "sha256-4FDokoA9zBDYj8RAO/kuTHaZ6jZYBLSJZiX/IYFaCW8=";
-      };
-
-      buildInputs = old.buildInputs ++ [ pkgs.pkg-config ];
-    });
-  };
-  services.icecast = {
-    enable = true;
-    hostname = "radio.lassul.us";
-    admin.password = "hackme";
-    extraConf = ''
-      <authentication>
-        <source-password>hackme</source-password>
-        <admin-user>admin</admin-user>
-        <admin-password>hackme</admin-password>
-      </authentication>
-      <logging>
-        <accesslog>-</accesslog>
-        <errorlog>-</errorlog>
-        <loglevel>3</loglevel>
-      </logging>
-    '';
-  };
-
-  krebs.iptables = {
-    tables = {
-      filter.INPUT.rules = [
-        { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
-        { predicate = "-i retiolum -p tcp --dport 8001"; target = "ACCEPT"; }
-      ];
-    };
-  };
-
-  # allow reaktor2 to modify files
-  systemd.services."reaktor2-the_playlist".serviceConfig.DynamicUser = lib.mkForce false;
-
-  krebs.reaktor2.the_playlist = {
-    hostname = "irc.hackint.org";
-    port = "6697";
-    useTLS = true;
-    nick = "the_playlist";
-    username = "radio";
-    API.listen = "unix:/home/radio/reaktor.sock";
-    plugins = [
-      {
-        plugin = "register";
-        config = {
-          channels = [
-            "#the_playlist"
-            "#krebs"
-          ];
-        };
-      }
-      {
-        plugin = "system";
-        config = {
-          workdir = config.krebs.reaktor2.the_playlist.stateDir;
-          hooks.PRIVMSG = [
-            {
-              activate = "match";
-              pattern = "^(?:.*\\s)?\\s*the_playlist:\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
-              command = 1;
-              arguments = [2];
-              commands = {
-                skip.filename = "${skip_track}/bin/skip_track";
-                next.filename = "${skip_track}/bin/skip_track";
-                bad.filename = "${skip_track}/bin/skip_track";
-
-                good.filename = "${good_track}/bin/good_track";
-                nice.filename = "${good_track}/bin/good_track";
-                like.filename = "${good_track}/bin/good_track";
-
-                current.filename = "${print_current}/bin/print_current";
-                wish.filename = pkgs.writeDash "wish" ''
-                  echo "youtube-dl:$1" | ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish -d @- > /dev/null
-                '';
-                wishlist.filename = pkgs.writeDash "wishlist" ''
-                  ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish | ${pkgs.jq}/bin/jq -r '.[]'
-                '';
-                suggest.filename = pkgs.writeDash "suggest" ''
-                  echo "$@" >> playlist_suggest
-                '';
-              };
-            }
-          ];
-        };
-      }
-    ];
-  };
-
-  krebs.htgen.radio = {
-    port = 8001;
-    user = {
-      name = "radio";
-    };
-    scriptFile = pkgs.writeDash "radio" ''
-      case "$Method $Request_URI" in
-        "POST /skip")
-          printf 'HTTP/1.1 200 OK\r\n'
-          printf 'Connection: close\r\n'
-          printf '\r\n'
-          msg=$(${skip_track}/bin/skip_track)
-          ${write_to_irc} "$msg"
-          echo "$msg"
-          exit
-        ;;
-        "POST /good")
-          printf 'HTTP/1.1 200 OK\r\n'
-          printf 'Connection: close\r\n'
-          printf '\r\n'
-          msg=$(${good_track}/bin/good_track)
-          ${write_to_irc} "$msg"
-          echo "$msg"
-          exit
-        ;;
-      esac
-    '';
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 ];
-  services.nginx = {
-    enable = true;
-    virtualHosts."radio.r" = {
-      locations."/".extraConfig = ''
-        # https://github.com/aswild/icecast-notes#core-nginx-config
-        proxy_pass http://localhost:8000;
-        # Disable request size limit, very important for uploading large files
-        client_max_body_size 0;
-
-        # Enable support `Transfer-Encoding: chunked`
-        chunked_transfer_encoding on;
-
-        # Disable request and response buffering, minimize latency to/from Icecast
-        proxy_buffering off;
-        proxy_request_buffering off;
-
-        # Icecast needs HTTP/1.1, not 1.0 or 2
-        proxy_http_version 1.1;
-
-        # Forward all original request headers
-        proxy_pass_request_headers on;
-
-        # Set some standard reverse proxy headers. Icecast server currently ignores these,
-        # but may support them in a future version so that access logs are more useful.
-        proxy_set_header  Host              $host;
-        proxy_set_header  X-Real-IP         $remote_addr;
-        proxy_set_header  X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header  X-Forwarded-Proto $scheme;
-
-        # get source ip for weather reports
-        proxy_set_header user-agent "$http_user_agent; client-ip=$remote_addr";
-      '';
-      locations."= /recent".extraConfig = ''
-        default_type "text/plain";
-        alias /var/lib/radio/recent;
-      '';
-      locations."= /current".extraConfig = ''
-        proxy_pass http://localhost:8002;
-      '';
-      locations."= /skip".extraConfig = ''
-        proxy_pass http://localhost:8001;
-      '';
-      locations."= /good".extraConfig = ''
-        proxy_pass http://localhost:8001;
-      '';
-      locations."= /radio.sh".alias = pkgs.writeScript "radio.sh" ''
-        #!/bin/sh
-        trap 'exit 0' EXIT
-        while sleep 1; do
-          mpv \
-            --cache-secs=0 --demuxer-readahead-secs=0 --untimed --cache-pause=no \
-            'http://radio.lassul.us/radio.ogg'
-        done
-      '';
-      locations."= /controls".extraConfig = ''
-        default_type "text/html";
-        alias ${./controls.html};
-      '';
-      extraConfig = ''
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-      '';
-    };
-  };
-  services.syncthing.declarative.folders."the_playlist" = {
-    path = "/var/music/the_playlist";
-    devices = [ "mors" "phone" "prism" "omo" "radio" ];
-  };
-  krebs.acl."/var/music/the_playlist"."u:syncthing:X".parents = true;
-  krebs.acl."/var/music/the_playlist"."u:syncthing:rwX" = {};
-  krebs.acl."/var/music/the_playlist"."u:radio:rwX" = {};
-}
diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix
deleted file mode 100644
index 0dc711e6c..000000000
--- a/lass/2configs/radio/news.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-
-  send_to_radio = pkgs.writers.writeDashBin "send_to_radio" ''
-    ${pkgs.vorbis-tools}/bin/oggenc - |
-      ${pkgs.cyberlocker-tools}/bin/cput news.ogg
-    ${pkgs.curl}/bin/curl -fSs -X POST http://localhost:8002/newsshow
-  '';
-
-  gc_news = pkgs.writers.writeDashBin "gc_news" ''
-    set -xefu
-    export TZ=UTC #workaround for jq parsing wrong timestamp
-    ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -cs 'map(select((.to|fromdateiso8601) > now)) | .[]' > $HOME/bla-news.tmp
-    ${pkgs.coreutils}/bin/mv $HOME/bla-news.tmp $HOME/news
-  '';
-
-  get_current_news = pkgs.writers.writeDashBin "get_current_news" ''
-    set -xefu
-    export TZ=UTC #workaround for jq parsing wrong timestamp
-    ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -rs '
-      sort_by(.priority) |
-      map(select(
-        ((.to | fromdateiso8601) > now) and
-        (.from|fromdateiso8601) < now) |
-        .text
-      ) | .[]'
-  '';
-
-  newsshow = pkgs.writers.writeDashBin "newsshow" /* sh */ ''
-    cat << EOF
-    hello crabpeople!
-    $(${pkgs.ddate}/bin/ddate +'Today is %{%A, the %e of %B%}, %Y. %N%nCelebrate %H')
-    It is $(date --utc +%H) o clock UTC.
-    todays news:
-    $(get_current_news)
-    $(gc_news)
-    EOF
-  '';
-in
-{
-  systemd.services.newsshow = {
-    path = [
-      newsshow
-      send_to_radio
-      gc_news
-      get_current_news
-      pkgs.curl
-      pkgs.retry
-    ];
-    script = ''
-      set -efu
-      retry -t 5 -d 10 -- newsshow |
-        retry -t 5 -d 10 -- curl -fSsG http://tts.r/api/tts --data-urlencode 'text@-' |
-        retry -t 5 -d 10 -- send_to_radio
-    '';
-    startAt = "*:00:00";
-    serviceConfig = {
-      User = "radio-news";
-    };
-  };
-
-  services.nginx.virtualHosts."radio-news.r" = {
-    locations."/" = {
-      proxyPass = "http://localhost:7999";
-      proxyWebsockets = true;
-      extraConfig = ''
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-      '';
-    };
-  };
-  krebs.htgen.news = {
-    port = 7999;
-    user = {
-      name = "radio-news";
-    };
-    script = ''. ${pkgs.writers.writeDash "htgen-news" ''
-      set -xefu
-      case "''${Method:-GET} $Request_URI" in
-        "GET /")
-          printf 'HTTP/1.1 200 OK\r\n'
-          printf 'Connection: close\r\n'
-          printf '\r\n'
-          cat "$HOME"/news | jq -sc .
-          exit
-        ;;
-        "POST /")
-          payload=$(head -c "$req_content_length")
-          printf '%s' "$payload" | jq 'has("from") and has("to") and has("text")' >&2
-          printf '%s' "$payload" | jq -c '{ from: .from, to: .to, text: .text, priority: (.priority // 0)}' >> "$HOME"/news
-          printf 'HTTP/1.1 200 OK\r\n'
-          printf 'Connection: close\r\n'
-          printf '\r\n'
-          exit
-        ;;
-      esac
-    ''}'';
-  };
-
-  ## debug
-  # environment.systemPackages = [
-  #   weather_report
-  #   send_to_radio
-  #   newsshow
-  # ];
-}
diff --git a/lass/2configs/radio/radio.liq b/lass/2configs/radio/radio.liq
deleted file mode 100644
index 1366287a7..000000000
--- a/lass/2configs/radio/radio.liq
+++ /dev/null
@@ -1,112 +0,0 @@
-log.stdout.set(true)
-
-# use yt-dlp
-settings.protocol.youtube_dl.path.set("yt-dlp")
-
-## functions
-
-def stringify_attrs(attrs) =
-  let json.stringify out = (attrs : [(string * string)] as json.object)
-  out
-end
-
-def filter_music(req) =
-  filename = request.filename(req)
-  if string.match(pattern = '.*/\\.graveyard/.*', filename) then
-    false
-  else
-    true
-  end
-end
-
-def queue_contents(q) =
-  list.map(fun (req) -> request.uri(req), q)
-end
-## main
-
-env = environment()
-port = string.to_int(env["RADIO_PORT"], default = 8000)
-
-all_music = playlist(env["MUSIC"], check_next = filter_music)
-wishlist = request.queue()
-tracks = fallback(track_sensitive = true, [wishlist, all_music])
-tracks = blank.eat(tracks)
-
-last_metadata = ref([])
-def on_metadata(m) =
-  last_metadata := m
-  print("changing tracks")
-  out = process.read(env["HOOK_TRACK_CHANGE"], env = m, timeout = 5.0)
-  print(out)
-end
-tracks.on_metadata(on_metadata)
-
-# some nice effects
-music = crossfade(tracks)
-music = mksafe(music)
-music = normalize(music)
-
-news = request.queue()
-radio = smooth_add(normal = music, special = amplify(1.5, news))
-
-if string.length(env["ICECAST_HOST"]) > 0 then
-  output.icecast(host = env["ICECAST_HOST"], mount = '/music.ogg', password = 'hackme', %vorbis(quality = 1), music)
-  output.icecast(host = env["ICECAST_HOST"], mount = '/music.mp3', password = 'hackme', %mp3.vbr(), music)
-  output.icecast(host = env["ICECAST_HOST"], mount = '/music.opus', password = 'hackme', %opus(bitrate = 128), music)
-
-  output.icecast(host = env["ICECAST_HOST"], mount = '/radio.ogg', password = 'hackme', %vorbis(quality = 1), radio)
-  output.icecast(host = env["ICECAST_HOST"], mount = '/radio.mp3', password = 'hackme', %mp3.vbr(), radio)
-  output.icecast(host = env["ICECAST_HOST"], mount = '/radio.opus', password = 'hackme', %opus(bitrate = 128), radio)
-else
-  output(fallible = true, buffer(radio))
-end
-
-interactive.harbor(port = port)
-
-def current(~protocol, ~headers, ~data, uri) =
-  http.response(content_type = "application/json", data = stringify_attrs(
-    !last_metadata
-  ))
-end
-harbor.http.register("/current", port = port, current)
-
-def skip(~protocol, ~headers, ~data, uri) =
-  tracks.skip()
-  http.response(content_type = "application/json", data = stringify_attrs(
-    !last_metadata
-  ))
-end
-harbor.http.register("/skip", method = "POST", port = port, skip)
-
-def all_tracks(~protocol, ~headers, ~data, uri) =
-  http.response(content_type = "application/json", data = json.stringify(
-    all_music.remaining_files()
-  ))
-end
-harbor.http.register("/all_tracks", port = port, all_tracks)
-
-def wish_track(~protocol, ~headers, ~data, uri) =
-  # disallow process:
-  if string.match(pattern = '^process:', data) then
-    http.response(code = 400)
-  else
-    # TODO report errors back
-    wish = request.create(data)
-    wishlist.push(wish)
-    http.response(content_type = "application/json", data = "ok")
-  end
-end
-harbor.http.register("/wish", method = "POST", port = port, wish_track)
-
-def wish_tracklist(~protocol, ~headers, ~data, uri) =
-  http.response(content_type = "application/json", data = json.stringify(
-    queue_contents(wishlist.queue())
-  ))
-end
-harbor.http.register("/wish", port = port, wish_tracklist)
-
-def newsshow(~protocol, ~headers, ~data, uri) =
-  news.push(request.create("http://c.r/news.ogg"))
-  http.response(content_type = "application/json", data = "ok")
-end
-harbor.http.register("/newsshow", method = "POST", port = port, newsshow)
diff --git a/lass/2configs/radio/shell.nix b/lass/2configs/radio/shell.nix
deleted file mode 100644
index 9d00e3b06..000000000
--- a/lass/2configs/radio/shell.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = [
-    pkgs.liquidsoap
-    pkgs.yt-dlp
-  ];
-}
diff --git a/lass/2configs/radio/weather.nix b/lass/2configs/radio/weather.nix
deleted file mode 100644
index dca8a7843..000000000
--- a/lass/2configs/radio/weather.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  weather_for_ips = pkgs.writers.writePython3Bin "weather_for_ips" {
-    libraries = [ pkgs.python3Packages.geoip2 ];
-    flakeIgnore = [ "E501" ];
-  } ./weather_for_ips.py;
-
-  weather_report = pkgs.writers.writeDashBin "weather_report" ''
-    set -efux
-    export PATH="${lib.makeBinPath [
-      pkgs.coreutils
-      pkgs.curl
-      pkgs.jq
-    ]}"
-    curl -fSsz /tmp/GeoLite2-City.mmdb -o /tmp/GeoLite2-City.mmdb http://c.r/GeoLite2-City.mmdb
-    MAXMIND_GEOIP_DB="/tmp/GeoLite2-City.mmdb"; export MAXMIND_GEOIP_DB
-    OPENWEATHER_API_KEY=$(cat "$CREDENTIALS_DIRECTORY/openweather_api"); export OPENWEATHER_API_KEY
-    (
-      curl -sS 'http://admin:hackme@localhost:8000/admin/listclients.json?mount=/radio.ogg'
-      curl -sS 'http://admin:hackme@localhost:8000/admin/listclients.json?mount=/radio.mp3'
-      curl -sS 'http://admin:hackme@localhost:8000/admin/listclients.json?mount=/radio.opus'
-    ) | jq -rs '
-      [
-        .[][].source|values|to_entries[].value |
-        (.listener//[]) [] |
-        (.useragent | capture("client-ip=(?<ip>[a-f0-9.:]+)")).ip // .ip
-      ] |
-        unique[] |
-        select(. != "127.0.0.1") |
-        select(. != "::1")
-    ' |
-      ${weather_for_ips}/bin/weather_for_ips
-  '';
-in {
-  systemd.services.weather = {
-    path = [
-      weather_report
-      pkgs.retry
-      pkgs.jq
-      pkgs.curl
-    ];
-    script = ''
-      set -xefu
-      retry -t 5 -d 10 -- weather_report |
-        jq \
-          --arg from "$(date -u +'%FT%TZ')" \
-          --arg to "$(date -u +'%FT%TZ' -d '+1 hours')" \
-          --slurp --raw-input --compact-output --ascii-output \
-          '{text: ., from: $from, to: $to, priority: 100}' |
-        retry -t 5 -d 10 -- curl -fSs -d@- http://radio-news.r
-    '';
-    startAt = "*:58:00";
-    serviceConfig = {
-      User = "radio-news";
-      LoadCredential = [
-        "openweather_api:${toString <secrets>}/openweather_api_key"
-      ];
-    };
-  };
-}
diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py
deleted file mode 100644
index 62206a985..000000000
--- a/lass/2configs/radio/weather_for_ips.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import geoip2.database
-import fileinput
-import json
-import requests
-import os
-import random
-
-
-geoip = geoip2.database.Reader(os.environ['MAXMIND_GEOIP_DB'])
-seen = {}
-output = []
-for ip in fileinput.input():
-    if "80.147.140.51" in ip:
-        output.append(
-            'Weather report for c-base, space.'
-            'It is empty space outside '
-            'with a temperature of -270 degrees, '
-            'a lightspeed of 299792 kilometers per second '
-            'and a humidity of Not a Number percent. '
-            f'The probability of reincarnation is {random.randrange(0, 100)} percent.'
-        )
-    else:
-        try:
-            location = geoip.city(ip.strip())
-            if location.city.geoname_id not in seen:
-                seen[location.city.geoname_id] = True
-                weather_api_key = os.environ['OPENWEATHER_API_KEY']
-                url = (
-                    f'https://api.openweathermap.org/data/2.5/onecall'
-                    f'?lat={location.location.latitude}'
-                    f'&lon={location.location.longitude}'
-                    f'&appid={weather_api_key}'
-                    f'&units=metric'
-                )
-                resp = requests.get(url)
-                weather = json.loads(resp.text)
-                output.append(
-                    f'Weather report for {location.city.name}, {location.country.name}. '
-                    f'It is {weather["current"]["weather"][0]["description"]} outside '
-                    f'with a temperature of {weather["current"]["temp"]:.1f} degrees, '
-                    f'a wind speed of {weather["current"]["wind_speed"]:.1f} meters per second '
-                    f'and a humidity of {weather["current"]["humidity"]} percent. '
-                    f'The probability of precipitation is {weather["hourly"][0]["pop"] * 100:.0f} percent. '
-                )
-        except:  # noqa E722
-            pass
-
-print('\n'.join(output))
diff --git a/lass/2configs/services/radio/container-host.nix b/lass/2configs/services/radio/container-host.nix
new file mode 100644
index 000000000..de0ea9afe
--- /dev/null
+++ b/lass/2configs/services/radio/container-host.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+{
+  krebs.sync-containers3.containers.radio = {
+    sshKey = "${toString <secrets>}/radio.sync.key";
+  };
+  containers.radio = {
+    bindMounts."/var/music" = {
+      hostPath = "/var/music";
+      isReadOnly = false;
+    };
+  };
+  krebs.iptables.tables.filter.INPUT.rules = [
+    { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
+  ];
+  krebs.htgen.radio-redirect = {
+    port = 8000;
+    scriptFile = pkgs.writers.writeDash "redir" ''
+      printf 'HTTP/1.1 301 Moved Permanently\r\n'
+      printf "Location: http://radio.lassul.us''${Request_URI}\r\n"
+      printf '\r\n'
+    '';
+  };
+}
diff --git a/lass/2configs/services/radio/controls.html b/lass/2configs/services/radio/controls.html
new file mode 100644
index 000000000..858dc3656
--- /dev/null
+++ b/lass/2configs/services/radio/controls.html
@@ -0,0 +1,83 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>The_Playlist Voting!</title>
+<style>
+#good {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: #04AA6D;
+  padding: 14px;
+  margin: 14px 0 0 0;
+  height: 100px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+#bad {
+    display: block;
+  width: 100%;
+  border: none;
+  background-color: red;
+  padding: 14px;
+    height: 100px;
+
+  margin: 14px 0 0 0;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+</style>
+
+</head>
+
+<body>
+  <div id=votenote></div>
+  <button id=good type="button"> GUT </button>
+
+  <button id=bad type="button"> SCHLECHT </button>
+  <center>
+    Currently Running: <br/><div>
+      <b id=current></b>
+    </div>
+    <div id=vote>
+    </div>
+    <audio controls autoplay="autoplay">
+      <source src="https://radio.lassul.us/radio.ogg" type="audio/ogg">
+      Your browser does not support the audio element.
+    </audio>
+  </center>
+
+  <script>
+    document.getElementById("good").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/good", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du gut"
+    };
+    document.getElementById("bad").onclick=async ()=>{
+      let result = await fetch("https://radio.lassul.us/skip", {"method": "POST"})
+      document.getElementById("vote").textContent =  "Dieses Lied findest du schlecht"
+      document.getElementById("bad").disabled = true
+      window.setTimeout(function(){
+        document.getElementById("bad").disabled = false
+      }, 100000)
+
+    };
+
+    async function current() {
+      let result = await fetch("https://radio.lassul.us/current", {"method": "GET"})
+      let data = await result.json()
+      document.getElementById("current").textContent = data.name
+    }
+    window.onload = function() {
+      window.setInterval('current()', 10000)
+      current()
+    }
+
+  </script>
+</body>
+</html>
diff --git a/lass/2configs/services/radio/default.nix b/lass/2configs/services/radio/default.nix
new file mode 100644
index 000000000..a511196fd
--- /dev/null
+++ b/lass/2configs/services/radio/default.nix
@@ -0,0 +1,328 @@
+{ config, pkgs, lib, ... }:
+
+let
+  name = "radio";
+
+  music_dir = "/var/music";
+
+  skip_track = pkgs.writers.writeBashBin "skip_track" ''
+    set -eu
+
+    # TODO come up with new rating, without moving files
+    # current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename)
+    # track_infos=$(${print_current}/bin/print_current)
+    # skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$current_track" || echo 0)
+    # if [[ "$current_track" =~ .*/the_playlist/music/.* ]] && [ "$skip_count" -le 2 ]; then
+    #   skip_count=$((skip_count+1))
+    #   ${pkgs.attr}/bin/setfattr -n user.skip_count -v "$skip_count" "$current_track"
+    #   echo skipping: "$track_infos" skip_count: "$skip_count"
+    # else
+    #   mkdir -p "$music_dir"/the_playlist/.graveyard/
+    #   mv "$current_track" "$music_dir"/the_playlist/.graveyard/
+    #   echo killing: "$track_infos"
+    # fi
+    ${pkgs.curl}/bin/curl -fSs -X POST http://localhost:8002/skip |
+      ${pkgs.jq}/bin/jq -r '.filename'
+  '';
+
+  good_track = pkgs.writeBashBin "good_track" ''
+    set -eu
+
+    current_track=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current | ${pkgs.jq}/bin/jq -r .filename)
+    track_infos=$(${print_current}/bin/print_current)
+    # TODO come up with new rating, without moving files
+    # if [[ "$current_track" =~ .*/the_playlist/music/.* ]]; then
+    #   ${pkgs.attr}/bin/setfattr -n user.skip_count -v 0 "$current_track"
+    # else
+    #   mv "$current_track" "$music_dir"/the_playlist/music/ || :
+    # fi
+    echo good: "$track_infos"
+  '';
+
+  print_current = pkgs.writeDashBin "print_current" ''
+    file=$(${pkgs.curl}/bin/curl -fSs http://localhost:8002/current |
+      ${pkgs.jq}/bin/jq -r '.filename' |
+      ${pkgs.gnused}/bin/sed 's,^${music_dir},,'
+    )
+    link=$(${pkgs.curl}/bin/curl http://localhost:8002/current |
+      ${pkgs.jq}/bin/jq -r '.filename' |
+      ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@https://youtu.be/\1@'
+    )
+    echo "$file": "$link"
+  '';
+
+  set_irc_topic = pkgs.writeDash "set_irc_topic" ''
+    ${pkgs.curl}/bin/curl -fsS --unix-socket /home/radio/reaktor.sock http://z/ \
+      -H content-type:application/json \
+      -d "$(${pkgs.jq}/bin/jq -n \
+        --arg text "$1" '{
+          command:"TOPIC",
+          params:["#the_playlist",$text]
+        }'
+      )"
+  '';
+
+  write_to_irc = pkgs.writeDash "write_to_irc" ''
+    ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \
+      -H content-type:application/json \
+      -d "$(${pkgs.jq}/bin/jq -n \
+        --arg text "$1" '{
+          command:"PRIVMSG",
+          params:["#the_playlist",$text]
+        }'
+      )"
+  '';
+
+in {
+  imports = [
+    ./news.nix
+    ./weather.nix
+  ];
+
+  users.users = {
+    "${name}" = rec {
+      inherit name;
+      createHome = lib.mkForce false;
+      group = name;
+      uid = pkgs.stockholm.lib.genid_uint31 name;
+      description = "radio manager";
+      home = "/home/${name}";
+      useDefaultShell = true;
+      openssh.authorizedKeys.keys = with config.krebs.users; [
+        lass.pubkey
+      ];
+    };
+  };
+
+  users.groups = {
+    "radio" = {};
+  };
+
+  krebs.per-user.${name}.packages = with pkgs; [
+    good_track
+    skip_track
+    print_current
+  ];
+
+  services.liquidsoap.streams.radio = ./radio.liq;
+  systemd.services.radio = {
+    environment = {
+      RADIO_PORT = "8002";
+      HOOK_TRACK_CHANGE = pkgs.writers.writeDash "on_change" ''
+        set -xefu
+        LIMIT=1000 #how many tracks to keep in the history
+        HISTORY_FILE=/var/lib/radio/recent
+
+        listeners=$(${pkgs.curl}/bin/curl -fSs http://localhost:8000/status-json.xsl |
+          ${pkgs.jq}/bin/jq '[.icestats.source[].listeners] | add' || echo 0)
+        echo "$(${pkgs.coreutils}/bin/date -Is)" "$filename" | ${pkgs.coreutils}/bin/tee -a "$HISTORY_FILE"
+        echo "$(${pkgs.coreutils}/bin/tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
+        ${set_irc_topic} "playing: $filename listeners: $listeners"
+      '';
+      MUSIC = "${music_dir}/the_playlist";
+      ICECAST_HOST = "localhost";
+    };
+    path = [
+      pkgs.yt-dlp
+    ];
+    serviceConfig.User = lib.mkForce "radio";
+  };
+
+  nixpkgs.config.packageOverrides = opkgs: {
+    icecast = opkgs.icecast.overrideAttrs (old: rec {
+      version = "2.5-beta3";
+
+      src = pkgs.fetchurl {
+        url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz";
+        sha256 = "sha256-4FDokoA9zBDYj8RAO/kuTHaZ6jZYBLSJZiX/IYFaCW8=";
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.pkg-config ];
+    });
+  };
+  services.icecast = {
+    enable = true;
+    hostname = "radio.lassul.us";
+    admin.password = "hackme";
+    extraConf = ''
+      <authentication>
+        <source-password>hackme</source-password>
+        <admin-user>admin</admin-user>
+        <admin-password>hackme</admin-password>
+      </authentication>
+      <logging>
+        <accesslog>-</accesslog>
+        <errorlog>-</errorlog>
+        <loglevel>3</loglevel>
+      </logging>
+    '';
+  };
+
+  krebs.iptables = {
+    tables = {
+      filter.INPUT.rules = [
+        { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
+        { predicate = "-i retiolum -p tcp --dport 8001"; target = "ACCEPT"; }
+      ];
+    };
+  };
+
+  # allow reaktor2 to modify files
+  systemd.services."reaktor2-the_playlist".serviceConfig.DynamicUser = lib.mkForce false;
+
+  krebs.reaktor2.the_playlist = {
+    hostname = "irc.hackint.org";
+    port = "6697";
+    useTLS = true;
+    nick = "the_playlist";
+    username = "radio";
+    API.listen = "unix:/home/radio/reaktor.sock";
+    plugins = [
+      {
+        plugin = "register";
+        config = {
+          channels = [
+            "#the_playlist"
+            "#krebs"
+          ];
+        };
+      }
+      {
+        plugin = "system";
+        config = {
+          workdir = config.krebs.reaktor2.the_playlist.stateDir;
+          hooks.PRIVMSG = [
+            {
+              activate = "match";
+              pattern = "^(?:.*\\s)?\\s*the_playlist:\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
+              command = 1;
+              arguments = [2];
+              commands = {
+                skip.filename = "${skip_track}/bin/skip_track";
+                next.filename = "${skip_track}/bin/skip_track";
+                bad.filename = "${skip_track}/bin/skip_track";
+
+                good.filename = "${good_track}/bin/good_track";
+                nice.filename = "${good_track}/bin/good_track";
+                like.filename = "${good_track}/bin/good_track";
+
+                current.filename = "${print_current}/bin/print_current";
+                wish.filename = pkgs.writeDash "wish" ''
+                  echo "youtube-dl:$1" | ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish -d @- > /dev/null
+                '';
+                wishlist.filename = pkgs.writeDash "wishlist" ''
+                  ${pkgs.curl}/bin/curl -fSs http://localhost:8002/wish | ${pkgs.jq}/bin/jq -r '.[]'
+                '';
+                suggest.filename = pkgs.writeDash "suggest" ''
+                  echo "$@" >> playlist_suggest
+                '';
+              };
+            }
+          ];
+        };
+      }
+    ];
+  };
+
+  krebs.htgen.radio = {
+    port = 8001;
+    user = {
+      name = "radio";
+    };
+    scriptFile = pkgs.writeDash "radio" ''
+      case "$Method $Request_URI" in
+        "POST /skip")
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Connection: close\r\n'
+          printf '\r\n'
+          msg=$(${skip_track}/bin/skip_track)
+          ${write_to_irc} "$msg"
+          echo "$msg"
+          exit
+        ;;
+        "POST /good")
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Connection: close\r\n'
+          printf '\r\n'
+          msg=$(${good_track}/bin/good_track)
+          ${write_to_irc} "$msg"
+          echo "$msg"
+          exit
+        ;;
+      esac
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [ 80 ];
+  services.nginx = {
+    enable = true;
+    virtualHosts."radio.r" = {
+      locations."/".extraConfig = ''
+        # https://github.com/aswild/icecast-notes#core-nginx-config
+        proxy_pass http://local