diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/bin/jdtls | 6 | ||||
| -rwxr-xr-x | utils/bin/lvim | 3 | ||||
| -rwxr-xr-x | utils/installer/install.sh | 35 |
3 files changed, 24 insertions, 20 deletions
diff --git a/utils/bin/jdtls b/utils/bin/jdtls index f23d85dd..adfd5e20 100755 --- a/utils/bin/jdtls +++ b/utils/bin/jdtls @@ -40,16 +40,16 @@ fi # JAR="$HOME/.config/nvim/.language-servers/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository/plugins/org.eclipse.equinox.launcher_*.jar" JAR="$HOME/.local/share/nvim/lspinstall/java/plugins/org.eclipse.equinox.launcher_*.jar" -GRADLE_HOME="$HOME/gradle" "$JAVACMD" \ +GRADLE_HOME=$HOME/gradle "$JAVACMD" \ -Declipse.application=org.eclipse.jdt.ls.core.id1 \ -Dosgi.bundles.defaultStartLevel=4 \ -Declipse.product=org.eclipse.jdt.ls.core.product \ -Dlog.protocol=true \ -Dlog.level=ALL \ - -javaagent:"$HOME/.local/share/nvim/lspinstall/java/lombok.jar" \ + -javaagent:$HOME/.local/share/nvim/lspinstall/java/lombok.jar \ -Xms1g \ -Xmx2G \ - -jar "$JAR" \ + -jar $(echo "$JAR") \ -configuration "$CONFIG" \ -data "${1:-$HOME/workspace}" \ --add-modules=ALL-SYSTEM \ diff --git a/utils/bin/lvim b/utils/bin/lvim new file mode 100755 index 00000000..0ef96a90 --- /dev/null +++ b/utils/bin/lvim @@ -0,0 +1,3 @@ +#!/bin/sh + +nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" "$@" diff --git a/utils/installer/install.sh b/utils/installer/install.sh index c6b57a66..2840f085 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -15,9 +15,9 @@ installnodeubuntu() { sudo apt install npm } -moveoldnvim() { +moveoldlvim() { echo "Not installing LunarVim" - echo "Please move your ~/.config/nvim folder before installing" + echo "Please move your ~/.local/share/lunarvim folder before installing" exit } @@ -96,25 +96,27 @@ installpynvim() { } installpacker() { - git clone https://github.com/wbthomason/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim + git clone https://github.com/wbthomason/packer.nvim ~/.local/share/lunarvim/site/pack/packer/start/packer.nvim } cloneconfig() { echo "Cloning LunarVim configuration" - git clone --branch "$LVBRANCH" https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim - cp "$HOME/.config/nvim/utils/installer/lv-config.example-no-ts.lua" "$HOME/.config/nvim/lv-config.lua" - nvim --headless \ + git clone --branch "$LVBRANCH" https://github.com/ChristianChiarulli/lunarvim.git ~/.local/share/lunarvim/lvim + mkdir -p "$HOME/.config/lvim" + sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin" + cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example-no-ts.lua" "$HOME/.config/lvim/lv-config.lua" + + nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \ +'autocmd User PackerComplete sleep 100m | qall' \ +PackerInstall - nvim --headless \ + nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \ +'autocmd User PackerComplete sleep 100m | qall' \ +PackerSync printf "\nCompile Complete\n" - rm "$HOME/.config/nvim/lv-config.lua" - cp "$HOME/.config/nvim/utils/installer/lv-config.example.lua" "$HOME/.config/nvim/lv-config.lua" - # nvim --headless -cq ':silent TSUpdate' -cq ':qall' >/dev/null 2>&1 + rm "$HOME/.config/lvim/lv-config.lua" + cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example.lua" "$HOME/.config/lvim/lv-config.lua" } asktoinstallnode() { @@ -176,15 +178,14 @@ echo 'Installing LunarVim' case "$@" in *--overwrite*) - echo '!!Warning!! -> Removing all nvim related config because of the --overwrite flag' - rm -rf "$HOME/.config/nvim" + echo '!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag' + rm -rf "$HOME/.local/share/lunarvim" rm -rf "$HOME/.cache/nvim" - rm -rf "$HOME/.local/share/nvim/site/pack/packer" ;; esac -# move old nvim directory if it exists -[ -d "$HOME/.config/nvim" ] && moveoldnvim +# move old lvim directory if it exists +[ -d "$HOME/.local/share/lunarvim" ] && moveoldlvim # install pip (command -v pip3 >/dev/null && echo "pip installed, moving on...") || asktoinstallpip @@ -195,13 +196,13 @@ esac # install pynvim (pip3 list | grep pynvim >/dev/null && echo "pynvim installed, moving on...") || installpynvim -if [ -e "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim" ]; then +if [ -e "$HOME/.local/share/lunarvim/site/pack/packer/start/packer.nvim" ]; then echo 'packer already installed' else installpacker fi -if [ -e "$HOME/.config/nvim/init.lua" ]; then +if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then echo 'LunarVim already installed' else # clone config down |