fix(monitoring): remove tahina

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a8d00f5c038cf7ec54e7dac9c57b171c1217f008' (2022-03-13)
  → 'github:nix-community/home-manager/0bdbdea2e26c984b096f4f7d10e3c88536a980b0' (2022-04-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d2caa9377539e3b5ff1272ac3aa2d15f3081069f' (2022-03-22)
  → 'github:NixOS/nixpkgs/6f88260faaaa3cda8f4e478be72be6c0861c47ad' (2022-04-01)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/6de161729c81dc98e844793cc9c8fda29d5ef62a' (2022-03-26)
  → 'github:NixOS/nixpkgs/21299f3dd3ff475f19bc8933f30ebb6a135799f1' (2022-04-02)
• Updated input 'scripts':
    'github:kmein/scripts/d1d525b92a34e55b1ad886807c284106e58716b2' (2022-03-26)
  → 'github:kmein/scripts/f5df67a2416d8f05a7dbfea269c44668854c7887' (2022-03-27)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=master&rev=ae9c0b12710b5361d0d45510eb401eebfc1b3fb0' (2022-03-25)
  → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd' (2022-03-28)

configs/cloud.nix

@@ -19,6 +19,7 @@
   '';
 
   home-manager.users.me = {
+    services.gnome-keyring.enable = true;
     services.nextcloud-client = {
       enable = true;
       startInBackground = true;

configs/default.nix

@@ -262,5 +262,6 @@ in {
     ./vscode.nix
     ./watson.nix
     ./zsh.nix
+    ./tor.nix
   ];
 }

configs/packages.nix

@@ -161,7 +161,7 @@ in {
     scripts.vimv
     scripts.swallow # window swallowing
     scripts.literature-quote
-    scripts.nav # json navigation
+    jless # less(1) for json
     scripts.notetags
     scripts.booksplit
     scripts.dmenurandr

configs/tor.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   services.tor.enable = true;
-  services.tor.torsocks.enable = true;
+  environment.systemPackages = [pkgs.tor];
 }

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1647175256,
+        "lastModified": 1648834319,
-        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
+        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
+        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1647992509,
+        "lastModified": 1648830526,
-        "narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
+        "narHash": "sha256-vXaBIvst+KvXSRAjYBDzX4vtQERL5R4fe0/7585Msqk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
+        "rev": "6f88260faaaa3cda8f4e478be72be6c0861c47ad",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1648337267,
+        "lastModified": 1648941300,
-        "narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
+        "narHash": "sha256-EYBrvRKf1DGxICfVthCmMYVivTbm8ZMFELjT5x7yQhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
+        "rev": "21299f3dd3ff475f19bc8933f30ebb6a135799f1",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1648314795,
+        "lastModified": 1648400983,
-        "narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
+        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
+        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1648214990,
+        "lastModified": 1648481223,
-        "narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
+        "narHash": "sha256-8tc3wCjUs1JQZKOU/eJy4s2jchEA2cf/62JaA4HAfqo=",
         "ref": "master",
-        "rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
+        "rev": "b9e0a7ec71e0318a992ff2b275a6aaee3cef63bd",
-        "revCount": 10497,
+        "revCount": 10498,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

systems/makanek/monitoring/default.nix

@@ -238,16 +238,6 @@ in {
         }
       ];
     }
-    {
-      job_name = "tahina";
-      static_configs = [
-        {
-          targets = [
-            "tahina.r:${toString config.services.prometheus.exporters.node.port}"
-          ];
-        }
-      ];
-    }
   ];
 
   services.prometheus.exporters.blackbox = {

systems/tahina/configuration.nix

@@ -11,23 +11,22 @@ in {
     <niveum/configs/spacetime.nix>
     <niveum/modules/retiolum.nix>
     <niveum/configs/sshd.nix>
-    {
-      console.keyMap = "de";
-      i18n.defaultLocale = "de_DE.UTF-8";
-      services.xserver = {
-        layout = "de";
-        libinput.enable = true;
-      };
-    }
-    {
-      nix.nixPath = ["/var/src"];
-    }
   ];
 
+  nix.nixPath = ["/var/src"];
+
+  console.keyMap = "de";
+  i18n.defaultLocale = "de_DE.UTF-8";
+  services.xserver = {
+    layout = "de";
+    libinput.enable = true;
+  };
+
   users.users.xenos = {
     name = "xenos";
     password = "xenos";
     isNormalUser = true;
+    extraGroups = ["networkmanager"];
   };
 
   services.xserver = {

systems/tahina/hardware-configuration.nix

@@ -26,17 +26,23 @@
     extraModulePackages = [];
   };
 
-  fileSystems."/" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+    "/" = {
-    fsType = "xfs";
+      device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+      fsType = "xfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9B2F-31E1";
+      fsType = "vfat";
+    };
   };
 
-  fileSystems."/boot" = {
+  swapDevices = [
-    device = "/dev/disk/by-uuid/9B2F-31E1";
+    {
-    fsType = "vfat";
+      device = "/swapfile";
-  };
+      size = 2048;
-
+    }
-  swapDevices = [];
+  ];
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

systems/zaatar/tuna.nix

@@ -72,11 +72,20 @@ in {
   };
 
   system.activationScripts.mpd-playlists = let
-    playlistFile = pkgs.writeText "radio.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
+    makePlaylist = name: streams: pkgs.writeText "name.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
+    tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
   in ''
     rm -rf /var/lib/mpd/playlists
     install -d /var/lib/mpd/playlists
-    ln -sfn "${toString playlistFile}" "/var/lib/mpd/playlists/radio.m3u"
+    ln -sfn "${toString (makePlaylist "all" streams)}" "/var/lib/mpd/playlists/all.m3u"
+    ${lib.concatMapStringsSep "\n" (
+        tag: let
+          playlistStreams = lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+        in ''
+          ln -sfn "${toString (makePlaylist tag playlistStreams)}" "/var/lib/mpd/playlists/${tag}.m3u"
+        ''
+      )
+      tags}
   '';
 
   services.tuna = {
@@ -87,33 +96,15 @@ in {
       logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
       stream,
       station,
+      ...
     }: {inherit id desc logo stream station;})
     streams;
-    webPort = 8080;
+    webPort = 7044;
   };
 
-  systemd.services.tuna-stations = let
+  services.ympd = {
-    stations = lib.lists.imap0 (id: {
+    enable = true;
-      desc ? "",
+    mpd.port = config.services.mpd.network.port;
-      logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
-      stream,
-      station,
-    }: {inherit id desc logo stream station;})
-    streams;
-    stationsJson = (pkgs.formats.json {}).generate "stations.json" stations;
-  in {
-    enable = false;
-    wantedBy = ["tuna.service"];
-    startAt = "hourly";
-    script = ''
-      mkdir -p /etc/tuna
-      antenne_asb_url=$(
-        ${pkgs.curl}/bin/curl -sS 'https://www.caster.fm/widgets/em_player.php?jsinit=true&uid=529295&t=blue&c=' \
-          | grep streamUrl \
-          | sed ${lib.escapeShellArg "s/^.*'\\([^']*\\)'.*/\\1/"}
-      )
-      ${pkgs.jq}/bin/jq "map(if .station == \"Antenne ASB\" then .stream |= \"$antenne_asb_url\" else . end)" < ${stationsJson} > /etc/tuna/stations.json
-    '';
   };
 
   services.nginx = {
@@ -125,7 +116,7 @@ in {
     virtualHosts."radio.kmein.r" = {
       basicAuth.dj = password;
       locations."/" = {
-        proxyPass = "http://127.0.0.1:${toString config.services.tuna.webPort}";
+        proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}";
         proxyWebsockets = true;
       };
     };