nvim: nerd fonts
This commit is contained in:
parent
fa256c577f
commit
5f6f65523a
5 changed files with 23 additions and 9 deletions
|
@ -186,7 +186,7 @@ function M.config()
|
||||||
vim.fn.sign_define('DiagnosticSignError', { text = ' ', texthl = 'DiagnosticSignError' })
|
vim.fn.sign_define('DiagnosticSignError', { text = ' ', texthl = 'DiagnosticSignError' })
|
||||||
vim.fn.sign_define('DiagnosticSignWarn', { text = ' ', texthl = 'DiagnosticSignWarn' })
|
vim.fn.sign_define('DiagnosticSignWarn', { text = ' ', texthl = 'DiagnosticSignWarn' })
|
||||||
vim.fn.sign_define('DiagnosticSignInfo', { text = ' ', texthl = 'DiagnosticSignInfo' })
|
vim.fn.sign_define('DiagnosticSignInfo', { text = ' ', texthl = 'DiagnosticSignInfo' })
|
||||||
vim.fn.sign_define('DiagnosticSignHint', { text = '', texthl = 'DiagnosticSignHint' })
|
vim.fn.sign_define('DiagnosticSignHint', { text = '', texthl = 'DiagnosticSignHint' })
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'nvim-tree/nvim-web-devicons',
|
'nvim-tree/nvim-web-devicons',
|
||||||
|
dir = '/home/vladimir/devel/nvim-web-devicons',
|
||||||
opts = {
|
opts = {
|
||||||
override = {
|
override = {
|
||||||
xml = make_override('', 'orange', 'XML'),
|
xml = make_override('', 'orange', 'XML'),
|
||||||
|
|
|
@ -175,7 +175,15 @@ local function on_attach(args) -- {{{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end -- }}}
|
end -- }}}
|
||||||
|
|
||||||
|
local function make_client_capabilities()
|
||||||
|
local caps = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
local def = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
caps = vim.tbl_deep_extend('keep', caps, def)
|
||||||
|
caps.workspace.didChangeWatchedFiles.dynamicRegistration = false
|
||||||
|
return caps
|
||||||
|
end
|
||||||
|
|
||||||
local function config() -- {{{
|
local function config() -- {{{
|
||||||
require('neodev').setup({})
|
require('neodev').setup({})
|
||||||
|
@ -186,6 +194,11 @@ local function config() -- {{{
|
||||||
|
|
||||||
local nvim_lsp = require('lspconfig')
|
local nvim_lsp = require('lspconfig')
|
||||||
|
|
||||||
|
-- vim.lsp.handlers['client/registerCapability'] = function ()
|
||||||
|
-- vim.print("nasrat!")
|
||||||
|
-- return vim.NIL
|
||||||
|
-- end
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
-- {{{
|
-- {{{
|
||||||
-- powershell_es = {},
|
-- powershell_es = {},
|
||||||
|
@ -304,7 +317,7 @@ local function config() -- {{{
|
||||||
local mlsp = require('mason-lspconfig')
|
local mlsp = require('mason-lspconfig')
|
||||||
local available = mlsp.get_available_servers()
|
local available = mlsp.get_available_servers()
|
||||||
local ensure = {}
|
local ensure = {}
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = make_client_capabilities()
|
||||||
for name, conf in pairs(servers) do
|
for name, conf in pairs(servers) do
|
||||||
conf.capabilities = capabilities
|
conf.capabilities = capabilities
|
||||||
nvim_lsp[name].setup(conf)
|
nvim_lsp[name].setup(conf)
|
||||||
|
|
|
@ -182,9 +182,9 @@ return {
|
||||||
mode = 'document_diagnostics',
|
mode = 'document_diagnostics',
|
||||||
signs = {
|
signs = {
|
||||||
-- icons / text used for a diagnostic
|
-- icons / text used for a diagnostic
|
||||||
error = '',
|
error = '',
|
||||||
warning = '',
|
warning = '',
|
||||||
hint = '',
|
hint = '',
|
||||||
information = '',
|
information = '',
|
||||||
other = '',
|
other = '',
|
||||||
},
|
},
|
||||||
|
|
|
@ -91,7 +91,7 @@ function M.config()
|
||||||
icon = {
|
icon = {
|
||||||
folder_closed = '',
|
folder_closed = '',
|
||||||
folder_open = '',
|
folder_open = '',
|
||||||
folder_empty = 'ﰊ',
|
folder_empty = '',
|
||||||
-- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
|
-- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there
|
||||||
-- then these will never be used.
|
-- then these will never be used.
|
||||||
default = '*',
|
default = '*',
|
||||||
|
@ -112,11 +112,11 @@ function M.config()
|
||||||
added = '', -- or "✚", but this is redundant info if you use git_status_colors on the name
|
added = '', -- or "✚", but this is redundant info if you use git_status_colors on the name
|
||||||
modified = '', -- or "", but this is redundant info if you use git_status_colors on the name
|
modified = '', -- or "", but this is redundant info if you use git_status_colors on the name
|
||||||
deleted = '', -- this can only be used in the git_status source
|
deleted = '', -- this can only be used in the git_status source
|
||||||
renamed = '', -- this can only be used in the git_status source
|
renamed = '', -- this can only be used in the git_status source
|
||||||
-- Status type
|
-- Status type
|
||||||
untracked = '',
|
untracked = '',
|
||||||
ignored = '',
|
ignored = '',
|
||||||
unstaged = '',
|
unstaged = '',
|
||||||
staged = '',
|
staged = '',
|
||||||
conflict = '',
|
conflict = '',
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Reference in a new issue