nix

commit 3ec33a6273620afe13386babaf8dbfc012032bbf
parent cc25e5e1300b6c9bdfbd0e61597d0c9d1a95ade5
Author: mtmn <miro@haravara.org>
Date:   Thu, 23 Apr 2026 13:08:38 +0200

chore: add lastfm user to corpus

Diffstat:
M
modules/mixins/corpus/users.dhall
 | 
1
+
M
modules/services/mpdscribble.nix
 | 
43
++++++++++++++++++++++---------------------

2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/modules/mixins/corpus/users.dhall b/modules/mixins/corpus/users.dhall
@@ -27,6 +27,7 @@ in  { users =
         , config =
             defaults
             with listenbrainzUser = Some "mtmn"
+            with lastfmUser = Some "mtmnn"
             with databaseFile = "corpus.db"
             with backupEnabled = True
         }
diff --git a/modules/services/mpdscribble.nix b/modules/services/mpdscribble.nix
@@ -50,32 +50,33 @@ in {
           ++ (lib.optional (cfg.passwordFile != null) "password:${toString cfg.passwordFile}");
 
         ExecStart = pkgs.writeShellScript "mpdscribble-start" ''
-          CONF_FILE="$STATE_DIRECTORY/mpdscribble.conf"
+                    CONF_FILE="$STATE_DIRECTORY/mpdscribble.conf"
 
-          # Start with a clean config
-          echo "[mpd]" > "$CONF_FILE"
+                    MPD_HOST="localhost"
+                    if [ -f "$CREDENTIALS_DIRECTORY/mpd_host" ]; then
+                      MPD_HOST=$(cat "$CREDENTIALS_DIRECTORY/mpd_host")
+                    fi
 
-          if [ -f "$CREDENTIALS_DIRECTORY/mpd_host" ]; then
-            MPD_HOST=$(cat "$CREDENTIALS_DIRECTORY/mpd_host")
-            echo "host = $MPD_HOST" >> "$CONF_FILE"
-          else
-            echo "host = localhost" >> "$CONF_FILE"
-          fi
-          echo "port = ${toString cfg.mpdPort}" >> "$CONF_FILE"
+                    PASSWORD=""
+                    if [ -f "$CREDENTIALS_DIRECTORY/password" ]; then
+                      PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/password")
+                    fi
 
-          echo "" >> "$CONF_FILE"
-          echo "[last.fm]" >> "$CONF_FILE"
-          echo "url = ${cfg.serviceUrl}" >> "$CONF_FILE"
-          echo "username = ${cfg.username}" >> "$CONF_FILE"
+                    cat > "$CONF_FILE" <<EOF
+          # Global settings
+          verbose = 2
+          log = -
+          host = $MPD_HOST
+          port = ${toString cfg.mpdPort}
 
-          if [ -f "$CREDENTIALS_DIRECTORY/password" ]; then
-            PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/password")
-            echo "password = $PASSWORD" >> "$CONF_FILE"
-          fi
+          [last.fm]
+          url = ${cfg.serviceUrl}
+          username = ${cfg.username}
+          password = $PASSWORD
+          journal = $STATE_DIRECTORY/lastfm.journal
+          EOF
 
-          echo "journal = $STATE_DIRECTORY/lastfm.journal" >> "$CONF_FILE"
-
-          exec ${pkgs.mpdscribble}/bin/mpdscribble --no-daemon --conf "$CONF_FILE"
+                    exec ${pkgs.mpdscribble}/bin/mpdscribble --no-daemon --conf "$CONF_FILE"
         '';
         Restart = "always";
         DynamicUser = true;