iris/nvim
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored and switched to config with packer

Browse Source
This commit is contained in:
iris committed 2022-08-02 19:37:22 -04:00
1 parent efece83eb8
commit f5b6ec34ad
19 files changed
+325 -259
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lua/config/plugins/cmp.lua
+22
View File
@@ -0,0 +1,22 @@
local cmp = require 'cmp'
cmp.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end
},
mapping = cmp.mapping.preset.insert({
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<c-space>'] = cmp.mapping.complete(),
['<c-e>'] = cmp.mapping.abort(),
['<cr>'] = cmp.mapping.confirm({ select = true }),
['<tab>'] = cmp.mapping.select_next_item(),
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'path' },
}),
})
lua/config/plugins/config.lua
-43
View File
@@ -1,43 +0,0 @@
require 'telescope'.load_extension('ui-select')
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
require 'neo-tree'.setup {
filesystem = {
filtered_items = {
visible = true,
}
},
window = {
width = 30,
},
}
require 'nvim-treesitter.configs'.setup {
highlight = { enable = true }
}
require 'lualine'.setup()
local cmp = require 'cmp'
cmp.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end
},
mapping = require 'config.mappings.cmp' (cmp),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'path' },
}),
})
require 'nvim-autopairs'.setup {}
if vim.o.termguicolors then
require 'colorizer'.setup()
end
require('gitsigns').setup()
lua/config/plugins/init.lua
-4
View File
@@ -1,4 +0,0 @@
require 'config.plugins.plugins'
require 'config.plugins.config'
require 'config.plugins.lsps'
lua/config/plugins/lspconfig.lua
+63
View File
@@ -0,0 +1,63 @@
local u = require 'config.utils'
u.nmap('E', vim.diagnostic.open_float)
u.nmap('[d', vim.diagnostic.goto_prev)
u.nmap(']d', vim.diagnostic.goto_next)
u.nmap('<space>q', vim.diagnostic.setloclist)
local on_attach = function(_, bufnr)
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
vim.o.signcolumn = 'yes'
local map = function(from, to)
vim.keymap.set('n', from, to, { noremap = true, silent = true, buffer = bufnr })
end
map('gd', vim.lsp.buf.definition)
map('gr', vim.lsp.buf.references)
map('gi', vim.lsp.buf.implementation)
map('gD', vim.lsp.buf.declaration)
map('K', vim.lsp.buf.hover)
map('<C-k>', vim.lsp.buf.signature_help)
map('<space>wa', vim.lsp.buf.add_workspace_folder)
map('<space>wr', vim.lsp.buf.remove_workspace_folder)
map('<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end)
map('<space>D', vim.lsp.buf.type_definition)
map('<space>rn', vim.lsp.buf.rename)
map('<space>ca', vim.lsp.buf.code_action)
map('<space>fm', vim.lsp.buf.formatting)
end
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
require 'lspconfig'.sumneko_lua.setup {
on_attach = on_attach,
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { 'vim' },
},
},
},
}
require 'rust-tools'.setup {
server = {
on_attach = on_attach,
capabilities = capabilities,
}
}
vim.g.markdown_fenced_languages = {
"ts=typescript"
}
require'lspconfig'.denols.setup{
on_attach = on_attach,
capabilities = capabilities,
}
lua/config/plugins/lsps.lua
-35
View File
@@ -1,35 +0,0 @@
local on_attach = function(_, bufnr)
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
vim.o.signcolumn = 'yes'
require 'config.mappings.lsp' (bufnr)
end
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
require 'lspconfig'.sumneko_lua.setup {
on_attach = on_attach,
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { 'vim' },
},
},
},
}
require 'rust-tools'.setup {
server = {
on_attach = on_attach,
capabilities = capabilities,
}
}
vim.g.markdown_fenced_languages = {
"ts=typescript"
}
require'lspconfig'.denols.setup{
on_attach = on_attach,
capabilities = capabilities,
}
lua/config/plugins/neotree.lua
+14
View File
@@ -0,0 +1,14 @@
local u = require 'config.utils'
vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]]
require 'neo-tree'.setup {
filesystem = {
filtered_items = {
visible = true,
}
},
window = {
width = 30,
},
}
u.nmap('<space>e', u.cmd('Neotree toggle'))
lua/config/plugins/plugins.lua
-38
View File
@@ -1,38 +0,0 @@
local packer = require('packer')
packer.startup(function(use)
use 'wbthomason/packer.nvim'
-- files
use 'nvim-lua/plenary.nvim'
use { 'nvim-telescope/telescope.nvim', tag = '0.1.0' }
use {
'nvim-telescope/telescope-fzf-native.nvim',
run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
}
use 'nvim-telescope/telescope-ui-select.nvim'
use { 'nvim-neo-tree/neo-tree.nvim', branch = "v2.x", }
use 'MunifTanjim/nui.nvim'
-- syntax highlighting
use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
-- autocomplete / snippits
use 'hrsh7th/cmp-nvim-lsp'
use 'hrsh7th/cmp-buffer'
use 'hrsh7th/cmp-path'
use 'hrsh7th/cmp-cmdline'
use 'hrsh7th/nvim-cmp'
use 'L3MON4D3/LuaSnip'
use 'saadparwaiz1/cmp_luasnip'
-- auto pairs
use 'windwp/nvim-autopairs'
-- lsp
use 'neovim/nvim-lspconfig'
use 'simrat39/rust-tools.nvim'
use 'mfussenegger/nvim-dap'
use 'nvim-lua/completion-nvim'
use 'tjdevries/nlua.nvim'
-- visual
use 'kyazdani42/nvim-web-devicons'
use 'navarasu/onedark.nvim'
use 'norcalli/nvim-colorizer.lua'
use 'nvim-lualine/lualine.nvim'
use 'lewis6991/gitsigns.nvim'
end)
lua/config/plugins/telescope.lua
+9
View File
@@ -0,0 +1,9 @@
local u = require 'config.utils'
require 'telescope'.setup {}
u.nmap('<space>ff', u.cmd('Telescope find_files'))
u.nmap('<space>fg', u.cmd('Telescope live_grep'))
u.nmap('<space>fb', u.cmd('Telescope buffers'))
u.nmap('<space>fh', u.cmd('Telescope help_tags'))