update nvterm repo author

* Better approach to check if the system is Windows

Now the check for Windows doesn't depend on luv's os_uname() function, which may have a different result if neovim was built on different compilers (MSVC, MinGW, etc).

* remove un-needed parenthesis

---------

Co-authored-by: Sidhanth Rathod <siduck@tutanota.com>

.github/README.md

@@ -15,7 +15,7 @@
 
 <div align="center">
  
-[![Neovim Minimum Version](https://img.shields.io/badge/Neovim-0.8.3-blueviolet.svg?style=flat-square&logo=Neovim&color=90E59A&logoColor=white)](https://github.com/neovim/neovim)
+[![Neovim Minimum Version](https://img.shields.io/badge/Neovim-0.9.0-blueviolet.svg?style=flat-square&logo=Neovim&color=90E59A&logoColor=white)](https://github.com/neovim/neovim)
 [![GitHub Issues](https://img.shields.io/github/issues/NvChad/NvChad.svg?style=flat-square&label=Issues&color=d77982)](https://github.com/NvChad/NvChad/issues)
 [![Discord](https://img.shields.io/discord/869557815780470834?color=738adb&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/gADmkJb9Fb)
 [![Matrix](https://img.shields.io/badge/Matrix-40aa8b.svg?style=flat-square&logo=Matrix&logoColor=white)](https://matrix.to/#/#nvchad:matrix.org)
@@ -37,7 +37,7 @@
 
 - Lazy loading is done 93% of the time meaning that plugins will not be loaded by default, they will be loaded only when required also at specific commands, events etc. This lowers the startuptime and it was like 0.07~ secs tested on an old pentium machine 1.4ghz + 4gb ram & HDD.
 
-- NvChad isnt a framework! Its supposed to be used as a "base" config, so users could tweak the defaults well, can also remove the things they dont like in the default config and build their config on top of it. Users can tweak the entire default config while staying in their custom config (lua/custom dir). This is the control center of the user's config and gitignored so the users can stay update to-date with NvChad's latest config (main branch) while still controlling it with their chadrc (file that controls entire custom dir)
+- NvChad isn't a framework! It's supposed to be used as a "base" config, so users can tweak the defaults well, and also remove the things they don't like in the default config and build their config on top of it. Users can tweak the entire default config while staying in their custom config (lua/custom dir). This is the control center of the user's config and gitignored so the users can stay up-to-date with NvChad's latest config (main branch) while still controlling it with their chadrc (file that controls entire custom dir).
 
 ## Theme Showcase
 
@@ -88,8 +88,7 @@ A fuzzy file finder, picker, sorter, previewer and much more:
 
 - Many beautiful themes, theme toggler by our [base46 plugin](https://github.com/NvChad/base46)
 - Inbuilt terminal toggling & management with [Nvterm](https://github.com/NvChad/nvterm)
-- NvChad updater, hide & unhide terminal buffers with [NvChad extensions](https://github.com/NvChad/extensions)
+- Lightweight & performant ui plugin with [NvChad UI](https://github.com/NvChad/ui) It provides statusline modules, tabufline ( tabs + buffer manager) , beautiful cheatsheets, NvChad updater, hide & unhide terminal buffers, theme switcher and much more!
-- Lightweight & performant ui plugin with [NvChad UI](https://github.com/NvChad/ui) It provides statusline modules, tabufline ( tabs + buffer manager) , beautiful cheatsheets and much more!
 - File navigation with [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua)
 - Beautiful and configurable icons with [nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons)
 - Git diffs and more with [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim) 
@@ -113,7 +112,7 @@ A fuzzy file finder, picker, sorter, previewer and much more:
 If you like NvChad and would like to support & appreciate it via donation then I'll gladly accept it. 
 
 [![kofi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/siduck)
-[![paypal](https://img.shields.io/badge/PayPal-00457C?style=for-the-badge&logo=paypal&logoColor=white)](https://paypal.me/siduck76)
+[![paypal](https://img.shields.io/badge/PayPal-00457C?style=for-the-badge&logo=paypal&logoColor=white)](https://paypal.me/siduck13)
 [![buymeacoffee](https://img.shields.io/badge/Buy_Me_A_Coffee-FFDD00?style=for-the-badge&logo=buy-me-a-coffee&logoColor=black)](https://www.buymeacoffee.com/siduck)
 [![patreon](https://img.shields.io/badge/Patreon-F96854?style=for-the-badge&logo=patreon&logoColor=white)](https://www.patreon.com/siduck)
 

.gitignore

@@ -1,5 +1,10 @@
+plugin
+custom
 spell
 ftplugin
+syntax
 coc-settings.json
 .luarc.json
 lazy-lock.json
+after
+**/.DS_Store

.ignore

@@ -0,0 +1 @@
+!/lua/custom/

after/syntax/diff.vim

@@ -1,11 +0,0 @@
-" hi DiffAdd      gui=none    guifg=NONE          guibg=#bada9f
-" hi DiffChange   gui=none    guifg=NONE          guibg=#e5d5ac
-" hi DiffDelete   gui=bold    guifg=#ff8080       guibg=#ffb0b0
-" hi DiffText     gui=none    guifg=NONE          guibg=#8cbee2
-hi DiffAdd      gui=none    guifg=NONE          guibg=#003200
-hi DiffChange   gui=none    guifg=NONE          guibg=#000032
-hi DiffDelete   gui=bold    guifg=#ff8080       guibg=#602020
-hi DiffText     gui=bold    guifg=NONE          guibg=#102040
-hi link @text.diff.add DiffAdd
-hi link @text.diff.delete DiffDelete
-hi link @text.diff.change DiffChange

init.lua

@@ -18,6 +18,4 @@ end
 
 dofile(vim.g.base46_cache .. "defaults")
 vim.opt.rtp:prepend(lazypath)
-vim.api.nvim_command "packadd cfilter"
-vim.api.nvim_command "packadd justify"
 require "plugins"

lua/core/bootstrap.lua

@@ -1,18 +1,24 @@
 local M = {}
+local fn = vim.fn
 
 M.echo = function(str)
   vim.cmd "redraw"
   vim.api.nvim_echo({ { str, "Bold" } }, true, {})
 end
 
+local function shell_call(args)
+  local output = fn.system(args)
+  assert(vim.v.shell_error == 0, "External call failed with error code: " .. vim.v.shell_error .. "\n" .. output)
+end
+
 M.lazy = function(install_path)
   ------------- base46 ---------------
-  local lazy_path = vim.fn.stdpath "data" .. "/lazy/base46"
+  local lazy_path = fn.stdpath "data" .. "/lazy/base46"
 
   M.echo "  Compiling base46 theme to bytecode ..."
 
   local base46_repo = "https://github.com/NvChad/base46"
-  vim.fn.system { "git", "clone", "--depth", "1", "-b", "v2.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()
@@ -20,32 +26,26 @@ M.lazy = function(install_path)
   --------- lazy.nvim ---------------
   M.echo "  Installing lazy.nvim & plugins ..."
   local repo = "https://github.com/folke/lazy.nvim.git"
-  vim.fn.system { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path }
+  shell_call { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path }
   vim.opt.rtp:prepend(install_path)
 
   -- install plugins
   require "plugins"
 
-  -- mason packages & show post_boostrap screen
+  -- mason packages & show post_bootstrap screen
-  require "nvchad.post_bootstrap"()
+  require "nvchad.post_install"()
 end
 
 M.gen_chadrc_template = function()
-  if not vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1] then
+  local path = fn.stdpath "config" .. "/lua/custom"
-    local path = vim.fn.stdpath "config" .. "/lua/custom/"
-    local input = vim.fn.input "Do you want to install example custom config? (y/N) : "
 
-    -- clone example_config repo
+  if fn.isdirectory(path) ~= 1 then
-    if input == "y" then
-      M.echo "cloning example custom config repo ..."
-      vim.fn.system { "git", "clone", "--depth", "1", "https://github.com/NvChad/example_config", path }
-      vim.fn.delete(path .. ".git", "rf")
-    else
     -- use very minimal chadrc
-      vim.fn.mkdir(path, "p")
+    fn.mkdir(path, "p")
 
-      local file = io.open(path .. "chadrc.lua", "w")
+    local file = io.open(path .. "/chadrc.lua", "w")
-      file:write "---@type ChadrcConfig \n local M = {}\n M.ui = {theme = 'onedark'}\n return M"
+    if file then
+      file:write "---@type ChadrcConfig\nlocal M = {}\n\nM.ui = { theme = 'onedark' }\n\nreturn M"
       file:close()
     end
   end

lua/core/default_config.lua

@@ -10,9 +10,9 @@ M.ui = {
   hl_add = {},
   hl_override = {},
   changed_themes = {},
-  theme_toggle = { "gatekeeper", "one_light" },
+  theme_toggle = { "onedark", "one_light" },
-  theme = "gatekeeper", -- default theme
+  theme = "onedark", -- default theme
-  transparency = true,
+  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
@@ -36,9 +36,6 @@ M.ui = {
     -- round and block will work for minimal theme only
     separator_style = "default",
     overriden_modules = nil,
-    fileInfo = function()
-        return require("nvchad_ui.statusline.default.fileInfo").run()
-    end
   },
 
   -- lazyload it when there are 1+ buffers
@@ -68,7 +65,7 @@ M.ui = {
     buttons = {
       { "  Find File", "Spc f f", "Telescope find_files" },
       { "󰈚  Recent Files", "Spc f o", "Telescope oldfiles" },
-      { "󰈭  Find Word", "Spc f w", "Telescope find_grep" },
+      { "󰈭  Find Word", "Spc f w", "Telescope live_grep" },
       { "  Bookmarks", "Spc m a", "Telescope marks" },
       { "  Themes", "Spc t h", "Telescope themes" },
       { "  Mappings", "Spc c h", "NvCheatsheet" },
@@ -90,6 +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.mappings = {}
+M.mappings = require "core.mappings"
 
 return M

lua/core/init.lua

@@ -6,7 +6,7 @@ local config = require("core.utils").load_config()
 g.nvchad_theme = config.ui.theme
 g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
 g.toggle_theme_icon = "   "
-g.transparency = true
+g.transparency = config.ui.transparency
 
 -------------------------------------- options ------------------------------------------
 opt.laststatus = 3 -- global statusline
@@ -17,10 +17,10 @@ opt.cursorline = true
 
 -- Indenting
 opt.expandtab = true
-opt.shiftwidth = 4
+opt.shiftwidth = 2
 opt.smartindent = true
-opt.tabstop = 4
+opt.tabstop = 2
-opt.softtabstop = 4
+opt.softtabstop = 2
 
 opt.fillchars = { eob = " " }
 opt.ignorecase = true
@@ -31,7 +31,6 @@ opt.mouse = "a"
 opt.number = true
 opt.numberwidth = 2
 opt.ruler = false
-opt.relativenumber = true
 
 -- disable nvim intro
 opt.shortmess:append "sI"
@@ -42,7 +41,6 @@ opt.splitright = true
 opt.termguicolors = true
 opt.timeoutlen = 400
 opt.undofile = true
-opt.scrolloff = 15
 
 -- interval for writing swap file to disk, also used by gitsigns
 opt.updatetime = 250
@@ -59,8 +57,8 @@ for _, provider in ipairs { "node", "perl", "python3", "ruby" } do
 end
 
 -- add binaries installed by mason.nvim to path
-local is_windows = vim.loop.os_uname().sysname == "Windows_NT"
+local is_windows = vim.fn.has("win32") ~= 0
-vim.env.PATH = vim.env.PATH .. (is_windows and ";" or ":") .. vim.fn.stdpath "data" .. "/mason/bin"
+vim.env.PATH = vim.fn.stdpath "data" .. "/mason/bin" .. (is_windows and ";" or ":") .. vim.env.PATH
 
 -------------------------------------- autocmds ------------------------------------------
 local autocmd = vim.api.nvim_create_autocmd
@@ -74,11 +72,10 @@ autocmd("FileType", {
 })
 
 -- reload some chadrc options on-save
-vim.api.nvim_create_autocmd("BufWritePost", {
+autocmd("BufWritePost", {
-  pattern = vim.tbl_map(
+  pattern = vim.tbl_map(function(path)
-    vim.fs.normalize,
+    return vim.fs.normalize(vim.loop.fs_realpath(path))
-    vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)
+  end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)),
-  ),
   group = vim.api.nvim_create_augroup("ReloadNvChad", {}),
 
   callback = function(opts)
@@ -94,20 +91,51 @@ vim.api.nvim_create_autocmd("BufWritePost", {
 
     vim.g.nvchad_theme = config.ui.theme
     vim.g.transparency = config.ui.transparency
-    vim.g.transparency = true
 
     -- statusline
-    require("plenary.reload").reload_module("nvchad_ui.statusline." .. config.ui.statusline.theme)
+    require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme)
-    vim.opt.statusline = "%!v:lua.require('nvchad_ui.statusline." .. config.ui.statusline.theme .. "').run()"
+    vim.opt.statusline = "%!v:lua.require('nvchad.statusline." .. config.ui.statusline.theme .. "').run()"
+
+    -- tabufline
+    if config.ui.tabufline.enabled then
+      require("plenary.reload").reload_module "nvchad.tabufline.modules"
+      vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules').run()"
+    end
 
     require("base46").load_all_highlights()
     -- vim.cmd("redraw!")
   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
 
 new_cmd("NvChadUpdate", function()
-  require "nvchad.update"()
+  require "nvchad.updater"()
 end, {})

lua/core/mappings.lua

@@ -16,51 +16,42 @@ M.general = {
   },
 
   n = {
-    ["<leader>n"] = { ":noh <CR>", "Clear highlights" },
+    ["<Esc>"] = { "<cmd> noh <CR>", "Clear highlights" },
-    ["<leader>rr"] = { ":source $MYVIMRC<CR>", "Reload config file" },
     -- 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" },
 
-    -- ["<C-d>"] = { "<cmd> tab Git diff %<CR>", "Git diff this file" },
-    ["<C-d>"] = { "<cmd> DiffviewOpen -- %<CR>", "Git diff this file" },
-    ["<C-o>"] = { "<cmd> DiffviewFileHistory %<CR>", "Git history diff this file" },
-    ["<C-a-d>"] = { "<cmd> DiffviewClose<CR>", "Close git diff" },
-    -- ["<C-p>"] = { "<cmd> tab Git diff<CR>", "Git diff global" },
-    ["<C-p>"] = { "<cmd> DiffviewOpen<CR>", "Git diff global" },
-    ["<a-p>"] = { ":DiffviewOpen HEAD~", "Show last N commits" },
-    ["<leader>gd"] = { "<cmd> DiffviewClose<CR>", "Git diff close" },
-
     -- save
     ["<C-s>"] = { "<cmd> w <CR>", "Save file" },
 
     -- Copy all
-    -- ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
+    ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
-
-    -- Quit
-    ["<C-q>"] = { "<cmd> q! <CR>", "Force quit window" },
 
     -- line numbers
-    -- ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
+    ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
-    -- ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
+    ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
 
-    -- allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
+    -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
     -- 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 } },
+    ["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 } },
+    ["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 } },
+    ["<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 } },
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-
-    ["<leader>y"] = {"<cmd> :w! /tmp/vimtmp<CR>", "Save into a global tmp file"},
-    ["<leader>p"] = {"<cmd> :r! cat /tmp/vimtmp<CR>", "Restore from the global tmp file"},
 
     -- new buffer
-    -- ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
+    ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
-    -- ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
+    ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
+
+    ["<leader>fm"] = {
+      function()
+        vim.lsp.buf.format { async = true }
+      end,
+      "LSP formatting",
+    },
   },
 
   t = {
@@ -68,71 +59,21 @@ M.general = {
   },
 
   v = {
-    -- ["<Up>"] = { '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 } },
+    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["<"] = { "<gv", "Indent line" },
+    [">"] = { ">gv", "Indent line" },
   },
 
   x = {
-    -- ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    ["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 } },
+    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
     -- Don't copy the replaced text after pasting in visual mode
-    -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#alternative_mapping_for_paste
+    -- 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 } },
   },
 }
 
-M.customstuffs = {
-
-  n = {
-    ["<Return>"] = { "o<ESC>", "Insert new line below" },
-    ["<BS>"] = { "O<ESC>", "Insert new line above" },
-    ["<C-c>"] = { "<cmd> vertical topleft Git <bar> vertical resize 50<CR>", "Show Git status on a left pane" },
-    ["<F1>"] = { "<cmd> tabprevious<CR>", "Previous tab" },
-    ["<F2>"] = { "<cmd> tabnext<CR>", "Next tab" },
-    ["<F3>"] = { "<cmd> Flog -all<CR>", "Show git tree" },
-    ["<F4>"] = { "<cmd> tab Git show -", "Git show N last commits" },
-    ["<C-t>"] = { "<cmd> TagbarToggle<CR>", "Show tagbar" },
-    ["<leader>ra"] = { "<cmd> call VrcQuery()<CR>", "Call REST endpoint" },
-    ["<leader>dl"] = { "0d$", "Delete line from start" },
-    ["<leader>gp"] = { "<cmd> Git pull<CR>", "Git pull" },
-    ["<leader>gnb"] = { ":Git checkout -b ", "Checkout to a new branch" },
-    ["<leader>gri"] = { ":Git rebase -i HEAD~", "Git rebase interactive from HEAD" },
-    ["<leader>mkd"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekOpen', require('peek').open, {})<CR>", "Open markdown preview" },
-    ["<leader>mkc"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekClose', require('peek').close, {})<CR>", "Open markdown preview" },
-
-    ["n"] = { "nzz", "Next + auto center" },
-    ["N"] = { "Nzz", "Previous + auto center" },
-    ["("] = { "(zz", "Previous + auto center" },
-    [")"] = { ")zz", "Previous + auto center" },
-    ["{"] = { "{zz", "Previous + auto center" },
-    ["}"] = { "}zz", "Previous + auto center" },
-    ["[["] = { "[[zz", "Previous + auto center" },
-    ["]]"] = { "]]zz", "Previous + auto center" },
-
-    -- Mappings: TODO
-
-    -- "trim(system('git branch --show-current 2>/dev/null'))"
-    -- ["<leader>tt"] = { ":call append(line('.') - 1, repeat(' ', indent('.')) . '# TODO-' . trim(system('git branch --show-current 2>/dev/null')) . ': ' . input('Comment >'))<CR>", "Add TODO comment + add to quickfix list" },
-    ["<leader>tt"] = { ":call append(line('.') - 1, repeat(' ', indent('.')) . '# TODO: ' . input('Comment >'))<CR>", "Add TODO comment + add to quickfix list" },
-
-    ["<leader>ww"] = { ":lua require('nvim-window').pick()<CR>", "Pick window to goto" },
-    ["<leader>wm"] = { ":WinShift<CR>", "Enter move window mode" },
-    ["<leader>ws"] = { ":WinShift swap<CR>", "Swap window, with selection" },
-
-    ["<leader>gg"] = { ":LazyGit<CR>", "Open lazygit" },
-  },
-  v = {
-    ["n"] = { "nzz", "Next + auto center" },
-    ["N"] = { "Nzz", "Previous + auto center" },
-    ["("] = { "(zz", "Previous + auto center" },
-    [")"] = { ")zz", "Previous + auto center" },
-    ["{"] = { "{zz", "Previous + auto center" },
-    ["}"] = { "}zz", "Previous + auto center" },
-    ["[["] = { "[[zz", "Previous + auto center" },
-    ["]]"] = { "]]zz", "Previous + auto center" },
-  },
-}
-
 M.tabufline = {
   plugin = true,
 
@@ -140,14 +81,14 @@ M.tabufline = {
     -- cycle through buffers
     ["<tab>"] = {
       function()
-        require("nvchad_ui.tabufline").tabuflineNext()
+        require("nvchad.tabufline").tabuflineNext()
       end,
       "Goto next buffer",
     },
 
     ["<S-tab>"] = {
       function()
-        require("nvchad_ui.tabufline").tabuflinePrev()
+        require("nvchad.tabufline").tabuflinePrev()
       end,
       "Goto prev buffer",
     },
@@ -155,7 +96,7 @@ M.tabufline = {
     -- close buffer + hide terminal buffer
     ["<leader>x"] = {
       function()
-        require("nvchad_ui.tabufline").close_buffer()
+        require("nvchad.tabufline").close_buffer()
       end,
       "Close buffer",
     },
@@ -167,7 +108,7 @@ M.comment = {
 
   -- toggle comment in both modes
   n = {
-    ["<leader>ci"] = {
+    ["<leader>/"] = {
       function()
         require("Comment.api").toggle.linewise.current()
       end,
@@ -176,7 +117,7 @@ M.comment = {
   },
 
   v = {
-    ["<leader>ci"] = {
+    ["<leader>/"] = {
       "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
       "Toggle comment",
     },
@@ -233,7 +174,7 @@ M.lspconfig = {
 
     ["<leader>ra"] = {
       function()
-        require("nvchad_ui.renamer").open()
+        require("nvchad.renamer").open()
       end,
       "LSP rename",
     },
@@ -252,7 +193,7 @@ M.lspconfig = {
       "LSP references",
     },
 
-    ["<leader>f"] = {
+    ["<leader>lf"] = {
       function()
         vim.diagnostic.open_float { border = "rounded" }
       end,
@@ -261,37 +202,30 @@ M.lspconfig = {
 
     ["[d"] = {
       function()
-        vim.diagnostic.goto_prev({ float = { border = "rounded" }})
+        vim.diagnostic.goto_prev { float = { border = "rounded" } }
       end,
       "Goto prev",
     },
 
     ["]d"] = {
       function()
-        vim.diagnostic.goto_next({ float = { border = "rounded" }})
+        vim.diagnostic.goto_next { float = { border = "rounded" } }
       end,
       "Goto next",
     },
 
-    -- ["<leader>q"] = {
+    ["<leader>q"] = {
-    --   function()
-    --     vim.diagnostic.setloclist()
-    --   end,
-    --   "Diagnostic setloclist",
-    -- },
-
-    ["<leader>fm"] = {
       function()
-        vim.lsp.buf.format { async = true }
+        vim.diagnostic.setloclist()
       end,
-      "LSP formatting",
+      "Diagnostic setloclist",
     },
 
     ["<leader>wa"] = {
       function()
         vim.lsp.buf.add_workspace_folder()
       end,
-      "add workspace folder",
+      "Add workspace folder",
     },
 
     ["<leader>wr"] = {
@@ -308,6 +242,15 @@ M.lspconfig = {
       "List workspace folders",
     },
   },
+
+  v = {
+    ["<leader>ca"] = {
+      function()
+        vim.lsp.buf.code_action()
+      end,
+      "LSP code action",
+    },
+  },
 }
 
 M.nvimtree = {
@@ -326,45 +269,18 @@ M.telescope = {
   plugin = true,
 
   n = {
-    -- Resume
-    ["<a-f>"] = { "<cmd> Telescope resume <CR>", "Resume" },
     -- find
-    ["<C-g>"] = { "<cmd> Telescope find_files <CR>", "Find files" },
+    ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "Find files" },
-    ["<C-x>"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
+    ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
-    ["<C-f>"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
+    ["<leader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
-    ["<C-b>"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
+    ["<leader>fb"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
-
-    ["<leader>fg"] = { "<cmd> lua require('telescope.builtin').live_grep({default_text=vim.fn.getreg('/')}) <CR>", "Live grep with actual search value as prefix" },
-    ["<leader>gf"] = { "<cmd> lua require('telescope.builtin').find_files({default_text=vim.fn.getreg('/')}) <CR>", "Live grep with actual search value as prefix" },
-    ["<leader>ac"] = { ":execute 'vimgrep' input('Pattern >', getreg('/')) '**/*' <CR>", "add search term files in quickfix list" },
-    -- ["<leader>qr"] = { ":execute 'cdo' '%s/' . input('Search term >', getreg('/')) . '/' . input('Replace by >', getreg('')) . '/g | update' <CR>", "Replace pattern in all quickfix list" },
-    ["<leader>qr"] = { ":cdo '%s/' . input('Search term >', getreg('/')) . '/' . input('Replace by >', '') . '/g | update' <CR>", "Replace pattern in all quickfix list" },
-    ["<leader>br"] = { ":execute '%s/' . input('Search term >', getreg('/')) . '/' . input('Replace by >', '') . '/g | update' <CR>", "Replace pattern in current buffer" },
-
-    ["<leader>ql"] = { "<cmd> Telescope quickfix <CR>", "Show quickfix list" },
-    ["<leader>qn"] = { ":cnext<CR>", "Jump to next in quickfix list" },
-    ["<leader>qp"] = { ":cprevious<CR>", "Jump to previous in quickfix list" },
-
-    ["<leader>ll"] = { "<cmd> Telescope loclist <CR>", "Show loclist list" },
-    ["<leader>ln"] = { ":lnext<CR>", "Jump to next in loclist" },
-    ["<leader>lp"] = { ":lprevious<CR>", "Jump to previous in loclist" },
-
     ["<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" },
 
-    ["<leader>wl"] = { "<cmd> Telescope workspaces <CR>", "Find workspaces" },
-
     -- git
-    --- Commits
+    ["<leader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git commits" },
-    ["<leader>gc"] = { "<cmd> lua require('custom.telescope').my_git_commits()<CR>", "Custom Git commits" },
+    ["<leader>gt"] = { "<cmd> Telescope git_status <CR>", "Git status" },
-    --- Status
-    ["<leader>gss"] = { "<cmd> lua require('custom.telescope').my_git_status()<CR>", "Custom Git status" },
-    --- Stash
-    ["<leader>gsh"] = { "<cmd> Telescope git_stash<CR>", "Git stash" },
-    --- Branches
-    ["<leader>gbb"] = { "<cmd> Telescope git_branches<CR>", "Git branches" },
-    ["<leader>gbc"] = { "<cmd> lua require('custom.telescope').my_git_bcommits()<CR>", "Custom Git branchs commits" },
 
     -- pick a hidden term
     ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "Pick hidden term" },
@@ -373,14 +289,6 @@ M.telescope = {
     ["<leader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad themes" },
 
     ["<leader>ma"] = { "<cmd> Telescope marks <CR>", "telescope bookmarks" },
-
-    -- History
-    ["<leader>ch"] = { "<cmd> Telescope command_history <CR>", "telescope commands history" },
-    ["<leader>/"] = { "<cmd> Telescope search_history <CR>", "telescope search history" },
-
-    -- Diaglist: LSP diagnostics in quick/loc list
-    ["<leader>dw"] = { "<cmd>lua require('diaglist').open_all_diagnostics()<CR>", "Open all open buffers diagnostics in quickfix list" },
-    ["<leader>d0"] = { "<cmd>lua require('diaglist').open_buffer_diagnostics()<CR>", "Open current buffer diagnostics in loclist list" },
   },
 }
 
@@ -389,21 +297,21 @@ M.nvterm = {
 
   t = {
     -- toggle in terminal mode
-    ["<a-i>"] = {
+    ["<A-i>"] = {
       function()
         require("nvterm.terminal").toggle "float"
       end,
       "Toggle floating term",
     },
 
-    ["<a-h>"] = {
+    ["<A-h>"] = {
       function()
         require("nvterm.terminal").toggle "horizontal"
       end,
       "Toggle horizontal term",
     },
 
-    ["<a-v>"] = {
+    ["<A-v>"] = {
       function()
         require("nvterm.terminal").toggle "vertical"
       end,
@@ -413,21 +321,21 @@ M.nvterm = {
 
   n = {
     -- toggle in normal mode
-    ["<a-i>"] = {
+    ["<A-i>"] = {
       function()
         require("nvterm.terminal").toggle "float"
       end,
       "Toggle floating term",
     },
 
-    ["<a-h>"] = {
+    ["<A-h>"] = {
       function()
         require("nvterm.terminal").toggle "horizontal"
       end,
       "Toggle horizontal term",
     },
 
-    ["<a-v>"] = {
+    ["<A-v>"] = {
       function()
         require("nvterm.terminal").toggle "vertical"
       end,
@@ -526,7 +434,7 @@ M.gitsigns = {
       opts = { expr = true },
     },
 
-    -- actions
+    -- Actions
     ["<leader>rh"] = {
       function()
         require("gitsigns").reset_hunk()
@@ -541,7 +449,7 @@ M.gitsigns = {
       "Preview hunk",
     },
 
-    ["<leader>bb"] = {
+    ["<leader>gb"] = {
       function()
         package.loaded.gitsigns.blame_line()
       end,

lua/core/utils.lua

@@ -8,11 +8,11 @@ M.load_config = function()
   if chadrc_path then
     local chadrc = dofile(chadrc_path)
 
-    config.mappings = M.remove_disabled_keys(chadrc.mappings, require "core.mappings")
+    config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings)
     config = merge_tb("force", config, chadrc)
+    config.mappings.disabled = nil
   end
 
-  config.mappings.disabled = nil
   return config
 end
 

lua/custom/chadrc.lua

@@ -1,20 +0,0 @@
----@type ChadrcConfig
-local M = {}
-
--- Path to overriding theme and highlights files
-local highlights = require "custom.highlights"
-
-M.ui = {
-  theme = "onedark",
-  theme_toggle = { "onedark", "monekai" },
-
-  hl_override = highlights.override,
-  hl_add = highlights.add,
-}
-
-M.plugins = "custom.plugins"
-
--- check core.mappings for table structure
-M.mappings = require "custom.mappings"
-
-return M

lua/custom/configs/lspconfig.lua

@@ -1,17 +0,0 @@
-local on_attach = require("plugins.configs.lspconfig").on_attach
-local capabilities = require("plugins.configs.lspconfig").capabilities
-
-local lspconfig = require "lspconfig"
-
--- if you just want default config for the servers then put them in a table
-local servers = { "html", "cssls", "tsserver", "clangd", "salt_ls" }
-
-for _, lsp in ipairs(servers) do
-  lspconfig[lsp].setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-  }
-end
-
--- 
--- lspconfig.pyright.setup { blabla}

lua/custom/configs/null-ls.lua

@@ -1,25 +0,0 @@
-local present, null_ls = pcall(require, "null-ls")
-
-if not present then
-  return
-end
-
-local b = null_ls.builtins
-
-local sources = {
-
-  -- webdev stuff
-  b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast!
-  b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes
-
-  -- Lua
-  b.formatting.stylua,
-
-  -- cpp
-  b.formatting.clang_format,
-}
-
-null_ls.setup {
-  debug = true,
-  sources = sources,
-}

lua/custom/configs/overrides.lua

@@ -1,68 +0,0 @@
-local M = {}
-
-M.treesitter = {
-  ensure_installed = {
-    "vim",
-    "lua",
-    "html",
-    "css",
-    "javascript",
-    "typescript",
-    "tsx",
-    "c",
-    "markdown",
-    "markdown_inline",
-  },
-  indent = {
-    enable = true,
-    -- disable = {
-    --   "python"
-    -- },
-  },
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = "<C-space>",
-      node_incremental = "<C-space>",
-      scope_incremental = false,
-      node_decremental = "<bs>",
-    },
-  },
-}
-
-M.mason = {
-  ensure_installed = {
-    -- lua stuff
-    "lua-language-server",
-    "stylua",
-
-    -- web dev stuff
-    "css-lsp",
-    "html-lsp",
-    "typescript-language-server",
-    "deno",
-    "prettier",
-
-    -- c/cpp stuff
-    "clangd",
-    "clang-format",
-  },
-}
-
--- git support in nvimtree
-M.nvimtree = {
-  git = {
-    enable = true,
-  },
-
-  renderer = {
-    highlight_git = true,
-    icons = {
-      show = {
-        git = true,
-      },
-    },
-  },
-}
-
-return M

lua/custom/highlights.lua

@@ -1,19 +0,0 @@
--- To find any highlight groups: "<cmd> Telescope highlights"
--- Each highlight group can take a table with variables fg, bg, bold, italic, etc
--- base30 variable names can also be used as colors
-
-local M = {}
-
----@type Base46HLGroupsList
-M.override = {
-  Comment = {
-    italic = true,
-  },
-}
-
----@type HLTable
-M.add = {
-  NvimTreeOpenedFolderName = { fg = "green", bold = true },
-}
-
-return M

lua/custom/init.lua

@@ -1,7 +0,0 @@
--- local autocmd = vim.api.nvim_create_autocmd
-
--- Auto resize panes when resizing nvim window
--- autocmd("VimResized", {
---   pattern = "*",
---   command = "tabdo wincmd =",
--- })

lua/custom/mappings.lua

@@ -1,12 +0,0 @@
----@type MappingsTable
-local M = {}
-
-M.general = {
-  n = {
-    [";"] = { ":", "enter command mode", opts = { nowait = true } },
-  },
-}
-
--- more keybinds!
---
-return M

lua/custom/plugins.lua

@@ -1,65 +0,0 @@
-local overrides = require("custom.configs.overrides")
-
----@type NvPluginSpec[]
-local plugins = {
-
-  -- Override plugin definition options
-
-  {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      -- format & linting
-      {
-        "jose-elias-alvarez/null-ls.nvim",
-        config = function()
-          require "custom.configs.null-ls"
-        end,
-      },
-    },
-    config = function()
-      require "plugins.configs.lspconfig"
-      require "custom.configs.lspconfig"
-    end, -- Override to setup mason-lspconfig
-  },
-
-  -- override plugin configs
-  {
-    "williamboman/mason.nvim",
-    opts = overrides.mason
-  },
-
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = overrides.treesitter,
-  },
-
-  {
-    "nvim-tree/nvim-tree.lua",
-    opts = overrides.nvimtree,
-  },
-
-  -- Install a plugin
-  {
-    "max397574/better-escape.nvim",
-    event = "InsertEnter",
-    config = function()
-      require("better_escape").setup()
-    end,
-  },
-
-  -- To make a plugin not be loaded
-  -- {
-  --   "NvChad/nvim-colorizer.lua",
-  --   enabled = false
-  -- },
-
-  -- All NvChad plugins are lazy-loaded by default
-  -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
-  -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
-  -- {
-  --   "mg979/vim-visual-multi",
-  --   lazy = false,
-  -- }
-}
-
-return plugins

lua/custom/telescope.lua

@@ -1,61 +0,0 @@
--- Implement delta as previewer for diffs
-
-local previewers = require('telescope.previewers')
-local builtin = require('telescope.builtin')
-local E = {}
-
-local delta = previewers.new_termopen_previewer {
-  get_command = function(entry)
-    -- this is for status
-    -- You can get the AM things in entry.status. So we are displaying file if entry.status == '??' or 'A '
-    -- just do an if and return a different command
-    if entry.status == '??' or 'A ' then
-      return { 'git', '-c', 'core.pager=delta', '-c', 'delta.side-by-side=false', 'diff', entry.value }
-    end
-
-    -- note we can't use pipes
-    -- this command is for git_commits and git_bcommits
-    return { 'git', '-c', 'core.pager=delta', '-c', 'delta.side-by-side=false', 'diff', entry.value .. '^!' }
-
-  end
-}
-
-E.my_git_commits = function(opts)
-  opts = opts or {}
-  opts.previewer = delta
-
-  builtin.git_commits(opts)
-end
-
-E.my_git_bcommits = function(opts)
-  opts = opts or {}
-  opts.previewer = delta
-
-  builtin.git_bcommits(opts)
-end
-
-E.my_git_status = function(opts)
-  opts = opts or {}
-  opts.previewer = delta
-
-  builtin.git_status(opts)
-end
-
-E.my_git_branches = function(opts)
-  opts = opts or {}
-  opts.previewer = delta
-
-  builtin.git_branches(opts)
-end
-
-E.project_files = function()
-  local opts = {} -- define here if you want to define something
-  vim.fn.system('git rev-parse --is-inside-work-tree')
-  if vim.v.shell_error == 0 then
-    require"telescope.builtin".git_files(opts)
-  else
-    require"telescope.builtin".find_files(opts)
-  end
-end
-
-return E

lua/plugins/configs/cmp.lua

@@ -15,7 +15,7 @@ local formatting_style = {
   fields = field_arrangement[cmp_style] or { "abbr", "kind", "menu" },
 
   format = function(_, item)
-    local icons = require("nvchad_ui.icons").lspkind
+    local icons = require "nvchad.icons.lspkind"
     local icon = (cmp_ui.icons and icons[item.kind]) or ""
 
     if cmp_style == "atom" or cmp_style == "atom_colored" then
@@ -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:PmenuSel",
+      winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None",
       scrollbar = false,
     },
     documentation = {
@@ -76,8 +76,8 @@ local options = {
     ["<C-Space>"] = cmp.mapping.complete(),
     ["<C-e>"] = cmp.mapping.close(),
     ["<CR>"] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
+      behavior = cmp.ConfirmBehavior.Insert,
-      select = false,
+      select = true,
     },
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then

lua/plugins/configs/diffview.lua

@@ -1,5 +0,0 @@
-local actions = require("diffview.actions")
-
-local options = {}
-
-return options

lua/plugins/configs/hydra.lua

@@ -1,35 +0,0 @@
-local Hydra = require("hydra")
-
-Hydra({
-	name = "Change / Resize Window",
-	mode = { "n" },
-	body = "<leader>t",
-	config = {
-		-- color = "pink",
-	},
-	heads = {
-		-- move between windows
-		{ "<C-h>", "<C-w>h", { desc="Noot nooty" } },
-		{ "<C-j>", "<C-w>j" },
-		{ "<C-k>", "<C-w>k" },
-		{ "<C-l>", "<C-w>l" },
-
-		-- resizing window
-		{ "H", "<C-w>3<" },
-		{ "L", "<C-w>3>" },
-		{ "K", "<C-w>2+" },
-		{ "J", "<C-w>2-" },
-
-		-- equalize window sizes
-		{ "e", "<C-w>=" },
-
-		-- close active window
-		{ "Q", ":q<cr>" },
-		{ "<C-q>", ":q<cr>" },
-
-		-- exit this Hydra
-		{ "q", nil, { exit = true, nowait = true } },
-		{ ";", nil, { exit = true, nowait = true } },
-		{ "<Esc>", nil, { exit = true, nowait = true } },
-	},
-})

lua/plugins/configs/lspconfig.lua

@@ -1,22 +1,21 @@
 dofile(vim.g.base46_cache .. "lsp")
-require "nvchad_ui.lsp"
+require "nvchad.lsp"
 
 local M = {}
 local utils = require "core.utils"
 
 -- export on_attach & capabilities for custom lspconfigs
-
 M.on_attach = function(client, bufnr)
-  client.server_capabilities.documentFormattingProvider = false
-  client.server_capabilities.documentRangeFormattingProvider = false
-
   utils.load_mappings("lspconfig", { buffer = bufnr })
 
   if client.server_capabilities.signatureHelpProvider then
-    require("nvchad_ui.signature").setup(client)
+    require("nvchad.signature").setup(client)
   end
+end
 
-  if not utils.load_config().ui.lsp_semantic_tokens then
+-- disable semantic tokens
+M.on_init = function(client, _)
+  if not utils.load_config().ui.lsp_semantic_tokens and client.supports_method "textDocument/semanticTokens" then
     client.server_capabilities.semanticTokensProvider = nil
   end
 end
@@ -42,6 +41,7 @@ M.capabilities.textDocument.completion.completionItem = {
 }
 
 require("lspconfig").lua_ls.setup {
+  on_init = M.on_init,
   on_attach = M.on_attach,
   capabilities = M.capabilities,
 
@@ -54,7 +54,7 @@ require("lspconfig").lua_ls.setup {
         library = {
           [vim.fn.expand "$VIMRUNTIME/lua"] = true,
           [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
-          [vim.fn.stdpath "data" .. "/lazy/extensions/nvchad_types"] = true,
+          [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
           [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
         },
         maxPreload = 100000,

lua/plugins/configs/others.lua

@@ -51,12 +51,12 @@ end
 
 M.gitsigns = {
   signs = {
-    add = { hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr" },
+    add = { text = "│" },
-    change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" },
+    change = { text = "│" },
-    delete = { hl = "DiffDelete", text = "󰍵", numhl = "GitSignsDeleteNr" },
+    delete = { text = "󰍵" },
-    topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" },
+    topdelete = { text = "‾" },
-    changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
+    changedelete = { text = "~" },
-    untracked = { hl = "GitSignsAdd", text = "│", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
+    untracked = { text = "│" },
   },
   on_attach = function(bufnr)
     utils.load_mappings("gitsigns", { buffer = bufnr })

lua/plugins/configs/ruff_lsp.lua

@@ -1,47 +0,0 @@
--- See: https://github.com/neovim/nvim-lspconfig/tree/54eb2a070a4f389b1be0f98070f81d23e2b1a715#suggested-configuration
-local opts = { noremap=true, silent=true }
-vim.keymap.set('n', '<space>k', vim.diagnostic.open_float, opts)
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
-  -- Enable completion triggered by <c-x><c-o>
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  -- Mappings.
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  local bufopts = { noremap=true, silent=true, buffer=bufnr }
-  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-  vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
-  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
-  vim.keymap.set('n', '<space>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, bufopts)
-
-  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
-  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
-  vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
-  vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
-end
-
--- Configure `ruff-lsp`.
--- See: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#ruff_lsp
--- For the default config, along with instructions on how to customize the settings
-require('lspconfig').ruff_lsp.setup {
-  on_attach = on_attach,
-  init_options = {
-    settings = {
-      -- Any extra CLI arguments for `ruff` go here.
-      args = {"--ignore", "E741"},
-    }
-
-  }
-}

lua/plugins/configs/telescope.lua

@@ -1,96 +1,3 @@
-local custom_actions = {}
-local actions = require("telescope.actions")
-local action_state = require("telescope.actions.state")
-local from_entry = require("telescope.from_entry")
-
-
-local entry_to_qf = function(entry)
-  local text = entry.text
-
-  if not text then
-    if type(entry.value) == "table" then
-      text = entry.value.text
-    else
-      text = entry.value
-    end
-  end
-
-  return {
-    bufnr = entry.bufnr,
-    filename = from_entry.path(entry, false, false),
-    lnum = vim.F.if_nil(entry.lnum, 1),
-    col = vim.F.if_nil(entry.col, 1),
-    text = text,
-  }
-end
-
-local send_selected_to_list_without_closing_prompt = function(prompt_bufnr, mode, target)
-  local picker = action_state.get_current_picker(prompt_bufnr)
-
-  local qf_entries = {}
-  for _, entry in ipairs(picker:get_multi_selection()) do
-    table.insert(qf_entries, entry_to_qf(entry))
-  end
-
-  local prompt = picker:_get_prompt()
-  -- actions.close(prompt_bufnr)
-
-  vim.api.nvim_exec_autocmds("QuickFixCmdPre", {})
-  if target == "loclist" then
-    vim.fn.setloclist(picker.original_win_id, qf_entries, mode)
-  else
-    local qf_title = string.format([[%s (%s)]], picker.prompt_title, prompt)
-    vim.fn.setqflist(qf_entries, mode)
-    vim.fn.setqflist({}, "a", { title = qf_title })
-  end
-  vim.api.nvim_exec_autocmds("QuickFixCmdPost", {})
-end
-
-function custom_actions._multiopen(prompt_bufnr, cmd, cmd2, mode, list)
-  -- actions.send_selected_to_loclist(prompt_bufnr)
-  local picker = action_state.get_current_picker(prompt_bufnr)
-  local multi = picker:get_multi_selection()
-  local single = picker:get_selection()
-
-  local str = ""
-
-  if #multi > 0 then
-
-    send_selected_to_list_without_closing_prompt(prompt_bufnr, mode, list)
-
-    for i, j in ipairs(multi) do
-      if i % 2 == 1 then
-        str = str..cmd.." "..j[1].." | "
-      else
-        str = str..cmd2.." "..j[1].." | "
-      end
-    end
-
-  else
-    str = cmd.." "..single[1]
-  end
-
-  -- To avoid populating qf or doing ":edit! file", close the prompt first
-  actions.close(prompt_bufnr)
-  vim.api.nvim_command(str)
-end
-
-function custom_actions.multi_selection_open(prompt_bufnr)
-  return custom_actions._multiopen(prompt_bufnr, "edit", "edit", "a", "loclist")
-end
-
-function custom_actions.multi_selection_vsplit(prompt_bufnr)
-  return custom_actions._multiopen(prompt_bufnr, "vsplit", "split", "a", "loclist")
-end
-
-function custom_actions.multi_selection_split(prompt_bufnr)
-  return custom_actions._multiopen(prompt_bufnr, "split", "vsplit", "a", "loclist")
-end
-
-function custom_actions.multi_selection_vtab(prompt_bufnr)
-  return custom_actions._multiopen(prompt_bufnr, "tabe", "tabe", "a", "loclist")
-end
-
 local options = {
   defaults = {
     vimgrep_arguments = {
@@ -113,15 +20,14 @@ local options = {
     layout_config = {
       horizontal = {
         prompt_position = "top",
-        preview_width = 0.60,
+        preview_width = 0.55,
-        results_width = 0.8,
       },
       vertical = {
         mirror = false,
       },
-      width = 0.90,
+      width = 0.87,
-      height = 0.92,
+      height = 0.80,
-      preview_cutoff = 200,
+      preview_cutoff = 120,
     },
     file_sorter = require("telescope.sorters").get_fuzzy_file,
     file_ignore_patterns = { "node_modules" },
@@ -138,45 +44,11 @@ local options = {
     -- Developer configurations: Not meant for general override
     buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
     mappings = {
-      n = { ["q"] = actions.close },
+      n = { ["q"] = require("telescope.actions").close },
     },
   },
-  pickers = {
-    buffers = {
-      show_all_buffers = true,
-      sort_lastused = true,
-      mappings = {
-        n = {
-          ["d"] = "delete_buffer",
-        },
-        i = {
-          ["<C-d>"] = "delete_buffer",
-        }
-      }
-    },
-    find_files = {
-      mappings = {
-        i = {
-          ["<CR>"] = custom_actions.multi_selection_open,
-          ["<C-V>"] = custom_actions.multi_selection_vsplit,
-          ["<C-X>"] = custom_actions.multi_selection_split,
-          ["<C-T>"] = custom_actions.multi_selection_tab,
-          ["<C-SPACE>"] = actions.send_selected_to_qflist,
-        },
-        n = i,
-      }
-    }
-  },
 
-  extensions_list = { "themes", "terms", "fzf", "macrothis" },
+  extensions_list = { "themes", "terms" },
-  extensions = {
-    fzf = {
-      fuzzy = true,
-      override_generic_sorter = true,
-      override_file_sorter = true,
-      case_mode = "smart_case",
-    }
-  }
 }
 
 return options

lua/plugins/configs/treesitter.lua

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

lua/plugins/configs/treesitter_textobjects.lua

@@ -1,133 +0,0 @@
-local M = {}
-
-M.textobjects = {
-  select = {
-    enable = true,
-
-    -- Automatically jump forward to textobj, similar to targets.vim
-    lookahead = true,
-
-    keymaps = {
-      -- You can use the capture groups defined in textobjects.scm
-      ["a="] = { query = "@assignment.outer", desc = "Select outer part of an assignment" },
-      ["i="] = { query = "@assignment.inner", desc = "Select inner part of an assignment" },
-      ["l="] = { query = "@assignment.lhs", desc = "Select left hand side of an assignment" },
-      ["r="] = { query = "@assignment.rhs", desc = "Select right hand side of an assignment" },
-
-      ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter/argument" },
-      ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter/argument" },
-
-      ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" },
-      ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" },
-
-      ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" },
-      ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" },
-
-      ["af"] = { query = "@call.outer", desc = "Select outer part of a function call" },
-      ["if"] = { query = "@call.inner", desc = "Select inner part of a function call" },
-
-      ["am"] = { query = "@function.outer", desc = "Select outer part of a function def" },
-      ["im"] = { query = "@function.inner", desc = "Select inner part of a function def" },
-
-      ["ak"] = { query = "@class.outer", desc = "Select outer part of a class" },
-      ["ik"] = { query = "@class.inner", desc = "Select inner part of a class" },
-
-      ["ac"] = { query = "@comment.outer", desc = "Select outer part of a comment" },
-      ["ic"] = { query = "@comment.inner", desc = "Select inner part of a comment" },
-    },
-  },
-  move = {
-    enable = true,
-    -- Whether to set jumps in the jumplist
-    set_jumps = true,
-    goto_next_start = {
-      ["]a"] = { query = "@parameter.outer", desc = "Goto next start outer parameter" },
-      ["]i"] = { query = "@conditional.outer", desc = "Goto next start outer conditional" },
-      ["]l"] = { query = "@loop.outer", desc = "Goto next start outer loop" },
-      ["]f"] = { query = "@call.outer", desc = "Goto next start outer call" },
-      ["]m"] = { query = "@function.outer", desc = "Goto next start outer function" },
-      ["]k"] = { query = "@class.outer", desc = "Goto next start outer class" },
-      ["]c"] = { query = "@comment.outer", desc = "Goto next start outer comment" },
-    },
-    goto_next_end = {
-      ["]A"] = { query = "@parameter.outer", desc = "Goto next end outer parameter" },
-      ["]I"] = { query = "@conditional.outer", desc = "Goto next end outer conditional" },
-      ["]L"] = { query = "@loop.outer", desc = "Goto next end outer loop" },
-      ["]F"] = { query = "@call.outer", desc = "Goto next end outer call" },
-      ["]M"] = { query = "@function.outer", desc = "Goto next end outer function" },
-      ["]K"] = { query = "@class.outer", desc = "Goto next end outer class" },
-      ["]C"] = { query = "@comment.outer", desc = "Goto next end outer comment" },
-    },
-    goto_previous_start = {
-      ["[a"] = { query = "@parameter.outer", desc = "Goto previous start outer parameter" },
-      ["[i"] = { query = "@conditional.outer", desc = "Goto previous start outer conditional" },
-      ["[l"] = { query = "@loop.outer", desc = "Goto previous start outer loop" },
-      ["[f"] = { query = "@call.outer", desc = "Goto previous start outer call" },
-      ["[m"] = { query = "@function.outer", desc = "Goto previous start outer function" },
-      ["[k"] = { query = "@class.outer", desc = "Goto previous start outer class" },
-      ["[c"] = { query = "@comment.outer", desc = "Goto previous start outer comment" },
-    },
-    goto_previous_end = {
-      ["[A"] = { query = "@parameter.outer", desc = "Goto previous end outer parameter" },
-      ["[I"] = { query = "@conditional.outer", desc = "Goto previous end outer conditional" },
-      ["[L"] = { query = "@loop.outer", desc = "Goto previous end outer loop" },
-      ["[F"] = { query = "@call.outer", desc = "Goto previous end outer call" },
-      ["[M"] = { query = "@function.outer", desc = "Goto previous end outer function" },
-      ["[K"] = { query = "@class.outer", desc = "Goto previous end outer class" },
-      ["[C"] = { query = "@comment.outer", desc = "Goto previous end outer comment" },
-    },
-  },
-
-  swap = {
-    enable = true,
-
-    swap_next = {
-      ["<leader>na"] = { query = "@parameter.inner", desc = "Swap with next inner parameter" },
-      ["<leader>ni"] = { query = "@conditional.outer", desc = "Swap with next outer conditional" },
-      ["<leader>nl"] = { query = "@loop.outer", desc = "Swap with next outer loop" },
-      ["<leader>nf"] = { query = "@call.outer", desc = "Swap with next outer call" },
-      ["<leader>nm"] = { query = "@function.outer", desc = "Swap with next outer function" },
-      ["<leader>nk"] = { query = "@class.outer", desc = "Swap with next outer class" },
-      ["<leader>nc"] = { query = "@comment.outer", desc = "Swap with next outer comment" },
-
-      ["<leader>nA"] = { query = "@parameter.outer", desc = "Swap with next outer parameter" },
-      ["<leader>nI"] = { query = "@conditional.inner", desc = "Swap with next inner conditional" },
-      ["<leader>nL"] = { query = "@loop.inner", desc = "Swap with next inner loop" },
-      ["<leader>nF"] = { query = "@call.inner", desc = "Swap with next inner call" },
-      ["<leader>nM"] = { query = "@function.inner", desc = "Swap with next inner function" },
-      ["<leader>nK"] = { query = "@class.inner", desc = "Swap with next inner class" },
-      ["<leader>nC"] = { query = "@comment.inner", desc = "Swap with next inner comment" },
-    },
-    swap_previous = {
-      ["<leader>pa"] = { query = "@parameter.inner", desc = "Swap with previous inner parameter" },
-      ["<leader>pi"] = { query = "@conditional.outer", desc = "Swap with previous outer conditional" },
-      ["<leader>pl"] = { query = "@loop.outer", desc = "Swap with previous outer loop" },
-      ["<leader>pf"] = { query = "@call.outer", desc = "Swap with previous outer call" },
-      ["<leader>pm"] = { query = "@function.outer", desc = "Swap with previous outer function" },
-      ["<leader>pk"] = { query = "@class.outer", desc = "Swap with previous outer class" },
-      ["<leader>pc"] = { query = "@comment.outer", desc = "Swap with previous outer comment" },
-
-      ["<leader>pA"] = { query = "@parameter.outer", desc = "Swap with previous outer parameter" },
-      ["<leader>pI"] = { query = "@conditional.inner", desc = "Swap with previous inner conditional" },
-      ["<leader>pL"] = { query = "@loop.inner", desc = "Swap with previous inner loop" },
-      ["<leader>pF"] = { query = "@call.inner", desc = "Swap with previous inner call" },
-      ["<leader>pM"] = { query = "@function.inner", desc = "Swap with previous inner function" },
-      ["<leader>pK"] = { query = "@class.inner", desc = "Swap with previous inner class" },
-      ["<leader>pC"] = { query = "@comment.inner", desc = "Swap with previous inner comment" },
-    },
-  }
-}
-
--- local ts_repeat_move = require "nvim-treesitter.textobjects.repeatable_move"
-
--- Repeat movement with ; and ,
--- vim.keymap.set({"n", "x", "o"}, ",", ts_repeat_move.repeat_last_move_next)
--- vim.keymap.set({"n", "x", "o"}, ",", ts_repeat_move.repeat_last_move_previous)
-
--- Optionnally, make builtin f, F, t, T also repeatable with ; and ,
--- vim.keymap.set({"n", "x", "o"}, "f", ts_repeat_move.builtin_f)
--- vim.keymap.set({"n", "x", "o"}, "F", ts_repeat_move.builtin_F)
--- vim.keymap.set({"n", "x", "o"}, "t", ts_repeat_move.builtin_t)
--- vim.keymap.set({"n", "x", "o"}, "T", ts_repeat_move.builtin_T)
-
-return M

lua/plugins/init.lua

@@ -3,35 +3,6 @@
 local default_plugins = {
 
   "nvim-lua/plenary.nvim",
-  "rebelot/kanagawa.nvim",
-  {
-    "iamcco/markdown-preview.nvim",
-    run = "cd app && npm install",
-    lazy = false,
-    setup = function()
-      vim.g.mkdp_filetypes = { "markdown" }
-    end,
-    ft = { "markdown" },
-  },
-  {"tpope/vim-fugitive", lazy=false},
-  {"rbong/vim-flog", lazy=false},
-  {"tpope/vim-surround", lazy=false},
-  {"tpope/vim-obsession", lazy=false},
-  {"preservim/tagbar", lazy=false},
-  {"ludovicchabant/vim-gutentags", lazy=false},
-  {"emaniacs/vim-rest-console", lazy=false},
-  {
-    "sindrets/diffview.nvim",
-    lazy=false,
-    opts = function()
-      return require "plugins.configs.diffview"
-    end,
-  },
-
-  {"nvim-telescope/telescope-fzf-native.nvim", build="make"},
-
-  -- nvchad plugins
-  { "NvChad/extensions", branch = "v2.0" },
 
   {
     "NvChad/base46",
@@ -45,13 +16,10 @@ local default_plugins = {
     "NvChad/ui",
     branch = "v2.0",
     lazy = false,
-    config = function()
-      require "nvchad_ui"
-    end,
   },
 
   {
-    "NvChad/nvterm",
+    "zbirenbaum/nvterm",
     init = function()
       require("core.utils").load_mappings "nvterm"
     end,
@@ -63,9 +31,7 @@ local default_plugins = {
 
   {
     "NvChad/nvim-colorizer.lua",
-    init = function()
+    event = "User FilePost",
-      require("core.utils").lazy_load "nvim-colorizer.lua"
-    end,
     config = function(_, opts)
       require("colorizer").setup(opts)
 
@@ -79,7 +45,7 @@ local default_plugins = {
   {
     "nvim-tree/nvim-web-devicons",
     opts = function()
-      return { override = require("nvchad_ui.icons").devicons }
+      return { override = require "nvchad.icons.devicons" }
     end,
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "devicons")
@@ -90,9 +56,7 @@ local default_plugins = {
   {
     "lukas-reineke/indent-blankline.nvim",
     version = "2.20.7",
-    init = function()
+    event = "User FilePost",
-      require("core.utils").lazy_load "indent-blankline.nvim"
-    end,
     opts = function()
       return require("plugins.configs.others").blankline
     end,
@@ -105,9 +69,7 @@ local default_plugins = {
 
   {
     "nvim-treesitter/nvim-treesitter",
-    init = function()
+    event = { "BufReadPost", "BufNewFile" },
-      require("core.utils").lazy_load "nvim-treesitter"
-    end,
     cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
     build = ":TSUpdate",
     opts = function()
@@ -119,35 +81,10 @@ local default_plugins = {
     end,
   },
 
-  {
-    "nvim-treesitter/nvim-treesitter-textobjects",
-    lazy = false,
-    config = function()
-      require("nvim-treesitter.configs").setup(
-        require("plugins.configs.treesitter_textobjects")
-      )
-    end,
-  },
-
   -- git stuff
   {
     "lewis6991/gitsigns.nvim",
-    ft = { "gitcommit", "diff" },
+    event = "User FilePost",
-    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.others").gitsigns
     end,
@@ -160,7 +97,7 @@ local default_plugins = {
   -- lsp stuff
   {
     "williamboman/mason.nvim",
-    cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUninstall", "MasonUninstallAll", "MasonLog" },
+    cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" },
     opts = function()
       return require "plugins.configs.mason"
     end,
@@ -170,7 +107,9 @@ 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, " "))
+        end
       end, {})
 
       vim.g.mason_binaries_list = opts.ensure_installed
@@ -179,9 +118,7 @@ local default_plugins = {
 
   {
     "neovim/nvim-lspconfig",
-    init = function()
+    event = "User FilePost",
-      require("core.utils").lazy_load "nvim-lspconfig"
-    end,
     config = function()
       require "plugins.configs.lspconfig"
     end,
@@ -237,113 +174,19 @@ local default_plugins = {
 
   {
     "numToStr/Comment.nvim",
-    keys = { "gcc", "gbc" },
+    keys = {
+      { "gcc", mode = "n", desc = "Comment toggle current line" },
+      { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" },
+      { "gc", mode = "x", desc = "Comment toggle linewise (visual)" },
+      { "gbc", mode = "n", desc = "Comment toggle current block" },
+      { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" },
+      { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
+    },
     init = function()
       require("core.utils").load_mappings "comment"
     end,
-    config = function()
+    config = function(_, opts)
-      require("Comment").setup()
+      require("Comment").setup(opts)
-    end,
-  },
-
-  -- Save and load macro / register
-  {
-    "desdic/macrothis.nvim",
-    opts = {},
-    keys = {
-      { "<Leader>kkd", function() require('macrothis').delete() end, desc = "Delete" },
-      { "<Leader>kke", function() require('macrothis').edit() end, desc = "Edit" },
-      { "<Leader>kkl", function() require('macrothis').load() end, desc = "Load" },
-      { "<Leader>kkn", function() require('macrothis').rename() end, desc = "Rename" },
-      { "<Leader>kkq", function() require('macrothis').quickfix() end, desc = "Run macro on all files in quickfix" },
-      { "<Leader>kkr", function() require('macrothis').run() end, desc = "Run macro" },
-      { "<Leader>kks", function() require('macrothis').save() end, desc = "Save" },
-      { "<Leader>kkx", function() require('macrothis').register() end, desc = "Edit register" },
-      { "<Leader>kkp", function() require('macrothis').copy_register_printable() end, desc = "Copy register as printable" },
-      { "<Leader>kkm", function() require('macrothis').copy_macro_printable() end, desc = "Copy macro as printable" },
-    }
-  },
-
-  {
-    "onsails/diaglist.nvim",
-    lazy=false,
-    debug=false,
-  },
-
-  {
-    "anuvyklack/hydra.nvim",
-    lazy=false,
-  },
-
-  {
-    "gioele/vim-autoswap",
-    lazy=false,
-  },
-
-  {
-    "natecraddock/workspaces.nvim",
-    lazy=false,
-
-    config = function()
-      require("workspaces").setup({
-        hooks = {
-          open = {"Telescope find_files"},
-        }
-      })
-    end,
-  },
-
-  {
-    "mangelozzi/rgflow.nvim",
-    lazy=false,
-
-    config = function()
-      require("rgflow").setup({
-        -- Set the default rip grep flags and options for when running a search via
-        -- RgFlow. Once changed via the UI, the previous search flags are used for 
-        -- each subsequent search (until Neovim restarts).
-        cmd_flags = "--smart-case --fixed-strings --ignore --max-columns 200",
-
-        -- Mappings to trigger RgFlow functions
-        default_trigger_mappings = true,
-        -- These mappings are only active when the RgFlow UI (panel) is open
-        default_ui_mappings = true,
-        -- QuickFix window only mapping
-        default_quickfix_mappings = true,
-      })
-    end,
-  },
-
-  {
-    "yorickpeterse/nvim-window",
-    lazy=false,
-    config = function()
-      require('nvim-window').setup({
-        normal_hl = 'Normal',
-        hint_hl = 'Bold',
-        border = 'single'
-      })
-    end,
-  },
-
-  {
-    "sindrets/winshift.nvim",
-    lazy=false,
-  },
-
-  {
-    "kdheepak/lazygit.nvim",
-    lazy=false,
-    config = function()
-      require("lazy").setup({
-        {
-          "kdheepak/lazygit.nvim",
-          -- optional for floating window border decoration
-          dependencies = {
-            "nvim-lua/plenary.nvim",
-          },
-        },
-      })
     end,
   },
 
@@ -360,12 +203,12 @@ local default_plugins = {
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "nvimtree")
       require("nvim-tree").setup(opts)
-      vim.g.nvimtree_side = opts.view.side
     end,
   },
 
   {
     "nvim-telescope/telescope.nvim",
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
     cmd = "Telescope",
     init = function()
       require("core.utils").load_mappings "telescope"
@@ -388,21 +231,16 @@ local default_plugins = {
   -- Only load whichkey after all the gui
   {
     "folke/which-key.nvim",
-    lazy=false,
+    keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
-    keys = { "<leader>", '"', "'", "`", "c", "v" },
     init = function()
       require("core.utils").load_mappings "whichkey"
     end,
+    cmd = "WhichKey",
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "whichkey")
       require("which-key").setup(opts)
     end,
   },
-  {
-    "ThePrimeagen/harpoon",
-    branch = "harpoon2",
-    dependencies = { "nvim-lua/plenary.nvim" }
-  },
 }
 
 local config = require("core.utils").load_config()
@@ -412,4 +250,3 @@ if #config.plugins > 0 then
 end
 
 require("lazy").setup(default_plugins, config.lazy_nvim)
-require "plugins.configs.ruff_lsp"