From e59a1b5085fcae849bac01635667b3005786caab Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Sat, 16 May 2020 04:28:48 -0700
Subject: [PATCH] latest

---
 Dockerfile                                             |  2 +-
 Makefile                                               |  8 +-------
 build/packages.txt                                     |  3 ---
 build/run.sh                                           |  3 ++-
 build/user.sh                                          | 10 ++++++++++
 root/home/user/.local/profile.d/300.nvm.sh             |  2 +-
 .../user/.local/profile.d/999.zsh-ls-linux-colors.sh   |  1 +
 7 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 root/home/user/.local/profile.d/999.zsh-ls-linux-colors.sh

diff --git a/Dockerfile b/Dockerfile
index 94420ee..818c506 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu@sha256:8e1c1ee12a539d652c371ee2f4ee66909f4f5fd8002936d8011d958f05faf
 
 ENV DEBIAN_FRONTEND noninteractive
 
-ARG UBUNTU_MIRROR=http://us.archive.ubuntu.com/ubuntu
+ARG UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu
 
 ARG UID_TO_ADD=1000
 ARG GID_TO_ADD=1000
diff --git a/Makefile b/Makefile
index e408d6d..6d80375 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,4 @@
 .PHONY: build
 
-
 build:
-	docker build . 2>&1 | tee -a build.log
-
-export DOCKER_HOST := ssh://datavi.be
-export UBUNTU_MIRROR := http://de.archive.ubuntu.com/ubuntu
-buildremote:
-	docker build --build-arg UBUNTU_MIRROR=$(UBUNTU_MIRROR) . 2>&1 | tee -a build.log
+	sudo docker build --build-arg UBUNTU_MIRROR=http://ubuntumirror.app.las1.eeqj.de/ubuntu . 2>&1 | tee -a build.log
diff --git a/build/packages.txt b/build/packages.txt
index 5e81399..1364a9d 100644
--- a/build/packages.txt
+++ b/build/packages.txt
@@ -22,7 +22,6 @@ diffstat
 dnsutils
 docker.io
 dos2unix
-eclipse-platform
 editorconfig
 ffmpeg
 fonts-indic
@@ -30,13 +29,11 @@ fonts-ipafont-gothic
 fonts-ipafont-mincho
 fortune
 git
-gnome-terminal
 gnupg2
 gnupg-agent
 golang-go
 host
 imagemagick
-inetutils-ping
 iputils-ping
 irssi
 jq
diff --git a/build/run.sh b/build/run.sh
index 970e98d..b3189b2 100644
--- a/build/run.sh
+++ b/build/run.sh
@@ -6,6 +6,7 @@ export LANG="en_US.UTF-8"
 export LANGUAGE="en_US:en"
 
 set -x
+set -e
 
 TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
 
@@ -23,7 +24,7 @@ SSH_HOST_KEY_FILES="
 "
 echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
 locale-gen en_US.UTF-8
-update-locale LANG=en_US
+update-locale LANG="en_US.UTF-8" LANGUAGE="en_US"
 dpkg-reconfigure locales
 
 for FN in $SSH_HOST_KEY_FILES ; do
diff --git a/build/user.sh b/build/user.sh
index 77e1617..48b9452 100644
--- a/build/user.sh
+++ b/build/user.sh
@@ -19,6 +19,7 @@ curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/instal
 export ZSH="$HOME/.zsh"
 bash /tmp/installomz.sh --unattended --keep-zshrc
 
+zsh -c 'vim &'
 # vim-plug
 # this should happen from vimrc
 #curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
@@ -39,6 +40,7 @@ export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
 pyenv install 3.8.2
+pyenv global 3.8.2
 
 git clone -n https://github.com/nvm-sh/nvm.git ~/.nvm
 pushd ~/.nvm
@@ -49,3 +51,11 @@ export NVM_DIR="$HOME/.nvm"
 source "$NVM_DIR/nvm.sh"
 
 nvm install node
+
+###############################################################################
+##### Personal Config
+###############################################################################
+# I had envisioned this image as adaptable to other users but I've decided
+# to abandon that hope and hardcode my own values in here.
+git config --global user.email sneak@sneak.berlin
+git config --global user.name sneak
diff --git a/root/home/user/.local/profile.d/300.nvm.sh b/root/home/user/.local/profile.d/300.nvm.sh
index 6320b5c..f5bc89a 100644
--- a/root/home/user/.local/profile.d/300.nvm.sh
+++ b/root/home/user/.local/profile.d/300.nvm.sh
@@ -1,4 +1,4 @@
-export NVM_DIR="~/.nvm"
+export NVM_DIR="$HOME/.nvm"
 
 if [[ -e "$NVM_DIR/nvm.sh" ]]; then
     source "$NVM_DIR/nvm.sh"
diff --git a/root/home/user/.local/profile.d/999.zsh-ls-linux-colors.sh b/root/home/user/.local/profile.d/999.zsh-ls-linux-colors.sh
new file mode 100644
index 0000000..7e794dc
--- /dev/null
+++ b/root/home/user/.local/profile.d/999.zsh-ls-linux-colors.sh
@@ -0,0 +1 @@
+export LSCOLORS=ExGxBxDxCxEgEdxbxgxcxd