Merge branch 'v2.0' into p53

2024-04-03 16:12:53 +02:00
parent 8638342fa9 44a24e2fe5
commit 19c17b583b
13 changed files with 139 additions and 109 deletions
@@ -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,
-      select = false,
+      behavior = cmp.ConfirmBehavior.Insert,
+      select = true,
    },
    ["<Tab>"] = cmp.mapping(function(fallback)
      if cmp.visible() then
@@ -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,
@@ -51,12 +51,12 @@ end

 M.gitsigns = {
  signs = {
-    add = { hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr" },
-    change = { hl = "DiffChange", text = "│", numhl = "GitSignsChangeNr" },
-    delete = { hl = "DiffDelete", text = "󰍵", numhl = "GitSignsDeleteNr" },
-    topdelete = { hl = "DiffDelete", text = "‾", numhl = "GitSignsDeleteNr" },
-    changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
-    untracked = { hl = "GitSignsAdd", text = "│", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
+    add = { text = "│" },
+    change = { text = "│" },
+    delete = { text = "󰍵" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "~" },
+    untracked = { text = "│" },
  },
  on_attach = function(bufnr)
    utils.load_mappings("gitsigns", { buffer = bufnr })
@@ -1,5 +1,5 @@
 local options = {
-  ensure_installed = { "lua" },
+  ensure_installed = { "lua", "vim", "vimdoc" },

  highlight = {
    enable = true,
@@ -30,9 +30,6 @@ local default_plugins = {

  {"nvim-telescope/telescope-fzf-native.nvim", build="make"},

-  -- nvchad plugins
-  { "NvChad/extensions", branch = "v2.0" },
-
  {
    "NvChad/base46",
    branch = "v2.0",
@@ -45,13 +42,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 +57,7 @@ local default_plugins = {

  {
    "NvChad/nvim-colorizer.lua",
-    init = function()
-      require("core.utils").lazy_load "nvim-colorizer.lua"
-    end,
+    event = "User FilePost",
    config = function(_, opts)
      require("colorizer").setup(opts)

@@ -79,7 +71,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")
@@ -93,6 +85,7 @@ local default_plugins = {
    init = function()
      require("core.utils").lazy_load "indent-blankline.nvim"
    end,
+    event = "User FilePost",
    opts = function()
      return require("plugins.configs.others").blankline
    end,
@@ -105,9 +98,7 @@ local default_plugins = {

  {
    "nvim-treesitter/nvim-treesitter",
-    init = function()
-      require("core.utils").lazy_load "nvim-treesitter"
-    end,
+    event = { "BufReadPost", "BufNewFile" },
    cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
    build = ":TSUpdate",
    opts = function()
@@ -132,22 +123,7 @@ local default_plugins = {
  -- git stuff
  {
    "lewis6991/gitsigns.nvim",
-    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,
+    event = "User FilePost",
    opts = function()
      return require("plugins.configs.others").gitsigns
    end,
@@ -160,7 +136,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 +146,9 @@ local default_plugins = {

      -- custom nvchad cmd to install all mason binaries listed
      vim.api.nvim_create_user_command("MasonInstallAll", function()
-        vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " "))
+        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 +157,7 @@ local default_plugins = {

  {
    "neovim/nvim-lspconfig",
-    init = function()
-      require("core.utils").lazy_load "nvim-lspconfig"
-    end,
+    event = "User FilePost",
    config = function()
      require "plugins.configs.lspconfig"
    end,
@@ -237,12 +213,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()
-      require("Comment").setup()
+    config = function(_, opts)
+      require("Comment").setup(opts)
    end,
  },

@@ -360,12 +343,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"
@@ -389,10 +372,11 @@ local default_plugins = {
  {
    "folke/which-key.nvim",
    lazy=false,
-    keys = { "<leader>", '"', "'", "`", "c", "v" },
+    keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
    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)