misc fixes

ErikBjare · Sep 23, 2024 · d203561 · d203561
1 parent 2c3db85
commit d203561
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/home/.config/fish/functions/check_and_activate_venv.fish b/home/.config/fish/functions/check_and_activate_venv.fish
@@ -22,6 +22,7 @@ function check_and_activate_venv --description 'Check for venv or Poetry env and
         end
         set check_dir (dirname "$check_dir")
     end
+    cd $current_dir
 
     # Determine the new environment
     set -l new_env

diff --git a/home/.config/nvim/plugin/lspconfig.lua b/home/.config/nvim/plugin/lspconfig.lua
@@ -40,6 +40,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end, { buffer = ev.buf, desc = 'Format' })
 
     -- Enable completion triggered by <c-x><c-o>
+    -- NOTE: we use mini.completion for this
     vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
 
     -- Workspace management

diff --git a/home/.vim/config/basic.vim b/home/.vim/config/basic.vim
@@ -52,7 +52,10 @@ syntax on
 let g:ale_python_auto_poetry = 1
 
 " Highlight occurences of selected word
-autocmd CursorMoved * exe printf('match IncSearch /\V\<%s\>/', escape(expand('<cword>'), '/\'))
+" (only in vim, nvim uses mini.cursorword)
+if !has('nvim')
+    autocmd CursorMoved * exe printf('match IncSearch /\V\<%s\>/', escape(expand('<cword>'), '/\'))
+endif
 
 " Show the git diff in vim when commiting
 autocmd FileType gitcommit DiffGitCached | wincmd p