409/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added illuminate, flutter tools, comment, headlines, barbecue; improved

Browse Source 
cmp
This commit is contained in:
Shawn
2024-04-05 09:03:37 +02:00
parent 0d028910ce
commit da33c345bd
9 changed files with 348 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
after/plugin/cmp.lua Normal file
View File

@@ -0,0 +1,61 @@
local cmp = require("cmp")
local lspkind = require("lspkind")
local cmp_select = { behavior = cmp.SelectBehavior.Select }
local border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" }
local winhighlight = "Normal:CmpPmenu,FloatBorder:CmpPmenuBorder,CursorLine:PmenuSel,Search:None"
cmp.setup({
snippet = {
expand = function(args)
require("luasnip").lsp_expand(args.body)
end,
},
sources = {
{ name = "nvim_lsp" },
{ name = "path" },
{ name = "nvim_lsp_signature_help" },
{ name = "nvim_lua" },
{ name = "luasnip", keyword_length = 2 },
{ name = "buffer", keyword_length = 3 },
},
view = {
entries = "custom",
},
completion = {
completeopt = "menuone,noselect,preview",
docs_initially_visible = true,
},
window = {
documentation = {
border = border,
winhighlight = winhighlight,
},
completion = {
border = border,
winhighlight = winhighlight,
},
},
formatting = {
fields = { "kind", "abbr", "menu" },
format = function(entry, vim_item)
local kind = lspkind.cmp_format({ mode = "symbol_text", maxwidth = 50 })(entry, vim_item)
local strings = vim.split(kind.kind, "%s", { trimempty = true })
kind.kind = " " .. (strings[1] or "") .. " "
kind.menu = " (" .. (strings[2] or "") .. ")"
return kind
end,
},
mapping = cmp.mapping.preset.insert({
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
["<C-k>"] = cmp.mapping.scroll_docs(-4),
["<C-j>"] = cmp.mapping.scroll_docs(4),
["<C-y>"] = cmp.mapping.confirm({ select = true }),
["<C-g>"] = cmp.mapping.complete(),
["<Tab>"] = nil,
["<S-Tab>"] = nil,
}),
})

3
after/plugin/colors.lua
View File

@@ -1,4 +1,6 @@
function Color(color)
local catppuccin_colors = require('catppuccin.palettes').get_palette('mocha')
color = color or "catppuccin-mocha"
vim.cmd.colorscheme(color)
@@ -12,6 +14,7 @@ function Color(color)
vim.api.nvim_set_hl(0, "Pmenu", { link = "Normal" })
vim.api.nvim_set_hl(0, "PmenuSel", { link = "Visual" })
vim.api.nvim_set_hl(0, "PmenuSbar", { link = "Normal" })
vim.api.nvim_set_hl(0, "CmpPmenuBorder", { fg = catppuccin_colors.surface2 })
end
Color()

5
after/plugin/conform.lua
View File

@@ -6,6 +6,7 @@ conform.setup({
cs = { "csharpier" },
javascript = { { "prettierd", "prettier" } },
rust = { "rustfmt" },
dart = { "dart_format" }
},
})
@@ -18,5 +19,7 @@ conform.formatters.rustfmt = {
}
vim.keymap.set("n", "<leader>f", function()
conform.format({ bufnr = vim.lsp.bufnr })
if not conform.format({ bufnr = vim.lsp.bufnr }) then
vim.lsp.buf.format()
end
end)

1
after/plugin/flutter-tools.lua Normal file
View File

@@ -0,0 +1 @@
require("flutter-tools").setup({})

9
after/plugin/harpoon.lua
View File

@@ -4,10 +4,9 @@ local harpoon = require("harpoon")
harpoon:setup()
-- REQUIRED
vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end)
vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end)
vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end)
vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end)
for i = 1, 9, 1 do
vim.keymap.set("n", string.format("<leader>%s", i), function() harpoon:list():select(i) end)
end

169
after/plugin/lsp.lua
View File

@@ -1,134 +1,99 @@
local cmp = require('cmp')
local default_capabilities = require('cmp_nvim_lsp').default_capabilities()
local default_capabilities = require("cmp_nvim_lsp").default_capabilities()
local capabilities = vim.tbl_deep_extend(
'force',
{},
vim.lsp.protocol.make_client_capabilities(),
default_capabilities
)
local lsp_default_capabilities = vim.lsp.protocol.make_client_capabilities()
require('mason').setup({})
require('mason-lspconfig').setup({
ensure_installed = { 'tsserver', 'rust_analyzer' },
local capabilities = vim.tbl_deep_extend("force", {}, lsp_default_capabilities, default_capabilities)
require("mason").setup({})
require("mason-lspconfig").setup({
ensure_installed = { "tsserver", "rust_analyzer" },
handlers = {
function(server_name)
require('lspconfig')[server_name].setup {
capabilities = capabilities
}
require("lspconfig")[server_name].setup({
capabilities = capabilities,
})
end,
['lua_ls'] = function()
local lspconfig = require('lspconfig')
lspconfig.lua_ls.setup {
["lua_ls"] = function()
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({
settings = {
Lua = {
diagnostics = {
globals = { 'vim' }
}
}
}
}
end
}
globals = { "vim" },
},
},
},
})
end,
},
})
require('lspconfig').yamlls.setup({
require("lspconfig").yamlls.setup({
on_attach = function(client, bufnr)
client.resolved_capabilities.document_formatting = true
end,
settings = {
yaml = {
customTags = { '!enemy', '!delay', '!composite' },
customTags = { "!enemy", "!delay", "!composite" },
validate = false,
format = {
enable = true
}
}
}
enable = true,
},
},
},
})
require('lspconfig').tsserver.setup {
require("lspconfig").tsserver.setup({
settings = {
typescript = {
preferences = {
quoteStype = 'single'
}
quoteStype = "single",
},
},
javascript = {
preferences = {
quoteStyle = 'single'
}
}
}
}
local cmp_select = { behavior = cmp.SelectBehavior.Select }
local lspkind = require('lspkind')
cmp.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end
quoteStyle = "single",
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'path' },
{ name = 'nvim_lsp_signature_help' },
{ name = 'nvim_lua' },
{ name = 'luasnip', keyword_length = 2 },
{ name = 'buffer', keyword_length = 3 },
},
view = {
entries = 'native',
},
completion = {
completeopt = 'menuone,noselect,preview',
docs_initially_visible = true
},
window = {
documentation = cmp.config.window.bordered()
},
formatting = {
format = lspkind.cmp_format({
mode = 'symbol_text',
menu = ({
buffer = '[Buffer]',
nvim_lsp = '[LSP]',
nvim_lua = '[Lua]',
luasnip = '[LuaSnip]'
})
})
},
mapping = cmp.mapping.preset.insert({
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
['<C-y>'] = cmp.mapping.confirm({ select = true }),
['<C-Space>'] = cmp.mapping.complete(),
['<Tab>'] = nil,
['<S-Tab>'] = nil
}),
})
vim.api.nvim_create_autocmd('LspAttach', {
vim.api.nvim_create_autocmd("LspAttach", {
callback = function(args)
local bufnr = args.buf
local opts = { buffer = bufnr, remap = false }
vim.keymap.set('n', 'gd', function() vim.lsp.buf.definition() end, opts)
vim.keymap.set('n', 'K', function() vim.lsp.buf.hover() end, opts)
vim.keymap.set('n', '<leader>vws', function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set('n', '<leader>vd', function() vim.diagnostic.open_float() end, opts)
vim.keymap.set('n', '[d', function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set('n', ']d', function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set('n', '<leader>vca', function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set('n', '<leader>vrr', function() vim.lsp.buf.references() end, opts)
vim.keymap.set('n', '<leader>vrn', function() vim.lsp.buf.rename() end, opts)
vim.keymap.set('i', '<C-h>', function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "gd", function()
vim.lsp.buf.definition()
end, opts)
vim.keymap.set("n", "K", function()
vim.lsp.buf.hover()
end, opts)
vim.keymap.set("n", "<leader>vws", function()
vim.lsp.buf.workspace_symbol()
end, opts)
vim.keymap.set("n", "<leader>vd", function()
vim.diagnostic.open_float()
end, opts)
vim.keymap.set("n", "[d", function()
vim.diagnostic.goto_next()
end, opts)
vim.keymap.set("n", "]d", function()
vim.diagnostic.goto_prev()
end, opts)
vim.keymap.set("n", "<leader>vca", function()
vim.lsp.buf.code_action()
end, opts)
vim.keymap.set("n", "<leader>vrr", function()
vim.lsp.buf.references()
end, opts)
vim.keymap.set("n", "<leader>vrn", function()
vim.lsp.buf.rename()
end, opts)
vim.keymap.set("i", "<C-h>", function()
vim.lsp.buf.signature_help()
end, opts)
end,
})
@@ -137,10 +102,10 @@ vim.diagnostic.config({
update_in_insert = true,
float = {
focusable = false,
style = 'minimal',
border = 'rounded',
source = 'always',
header = '',
prefix = ''
}
style = "minimal",
border = "rounded",
source = "always",
header = "",
prefix = "",
},
})

12
after/plugin/telescope.lua
View File

@@ -1,9 +1,9 @@
local builtin = require('telescope.builtin')
vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
vim.keymap.set("n", "<C-p>", builtin.git_files, {})
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
vim.keymap.set('n', '<leader>pt', ':TodoTelescope<CR>')
vim.keymap.set("n", "<leader>ps", function()
local status, result = pcall(function() return vim.fn.input("Grep > ") end)
vim.keymap.set('n', '<leader>ps', function()
local status, result = pcall(function() return vim.fn.input('Grep > ') end)
--
-- prevent keyboard interrupt error
if not status then
@@ -13,4 +13,6 @@ vim.keymap.set("n", "<leader>ps", function()
builtin.grep_string({ search = result });
end)
vim.api.nvim_set_hl(0, "TelescopeSelection", { link = "Visual" })
vim.keymap.set('n', '<C-b>', ':Telescope buffers<CR>');
vim.api.nvim_set_hl(0, 'TelescopeSelection', { link = 'Visual' })

184
lua/409/packer.lua
View File

@@ -1,79 +1,117 @@
vim.cmd.packadd('packer.nvim')
vim.cmd.packadd("packer.nvim")
return require('packer').startup(function(use)
use 'wbthomason/packer.nvim'
return require("packer").startup(function(use)
use("wbthomason/packer.nvim")
use 'nvim-lua/plenary.nvim'
use {
'christoomey/vim-tmux-navigator',
lazy = false
}
use {
'nvim-telescope/telescope.nvim',
requires = { { 'nvim-lua/plenary.nvim' } }
}
use {
"catppuccin/nvim",
as = "catppuccin"
}
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
use('nvim-treesitter/nvim-tree-docs')
use {
'ThePrimeagen/harpoon',
branch = 'harpoon2',
requires = { { 'nvim-lua/plenary.nvim' } }
}
use('onsails/lspkind.nvim')
use('mbbill/undotree')
use('tpope/vim-fugitive')
use {
'nvim-lualine/lualine.nvim',
requires = { 'nvim-tree/nvim-web-devicons', opt = true }
}
use('williamboman/mason.nvim')
use('williamboman/mason-lspconfig.nvim')
-- LSP Support
use('neovim/nvim-lspconfig')
-- Autocompletion
use('hrsh7th/nvim-cmp')
use('hrsh7th/cmp-nvim-lsp')
use('hrsh7th/cmp-nvim-lsp-signature-help')
use('hrsh7th/cmp-nvim-lua')
use('hrsh7th/cmp-buffer')
use('hrsh7th/cmp-path')
use('hrsh7th/cmp-cmdline')
use('L3MON4D3/LuaSnip')
use('nvim-tree/nvim-web-devicons')
use {
'danymat/neogen',
requires = { 'nvim-treesitter/nvim-treesitter' }
}
use {
'folke/todo-comments.nvim',
dependencies = { 'nvim-lua/plenary' }
}
use {
'folke/trouble.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' }
}
use("nvim-lua/plenary.nvim")
use({
'stevearc/conform.nvim'
"christoomey/vim-tmux-navigator",
lazy = false,
})
use({
"nvim-telescope/telescope.nvim",
requires = { { "nvim-lua/plenary.nvim" } },
})
use({
"catppuccin/nvim",
as = "catppuccin",
})
use("nvim-treesitter/nvim-treesitter", { run = ":TSUpdate" })
use("nvim-treesitter/nvim-tree-docs")
use({
"ThePrimeagen/harpoon",
branch = "harpoon2",
requires = { { "nvim-lua/plenary.nvim" } },
})
use("onsails/lspkind.nvim")
use("mbbill/undotree")
use("tpope/vim-fugitive")
use({
"nvim-lualine/lualine.nvim",
requires = { "nvim-tree/nvim-web-devicons", opt = true },
})
use("williamboman/mason.nvim")
use("williamboman/mason-lspconfig.nvim")
-- LSP Support
use("neovim/nvim-lspconfig")
-- Autocompletion
use("hrsh7th/nvim-cmp")
use("hrsh7th/cmp-nvim-lsp")
use("hrsh7th/cmp-nvim-lsp-signature-help")
use("hrsh7th/cmp-nvim-lua")
use("hrsh7th/cmp-buffer")
use("hrsh7th/cmp-path")
use("hrsh7th/cmp-cmdline")
use("L3MON4D3/LuaSnip")
use("nvim-tree/nvim-web-devicons")
use({
"danymat/neogen",
requires = { "nvim-treesitter/nvim-treesitter" },
})
use({
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary" },
})
use({
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
})
use({
"stevearc/conform.nvim",
})
use({
"akinsho/flutter-tools.nvim",
requires = {
"nvim-lua/plenary.nvim",
"stevearc/dressing.nvim", -- optional for vim.ui.select
},
})
use("RRethy/vim-illuminate")
use({
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
end,
})
use({
"lukas-reineke/headlines.nvim",
after = "nvim-treesitter",
config = function()
require("headlines").setup()
end,
})
use("JoosepAlviste/nvim-ts-context-commentstring")
use({
"utilyre/barbecue.nvim",
tag = "*",
requires = {
"SmiteshP/nvim-navic",
"nvim-tree/nvim-web-devicons", -- optional dependency
},
config = function()
require("barbecue").setup()
end,
})
end)

62
plugin/packer_compiled.lua
View File

@@ -74,11 +74,23 @@ end
time([[try_loadstring definition]], false)
time([[Defining packer_plugins]], true)
_G.packer_plugins = {
["Comment.nvim"] = {
config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0" },
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/Comment.nvim",
url = "https://github.com/numToStr/Comment.nvim"
},
LuaSnip = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
["barbecue.nvim"] = {
config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rbarbecue\frequire\0" },
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/barbecue.nvim",
url = "https://github.com/utilyre/barbecue.nvim"
},
catppuccin = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/catppuccin",
@@ -119,11 +131,29 @@ _G.packer_plugins = {
path = "/home/j409/.local/share/nvim/site/pack/packer/start/conform.nvim",
url = "https://github.com/stevearc/conform.nvim"
},
["dressing.nvim"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/dressing.nvim",
url = "https://github.com/stevearc/dressing.nvim"
},
["flutter-tools.nvim"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/flutter-tools.nvim",
url = "https://github.com/akinsho/flutter-tools.nvim"
},
harpoon = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/harpoon",
url = "https://github.com/ThePrimeagen/harpoon"
},
["headlines.nvim"] = {
config = { "\27LJ\2\n7\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\14headlines\frequire\0" },
load_after = {},
loaded = true,
needs_bufread = false,
path = "/home/j409/.local/share/nvim/site/pack/packer/opt/headlines.nvim",
url = "https://github.com/lukas-reineke/headlines.nvim"
},
["lspkind.nvim"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/lspkind.nvim",
@@ -159,6 +189,11 @@ _G.packer_plugins = {
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
url = "https://github.com/neovim/nvim-lspconfig"
},
["nvim-navic"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-navic",
url = "https://github.com/SmiteshP/nvim-navic"
},
["nvim-tree-docs"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-tree-docs",
@@ -169,6 +204,11 @@ _G.packer_plugins = {
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
url = "https://github.com/nvim-treesitter/nvim-treesitter"
},
["nvim-ts-context-commentstring"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring",
url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring"
},
["nvim-web-devicons"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
@@ -209,6 +249,11 @@ _G.packer_plugins = {
path = "/home/j409/.local/share/nvim/site/pack/packer/start/vim-fugitive",
url = "https://github.com/tpope/vim-fugitive"
},
["vim-illuminate"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/vim-illuminate",
url = "https://github.com/RRethy/vim-illuminate"
},
["vim-tmux-navigator"] = {
loaded = true,
path = "/home/j409/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator",
@@ -217,6 +262,23 @@ _G.packer_plugins = {
}
time([[Defining packer_plugins]], false)
-- Config for: barbecue.nvim
time([[Config for barbecue.nvim]], true)
try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rbarbecue\frequire\0", "config", "barbecue.nvim")
time([[Config for barbecue.nvim]], false)
-- Config for: Comment.nvim
time([[Config for Comment.nvim]], true)
try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
time([[Config for Comment.nvim]], false)
-- Load plugins in order defined by `after`
time([[Sequenced loading]], true)
vim.cmd [[ packadd nvim-treesitter ]]
vim.cmd [[ packadd headlines.nvim ]]
-- Config for: headlines.nvim
try_loadstring("\27LJ\2\n7\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\14headlines\frequire\0", "config", "headlines.nvim")
time([[Sequenced loading]], false)
_G._packer.inside_compile = false
if _G._packer.needs_bufread == true then