streams: fix FRK description

configs/browser.nix

@@ -5,18 +5,6 @@
 }: let
   inherit (import ../lib) tmpfilesConfig;
 in {
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "cro" ''
-      ${pkgs.chromium}/bin/chromium \
-        --disable-sync \
-        --no-default-browser-check \
-        --no-first-run \
-        --user-data-dir="$(mktemp -d)" \
-        --incognito \
-        "$@"
-    '')
-  ];
-
   home-manager.users.me = {
     programs.firefox = {
       enable = true;

configs/packages.nix

@@ -153,9 +153,15 @@ in {
     niveumPackages.emailmenu
     niveumPackages.closest
     niveumPackages.trans
+    niveumPackages.cro
     (niveumPackages.mpv-radio.override {
       di-fm-key-file = config.age.secrets.di-fm-key.path;
     })
+    (niveumPackages.mpv-radio.override {
+      di-fm-key-file = config.age.secrets.di-fm-key.path;
+      executableName = "cro-radio";
+      mpvCommand = "${niveumPackages.cro}/bin/cro";
+    })
     (niveumPackages.mpv-tuner.override {
       di-fm-key-file = config.age.secrets.di-fm-key.path;
     })

flake.nix

@@ -321,6 +321,7 @@
         brassica = pkgs.callPackage packages/brassica.nix {};
         cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
         closest = pkgs.callPackage packages/closest {};
+        cro = pkgs.callPackage packages/cro.nix {};
         cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
         default-gateway = pkgs.callPackage packages/default-gateway.nix {};
         depp = pkgs.callPackage packages/depp.nix {};

lib/streams.nix

@@ -151,7 +151,7 @@ in
     {
       stream = "http://stream.freiesradio.org:8000/live.mp3";
       station = "Freies Radio Kassel";
-      description = "Gesellschaft zur drahtlosen Belehrung und Erbauung";
+      desc = "Gesellschaft zur drahtlosen Belehrung und Erbauung";
     }
     {
       stream = "http://162.244.80.20:6948";

packages/cro.nix

@@ -0,0 +1,10 @@
+{ writers, chromium }:
+writers.writeDashBin "cro" ''
+  ${chromium}/bin/chromium \
+    --disable-sync \
+    --no-default-browser-check \
+    --no-first-run \
+    --user-data-dir="$(mktemp -d)" \
+    --incognito \
+    "$@"
+''

packages/mpv-radio.nix

@@ -7,6 +7,8 @@
   coreutils,
   gnused,
   di-fm-key-file,
+  executableName ? "mpv-radio",
+  mpvCommand ? "${mpv}/bin/mpv --force-window=yes"
 }: let
   streams = import ../lib/streams.nix {
     di-fm-key = "%DI_FM_KEY%";
@@ -19,11 +21,13 @@
   }: "${station}\t${desc}\t${stream}")
   streams);
 in
-  writers.writeDashBin "mpv-radio" ''
+  writers.writeDashBin executableName ''
+    set -x
+
     if [ -z ''${DI_FM_KEY} ]; then
       DI_FM_KEY=$(cat "${di-fm-key-file}")
     fi
-    exec ${mpv}/bin/mpv --force-window=yes "$(
+    exec ${mpvCommand} "$(
       ${dmenu}/bin/dmenu -i -l 5 < ${streams-tsv} \
         | ${coreutils}/bin/cut -f3 \
         | ${gnused}/bin/sed s/%DI_FM_KEY%/"$DI_FM_KEY"/

systems/zaatar/configuration.nix

@@ -10,14 +10,8 @@ in {
     ./atuin.nix
     ./backup.nix
     ./gaslight.nix
-    # ./kiosk.nix
     ./hardware-configuration.nix
     ./home-assistant.nix
-    ./mpd.nix
-    ./grocy.nix
-    ./spotifyd.nix
-    # ../../configs/keyboard.nix
-    ../../configs/sound.nix
     ../../configs/monitoring.nix
     ../../configs/retiolum.nix
     ../../configs/printing.nix