From d6beadefaafd08c41cfec9f3f3477bb68295d1ec Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 25 Aug 2022 10:12:33 +0200 Subject: [PATCH] Minor updates to nvim config --- .config/nvim/after/plugin/lsp.lua | 21 +++++++++++---------- .config/nvim/after/plugin/telescope.lua | 6 ++++-- .config/nvim/lua/halfdan/packer.lua | 13 ++++++++++--- .config/nvim/lua/halfdan/telescope.lua | 2 +- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 649000d..009a383 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -112,6 +112,7 @@ local function config(_config) nnoremap("rr", function() vim.lsp.buf.references() end) nnoremap("rn", function() vim.lsp.buf.rename() end) nnoremap("cl", function() vim.lsp.codelens.run() end) + nnoremap("ff", function() vim.lsp.buf.format{async = true} end) inoremap("", function() vim.lsp.buf.signature_help() end) --vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', 'lua vim.lsp.buf.implementation()', opts) -- vim.api.nvim_buf_set_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()', opts) @@ -128,7 +129,7 @@ end local elixir = require('elixir') elixir.setup(config({ - cmd = {"/home/halfdan/opt/elixir-ls/bin/language_server.sh"}, + cmd = {"/Users/fbecker18/opt/elixir-ls/bin/language_server.sh"}, settings = elixir.settings({ dialyzerEnabled = true, fetchDeps = false, @@ -152,12 +153,12 @@ require('rust-tools').setup({ } }) ---vim.cmd([[ - --augroup - --autocmd! - --autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync(nil, 100) - --autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_sync(nil, 100) - --autocmd BufWritePre *.ex,*.exs lua vim.lsp.buf.formatting_sync(nil, 100) - --autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync(nil, 100) - --augroup END ---]]) +-- vim.cmd([[ +-- augroup +-- autocmd! +-- autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync(nil, 100) +-- autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_sync(nil, 100) +-- autocmd BufWritePre *.ex,*.exs lua vim.lsp.buf.formatting_sync(nil, 100) +-- autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync(nil, 100) +-- augroup END +-- ]]) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index 7671943..0f1b31b 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -6,10 +6,12 @@ nnoremap("ps", function() builtin.grep_string({ search = vim.fn.input("Grep For > ")}) end) nnoremap("", function() - builtin.git_files() + if not pcall(builtin.git_files) then + builtin.find_files() + end end) nnoremap("pf", function() - builtin.find_files() + builtin.find_files() end) nnoremap("pw", function() diff --git a/.config/nvim/lua/halfdan/packer.lua b/.config/nvim/lua/halfdan/packer.lua index b5e7064..ca218e7 100644 --- a/.config/nvim/lua/halfdan/packer.lua +++ b/.config/nvim/lua/halfdan/packer.lua @@ -30,7 +30,7 @@ end vim.cmd "autocmd BufWritePost plugins.lua PackerCompile" -- Auto compile when there are changes in plugins.lua -return require("packer").startup( +return require("packer").startup({ function(use) -- Packer can manage itself as an optional plugin use "wbthomason/packer.nvim" @@ -125,6 +125,13 @@ return require("packer").startup( use {'joshdick/onedark.vim'} use {'gruvbox-community/gruvbox'} use {'luisiacc/gruvbox-baby'} - end -) + end, + config = { + display = { + open_fn = function() + return require('packer.util').float({ border = 'single' }) + end + } + } +}) diff --git a/.config/nvim/lua/halfdan/telescope.lua b/.config/nvim/lua/halfdan/telescope.lua index f3d9c90..b5f780a 100644 --- a/.config/nvim/lua/halfdan/telescope.lua +++ b/.config/nvim/lua/halfdan/telescope.lua @@ -16,7 +16,7 @@ require('telescope').setup { layout_strategy = "horizontal", layout_defaults = {horizontal = {mirror = false}, vertical = {mirror = false}}, file_sorter = require'telescope.sorters'.get_fuzzy_file, - file_ignore_patterns = {"_build", "node_modules" }, + file_ignore_patterns = {"_build", "node_modules", "deps" }, generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, shorten_path = true, winblend = 0,