mirror of
https://github.com/jdhao/nvim-config.git
synced 2025-06-08 14:14:33 +02:00
Compare commits
No commits in common. "d40d87cb61a723104bbdd0dac533a16ed42eaf4f" and "2c7e4aa87aefcc32682d017eae9e3c1395ae8f2b" have entirely different histories.
d40d87cb61
...
2c7e4aa87a
@ -47,6 +47,10 @@ if not vim.g.is_mac then
|
||||
vim.cmd [[language en_US.utf-8]]
|
||||
end
|
||||
|
||||
-- use filetype.lua instead of filetype.vim
|
||||
vim.g.do_filetype_lua = 1
|
||||
vim.g.did_load_filetypes = 0
|
||||
|
||||
-- Disable loading certain plugins
|
||||
|
||||
-- Whether to load netrw by default, see https://github.com/bling/dotvim/issues/4
|
||||
|
||||
2
init.lua
2
init.lua
@ -12,7 +12,7 @@ local api = vim.api
|
||||
local utils = require("utils")
|
||||
|
||||
-- check if we have the latest stable version of nvim
|
||||
local expected_ver = "0.8.0"
|
||||
local expected_ver = "0.7.2"
|
||||
local nvim_ver = utils.get_nvim_version()
|
||||
|
||||
if nvim_ver ~= expected_ver then
|
||||
|
||||
@ -33,8 +33,11 @@ local custom_attach = function(client, bufnr)
|
||||
end, { desc = "list workspace folder" })
|
||||
|
||||
-- Set some key bindings conditional on server capabilities
|
||||
if client.server_capabilities.documentFormattingProvider then
|
||||
map("n", "<space>f", vim.lsp.buf.format, { desc = "format code" })
|
||||
if client.resolved_capabilities.document_formatting then
|
||||
map("n", "<space>f", vim.lsp.buf.formatting_sync, { desc = "format code" })
|
||||
end
|
||||
if client.resolved_capabilities.document_range_formatting then
|
||||
map("x", "<space>f", vim.lsp.buf.range_formatting, { desc = "range format" })
|
||||
end
|
||||
|
||||
api.nvim_create_autocmd("CursorHold", {
|
||||
@ -53,7 +56,8 @@ local custom_attach = function(client, bufnr)
|
||||
end
|
||||
|
||||
local cursor_pos = api.nvim_win_get_cursor(0)
|
||||
if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
|
||||
if
|
||||
(cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
|
||||
and #vim.diagnostic.get() > 0
|
||||
then
|
||||
vim.diagnostic.open_float(nil, float_opts)
|
||||
@ -64,7 +68,7 @@ local custom_attach = function(client, bufnr)
|
||||
})
|
||||
|
||||
-- The blow command will highlight the current variable and its usages in the buffer.
|
||||
if client.server_capabilities.documentHighlightProvider then
|
||||
if client.resolved_capabilities.document_highlight then
|
||||
vim.cmd([[
|
||||
hi! link LspReferenceRead Visual
|
||||
hi! link LspReferenceText Visual
|
||||
|
||||
@ -3,6 +3,6 @@ require("nvim-treesitter.configs").setup {
|
||||
ignore_install = {}, -- List of parsers to ignore installing
|
||||
highlight = {
|
||||
enable = true, -- false will disable the whole extension
|
||||
disable = { 'help' }, -- list of language that will be disabled
|
||||
disable = {}, -- list of language that will be disabled
|
||||
},
|
||||
}
|
||||
|
||||
@ -262,7 +262,9 @@ packer.startup {
|
||||
if vim.g.is_win or vim.g.is_mac then
|
||||
use {
|
||||
"iamcco/markdown-preview.nvim",
|
||||
run = "cd app && npm install",
|
||||
run = function()
|
||||
fn["mkdp#util#install"]()
|
||||
end,
|
||||
ft = { "markdown" },
|
||||
}
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user