diff options
| -rwxr-xr-x | bootstrap-nvim-python.sh | 45 | ||||
| -rw-r--r-- | nvim/lua/config/options.lua | 25 | ||||
| -rw-r--r-- | zsh/zprofile | 1 |
3 files changed, 33 insertions, 38 deletions
diff --git a/bootstrap-nvim-python.sh b/bootstrap-nvim-python.sh index 30e4b06..4df9226 100755 --- a/bootstrap-nvim-python.sh +++ b/bootstrap-nvim-python.sh | |||
| @@ -1,26 +1,35 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -eu | 2 | set -eu |
| 3 | 3 | ||
| 4 | VENV="$HOME/.local/venv/nvim" | 4 | case "$(uname)" in |
| 5 | PYTHON="${PYTHON:-python3}" | 5 | FreeBSD) |
| 6 | echo "FreeBSD detected – using system Python + pkg pynvim" | ||
| 7 | exit 1 | ||
| 8 | ;; | ||
| 9 | Darwin) | ||
| 10 | VENV="$HOME/.local/venv/nvim" | ||
| 11 | PYTHON="${PYTHON:-python3}" | ||
| 6 | 12 | ||
| 7 | # Python vorhanden? | 13 | # Python vorhanden? |
| 8 | if ! command -v "$PYTHON" >/dev/null 2>&1; then | 14 | if ! command -v "$PYTHON" >/dev/null 2>&1; then |
| 9 | echo "ERROR: python3 not found" | 15 | echo "ERROR: python3 not found" |
| 10 | exit 1 | 16 | exit 1 |
| 11 | fi | 17 | fi |
| 12 | 18 | ||
| 13 | # venv anlegen (falls nicht vorhanden) | 19 | # venv anlegen (falls nicht vorhanden) |
| 14 | if [ ! -x "$VENV/bin/python" ]; then | 20 | if [ ! -x "$VENV/bin/python" ]; then |
| 15 | echo "Creating Neovim Python venv at $VENV" | 21 | echo "Creating Neovim Python venv at $VENV" |
| 16 | "$PYTHON" -m venv "$VENV" | 22 | "$PYTHON" -m venv "$VENV" |
| 17 | fi | 23 | fi |
| 18 | 24 | ||
| 19 | # pip sicherstellen | 25 | # pip sicherstellen |
| 20 | "$VENV/bin/python" -m ensurepip --upgrade >/dev/null 2>&1 || true | 26 | "$VENV/bin/python" -m ensurepip --upgrade >/dev/null 2>&1 || true |
| 21 | 27 | ||
| 22 | # pynvim installieren / aktualisieren | 28 | # pynvim installieren / aktualisieren |
| 23 | "$VENV/bin/python" -m pip install --upgrade pip pynvim | 29 | "$VENV/bin/python" -m pip install --upgrade --prefer-binary pip pynvim |
| 30 | |||
| 31 | echo "Neovim Python provider ready:" | ||
| 32 | "$VENV/bin/python" -c 'import pynvim; print("pynvim:", pynvim.__version__)' | ||
| 33 | ;; | ||
| 34 | esac | ||
| 24 | 35 | ||
| 25 | echo "Neovim Python provider ready:" | ||
| 26 | "$VENV/bin/python" -c 'import pynvim; print("pynvim:", pynvim.__version__)' | ||
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index eefb530..a00cc64 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua | |||
| @@ -17,18 +17,6 @@ opt.showcmd = false | |||
| 17 | opt.spelllang = { "de", "en" } | 17 | opt.spelllang = { "de", "en" } |
| 18 | opt.spell = true | 18 | opt.spell = true |
| 19 | 19 | ||
| 20 | -- Die notwendigen Dateien müssen erst noch geladen werden! | ||
| 21 | -- TODO: Automatisieren | ||
| 22 | --[[ | ||
| 23 | |||
| 24 | mkdir -p "$HOME/.local/share/nvim/site/spell" | ||
| 25 | |||
| 26 | cd "$HOME/.local/share/nvim/site/spell" | ||
| 27 | wget "https://ftp.nluug.nl/pub/vim/runtime/spell/de.utf-8.spl" | ||
| 28 | wget "https://ftp.nluug.nl/pub/vim/runtime/spell/de.utf-8.sug" | ||
| 29 | |||
| 30 | ]] | ||
| 31 | |||
| 32 | -- Optionen für ^n-Vervollständigung | 20 | -- Optionen für ^n-Vervollständigung |
| 33 | opt.complete = { ".", "w", "b", "u", "t", "i" } | 21 | opt.complete = { ".", "w", "b", "u", "t", "i" } |
| 34 | 22 | ||
| @@ -80,14 +68,6 @@ opt.autowrite = true | |||
| 80 | -- Guifont | 68 | -- Guifont |
| 81 | opt.guifont = "JetBrains Mono Semibold:h12" | 69 | opt.guifont = "JetBrains Mono Semibold:h12" |
| 82 | 70 | ||
| 83 | -- Provider | ||
| 84 | g.python3_host_prog = vim.fn.expand("~/.local/venv/nvim/bin/python") | ||
| 85 | |||
| 86 | -- Provider deaktivieren | ||
| 87 | g.loaded_ruby_provider = 0 | ||
| 88 | g.loaded_perl_provider = 0 | ||
| 89 | g.loaded_luarocks_provider = 0 | ||
| 90 | |||
| 91 | -- Swap files und Undo | 71 | -- Swap files und Undo |
| 92 | opt.swapfile = false | 72 | opt.swapfile = false |
| 93 | opt.undofile = true | 73 | opt.undofile = true |
| @@ -101,6 +81,11 @@ opt.statusline = "%!v:lua.require('config.statusline').statusline()" | |||
| 101 | -- Clipboard | 81 | -- Clipboard |
| 102 | opt.clipboard = "unnamedplus" | 82 | opt.clipboard = "unnamedplus" |
| 103 | 83 | ||
| 84 | -- Provider deaktivieren | ||
| 85 | g.loaded_ruby_provider = 0 | ||
| 86 | g.loaded_perl_provider = 0 | ||
| 87 | g.loaded_luarocks_provider = 0 | ||
| 88 | |||
| 104 | -- netrw deaktivieren | 89 | -- netrw deaktivieren |
| 105 | g.loaded_netrw = 1 | 90 | g.loaded_netrw = 1 |
| 106 | g.loaded_netrwPlugin = 1 | 91 | g.loaded_netrwPlugin = 1 |
diff --git a/zsh/zprofile b/zsh/zprofile index a2e582b..e066023 100644 --- a/zsh/zprofile +++ b/zsh/zprofile | |||
| @@ -12,6 +12,7 @@ add_path "$HOME/.local/bin" | |||
| 12 | case "$OSTYPE" in | 12 | case "$OSTYPE" in |
| 13 | darwin*) | 13 | darwin*) |
| 14 | add_path "/opt/homebrew/bin" | 14 | add_path "/opt/homebrew/bin" |
| 15 | add_path "$HOME/.local/venv/nvim" | ||
| 15 | ;; | 16 | ;; |
| 16 | freebsd*) | 17 | freebsd*) |
| 17 | add_path "$HOME/.local/texlive/bin/amd64-freebsd" | 18 | add_path "$HOME/.local/texlive/bin/amd64-freebsd" |
