From 1414eff2c76f4e411f260c09f1b8c3eeab003153 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@chua.family>
Date: Sun, 29 Sep 2019 18:10:11 +0800
Subject: [PATCH] Fix neovim and pass build

---
 .brewfile                 | 11 +++++------
 .install/neovim-source.sh | 12 ++++++------
 .install/pass.sh          |  4 ++--
 .versions                 |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.brewfile b/.brewfile
index 9623eb9..1a484a0 100644
--- a/.brewfile
+++ b/.brewfile
@@ -13,7 +13,7 @@ brew "bash" # improve bash version
 brew "neovim"
 brew "pinentry"
 # languages
-brew "python"
+brew "python3"
 brew "go"
 brew "node"
 brew "deno"
@@ -31,11 +31,10 @@ cask "docker"
 # desktop
 tap "koekeishiya/formulae"
 brew "koekeishiya/formulae/skhd"
-brew "koekeishiya/formulae/chunkwm"
+brew "koekeishiya/formulae/yabai"
 cask "bitbar"
 cask "iterm2-nightly"
 cask "firefoxnightly"
-cask "brave-browser"
 
 # user tools
 brew "thefuck"
@@ -70,8 +69,8 @@ brew "tmux"
 brew "mosh"
 #brew "qemu"
 cask "intel-haxm"
-cask "virtualbox"
-cask "xquartz"
+#cask "virtualbox"
+#cask "xquartz"
 #cask "daisydisk"
 brew "ncdu"
 tap "jeffreywildman/virt-manager"
@@ -143,7 +142,7 @@ cask "vlc"
 cask "blender"
 # blackmagic disk speed test
 # epson scan
-cask "skyfonts"
+#cask "skyfonts"
 
 # extra electronics
 #brew "avrdude"
diff --git a/.install/neovim-source.sh b/.install/neovim-source.sh
index 06f56f0..ab5153b 100755
--- a/.install/neovim-source.sh
+++ b/.install/neovim-source.sh
@@ -8,7 +8,7 @@ echo "Installing neovim $NEOVIM_VERSION..."
 echo
 
 apk add --no-cache \
-    gettext \
+	gettext \
 	unibilium \
 	libtermkey \
 	libvterm \
@@ -25,20 +25,20 @@ apk add --no-cache --virtual .build-deps \
 	automake \
 	cmake \
 	libtool \
-    gettext-dev \
+	gettext-dev \
 	unibilium-dev \
 	libtermkey-dev \
 	libvterm-dev \
 	python3-dev \
 	python3
 
-git clone --depth 1 https://github.com/neovim/neovim.git
-cd neovim
 if [ "$NEOVIM_VERSION" = "nightly" ]; then
-	git checkout $NEOVIM_VERSION
+	branch=$NEOVIM_VERSION
 else
-	git checkout v$NEOVIM_VERSION
+	branch=v$NEOVIM_VERSION
 fi
+git clone --depth 1 -b $branch https://github.com/neovim/neovim.git
+cd neovim
 make CMAKE_EXTRA_FLAGS=-DENABLE_JEMALLOC=OFF >/dev/null || make
 make install
 cd ..
diff --git a/.install/pass.sh b/.install/pass.sh
index 5e6d39c..a909703 100755
--- a/.install/pass.sh
+++ b/.install/pass.sh
@@ -7,5 +7,5 @@ echo "Installing pass..."
 echo
 
 sudo apk add --no-cache \
-    pass@testing
-
+	gnupg \
+	pass@testing
diff --git a/.versions b/.versions
index b7238a1..9bea5c5 100755
--- a/.versions
+++ b/.versions
@@ -9,7 +9,7 @@ export NODE_VERSION=10.15.0
 export YARN_VERSION=1.13.0
 
 export JDK_NUMBER=14
-export JDK_VERSION=16
+export JDK_VERSION=15
 
 
 export VIM_PLUG_VERSION=0.10.0