From 98a83f737523edbced3e23b90f3002b4c4782010 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 | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd7c9e0..c4883cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -150,16 +150,6 @@ RUN curl https://mise.jdx.dev/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 2510c29d62d39d63bb75f1a613d2ae628a2af4ee \
-  && 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 \
@@ -170,6 +160,16 @@ 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
 
+# 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 2510c29d62d39d63bb75f1a613d2ae628a2af4ee \
+  && 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 ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
     awscli \
@@ -194,5 +194,12 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
     yarn \
     zoxide
 
+# configure git
+ARG GIT_USER_EMAIL
+ARG GIT_USER_NAME
+RUN git config --global user.email "${GIT_USER_EMAIL}" \
+  && git config --global user.name "${GIT_USER_NAME}" \
+  && git config --global core.editor nvim
+
 COPY ./scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY ./scripts/elixir-ls-setup.sh /usr/local/bin/elixir-ls-setup