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

refactored plugins

Browse Source
This commit is contained in:
iris committed 2022-08-02 21:03:40 -04:00
1 parent f5b6ec34ad
commit c8bfa09562
9 files changed
+200 -192
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lua/config/plugins.lua
+6 -106
View File
@@ -10,112 +10,12 @@ local packer = require('packer')
packer.startup(function(use)
use 'wbthomason/packer.nvim'
-- files
use {
'nvim-telescope/telescope.nvim',
tag = '0.1.0',
requires = { 'nvim-lua/plenary.nvim' },
config = function() require 'config.plugins.telescope' end
}
use {
'nvim-telescope/telescope-fzf-native.nvim',
run = 'make',
requires = { 'nvim-telescope/telescope.nvim' },
-- doesn't work?
-- config = function() require 'telescope'.load_extension('fzf') end
}
use {
'nvim-telescope/telescope-ui-select.nvim',
requires = { 'nvim-telescope/telescope.nvim' },
config = function() require 'telescope'.load_extension('ui-select') end
}
use {
'nvim-neo-tree/neo-tree.nvim',
branch = "v2.x",
requires = {
'nvim-lua/plenary.nvim',
'kyazdani42/nvim-web-devicons',
'MunifTanjim/nui.nvim'
},
config = function() require 'config.plugins.neotree' end
}
-- syntax highlighting
use {
'nvim-treesitter/nvim-treesitter',
run = function()
require('nvim-treesitter.install').update { with_sync = true }
end,
config = function()
require 'nvim-treesitter.configs'.setup {
highlight = { enable = true }
}
end,
}
-- autocomplete
use 'hrsh7th/cmp-nvim-lsp'
use 'hrsh7th/cmp-buffer'
use 'hrsh7th/cmp-path'
use 'hrsh7th/cmp-cmdline'
use {
'hrsh7th/nvim-cmp',
config = function()
require 'config.plugins.cmp'
end
}
-- snippets
use 'L3MON4D3/LuaSnip'
use 'saadparwaiz1/cmp_luasnip'
-- autopairs
use {
'windwp/nvim-autopairs',
config = function() require 'nvim-autopairs'.setup {} end
}
-- lsp
use {
'neovim/nvim-lspconfig',
config = function()
require 'config.plugins.lspconfig'
end
}
use {
'simrat39/rust-tools.nvim',
requires = {
'nvim-lua/plenary.nvim',
'mfussenegger/nvim-dap',
}
}
use 'tjdevries/nlua.nvim'
-- visual
use {
'navarasu/onedark.nvim',
config = function()
require 'onedark'.setup { style = 'darker' }
require 'onedark'.load()
end
}
use {
'norcalli/nvim-colorizer.lua',
config = function()
if vim.o.termguicolors then
require 'colorizer'.setup()
end
end
}
use {
'nvim-lualine/lualine.nvim',
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
config = function() require 'lualine'.setup() end
}
use {
'lewis6991/gitsigns.nvim',
config = function() require 'gitsigns'.setup() end
}
require 'config.plugins.telescope'(use)
require 'config.plugins.tree'(use)
require 'config.plugins.syntax'(use)
require 'config.plugins.cmp'(use)
require 'config.plugins.lsp'(use)
require 'config.plugins.visual'(use)
-- sync if bootstrapped
if PACKER_BOOTSTRAP then
lua/config/plugins/cmp.lua
+16 -3
View File
@@ -1,5 +1,13 @@
local cmp = require 'cmp'
cmp.setup({
return function(use)
use 'hrsh7th/cmp-nvim-lsp'
use 'hrsh7th/cmp-buffer'
use 'hrsh7th/cmp-path'
use 'hrsh7th/cmp-cmdline'
use {
'hrsh7th/nvim-cmp',
config = function()
local cmp = require 'cmp'
cmp.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
@@ -18,5 +26,10 @@ cmp.setup({
{ name = 'luasnip' },
{ name = 'path' },
}),
})
})
end
}
use 'L3MON4D3/LuaSnip'
use 'saadparwaiz1/cmp_luasnip'
end
lua/config/plugins/lsp.lua
+83
View File
@@ -0,0 +1,83 @@
local config = function()
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,
}
end
return function(use)
use {
'neovim/nvim-lspconfig',
config = config
}
use {
'simrat39/rust-tools.nvim',
requires = {
'nvim-lua/plenary.nvim',
'mfussenegger/nvim-dap',
}
}
use 'tjdevries/nlua.nvim'
use {
'windwp/nvim-autopairs',
config = function() require 'nvim-autopairs'.setup {} end
}
end
lua/config/plugins/lspconfig.lua
-63
View File
@@ -1,63 +0,0 @@
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/neotree.lua
-14
View File
@@ -1,14 +0,0 @@
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/syntax.lua
+15
View File
@@ -0,0 +1,15 @@
return function(use)
use {
'nvim-treesitter/nvim-treesitter',
run = function()
require 'nvim-treesitter.install'.update {
with_sync = true
}
end,
config = function()
require 'nvim-treesitter.configs'.setup {
highlight = { enable = true }
}
end,
}
end
lua/config/plugins/telescope.lua
+27 -6
View File
@@ -1,9 +1,30 @@
local u = require 'config.utils'
return function(use)
use {
'nvim-telescope/telescope.nvim',
tag = '0.1.0',
requires = { 'nvim-lua/plenary.nvim' },
config = function()
require 'telescope'.setup {}
require 'telescope'.setup {}
local u = require 'config.utils'
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'))
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'))
end
}
use {
'nvim-telescope/telescope-fzf-native.nvim',
run = 'make',
requires = { 'nvim-telescope/telescope.nvim' },
-- doesn't work?
-- config = function() require 'telescope'.load_extension('fzf') end
}
use {
'nvim-telescope/telescope-ui-select.nvim',
requires = { 'nvim-telescope/telescope.nvim' },
config = function() require 'telescope'.load_extension('ui-select') end
}
end
lua/config/plugins/tree.lua
+27
View File
@@ -0,0 +1,27 @@
return function(use)
use {
'nvim-neo-tree/neo-tree.nvim',
branch = "v2.x",
requires = {
'nvim-lua/plenary.nvim',
'kyazdani42/nvim-web-devicons',
'MunifTanjim/nui.nvim'
},
config = function()
vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]]
require 'neo-tree'.setup {
filesystem = {
filtered_items = {
visible = true,
}
},
window = {
width = 30,
},
}
local u = require 'config.utils'
u.nmap('<space>e', u.cmd('Neotree toggle'))
end
}
end
lua/config/plugins/visual.lua
+26
View File
@@ -0,0 +1,26 @@
return function(use)
use {
'navarasu/onedark.nvim',
config = function()
require 'onedark'.setup { style = 'darker' }
require 'onedark'.load()
end
}
use {
'norcalli/nvim-colorizer.lua',
config = function()
if vim.o.termguicolors then
require 'colorizer'.setup()
end
end
}
use {
'nvim-lualine/lualine.nvim',
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
config = function() require 'lualine'.setup() end
}
use {
'lewis6991/gitsigns.nvim',
config = function() require 'gitsigns'.setup() end
}
end