From f230006a384294d584099396b4aac4f12d223353 Mon Sep 17 00:00:00 2001 From: vx-clutch Date: Tue, 8 Apr 2025 20:27:32 -0400 Subject: [PATCH] todo: make it more dull --- nvim/.config/nvim/colors/coolurs.lua | 4 + nvim/.config/nvim/lua/vxclutch/init.lua | 15 +-- .../.config/nvim/lua/vxclutch/lazy/colors.lua | 31 ----- nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua | 126 ++++++------------ 4 files changed, 44 insertions(+), 132 deletions(-) create mode 100644 nvim/.config/nvim/colors/coolurs.lua diff --git a/nvim/.config/nvim/colors/coolurs.lua b/nvim/.config/nvim/colors/coolurs.lua new file mode 100644 index 0000000..a5e80d7 --- /dev/null +++ b/nvim/.config/nvim/colors/coolurs.lua @@ -0,0 +1,4 @@ +vim.g.colors_name = 'coolurs' + +vim.cmd('hi Normal guibg=black guifg=#ffffff') +vim.cmd('hi String guifg=#008000') diff --git a/nvim/.config/nvim/lua/vxclutch/init.lua b/nvim/.config/nvim/lua/vxclutch/init.lua index 76d837c..d75d6d0 100644 --- a/nvim/.config/nvim/lua/vxclutch/init.lua +++ b/nvim/.config/nvim/lua/vxclutch/init.lua @@ -2,17 +2,4 @@ require("vxclutch.set") require("vxclutch.remap") require("vxclutch.lazy_init") -local augroup = vim.api.nvim_create_augroup -local autocmd = vim.api.nvim_create_autocmd -local VxclutchGroup = augroup("Vxclutch", {}) - -autocmd("BufEnter", { - group = VxclutchGroup, - callback = function() - if vim.bo.filetype == "zig" then - vim.cmd.colorscheme("tokyonight-night") - else - vim.cmd.colorscheme("rose-pine-moon") - end - end, -}) +vim.cmd.colorscheme("coolurs") diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/colors.lua b/nvim/.config/nvim/lua/vxclutch/lazy/colors.lua index 2bac5ce..97aeadd 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/colors.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/colors.lua @@ -1,33 +1,2 @@ -function ColorMyPencils(color) - color = color or "rose-pine" - vim.cmd.colorscheme(color) -end - return { - { - "folke/tokyonight.nvim", - config = function() - require("tokyonight").setup({ - style = "storm", - transparent = true, - terminal_colors = true, - styles = { - comments = { italic = false }, - keywords = { italic = false }, - sidebars = "dark", - floats = "dark", - }, - }) - end, - }, - { - "rose-pine/neovim", - name = "rose-pine", - config = function() - require("rose-pine").setup({ disable_background = true }) - - vim.cmd("colorscheme rose-pine") - ColorMyPencils() - end, - }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua index 6750972..605c697 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua @@ -1,91 +1,43 @@ return { - "neovim/nvim-lspconfig", - dependencies = { - "stevearc/conform.nvim", - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "hrsh7th/nvim-cmp", - "L3MON4D3/LuaSnip", - "saadparwaiz1/cmp_luasnip", - "j-hui/fidget.nvim", - }, + "neovim/nvim-lspconfig", + dependencies = { + "stevearc/conform.nvim", + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", + "j-hui/fidget.nvim", + }, - config = function() - require("conform").setup { - formatters_by_ft = {}, - } - local cmp = require "cmp" - local cmp_lsp = require "cmp_nvim_lsp" - local capabilities = - vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities()) + config = function() + require("conform").setup({ + formatters_by_ft = {}, + }) - require("fidget").setup {} - require("mason").setup() - require("mason-lspconfig").setup { - ensure_installed = { - "lua_ls", - "clangd", - "gopls", - }, - handlers = { - function(server_name) -- default handler (optional) - require("lspconfig")[server_name].setup { - capabilities = capabilities, - } - end, - ["lua_ls"] = function() - local lspconfig = require "lspconfig" - lspconfig.lua_ls.setup { - capabilities = capabilities, - settings = { - Lua = { - runtime = { version = "Lua 5.1" }, - diagnostics = { - globals = { "bit", "vim", "it", "describe", "before_each", "after_each" }, - }, - }, - }, - } - end, - }, - } - - local cmp_select = { behavior = cmp.SelectBehavior.Select } - - cmp.setup { - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) -- For `luasnip` users. - end, - }, - mapping = cmp.mapping.preset.insert { - [""] = cmp.mapping.select_prev_item(cmp_select), - [""] = cmp.mapping.select_next_item(cmp_select), - [""] = cmp.mapping.confirm { select = true }, - [""] = cmp.mapping.complete(), - }, - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, -- For luasnip users. - }, { - { name = "buffer" }, - }), - } - - vim.diagnostic.config { - -- update_in_insert = true, - float = { - focusable = true, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - }, - } - end, + require("fidget").setup({}) + require("mason").setup() + require("mason-lspconfig").setup({ + ensure_installed = { + "lua_ls", + "clangd", + "gopls", + }, + handlers = { + function(server_name) + require("lspconfig")[server_name].setup({}) + end, + ["lua_ls"] = function() + local lspconfig = require("lspconfig") + lspconfig.lua_ls.setup({ + settings = { + Lua = { + runtime = { version = "Lua 5.1" }, + diagnostics = { + globals = { "bit", "vim", "it", "describe", "before_each", "after_each" }, + }, + }, + }, + }) + end, + }, + }) + end, }