clean config & rm un-needed pcalls

lua/plugins/configs/cmp.lua

@@ -1,9 +1,4 @@
-local present, cmp = pcall(require, "cmp")
+local cmp = require("cmp")
-
-if not present then
-    return
-end
-
 -- require("ui").load_highlight "cmp"
 
 vim.o.completeopt = "menu,menuone,noselect"
@@ -97,7 +92,7 @@ local options = {
         },
         ["<Tab>"] = cmp.mapping(function(fallback)
             if cmp.visible() then
-                cmp.select_next_item()
+                cmp.select_next_item({behavior = ' elect'})
             elseif require("luasnip").expand_or_jumpable() then
                 vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
             else

lua/plugins/configs/lspconfig.lua

@@ -1,8 +1,4 @@
-local present, lspconfig = pcall(require, "lspconfig")
+local lspconfig = require("lspconfig")
-
-if not present then
-    return
-end
 
 local M = {}
 local utils = require "core.utils"

lua/plugins/configs/mason.lua

@@ -1,9 +1,3 @@
-local present, mason = pcall(require, "mason")
-
-if not present then
-    return
-end
-
 local options = {
     ensure_installed = { "lua-language-server", "rust_analyzer" }, -- not an option from mason.nvim
 
@@ -31,4 +25,4 @@ local options = {
     max_concurrent_installers = 10,
 }
 
-mason.setup(options)
+require("mason").setup(options)

lua/plugins/configs/others.lua

@@ -1,59 +1,39 @@
 local M = {}
 
 M.autopairs = function()
-    local present1, autopairs = pcall(require, "nvim-autopairs")
-    local present2, cmp = pcall(require, "cmp")
-
-    if not (present1 and present2) then
-        return
-    end
-
     local options = {
         fast_wrap = {},
         disable_filetype = { "TelescopePrompt", "vim" },
     }
 
-    autopairs.setup(options)
+    require("nvim-autopairs").setup(options)
 
     local cmp_autopairs = require "nvim-autopairs.completion.cmp"
-    cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+    require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
 end
 
 M.luasnip = function()
-  local present, luasnip = pcall(require, "luasnip")
+    local options = {
+        history = true,
+        updateevents = "TextChanged,TextChangedI",
+    }
 
-  if not present then
+    require("luasnip").config.set_config(options)
-    return
+    require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.luasnippets_path or "" }
-  end
+    require("luasnip.loaders.from_vscode").lazy_load()
 
-  local options = {
+    vim.api.nvim_create_autocmd("InsertLeave", {
-    history = true,
+        callback = function()
-    updateevents = "TextChanged,TextChangedI",
+            if require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
-  }
+                and not require("luasnip").session.jump_active
-
+            then
-  luasnip.config.set_config(options)
+                require("luasnip").unlink_current()
-  require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.luasnippets_path or "" }
+            end
-  require("luasnip.loaders.from_vscode").lazy_load()
+        end,
-
+    })
-  vim.api.nvim_create_autocmd("InsertLeave", {
-    callback = function()
-      if
-        require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
-        and not require("luasnip").session.jump_active
-      then
-        require("luasnip").unlink_current()
-      end
-    end,
-  })
 end
 
 M.gitsigns = function()
-    local present, gitsigns = pcall(require, "gitsigns")
-
-    if not present then
-        return
-    end
-
     local options = {
         signs = {
             add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
@@ -63,36 +43,10 @@ M.gitsigns = function()
             changedelete = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
         },
     }
-    gitsigns.setup(options)
+    require("gitsigns").setup(options)
-end
-
-M.crates = function()
-    local present, crates = pcall(require, "crates")
-
-    if not present then
-        return
-    end
-
-    local options = {
-        popup = {
-            style = "minimal",
-            border = "rounded",
-            show_version_date = false,
-            show_dependency_version = true,
-            padding = 1,
-        },
-    }
-
-    crates.setup(options)
 end
 
 M.blankline = function()
-    local present, blankline = pcall(require, "indent_blankline")
-
-    if not present then
-        return
-    end
-
     local options = {
         indentLine_enabled = 1,
         char = "▏",
@@ -113,51 +67,15 @@ M.blankline = function()
         show_first_indent_level = false,
     }
 
-    blankline.setup(options)
+    require("indent_blankline").setup(options)
 end
 
 M.colorizer = function()
-    local present, colorizer = pcall(require, "colorizer")
+    require("colorizer").setup()
-
-    if not present then
-        return
-    end
-
-    local options = {
-        filetypes = {
-            "*",
-        },
-        user_default_options = {
-            RGB = true, -- #RGB hex codes
-            RRGGBB = true, -- #RRGGBB hex codes
-            names = false, -- "Name" codes like Blue
-            RRGGBBAA = false, -- #RRGGBBAA hex codes
-            rgb_fn = false, -- CSS rgb() and rgba() functions
-            hsl_fn = false, -- CSS hsl() and hsla() functions
-            css = false, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
-            css_fn = false, -- Enable all CSS *functions*: rgb_fn, hsl_fn
-            mode = "background", -- Set the display mode.
-            tailwind = true,
-        },
-    }
-
-    colorizer.setup(options)
     -- execute colorizer as soon as possible
     vim.defer_fn(function()
         require("colorizer").attach_to_buffer(0)
     end, 0)
 end
 
-
-M.comment = function()
-    local present, nvim_comment = pcall(require, "Comment")
-
-    if not present then
-        return
-    end
-
-    local options = {}
-    nvim_comment.setup(options)
-end
-
 return M

lua/plugins/configs/telescope.lua

@@ -1,9 +1,3 @@
-local present, telescope = pcall(require, "telescope")
-
-if not present then
-    return
-end
-
 vim.g.theme_switcher_loaded = true
 
 local options = {
@@ -56,16 +50,8 @@ local options = {
             n = { ["q"] = require("telescope.actions").close },
         },
     },
-
-    extensions_list = { "themes", "terms" },
 }
 
+local telescope = require("telescope")
 -- check for any override
 telescope.setup(options)
-
--- load extensions
-pcall(function()
-    for _, ext in ipairs(options.extensions_list) do
-        telescope.load_extension(ext)
-    end
-end)

lua/plugins/configs/treesitter.lua

@@ -1,9 +1,3 @@
-local present, treesitter = pcall(require, "nvim-treesitter.configs")
-
-if not present then
-    return
-end
-
 -- require("ui").load_highlight "treesitter"
 
 local options = {
@@ -25,4 +19,4 @@ local options = {
     },
 }
 
-treesitter.setup(options)
+require("nvim-treesitter.configs").setup(options)

lua/plugins/configs/whichkey.lua

@@ -1,9 +1,3 @@
-local present, wk = pcall(require, "which-key")
-
-if not present then
-    return
-end
-
 local options = {
 
     icons = {
@@ -34,4 +28,4 @@ local options = {
     },
 }
 
-wk.setup(options)
+require("which-key").setup(options)

lua/plugins/init.lua

@@ -98,7 +98,7 @@ local plugins = {
     ["Saecki/crates.nvim"] = {
         event = { "BufRead Cargo.toml" },
         config = function()
-            require("plugins.configs.others").crates()
+            require("crates").setup()
             -- Add crates.nvim to the cmp sources as soon as we load the plugin
             require("cmp").setup.buffer({ sources = { { name = "crates" } } })
         end,
@@ -158,7 +158,7 @@ local plugins = {
     ["numToStr/Comment.nvim"] = {
         -- keys = { "gc", "gb" },
         config = function()
-            require("plugins.configs.others").comment()
+            require("Comment").setup()
         end,
         init = function()
             require("core.utils").load_mappings "comment"