Change nvim theme to catppuccin, and add some more ensured_installed to treesitter

nvim/lua/plugs/catppuccin.lua

@@ -0,0 +1,66 @@
+return {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,
+    config = function()
+        require("catppuccin").setup({
+            flavour = "macchiato",
+            background = {
+                light = "latte",
+                dark = "macchiato"
+            },
+            transparent_background = true,
+            term_colors = true,
+            sidebars = { "qf", "help" },
+            integrations = {
+                leap = true,
+                lsp_saga = 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 = ""})
+            },
+            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,
+        })
+
+        vim.cmd.colorscheme "catppuccin"
+    end
+}

nvim/lua/plugs/lspsaga.lua

@@ -2,7 +2,6 @@ return {
     "LarssonMartin1998/lspsaga.nvim",
     branch = "improved_winbar",
     dependencies = {
-        -- "nvim-treesitter/nvim-treesitter",
         "nvim-tree/nvim-web-devicons",
     },
     config = function()
@@ -26,6 +25,7 @@ return {
                 win_width = 52,
             },
             ui = {
+                kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(),
                 border = "single",
             }
         })

nvim/lua/plugs/lualine.lua

@@ -6,7 +6,7 @@ return {
     config = function()
         require("lualine").setup {
             options = {
-                theme = "tokyonight",
+                theme = "catppuccin",
                 section_separators = {"", ""},
                 component_separators = {"", ""},
                 icons_enabled = true,

nvim/lua/plugs/reactive.lua

@@ -1,91 +1,8 @@
-local function create_tokyonight_storm_preset()
-    local darken = require("tokyonight.util").darken
-
-    local red = "#f7768e"
-    local green = "#9ece6a"
-    local yellow = "#e0af68"
-    local blue = "#7aa2f7"
-    local pink = "#bb9af7"
-    local teal = "#7dcfff"
-
-    return {
-        name = "tokyonight-storm",
-        init = function()
-            vim.opt.guicursor:append({ "a:MyCursor" })
-        end,
-        skip = function()
-            -- return true if we want to avoid applying highight for this mode, it's called on each mode change
-            return false
-        end,
-        modes = {
-            n = {
-                winhl = {
-                    CursorLineNr = { fg = blue },
-                    CursorLine = { bg = darken(blue, 0.25) },
-                },
-                hl = {
-                    MyCursor = { bg = darken(blue, 0.7) }
-                }
-            },
-            no = {
-                winhl = {},
-                hl = {},
-                operators = {
-                    d = {
-                        winhl = {
-                            CursorLineNr = { fg = red },
-                            CursorLine = { bg = darken(red, 0.15) },
-                        },
-                        hl = {
-                            MyCursor = { bg = red }
-                        }
-                    },
-                    y = {
-                        winhl = {
-                            CursorLineNr = { fg = yellow },
-                            CursorLine = { bg = darken(yellow, 0.15) },
-                        },
-                        hl = {
-                            MyCursor = { bg = yellow }
-                        }
-                    },
-                    c = {
-                        winhl = {
-                            CursorLineNr = { fg = teal },
-                            CursorLine = { bg = darken(teal, 0.15) },
-                        },
-                        hl = {
-                            MyCursor = { bg = teal }
-                        },
-                    },
-                },
-            },
-            i = {
-                winhl = {
-                    CursorLineNr = { fg = green },
-                    CursorLine = { bg = darken(green, 0.125) },
-                },
-                hl = {
-                    MyCursor = { bg = green }
-                }
-            },
-            [{ "v", "V", "\x16" }] = {
-                winhl = {
-                    CursorLineNr = { fg = pink },
-                    Visual = { bg = darken(pink, 0.3) },
-                },
-                hl = {
-                    MyCursor = { bg = pink }
-                }
-            },
-        },
-    }
-end
-
 return {
     "rasulomaroff/reactive.nvim",
     config = function()
-        local reactive = require("reactive")
+        require("reactive").setup({
-        reactive.add_preset(create_tokyonight_storm_preset())
+            load = { "catppuccin-macchiato-cursor", "catppuccin-macchiato-cursorline" }
+        })
     end,
 }

nvim/lua/plugs/telescope.lua

@@ -74,6 +74,7 @@ return {
                         dropdown_theme.previewer = false
                         dropdown_theme.find_command = nil
                         require("telescope.builtin").find_files(dropdown_theme)
+                        -- require("telescope.builtin").find_files()
                     end,
                 },
                 ["<leader>tf"] = {

nvim/lua/plugs/tokyonight.lua

@@ -1,77 +0,0 @@
-return {
-    "folke/tokyonight.nvim",
-    lazy = false,
-    priority = 1000,
-    config = function()
-        require("tokyonight").setup({
-            style = "storm",
-            light_style = "day",
-            transparent = true,
-            terminal_colors = true,
-            styles = {
-                comments = {},
-                keywords = {},
-                functions = {},
-                variables = {},
-                sidebars = "dark",
-                floats = "dark"
-            },
-            sidebars = { "qf", "help" },
-            day_brightness = 0.3,
-            hide_inactive_statusline = false,
-            dim_inactive = false,
-            lualine_bold = true,
-
-            --- You can override specific color groups to use other groups or a hex color
-            --- function will be called with a ColorScheme table
-            ---@param colors ColorScheme
-            on_colors = function(colors) end,
-
-            --- You can override specific highlights to use other groups or a hex color
-            --- function will be called with a Highlights and ColorScheme table
-            ---@param highlights Highlights
-            ---@param colors ColorScheme
-            on_highlights = function(highlights, colors)
-                -- local prompt = "#2d3149"
-                -- highlights.TelescopeNormal = {
-                --     bg = colors.bg_dark,
-                --     fg = colors.fg_dark,
-                -- }
-                -- highlights.TelescopeBorder = {
-                --     bg = colors.bg_dark,
-                --     fg = colors.bg_dark,
-                -- }
-                -- highlights.TelescopePromptNormal = {
-                --     bg = prompt,
-                -- }
-                -- highlights.TelescopePromptBorder = {
-                --     bg = prompt,
-                --     fg = prompt,
-                -- }
-                -- highlights.TelescopePromptTitle = {
-                --     bg = prompt,
-                --     fg = prompt,
-                -- }
-                -- highlights.TelescopePreviewTitle = {
-                --     bg = colors.bg_dark,
-                --     fg = colors.bg_dark,
-                -- }
-                -- highlights.TelescopeResultsTitle = {
-                --     bg = colors.bg_dark,
-                --     fg = colors.bg_dark,
-                -- }
-            end,
-        })
-
-        vim.cmd[[colorscheme tokyonight-storm]]
-    end
-}
-
--- Usecase example for other plugins when adding colorscheme support
---[[
-local colors = require("tokyonight.colors").setup() -- pass in any of the config options as explained above
-local util = require("tokyonight.util")
-
-aplugin.background = colors.bg_dark
-aplugin.my_error = util.lighten(colors.red1, 0.3) -- number between 0 and 1. 0 results in white, 1 results in red1
-]]--

nvim/lua/plugs/treesitter.lua

@@ -15,12 +15,25 @@ return {
                 "lua",
                 "c",
                 "cpp",
+                "c_sharp",
                 "rust",
                 "cmake",
                 "make",
                 "yaml",
                 "ninja",
                 "gitignore",
+                "markdown",
+                "markdown_inline",
+                "hyprlang",
+                "json",
+                "html",
+                "hlsl",
+                "glsl",
+                "gdshader",
+                "gdscript",
+                "dockerfile",
+                "dart",
+                "css"
             },
             sync_install = false,
             -- This can be updated to a list of languages instead of defaulting to true