# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1727556558 14400
# Node ID be286d8b276408e6919e21f003e74cd7856d7136
# Parent  7b2e34e1c161a553ba7b9061de8bc3c5cdc02acd
emacs fixes

diff -r 7b2e34e1c161 -r be286d8b2764 Containerfile.dev
--- a/Containerfile.dev	Tue Sep 24 15:53:20 2024 -0400
+++ b/Containerfile.dev	Sat Sep 28 16:49:18 2024 -0400
@@ -40,7 +40,7 @@
 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
 WORKDIR ${DEV_HOME}
 RUN rm -rf ${DEV_HOME}/.stash/*
-RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${DEV}
+RUN hg clone https://vc.compiler.company/infra/home .stash/home && cd .stash/home && hg up ${DEV}
 RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc
 RUN homer install
 ENV DEV=${DEV}
diff -r 7b2e34e1c161 -r be286d8b2764 Containerfile.emacs
--- a/Containerfile.emacs	Tue Sep 24 15:53:20 2024 -0400
+++ b/Containerfile.emacs	Sat Sep 28 16:49:18 2024 -0400
@@ -1,5 +1,5 @@
 FROM localhost/operator:latest
 # bootstrap
-RUN emacs --load ~/.emacs.d/init.el --kill
+RUN emacs --batch --load ~/.emacs.d/init.el --kill
 ENTRYPOINT [ "emacs" ]
 
diff -r 7b2e34e1c161 -r be286d8b2764 Containerfile.operator
--- a/Containerfile.operator	Tue Sep 24 15:53:20 2024 -0400
+++ b/Containerfile.operator	Sat Sep 28 16:49:18 2024 -0400
@@ -4,18 +4,20 @@
 RUN echo "operator ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/operator
 RUN --network=host pacman -Sy aspell hunspell-en_us --noconfirm
 RUN pacman -Scc --noconfirm
+USER operator
 WORKDIR /home/operator
 RUN hg clone https://vc.compiler.company/infra .stash/infra
 RUN hg clone https://vc.compiler.company/core .stash/core
 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
+RUN mkdir .emacs.d
 WORKDIR .stash/infra
-RUN mkdir -pv .stash/tmp
 RUN sudo skel build emacs
 RUN sudo skel install emacs
 RUN sudo skel clean
 WORKDIR /home/operator/.stash
 USER operator
-RUN cd core/emacs && make
+RUN mkdir -pv ~/.stash/tmp
+RUN cd core/emacs && skel make install
 USER root
 RUN rm -rf .stash/core .stash/infra
 USER operator