Fix some colors in catppuccin and re-enable tresitter context

home/.config/nvim/lua/plugs/catppuccin.lua

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

home/.config/nvim/lua/plugs/treesitter.lua

@@ -3,7 +3,7 @@ return {
     event = { "BufReadPre", "BufNewFile" },
     build = ":TSUpdate",
     dependencies = {
-        -- "nvim-treesitter/nvim-treesitter-context",
+        "nvim-treesitter/nvim-treesitter-context",
         "nvim-treesitter/nvim-treesitter-textobjects",
     },
     config = function()
@@ -37,7 +37,10 @@ return {
             },
             sync_install = false,
             -- 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 },
             incremental_selection = {
                 enable = true,

home/.config/nvim/lua/vim_opt.lua

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