chore(tahina): clean

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];
 }

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."/" = {
-    device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
-    fsType = "xfs";
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+      fsType = "xfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9B2F-31E1";
+      fsType = "vfat";
+    };
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/9B2F-31E1";
-    fsType = "vfat";
-  };
-
-  swapDevices = [];
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 2048;
+    }
+  ];
 
   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
-    stations = lib.lists.imap0 (id: {
-      desc ? "",
-      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.ympd = {
+    enable = true;
+    mpd.port = config.services.mpd.network.port;
   };
 
   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;
       };
     };