larssonmartin1998/.dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some colors in catppuccin and re-enable tresitter context

Browse source
This commit is contained in:
Martin Larsson 2024-05-24 00:37:35 +02:00
parent 6ceabaec6c
commit 029a6817df
3 changed files with 28 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

58
home/.config/nvim/lua/plugs/catppuccin.lua
View file

@ -15,50 +15,34 @@ return {
integrations = { integrations = {
leap = true, leap = true,
lsp_saga = true, lsp_saga = true,
lsp_trouble = true,
mason = true, mason = true,
semantic_tokens = true, semantic_tokens = true,
treesitter_context = true, treesitter_context = true,
telescope = { telescope = {
enable = true, enable = true,
-- style = "nvchad",
}, },
-- dap_ui = true, cmp = true,
-- dap = true, dap_ui = true,
-- Read catppuccin integration guide when installing dap, and dap_ui dap = true,
-- sign("DapBreakpoint", { text = "●", texthl = "DapBreakpoint", linehl = "", numhl = ""})
-- sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""})
-- sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""})
}, },
on_highlights = function(hl, c) dim_inactive = {
-- local prompt = "#2d3149" enabled = true,
-- hl.TelescopeNormal = { shade = "dark",
-- bg = c.bg_dark, percent = 0.15,
-- fg = c.fg_dark, },
-- } styles = {
-- hl.TelescopeBorder = { comments = { "italic" },
-- bg = c.bg_dark, },
-- fg = c.bg_dark, custom_highlights = function(colors)
-- } return {
-- hl.TelescopePromptNormal = { FloatBorder = { fg = colors.lavender },
-- bg = prompt, CmpItemMenu = { fg = colors.overlay2 },
-- } TelescopeNormal = { link = "NormalFloat" },
-- hl.TelescopePromptBorder = { TelescopeSelection = { link = "NormalFloat" },
-- bg = prompt, CopilotSuggestion = { fg = colors.overlay2 },
-- fg = prompt, }
-- } end
-- hl.TelescopePromptTitle = {
-- bg = prompt,
-- fg = prompt,
-- }
-- hl.TelescopePreviewTitle = {
-- bg = c.bg_dark,
-- fg = c.bg_dark,
-- }
-- hl.TelescopeResultsTitle = {
-- bg = c.bg_dark,
-- fg = c.bg_dark,
-- }
end,
}) })
vim.cmd.colorscheme "catppuccin" vim.cmd.colorscheme "catppuccin"

7
home/.config/nvim/lua/plugs/treesitter.lua
View file

@ -3,7 +3,7 @@ return {
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
build = ":TSUpdate", build = ":TSUpdate",
dependencies = { dependencies = {
-- "nvim-treesitter/nvim-treesitter-context", "nvim-treesitter/nvim-treesitter-context",
"nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-textobjects",
}, },
config = function() config = function()
@ -37,7 +37,10 @@ return {
}, },
sync_install = false, sync_install = false,
-- This can be updated to a list of languages instead of defaulting to true -- This can be updated to a list of languages instead of defaulting to true
highlight = { enable = true }, highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
enable = true, enable = true,

2
home/.config/nvim/lua/vim_opt.lua
View file

@ -54,4 +54,6 @@ opt.cmdheight = 0
opt.laststatus = 3 opt.laststatus = 3
opt.termguicolors = true
return opt return opt