cleanup

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

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,8 +23,7 @@ local plugins = {
     "catppuccin/nvim",
     name = "catppuccin",
     priority = 1000,
-    config = function()
+    opts = {
-      require("catppuccin").setup({
       background = { -- :h background
         light = "latte",
         dark = "mocha",
@@ -57,8 +45,8 @@ local plugins = {
       color_overrides = {
         mocha = {
           base = "#000000",
-            mantle = "#000000",
+          mantle = "#111111",
-            crust = "#000000",
+          crust = "#111111",
         },
         latte = {
           base = "#ffffff",
@@ -123,20 +111,8 @@ local plugins = {
           },
         },
       },
-      })
+    }
-    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()
+    opts = require("configs.lualine")
-      require('lualine').setup(require("configs.lualine"))
-    end
   },
   {
     '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,
+    opts = {}
-    config = function()
-      require("Comment").setup()
-    end,
-
   },
   {
     'Wansmer/treesj',
     keys = { '<space>m', '<space>j', '<space>s' },
     dependencies = { 'nvim-treesitter/nvim-treesitter' },
-    config = function()
+    opts = {
-      require('treesj').setup({
       use_default_keymaps = false,
       max_join_length = 1200,
-      })
+    },
-    end,
   },
   {
     "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()
+    opts = {
-      require("wildfire").setup({
       keymaps = {
         init_selection = "<space>",
         node_incremental = "<space>",
         node_decremental = "<c-space>",
       }
     }
-      )
-    end,
   },
   {
     "lukas-reineke/indent-blankline.nvim",
     main = "ibl",
-    opts = {
+    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()
+    opts = {}
-      require("nvim-surround").setup({
-        -- Configuration here, or leave empty to use defaults
-      })
-    end
   },
   {
     "NeogitOrg/neogit",
@@ -407,15 +343,13 @@ local plugins = {
       "sindrets/diffview.nvim",        -- optional
       "ibhagwan/fzf-lua",              -- optional
     },
-    config = function()
+    opts = {
-      require("neogit").setup({
       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()
+    opts = {
-      require("dapui").setup({
+      controls = {
-        -- controls = {
+        enabled = false,
-        --   enabled = false,
+      },
-        -- },
+    }
-      })
-    end
   },
   {
     "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()
+    opts = {}
-      require("nvim-dap-virtual-text").setup()
-    end
   },
   {
     '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 = {
       -- { "<Leader>D",     "<Cmd>MultipleCursorsJumpNextMatch<CR>" },
     },
   },
-  {
-    '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()
+    opts = {},
-      require "marks".setup {
-
-      }
-    end
   },
   {
     'nvim-treesitter/nvim-treesitter-context',