guy176251/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oijweofijw

Browse Source
This commit is contained in:
long
2022-06-19 14:14:14 -05:00
parent 39cd83f557
commit 29540d6cb0
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/keybinds.lua
+9 -5
View File
@@ -3,11 +3,11 @@ require("functions")
--local fn = vim.fn -- to call Vim functions e.g. fn.bufnr() --local fn = vim.fn -- to call Vim functions e.g. fn.bufnr()
local function map(mode, lhs, rhs, opts) local function map(mode, lhs, rhs, opts)
local options = { noremap = true } local options = { noremap = true }
if opts then if opts then
options = vim.tbl_extend("force", options, opts) options = vim.tbl_extend("force", options, opts)
end end
vim.api.nvim_set_keymap(mode, lhs, rhs, options) vim.api.nvim_set_keymap(mode, lhs, rhs, options)
end end
vim.g.mapleader = "," vim.g.mapleader = ","
@@ -202,3 +202,7 @@ map("n", "<Leader>mt", [[:lua harpoon_btoggle()<CR>]])
map("n", "<Leader>mm", [[:lua fzf_buffer_add_to_harpoon()<CR>]]) map("n", "<Leader>mm", [[:lua fzf_buffer_add_to_harpoon()<CR>]])
map("n", "<Leader>mo", [[:lua fzf_files_to_harpoon()<CR>]]) map("n", "<Leader>mo", [[:lua fzf_files_to_harpoon()<CR>]])
map("n", "<Leader>ml", [[:lua fzf_select_harpoon_mark()<CR>]]) map("n", "<Leader>ml", [[:lua fzf_select_harpoon_mark()<CR>]])
-- RNVIMR
-- https://github.com/kevinhwang91/rnvimr
map("n", "<Leader>f", [[:RnvimrToggle<CR>]])
lua/lsp.lua
+4 -3
View File
@@ -58,7 +58,7 @@ local config = {
buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts) buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts) buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts) buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.format({ async = true })<CR>", opts)
buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts) buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts) buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts) buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
@@ -223,8 +223,8 @@ require("nvim-lsp-installer").on_server_ready(function(server)
local on_attach_generic = function(client, bufnr) local on_attach_generic = function(client, bufnr)
-- Disables document formatting by lsp -- Disables document formatting by lsp
client.resolved_capabilities.document_formatting = false client.server_capabilities.document_formatting = false
client.resolved_capabilities.document_range_formatting = false client.server_capabilities.document_range_formatting = false
config.on_attach(client, bufnr) config.on_attach(client, bufnr)
end end
@@ -281,6 +281,7 @@ local auto_servers = {
"svelte", "svelte",
"gopls", "gopls",
"golangci_lint_ls", "golangci_lint_ls",
"tailwindcss",
} }
for _, s in ipairs(auto_servers) do for _, s in ipairs(auto_servers) do
lua/plugins.lua
+2 -1
View File
@@ -39,7 +39,8 @@ require("packer").startup(function()
use("junegunn/fzf") use("junegunn/fzf")
use("junegunn/fzf.vim") use("junegunn/fzf.vim")
use("rbgrouleff/bclose.vim") use("rbgrouleff/bclose.vim")
use("francoiscabrol/ranger.vim") --use("francoiscabrol/ranger.vim")
use("kevinhwang91/rnvimr")
use("vijaymarupudi/nvim-fzf") use("vijaymarupudi/nvim-fzf")
use("vijaymarupudi/nvim-fzf-commands") use("vijaymarupudi/nvim-fzf-commands")
use({ "tpope/vim-obsession" }) use({ "tpope/vim-obsession" })