lua/plugins/cosmic-ui.lua

@@ -10,9 +10,7 @@ return {
   dependencies = {
     'MunifTanjim/nui.nvim',
   },
-  config = function()
-    require('cosmic-ui').setup(plugin_config)
-
+  init = function()
     config.lsp.add_on_attach_mapping(function(client, bufnr)
       local buf_map = utils.create_buf_map(bufnr)
 
@@ -26,5 +24,8 @@ return {
       )
     end)
   end,
+  config = function()
+    require('cosmic-ui').setup(plugin_config)
+  end,
   event = 'VeryLazy',
 }

lua/plugins/oil.lua

@@ -5,7 +5,8 @@ return {
   -- dependencies = { { "echasnovski/mini.icons", opts = {} } },
   config = function()
     require('oil').setup()
-
+  end,
+  init = function()
     local map = require('utils').set_keymap
 
     map('n', '-', '<CMD>Oil<cr>', { desc = 'Open parent directory' })

lua/plugins/telescope.lua

@@ -11,7 +11,8 @@ return {
   },
   config = function()
     require('plugins.telescope.config')
-
+  end,
+  init = function()
     -- normal mappings
     local u = require('utils')
     local map = u.set_keymap

lua/plugins/vim-surround.lua

@@ -1,4 +1,10 @@
 return {
   'tpope/vim-surround',
   lazy = false,
+  init = function()
+    local map = require('utils').set_keymap
+    vim.g.surround_no_mappings = true
+
+    map('n', 'ds', '<Plug>Dsurround', { desc = 'Surrounding' })
+  end,
 }