Merge branch 'dev' into gentoo

nvim:
        format config files
        add commenting plugin
mercury
David JULIEN 2021-10-12 19:10:53 +02:00
commit 67c6462ab0
No known key found for this signature in database
GPG Key ID: 4B388E8BD9D47382
5 changed files with 99 additions and 30 deletions

View File

@ -17,3 +17,6 @@ require("plugin.cmp") -- ./lua/plugin/cmp.lua
-- treesitter
require("plugin.treesitter") -- ./lua/plugin/treesitter.lua
-- commenting, done right
require("plugin.comment") -- ./lua/plugin/comment.lua

View File

@ -3,7 +3,7 @@
-- License : GPLv3
-- Description : neovim lsp config file
local lsp = {}
local M = {}
vim.fn.sign_define(
"DiagnosticSignError",
@ -38,39 +38,43 @@ vim.fn.sign_define(
}
)
-- symbols for autocomplete
vim.lsp.protocol.CompletionItemKind = {
"", -- Text
"", -- Method
"", -- Function
"", -- Constructor
"", -- Field
"", -- Variable
"", -- Class
"", -- Interface
"", -- Module
"", -- Property
"", -- Unit
"", -- Value
"", -- Enum
"", -- Keyword
"", -- Snippet
"", -- Color
"", -- File
"", -- Reference
"", -- Folder
"", -- EnumMember
"", -- Constant
"", -- Struct
"", -- Event
"", -- Operator
"", -- TypeParameter
M.icons = {
Class = "",
Color = "",
Constant = " µ ",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
File = "",
Folder = "",
Function = "",
Keyword = "",
Interface = "",
Method = "",
Module = "",
Operator = "",
Property = "",
Reference = "",
Snippet = "",
Struct = "",
Text = "",
TypeParameter = "",
Unit = "",
Value = "",
Variable = "",
}
function lsp.setup()
function M.setup()
local kinds = vim.lsp.protocol.CompletionItemKind
for i, kind in ipairs(kinds) do
kinds[i] = M.icons[kind] or kind
end
local ft = vim.bo.filetype
if ft == "cpp" then ft = "c" end
require("lsp." .. ft) -- ./<ft>.lua
end
return lsp
return M

View File

@ -0,0 +1,54 @@
-- Author : swytch
-- Created : Tuesday Oct. 12, 2021 19:07:36 CET
-- License : GPLv3
-- Description : Comment plugin config file
require("Comment").setup {
---Add a space b/w comment and the line
---@type boolean
padding = true,
---Lines to be ignored while comment/uncomment.
---Could be a regex string or a function that returns a regex string.
---Example: Use '^$' to ignore empty lines
---@type string|function
ignore = nil,
---Whether to create basic (operator-pending) and extra mappings for NORMAL/VISUAL mode
---@type table
mappings = {
---operator-pending mapping
---Includes `gcc`, `gcb`, `gc[count]{motion}` and `gb[count]{motion}`
basic = true,
---extended mapping
---Includes `g>`, `g<`, `g>[count]{motion}` and `g<[count]{motion}`
extra = false,
},
---LHS of line and block comment toggle mapping in NORMAL/VISUAL mode
---@type table
toggler = {
---line-comment toggle
line = 'gcc',
---block-comment toggle
block = 'gbc',
},
---LHS of line and block comment operator-mode mapping in NORMAL/VISUAL mode
---@type table
opleader = {
---line-comment opfunc mapping
line = 'gc',
---block-comment opfunc mapping
block = 'gb',
},
---Pre-hook, called before commenting the line
---@type function|nil
pre_hook = nil,
---Post-hook, called after commenting is done
---@type function|nil
post_hook = nil,
}

View File

@ -1,3 +1,8 @@
-- Author : swytch
-- Created : Monday May 24, 2021 20:02:19 CET
-- License : GPLv3
-- Description : treesitter config file
require("nvim-treesitter.configs").setup {
ensure_installed = { "c", "lua", "python", "bash", "latex", "verilog" },
ignore_install = { "javascript" },

View File

@ -69,6 +69,9 @@ return require("packer").startup(function()
}
}
-- commenting, simplified
use "numToStr/Comment.nvim"
-- display colors directly in editor
use {
"norcalli/nvim-colorizer.lua",