have strm send to sif

6 files changed, 14 insertions, 7 deletions

diff --git a/odin/strm.nix b/odin/strm.nix
index 487fd170..70034404 100644
--- a/odin/strm.nix
+++ b/odin/strm.nix
@@ -51,6 +51,8 @@ in stdenv.mkDerivation {
   youtubedl = youtube-dl;
   rollingdirectory = rolling-directory;
 
+  remoteNode = "sif";
+
   buildPhase = ''
     substituteAllInPlace download_youtube
     substituteAllInPlace cleanup_youtube
diff --git a/odin/strm/cache_media b/odin/strm/cache_media
index c34e20fe..a6bd4732 100644
--- a/odin/strm/cache_media
+++ b/odin/strm/cache_media
@@ -42,5 +42,5 @@ while {
 done
 
 if ${acted}; then
-    systemctl --no-block start uucico@hel.service
+    systemctl --no-block start uucico@@remoteNode@.service
 fi
diff --git a/odin/strm/download_youtube b/odin/strm/download_youtube
index f669fda4..f8c05fdf 100644
--- a/odin/strm/download_youtube
+++ b/odin/strm/download_youtube
@@ -348,10 +348,10 @@ printf ">>> %s <<<\n  %s\n" "${msgId}" "${message}"
       if [[ -n "$(notmuch search "tag:inbox AND $msgId")" ]]; then
           if [[ ${msgTags[(i)tv]} -le $#msgTags ]]; then
               printf "%s\n%s\n" "Media available on odin" "${title}" \
-                  | uux -r -p -n 'hel!notify-gkleen' -a download_youtube -u normal \
-                  && print "Sent notification to hel via uucp"
+                  | uux -r -p -n '@remoteNode@!notify-gkleen' -a download_youtube -u normal \
+                  && print "Sent notification to @remoteNode@ via uucp"
           else
-              queue.hel -r "${filename}" && notmuch tag '-inbox' '-unread' -- $msgId
+              queue.@remoteNode@ -r "${filename}" && notmuch tag '-inbox' '-unread' -- $msgId
           fi
       else
           print "Message vanished from inbox" >&2
diff --git a/odin/strm/send_kitty b/odin/strm/send_kitty
index a1b7e836..ccebc361 100644
--- a/odin/strm/send_kitty
+++ b/odin/strm/send_kitty
@@ -42,5 +42,5 @@ tmpFile=$(mktemp --tmpdir=${concatDir} "${newfile:h}/.${newFile:t:r}.XXXXXX.mkv"
 ffmpeg -y -safe 0 -f concat -i =(awk $'{ print "file \'"$0"\'" }' ${fList}) -c:v libx264 -r 30 -crf 27 -preset veryfast -vf 'scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2' -metadata "description=$(xargs -a ${fList} -- basename -s ".mkv")" ${tmpFile}
 chmod 440 ${tmpFile}
 mv -v ${tmpFile} ${newFile}
-queue.hel -p -r ${newFile}
+queue.@remoteNode@ -p -r ${newFile}
 ln -vfs $(realpath --relative-to=${lastFile:h} ${newFile}) ${lastFile}
diff --git a/odin/strm/send_media b/odin/strm/send_media
index 4f3e576b..ecd6148f 100644
--- a/odin/strm/send_media
+++ b/odin/strm/send_media
@@ -73,9 +73,9 @@ while {
               args=(-f $args)
               force=$(($force - 1))
           fi
-          queue.hel $args && notmuch tag -unread -inbox -- ${(q)id}
+          queue.@remoteNode@ $args && notmuch tag -unread -inbox -- ${(q)id}
         ) 9<>"${message}"
     done
 done
 
-[[ -z "${checkedIds}" ]] && queue.hel
+[[ -z "${checkedIds}" ]] && queue.@remoteNode@
diff --git a/sif/hw.nix b/sif/hw.nix
index 17293c90..1a20bcf5 100644
--- a/sif/hw.nix
+++ b/sif/hw.nix
@@ -20,6 +20,11 @@
       fsType = "btrfs";
     };
 
+  fileSystems."/var/media" =
+    { device = "/dev/disk/by-uuid/437eca70-d017-4d52-a1fa-2f4c7a87f096";
+      fsType = "btrfs";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/50f3f856-cc17-4614-846a-34a14d5006ec"; }
     ];