diff --git a/.install/golang.sh b/.install/golang.sh index 93b9bc1..889a5e6 100755 --- a/.install/golang.sh +++ b/.install/golang.sh @@ -27,5 +27,6 @@ tar -C /usr/local -xzf go.tgz rm go.tgz cd /usr/local/go/src ./make.bash + apk del .build-deps diff --git a/.install/neovim.sh b/.install/neovim.sh index 98bf15e..0c12ad0 100755 --- a/.install/neovim.sh +++ b/.install/neovim.sh @@ -4,55 +4,31 @@ set -e source ./.versions echo -echo "Installing neovim..." +echo "Installing neovim $NEOVIM_VERSION..." echo apk add --no-cache --virtual .build-deps \ - git \ - alpine-sdk build-base \ - libtool \ - automake \ - m4 \ - autoconf \ - linux-headers \ - unzip \ - ncurses ncurses-dev ncurses-libs ncurses-terminfo \ - python3 \ - python3-dev \ - clang \ - go \ - xz \ curl \ - make \ - cmake - -git clone https://github.com/neovim/libtermkey.git -cd libtermkey -make -make install -cd .. -rm -rf libtermkey - -git clone https://github.com/neovim/libvterm.git -cd libvterm -make -make install -cd .. -rm -rf libvterm - -git clone https://github.com/neovim/unibilium.git -cd unibilium -make -make install -cd .. -rm -rf unibilium + git \ + unzip \ + build-base \ + autoconf \ + automake \ + cmake \ + libtool \ + unibilium-dev git clone https://github.com/neovim/neovim.git cd neovim +git checkout v$NEOVIM_VERSION + +# temp fix for #8056 until next release +sed -i 's/https://raw.githubusercontent.com/mpeterv/luacheck/master/luacheck-scm-1.rockspec/https://luarocks.org/manifests/mpeterv/luacheck-0.21.2-1.rockspec/g' third-party/cmake/BuildLuarocks.cmake + make -make install +make install cd .. -rm -rf nvim +rm -rf neovim pip3 install neovim diff --git a/.install/node.sh b/.install/node.sh index 71f967e..4a9efe3 100755 --- a/.install/node.sh +++ b/.install/node.sh @@ -78,5 +78,6 @@ tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + apk del .build-deps-yarn diff --git a/.install/zsh-pure.sh b/.install/zsh-pure.sh new file mode 100755 index 0000000..0352adc --- /dev/null +++ b/.install/zsh-pure.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +source ./.versions + +echo +echo "Installing pure-prompt for ZSH..." +echo + +yarn global add pure-prompt diff --git a/.zshrc b/.zshrc index bb9369a..553b1f9 100755 --- a/.zshrc +++ b/.zshrc @@ -3,7 +3,7 @@ setopt appendhistory setopt autocd setopt extendedglob -export TERM=xterm256-color +export TERM=xterm-256color # golang export PATH="$(go env GOPATH)/bin:$PATH" diff --git a/Dockerfile b/Dockerfile index b042128..85970e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN ./.install/neovim.sh RUN ./.install/golang.sh RUN ./.install/node.sh RUN ./.install/python.sh -# setup global PATH +# setup global PATH for system programs ENV PATH=/usr/local/go/bin:$PATH # create user