From a8bf7698f009059a478306a6ca94ef8bcff890ac Mon Sep 17 00:00:00 2001
From: Joao P Dubas <joao.dubas+gitea@gmail.com>
Date: Thu, 30 Nov 2023 13:50:06 +0000
Subject: [PATCH] chore: move frequently updated layers to the end

---
 Dockerfile | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c57da1..f1c3e38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,16 +144,6 @@ RUN curl https://rtx.pub/install.sh | sh \
   && make \
   && ln -s ${LOCAL_SRC_HOME}/jetporch/target/release/jetp ${LOCAL_BIN_HOME}/
 
-# git configuration
-COPY ./patch/kickstart.nvim/updates.patch /tmp
-COPY ./config/nvim/lua/custom/plugins/init.lua /tmp
-RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \
-  && cd ${XDG_CONFIG_HOME}/nvim \
-  && git reset --hard 1915cea32e13fcb4191904de8f5e0252ad050a6e \
-  && git apply /tmp/updates.patch \
-  && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
-  && nvim --headless "+Lazy! sync" +qa
-
 # configure fish and bash
 RUN fish -c true \
   && echo 'starship init fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \
@@ -164,18 +154,6 @@ RUN fish -c true \
   && echo 'alias ll="l -Fahl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \
   && echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish
 
-# install rtx plugins
-RUN ${XDG_DATA_HOME}/rtx/bin/rtx plugins install \
-    awscli \
-    elixir \
-    erlang \
-    helm \
-    kubectl \
-    lefthook \
-    poetry \
-    terraform \
-    tilt
-
 # NOTE (jpd): the section below exists mainly to handle a project running elixir 1.11.
 # It allows the usage of openssl 1.1 and a compatible elixir-ls.
 
@@ -207,6 +185,28 @@ RUN git clone https://github.com/elixir-lsp/elixir-ls.git ${LOCAL_SRC_HOME}/elix
   && git checkout tags/v0.14.6 \
   && cp .release-tool-versions .tool-versions
 
+# git configuration
+COPY ./patch/kickstart.nvim/updates.patch /tmp
+COPY ./config/nvim/lua/custom/plugins/init.lua /tmp
+RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \
+  && cd ${XDG_CONFIG_HOME}/nvim \
+  && git reset --hard 1915cea32e13fcb4191904de8f5e0252ad050a6e \
+  && git apply /tmp/updates.patch \
+  && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
+  && nvim --headless "+Lazy! sync" +qa
+
+# install rtx plugins
+RUN ${XDG_DATA_HOME}/rtx/bin/rtx plugins install \
+    awscli \
+    elixir \
+    erlang \
+    helm \
+    kubectl \
+    lefthook \
+    poetry \
+    terraform \
+    tilt
+
 # configure git
 ARG GIT_USER_EMAIL
 ARG GIT_USER_NAME