seems to work a lot better

base/Dockerfile

@@ -16,8 +16,9 @@ WORKDIR /home/x
 
 ## Install Yay incase we need it
 RUN sudo pacman -S --noconfirm git base-devel
-RUN git clone https://aur.archlinux.org/yay.git \
- && cd yay \
+COPY ./yay yay
+RUN sudo chown -R x:x yay
+RUN cd yay \
  && makepkg -si --noconfirm \
  && cd .. && rm -rf yay \
  && yay -Syu
@@ -41,6 +42,9 @@ COPY ./nvim /home/x/.config/nvim
 # Just to avoid lengthy startups but we'll see how this approach goes.
 RUN nvim --headless "+Lazy! update" +qa
 
+## Install OpenSSH
+RUN sudo pacman -Sy --noconfirm openssh
+
 # Install Tmux
 RUN sudo pacman -S --noconfirm tmux
 COPY tmux/tmux.conf /home/x/.tmux.conf
@@ -49,17 +53,16 @@ COPY tmux/tmux.conf /home/x/.tmux.conf
 # Should already be installed for Yay but repeating stuff to keep everything in blocks
 RUN sudo pacman -S --noconfirm git
 RUN mkdir -p /home/x/.config/git
-#COPY ~/.gitconfig /home/x/.gitconfig
-COPY git/confs/ /home/x/.config/git/
 
-## Tofu
-# Might run into version issues because AUR isn't a versioned repo.
-RUN yay -Syu --noconfirm opentofu
-
-## AWS CLI
-RUN yay -Syu --noconfirm aws-cli-v2
+## Entrypoint
+# This entrypoint allows us to avoid jank ssh agent jazz
+USER root
+COPY entrypoint.sh /entrypoint.sh
+RUN chown x:x /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+USER x
 
 ## Quick drop password at end of build output
 RUN echo "Your password: $PASS"
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/entrypoint.sh"]

base/entrypoint.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Start the ssh-agent if it's not already running
+if [ ! -S /tmp/ssh-agent.sock ]; then
+    eval $(ssh-agent -a /tmp/ssh-agent.sock)
+fi
+
+# Export environment variables globally
+export SSH_AUTH_SOCK=/tmp/ssh-agent.sock
+echo "export SSH_AUTH_SOCK=/tmp/ssh-agent.sock" >> /etc/profile.d/ssh-agent.sh
+
+# Optionally preload keys
+# ssh-add /path/to/id_rsa
+
+# Start tmux
+SSH_AUTH_SOCK=/tmp/ssh-agent.sock tmux

base/yay

@@ -0,0 +1 @@
+Subproject commit 59714d8ae3dc1e5790228c1faeef8283b0c0101f