From 98ae2fe4d329cde7c7d4dc142d2ea555cc31c5eb Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Wed, 16 Nov 2022 19:37:03 -0500 Subject: [PATCH] more updates --- .config/nvim/after/plugin/null-ls.lua | 2 +- .config/nvim/lua/rahcodes/remap.lua | 6 +++++- .config/nvim/plugin/packer_compiled.lua | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.config/nvim/after/plugin/null-ls.lua b/.config/nvim/after/plugin/null-ls.lua index 9a754f5c..ab13c945 100644 --- a/.config/nvim/after/plugin/null-ls.lua +++ b/.config/nvim/after/plugin/null-ls.lua @@ -23,7 +23,7 @@ null_ls.setup({ buffer = bufnr, callback = function() -- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead - vim.lsp.buf.format({ bufnr = bufnr }) + vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = 10000 }) end, }) end diff --git a/.config/nvim/lua/rahcodes/remap.lua b/.config/nvim/lua/rahcodes/remap.lua index 4416e95f..6a15b4bd 100644 --- a/.config/nvim/lua/rahcodes/remap.lua +++ b/.config/nvim/lua/rahcodes/remap.lua @@ -17,6 +17,10 @@ vim.keymap.set("n", "gb", builtin.git_branches, {}) -- vim.keymap.set('n', 'gs', builtin.git_status, {}) vim.keymap.set("n", "", builtin.git_files, {}) +-- Null Ls +nnoremap("lf", ":lua vim.lsp.buf.format({ timeout_ms = 10000 })") +nnoremap("lF", ":lua vim.lsp.buf.range_format({ timeout_ms = 2000 })") + -- Git Fugitive nnoremap("gs", ":G") nnoremap("gh", ":diffget //3") @@ -35,7 +39,7 @@ nnoremap("gw", ":Gwrite") nnoremap("gl", ":silent! Glog:bot copen") nnoremap("gp", ":Ggrep") nnoremap("gm", ":Gmove") -nnoremap("gb", ":G branch") +-- nnoremap("gb", ":G branch") nnoremap("go", ":G checkout") nnoremap("gps", ":Dispatch! git push") nnoremap("gpl", ":Dispatch! git pull") diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index ede6d5fa..3145a094 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -211,14 +211,14 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: trouble.nvim -time([[Config for trouble.nvim]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") -time([[Config for trouble.nvim]], false) -- Config for: gitsigns.nvim time([[Config for gitsigns.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") time([[Config for gitsigns.nvim]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) -- Config for: nvim-surround time([[Config for nvim-surround]], true) try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")