diff --git a/config/nvim/lua/config/lsp.lua b/config/nvim/lua/config/lsp.lua index ca5020d..525e310 100644 --- a/config/nvim/lua/config/lsp.lua +++ b/config/nvim/lua/config/lsp.lua @@ -4,6 +4,7 @@ local Methods = vim.lsp.protocol.Methods local function fzf_or(fzf_cmd, fallback) return function() + pcall(require('lz.n').trigger_load, 'ibhagwan/fzf-lua') if pcall(require, 'fzf-lua') then vim.cmd('FzfLua ' .. fzf_cmd) else diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 88f95cf..940fe2d 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -161,7 +161,7 @@ in font_size 18 status_bar_font_size 18 - inverse_search_command nvim-inverse-search %1 %2 + inverse_search_command ${repoDir}/scripts/nvim-inverse-search %1 %2 ''; }; diff --git a/scripts/nvim-inverse-search b/scripts/nvim-inverse-search index 4a9a13e..8d87560 100755 --- a/scripts/nvim-inverse-search +++ b/scripts/nvim-inverse-search @@ -2,11 +2,17 @@ file="$1" line="$2" +echo "$(date) file='$file' line='$line'" >> ~/.debug + for sock in /run/user/$(id -u)/nvim.*.0; do [ -S "$sock" ] || continue - result=$(nvim --server "$sock" --remote-expr "bufnr('$file')" 2>/dev/null) + result=$(nvim --server "$sock" --remote-expr "bufnr('$file')" 2>&1) + echo " sock='$sock' bufnr='$result'" >> ~/.debug if [ "$result" != "-1" ] && [ -n "$result" ]; then - nvim --server "$sock" --remote-expr "execute('b +$line $file | normal! zz')" + out=$(nvim --server "$sock" --remote-expr "execute('b +$line $file | normal! zz')" 2>&1) + echo " -> sent, result='$out'" >> ~/.debug exit 0 fi done + +echo " -> no match found" >> ~/.debug