streams: move to package

flake.nix

@@ -238,6 +238,7 @@
         default-gateway = prev.callPackage packages/default-gateway.nix { };
         depp = prev.callPackage packages/depp.nix { };
         devanagari = prev.callPackage packages/devanagari { };
+        radioStreams = prev.callPackage packages/streams {};
         devour = prev.callPackage packages/devour.nix { };
         dmenu-randr = prev.callPackage packages/dmenu-randr.nix { };
         emailmenu = prev.callPackage packages/emailmenu.nix { };
@@ -451,7 +452,7 @@
           };
         in
         {
-          inherit (pkgs) auc swallow cheat-sh hc kpaste noise-waves trans stag qrpaste new-mac scanned default-gateway kirciuoklis tocharian-font image-convert-favicon image-convert-tolino heuretes mpv-tv mpv-iptv devanagari literature-quote booksplit manual-sort wttr emailmenu closest mpv-radio mpv-tuner cro nix-git text2pdf betacode brassica ipa polyglot jsesh gfs-fonts vim-kmein vimv brainmelter cyberlocker-tools pls untilport radio-news vg ttspaste depp fkill fzfmenu unicodmenu dmenu-randr notemenu man-pdf mansplain opustags q timer rfc gimp obsidian-vim devour go-webring random-zeno stardict-tools weechat-declarative klem;
+          inherit (pkgs) auc swallow cheat-sh hc kpaste noise-waves trans stag qrpaste new-mac scanned default-gateway kirciuoklis tocharian-font image-convert-favicon image-convert-tolino heuretes mpv-tv mpv-iptv devanagari literature-quote booksplit manual-sort wttr emailmenu closest mpv-radio mpv-tuner cro nix-git text2pdf betacode brassica ipa polyglot jsesh gfs-fonts vim-kmein vimv brainmelter cyberlocker-tools pls untilport radio-news vg ttspaste depp fkill fzfmenu unicodmenu dmenu-randr notemenu man-pdf mansplain opustags q timer rfc gimp obsidian-vim devour go-webring random-zeno stardict-tools weechat-declarative klem radioStreams;
         }
       );
     };

packages/mpv-radio.nix

@@ -1,25 +1,18 @@
 {
-  writeText,
-  lib,
   writers,
   mpv,
   dmenu,
   coreutils,
   gnused,
   di-fm-key-file,
+  radioStreams,
   executableName ? "mpv-radio",
-  mpvCommand ? "${mpv}/bin/mpv --force-window=yes"
-}: let
-  streams = import ../lib/streams.nix {
+  mpvCommand ? "${mpv}/bin/mpv --force-window=yes",
+}:
+let
+  streams = radioStreams.override {
     di-fm-key = "%DI_FM_KEY%";
   };
-  streams-tsv = writeText "streams.tsv" (lib.concatMapStringsSep "\n" ({
-    desc ? "",
-    stream,
-    station,
-    ...
-  }: "${station}\t${desc}\t${stream}")
-  streams);
 in
 writers.writeDashBin executableName ''
   set -x
@@ -28,7 +21,7 @@ in
     DI_FM_KEY=$(cat "${di-fm-key-file}")
   fi
   exec ${mpvCommand} "$(
-      ${dmenu}/bin/dmenu -i -l 5 < ${streams-tsv} \
+    ${dmenu}/bin/dmenu -i -l 5 < ${streams.tsv} \
       | ${coreutils}/bin/cut -f3 \
       | ${gnused}/bin/sed s/%DI_FM_KEY%/"$DI_FM_KEY"/
   )"

packages/mpv-tuner.nix

@@ -5,18 +5,19 @@
   mpv,
   gnused,
   di-fm-key-file,
+  radioStreams,
   findutils,
-}: let
-  streams = import ../lib/streams.nix {
+}:
+let
+  streams = radioStreams.override {
     di-fm-key = "%DI_FM_KEY%";
   };
-  streams-list = writeText "streams.txt" (lib.concatMapStringsSep "\n" (station: station.stream) streams);
 in
 writers.writeDashBin "mpv-tuner" ''
   if [ -z ''${DI_FM_KEY} ]; then
     DI_FM_KEY=$(cat "${di-fm-key-file}")
   fi
-    shuf ${streams-list} \
+  shuf ${streams.playlist} \
     | ${gnused}/bin/sed s/%DI_FM_KEY%/"$DI_FM_KEY"/ \
     | ${findutils}/bin/xargs ${mpv}/bin/mpv
 ''

systems/zaatar/mpd.nix

@@ -1,164 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  mukkeMountPoint = "/mnt/mukke";
-  fritzboxMountPoint = "/mnt/fritz";
-
-  streams = import ../../lib/streams.nix {
-    di-fm-key = "%DI_FM_KEY%"; # TODO lib.strings.fileContents <secrets/di.fm/key>;
-  };
-in {
-  users.users.${config.services.mpd.user}.extraGroups = ["pipewire" "audio"];
-
-  services.mpd = {
-    enable = true;
-    network.listenAddress = "0.0.0.0";
-    extraConfig = ''
-      log_level "default"
-      auto_update "yes"
-
-      audio_output {
-        type "pipewire"
-        name "zaatar single room audio system"
-      }
-    '';
-  };
-
-  fileSystems.${mukkeMountPoint} = {
-    device = "//mukke.r/public";
-    fsType = "cifs";
-    options = [
-      "guest"
-      "nofail"
-      "noauto"
-      "ro"
-      "rsize=16777216"
-      "cache=loose"
-    ];
-  };
-
-  fileSystems."${fritzboxMountPoint}" = {
-    device = "//192.168.178.1/FRITZ.NAS/Backup";
-    fsType = "cifs";
-    options = [
-      "username=ftpuser"
-      "password=ftppassword"
-      "noauto"
-      "nounix"
-      "ro"
-      "noserverino" # ref https://askubuntu.com/a/1265165
-    ];
-  };
-
-  systemd.tmpfiles.rules = [
-    (pkgs.lib.niveum.tmpfilesConfig {
-      type = "L+";
-      mode = "0644";
-      user = "mpd";
-      group = "mpd";
-      path = "${config.services.mpd.musicDirectory}/mukke";
-      argument = mukkeMountPoint;
-    })
-    (pkgs.lib.niveum.tmpfilesConfig {
-      type = "L+";
-      mode = "0644";
-      user = "mpd";
-      group = "mpd";
-      path = "${config.services.mpd.musicDirectory}/fritz";
-      argument = "${fritzboxMountPoint}";
-    })
-  ];
-
-  environment.systemPackages = [pkgs.mpc_cli];
-
-  networking.firewall = let
-    dport = config.services.mpd.network.port;
-    protocol = "tcp";
-    rules = [
-      (pkgs.lib.niveum.firewall.accept {
-        inherit dport protocol;
-        source = "192.168.0.0/16";
-      })
-      (pkgs.lib.niveum.firewall.accept {
-        inherit dport protocol;
-        source = "127.0.0.0/8";
-      })
-    ];
-  in {
-    allowedTCPPorts = [80];
-    extraCommands = pkgs.lib.niveum.firewall.addRules rules;
-    extraStopCommands = pkgs.lib.niveum.firewall.removeRules rules;
-  };
-
-  systemd.services.mpd-playlists = {
-    before = ["mpd.service"];
-    wantedBy = ["mpd.service"];
-    script = let
-      tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
-      tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
-      makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
-      playlistDirectory = pkgs.linkFarm "playlists" (
-        [
-          {
-            name = "all.m3u";
-            path = makePlaylist "all" streams;
-          }
-        ]
-        ++ map (tag: {
-          name = "${tag}.m3u";
-          path = makePlaylist tag (tagStreams tag);
-        })
-        tags
-      );
-      playlistDirectoryPath = "/var/lib/mpd/playlists";
-    in ''
-      export DI_FM_KEY="$(cat "$CREDENTIALS_DIRECTORY/di-fm-key")"
-
-      rm -rf ${playlistDirectoryPath}
-      mkdir ${playlistDirectoryPath}
-
-      for m3u in $(ls ${playlistDirectory})
-      do
-        ${pkgs.gnused}/bin/sed s/%DI_FM_KEY%/"$DI_FM_KEY"/g ${playlistDirectory}/"$m3u" > ${playlistDirectoryPath}/"$(basename "$m3u")"
-      done
-    '';
-    serviceConfig = {
-      LoadCredential = [
-        "di-fm-key:${config.age.secrets.di-fm-key.path}"
-      ];
-    };
-  };
-
-  services.ympd = {
-    enable = true;
-    mpd.port = config.services.mpd.network.port;
-  };
-
-  age.secrets = {
-    ympd-basicAuth = {
-      file = ../../secrets/zaatar-ympd-basicAuth.age;
-      owner = "nginx";
-      group = "nginx";
-      mode = "400";
-    };
-    di-fm-key.file = ../../secrets/di-fm-key.age;
-  };
-
-  services.nginx = {
-    enable = true;
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-    virtualHosts."radio.kmein.r" = {
-      basicAuthFile = config.age.secrets.ympd-basicAuth.path;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}";
-        proxyWebsockets = true;
-      };
-    };
-  };
-}