aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap/neovim.sh42
-rw-r--r--nvim/lua/config/options.lua5
2 files changed, 3 insertions, 44 deletions
diff --git a/bootstrap/neovim.sh b/bootstrap/neovim.sh
index d601dbd..6ffefaf 100755
--- a/bootstrap/neovim.sh
+++ b/bootstrap/neovim.sh
@@ -78,51 +78,10 @@ install_npm() {
78 npm install -g "$package" 78 npm install -g "$package"
79} 79}
80 80
81install_pip() {
82 python="$1"
83 package="$2"
84
85 if "$python" -c "import $package" >/dev/null 2>&1; then
86 printf "✓ %-32s vorhanden\n" "$package"
87 return
88 fi
89
90 printf "→ Installiere Python-Paket %s\n" "$package"
91 env \
92 -u C_INCLUDE_PATH \
93 -u CPLUS_INCLUDE_PATH \
94 -u LIBRARY_PATH \
95 "$python" -m pip install --no-cache-dir "$package"
96}
97
98setup_python_provider() {
99 VENV="$HOME/.local/venv/nvim"
100 PYTHON="${PYTHON:-python3}"
101
102 if ! have "$PYTHON"; then
103 die "Python wurde nicht gefunden."
104 fi
105
106 if [ ! -x "$VENV/bin/python" ]; then
107 printf "→ Erzeuge Python-Venv %s\n" "$VENV"
108
109 mkdir -p "$(dirname "$VENV")"
110 "$PYTHON" -m venv "$VENV"
111 fi
112
113 install_pip "$VENV/bin/python" pynvim
114}
115
116install_prerequisites() { 81install_prerequisites() {
117 install_pkg curl curl 82 install_pkg curl curl
118 install_pkg git git 83 install_pkg git git
119 install_pkg node node 84 install_pkg node node
120 install_pkg python3 python
121}
122
123install_providers() {
124 install_npm neovim-node-host neovim
125 setup_python_provider
126} 85}
127 86
128install_formatters() { 87install_formatters() {
@@ -187,7 +146,6 @@ main() {
187 setup_homebrew_env 146 setup_homebrew_env
188 147
189 install_prerequisites 148 install_prerequisites
190 install_providers
191 install_formatters 149 install_formatters
192 install_tools 150 install_tools
193 install_lsp 151 install_lsp
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index abd5ed9..409c620 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -92,11 +92,12 @@ opt.clipboard = "unnamedplus"
92opt.updatetime = 250 92opt.updatetime = 250
93opt.timeoutlen = 300 93opt.timeoutlen = 300
94 94
95-- Provider deaktivieren 95-- Provider deaktivieren (alle Plugins sind reines Lua, kein Provider noetig)
96g.loaded_ruby_provider = 0 96g.loaded_ruby_provider = 0
97g.loaded_perl_provider = 0 97g.loaded_perl_provider = 0
98g.loaded_luarocks_provider = 0 98g.loaded_luarocks_provider = 0
99g.python3_host_prog = os.getenv("HOME") .. "/.local/venv/nvim/bin/python" 99g.loaded_python3_provider = 0
100g.loaded_node_provider = 0
100 101
101-- netrw deaktivieren 102-- netrw deaktivieren
102g.loaded_netrw = 1 103g.loaded_netrw = 1