Adds dashboard and telescope-ui-select
This commit is contained in:
parent
0ebf26b49c
commit
dbf9c5783f
|
@ -1,47 +1,47 @@
|
|||
-- [[ Configure nvim-cmp ]]
|
||||
-- See `:help cmp`
|
||||
-- local cmp = require 'cmp'
|
||||
-- local luasnip = require 'luasnip'
|
||||
-- require('luasnip.loaders.from_vscode').lazy_load()
|
||||
-- luasnip.config.setup {}
|
||||
--
|
||||
-- cmp.setup {
|
||||
-- snippet = {
|
||||
-- expand = function(args)
|
||||
-- luasnip.lsp_expand(args.body)
|
||||
-- end,
|
||||
-- },
|
||||
-- mapping = cmp.mapping.preset.insert {
|
||||
-- ['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
-- ['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
-- ['<C-Space>'] = cmp.mapping.complete {},
|
||||
-- ['<CR>'] = cmp.mapping.confirm {
|
||||
-- behavior = cmp.ConfirmBehavior.Replace,
|
||||
-- select = true,
|
||||
-- },
|
||||
-- ['<Tab>'] = cmp.mapping(function(fallback)
|
||||
-- if cmp.visible() then
|
||||
-- cmp.select_next_item()
|
||||
-- elseif luasnip.expand_or_locally_jumpable() then
|
||||
-- luasnip.expand_or_jump()
|
||||
-- else
|
||||
-- fallback()
|
||||
-- end
|
||||
-- end, { 'i', 's' }),
|
||||
-- ['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||
-- if cmp.visible() then
|
||||
-- cmp.select_prev_item()
|
||||
-- elseif luasnip.locally_jumpable(-1) then
|
||||
-- luasnip.jump(-1)
|
||||
-- else
|
||||
-- fallback()
|
||||
-- end
|
||||
-- end, { 'i', 's' }),
|
||||
-- },
|
||||
-- sources = {
|
||||
-- { name = 'nvim_lsp' },
|
||||
-- { name = 'luasnip' },
|
||||
-- },
|
||||
-- }
|
||||
local cmp = require 'cmp'
|
||||
local luasnip = require 'luasnip'
|
||||
require('luasnip.loaders.from_vscode').lazy_load()
|
||||
luasnip.config.setup {}
|
||||
|
||||
cmp.setup {
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert {
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete {},
|
||||
['<CR>'] = cmp.mapping.confirm {
|
||||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
select = true,
|
||||
},
|
||||
['<Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_locally_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.locally_jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
},
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' },
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,93 +1,94 @@
|
|||
-- -- [[ Configure LSP ]]
|
||||
-- -- This function gets run when an LSP connects to a particular buffer.
|
||||
-- local on_attach = function(_, bufnr)
|
||||
-- -- NOTE: Remember that lua is a real programming language, and as such it is possible
|
||||
-- -- to define small helper and utility functions so you don't have to repeat yourself
|
||||
-- -- many times.
|
||||
-- --
|
||||
-- -- In this case, we create a function that lets us more easily define mappings specific
|
||||
-- -- for LSP related items. It sets the mode, buffer and description for us each time.
|
||||
-- local nmap = function(keys, func, desc)
|
||||
-- if desc then
|
||||
-- desc = 'LSP: ' .. desc
|
||||
-- end
|
||||
-- [[ Configure LSP ]]
|
||||
-- This function gets run when an LSP connects to a particular buffer.
|
||||
local on_attach = function(_, bufnr)
|
||||
-- NOTE: Remember that lua is a real programming language, and as such it is possible
|
||||
-- to define small helper and utility functions so you don't have to repeat yourself
|
||||
-- many times.
|
||||
--
|
||||
-- vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
|
||||
-- end
|
||||
-- In this case, we create a function that lets us more easily define mappings specific
|
||||
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
||||
local remap = function(keys, func, desc)
|
||||
if desc then
|
||||
desc = 'LSP: ' .. desc
|
||||
end
|
||||
|
||||
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
|
||||
end
|
||||
|
||||
remap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
|
||||
remap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
||||
|
||||
remap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
|
||||
remap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
||||
remap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
||||
remap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
|
||||
remap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
|
||||
remap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
|
||||
|
||||
-- See `:help K` for why this keymap
|
||||
remap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
||||
remap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||
|
||||
-- Lesser used LSP functionality
|
||||
remap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||
remap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
|
||||
remap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
|
||||
remap('<leader>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, '[W]orkspace [L]ist Folders')
|
||||
|
||||
-- Create a command `:Format` local to the LSP buffer
|
||||
vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
|
||||
vim.lsp.buf.format()
|
||||
end, { desc = 'Format current buffer with LSP' })
|
||||
end
|
||||
|
||||
-- Enable the following language servers
|
||||
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
||||
--
|
||||
-- nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
|
||||
-- nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
|
||||
-- Add any additional override configuration in the following tables. They will be passed to
|
||||
-- the `settings` field of the server config. You must look up that documentation yourself.
|
||||
--
|
||||
-- nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
|
||||
-- nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
||||
-- nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
||||
-- nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
|
||||
-- nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
|
||||
-- nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
|
||||
--
|
||||
-- -- See `:help K` for why this keymap
|
||||
-- nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
||||
-- nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||
--
|
||||
-- -- Lesser used LSP functionality
|
||||
-- nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||
-- nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
|
||||
-- nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
|
||||
-- nmap('<leader>wl', function()
|
||||
-- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
-- end, '[W]orkspace [L]ist Folders')
|
||||
--
|
||||
-- -- Create a command `:Format` local to the LSP buffer
|
||||
-- vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
|
||||
-- vim.lsp.buf.format()
|
||||
-- end, { desc = 'Format current buffer with LSP' })
|
||||
-- end
|
||||
--
|
||||
-- -- Enable the following language servers
|
||||
-- -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
||||
-- --
|
||||
-- -- Add any additional override configuration in the following tables. They will be passed to
|
||||
-- -- the `settings` field of the server config. You must look up that documentation yourself.
|
||||
-- --
|
||||
-- -- If you want to override the default filetypes that your language server will attach to you can
|
||||
-- -- define the property 'filetypes' to the map in question.
|
||||
-- local servers = {
|
||||
-- -- clangd = {},
|
||||
-- -- gopls = {},
|
||||
-- -- pyright = {},
|
||||
-- -- rust_analyzer = {},
|
||||
-- -- tsserver = {},
|
||||
-- -- html = { filetypes = { 'html', 'twig', 'hbs'} },
|
||||
--
|
||||
-- lua_ls = {
|
||||
-- Lua = {
|
||||
-- workspace = { checkThirdParty = false },
|
||||
-- telemetry = { enable = false },
|
||||
-- },
|
||||
-- },
|
||||
-- }
|
||||
--
|
||||
-- -- Setup neovim lua configuration
|
||||
-- require('neodev').setup()
|
||||
--
|
||||
-- -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
-- capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||
--
|
||||
-- -- Ensure the servers above are installed
|
||||
-- local mason_lspconfig = require 'mason-lspconfig'
|
||||
--
|
||||
-- mason_lspconfig.setup {
|
||||
-- ensure_installed = vim.tbl_keys(servers),
|
||||
-- }
|
||||
--
|
||||
-- mason_lspconfig.setup_handlers {
|
||||
-- function(server_name)
|
||||
-- require('lspconfig')[server_name].setup {
|
||||
-- capabilities = capabilities,
|
||||
-- on_attach = on_attach,
|
||||
-- settings = servers[server_name],
|
||||
-- filetypes = (servers[server_name] or {}).filetypes,
|
||||
-- }
|
||||
-- end
|
||||
-- }
|
||||
-- If you want to override the default filetypes that your language server will attach to you can
|
||||
-- define the property 'filetypes' to the map in question.
|
||||
local servers = {
|
||||
-- clangd = {},
|
||||
-- gopls = {},
|
||||
-- pyright = {},
|
||||
-- rust_analyzer = {},
|
||||
-- tsserver = {},
|
||||
-- html = { filetypes = { 'html', 'twig', 'hbs'} },
|
||||
|
||||
lua_ls = {
|
||||
Lua = {
|
||||
workspace = { checkThirdParty = false },
|
||||
telemetry = { enable = false },
|
||||
},
|
||||
},
|
||||
pyright = {}
|
||||
}
|
||||
|
||||
-- Setup neovim lua configuration
|
||||
require('neodev').setup()
|
||||
|
||||
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||
|
||||
-- Ensure the servers above are installed
|
||||
local mason_lspconfig = require 'mason-lspconfig'
|
||||
|
||||
mason_lspconfig.setup {
|
||||
ensure_installed = vim.tbl_keys(servers),
|
||||
}
|
||||
|
||||
mason_lspconfig.setup_handlers {
|
||||
function(server_name)
|
||||
require('lspconfig')[server_name].setup {
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach,
|
||||
settings = servers[server_name],
|
||||
filetypes = (servers[server_name] or {}).filetypes,
|
||||
}
|
||||
end
|
||||
}
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
return {
|
||||
{
|
||||
'nvimdev/dashboard-nvim',
|
||||
event = 'VimEnter',
|
||||
config = function()
|
||||
require('dashboard').setup {
|
||||
-- config = {
|
||||
-- shortcut = {
|
||||
-- -- action can be a function type
|
||||
-- { desc = string, group = 'highlight group', key = 'shortcut key', action = 'action when you press key' },
|
||||
-- },
|
||||
-- packages = { enable = true }, -- show how many plugins neovim loaded
|
||||
-- -- limit how many projects list, action when you press key or enter it will run this action.
|
||||
-- -- action can be a functino type, e.g.
|
||||
-- -- action = func(path) vim.cmd('Telescope find_files cwd=' .. path) end
|
||||
-- project = { enable = true, limit = 8, icon = 'your icon', label = '', action = 'Telescope find_files cwd=' },
|
||||
-- mru = { limit = 10, icon = 'your icon', label = '', cwd_only = false },
|
||||
-- footer = {}, -- footer
|
||||
-- }
|
||||
}
|
||||
end,
|
||||
dependencies = { { 'nvim-tree/nvim-web-devicons' } }
|
||||
}
|
||||
}
|
|
@ -1,23 +0,0 @@
|
|||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
config = function ()
|
||||
require('mason').setup()
|
||||
end
|
||||
},
|
||||
{
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
config = function()
|
||||
require("mason-lspconfig").setup {
|
||||
ensure_installed = { "lua_ls", "pyright" },
|
||||
}
|
||||
end
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
local lspconfig = require('lspconfig')
|
||||
lspconfig.lua_ls.setup({})
|
||||
end
|
||||
}
|
||||
}
|
|
@ -0,0 +1,35 @@
|
|||
return {
|
||||
{
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
config = function()
|
||||
-- This is your opts table
|
||||
require("telescope").setup {
|
||||
extensions = {
|
||||
["ui-select"] = {
|
||||
require("telescope.themes").get_dropdown {
|
||||
-- even more opts
|
||||
}
|
||||
|
||||
-- pseudo code / specification for writing custom displays, like the one
|
||||
-- for "codeactions"
|
||||
-- specific_opts = {
|
||||
-- [kind] = {
|
||||
-- make_indexed = function(items) -> indexed_items, width,
|
||||
-- make_displayer = function(widths) -> displayer
|
||||
-- make_display = function(displayer) -> function(e)
|
||||
-- make_ordinal = function(e) -> string
|
||||
-- },
|
||||
-- -- for example to disable the custom builtin "codeactions" display
|
||||
-- do the following
|
||||
-- codeactions = false,
|
||||
-- }
|
||||
}
|
||||
}
|
||||
}
|
||||
-- To get ui-select loaded and working with telescope, you need to call
|
||||
-- load_extension, somewhere after setup function:
|
||||
require("telescope").load_extension("ui-select")
|
||||
end
|
||||
|
||||
}
|
||||
}
|
|
@ -47,8 +47,8 @@ vim.o.completeopt = 'menuone,noselect'
|
|||
vim.o.termguicolors = true
|
||||
|
||||
-- Number of spaces that a <Tab> in the file counts for
|
||||
vim.opt.tabstop = 4
|
||||
-- Number of spaces to use for each step of (auto)indent
|
||||
vim.opt.shiftwidth = 4
|
||||
-- Use spaces instead of tabs
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.expandtab = true
|
||||
|
|
|
@ -11,38 +11,38 @@ return { -- NOTE: First, some plugins that don't require any configuration
|
|||
|
||||
-- NOTE: This is where your plugins related to LSP can be installed.
|
||||
-- The configuration is done below. Search for lspconfig to find it below.
|
||||
-- {
|
||||
-- -- LSP Configuration & Plugins
|
||||
-- 'neovim/nvim-lspconfig',
|
||||
-- dependencies = {
|
||||
-- -- Automatically install LSPs to stdpath for neovim
|
||||
-- { 'williamboman/mason.nvim', config = true },
|
||||
-- 'williamboman/mason-lspconfig.nvim',
|
||||
--
|
||||
-- -- Useful status updates for LSP
|
||||
-- -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
||||
-- { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
||||
--
|
||||
-- -- Additional lua configuration, makes nvim stuff amazing!
|
||||
-- 'folke/neodev.nvim',
|
||||
-- },
|
||||
-- },
|
||||
{
|
||||
-- LSP Configuration & Plugins
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
-- Automatically install LSPs to stdpath for neovim
|
||||
{ 'williamboman/mason.nvim', config = true },
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
|
||||
-- {
|
||||
-- -- Autocompletion
|
||||
-- 'hrsh7th/nvim-cmp',
|
||||
-- dependencies = {
|
||||
-- -- Snippet Engine & its associated nvim-cmp source
|
||||
-- 'L3MON4D3/LuaSnip',
|
||||
-- 'saadparwaiz1/cmp_luasnip',
|
||||
--
|
||||
-- -- Adds LSP completion capabilities
|
||||
-- 'hrsh7th/cmp-nvim-lsp',
|
||||
--
|
||||
-- -- Adds a number of user-friendly snippets
|
||||
-- 'rafamadriz/friendly-snippets',
|
||||
-- },
|
||||
-- },
|
||||
-- Useful status updates for LSP
|
||||
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
|
||||
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
||||
|
||||
-- Additional lua configuration, makes nvim stuff amazing!
|
||||
'folke/neodev.nvim',
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Autocompletion
|
||||
'hrsh7th/nvim-cmp',
|
||||
dependencies = {
|
||||
-- Snippet Engine & its associated nvim-cmp source
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
|
||||
-- Adds LSP completion capabilities
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
|
||||
-- Adds a number of user-friendly snippets
|
||||
'rafamadriz/friendly-snippets',
|
||||
},
|
||||
},
|
||||
|
||||
-- Useful plugin to show you pending keybinds.
|
||||
{ 'folke/which-key.nvim', opts = {} },
|
||||
|
|
Loading…
Reference in New Issue