diff --git a/bootstrap-root.sh b/bootstrap-root.sh index cc69537..fb1cfae 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -27,6 +27,7 @@ apt-get update \ man \ mc \ neovim \ + nodeenv \ python3 \ python3-jedi \ python3-neovim \ @@ -42,12 +43,23 @@ apt-get update \ python3-pipx \ && apt-file update +# node related +# shellcheck disable=SC2086 +curl $CURLOPT https://deb.nodesource.com/setup_14.x | bash - +apt-get install -y nodejs + +# python3 related +# shellcheck disable=SC2086 +curl $CURLOPT https://bootstrap.pypa.io/get-pip.py | python3 + +pip install pipx + [ ! -x "$(which exa)" ] && cargo install --root /usr/local --git https://github.com/ogham/exa --tag v0.10.1 cargo install --root /usr/local --git https://github.com/mookid/diffr # shellcheck disable=SC2086 -curl $CURLOPT -o /usr/local/sbin/cleanup.sh https://git.schmidl.dev/schtobia/bootstrap/raw/branch/master/cleanup/cleanup.sh \ +curl $CURLOPT -o /usr/local/sbin/cleanup.sh https://gist.github.com/schtobia/f02deeaf2fd20b23ae9fcf0f451cc858/raw/cleanup.sh \ && chmod u+x /usr/local/sbin/cleanup.sh # diff-highlight from git is necessary for tig diff --git a/bootstrap-user.sh b/bootstrap-user.sh index 9d9c546..e7d699c 100755 --- a/bootstrap-user.sh +++ b/bootstrap-user.sh @@ -3,7 +3,7 @@ set -e TMPDIR=$(mktemp -u -p "$HOME" -d dotfiles.XXXXX) && \ - git clone --separate-git-dir="$HOME/.cfg" https://git.schmidl.dev/schtobia/dotfiles.git "$TMPDIR" && \ + git clone --separate-git-dir="$HOME/.cfg" https://gitlab.com/schtobia/dotfiles.git "$TMPDIR" && \ [ -r "$TMPDIR/.gitmodules" ] && cp -vi "$TMPDIR/.gitmodules" "$HOME" [ -d "$HOME/.cfg" ] && \ git --git-dir="$HOME/.cfg/" --work-tree="$HOME" config status.showUntrackedFiles no && \ @@ -12,7 +12,13 @@ TMPDIR=$(mktemp -u -p "$HOME" -d dotfiles.XXXXX) && \ git --git-dir="$HOME/.cfg/" --work-tree="$HOME" submodule update --init --remote --recursive --rebase) rm -rf "$TMPDIR" -pip install --user -r https://git.schmidl.dev/schtobia/bootstrap/raw/branch/master/requirements.txt && +pip install --user -r https://gitlab.com/schtobia/bootstrap/raw/master/requirements.txt && +#for package in \ +# kas \ +# pylint; +#do +# pipx install $package +#done # vim related nvim +PluginInstall +UpdateRemotePlugins +qall diff --git a/bootstrap.sh b/bootstrap.sh index 0e15d3f..9250ded 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,10 +5,10 @@ CURLOPT=${CURLOPT:-"--location --remote-time --remote-name --show-error --silent # root part # shellcheck disable=SC2086 -curl $CURLOPT https://git.schmidl.dev/schtobia/bootstrap/raw/branch/master/bootstrap-root.sh \ +curl $CURLOPT https://gitlab.com/schtobia/bootstrap/raw/master/bootstrap-root.sh \ && chmod +x bootstrap-root.sh # userspace part # shellcheck disable=SC2086 -curl $CURLOPT https://git.schmidl.dev/schtobia/bootstrap/raw/branch/master/bootstrap-user.sh \ +curl $CURLOPT https://gitlab.com/schtobia/bootstrap/raw/master/bootstrap-user.sh \ && chmod +x bootstrap-user.sh