From 21a16641c5d1bf5db244108c0f443b33070c48bd Mon Sep 17 00:00:00 2001 From: Huck Boles Date: Tue, 9 Jan 2024 12:07:40 -0800 Subject: [PATCH] merged: from github --- init.lua | 4 ++-- lua/huck/map.lua | 1 + lua/huck/settings.lua | 5 +++++ lua/plugins/lsp.lua | 10 +++++++++- lua/plugins/misc.lua | 19 +++++++++++++++++++ lua/plugins/telescope.lua | 10 ++++++++-- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index ac11d89..2e7cd48 100644 --- a/init.lua +++ b/init.lua @@ -17,8 +17,8 @@ vim.opt.runtimepath:prepend(lazypath) require("lazy").setup("plugins", { defaults = { lazy = true }, - checker = { enabled = true }, - change_detection = { notify = false, }, + checker = { enabled = true, notify = false }, + change_detection = { enabled = true, notify = false, }, performance = { rtp = { disabled_plugins = { diff --git a/lua/huck/map.lua b/lua/huck/map.lua index cf6cbb1..b5159ba 100644 --- a/lua/huck/map.lua +++ b/lua/huck/map.lua @@ -25,6 +25,7 @@ vim.keymap.set('n', 'c', ':r!') vim.keymap.set('n', 'h', ":vsplit ") vim.keymap.set('n', 'v', ":split ") vim.keymap.set('n', '-', 'setlocal spell spelllang=en_us') +vim.keymap.set('n', 'w', 'set textwidth=80ggVGgq') -- better line editing vim.keymap.set('v', 'J', ":m '>+1gv=gv") diff --git a/lua/huck/settings.lua b/lua/huck/settings.lua index b72c1a4..2e36778 100644 --- a/lua/huck/settings.lua +++ b/lua/huck/settings.lua @@ -8,6 +8,11 @@ vim.g.netrw_liststyle = 4 vim.g.visible_diagnostics = true +vim.g.loaded_perl_provider = 0 +vim.g.loaded_node_provider = 0 +vim.g.loaded_ruby_provider = 0 +vim.g.loaded_python3_provider = 0 + vim.o.mouse = 'a' vim.o.mousefocus = true vim.o.mousemodel = 'extend' diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index e3ed90c..50a4873 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -69,8 +69,15 @@ return { local lsp = require("lspconfig") lsp.julials.setup({ on_attach = keybinds }) - lsp.lua_ls.setup({ on_attach = keybinds }) lsp.texlab.setup({ on_attach = keybinds }) + lsp.lua_ls.setup({ + on_attach = keybinds, + settings = { + Lua = { + diagnostics = { globals = "vim" } + } + } + }) -- diagnostic settings vim.lsp.diagnostics = { @@ -111,4 +118,5 @@ return { 'JuliaEditorSupport/julia-vim', event = { "BufReadPost *.jl" }, }, + } diff --git a/lua/plugins/misc.lua b/lua/plugins/misc.lua index 0a914de..c05c91a 100644 --- a/lua/plugins/misc.lua +++ b/lua/plugins/misc.lua @@ -2,6 +2,25 @@ return { { 'christoomey/vim-tmux-navigator', lazy = false }, { 'lukas-reineke/indent-blankline.nvim', event = 'VeryLazy' }, + { + 'j-hui/fidget.nvim', + lazy = false, + opts = { + progress = { + suppress_on_insert = true, + ignore_empty_message = true, + }, + notification = { + view = { + stack_upwards = false, + }, + window = { + align = "top", + }, + }, + }, + }, + { 'akinsho/toggleterm.nvim', keys = { { [[\]], 'ToggleTerm' } }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index b8f29a5..1764063 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -35,6 +35,14 @@ return { { 'li', 'Telescope lsp_implementations' }, { 'ls', 'Telescope lsp_document_symbols' }, { 'lS', 'Telescope lsp_workspace_symbols' }, + { 'tw', function() + local word = vim.fn.expand("") + require('telescope.builtin').grep_string({ search = word }) + end }, + { 'tW', function() + local word = vim.fn.expand("") + require('telescope.builtin').grep_string({ search = word }) + end }, }, config = function() local actions = require('telescope.actions') @@ -72,7 +80,6 @@ return { require('telescope').load_extension('fzf') - -- live grep in git repo, or fall back to current directory vim.keymap.set('n', 'F', function() @@ -120,7 +127,6 @@ return { end ) - -- give telescope window if opened with no command vim.api.nvim_create_autocmd('VimEnter', { pattern = '*', -- 2.44.2