From 38f088d9e5c6f136ba1f22b53dc7f23003a95405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 27 Jan 2021 00:03:32 +0100
Subject: [PATCH] feat(zaatar): clean up mpd

---
 configs/mpd.nix                  |   4 +-
 configs/tuner.nix                |  24 --
 lib/playlists.nix                | 384 -------------------------------
 lib/streams.nix                  |   3 +-
 packages/tuner.nix               |  64 ------
 systems/zaatar/configuration.nix |  34 ---
 6 files changed, 4 insertions(+), 509 deletions(-)
 delete mode 100644 configs/tuner.nix
 delete mode 100644 lib/playlists.nix
 delete mode 100644 packages/tuner.nix

diff --git a/configs/mpd.nix b/configs/mpd.nix
index 8037756..f41227a 100644
--- a/configs/mpd.nix
+++ b/configs/mpd.nix
@@ -1,6 +1,8 @@
 { config, pkgs, lib, ... }:
 let
-  streams = import <niveum/lib/streams.nix> { inherit lib; };
+  streams = import <niveum/lib/streams.nix> {
+    di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
+  };
 in
 {
   imports = [ <niveum/modules/mpd-fm.nix> ];
diff --git a/configs/tuner.nix b/configs/tuner.nix
deleted file mode 100644
index df19642..0000000
--- a/configs/tuner.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, config, lib, ... }:
-let
-  tunerHTML = pkgs.callPackage <niveum/packages/tuner.nix> {
-    playlists = import <niveum/lib/playlists.nix> { inherit lib; };
-  };
-in
-{
-  services.nginx = {
-    enable = true;
-
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedTlsSettings = true;
-
-    virtualHosts.default = {
-      locations."= /tuner".extraConfig = ''
-        default_type text/html;
-        alias ${tunerHTML};
-      '';
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 ];
-}
diff --git a/lib/playlists.nix b/lib/playlists.nix
deleted file mode 100644
index b8e21ed..0000000
--- a/lib/playlists.nix
+++ /dev/null
@@ -1,384 +0,0 @@
-{ lib }:
-let
-  di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
-
-  soma-fm = name: {
-    url = "http://ice1.somafm.com/${name}-128-aac";
-    provider = "soma.fm";
-    inherit name;
-  };
-  di-fm = name: {
-    url = "http://prem2.di.fm/${name}_hi?${di-fm-key}";
-    provider = "di.fm";
-    inherit name;
-  };
-  big-fm = name: {
-    url = "https://streams.bigfm.de/bigfm-${name}-128-aac";
-    provider = "big.fm";
-    inherit name;
-  };
-  we-are-one = name: {
-    url = "http://listen.${name}.fm/tunein-aac-hd-pls";
-    provider = "WeAreOne";
-    inherit name;
-  };
-  rte = name: {
-    url = "https://www.rte.ie/manifests/${name}.m3u8";
-    provider = "Raidió Teilifís Éireann";
-    inherit name;
-  };
-  laut-fm = name: {
-    url = "http://stream.laut.fm/${name}";
-    provider = "laut.fm";
-    inherit name;
-  };
-  rautemusik = name: {
-    url = "http://${name}-high.rautemusik.fm/";
-    provider = "rautemusik.fm";
-    inherit name;
-  };
-  radiosai = name: port: {
-    url = "http://stream.radiosai.net:${toString port}";
-    provider = "Radio Sai";
-    inherit name;
-  };
-  caster-fm = name: subdomain: port: {
-    url = "http://${subdomain}.caster.fm:${toString port}/listen.mp3?authn0b0236758bd0e178156d0787327a055d";
-    provider = "caster.fm";
-    inherit name;
-  };
-in
-{
-  Chill = {
-    description = "Kühlen.";
-    tracks = [
-      {
-        url = "https://radio.lassul.us/radio.ogg";
-        name = "Radio";
-        provider = "lassulus";
-      }
-      {
-        url = "http://1.ice1.firststreaming.com/kkjz_fm.aac";
-        name = "KJazz 88.1";
-        provider = "California State University";
-      }
-      {
-        url = "http://162.244.80.20:6948";
-        name = "Cool Jazz Florida";
-        provider = "cooljazzflorida.com";
-      }
-      (di-fm "ambient")
-      (di-fm "chilledm")
-      (di-fm "chillhop")
-      (di-fm "chillntropicalhouse")
-      (di-fm "chillout")
-      (di-fm "chilloutdreams")
-      (di-fm "chillstep")
-      (di-fm "deephouse")
-      (di-fm "deepprogressivehouse")
-      (di-fm "downtempolounge")
-      (di-fm "dub") # An emphasis on the bass and drums / DnB, delayed effects, sampled vocals and smokey Reggae inspired vibes.
-      (di-fm "indiebeats") # Smooth, groovy and full of cutting-edge, fresh ideas - beats to kick back and enjoy far from the club setting.
-      (di-fm "liquidtrap") # The smoother side of Trap but still packed with mechanical grooves and hip hop moods.
-      (di-fm "lofihiphop")
-      (di-fm "lofiloungenchill")
-      (di-fm "lounge")
-      (di-fm "melodicprogressive")
-      (di-fm "psybient") # The psychedelic side of ambient.
-      (di-fm "psychill")
-      (di-fm "psydub")
-      (di-fm "spacemusic") # Ambient space music for expanding minds.
-      (di-fm "trap")
-      (di-fm "vocalchillout")
-      (di-fm "vocallounge")
-      (soma-fm "beatblender") # A late night blend of deep-house and downtempo chill.
-      (soma-fm "deepspaceone") # Deep ambient electronic, experimental and space music. For inner and outer space exploration.
-      (soma-fm "digitalis") # Digitally affected analog rock to calm the agitated heart.
-      (soma-fm "dronezone") # Served best chilled, safe with most medications. Atmospheric textures with minimal beats.
-      (soma-fm "fluid") # Drown in the electronic sound of instrumental hiphop, future soul and liquid trap.
-      (soma-fm "indiepop") # New and classic favorite indie pop tracks.
-      (soma-fm "lush") # Sensuous and mellow vocals, mostly female, with an electronic influence.
-      (soma-fm "missioncontrol") # Celebrating NASA and Space Explorers everywhere.
-      (soma-fm "reggae") # NEW! Reggae, Ska, Rocksteady classic and deep tracks.
-      (soma-fm "sf1033") # Ambient music mixed with the sounds of San Francisco public safety radio traffic.
-      (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
-      (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
-      (big-fm "reggaevibes")
-      (big-fm "sunsetlounge")
-    ];
-  };
-
-  Brennpunkt = {
-    description = "What focus means.";
-    tracks = [ # What Focus Means
-      (laut-fm "dnbzone")
-      (di-fm "atmosphericbreaks")
-      (di-fm "bigbeat") # Heavily focused on breakbeats and dusty samples. A defining 90s musical movement still going strong today.
-      (di-fm "darkdnb") # Evil, gritty and twisted DnB / Drum & Bass. at 160+ BPM, hear the darkest basslines and the hardest hitting percussion.
-      (di-fm "deeptech")
-      (di-fm "drumandbass")
-      (di-fm "drumstep") # A hybrid of half-time Dubstep and intense Drum and Bass / DnB.
-      (di-fm "dubstep")
-      (di-fm "dubtechno") # The beloved sounds of deep techno saturated with tape delays, heavy reverb and ice cold atmospherics.
-      (di-fm "futuregarage") # 2step Garage rhythms, chunky bass line driven grooves and plenty of forward thinking innovation.
-      (di-fm "jungle") # Jungle keeps the breakbeat tempos high and celebrates the diverse ideas found within urban and rave music.
-      (di-fm "liquiddnb")
-      (di-fm "liquiddubstep")
-      (di-fm "minimal")
-      (di-fm "oldschoolacid") # Acid, one of the characteristics of the TB-303, is celebrated here with the best tracks from house, techno and trance.
-      (di-fm "progressive")
-      (di-fm "techhouse")
-      (di-fm "techno")
-      (di-fm "umfradio")
-      (soma-fm "defcon") # Music for Hacking. The DEF CON Year-Round Channel.
-      (soma-fm "dubstep") # Dubstep, Dub and Deep Bass. May damage speakers at high volume.
-      (soma-fm "groovesalad") # A nicely chilled plate of ambient/downtempo beats and grooves.
-      (soma-fm "gsclassic") # The classic (early 2000s) version of a nicely chilled plate of ambient/downtempo beats and grooves.
-      (soma-fm "secretagent") # The soundtrack for your stylish, mysterious, dangerous life. For Spies and PIs too!
-    ];
-  };
-
-  Post-Musicality = {
-    description = "Makes you wonder whether you are listening to music at all.";
-    tracks = [
-      (rautemusik "wackenradio")
-      (di-fm "classicelectronica")
-      (di-fm "darkpsytrance") # The darker form of PsyTrance, which is a sound all its own – direct from Goa to your headphones.
-      (di-fm "gabber") # The hardest form of techno with punishing tracks designed to drive the crowds into a sweaty frenzy.
-      (di-fm "goapsy")
-      (di-fm "hardtechno") # Tough as nails warehouse jams full of cold aggression, sinister structures and pounding rhythms that hit hard.
-      (di-fm "progressivepsy")
-      (di-fm "undergroundtechno") # From gritty Berlin streets to dark corners of Brooklyn, this is techno made by artists pushing the genre further.
-      (soma-fm "cliqhop") # Blips'n'beeps backed mostly w/beats. Intelligent Dance Music.
-      (soma-fm "metal") # From black to doom, prog to sludge, thrash to post, stoner to crossover, punk to industrial.
-      (we-are-one "coretime")
-    ];
-  };
-
-  "Club Albrecht" = {
-    description = "Party!";
-    tracks = [
-      (rautemusik "club")
-      (rautemusik "house")
-      (rautemusik "bass")
-      (rautemusik "breakz")
-      (laut-fm "electro-swing")
-      (big-fm "dance")
-      (big-fm "groovenight")
-      (big-fm "nitroxdeep")
-      (big-fm "nitroxedm")
-      (big-fm "urbanclubbeats")
-      (di-fm "00sclubhits")
-      (di-fm "bassline") # Blending together elements of house music, speed garage, and techno – it’s all about the low end frequencies.
-      (di-fm "bassnjackinhouse") # From the funkiest grooves to the dirtiest beats. Hard-hitting, high energy 4/4 club cuts to move the masses.
-      (di-fm "bigroomhouse") # Fusing together house elements from the past and the present - prime time music full of uplifting high energy.
-      (di-fm "classiceurodance")
-      (di-fm "club")
-      (di-fm "clubdubstep")
-      (di-fm "deepnudisco")
-      (di-fm "detroithousentechno") # Where would dance music be without Detroit? The city that started it all continues to inspire and educate.
-      (di-fm "discohouse")
-      (di-fm "djmixes")
-      (di-fm "edm")
-      (di-fm "edmfestival")
-      (di-fm "electrohouse")
-      (di-fm "electronicpioneers") # The trailblazers, the renegades and the experimental musicians who gave early inspiration with electronic instruments.
-      (di-fm "electroswing") # The combination of 1920s-1940s jazz and swing music, big band horns and modern day electro house.
-      (di-fm "eurodance")
-      (di-fm "funkyhouse")
-      (di-fm "futurebass") # Hard basslines, booming beats and insatiable grooves. Inspired by Trap, Juke and Garage - molded together into a unique booming style.
-      (di-fm "futuresynthpop") # Finest selection of futurepop and synthpop.
-      (di-fm "glitchhop") # The sound of digital malfunctions, electric hum and bit rate distortions perfectly placed alongside laid-back hip hop beats.
-      (di-fm "handsup") # A channel showcasing everything from hard dance, trance and happy hardcore to lift the spirits (and the arms).
-      (di-fm "hardcore") # Strictly for the hardcore. These are the biggest and boldest bangers, and the hardest hitting tracks.
-      (di-fm "harddance") # Concrete kicks and punching rhythms, hard dance is a tougher side of music with sharp edges and aggressive power.
-      (di-fm "hardstyle") # Hard techno & hardcore. A global phenomenon with powerful kicks, distorted effects and infectious melodies.
-      (di-fm "house")
-      (di-fm "indiedance")
-      (di-fm "jazzhouse") # One of the biggest cultural soundtracks with the infectious thump of house music. Expect sultry saxophones, trumpets, and finger snapping grooves.
-      (di-fm "latinhouse") # The sounds of Salsa, Brazilian beats and Latin Jazz with the steady grooves of modern East Coast dance music.
-      (di-fm "nightcore") # Pitched up vocals, happy hardcore beats, and high energy music non-stop.
-      (di-fm "nudisco") # Modern disco music blending the familiar funk of the 70s and 80s with futuristic beats and up to date grooves.
-      (di-fm "oldschoolhouse") # The biggest classics and secret weapons – this is a true treasure chest of house tracks from back in the day.
-      (di-fm "oldschoolrave") # Grab your whistles, white gloves and reach for the laser beams. This is the sound of raving when raving was new.
-      (di-fm "soulfulhouse") # House music saturated with feeling – full of melodies, vocals and true soul. Steady warm 4/4 vibes.
-      (di-fm "summerchillhouse")
-      (di-fm "tribalhouse") # The percussive side of the house and tech house scene, tribal house takes drums and puts them in the forefront.
-      (di-fm "vocalhouse")
-      (soma-fm "poptron") # Electropop and indie dance rock with sparkle and pop.
-      (soma-fm "spacestation") # Tune in, turn on, space out. Spaced-out ambient and mid-tempo electronica.
-      (we-are-one "clubtime")
-      (we-are-one "hardbase")
-      (we-are-one "housetime")
-      (we-are-one "teatime")
-      (we-are-one "technobase")
-    ];
-  };
-
-  HipHop = {
-    description = "";
-    tracks = [
-      (rautemusik "deutschrap-charts")
-      (rautemusik "deutschrap-classic")
-      (big-fm "deutschrap")
-      (big-fm "hiphop")
-      (big-fm "oldschool")
-      (big-fm "oldschooldeutsch")
-      (big-fm "rapfeature")
-      (big-fm "usrap")
-      # (di-fm "breaks") # Inspired by hip hop and UK rave music, breaks features broken up drum loops and creative samples, synths and fx.
-      (rte "pulse")
-    ];
-  };
-
-  Wave = {
-    description = "";
-    tracks = [
-      (di-fm "classiceurodisco") # Conceived in the European discos in the 70s, evolving through the decades into modern electronic masterpieces.
-      (di-fm "electropop") # Catchy pop music blended together with vintage synthesizers and electronic instrumentation.
-      (di-fm "synthwave")
-      (soma-fm "seventies") # Mellow album rock from the Seventies. Yacht not required.
-      (soma-fm "u80s") # Early 80s UK Synthpop and a bit of New Wave.
-      (soma-fm "vaporwaves") # All Vaporwave. All the time.
-    ];
-  };
-
-  Trance = {
-    description = "";
-    tracks = [
-      (laut-fm "uplifting-trance-radio")
-      (rautemusik "trance")
-      (di-fm "classictrance")
-      (di-fm "classicvocaltrance")
-      (di-fm "epictrance")
-      (di-fm "trance")
-      (di-fm "vocaltrance")
-      (soma-fm "thetrip") # Progressive house / trance. Tip top tunes.
-      (we-are-one "trancebase")
-    ];
-  };
-
-  i18n = {
-    description = "Country and culture specific music.";
-    tracks = [
-      {
-        url = "http://62.210.24.124:8379/;stream.mp3"; # Gjirokastër
-        provider = "Alpomedia";
-        name = "Gjirokastër";
-      }
-      {
-        url = "http://iphone.live24.gr/derty1000"; # derti – μόνο λαϊκά
-        name = "μόνο λαϊκά";
-        provider = "Derti";
-      }
-      {
-        url = "https://knr.gl/radiolivestream"; # kalaallit nunaata radioa
-        provider = "KNR";
-        name = "Kalaallit Nunaata Radioa";
-      }
-      {
-        provider = "VahonFM";
-        name = "Hindustani";
-        url = "http://94.23.148.11:8058/";
-      }
-      {
-        url = "http://188.247.86.67:8008";
-        name = "Jordanian";
-        provider = "Rotana Tarab";
-      }
-      (caster-fm "Sitha FM" "shaincast" 48148)
-      (radiosai "Asia" 8002)
-      (radiosai "Ameri" 8006)
-      (radiosai "Bhajan" 8000)
-      (big-fm "balkan")
-      (big-fm "latinbeats")
-      (big-fm "orient")
-      (big-fm "russia")
-      (big-fm "turkey")
-      (big-fm "worldbeats")
-      (di-fm "russianclubhits")
-      (rautemusik "partyhits")
-      (rautemusik "volksmusik")
-      (rte "rnag") # Raidió na Gaeltachta
-      (soma-fm "bootliquor") # Americana Roots music for Cowhands, Cowpokes and Cowtippers
-      (soma-fm "suburbsofgoa") # Desi-influenced Asian world beats and beyond.
-      (soma-fm "thistle") # Exploring music from Celtic roots and branches
-    ];
-  };
-
-  Out-There = {
-    description = "Music that is very out-there.";
-    tracks = [
-      {
-        url = "http://klassikr.streamabc.net/klassikradio-simulcast-mp3-hq"; # Klassikradio
-        name = "Klassikradio";
-        provider = "Klassik Radio GmbH & Co. KG";
-      }
-      {
-        url = "http://www.beatlesradio.com:8000/stream";
-        name = "Beatles";
-        provider = "beatlesradio.com";
-      }
-      (caster-fm "Antenne-ASB.ga" "shaincast" 17656)
-      # "http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de"
-      # (soma-fm "scanner") # San Francisco Public Safety Scanner Feed
-      (rautemusik "rock")
-      (rautemusik "12punks")
-      (rte "2xm") # Alternative
-      (rte "gold") # Oldies
-      (rte "lyric") # "Classical and specialist music"
-      (soma-fm "7soul") # Vintage soul tracks from the original 45 RPM vinyl.
-      (soma-fm "bagel") # What alternative rock radio should sound like. [explicit]
-      (soma-fm "brfm") # From the Playa to the world, for the annual Burning Man festival.
-      (soma-fm "covers") # Just covers. Songs you know by artists you don't. We've got you covered.
-      (soma-fm "folkfwd") # Indie Folk, Alt-folk and the occasional folk classics.
-      (soma-fm "illstreet") # Classic bachelor pad, playful exotica and vintage music of tomorrow.
-      (soma-fm "live") # Special Live Events and rebroadcasts of past live events
-      (soma-fm "sonicuniverse") # Transcending the world of jazz with eclectic, avant-garde takes on tradition.
-      (soma-fm "specials") # For Halloween: Dark industrial/ambient music for tortured souls.
-    ];
-  };
-
-  Weihnacht = {
-    description = "";
-    tracks = [
-      (soma-fm "christmas") # Chilled holiday grooves and classic winter lounge tracks. (Kid and Parent safe!)
-      (soma-fm "jollysoul") # Where we cut right to the soul of the season.
-      (soma-fm "xmasinfrisko") # SomaFM's wacky and eclectic holiday mix. Not for the easily offended.
-      (soma-fm "xmasrocks") # Have your self an indie/alternative holiday season!
-    ];
-  };
-
-  Charts = {
-    description = "";
-    tracks = [
-      (rautemusik "main")
-      (rautemusik "workout")
-      (rautemusik "jam")
-      (rautemusik "charthits")
-      (rautemusik "top40")
-      {
-        url = "http://185.80.220.12:8166/stream"; # "Raidió Rírá"
-        name = "Raidió Rí-Rá";
-        provider = "Conradh na Gaeilge";
-      }
-      (big-fm "charts")
-      (big-fm "deutschland")
-      (big-fm "mashup")
-      (rte "2fm")
-    ];
-  };
-
-  Talk = {
-    description = "";
-    tracks = [
-      (rte "radio1")
-      (rte "radio1extra")
-      {
-        url = "http://server25531.streamplus.de/;stream.mp3";
-        provider = "DWG Radio";
-        name = "Bibelradio";
-      }
-    ];
-  };
-}
diff --git a/lib/streams.nix b/lib/streams.nix
index ce9ce86..9a7cfae 100644
--- a/lib/streams.nix
+++ b/lib/streams.nix
@@ -1,8 +1,7 @@
-{ lib }:
+{ di-fm-key }:
 # DI generated via: cat /tmp/di-fm.html| pup '.channel-tile-component json{}' | jq 'map({logo: .children[0].children[1].children[1].src | sub("^"; "http:"), station: .children[3].children[0].children[0].text, desc: .children[3].children[1].text | gsub("\\s+"; " ")})'  > /tmp/di-fm.json
 # soma.fm generated via: curl https://somafm.com/ | pup '.cbshort json{}' | jq 'map({logo:.children[0].children[0].src|sub("^"; "http://soma.fm"), desc: .children[2].text, station: .children[1].text})'
 let
-  di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
   di-fm-name = name: "${name} | DI.FM";
   di-fm = name: "http://prem2.di.fm/${name}_hi?${di-fm-key}";
 
diff --git a/packages/tuner.nix b/packages/tuner.nix
deleted file mode 100644
index bd29060..0000000
--- a/packages/tuner.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ pkgs, playlists }:
-let
-  inherit (pkgs) lib;
-  trackHTML = {url, provider, name}: ''
-    <tr>
-      <th>${name}</th>
-      <td><small>${provider}</small></td>
-      <td>
-        <audio controls>
-          <source src="${url}">
-          Your browser does not support the audio tag.
-        </audio>
-      </td>
-    </tr>
-  '';
-  playlistSection = name: {description, tracks}: ''
-    <section>
-      <header>
-      <h2 id="${lib.strings.sanitizeDerivationName name}">${name}</h2>
-      <p>${description}</p>
-      </header>
-      <table>
-        <thead>
-          <th>Name</th>
-          <th>Provider</th>
-          <th>Player</th>
-        </thead>
-        ${builtins.concatStringsSep "\n\n" (map trackHTML tracks)}
-      </table>
-    </section>
-  '';
-in pkgs.writeText "tuner.html" ''
-  <!doctype html>
-  <html>
-    <head>
-      <meta charset="utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-      <title>Tuner</title>
-      <link rel="stylesheet" href="https://unpkg.com/mvp.css">
-    </head>
-    <body>
-      <header>
-        <nav>
-            <a href="#">Tuner</a>
-            <small>kmein's webradio hub</small>
-            <ul>
-              <li>
-                Playlists
-                <ul>
-                  ${builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: {...}: ''<li><a href="#${lib.strings.sanitizeDerivationName name}">${name}</a></li>'') playlists)}
-                </ul>
-              </li>
-            </ul>
-        </nav>
-      </header>
-      <main>
-        ${builtins.concatStringsSep "\n<hr/>\n" (lib.mapAttrsToList playlistSection playlists)}
-      </main>
-      <footer>
-        <p><small>&copy; kmein 2020</small></p>
-      </footer>
-    </body>
-  </html>
-''
diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix
index c795879..f2f2bff 100644
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -5,7 +5,6 @@
     <niveum/configs/wifi.nix>
     <niveum/configs/keyboard.nix>
     <niveum/modules/retiolum.nix>
-    <niveum/configs/tuner.nix>
     <niveum/configs/spacetime.nix>
     <niveum/configs/mpd.nix>
     <niveum/configs/sshd.nix>
@@ -27,9 +26,6 @@
         '')
       ];
     }
-    {
-      services.illum.enable = true;
-    }
     {
       environment.systemPackages = [ pkgs.tmux ];
       systemd.services.turntables = {
@@ -48,36 +44,6 @@
         };
       };
     }
-    /* {
-      users.extraUsers.kiosk = {
-        isNormalUser = true;
-        password = "";
-        extraGroups = [ "audio" ];
-      };
-      services.cage = {
-        enable = true;
-        user = config.users.extraUsers.kiosk.name;
-        extraArguments = [ "-s" ]; # allow vt switching
-        program =
-        let startUrl = "https://youtube.com";
-        in pkgs.writers.writeDash "kiosk-browser" ''
-          while true; do
-            ${pkgs.chromium}/bin/chromium \
-              --no-first-run --no-message-box --noerrdialogs \
-              --default-browser --no-default-browser-check \
-              --start-maximized --kiosk ${startUrl}
-            sleep 0.5
-          done
-        '';
-      };
-      systemd.services.cage-tty1.environment.XKB_DEFAULT_LAYOUT = "de";
-      programs.chromium = {
-        enable = true;
-        extensions = [
-          "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-        ];
-      };
-    } */
   ];
 
   nix.nixPath = [ "/var/src" ];