Highlight: disable lsp, fix rust and whitespace

This commit is contained in:
Vladan Popovic 2024-09-24 19:02:23 +02:00
parent 324505f245
commit f173413eff
2 changed files with 37 additions and 18 deletions

View file

@ -100,26 +100,27 @@ require("catppuccin").setup({
DiagnosticUnnecessary = { link = "" }, DiagnosticUnnecessary = { link = "" },
["@conceal.checked"] = { fg = colors.teal }, --["@conceal.checked"] = { fg = colors.teal },
["@none"] = { link = "Normal" }, --["@none"] = { link = "Normal" },
["@field"] = { fg = colors.blue }, --["@field"] = { fg = colors.blue },
["@comment.todo"] = { fg = colors.lavender }, --["@comment.todo"] = { fg = colors.lavender },
["@property"] = { fg = colors.blue }, --["@property"] = { fg = colors.blue },
["@variable.member"] = { fg = colors.blue }, --["@variable.member"] = { fg = colors.blue },
["@variable.parameter"] = { fg = colors.sky }, --["@variable.parameter"] = { fg = colors.sky },
["@parameter"] = { fg = colors.sky }, --["@parameter"] = { fg = colors.sky },
["@comment.note"] = { link = "@comment.hint" }, --["@comment.note"] = { link = "@comment.hint" },
["@lsp.type.annotation"] = { fg = colors.yellow },
["@lsp.type.modifier.java"] = { link = "@type.qualifier" }, --["@lsp.type.annotation"] = { fg = colors.darkyellow },
["@lsp.mod.builtin"] = { fg = colors.maroon }, --["@lsp.type.modifier.java"] = { link = "@type.qualifier" },
["@lsp.mod.readonly.python"] = { link = "Constant" }, --["@lsp.mod.builtin"] = { fg = colors.maroon },
["@lsp.mod.documentation"] = { bold = true, fg = colors.mauve }, --["@lsp.mod.readonly.python"] = { link = "Constant" },
["@lsp.type.keyword"] = { fg = colors.mauve }, --["@lsp.mod.documentation"] = { bold = true, fg = colors.mauve },
--["@lsp.type.keyword"] = { fg = colors.mauve },
} }
end, end,
latte = function(colors) latte = function(colors)
return { return {
["@lsp.type.keyword"] = { fg = colors.lavender }, -- ["@lsp.type.keyword"] = { fg = colors.darkyellow },
Comment = { fg = colors.blue }, Comment = { fg = colors.blue },
Conditional = { fg = colors.darkyellow }, Conditional = { fg = colors.darkyellow },
@ -128,7 +129,7 @@ require("catppuccin").setup({
Function = { fg = colors.cyan }, Function = { fg = colors.cyan },
Identifier = { fg = colors.green }, Identifier = { fg = colors.green },
Include = { fg = colors.pink }, Include = { fg = colors.pink },
Keyword = { fg = colors.cyan }, Keyword = { fg = colors.darkyellow },
Operator = { fg = colors.darkyellow }, Operator = { fg = colors.darkyellow },
Parameter = { fg = colors.sky }, Parameter = { fg = colors.sky },
Special = { fg = colors.flamingo }, Special = { fg = colors.flamingo },
@ -136,6 +137,10 @@ require("catppuccin").setup({
String = { fg = colors.red }, String = { fg = colors.red },
Structure = { fg = colors.green }, Structure = { fg = colors.green },
WhitespaceError = { fg = colors.base, bg = colors.red }, WhitespaceError = { fg = colors.base, bg = colors.red },
Type = { fg = colors.cyan },
StorageClass = { fg = colors.green },
--Macro = { fg = colors.magenta },
--Define = { fg = colors.magenta },
} }
end, end,
}, },
@ -168,6 +173,7 @@ require("catppuccin").setup({
mantle = "#eeeeee", mantle = "#eeeeee",
crust = "#dddddd", crust = "#dddddd",
cyan = "#0EB1A2", cyan = "#0EB1A2",
magenta = "#FF00FF",
}, },
}, },
background = { background = {

View file

@ -28,12 +28,25 @@ vim.opt.background = 'light'
vim.opt.exrc = true vim.opt.exrc = true
vim.opt.secure = true vim.opt.secure = true
vim.api.nvim_create_autocmd('InsertEnter', {
callback = function()
vim.cmd.hi('clear RedundantSpaces')
end,
pattern = '*',
})
vim.api.nvim_create_autocmd({'InsertLeave', 'BufEnter'}, {
callback = function()
vim.cmd.hi('RedundantSpaces ctermbg=red guibg=red')
end,
pattern = '*',
})
vim.cmd([[ vim.cmd([[
set noautoread set noautoread
autocmd CursorHold * checktime autocmd CursorHold * checktime
autocmd TextYankPost * lua vim.highlight.on_yank {on_visual = false} autocmd TextYankPost * lua vim.highlight.on_yank {on_visual = false}
autocmd BufRead,BufNewFile *.bu,*.yml.example,*.yaml.example set filetype=yaml autocmd BufRead,BufNewFile *.bu,*.yml.example,*.yaml.example set filetype=yaml
autocmd BufRead,BufNewFile *.ign set filetype=json autocmd BufRead,BufNewFile *.ign set filetype=json
match Error /\s\+$/ match RedundantSpaces /\s\+$/
let g:airline_theme='papercolor' let g:airline_theme='papercolor'
]]) ]])