From 29540d6cb0ca7480e2fef70c6031e1e919ad1d00 Mon Sep 17 00:00:00 2001 From: long Date: Sun, 19 Jun 2022 14:14:14 -0500 Subject: [PATCH] oijweofijw --- lua/keybinds.lua | 14 +++++++++----- lua/lsp.lua | 7 ++++--- lua/plugins.lua | 3 ++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 10d2043..0350e6b 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -3,11 +3,11 @@ require("functions") --local fn = vim.fn -- to call Vim functions e.g. fn.bufnr() local function map(mode, lhs, rhs, opts) - local options = { noremap = true } - if opts then - options = vim.tbl_extend("force", options, opts) - end - vim.api.nvim_set_keymap(mode, lhs, rhs, options) + local options = { noremap = true } + if opts then + options = vim.tbl_extend("force", options, opts) + end + vim.api.nvim_set_keymap(mode, lhs, rhs, options) end vim.g.mapleader = "," @@ -202,3 +202,7 @@ map("n", "mt", [[:lua harpoon_btoggle()]]) map("n", "mm", [[:lua fzf_buffer_add_to_harpoon()]]) map("n", "mo", [[:lua fzf_files_to_harpoon()]]) map("n", "ml", [[:lua fzf_select_harpoon_mark()]]) + +-- RNVIMR +-- https://github.com/kevinhwang91/rnvimr +map("n", "f", [[:RnvimrToggle]]) diff --git a/lua/lsp.lua b/lua/lsp.lua index faeba48..05017eb 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -58,7 +58,7 @@ local config = { buf_set_keymap("n", "D", "lua vim.lsp.buf.type_definition()", opts) buf_set_keymap("n", "ca", "lua vim.lsp.buf.code_action()", opts) buf_set_keymap("n", "e", "lua vim.diagnostic.open_float()", opts) - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) + buf_set_keymap("n", "f", "lua vim.lsp.buf.format({ async = true })", opts) buf_set_keymap("n", "q", "lua vim.diagnostic.setloclist()", opts) buf_set_keymap("n", "rn", "lua vim.lsp.buf.rename()", opts) buf_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) @@ -223,8 +223,8 @@ require("nvim-lsp-installer").on_server_ready(function(server) local on_attach_generic = function(client, bufnr) -- Disables document formatting by lsp - client.resolved_capabilities.document_formatting = false - client.resolved_capabilities.document_range_formatting = false + client.server_capabilities.document_formatting = false + client.server_capabilities.document_range_formatting = false config.on_attach(client, bufnr) end @@ -281,6 +281,7 @@ local auto_servers = { "svelte", "gopls", "golangci_lint_ls", + "tailwindcss", } for _, s in ipairs(auto_servers) do diff --git a/lua/plugins.lua b/lua/plugins.lua index 8a2074f..aa7f284 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -39,7 +39,8 @@ require("packer").startup(function() use("junegunn/fzf") use("junegunn/fzf.vim") use("rbgrouleff/bclose.vim") - use("francoiscabrol/ranger.vim") + --use("francoiscabrol/ranger.vim") + use("kevinhwang91/rnvimr") use("vijaymarupudi/nvim-fzf") use("vijaymarupudi/nvim-fzf-commands") use({ "tpope/vim-obsession" })