From 09708555033a0fb9d5ed0a76b9b7a4e5cd25a00f Mon Sep 17 00:00:00 2001 From: Erik Cowley Date: Mon, 11 Mar 2024 18:08:34 -0400 Subject: [PATCH] Updates to nvim config around reference searching --- .zshrc | 8 +++++--- init.lua | 26 ++++++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.zshrc b/.zshrc index 7b85bb4..372f900 100644 --- a/.zshrc +++ b/.zshrc @@ -103,7 +103,7 @@ source $ZSH/oh-my-zsh.sh set -o vi source $HOME/venv/default/bin/activate -PATH=$PATH:/home/cowley/Downloads/go/bin +PATH=$PATH:/usr/local/go/bin PATH=$PATH:$HOME/go/bin export PATH @@ -113,11 +113,13 @@ TRAPWINCH() { function Zml2ZV9vbmVfb25lX2Nz { dirfile="$HOME/directories.txt" - if ! [ -f $dirfile ] || test $(find $dirfile -mmin +720) + #if ! [ -f $dirfile ] || test $(find $dirfile -mmin +720) + if ! [ -f $dirfile ] then + echo "Indexing directories..." find $HOME -type d -not -path '*/.*' 1> $dirfile 2>/dev/null fi - cd $(cat $dirfile | fzf) + cd "$(cat $dirfile | fzf)" zle reset-prompt } zle -N 'Zml2ZV9vbmVfb25lX2Nz' diff --git a/init.lua b/init.lua index 75cba33..fb59546 100644 --- a/init.lua +++ b/init.lua @@ -121,23 +121,24 @@ require("telescope").setup { -- }) -local builtin = require('telescope.builtin') +local telescope_builtin = require('telescope.builtin') local mytags = function() -- this should always exist because of gutentags local tagspath = vim.fn.getcwd() .. "/tags" - return builtin.tags({ ctags_file = tagspath }) + return telescope_builtin.tags({ ctags_file = tagspath }) end local file_browser = require('telescope').extensions.file_browser.file_browser local myfilebrowser = function() local opts = { path = "%:p:h", select_buffer = true } return file_browser(opts) end -vim.keymap.set('n', 'f', builtin.find_files, {}) -vim.keymap.set('n', 'g', builtin.live_grep, {}) -vim.keymap.set('n', 'b', builtin.buffers, {}) -vim.keymap.set('n', 'h', builtin.help_tags, {}) +vim.keymap.set('n', 'f', telescope_builtin.find_files, {}) +vim.keymap.set('n', 'g', telescope_builtin.live_grep, {}) +vim.keymap.set('n', 'b', telescope_builtin.buffers, {}) +vim.keymap.set('n', 'h', telescope_builtin.help_tags, {}) vim.keymap.set('n', 'c', mytags, {}) vim.keymap.set('n', 'n', myfilebrowser, {}) +vim.keymap.set('n', 'r', telescope_builtin.lsp_references, {}) --vim.keymap.set('n', 'n', file_browser, {}) --vim.keymap.set('n', 'c', ":CtrlPTag", {}) --vim.keymap.set('n', 'gd', ":tag ", {}) @@ -145,7 +146,14 @@ vim.keymap.set('n', 'n', myfilebrowser, {}) -- Setup language servers. require('lspconfig').pyright.setup{ - theme = "tokyonight-night" + theme = "tokyonight-night", + settings = { + python = { + analysis = { + diagnosticMode = 'workspace', + }, + }, + }, } vim.api.nvim_create_autocmd("BufWritePost", { pattern = "*.py", @@ -247,6 +255,8 @@ set.autoread = true set.scrolloff = 6 -- autoindent works weirdly sometimes -- set.autoindent = true +-- some terminal emulators mess up mouse integration- uncomment the following +-- set.mouse = nil vim.keymap.set("n", "gtl", ":tabn") vim.keymap.set("n", "gth", ":tabp") vim.keymap.set("n", "gt0", ":tabfirst") @@ -351,7 +361,7 @@ vim.keymap.set("n", "vip", select_indent, nil) local function get_visual_selection() local buf = vim.api.nvim_get_current_buf() local line_start = vim.api.nvim_buf_get_mark(buf, "<")[1] - if line_start > 1 then + if line_start > 0 then line_start = line_start - 1 end local line_stop = vim.api.nvim_buf_get_mark(buf, ">")[1]