diff --git a/lua/configs/cmp.lua b/lua/configs/cmp.lua index d616344..976d5e7 100644 --- a/lua/configs/cmp.lua +++ b/lua/configs/cmp.lua @@ -1,6 +1,6 @@ local cmp = require "cmp" -local options = { +cmp.setup({ snippet = { expand = function(args) @@ -38,6 +38,6 @@ local options = { { name = "nvim_lua" }, { name = "path" }, }, -} +}) return options diff --git a/lua/plugins.lua b/lua/plugins.lua index 1cbb3bd..3566a89 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -13,17 +13,6 @@ local plugins = { require('configs.treesitter') end, }, - -- { - -- "williamboman/mason-lspconfig.nvim", - -- dependencies = { - -- "williamboman/mason.nvim", - -- }, - -- config = function() - -- require("mason").setup() - -- require("mason-lspconfig").setup() - -- -- - -- end - -- }, { "neovim/nvim-lspconfig", config = function() @@ -34,109 +23,96 @@ local plugins = { "catppuccin/nvim", name = "catppuccin", priority = 1000, - config = function() - require("catppuccin").setup({ - background = { -- :h background - light = "latte", - dark = "mocha", + opts = { + background = { -- :h background + light = "latte", + dark = "mocha", + }, + styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): + comments = {}, -- Change the style of comments + conditionals = { "italic" }, + loops = {}, + functions = {}, + keywords = { "italic" }, + strings = {}, + variables = {}, + numbers = {}, + booleans = {}, + properties = { "italic" }, + types = { "bold" }, + operators = {}, + }, + color_overrides = { + mocha = { + base = "#000000", + mantle = "#111111", + crust = "#111111", }, - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = {}, -- Change the style of comments - conditionals = { "italic" }, - loops = {}, - functions = {}, - keywords = { "italic" }, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = { "italic" }, - types = { "bold" }, - operators = {}, + latte = { + base = "#ffffff", + mantle = "#f5f5f5", + crust = "#f5f5f5", + black = "#000000", + } + }, + custom_highlights = function(C) + return { + HopNextKey = { bg = C.text, fg = C.base, style = { "bold", "underline" } }, + HopNextKey1 = { bg = C.text, fg = C.base, style = { "bold" } }, + HopNextKey2 = { bg = C.text, fg = C.base, style = { "bold", "italic" } }, + DiagnosticUnderlineError = { style = { "undercurl" } }, + DiagnosticUnderlineWarn = { style = { "undercurl" } }, + DiagnosticUnderlineInfo = { style = { "undercurl" } }, + DiagnosticUnderlineHint = { style = { "undercurl" } }, + DiagnosticUnderlineOk = { style = { "undercurl" } }, + -- Function = { fg = C.blue, style = { "bold" } }, + -- Keyword = { fg = C.black, style = { "italic" } }, + } + end, + integrations = { + cmp = true, + gitsigns = true, + nvimtree = true, + treesitter = true, + mini = true, + mason = true, + neogit = true, + illuminate = false, + -- noice = true, + -- notify = true, + flash = true, + telescope = { + enabled = true, + style = "nvchad" }, - color_overrides = { - mocha = { - base = "#000000", - mantle = "#000000", - crust = "#000000", - }, - latte = { - base = "#ffffff", - mantle = "#f5f5f5", - crust = "#f5f5f5", - black = "#000000", - } + dap = { + enabled = true, + enable_ui = true, -- enable nvim-dap-ui }, - custom_highlights = function(C) - return { - HopNextKey = { bg = C.text, fg = C.base, style = { "bold", "underline" } }, - HopNextKey1 = { bg = C.text, fg = C.base, style = { "bold" } }, - HopNextKey2 = { bg = C.text, fg = C.base, style = { "bold", "italic" } }, - DiagnosticUnderlineError = { style = { "undercurl" } }, - DiagnosticUnderlineWarn = { style = { "undercurl" } }, - DiagnosticUnderlineInfo = { style = { "undercurl" } }, - DiagnosticUnderlineHint = { style = { "undercurl" } }, - DiagnosticUnderlineOk = { style = { "undercurl" } }, - -- Function = { fg = C.blue, style = { "bold" } }, - -- Keyword = { fg = C.black, style = { "italic" } }, - } - end, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - treesitter = true, - mini = true, - mason = true, - neogit = true, - illuminate = false, - -- noice = true, - -- notify = true, - flash = true, - telescope = { - enabled = true, - style = "nvchad" + indent_blankline = { + enabled = true, + }, + native_lsp = { + enabled = true, + virtual_text = { + errors = { "italic" }, + hints = { "italic" }, + warnings = { "italic" }, + information = { "italic" }, }, - dap = { - enabled = true, - enable_ui = true, -- enable nvim-dap-ui + underlines = { + errors = { "underline" }, + hints = { "underline" }, + warnings = { "underline" }, + information = { "underline" }, }, - indent_blankline = { - enabled = true, - }, - native_lsp = { - enabled = true, - virtual_text = { - errors = { "italic" }, - hints = { "italic" }, - warnings = { "italic" }, - information = { "italic" }, - }, - underlines = { - errors = { "underline" }, - hints = { "underline" }, - warnings = { "underline" }, - information = { "underline" }, - }, - inlay_hints = { - background = true, - }, + inlay_hints = { + background = true, }, }, - }) - end, + }, + } }, - -- { - -- "Shatur/neovim-ayu", - -- config = function() - -- require('ayu').setup({ - -- options = { - -- theme = 'ayu', - -- }, - -- }) - -- end, - -- }, - -- Install without configuration { "folke/which-key.nvim", event = "VeryLazy", @@ -144,11 +120,6 @@ local plugins = { vim.o.timeout = true vim.o.timeoutlen = 300 end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - } }, { "hrsh7th/nvim-cmp", @@ -174,7 +145,7 @@ local plugins = { 'saadparwaiz1/cmp_luasnip' }, }, - opts = function() + config = function() return require "configs.cmp" end, }, @@ -194,40 +165,32 @@ local plugins = { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons', - -- 'arkav/lualine-lsp-progress', + { 'linrongbin16/lsp-progress.nvim', opts = {} } }, - config = function() - require('lualine').setup(require("configs.lualine")) - end + opts = require("configs.lualine") }, { 'akinsho/bufferline.nvim', version = "*", dependencies = { 'nvim-tree/nvim-web-devicons', 'catppuccin' }, config = function() - require("bufferline").setup { + require("bufferline").setup({ highlights = require("catppuccin.groups.integrations.bufferline").get() - } + }) end }, { 'numToStr/Comment.nvim', - lazy = false, - config = function() - require("Comment").setup() - end, - + opts = {} }, { 'Wansmer/treesj', keys = { 'm', 'j', 's' }, dependencies = { 'nvim-treesitter/nvim-treesitter' }, - config = function() - require('treesj').setup({ - use_default_keymaps = false, - max_join_length = 1200, - }) - end, + opts = { + use_default_keymaps = false, + max_join_length = 1200, + }, }, { "rmagatti/auto-session", @@ -258,22 +221,6 @@ local plugins = { }) end, }, - -- { - -- 'niuiic/multiple-session.nvim', - -- dependencies = { 'niuiic/core.nvim' }, - -- config = function () require("multiple-session").setup() end - -- }, - -- Lua - -- { - -- "olimorris/persisted.nvim", - -- lazy = false, -- make sure the plugin is always loaded at startup - -- config = function() - -- require("persisted").setup({ - -- autosave = true, - -- autoload = true, - -- }) - -- end, - -- }, { "ethanholz/nvim-lastplace", config = function() @@ -291,12 +238,6 @@ local plugins = { require('mini.files').setup() end, }, - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - }, - }, { "lewis6991/gitsigns.nvim", config = function() @@ -368,36 +309,31 @@ local plugins = { "sustech-data/wildfire.nvim", event = "VeryLazy", dependencies = { "nvim-treesitter/nvim-treesitter" }, - config = function() - require("wildfire").setup({ - keymaps = { - init_selection = "", - node_incremental = "", - node_decremental = "", - } + opts = { + keymaps = { + init_selection = "", + node_incremental = "", + node_decremental = "", } - ) - end, + } }, { "lukas-reineke/indent-blankline.nvim", main = "ibl", - opts = { - scope = { - show_start = false, - show_end = false, - }, - }, + opts = function() + return { + scope = { + show_start = false, + show_end = false, + }, + } + end, }, { "kylechui/nvim-surround", version = "*", -- Use for stability; omit to use `main` branch for the latest features event = "VeryLazy", - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end + opts = {} }, { "NeogitOrg/neogit", @@ -407,15 +343,13 @@ local plugins = { "sindrets/diffview.nvim", -- optional "ibhagwan/fzf-lua", -- optional }, - config = function() - require("neogit").setup({ - sections = { - untracked = { - folded = true, - } + opts = { + sections = { + untracked = { + folded = true, } - }) - end + } + } }, { "RRethy/vim-illuminate", @@ -464,13 +398,11 @@ local plugins = { { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }, - config = function() - require("dapui").setup({ - -- controls = { - -- enabled = false, - -- }, - }) - end + opts = { + controls = { + enabled = false, + }, + } }, { "mfussenegger/nvim-dap", @@ -479,19 +411,11 @@ local plugins = { end }, { "nvim-neotest/nvim-nio" }, - { - 'linrongbin16/lsp-progress.nvim', - config = function() - require('lsp-progress').setup() - end - }, { "theHamsta/nvim-dap-virtual-text", lazy = false, dependencies = { "mfussenegger/nvim-dap", "nvim-treesitter/nvim-treesitter" }, - config = function() - require("nvim-dap-virtual-text").setup() - end + opts = {} }, { 'echasnovski/mini.align', @@ -506,7 +430,6 @@ local plugins = { }, }, }, - { 'sbdchd/neoformat' }, { "brenton-leighton/multiple-cursors.nvim", version = "*", -- Use the latest tagged version @@ -523,16 +446,6 @@ local plugins = { -- { "D", "MultipleCursorsJumpNextMatch" }, }, }, - { - 'glacambre/firenvim', - - -- Lazy load firenvim - -- Explanation: https://github.com/folke/lazy.nvim/discussions/463#discussioncomment-4819297 - lazy = not vim.g.started_by_firenvim, - build = function() - vim.fn["firenvim#install"](0) - end - }, { 'stevearc/conform.nvim', config = function() @@ -564,11 +477,7 @@ local plugins = { }, { "chentoast/marks.nvim", - config = function() - require "marks".setup { - - } - end + opts = {}, }, { 'nvim-treesitter/nvim-treesitter-context',