update

2026-02-22 16:43:16 -05:00
parent c8b2f86499
commit 60d782b282
7 changed files with 19 additions and 189 deletions
--- a/lua/plugins/catppuccin.lua
+++ b/lua/plugins/catppuccin.lua
@@ -1,10 +0,0 @@
-- Catppuccin theme plugin. 
-return {
-    "catppuccin/nvim",
-    lazy = false,
-    name = "catppuccin",
-    priority = 1000,
-    config = function()
-       -- vim.cmd.colorscheme "catppuccin"
-    end
-}
--- a/lua/plugins/dotnet.lua
+++ b/lua/plugins/dotnet.lua
@@ -1,8 +0,0 @@
-return
-{
-    --"GustavEikaas/easy-dotnet.nvim",
-    --dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" },
-    --config = function()
-      --  require("easy-dotnet").setup()
-    --end,
-}
--- a/lua/plugins/gay.vim
+++ b/lua/plugins/gay.vim
@@ -1,76 +0,0 @@
-hi clear
-syntax reset
-let g:colors_name = "gay"
-set background=dark
-set t_Co=256
-hi Normal guifg=#dadada ctermbg=NONE guibg=#000000 gui=NONE
-
-hi DiffText guifg=#ff3030 guibg=NONE
-hi ErrorMsg guifg=#ff3030 guibg=NONE
-hi WarningMsg guifg=#ff3030 guibg=NONE
-hi PreProc guifg=#ff3030 guibg=NONE
-hi Exception guifg=#ff3030 guibg=NONE
-hi Error guifg=#ff3030 guibg=NONE
-hi DiffDelete guifg=#ff3030 guibg=NONE
-hi GitGutterDelete guifg=#ff3030 guibg=NONE
-hi GitGutterChangeDelete guifg=#ff3030 guibg=NONE
-hi cssIdentifier guifg=#ff3030 guibg=NONE
-hi cssImportant guifg=#ff3030 guibg=NONE
-hi Type guifg=#ff3030 guibg=NONE
-hi Identifier guifg=#ff3030 guibg=NONE
-hi PMenuSel guifg=#45ff30 guibg=NONE
-hi Constant guifg=#45ff30 guibg=NONE
-hi Repeat guifg=#45ff30 guibg=NONE
-hi DiffAdd guifg=#45ff30 guibg=NONE
-hi GitGutterAdd guifg=#45ff30 guibg=NONE
-hi cssIncludeKeyword guifg=#45ff30 guibg=NONE
-hi Keyword guifg=#45ff30 guibg=NONE
-hi IncSearch guifg=#fff530 guibg=NONE
-hi Title guifg=#fff530 guibg=NONE
-hi PreCondit guifg=#fff530 guibg=NONE
-hi Debug guifg=#fff530 guibg=NONE
-hi SpecialChar guifg=#fff530 guibg=NONE
-hi Conditional guifg=#fff530 guibg=NONE
-hi Todo guifg=#fff530 guibg=NONE
-hi Special guifg=#fff530 guibg=NONE
-hi Label guifg=#fff530 guibg=NONE
-hi Delimiter guifg=#fff530 guibg=NONE
-hi Number guifg=#fff530 guibg=NONE
-hi CursorLineNR guifg=#fff530 guibg=NONE
-hi Define guifg=#fff530 guibg=NONE
-hi MoreMsg guifg=#fff530 guibg=NONE
-hi Tag guifg=#fff530 guibg=NONE
-hi String guifg=#fff530 guibg=NONE
-hi MatchParen guifg=#fff530 guibg=NONE
-hi Macro guifg=#fff530 guibg=NONE
-hi DiffChange guifg=#fff530 guibg=NONE
-hi GitGutterChange guifg=#fff530 guibg=NONE
-hi cssColor guifg=#fff530 guibg=NONE
-hi Function guifg=#30a9ff guibg=NONE
-hi Directory guifg=#962ffe guibg=NONE
-hi markdownLinkText guifg=#962ffe guibg=NONE
-hi javaScriptBoolean guifg=#962ffe guibg=NONE
-hi Include guifg=#962ffe guibg=NONE
-hi Storage guifg=#962ffe guibg=NONE
-hi cssClassName guifg=#962ffe guibg=NONE
-hi cssClassNameDot guifg=#962ffe guibg=NONE
-hi Statement guifg=#6de5ff guibg=NONE
-hi Operator guifg=#6de5ff guibg=NONE
-hi cssAttr guifg=#6de5ff guibg=NONE
-
-
-hi Pmenu guifg=#dadada guibg=#050505
-hi SignColumn guibg=#000000
-hi Title guifg=#dadada
-hi LineNr guifg=#747474 guibg=#000000
-hi NonText guifg=#ffa0e3 guibg=#000000
-hi Comment guifg=#ffa0e3 gui=italic
-hi SpecialComment guifg=#ffa0e3 gui=italic guibg=NONE
-hi CursorLine guibg=#050505
-hi TabLineFill gui=NONE guibg=#050505
-hi TabLine guifg=#747474 guibg=#050505 gui=NONE
-hi StatusLine gui=bold guibg=#050505 guifg=#dadada
-hi StatusLineNC gui=NONE guibg=#000000 guifg=#dadada
-hi Search guibg=#ffa0e3 guifg=#dadada
-hi VertSplit gui=NONE guifg=#050505 guibg=NONE
-hi Visual gui=NONE guibg=#050505
--- a/lua/plugins/lsp-config.lua
+++ b/lua/plugins/lsp-config.lua
@@ -9,86 +9,31 @@ return {
    -- Mason LSP Config.
    {
        "williamboman/mason-lspconfig.nvim",
+        dependencies = { "neovim/nvim-lspconfig" },
        config = function()
-            require("lspconfig").gdscript.setup({})
            require("mason-lspconfig").setup({
                ensure_installed = {
-                    "clangd",
-                    "neocmake",
-                    "jdtls",
-                    "ts_ls",
-                    "lua_ls",
-                    "pyright",
-                    "omnisharp",
-                    "html",
-                    "cssls",
-                    "glsl_analyzer",
-                    "biome",
-                    "somesass_ls",
-                    "ocamllsp",
+                    "clangd", "neocmake", "jdtls", "ts_ls", "lua_ls",
+                    "pyright", "omnisharp", "html", "cssls", "glsl_analyzer",
+                    "biome", "somesass_ls", "ocamllsp", "rust_analyzer",
                },
            })
-        end,
-    },
-    -- NeoVim LSP Config.
-    {
-        "neovim/nvim-lspconfig",
-        config = function()
-            -- Autocomplete and snippets stuff.
-            local capabilities = require("cmp_nvim_lsp").default_capabilities()
-            -- Setting up languages.
-            local lspconfig = require("lspconfig")
-            lspconfig.clangd.setup({ capabilities = capabilities })
-            lspconfig.jdtls.setup({ capabilities = capabilities })
-            lspconfig.lua_ls.setup({ capabilities = capabilities })
-            lspconfig.ts_ls.setup({ capabilities = capabilities })
-            lspconfig.pyright.setup({ capabilities = capabilities })
-            lspconfig.html.setup({
-                capabilities = capabilities,
-                filetypes = { "html", "jinja.html" },
-            })
-            lspconfig.cssls.setup({ capabilities = capabilities })
-            lspconfig.glsl_analyzer.setup({ capabilities = capabilities })
-            lspconfig.somesass_ls.setup({ capabilities = capabilities })
-
-            -- Specific stuff for CMake.
-            local cmakeCapabilities = vim.lsp.protocol.make_client_capabilities()
-            cmakeCapabilities.textDocument.completion.completionItem.snippetSupport = true
-            lspconfig.neocmake.setup({ capabilities = cmakeCapabilities })
-
-            -- Specific stuff to C# omnisharp
-            lspconfig.omnisharp.setup({
-                capabilities = capabilities,
-                cmd = { "dotnet", vim.fn.stdpath("data") .. "/mason/packages/omnisharp/libexec/OmniSharp.dll" },
-                enable_import_completion = true,
-                organize_imports_on_format = true,
-                enable_roslyn_analyzers = true,
+            require("mason-lspconfig").setup_handlers({
+                function(server_name)
+                    if server_name == "ocamllsp" then
+                        require("lspconfig").ocamllsp.setup({
+                            capabilities = require("cmp_nvim_lsp").default_capabilities(),
                            root_dir = function()
-                    return vim.loop.cwd() -- Current Working Directory
+                                return vim.loop.cwd()
+                            end,
+                        })
+                    else
+                        require("lspconfig")[server_name].setup({
+                            capabilities = require("cmp_nvim_lsp").default_capabilities(),
+                        })
+                    end
                end,
-                -- Settings stuff
-                settings = {
-                    FormattingOptions = {
-                        EnableEditorConfigSupport = true,
-                        OrganizeImports = true,
-                    },
-                    MsBuild = {
-                        LoadProjectsOnDemand = false,
-                    },
-                    RoslynExtensionsOptions = {
-                        EnableAnalyzersSupport = true,
-                        EnableImportCompletion = true,
-                        AnalyzeOpenDocumentsOnly = false,
-                    },
-                    Sdk = {
-                        IncludePrereleases = true,
-                    },
-                },
            })
-            -- Setting up keybinds.
-            vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
-            vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
-            vim.keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, {})
        end,
    },
 }
--- a/lua/plugins/markdown-preview.lua
+++ b/lua/plugins/markdown-preview.lua
@@ -1,11 +0,0 @@
-return {
-    {
-        "iamcco/markdown-preview.nvim",
-        cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-        build = "cd app && yarn install",
-        init = function()
-            vim.g.mkdp_filetypes = { "markdown" }
-        end,
-        ft = { "markdown" },
-    },
-}
--- a/lua/plugins/markdown-render.lua
+++ b/lua/plugins/markdown-render.lua
@@ -1,11 +0,0 @@
-return {
-    {
-        "MeanderingProgrammer/render-markdown.nvim",
-        dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
-        -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
-        -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
-        ---@module 'render-markdown'
-        ---@type render.md.UserConfig
-        opts = {},
-    },
-}
--- a/lua/vim-options.lua
+++ b/lua/vim-options.lua
@@ -6,6 +6,7 @@ vim.cmd("set shiftwidth=4")
 vim.g.mapleader = " "
 vim.opt.number = true

+
 vim.filetype.add({
    extension = {
        shader = "hlsl"