using ttyd provided in /home/heywoodlh/.nix-profile/bin/ttyd if avail…

…able

dev/Dockerfile

@@ -1,16 +1,8 @@
-FROM docker.io/heywoodlh/nix:latest AS ttyd-builder
-
-RUN nix bundle --bundler "github:nixos/bundlers#toDEB" "github:heywoodlh/flakes?dir=ttyd-nerd" -o /ttyd
-
 FROM docker.io/heywoodlh/nix:latest
 LABEL MAINTAINER=heywoodlh
 
-COPY --from=ttyd-builder /ttyd /ttyd
-
-RUN apt update && apt install -y curl openssh-server mosh supervisor sudo \
-    && dpkg -i /ttyd/*.deb \
-    && rm -rf /var/lib/apt/lists/* #\
-    && rm -rf /ttyd
+RUN apt update && apt install -y ttyd curl openssh-server mosh supervisor sudo \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN userdel ubuntu \
     && addgroup --gid 1000 heywoodlh \

dev/heywoodlh.sh

@@ -6,6 +6,9 @@ then
     curl -H 'Cache-Control: no-cache' -L https://files.heywoodlh.io/scripts/linux.sh | bash -s -- server \
         && rm -rf /home/heywoodlh/.cache/nix/
 
+    # nerd-font ttyd
+    nix profile install "github:heywoodlh/flakes?dir=ttyd-nerd#ttyd"
+
     ## kill ttyd after tmux install
     [[ -e /home/heywoodlh/.nix-profile/bin/tmux ]] && sudo pkill -9 ttyd
 fi

dev/ttyd.sh

@@ -10,4 +10,9 @@ fi
 COMMAND="/bin/bash"
 [[ -e /home/heywoodlh/.nix-profile/bin/tmux ]] && COMMAND="/home/heywoodlh/.nix-profile/bin/tmux"
 
-/bin/ttyd -W -t fontSize=16 -t fontFamily="JetBrains" -p 80 --uid 1000 --gid 1000 -w /home/heywoodlh --writable ${TTYD_ARGS} ${COMMAND}
+if [[ -e /home/heywoodlh/.nix-profile/bin/ttyd ]]
+then
+    /home/heywoodlh/.nix-profile/bin/ttyd -W -t fontSize=16 -t fontFamily="JetBrains" -p 80 --uid 1000 --gid 1000 -w /home/heywoodlh --writable ${TTYD_ARGS} ${COMMAND}
+else
+    /usr/bin/ttyd -W -t fontSize=16 -t fontFamily="JetBrains" -p 80 --uid 1000 --gid 1000 -w /home/heywoodlh --writable ${TTYD_ARGS} ${COMMAND}
+fi