mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

added keybindings

This commit is contained in:
Rahsheen Porter 2022-11-07 17:33:59 -05:00
parent 0f401d28e1
commit b1a7860fdd
5 changed files with 189 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
.config/nvim/after/plugin/lsp.lua
View File

@ -3,7 +3,7 @@ local nnoremap = Remap.nnoremap
local inoremap = Remap.inoremap
local sumneko_root_path = "/usr/lib/lua-language-server"
local sumneko_binary = "/usr/bin/lua-language-server"
local sumneko_binary = "/usr/local/bin/lua-language-server"
-- Setup nvim-cmp.
local cmp = require("cmp")
@ -30,23 +30,23 @@ cmp.setup({
-- vim.fn["UltiSnips#Anon"](args.body)
end,
},
mapping = cmp.mapping.preset.insert({
["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
['<C-y>'] = cmp.mapping.confirm({ select = true }),
}),
mapping = cmp.mapping.preset.insert({
["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<C-d>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-y>"] = cmp.mapping.confirm({ select = true }),
}),
formatting = {
format = function(entry, vim_item)
vim_item.kind = lspkind.presets.default[vim_item.kind]
local menu = source_mapping[entry.source.name]
-- if entry.source.name == "cmp_tabnine" then
-- if entry.completion_item.data ~= nil and entry.completion_item.data.detail ~= nil then
-- menu = entry.completion_item.data.detail .. " " .. menu
-- end
-- vim_item.kind = ""
-- end
-- if entry.source.name == "cmp_tabnine" then
-- if entry.completion_item.data ~= nil and entry.completion_item.data.detail ~= nil then
-- menu = entry.completion_item.data.detail .. " " .. menu
-- end
-- vim_item.kind = ""
-- end
vim_item.menu = menu
return vim_item
end,
@ -82,42 +82,78 @@ tabnine:setup({
run_on_every_keystroke = true,
snippet_placeholder = "..",
})
]]--
]]
--
local function config(_config)
return vim.tbl_deep_extend("force", {
on_attach = function()
nnoremap("gD", function() vim.lsp.buf.definition() end)
nnoremap("gd", function() vim.lsp.buf.definition() end)
nnoremap("K", function() vim.lsp.buf.hover() end)
nnoremap("gi", function() vim.lsp.buf.implementation() end)
nnoremap("<leader>wa", function() vim.lsp.buf.add_workspace_folder() end)
nnoremap("<leader>wr", function() vim.lsp.buf.remove_workspace_folder() end)
nnoremap("<leader>wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end)
nnoremap("<leader>vws", function() vim.lsp.buf.workspace_symbol() end)
nnoremap("<leader>vd", function() vim.diagnostic.open_float() end)
nnoremap("[d", function() vim.diagnostic.goto_next() end)
nnoremap("]d", function() vim.diagnostic.goto_prev() end)
nnoremap("<leader>ca", function() vim.lsp.buf.code_action() end)
nnoremap("<leader>vco", function() vim.lsp.buf.code_action({
filter = function(code_action)
if not code_action or not code_action.data then
return false
end
nnoremap("gD", function()
vim.lsp.buf.definition()
end)
nnoremap("gd", function()
vim.lsp.buf.definition()
end)
nnoremap("K", function()
vim.lsp.buf.hover()
end)
nnoremap("gi", function()
vim.lsp.buf.implementation()
end)
nnoremap("<leader>wa", function()
vim.lsp.buf.add_workspace_folder()
end)
nnoremap("<leader>wr", function()
vim.lsp.buf.remove_workspace_folder()
end)
nnoremap("<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end)
nnoremap("<leader>vws", function()
vim.lsp.buf.workspace_symbol()
end)
nnoremap("<leader>vd", function()
vim.diagnostic.open_float()
end)
nnoremap("[d", function()
vim.diagnostic.goto_next()
end)
nnoremap("]d", function()
vim.diagnostic.goto_prev()
end)
nnoremap("<leader>ca", function()
vim.lsp.buf.code_action()
end)
nnoremap("<leader>vco", function()
vim.lsp.buf.code_action({
filter = function(code_action)
if not code_action or not code_action.data then
return false
end
local data = code_action.data.id
return string.sub(data, #data - 1, #data) == ":0"
end,
apply = true
}) end)
nnoremap("<leader>gr", function() vim.lsp.buf.references() end)
nnoremap("<leader>rn", function() vim.lsp.buf.rename() end)
inoremap("<C-h>", function() vim.lsp.buf.signature_help() end)
nnoremap("<leader>f", function() vim.lsp.buf.format({ async = true }) end)
local data = code_action.data.id
return string.sub(data, #data - 1, #data) == ":0"
end,
apply = true,
})
end)
nnoremap("<leader>gr", function()
vim.lsp.buf.references()
end)
nnoremap("<leader>rn", function()
vim.lsp.buf.rename()
end)
inoremap("<C-h>", function()
vim.lsp.buf.signature_help()
end)
nnoremap("<leader>f", function()
vim.lsp.buf.format({ async = true })
end)
end,
}, _config or {})
end
require("lspconfig").solargraph.setup(config())
require("lspconfig").zls.setup(config())
require("lspconfig").tsserver.setup(config())
@ -147,15 +183,6 @@ require("lspconfig").gopls.setup(config({
-- who even uses this?
require("lspconfig").rust_analyzer.setup(config({
cmd = { "rustup", "run", "nightly", "rust-analyzer" },
--[[
settings = {
rust = {
unstable_features = true,
build_on_save = false,
all_features = true,
},
}
--]]
}))
require("lspconfig").sumneko_lua.setup(config({
@ -216,4 +243,3 @@ require("luasnip.loaders.from_vscode").lazy_load({
include = nil, -- Load all languages
exclude = {},
})

28
.config/nvim/after/plugin/mason.lua
View File

@ -1,33 +1,33 @@
local mason_status, mason = pcall(require, "mason")
if not mason_status then
return
return
end
local mason_lspconfig_status, mason_lspconfig = pcall(require, "mason-lspconfig")
if not mason_lspconfig_status then
return
return
end
local mason_null_ls_status, mason_null_ls = pcall(require, "mason-null-ls")
if not mason_null_ls_status then
return
return
end
mason.setup()
mason_lspconfig.setup({
ensure_installed = {
"tsserver",
"html",
"cssls",
"sumneko_lua",
}
ensure_installed = {
"tsserver",
"html",
"cssls",
"sumneko_lua",
},
})
mason_null_ls.setup({
ensure_installed = {
"prettier",
"stylua",
"eslint_d",
}
ensure_installed = {
"prettier",
"stylua",
"eslint_d",
},
})

42
.config/nvim/after/plugin/null-ls.lua
View File

@ -1,6 +1,6 @@
local setup, null_ls = pcall(require, "null-ls")
if not setup then
return
return
end
local formatting = null_ls.builtins.formatting
@ -8,24 +8,24 @@ local diagnostics = null_ls.builtins.diagnostics
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
null_ls.setup({
sources = {
formatting.prettier,
formatting.stylua,
diagnostics.eslint_d
},
-- format on save
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
-- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead
vim.lsp.buf.format({ bufnr = bufnr })
end,
})
end
end,
sources = {
formatting.prettier,
formatting.stylua,
diagnostics.eslint_d,
diagnostics.rubocop,
},
-- format on save
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
-- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead
vim.lsp.buf.format({ bufnr = bufnr })
end,
})
end
end,
})

12
.config/nvim/lua/rahcodes/packer.lua
View File

@ -60,6 +60,8 @@ return require("packer").startup(function(use)
end,
})
use("tpope/vim-fugitive")
use({
"folke/trouble.nvim",
requires = "kyazdani42/nvim-web-devicons",
@ -72,6 +74,16 @@ return require("packer").startup(function(use)
end,
})
use({
"kylechui/nvim-surround",
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
config = function()
require("nvim-surround").setup({
-- Configuration here, or leave empty to use defaults
})
end,
})
-- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins
if packer_bootstrap then

76
.config/nvim/lua/rahcodes/remap.lua
View File

@ -1,14 +1,70 @@
local nnoremap = require("rahcodes.keymap").nnoremap
local Remap = require("rahcodes.keymap")
local nnoremap = Remap.nnoremap
local vnoremap = Remap.vnoremap
local inoremap = Remap.inoremap
local nmap = Remap.nmap
nnoremap("<leader>pv", "<cmd>Ex<CR>")
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
vim.keymap.set('n', '<leader>m', builtin.oldfiles, {})
vim.keymap.set('n', '<leader>gb', builtin.git_branches, {})
vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
vim.keymap.set('n', '<leader><leader>', builtin.git_files, {})
vim.keymap.set("n", "<leader>m", builtin.oldfiles, {})
vim.keymap.set("n", "<leader>gb", builtin.git_branches, {})
-- vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
vim.keymap.set("n", "<leader><leader>", builtin.git_files, {})
-- Git Fugitive
nnoremap("<leader>gs", ":G<CR>")
nnoremap("<leader>gh", ":diffget //3<CR>")
nnoremap("<leader>gu", ":diffget //2<CR>")
nnoremap("<leader>gc", ":GCheckout<CR>")
nnoremap("<leader>ga", ":G add %:p<CR><CR>")
nnoremap("<leader>gc", ":G commit -v -q<CR>")
nnoremap("<leader>gt", ":G commit -v -q %:p<CR>")
nnoremap("<leader>gca", ":G commit --amend --no-edit<CR>")
nnoremap("<leader>gd", ":Gdiff<CR>")
nnoremap("<leader>ge", ":Gedit<CR>")
nnoremap("<leader>gr", ":Gread<CR>")
nnoremap("<leader>gw", ":Gwrite<CR><CR>")
nnoremap("<leader>gl", ":silent! Glog<CR>:bot copen<CR>")
nnoremap("<leader>gp", ":Ggrep<Space>")
nnoremap("<leader>gm", ":Gmove<Space>")
nnoremap("<leader>gb", ":G branch<Space>")
nnoremap("<leader>go", ":G checkout<Space>")
nnoremap("<leader>gps", ":Dispatch! git push<CR>")
nnoremap("<leader>gpl", ":Dispatch! git pull<CR>")
vnoremap("J", ":m '>+1<CR>gv=gv")
vnoremap("K", ":m '<-2<CR>gv=gv")
nnoremap("/", "/\v")
vnoremap("/", "/\v")
nnoremap("<leader>/", ":Rg<space>")
vnoremap("<leader>/", ":Rg<space>")
nnoremap("<leader>`", ":noh<cr>")
-- No Cheating
nnoremap("<up>", "<nop>")
nnoremap("<down>", "<nop>")
nnoremap("<left>", "<nop>")
nnoremap("<right>", "<nop>")
inoremap("<up>", "<nop>")
inoremap("<down>", "<nop>")
inoremap("<left>", "<nop>")
inoremap("<right>", "<nop>")
-- No weird line jumps
nnoremap("j", "gj")
nnoremap("k", "gk")
-- Copy to system clipboard
vnoremap("<leader>y", '"*y')
vnoremap("<leader>yy", '"+y')
-- Move buffers
nmap("sp", ":bprev<Return>")
nmap("sn", ":bnext<Return>")