dont hide

.gitignore

@@ -6,5 +6,4 @@ syntax
 coc-settings.json
 .luarc.json
 lazy-lock.json
-after
+*.log
-**/.DS_Store

init.lua

@@ -1,6 +1,13 @@
 require "core"
+vim.api.nvim_set_var('mapleader', ';')
 
-pcall(require, 'custom')
+local custom_init_path = vim.api.nvim_get_runtime_file("lua/custom/init.lua", false)[1]
+
+if custom_init_path then
+  dofile(custom_init_path)
+end
+
+require("core.utils").load_mappings()
 
 local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 
@@ -14,6 +21,59 @@ dofile(vim.g.base46_cache .. "defaults")
 vim.opt.rtp:prepend(lazypath)
 require "plugins"
 
-vim.schedule(function()
+-- Configure Telescope to scroll files with ctrl+j/k
-  require "core.mappings"
+local actions = require('telescope.actions')
-end, 0)
+local sorters = require('telescope.sorters')
+
+require('telescope').setup {
+  defaults = {
+    mappings = {
+      i = {
+        ["<C-j>"] = actions.move_selection_next,
+        ["<C-k>"] = actions.move_selection_previous,
+      },
+    },
+    file_sorter = sorters.get_fzy_sorter,
+    file_ignore_patterns = { '.git/*', 'node_modules/*', 'vendor/*' },
+    generic_sorter = sorters.get_generic_fuzzy_sorter,
+  },
+  extensions = {
+    fzf = {
+      fuzzy = true,
+      override_generic_sorter = true,
+      override_file_sorter = true,
+      case_mode = "smart_case",
+    }
+  }
+}
+
+
+vim.api.nvim_set_keymap('n', '<leader>e', ':NvimTreeToggle<CR>', {noremap = true, silent = true})
+
+-- Cycle through open buffers with leader+a
+vim.api.nvim_set_keymap('n', '<leader>a', ':bprevious<CR>', {noremap = true, silent = true})
+vim.api.nvim_set_keymap('n', '<leader>f', ':bnext<CR>', {noremap = true, silent = true})
+
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+
+-- move the whole page without moving the cursor
+vim.api.nvim_set_keymap('n', 'J', '<C-e>', { noremap = true })
+vim.api.nvim_set_keymap('n', 'K', '<C-y>', { noremap = true })
+
+-- Resize windows
+vim.api.nvim_set_keymap('n', '<Up>', '5<C-w>+', { silent = true })
+vim.api.nvim_set_keymap('n', '<Down>', '5<C-w>-', { silent = true })
+vim.api.nvim_set_keymap('n', '<Right>', '10<C-w>>', { silent = true })
+vim.api.nvim_set_keymap('n', '<Left>', '10<C-w><', { silent = true })
+
+-- Set the tab width to 4 spaces
+vim.cmd('set tabstop=4')
+vim.cmd('set shiftwidth=4')
+vim.cmd('set expandtab')
+
+vim.o.hidden = true
+
+-- Git diffthis
+vim.api.nvim_set_keymap('n', '<leader>gd', ':Gitsigns diffthis<CR>', {noremap = true, silent = true})
+

lua/core/bootstrap.lua

@@ -18,7 +18,7 @@ M.lazy = function(install_path)
   M.echo "  Compiling base46 theme to bytecode ..."
 
   local base46_repo = "https://github.com/NvChad/base46"
-  shell_call { "git", "clone", "--depth", "1", "-b", "v3.0", base46_repo, lazy_path }
+  shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path }
   vim.opt.rtp:prepend(lazy_path)
 
   require("base46").compile()
@@ -32,23 +32,15 @@ M.lazy = function(install_path)
   -- install plugins
   require "plugins"
 
-  -- mason packages & show post_bootstrap screen
+  -- mason packages & show post_boostrap screen
-  vim.cmd "MasonInstallAll"
+  require "nvchad.post_install"()
-  local lastpkg = vim.g.mason_binaries_list[#vim.g.mason_binaries_list]
-
-  -- Keep track of which mason pkgs get installed
-  require("mason-registry"):on("package:install:success", function(pkg)
-    if tostring(pkg) == "Package(name=" .. lastpkg .. ")" then
-      print "All done! Now read nvchad.com "
-    end
-  end)
 end
 
 M.gen_chadrc_template = function()
   local path = fn.stdpath "config" .. "/lua/custom"
 
   if fn.isdirectory(path) ~= 1 then
-    local input = vim.env.NVCHAD_EXAMPLE_CONFIG or fn.input "Do you want to install example custom config? (y/N): "
+    local input = fn.input "Do you want to install example custom config? (y/N): "
 
     if input:lower() == "y" then
       M.echo "Cloning example custom config repo..."

lua/core/default_config.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 M.options = {
-  nvchad_branch = "v3.0",
+  nvchad_branch = "v2.0",
 }
 
 M.ui = {
@@ -13,12 +13,18 @@ M.ui = {
   theme_toggle = { "onedark", "one_light" },
   theme = "onedark", -- default theme
   transparency = false,
+  lsp_semantic_tokens = false, -- needs nvim v0.9, just adds highlight groups for lsp semantic tokens
+
+  -- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations
+  extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify"
 
   -- cmp themeing
   cmp = {
     icons = true,
     lspkind_text = true,
     style = "default", -- default/flat_light/flat_dark/atom/atom_colored
+    border_color = "grey_fg", -- only applicable for "default" style, use color names from base30 variables
+    selected_item_bg = "colored", -- colored / simple
   },
 
   telescope = { style = "borderless" }, -- borderless / bordered
@@ -26,21 +32,18 @@ M.ui = {
   ------------------------------- nvchad_ui modules -----------------------------
   statusline = {
     theme = "default", -- default/vscode/vscode_colored/minimal
-
     -- default/round/block/arrow separators work only for default statusline theme
     -- round and block will work for minimal theme only
     separator_style = "default",
-
+    overriden_modules = nil,
-    order = nil,
-    modules = {},
   },
 
   -- lazyload it when there are 1+ buffers
   tabufline = {
+    show_numbers = false,
     enabled = true,
     lazyload = true,
-    order = { "treeOffset", "buffers", "tabs", "btns" },
+    overriden_modules = nil,
-    modules = {},
   },
 
   -- nvdash (dashboard)
@@ -72,23 +75,10 @@ M.ui = {
   cheatsheet = { theme = "grid" }, -- simple/grid
 
   lsp = {
-    signature = true,
+    -- show function signatures i.e args as you type
-    semantic_tokens = false,
+    signature = {
-  },
+      disabled = false,
-
+      silent = true, -- silences 'no signature help available' message from appearing
-  term = {
-    hl = "Normal:term,WinSeparator:WinSeparator",
-    sizes = { sp = 0.3, vsp = 0.2 },
-    float = {
-      relative = "editor",
-      row = 0.3,
-      col = 0.25,
-      width = 0.5,
-      height = 0.4,
-      border = "single",
-    },
-    behavior = {
-      auto_insert = true,
     },
   },
 }
@@ -97,32 +87,6 @@ M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file
 
 M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startup options
 
-M.base46 = {
+M.mappings = require "core.mappings"
-  integrations = {
-    "blankline",
-    "cmp",
-    "defaults",
-    "devicons",
-    "git",
-    "lsp",
-    "mason",
-    "nvchad_updater",
-    "nvcheatsheet",
-    "nvdash",
-    "nvimtree",
-    "statusline",
-    "syntax",
-    "treesitter",
-    "tbline",
-    "telescope",
-    "whichkey",
-  },
-}
-
-local chadrc_exists, chadrc = pcall(require, "custom.chadrc")
-
-if chadrc_exists then
-  M = vim.tbl_deep_extend("force", M, chadrc)
-end
 
 return M

lua/core/init.lua

@@ -1,9 +1,12 @@
 local opt = vim.opt
 local g = vim.g
+local config = require("core.utils").load_config()
 
 -------------------------------------- globals -----------------------------------------
+g.nvchad_theme = config.ui.theme
 g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
 g.toggle_theme_icon = "   "
+g.transparency = config.ui.transparency
 
 -------------------------------------- options ------------------------------------------
 opt.laststatus = 3 -- global statusline
@@ -11,7 +14,6 @@ opt.showmode = false
 
 opt.clipboard = "unnamedplus"
 opt.cursorline = true
-opt.cursorlineopt = "number"
 
 -- Indenting
 opt.expandtab = true
@@ -36,6 +38,7 @@ opt.shortmess:append "sI"
 opt.signcolumn = "yes"
 opt.splitbelow = true
 opt.splitright = true
+opt.termguicolors = true
 opt.timeoutlen = 400
 opt.undofile = true
 
@@ -80,23 +83,23 @@ autocmd("BufWritePost", {
     local app_name = vim.env.NVIM_APPNAME and vim.env.NVIM_APPNAME or "nvim"
     local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".")
 
-    require("plenary.reload").reload_module "nvconfig"
     require("plenary.reload").reload_module "base46"
     require("plenary.reload").reload_module(module)
+    require("plenary.reload").reload_module "custom.chadrc"
 
-    local config = require "nvconfig"
+    config = require("core.utils").load_config()
+
+    vim.g.nvchad_theme = config.ui.theme
+    vim.g.transparency = config.ui.transparency
 
     -- statusline
-    if config.ui.statusline.theme ~= "custom" then
+    require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)
-      require("plenary.reload").reload_module "nvchad.stl.utils"
+    vim.opt.statusline = "%!v:lua.require('nvchad.statusline." .. config.ui.statusline.theme .. "').run()"
-      require("plenary.reload").reload_module("nvchad.stl." .. config.ui.statusline.theme)
-      vim.opt.statusline = "%!v:lua.require('nvchad.stl." .. config.ui.statusline.theme .. "')()"
-    end
 
     -- tabufline
     if config.ui.tabufline.enabled then
       require("plenary.reload").reload_module "nvchad.tabufline.modules"
-      vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules')()"
+      vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules').run()"
     end
 
     require("base46").load_all_highlights()
@@ -104,32 +107,6 @@ autocmd("BufWritePost", {
   end,
 })
 
--- user event that loads after UIEnter + only if file buf is there
-vim.api.nvim_create_autocmd({ "UIEnter", "BufReadPost", "BufNewFile" }, {
-  group = vim.api.nvim_create_augroup("NvFilePost", { clear = true }),
-  callback = function(args)
-    local file = vim.api.nvim_buf_get_name(args.buf)
-    local buftype = vim.api.nvim_buf_get_option(args.buf, "buftype")
-
-    if not vim.g.ui_entered and args.event == "UIEnter" then
-      vim.g.ui_entered = true
-    end
-
-    if file ~= "" and buftype ~= "nofile" and vim.g.ui_entered then
-      vim.api.nvim_exec_autocmds("User", { pattern = "FilePost", modeline = false })
-      vim.api.nvim_del_augroup_by_name "NvFilePost"
-
-      vim.schedule(function()
-        vim.api.nvim_exec_autocmds("FileType", {})
-
-        if vim.g.editorconfig then
-          require("editorconfig").config(args.buf)
-        end
-      end, 0)
-    end
-  end,
-})
-
 -------------------------------------- commands ------------------------------------------
 local new_cmd = vim.api.nvim_create_user_command
 

lua/core/mappings.lua

@@ -1,135 +1,468 @@
-local map = vim.keymap.set
+-- n, v, i, t = mode names
 
-map("i", "<C-b>", "<ESC>^i", { desc = "Move Beginning of line" })
+local M = {}
-map("i", "<C-e>", "<End>", { desc = "Move End of line" })
-map("i", "<C-h>", "<Left>", { desc = "Move Left" })
-map("i", "<C-l>", "<Right>", { desc = "Move Right" })
-map("i", "<C-j>", "<Down>", { desc = "Move Down" })
-map("i", "<C-k>", "<Up>", { desc = "Move Up" })
 
-map("n", "<Esc>", "<cmd>noh<CR>", { desc = "General Clear highlights" })
+M.general = {
+  i = {
+    -- go to  beginning and end
+    ["<C-b>"] = { "<ESC>^i", "Beginning of line" },
+    ["<C-e>"] = { "<End>", "End of line" },
 
-map("n", "<C-h>", "<C-w>h", { desc = "Switch Window left" })
+    -- navigate within insert mode
-map("n", "<C-l>", "<C-w>l", { desc = "Switch Window right" })
+    ["<C-h>"] = { "<Left>", "Move left" },
-map("n", "<C-j>", "<C-w>j", { desc = "Switch Window down" })
+    ["<C-l>"] = { "<Right>", "Move right" },
-map("n", "<C-k>", "<C-w>k", { desc = "Switch Window up" })
+    ["<C-j>"] = { "<Down>", "Move down" },
+    ["<C-k>"] = { "<Up>", "Move up" },
+  },
 
-map("n", "<C-s>", "<cmd>w<CR>", { desc = "File Save" })
+  n = {
-map("n", "<C-c>", "<cmd>%y+<CR>", { desc = "File Copy whole" })
+    ["<Esc>"] = { ":noh <CR>", "Clear highlights" },
+    -- switch between windows
+    ["<C-h>"] = { "<C-w>h", "Window left" },
+    ["<C-l>"] = { "<C-w>l", "Window right" },
+    ["<C-j>"] = { "<C-w>j", "Window down" },
+    ["<C-k>"] = { "<C-w>k", "Window up" },
 
-map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "Toggle Line number" })
+    -- save
-map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle Relative number" })
+    ["<C-s>"] = { "<cmd> w <CR>", "Save file" },
-map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Toggle NvCheatsheet" })
 
--- global lsp mappings
+    -- Copy all
-map("n", "<leader>fm", function()
+    ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
-  vim.lsp.buf.format { async = true }
-end, { desc = "Lsp formatting" })
 
-map("n", "<leader>lf", vim.diagnostic.open_float, { desc = "Lsp floating diagnostics" })
+    -- line numbers
-map("n", "[d", vim.diagnostic.goto_prev, { desc = "Lsp prev diagnostic" })
+    ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
-map("n", "]d", vim.diagnostic.goto_next, { desc = "Lsp next diagnostic" })
+    ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
-map("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Lsp diagnostic loclist" })
 
--- tabufline
+    -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
-map("n", "<leader>b", "<cmd>enew<CR>", { desc = "Buffer New" })
+    -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/
+    -- empty mode is same as using <cmd> :map
+    -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour
+    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
 
-map("n", "<tab>", function()
+    -- new buffer
-  require("nvchad.tabufline").next()
+    ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
-end, { desc = "Buffer Goto next" })
+    ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
 
-map("n", "<S-tab>", function()
+    ["<leader>fm"] = {
-  require("nvchad.tabufline").prev()
+      function()
-end, { desc = "Buffer Goto prev" })
+        vim.lsp.buf.format { async = true }
+      end,
+      "LSP formatting",
+    },
+  },
 
-map("n", "<leader>x", function()
+  t = {
-  require("nvchad.tabufline").close_buffer()
+    ["<C-x>"] = { vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true), "Escape terminal mode" },
-end, { desc = "Buffer Close" })
+  },
 
--- Comment
+  v = {
-map("n", "<leader>/", function()
+    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-  require("Comment.api").toggle.linewise.current()
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-end, { desc = "Comment Toggle" })
+    ["<"] = { "<gv", "Indent line" },
+    [">"] = { ">gv", "Indent line" },
+  },
 
-map(
+  x = {
-  "v",
+    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-  "<leader>/",
+    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-  "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+    -- Don't copy the replaced text after pasting in visual mode
-  { desc = "Comment Toggle" }
+    -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste
-)
+    ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', "Dont copy replaced text", opts = { silent = true } },
+  },
+}
 
--- nvimtree
+M.tabufline = {
-map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "Nvimtree Toggle window" })
+  plugin = true,
-map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "Nvimtree Focus window" })
 
--- telescope
+  n = {
-map("n", "<leader>fw", "<cmd>Telescope live_grep<CR>", { desc = "Telescope Live grep" })
+    -- cycle through buffers
-map("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "Telescope Find buffers" })
+    ["<tab>"] = {
-map("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "Telescope Help page" })
+      function()
+        require("nvchad.tabufline").tabuflineNext()
+      end,
+      "Goto next buffer",
+    },
 
-map("n", "<leader>fo", "<cmd>Telescope oldfiles<CR>", { desc = "Telescope Find oldfiles" })
+    ["<S-tab>"] = {
-map("n", "<leader>fz", "<cmd>Telescope current_buffer_fuzzy_find<CR>", { desc = "Telescope Find in current buffer" })
+      function()
-map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "Telescope Git commits" })
+        require("nvchad.tabufline").tabuflinePrev()
-map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "Telescope Git status" })
+      end,
-map("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "Telescope Pick hidden term" })
+      "Goto prev buffer",
-map("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "Telescope Nvchad themes" })
+    },
-map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Telescope Find files" })
-map(
-  "n",
-  "<leader>fa",
-  "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
-  { desc = "Telescope Find all files" }
-)
 
--- terminal
+    -- close buffer + hide terminal buffer
-map("t", "<C-x>", "<C-\\><C-N>", { desc = "Terminal Escape terminal mode" })
+    ["<leader>x"] = {
+      function()
+        require("nvchad.tabufline").close_buffer()
+      end,
+      "Close buffer",
+    },
+  },
+}
 
-map("n", "<leader>h", function()
+M.comment = {
-  require("nvchad.term").new { pos = "sp", size = 0.3 }
+  plugin = true,
-end, { desc = "Terminal New horizontal term" })
 
-map("n", "<leader>v", function()
+  -- toggle comment in both modes
-  require("nvchad.term").new { pos = "vsp", size = 0.3 }
+  n = {
-end, { desc = "Terminal New vertical term" })
+    ["<leader>/"] = {
+      function()
+        require("Comment.api").toggle.linewise.current()
+      end,
+      "Toggle comment",
+    },
+  },
 
-map({ "n", "t" }, "<A-v>", function()
+  v = {
-  require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 }
+    ["<leader>/"] = {
-end, { desc = "Terminal Toggleable vertical term" })
+      "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+      "Toggle comment",
+    },
+  },
+}
 
-map({ "n", "t" }, "<A-h>", function()
+M.lspconfig = {
-  require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.2 }
+  plugin = true,
-end, { desc = "Terminal New horizontal term" })
 
-map({ "n", "t" }, "<A-i>", function()
+  -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
-  require("nvchad.term").toggle { pos = "float", id = "floatTerm" }
-end, { desc = "Terminal Toggle Floating term" })
 
-map("t", "<ESC>", function()
+  n = {
-  local win = vim.api.nvim_get_current_win()
+    ["gD"] = {
-  vim.api.nvim_win_close(win, true)
+      function()
-end, { desc = "Terminal Close term in terminal mode" })
+        vim.lsp.buf.declaration()
+      end,
+      "LSP declaration",
+    },
 
--- whichkey
+    ["gd"] = {
-map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "Whichkey all keymaps" })
+      function()
+        vim.lsp.buf.definition()
+      end,
+      "LSP definition",
+    },
 
-map("n", "<leader>wk", function()
+    ["K"] = {
-  vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
+      function()
-end, { desc = "Whichkey query lookup" })
+        vim.lsp.buf.hover()
+      end,
+      "LSP hover",
+    },
 
--- blankline
+    ["gi"] = {
-map("n", "<leader>cc", function()
+      function()
-  local config = { scope = {} }
+        vim.lsp.buf.implementation()
-  config.scope.exclude = { language = {}, node_type = {} }
+      end,
-  config.scope.include = { node_type = {} }
+      "LSP implementation",
-  local node = require("ibl.scope").get(vim.api.nvim_get_current_buf(), config)
+    },
 
-  if node then
+    ["<leader>ls"] = {
-    local start_row, _, end_row, _ = node:range()
+      function()
-    if start_row ~= end_row then
+        vim.lsp.buf.signature_help()
-      vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start_row + 1, 0 })
+      end,
-      vim.api.nvim_feedkeys("_", "n", true)
+      "LSP signature help",
-    end
+    },
-  end
-end, { desc = "Blankline Jump to current context" })
 
-pcall(require, "custom.mappings")
+    ["<leader>D"] = {
+      function()
+        vim.lsp.buf.type_definition()
+      end,
+      "LSP definition type",
+    },
+
+    ["<leader>ra"] = {
+      function()
+        require("nvchad.renamer").open()
+      end,
+      "LSP rename",
+    },
+
+    ["<leader>ca"] = {
+      function()
+        vim.lsp.buf.code_action()
+      end,
+      "LSP code action",
+    },
+
+    ["gr"] = {
+      function()
+        vim.lsp.buf.references()
+      end,
+      "LSP references",
+    },
+
+    ["<leader>f"] = {
+      function()
+        vim.diagnostic.open_float { border = "rounded" }
+      end,
+      "Floating diagnostic",
+    },
+
+    ["[d"] = {
+      function()
+        vim.diagnostic.goto_prev { float = { border = "rounded" } }
+      end,
+      "Goto prev",
+    },
+
+    ["]d"] = {
+      function()
+        vim.diagnostic.goto_next { float = { border = "rounded" } }
+      end,
+      "Goto next",
+    },
+
+    ["<leader>q"] = {
+      function()
+        vim.diagnostic.setloclist()
+      end,
+      "Diagnostic setloclist",
+    },
+
+    ["<leader>wa"] = {
+      function()
+        vim.lsp.buf.add_workspace_folder()
+      end,
+      "Add workspace folder",
+    },
+
+    ["<leader>wr"] = {
+      function()
+        vim.lsp.buf.remove_workspace_folder()
+      end,
+      "Remove workspace folder",
+    },
+
+    ["<leader>wl"] = {
+      function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+      end,
+      "List workspace folders",
+    },
+  },
+
+  v = {
+    ["<leader>ca"] = {
+      function()
+        vim.lsp.buf.code_action()
+      end,
+      "LSP code action",
+    },
+  },
+}
+
+M.nvimtree = {
+  plugin = true,
+
+  n = {
+    -- toggle
+    ["<C-n>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
+
+    -- focus
+    ["<leader>e"] = { "<cmd> NvimTreeFocus <CR>", "Focus nvimtree" },
+  },
+}
+
+M.telescope = {
+  plugin = true,
+
+  n = {
+    -- find
+    ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "Find files" },
+    ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
+    ["<leader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
+    ["<leader>fb"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
+    ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "Help page" },
+    ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "Find oldfiles" },
+    ["<leader>fz"] = { "<cmd> Telescope current_buffer_fuzzy_find <CR>", "Find in current buffer" },
+
+    -- git
+    ["<leader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git commits" },
+    ["<leader>gt"] = { "<cmd> Telescope git_status <CR>", "Git status" },
+
+    -- pick a hidden term
+    ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "Pick hidden term" },
+
+    -- theme switcher
+    ["<leader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad themes" },
+
+    ["<leader>ma"] = { "<cmd> Telescope marks <CR>", "telescope bookmarks" },
+  },
+}
+
+M.nvterm = {
+  plugin = true,
+
+  t = {
+    -- toggle in terminal mode
+    ["<A-i>"] = {
+      function()
+        require("nvterm.terminal").toggle "float"
+      end,
+      "Toggle floating term",
+    },
+
+    ["<A-h>"] = {
+      function()
+        require("nvterm.terminal").toggle "horizontal"
+      end,
+      "Toggle horizontal term",
+    },
+
+    ["<A-v>"] = {
+      function()
+        require("nvterm.terminal").toggle "vertical"
+      end,
+      "Toggle vertical term",
+    },
+  },
+
+  n = {
+    -- toggle in normal mode
+    ["<A-i>"] = {
+      function()
+        require("nvterm.terminal").toggle "float"
+      end,
+      "Toggle floating term",
+    },
+
+    ["<A-h>"] = {
+      function()
+        require("nvterm.terminal").toggle "horizontal"
+      end,
+      "Toggle horizontal term",
+    },
+
+    ["<A-v>"] = {
+      function()
+        require("nvterm.terminal").toggle "vertical"
+      end,
+      "Toggle vertical term",
+    },
+
+    -- new
+    ["<leader>h"] = {
+      function()
+        require("nvterm.terminal").new "horizontal"
+      end,
+      "New horizontal term",
+    },
+
+    ["<leader>v"] = {
+      function()
+        require("nvterm.terminal").new "vertical"
+      end,
+      "New vertical term",
+    },
+  },
+}
+
+M.whichkey = {
+  plugin = true,
+
+  n = {
+    ["<leader>wK"] = {
+      function()
+        vim.cmd "WhichKey"
+      end,
+      "Which-key all keymaps",
+    },
+    ["<leader>wk"] = {
+      function()
+        local input = vim.fn.input "WhichKey: "
+        vim.cmd("WhichKey " .. input)
+      end,
+      "Which-key query lookup",
+    },
+  },
+}
+
+M.blankline = {
+  plugin = true,
+
+  n = {
+    ["<leader>cc"] = {
+      function()
+        local ok, start = require("indent_blankline.utils").get_current_context(
+          vim.g.indent_blankline_context_patterns,
+          vim.g.indent_blankline_use_treesitter_scope
+        )
+
+        if ok then
+          vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 })
+          vim.cmd [[normal! _]]
+        end
+      end,
+
+      "Jump to current context",
+    },
+  },
+}
+
+M.gitsigns = {
+  plugin = true,
+
+  n = {
+    -- Navigation through hunks
+    ["]c"] = {
+      function()
+        if vim.wo.diff then
+          return "]c"
+        end
+        vim.schedule(function()
+          require("gitsigns").next_hunk()
+        end)
+        return "<Ignore>"
+      end,
+      "Jump to next hunk",
+      opts = { expr = true },
+    },
+
+    ["[c"] = {
+      function()
+        if vim.wo.diff then
+          return "[c"
+        end
+        vim.schedule(function()
+          require("gitsigns").prev_hunk()
+        end)
+        return "<Ignore>"
+      end,
+      "Jump to prev hunk",
+      opts = { expr = true },
+    },
+
+    -- Actions
+    ["<leader>rh"] = {
+      function()
+        require("gitsigns").reset_hunk()
+      end,
+      "Reset hunk",
+    },
+
+    ["<leader>ph"] = {
+      function()
+        require("gitsigns").preview_hunk()
+      end,
+      "Preview hunk",
+    },
+
+    ["<leader>gb"] = {
+      function()
+        package.loaded.gitsigns.blame_line()
+      end,
+      "Blame line",
+    },
+
+    ["<leader>td"] = {
+      function()
+        require("gitsigns").toggle_deleted()
+      end,
+      "Toggle deleted",
+    },
+  },
+}
+
+return M

lua/core/utils.lua

@@ -0,0 +1,118 @@
+local M = {}
+local merge_tb = vim.tbl_deep_extend
+
+M.load_config = function()
+  local config = require "core.default_config"
+  local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1]
+
+  if chadrc_path then
+    local chadrc = dofile(chadrc_path)
+
+    config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings)
+    config = merge_tb("force", config, chadrc)
+    config.mappings.disabled = nil
+  end
+
+  return config
+end
+
+M.remove_disabled_keys = function(chadrc_mappings, default_mappings)
+  if not chadrc_mappings then
+    return default_mappings
+  end
+
+  -- store keys in a array with true value to compare
+  local keys_to_disable = {}
+  for _, mappings in pairs(chadrc_mappings) do
+    for mode, section_keys in pairs(mappings) do
+      if not keys_to_disable[mode] then
+        keys_to_disable[mode] = {}
+      end
+      section_keys = (type(section_keys) == "table" and section_keys) or {}
+      for k, _ in pairs(section_keys) do
+        keys_to_disable[mode][k] = true
+      end
+    end
+  end
+
+  -- make a copy as we need to modify default_mappings
+  for section_name, section_mappings in pairs(default_mappings) do
+    for mode, mode_mappings in pairs(section_mappings) do
+      mode_mappings = (type(mode_mappings) == "table" and mode_mappings) or {}
+      for k, _ in pairs(mode_mappings) do
+        -- if key if found then remove from default_mappings
+        if keys_to_disable[mode] and keys_to_disable[mode][k] then
+          default_mappings[section_name][mode][k] = nil
+        end
+      end
+    end
+  end
+
+  return default_mappings
+end
+
+M.load_mappings = function(section, mapping_opt)
+  vim.schedule(function()
+    local function set_section_map(section_values)
+      if section_values.plugin then
+        return
+      end
+
+      section_values.plugin = nil
+
+      for mode, mode_values in pairs(section_values) do
+        local default_opts = merge_tb("force", { mode = mode }, mapping_opt or {})
+        for keybind, mapping_info in pairs(mode_values) do
+          -- merge default + user opts
+          local opts = merge_tb("force", default_opts, mapping_info.opts or {})
+
+          mapping_info.opts, opts.mode = nil, nil
+          opts.desc = mapping_info[2]
+
+          vim.keymap.set(mode, keybind, mapping_info[1], opts)
+        end
+      end
+    end
+
+    local mappings = require("core.utils").load_config().mappings
+
+    if type(section) == "string" then
+      mappings[section]["plugin"] = nil
+      mappings = { mappings[section] }
+    end
+
+    for _, sect in pairs(mappings) do
+      set_section_map(sect)
+    end
+  end)
+end
+
+M.lazy_load = function(plugin)
+  vim.api.nvim_create_autocmd({ "BufRead", "BufWinEnter", "BufNewFile" }, {
+    group = vim.api.nvim_create_augroup("BeLazyOnFileOpen" .. plugin, {}),
+    callback = function()
+      local file = vim.fn.expand "%"
+      local condition = file ~= "NvimTree_1" and file ~= "[lazy]" and file ~= ""
+
+      if condition then
+        vim.api.nvim_del_augroup_by_name("BeLazyOnFileOpen" .. plugin)
+
+        -- dont defer for treesitter as it will show slow highlighting
+        -- This deferring only happens only when we do "nvim filename"
+        if plugin ~= "nvim-treesitter" then
+          vim.schedule(function()
+            require("lazy").load { plugins = plugin }
+
+            if plugin == "nvim-lspconfig" then
+              vim.cmd "silent! do FileType"
+            end
+          end, 0)
+        else
+          require("lazy").load { plugins = plugin }
+        end
+      end
+    end,
+  })
+end
+
+return M

lua/plugins/configs/cmp.lua

@@ -2,7 +2,7 @@ local cmp = require "cmp"
 
 dofile(vim.g.base46_cache .. "cmp")
 
-local cmp_ui = require("nvconfig").ui.cmp
+local cmp_ui = require("core.utils").load_config().ui.cmp
 local cmp_style = cmp_ui.style
 
 local field_arrangement = {
@@ -52,7 +52,7 @@ local options = {
   window = {
     completion = {
       side_padding = (cmp_style ~= "atom" and cmp_style ~= "atom_colored") and 1 or 0,
-      winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None",
+      winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel",
       scrollbar = false,
     },
     documentation = {
@@ -75,12 +75,10 @@ local options = {
     ["<C-f>"] = cmp.mapping.scroll_docs(4),
     ["<C-Space>"] = cmp.mapping.complete(),
     ["<C-e>"] = cmp.mapping.close(),
-
     ["<CR>"] = cmp.mapping.confirm {
       behavior = cmp.ConfirmBehavior.Insert,
       select = true,
     },
-
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
@@ -89,8 +87,10 @@ local options = {
       else
         fallback()
       end
-    end, { "i", "s" }),
+    end, {
-
+      "i",
+      "s",
+    }),
     ["<S-Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
@@ -99,7 +99,10 @@ local options = {
       else
         fallback()
       end
-    end, { "i", "s" }),
+    end, {
+      "i",
+      "s",
+    }),
   },
   sources = {
     { name = "nvim_lsp" },

lua/plugins/configs/gitsigns.lua

@@ -1,26 +0,0 @@
-local options = {
-  signs = {
-    add = { text = "│" },
-    change = { text = "│" },
-    delete = { text = "󰍵" },
-    topdelete = { text = "‾" },
-    changedelete = { text = "~" },
-    untracked = { text = "│" },
-  },
-
-  on_attach = function(bufnr)
-    local gs = package.loaded.gitsigns
-
-    local function opts(desc)
-      return { buffer = bufnr, desc = desc }
-    end
-
-    local map = vim.keymap.set
-
-    map("n", "<leader>rh", gs.reset_hunk, opts "Reset Hunk")
-    map("n", "<leader>ph", gs.preview_hunk, opts "Preview Hunk")
-    map("n", "<leader>gb", gs.blame_line, opts "Blame Line")
-  end,
-}
-
-return options

lua/plugins/configs/lspconfig.lua

@@ -1,43 +1,22 @@
+dofile(vim.g.base46_cache .. "lsp")
+require "nvchad.lsp"
+
 local M = {}
-local map = vim.keymap.set
+local utils = require "core.utils"
-local conf = require("nvconfig").ui.lsp
 
 -- export on_attach & capabilities for custom lspconfigs
+
 M.on_attach = function(client, bufnr)
-  local function opts(desc)
+  client.server_capabilities.documentFormattingProvider = false
-    return { buffer = bufnr, desc = desc }
+  client.server_capabilities.documentRangeFormattingProvider = false
+
+  utils.load_mappings("lspconfig", { buffer = bufnr })
+
+  if client.server_capabilities.signatureHelpProvider then
+    require("nvchad.signature").setup(client)
   end
 
-  map("n", "gD", vim.lsp.buf.declaration, opts "Lsp Go to declaration")
+  if not utils.load_config().ui.lsp_semantic_tokens and client.supports_method "textDocument/semanticTokens" then
-  map("n", "gd", vim.lsp.buf.definition, opts "Lsp Go to definition")
-  map("n", "K", vim.lsp.buf.hover, opts "Lsp hover information")
-  map("n", "gi", vim.lsp.buf.implementation, opts "Lsp Go to implementation")
-  map("n", "<leader>sh", vim.lsp.buf.signature_help, opts "Lsp Show signature help")
-  map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Lsp Add workspace folder")
-  map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Lsp Remove workspace folder")
-
-  map("n", "<leader>wl", function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, opts "Lsp List workspace folders")
-
-  map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Lsp Go to type definition")
-
-  map("n", "<leader>ra", function()
-    require "nvchad.renamer"()
-  end, opts "Lsp NvRenamer")
-
-  map({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts "Lsp Code action")
-  map("n", "gr", vim.lsp.buf.references, opts "Lsp Show references")
-
-  -- setup signature popup
-  if conf.signature and client.server_capabilities.signatureHelpProvider then
-    require("nvchad.signature").setup(client, bufnr)
-  end
-end
-
--- disable semanticTokens
-M.on_init = function(client, _)
-  if not conf.semantic_tokens and client.supports_method "textDocument/semanticTokens" then
     client.server_capabilities.semanticTokensProvider = nil
   end
 end
@@ -62,33 +41,27 @@ M.capabilities.textDocument.completion.completionItem = {
   },
 }
 
-M.defaults = function()
+require("lspconfig").lua_ls.setup {
-  dofile(vim.g.base46_cache .. "lsp")
+  on_attach = M.on_attach,
-  require "nvchad.lsp"
+  capabilities = M.capabilities,
 
-  require("lspconfig").lua_ls.setup {
+  settings = {
-    on_attach = M.on_attach,
+    Lua = {
-    capabilities = M.capabilities,
+      diagnostics = {
-    on_init = M.on_init,
+        globals = { "vim" },
-
+      },
-    settings = {
+      workspace = {
-      Lua = {
+        library = {
-        diagnostics = {
+          [vim.fn.expand "$VIMRUNTIME/lua"] = true,
-          globals = { "vim" },
+          [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
-        },
+          [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
-        workspace = {
+          [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
-          library = {
-            [vim.fn.expand "$VIMRUNTIME/lua"] = true,
-            [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
-            [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
-            [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
-          },
-          maxPreload = 100000,
-          preloadFileSize = 10000,
         },
+        maxPreload = 100000,
+        preloadFileSize = 10000,
       },
     },
-  }
+  },
-end
+}
 
 return M

lua/plugins/configs/luasnip.lua

@@ -1,23 +0,0 @@
--- vscode format
-require("luasnip.loaders.from_vscode").lazy_load()
-require("luasnip.loaders.from_vscode").lazy_load { paths = "your path!" }
-require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-
--- snipmate format
-require("luasnip.loaders.from_snipmate").load()
-require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-
--- lua format
-require("luasnip.loaders.from_lua").load()
-require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
-
-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,
-})

lua/plugins/configs/nvimtree.lua

@@ -16,11 +16,12 @@ local options = {
     adaptive_size = false,
     side = "left",
     width = 30,
-    preserve_window_proportions = true,
+    preserve_window_proportions = true
+    -- hide_root_folder = true,
   },
   git = {
-    enable = false,
+    enable = true,
-    ignore = true,
+    ignore = false,
   },
   filesystem_watchers = {
     enable = true,
@@ -31,12 +32,10 @@ local options = {
     },
   },
   renderer = {
-    root_folder_label = false,
+    highlight_git = true,
-    highlight_git = false,
     highlight_opened_files = "none",
-
     indent_markers = {
-      enable = true,
+      enable = false,
     },
 
     icons = {
@@ -44,16 +43,16 @@ local options = {
         file = true,
         folder = true,
         folder_arrow = true,
-        git = false,
+        git = true,
       },
 
       glyphs = {
-        default = "󰈚",
+        default = "",
         symlink = "",
         folder = {
-          default = "",
+          default = "",
-          empty = "",
+          empty = "",
-          empty_open = "",
+          empty_open = "",
           open = "",
           symlink = "",
           symlink_open = "",

lua/plugins/configs/others.lua

@@ -0,0 +1,66 @@
+local M = {}
+local utils = require "core.utils"
+
+M.blankline = {
+  indentLine_enabled = 1,
+  filetype_exclude = {
+    "help",
+    "terminal",
+    "lazy",
+    "lspinfo",
+    "TelescopePrompt",
+    "TelescopeResults",
+    "mason",
+    "nvdash",
+    "nvcheatsheet",
+    "",
+  },
+  buftype_exclude = { "terminal" },
+  show_trailing_blankline_indent = false,
+  show_first_indent_level = false,
+  show_current_context = true,
+  show_current_context_start = true,
+}
+
+M.luasnip = function(opts)
+  require("luasnip").config.set_config(opts)
+
+  -- vscode format
+  require("luasnip.loaders.from_vscode").lazy_load()
+  require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
+
+  -- snipmate format
+  require("luasnip.loaders.from_snipmate").load()
+  require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
+
+  -- lua format
+  require("luasnip.loaders.from_lua").load()
+  require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
+
+  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 = {
+  signs = {
+    add = { text = "│" },
+    change = { text = "│" },
+    delete = { text = "󰍵" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "~" },
+    untracked = { text = "│" },
+  },
+  on_attach = function(bufnr)
+    utils.load_mappings("gitsigns", { buffer = bufnr })
+  end,
+}
+
+return M

lua/plugins/configs/telescope.lua

@@ -49,7 +49,7 @@ local options = {
     },
   },
 
-  extensions_list = { "themes", "terms" },
+  extensions_list = { "themes", "terms", "fzf" },
   extensions = {
     fzf = {
       fuzzy = true,

lua/plugins/configs/treesitter.lua

@@ -1,5 +1,5 @@
 local options = {
-  ensure_installed = { "lua", "vim", "vimdoc" },
+  ensure_installed = { "lua" },
 
   highlight = {
     enable = true,

lua/plugins/init.lua

@@ -6,7 +6,7 @@ local default_plugins = {
 
   {
     "NvChad/base46",
-    branch = "v3.0",
+    branch = "v2.0",
     build = function()
       require("base46").load_all_highlights()
     end,
@@ -14,16 +14,26 @@ local default_plugins = {
 
   {
     "NvChad/ui",
-    branch = "v3.0",
+    branch = "v2.0",
     lazy = false,
-    config = function()
+  },
-      require "nvchad"
+
+  {
+    "NvChad/nvterm",
+    init = function()
+      require("core.utils").load_mappings "nvterm"
+    end,
+    config = function(_, opts)
+      require "base46.term"
+      require("nvterm").setup(opts)
     end,
   },
 
   {
     "NvChad/nvim-colorizer.lua",
-    event = "User FilePost",
+    init = function()
+      require("core.utils").lazy_load "nvim-colorizer.lua"
+    end,
     config = function(_, opts)
       require("colorizer").setup(opts)
 
@@ -47,23 +57,25 @@ local default_plugins = {
 
   {
     "lukas-reineke/indent-blankline.nvim",
-    event = "User FilePost",
+    version = "2.20.7",
-    opts = {
+    init = function()
-      indent = { char = "│", highlight = "IblChar" },
+      require("core.utils").lazy_load "indent-blankline.nvim"
-      scope = { char = "│", highlight = "IblScopeChar" },
+    end,
-    },
+    opts = function()
+      return require("plugins.configs.others").blankline
+    end,
     config = function(_, opts)
+      require("core.utils").load_mappings "blankline"
       dofile(vim.g.base46_cache .. "blankline")
-
+      require("indent_blankline").setup(opts)
-      local hooks = require "ibl.hooks"
-      hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
-      require("ibl").setup(opts)
     end,
   },
 
   {
     "nvim-treesitter/nvim-treesitter",
-    event = { "BufReadPost", "BufNewFile" },
+    init = function()
+      require("core.utils").lazy_load "nvim-treesitter"
+    end,
     cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
     build = ":TSUpdate",
     opts = function()
@@ -71,7 +83,6 @@ local default_plugins = {
     end,
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "syntax")
-      dofile(vim.g.base46_cache .. "treesitter")
       require("nvim-treesitter.configs").setup(opts)
     end,
   },
@@ -79,9 +90,24 @@ local default_plugins = {
   -- git stuff
   {
     "lewis6991/gitsigns.nvim",
-    event = "User FilePost",
+    ft = { "gitcommit", "diff" },
+    init = function()
+      -- load gitsigns only when a git file is opened
+      vim.api.nvim_create_autocmd({ "BufRead" }, {
+        group = vim.api.nvim_create_augroup("GitSignsLazyLoad", { clear = true }),
+        callback = function()
+          vim.fn.system("git -C " .. '"' .. vim.fn.expand "%:p:h" .. '"' .. " rev-parse")
+          if vim.v.shell_error == 0 then
+            vim.api.nvim_del_augroup_by_name "GitSignsLazyLoad"
+            vim.schedule(function()
+              require("lazy").load { plugins = { "gitsigns.nvim" } }
+            end)
+          end
+        end,
+      })
+    end,
     opts = function()
-      return require "plugins.configs.gitsigns"
+      return require("plugins.configs.others").gitsigns
     end,
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "git")
@@ -102,9 +128,7 @@ local default_plugins = {
 
       -- custom nvchad cmd to install all mason binaries listed
       vim.api.nvim_create_user_command("MasonInstallAll", function()
-        if opts.ensure_installed and #opts.ensure_installed > 0 then
+        vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " "))
-          vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " "))
-        end
       end, {})
 
       vim.g.mason_binaries_list = opts.ensure_installed
@@ -113,9 +137,11 @@ local default_plugins = {
 
   {
     "neovim/nvim-lspconfig",
-    event = "User FilePost",
+    init = function()
+      require("core.utils").lazy_load "nvim-lspconfig"
+    end,
     config = function()
-      require("plugins.configs.lspconfig").defaults()
+      require "plugins.configs.lspconfig"
     end,
   },
 
@@ -130,8 +156,7 @@ local default_plugins = {
         dependencies = "rafamadriz/friendly-snippets",
         opts = { history = true, updateevents = "TextChanged,TextChangedI" },
         config = function(_, opts)
-          require("luasnip").config.set_config(opts)
+          require("plugins.configs.others").luasnip(opts)
-          require "plugins.configs.luasnip"
         end,
       },
 
@@ -179,7 +204,7 @@ local default_plugins = {
       { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
     },
     init = function()
-      vim.g.comment_maps = true
+      require("core.utils").load_mappings "comment"
     end,
     config = function(_, opts)
       require("Comment").setup(opts)
@@ -190,6 +215,9 @@ local default_plugins = {
   {
     "nvim-tree/nvim-tree.lua",
     cmd = { "NvimTreeToggle", "NvimTreeFocus" },
+    init = function()
+      require("core.utils").load_mappings "nvimtree"
+    end,
     opts = function()
       return require "plugins.configs.nvimtree"
     end,
@@ -201,8 +229,11 @@ local default_plugins = {
 
   {
     "nvim-telescope/telescope.nvim",
-    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    dependencies = { "nvim-treesitter/nvim-treesitter", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" } },
     cmd = "Telescope",
+    init = function()
+      require("core.utils").load_mappings "telescope"
+    end,
     opts = function()
       return require "plugins.configs.telescope"
     end,
@@ -221,7 +252,10 @@ local default_plugins = {
   -- Only load whichkey after all the gui
   {
     "folke/which-key.nvim",
-    keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
+    keys = { "<leader>", "<c-r>", '"', "'", "`", "c", "v", "g" },
+    init = function()
+      require("core.utils").load_mappings "whichkey"
+    end,
     cmd = "WhichKey",
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "whichkey")
@@ -230,7 +264,7 @@ local default_plugins = {
   },
 }
 
-local config = require "nvconfig"
+local config = require("core.utils").load_config()
 
 if #config.plugins > 0 then
   table.insert(default_plugins, { import = config.plugins })