diff --git a/justfile b/justfile
new file mode 100644
index 0000000..20916e1
--- /dev/null
+++ b/justfile
@@ -0,0 +1,24 @@
+export zig_version := "master"
+
+hello-world:
+  echo "Hello World"
+
+# Full zig install
+setup-zig: setup-zig-lib setup-zls
+
+# Install zig into ~/.local/zig
+setup-zig-lib:
+  #!/usr/bin/env bash
+  mkdir -p ~/.local/zig
+  set -euxo pipefail
+  zig_download="$(mktemp --suffix=zig_download)"
+  zig_download_url="$(curl -s https://ziglang.org/download/index.json |
+    jq -r ".${zig_version}.[\"x86_64-linux\"].tarball")"
+  curl -s -o "${zig_download}" "${zig_download_url}"
+  tar xvf "${zig_download}" -C ~/.local/zig >/dev/null
+  ln -s ~/.local/zig/zig-x86_64-linux-0.16.0-dev.2694+74f361a5c ~/.local/zig/zig-bin
+  rm -f "${zig_download}"
+
+setup-zls:
+  #!/usr/bin/env bash
+  ./setup-vim.sh zls-install
diff --git a/setup-vim.sh b/setup-vim.sh
old mode 100644
new mode 100755
index fbdf03b..54945fc
--- a/setup-vim.sh
+++ b/setup-vim.sh
@@ -2,7 +2,7 @@
 # This file is still a work in progress
 # it mostly works if you tinker with uncommenting
 # the function calls
-ZLS_VERSION=0.15.1
+ZLS_VERSION=master
 
 function zls-install {
   mkdir -p ~/.local/bin
@@ -38,3 +38,4 @@ function setup {
 #setup
 #ycm-install
 #zls-install
+"$@"