From 6fc70290a7a5e02ca10192fea511596409303d45 Mon Sep 17 00:00:00 2001 From: Panos Sakkos Date: Sat, 13 Apr 2024 17:37:24 +0300 Subject: [PATCH] migrate to NvChad 2.5 --- .gitignore | 7 - stylua.toml => .stylua.toml | 0 README.md | 67 ++- configs/markdownlint.yaml | 4 - configs/prettier.yaml | 5 - init.lua | 44 +- lazy-lock.json | 23 +- lua/{custom => }/chadrc.lua | 22 +- lua/configs/conform.lua | 33 ++ .../lazy_nvim.lua => configs/lazy.lua} | 0 lua/configs/lint.lua | 17 + lua/{custom => }/configs/lspconfig.lua | 15 +- lua/core/bootstrap.lua | 62 --- lua/core/default_config.lua | 92 ---- lua/core/init.lua | 141 ------ lua/core/mappings.lua | 468 ------------------ lua/core/utils.lua | 118 ----- lua/custom/configs/none-ls.lua | 49 -- lua/custom/configs/utils.lua | 23 - lua/custom/mappings.lua | 151 ------ lua/custom/plugins/colorizer.lua | 10 - lua/custom/plugins/dap.lua | 6 - lua/custom/plugins/lspconfig.lua | 7 - lua/custom/plugins/none-ls.lua | 29 -- lua/custom/plugins/nvim-tree.lua | 23 - lua/custom/plugins/nvterm.lua | 12 - lua/mappings.lua | 115 +++++ lua/{custom/init.lua => options.lua} | 3 +- lua/{custom => }/plugins/cmp.lua | 0 lua/plugins/configs/cmp.lua | 120 ----- lua/plugins/configs/lspconfig.lua | 67 --- lua/plugins/configs/mason.lua | 28 -- lua/plugins/configs/nvimtree.lua | 77 --- lua/plugins/configs/others.lua | 66 --- lua/plugins/configs/telescope.lua | 54 -- lua/plugins/configs/treesitter.lua | 12 - lua/plugins/conform.lua | 7 + lua/{custom => }/plugins/copilot-cmp.lua | 0 lua/{custom => }/plugins/copilot.lua | 0 lua/{custom => }/plugins/dap-go.lua | 1 - lua/{custom => }/plugins/dap-python.lua | 1 - lua/{custom => }/plugins/dap-ui.lua | 0 lua/plugins/dap.lua | 3 + lua/{custom => }/plugins/gitsigns.lua | 0 lua/plugins/init.lua | 252 ---------- lua/plugins/lint.lua | 7 + lua/plugins/lspconfig.lua | 7 + lua/{custom => }/plugins/markdown-preview.lua | 0 lua/{custom => }/plugins/mason.lua | 0 lua/plugins/tree.lua | 4 + lua/{custom => }/plugins/treesitter.lua | 1 + 51 files changed, 286 insertions(+), 1967 deletions(-) rename stylua.toml => .stylua.toml (100%) delete mode 100644 configs/markdownlint.yaml delete mode 100644 configs/prettier.yaml rename lua/{custom => }/chadrc.lua (57%) create mode 100644 lua/configs/conform.lua rename lua/{plugins/configs/lazy_nvim.lua => configs/lazy.lua} (100%) create mode 100644 lua/configs/lint.lua rename lua/{custom => }/configs/lspconfig.lua (81%) delete mode 100644 lua/core/bootstrap.lua delete mode 100644 lua/core/default_config.lua delete mode 100644 lua/core/init.lua delete mode 100644 lua/core/mappings.lua delete mode 100644 lua/core/utils.lua delete mode 100644 lua/custom/configs/none-ls.lua delete mode 100644 lua/custom/configs/utils.lua delete mode 100644 lua/custom/mappings.lua delete mode 100644 lua/custom/plugins/colorizer.lua delete mode 100644 lua/custom/plugins/dap.lua delete mode 100644 lua/custom/plugins/lspconfig.lua delete mode 100644 lua/custom/plugins/none-ls.lua delete mode 100644 lua/custom/plugins/nvim-tree.lua delete mode 100644 lua/custom/plugins/nvterm.lua create mode 100644 lua/mappings.lua rename lua/{custom/init.lua => options.lua} (89%) rename lua/{custom => }/plugins/cmp.lua (100%) delete mode 100644 lua/plugins/configs/cmp.lua delete mode 100644 lua/plugins/configs/lspconfig.lua delete mode 100644 lua/plugins/configs/mason.lua delete mode 100644 lua/plugins/configs/nvimtree.lua delete mode 100644 lua/plugins/configs/others.lua delete mode 100644 lua/plugins/configs/telescope.lua delete mode 100644 lua/plugins/configs/treesitter.lua create mode 100644 lua/plugins/conform.lua rename lua/{custom => }/plugins/copilot-cmp.lua (100%) rename lua/{custom => }/plugins/copilot.lua (100%) rename lua/{custom => }/plugins/dap-go.lua (80%) rename lua/{custom => }/plugins/dap-python.lua (84%) rename lua/{custom => }/plugins/dap-ui.lua (100%) create mode 100644 lua/plugins/dap.lua rename lua/{custom => }/plugins/gitsigns.lua (100%) delete mode 100644 lua/plugins/init.lua create mode 100644 lua/plugins/lint.lua create mode 100644 lua/plugins/lspconfig.lua rename lua/{custom => }/plugins/markdown-preview.lua (100%) rename lua/{custom => }/plugins/mason.lua (100%) create mode 100644 lua/plugins/tree.lua rename lua/{custom => }/plugins/treesitter.lua (98%) diff --git a/.gitignore b/.gitignore index 9e6991b6fe..79b5594df7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -plugin -spell -ftplugin -syntax -coc-settings.json -.luarc.json -after **/.DS_Store diff --git a/stylua.toml b/.stylua.toml similarity index 100% rename from stylua.toml rename to .stylua.toml diff --git a/README.md b/README.md index 3f6b872c84..31aab57819 100644 --- a/README.md +++ b/README.md @@ -50,55 +50,54 @@ rm -rf ~/.config/nvim rm -rf ~/.local/share/nvim ``` -Install config: +Download the config and install the dependencies: ```sh -git clone https://github.com/le4ker/NvMegaChad ~/.config/nvim/ -nvim +git clone https://github.com/le4ker/NvMegaChad ~/.config/nvim && nvim ``` ## Language Servers -- bash-language-server -- clangd -- css-lsp -- dockerfile-language-server -- gopls -- html-lsp -- lua-language-server -- marksman -- pyright -- ruby-lsp -- taplo -- terraform-ls -- typescript-language-server -- vim-language-server -- yaml-language-server +- [bash-language-server](https://github.com/bash-lsp/bash-language-server) +- [clangd](https://clangd.llvm.org) +- [css-lsp](https://github.com/microsoft/vscode-css-languageservice) +- [dockerfile-language-server](https://github.com/rcjsuen/dockerfile-language-server-nodejs) +- [gopls](https://pkg.go.dev/golang.org/x/tools/gopls) +- [html-lsp](https://github.com/microsoft/vscode-html-languageservice) +- [lua-language-server](https://github.com/LuaLS/lua-language-server) +- [marksman](https://github.com/artempyanykh/marksman) +- [pyright](https://github.com/microsoft/pyright) +- [ruby-lsp](https://github.com/Shopify/ruby-lsp) +- [taplo](https://taplo.tamasfe.dev/) +- [terraform-ls](https://github.com/hashicorp/terraform-ls) +- [typescript-language-server](https://github.com/typescript-language-server/typescript-language-server) +- [vim-language-server](https://github.com/iamcco/vim-language-server) +- [yaml-language-server](https://github.com/redhat-developer/yaml-language-server) ## Formatters -- black -- clang-format -- gofmt -- isort -- prettier -- rubocop -- shfmt -- stylua -- terraform_fmt +- [black](https://github.com/psf/black) +- [clang-format](https://www.kernel.org/doc/html/latest/process/clang-format.html) +- [gofmt](https://pkg.go.dev/cmd/gofmt) +- [isort](https://github.com/PyCQA/isort) +- [prettier](https://github.com/prettier/prettier) +- [rubocop](https://github.com/rubocop/rubocop) +- [shfmt](https://github.com/mvdan/sh) +- [stylua](https://github.com/JohnnyMorganz/StyLua) +- [terraform_fmt](https://developer.hashicorp.com/terraform/cli/commands/fmt) ## Linters -- golangci-lint -- markdownlint -- pylint -- rubocop -- tflint +- [golangci-lint](https://golangci-lint.run/) +- [markdownlint](https://github.com/DavidAnson/markdownlint) +- [pylint](https://pylint.org/) +- [rubocop](https://github.com/rubocop/rubocop) +- [tflint](https://github.com/terraform-linters/tflint) ## Debuggers -- delve -- debugpy +- [delve](https://github.com/go-delve/delve) +- [debugpy](https://github.com/microsoft/debugpy) ## Fetching upstream changes diff --git a/configs/markdownlint.yaml b/configs/markdownlint.yaml deleted file mode 100644 index 8641279b47..0000000000 --- a/configs/markdownlint.yaml +++ /dev/null @@ -1,4 +0,0 @@ -MD013: - tables: false - code_blocks: false - line_length: 100 diff --git a/configs/prettier.yaml b/configs/prettier.yaml deleted file mode 100644 index 20c26bc30a..0000000000 --- a/configs/prettier.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - - files: "*.md" - options: - tabWidth: 2 - proseWrap: always diff --git a/init.lua b/init.lua index 21f0b6f73a..1152335b13 100644 --- a/init.lua +++ b/init.lua @@ -1,21 +1,39 @@ -require "core" +vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" +vim.g.mapleader = " " -local custom_init_path = vim.api.nvim_get_runtime_file("lua/custom/init.lua", false)[1] +-- bootstrap lazy and all plugins +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -if custom_init_path then - dofile(custom_init_path) +if not vim.loop.fs_stat(lazypath) then + local repo = "https://github.com/folke/lazy.nvim.git" + vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } end -require("core.utils").load_mappings() +vim.opt.rtp:prepend(lazypath) -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" +local lazy_config = require "configs.lazy" --- bootstrap lazy.nvim! -if not vim.loop.fs_stat(lazypath) then - require("core.bootstrap").gen_chadrc_template() - require("core.bootstrap").lazy(lazypath) -end +-- load plugins +require("lazy").setup({ + { + "NvChad/NvChad", + lazy = false, + branch = "v2.5", + import = "nvchad.plugins", + config = function() + require "options" + end, + }, + + { import = "plugins" }, +}, lazy_config) +-- load theme dofile(vim.g.base46_cache .. "defaults") -vim.opt.rtp:prepend(lazypath) -require "plugins" +dofile(vim.g.base46_cache .. "statusline") + +require "nvchad.autocmds" + +vim.schedule(function() + require "mappings" +end) diff --git a/lazy-lock.json b/lazy-lock.json index dcc326c990..a4be6b71a0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,36 +1,37 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "be7be2ca7f55bb881a7ffc16b2efa5af034ab06b" }, - "base46": { "branch": "v2.0", "commit": "36a44bf1c712a42b46479540ee89e296c6c63cdc" }, + "NvChad": { "branch": "v2.5", "commit": "0b1f669caa312ca11be79b3833296d1271bf4c75" }, + "base46": { "branch": "v2.5", "commit": "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "820eec990d5f332d30cf939954c8672a43a0459e" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "1a50b94066def8591d5f65bd60a4233902e9def4" }, - "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" }, + "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "none-ls.nvim": { "branch": "main", "commit": "dca7ddec321a102ec9e792b1b29193702aff5fbb" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-go": { "branch": "main", "commit": "36abe1d320cb61bfdf094d4e0fe815ef58f2302a" }, - "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, + "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-lspconfig": { "branch": "master", "commit": "b94a4c2ff309e232cfacdf8fc7658bd93919a770" }, + "nvim-lint": { "branch": "master", "commit": "4055dc856d5ac8f6b85748006fd8fa6457e086e8" }, + "nvim-lspconfig": { "branch": "master", "commit": "9266dc26862d8f3556c2ca77602e811472b4c5b8" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" }, - "nvim-treesitter": { "branch": "master", "commit": "e9321bb914b3a5a88b7dff5392f0f5f8d83bee67" }, - "nvim-web-devicons": { "branch": "master", "commit": "fd4abfc5237246670977972c6f518186b621a32d" }, - "nvterm": { "branch": "main", "commit": "9d7ba3b6e368243175d38e1ec956e0476fd86ed9" }, + "nvim-treesitter": { "branch": "master", "commit": "2a95ff14764af20d32ec1edb27e11c38a84b9478" }, + "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "telescope.nvim": { "branch": "master", "commit": "d26b666b45e5dde23332e4bde1227677f2d92e31" }, - "ui": { "branch": "v2.0", "commit": "7b3225264af17a9e0aff0b4fd2a0fac90b73db53" }, + "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, + "ui": { "branch": "v2.5", "commit": "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/custom/chadrc.lua b/lua/chadrc.lua similarity index 57% rename from lua/custom/chadrc.lua rename to lua/chadrc.lua index fc929a5c11..530d0c54bf 100644 --- a/lua/custom/chadrc.lua +++ b/lua/chadrc.lua @@ -1,13 +1,13 @@ ---@type ChadrcConfig local M = {} -local function LSP_status() +local function lsp() if rawget(vim, "lsp") then for _, client in ipairs(vim.lsp.get_active_clients()) do local stbufnr = vim.api.nvim_win_get_buf(vim.g.statusline_winid) - -- ignore copilot and null-ls clients - if client.attached_buffers[stbufnr] and client.name ~= "copilot" and client.name ~= "null-ls" then + -- ignore copilot + if client.attached_buffers[stbufnr] and client.name ~= "copilot" then return (vim.o.columns > 100 and "%#St_LspStatus#" .. "  LSP ~ " .. client.name .. " ") or "  LSP " end end @@ -15,21 +15,17 @@ local function LSP_status() end M.ui = { - theme = "everforest", + theme = "everforest_light", tabufline = { - overriden_modules = function(modules) - table.remove(modules, 4) - end, + order = { "treeOffset", "buffers", "tabs" }, }, statusline = { + theme = "minimal", separator_style = "block", - overriden_modules = function(modules) - modules[8] = LSP_status() or "" - end, + modules = { + lsp = lsp, + }, }, } -M.plugins = "custom.plugins" -M.mappings = require "custom.mappings" - return M diff --git a/lua/configs/conform.lua b/lua/configs/conform.lua new file mode 100644 index 0000000000..f09f285843 --- /dev/null +++ b/lua/configs/conform.lua @@ -0,0 +1,33 @@ +local options = { + formatters_by_ft = { + c = { "clangd-format" }, + cpp = { "clangd-format" }, + css = { "prettier" }, + go = { "goimports", "gofmt" }, + graphql = { "prettier" }, + html = { "prettier" }, + javascript = { "prettier" }, + javascriptreact = { "prettier" }, + json = { "prettier" }, + lua = { "stylua" }, + markdown = { "prettier" }, + python = { "isort", "black" }, + scss = { "prettier" }, + sh = { "shfmt" }, + ruby = { "rubocop" }, + terraform = { "terraform_fmt" }, + toml = { "taplo" }, + typescript = { "prettier" }, + typercriptreact = { "prettier" }, + yaml = { "prettier" }, + zsh = { "shfmt" }, + }, + + format_on_save = { + lsp_fallback = true, + async = false, + timeout_ms = 500, + }, +} + +require("conform").setup(options) diff --git a/lua/plugins/configs/lazy_nvim.lua b/lua/configs/lazy.lua similarity index 100% rename from lua/plugins/configs/lazy_nvim.lua rename to lua/configs/lazy.lua diff --git a/lua/configs/lint.lua b/lua/configs/lint.lua new file mode 100644 index 0000000000..be0495485a --- /dev/null +++ b/lua/configs/lint.lua @@ -0,0 +1,17 @@ +local lint = require "lint" + +lint.linters_by_ft = { + go = { "golangcilint" }, + markdown = { "markdownlint" }, + python = { "pylint" }, + ruby = { "rubocop" }, + terraform = { "tflint" }, +} + +local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) +vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave", "TextChanged" }, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, +}) diff --git a/lua/custom/configs/lspconfig.lua b/lua/configs/lspconfig.lua similarity index 81% rename from lua/custom/configs/lspconfig.lua rename to lua/configs/lspconfig.lua index c14eecf6a8..4a08e83c10 100644 --- a/lua/custom/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -6,7 +6,8 @@ local default_servers = { "dockerls", "html", "marksman", - "ruby_ls", + "ruby_lsp", + "taplo", "terraformls", "tflint", "tsserver", @@ -14,23 +15,17 @@ local default_servers = { } local lspconfig = require "lspconfig" -local on_attach = require("plugins.configs.lspconfig").on_attach -local capabilities = require("plugins.configs.lspconfig").capabilities +local on_attach = require("nvchad.configs.lspconfig").on_attach +local capabilities = require("nvchad.configs.lspconfig").capabilities for _, lsp in ipairs(default_servers) do + ---@diagnostic disable-next-line: undefined-field lspconfig[lsp].setup { on_attach = on_attach, capabilities = capabilities, } end -local format_on_save = require("custom.configs.utils").format_on_save - -lspconfig.taplo.setup { - on_attach = lspconfig.util.add_hook_after(on_attach, format_on_save), - capabilities = capabilities, -} - lspconfig.gopls.setup { on_attach = on_attach, capabilities = capabilities, diff --git a/lua/core/bootstrap.lua b/lua/core/bootstrap.lua deleted file mode 100644 index a5d5c68bfe..0000000000 --- a/lua/core/bootstrap.lua +++ /dev/null @@ -1,62 +0,0 @@ -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 = fn.stdpath "data" .. "/lazy/base46" - - M.echo " Compiling base46 theme to bytecode ..." - - local base46_repo = "https://github.com/NvChad/base46" - shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path } - vim.opt.rtp:prepend(lazy_path) - - require("base46").compile() - - --------- lazy.nvim --------------- - M.echo " Installing lazy.nvim & plugins ..." - local repo = "https://github.com/folke/lazy.nvim.git" - 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_bootstrap screen - require "nvchad.post_install"() -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): " - - if input:lower() == "y" then - M.echo "Cloning example custom config repo..." - shell_call { "git", "clone", "--depth", "1", "https://github.com/NvChad/example_config", path } - fn.delete(path .. "/.git", "rf") - else - -- use very minimal chadrc - fn.mkdir(path, "p") - - local file = io.open(path .. "/chadrc.lua", "w") - if file then - file:write "---@type ChadrcConfig\nlocal M = {}\n\nM.ui = { theme = 'onedark' }\n\nreturn M" - file:close() - end - end - end -end - -return M diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua deleted file mode 100644 index 639916a819..0000000000 --- a/lua/core/default_config.lua +++ /dev/null @@ -1,92 +0,0 @@ -local M = {} - -M.options = { - nvchad_branch = "v2.0", -} - -M.ui = { - ------------------------------- base46 ------------------------------------- - -- hl = highlights - hl_add = {}, - hl_override = {}, - changed_themes = {}, - 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 - - ------------------------------- 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, - }, - - -- lazyload it when there are 1+ buffers - tabufline = { - show_numbers = false, - enabled = true, - lazyload = true, - overriden_modules = nil, - }, - - -- nvdash (dashboard) - nvdash = { - load_on_startup = false, - - header = { - " ▄ ▄ ", - " ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ", - " █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ", - " ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ", - " ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ", - " █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄", - "▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █", - "█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █", - " █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ", - }, - - buttons = { - { " Find File", "Spc f f", "Telescope find_files" }, - { "󰈚 Recent Files", "Spc f o", "Telescope oldfiles" }, - { "󰈭 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" }, - }, - }, - - cheatsheet = { theme = "grid" }, -- simple/grid - - lsp = { - -- show function signatures i.e args as you type - signature = { - disabled = false, - silent = true, -- silences 'no signature help available' message from appearing - }, - }, -} - -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 = require "core.mappings" - -return M diff --git a/lua/core/init.lua b/lua/core/init.lua deleted file mode 100644 index 9555ba563a..0000000000 --- a/lua/core/init.lua +++ /dev/null @@ -1,141 +0,0 @@ -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 -opt.showmode = false - -opt.clipboard = "unnamedplus" -opt.cursorline = true - --- Indenting -opt.expandtab = true -opt.shiftwidth = 2 -opt.smartindent = true -opt.tabstop = 2 -opt.softtabstop = 2 - -opt.fillchars = { eob = " " } -opt.ignorecase = true -opt.smartcase = true -opt.mouse = "a" - --- Numbers -opt.number = true -opt.numberwidth = 2 -opt.ruler = false - --- disable nvim intro -opt.shortmess:append "sI" - -opt.signcolumn = "yes" -opt.splitbelow = true -opt.splitright = true -opt.termguicolors = true -opt.timeoutlen = 400 -opt.undofile = true - --- interval for writing swap file to disk, also used by gitsigns -opt.updatetime = 250 - --- go to previous/next line with h,l,left arrow and right arrow --- when cursor reaches end/beginning of line -opt.whichwrap:append "<>[]hl" - -g.mapleader = " " - --- disable some default providers -for _, provider in ipairs { "node", "perl", "python3", "ruby" } do - vim.g["loaded_" .. provider .. "_provider"] = 0 -end - --- add binaries installed by mason.nvim to path -local is_windows = vim.loop.os_uname().sysname == "Windows_NT" -vim.env.PATH = vim.fn.stdpath "data" .. "/mason/bin" .. (is_windows and ";" or ":") .. vim.env.PATH - --------------------------------------- autocmds ------------------------------------------ -local autocmd = vim.api.nvim_create_autocmd - --- dont list quickfix buffers -autocmd("FileType", { - pattern = "qf", - callback = function() - vim.opt_local.buflisted = false - end, -}) - --- reload some chadrc options on-save -autocmd("BufWritePost", { - pattern = vim.tbl_map(function(path) - return vim.fs.normalize(vim.loop.fs_realpath(path)) - end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)), - group = vim.api.nvim_create_augroup("ReloadNvChad", {}), - - callback = function(opts) - local fp = vim.fn.fnamemodify(vim.fs.normalize(vim.api.nvim_buf_get_name(opts.buf)), ":r") --[[@as string]] - 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 "base46" - require("plenary.reload").reload_module(module) - require("plenary.reload").reload_module "custom.chadrc" - - config = require("core.utils").load_config() - - vim.g.nvchad_theme = config.ui.theme - vim.g.transparency = config.ui.transparency - - -- statusline - require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme) - 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.updater"() -end, {}) diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua deleted file mode 100644 index 0a652a7914..0000000000 --- a/lua/core/mappings.lua +++ /dev/null @@ -1,468 +0,0 @@ --- n, v, i, t = mode names - -local M = {} - -M.general = { - i = { - -- go to beginning and end - [""] = { "^i", "Beginning of line" }, - [""] = { "", "End of line" }, - - -- navigate within insert mode - [""] = { "", "Move left" }, - [""] = { "", "Move right" }, - [""] = { "", "Move down" }, - [""] = { "", "Move up" }, - }, - - n = { - [""] = { " noh ", "Clear highlights" }, - -- switch between windows - [""] = { "h", "Window left" }, - [""] = { "l", "Window right" }, - [""] = { "j", "Window down" }, - [""] = { "k", "Window up" }, - - -- save - [""] = { " w ", "Save file" }, - - -- Copy all - [""] = { " %y+ ", "Copy whole file" }, - - -- line numbers - ["n"] = { " set nu! ", "Toggle line number" }, - ["rn"] = { " set rnu! ", "Toggle relative number" }, - - -- Allow moving the cursor through wrapped lines with j, k, and - -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/ - -- empty mode is same as using :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 } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - - -- new buffer - ["b"] = { " enew ", "New buffer" }, - ["ch"] = { " NvCheatsheet ", "Mapping cheatsheet" }, - - ["fm"] = { - function() - vim.lsp.buf.format { async = true } - end, - "LSP formatting", - }, - }, - - t = { - [""] = { vim.api.nvim_replace_termcodes("", true, true, true), "Escape terminal mode" }, - }, - - v = { - [""] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - ["<"] = { ""] = { ">gv", "Indent line" }, - }, - - x = { - ["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 } }, - -- 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 - ["p"] = { 'p:let @+=@0:let @"=@0', "Dont copy replaced text", opts = { silent = true } }, - }, -} - -M.tabufline = { - plugin = true, - - n = { - -- cycle through buffers - [""] = { - function() - require("nvchad.tabufline").tabuflineNext() - end, - "Goto next buffer", - }, - - [""] = { - function() - require("nvchad.tabufline").tabuflinePrev() - end, - "Goto prev buffer", - }, - - -- close buffer + hide terminal buffer - ["x"] = { - function() - require("nvchad.tabufline").close_buffer() - end, - "Close buffer", - }, - }, -} - -M.comment = { - plugin = true, - - -- toggle comment in both modes - n = { - ["/"] = { - function() - require("Comment.api").toggle.linewise.current() - end, - "Toggle comment", - }, - }, - - v = { - ["/"] = { - "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", - "Toggle comment", - }, - }, -} - -M.lspconfig = { - plugin = true, - - -- See ` :help vim.lsp.*` for documentation on any of the below functions - - n = { - ["gD"] = { - function() - vim.lsp.buf.declaration() - end, - "LSP declaration", - }, - - ["gd"] = { - function() - vim.lsp.buf.definition() - end, - "LSP definition", - }, - - ["K"] = { - function() - vim.lsp.buf.hover() - end, - "LSP hover", - }, - - ["gi"] = { - function() - vim.lsp.buf.implementation() - end, - "LSP implementation", - }, - - ["ls"] = { - function() - vim.lsp.buf.signature_help() - end, - "LSP signature help", - }, - - ["D"] = { - function() - vim.lsp.buf.type_definition() - end, - "LSP definition type", - }, - - ["ra"] = { - function() - require("nvchad.renamer").open() - end, - "LSP rename", - }, - - ["ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP code action", - }, - - ["gr"] = { - function() - vim.lsp.buf.references() - end, - "LSP references", - }, - - ["lf"] = { - 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", - }, - - ["q"] = { - function() - vim.diagnostic.setloclist() - end, - "Diagnostic setloclist", - }, - - ["wa"] = { - function() - vim.lsp.buf.add_workspace_folder() - end, - "Add workspace folder", - }, - - ["wr"] = { - function() - vim.lsp.buf.remove_workspace_folder() - end, - "Remove workspace folder", - }, - - ["wl"] = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, - "List workspace folders", - }, - }, - - v = { - ["ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP code action", - }, - }, -} - -M.nvimtree = { - plugin = true, - - n = { - -- toggle - [""] = { " NvimTreeToggle ", "Toggle nvimtree" }, - - -- focus - ["e"] = { " NvimTreeFocus ", "Focus nvimtree" }, - }, -} - -M.telescope = { - plugin = true, - - n = { - -- find - ["ff"] = { " Telescope find_files ", "Find files" }, - ["fa"] = { " Telescope find_files follow=true no_ignore=true hidden=true ", "Find all" }, - ["fw"] = { " Telescope live_grep ", "Live grep" }, - ["fb"] = { " Telescope buffers ", "Find buffers" }, - ["fh"] = { " Telescope help_tags ", "Help page" }, - ["fo"] = { " Telescope oldfiles ", "Find oldfiles" }, - ["fz"] = { " Telescope current_buffer_fuzzy_find ", "Find in current buffer" }, - - -- git - ["cm"] = { " Telescope git_commits ", "Git commits" }, - ["gt"] = { " Telescope git_status ", "Git status" }, - - -- pick a hidden term - ["pt"] = { " Telescope terms ", "Pick hidden term" }, - - -- theme switcher - ["th"] = { " Telescope themes ", "Nvchad themes" }, - - ["ma"] = { " Telescope marks ", "telescope bookmarks" }, - }, -} - -M.nvterm = { - plugin = true, - - t = { - -- toggle in terminal mode - [""] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle floating term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle horizontal term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle vertical term", - }, - }, - - n = { - -- toggle in normal mode - [""] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle floating term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle horizontal term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle vertical term", - }, - - -- new - ["h"] = { - function() - require("nvterm.terminal").new "horizontal" - end, - "New horizontal term", - }, - - ["v"] = { - function() - require("nvterm.terminal").new "vertical" - end, - "New vertical term", - }, - }, -} - -M.whichkey = { - plugin = true, - - n = { - ["wK"] = { - function() - vim.cmd "WhichKey" - end, - "Which-key all keymaps", - }, - ["wk"] = { - function() - local input = vim.fn.input "WhichKey: " - vim.cmd("WhichKey " .. input) - end, - "Which-key query lookup", - }, - }, -} - -M.blankline = { - plugin = true, - - n = { - ["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 "" - 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 "" - end, - "Jump to prev hunk", - opts = { expr = true }, - }, - - -- Actions - ["rh"] = { - function() - require("gitsigns").reset_hunk() - end, - "Reset hunk", - }, - - ["ph"] = { - function() - require("gitsigns").preview_hunk() - end, - "Preview hunk", - }, - - ["gb"] = { - function() - package.loaded.gitsigns.blame_line() - end, - "Blame line", - }, - - ["td"] = { - function() - require("gitsigns").toggle_deleted() - end, - "Toggle deleted", - }, - }, -} - -return M diff --git a/lua/core/utils.lua b/lua/core/utils.lua deleted file mode 100644 index 8b2a03d51b..0000000000 --- a/lua/core/utils.lua +++ /dev/null @@ -1,118 +0,0 @@ -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 diff --git a/lua/custom/configs/none-ls.lua b/lua/custom/configs/none-ls.lua deleted file mode 100644 index f068c410d5..0000000000 --- a/lua/custom/configs/none-ls.lua +++ /dev/null @@ -1,49 +0,0 @@ -local null_ls = require "null-ls" -local format_on_save = require("custom.configs.utils").format_on_save - -local opts = { - sources = { - null_ls.builtins.diagnostics.golangci_lint, - null_ls.builtins.diagnostics.markdownlint.with { - extra_args = { - "--config", - vim.fn.expand "~/.config/nvim/configs/markdownlint.yaml", - }, - }, - null_ls.builtins.diagnostics.pylint, - null_ls.builtins.diagnostics.rubocop, - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.clang_format, - null_ls.builtins.formatting.gofmt, - null_ls.builtins.formatting.goimports, - null_ls.builtins.formatting.isort, - null_ls.builtins.formatting.prettier.with { - filetypes = { - "css", - "graphql", - "html", - "javascript", - "javascriptreact", - "json", - "markdown", - "scss", - "typescript", - "typescriptreact", - "yaml", - }, - extra_args = { - "--config", - vim.fn.expand "~/.config/nvim/configs/prettier.yaml", - }, - }, - null_ls.builtins.formatting.rubocop, - null_ls.builtins.formatting.shfmt.with { - filetypes = { "sh", "zsh" }, - }, - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.terraform_fmt, - }, - on_attach = format_on_save, -} - -return opts diff --git a/lua/custom/configs/utils.lua b/lua/custom/configs/utils.lua deleted file mode 100644 index 8a3667ae2a..0000000000 --- a/lua/custom/configs/utils.lua +++ /dev/null @@ -1,23 +0,0 @@ -local M = {} - -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - -M.format_on_save = function(client, bufnr) - if client.supports_method "textDocument/formatting" then - vim.api.nvim_clear_autocmds { - group = augroup, - buffer = bufnr, - } - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - if vim.g.format_on_save then - vim.lsp.buf.format { bufnr = bufnr } - end - end, - }) - end -end - -return M diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua deleted file mode 100644 index a7ffc6c812..0000000000 --- a/lua/custom/mappings.lua +++ /dev/null @@ -1,151 +0,0 @@ ----@type MappingsTable -local M = {} - --- Disabled NvChad core mappings - -M.disabled = { - i = { - [""] = "", - [""] = "", - }, - - t = { - [""] = "", - [""] = "", - [""] = "", - [""] = "", - }, - - v = { - [""] = "", - [""] = "", - }, - - n = { - [""] = "", - [""] = "", - [""] = "", - ["fh"] = "", - ["th"] = "", - ["ma"] = "", - ["fo"] = "", - ["fz"] = "", - [""] = "", - [""] = "", - [""] = "", - ["v"] = "", - ["wK"] = "", - ["wk"] = "", - ["cc"] = "", - ["]c"] = "", - ["[c"] = "", - ["rh"] = "", - ["ph"] = "", - ["gb"] = "", - ["td"] = "", - ["fm"] = "", - }, -} - -M.general = { - n = { - [""] = { "", "Redo" }, - [""] = { "zz", "Move half page down", opts = { noremap = true } }, - [""] = { "zz", "Move half page up", opts = { noremap = true } }, - [""] = { "zz", "Move one page down", opts = { noremap = true } }, - [""] = { "zz", "Move one page up", opts = { noremap = true } }, - ["s"] = { " w ", "Save file" }, - ["v"] = { " vsplit ", "Vertical split" }, - ["lu"] = { " Lazy update ", "Update plugins" }, - ["pr"] = { " MarkdownPreviewToggle ", "Preview Markdown file" }, - ["fmt"] = { - function() - vim.g.format_on_save = not vim.g.format_on_save - if vim.g.format_on_save then - print "Format on save enabled" - else - print "Format on save disabled" - end - end, - "Toggle format on save", - }, - ["cp"] = { - function() - if vim.g.copilot_enabled then - vim.cmd "Copilot disable" - print "Copilot disabled" - else - vim.cmd "Copilot enable" - print "Copilot enabled" - end - vim.g.copilot_enabled = not vim.g.copilot_enabled - end, - "Toggle Copilot", - }, - }, - t = { - [""] = { "", "Escape terminal mode", opts = { nowait = true } }, - ["jk"] = { "", "Escape terminal mode", opts = { nowait = true } }, - }, - i = { - ["jk"] = { "", "Escape insert mode", opts = { nowait = true } }, - }, -} - -M.dap = { - plugin = true, - n = { - ["db"] = { - " DapToggleBreakpoint ", - "Add breakpoint at line", - }, - ["dso"] = { - " DapStepOver ", - "Step Over", - }, - ["dsi"] = { - " DapStepIn ", - "Step In", - }, - ["dc"] = { - " DapContinue ", - "Continue", - }, - ["dt"] = { - " DapTerminate ", - "Terminate", - }, - }, -} - -M.dap_go = { - plugin = true, - n = { - ["dtg"] = { - function() - require("dap-go").debug_test() - end, - "Debug Go test", - }, - ["dtl"] = { - function() - require("dap-go").debug_last_test() - end, - "Debug last Go test", - }, - }, -} - -M.dap_python = { - plugin = true, - n = { - ["dtp"] = { - function() - require("dap-python").test_method() - end, - "Debug Python test", - }, - }, -} - -return M diff --git a/lua/custom/plugins/colorizer.lua b/lua/custom/plugins/colorizer.lua deleted file mode 100644 index 3cf535309f..0000000000 --- a/lua/custom/plugins/colorizer.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "NvChad/nvim-colorizer.lua", - opts = { - filetypes = { - "css", - "html", - "scss", - }, - }, -} diff --git a/lua/custom/plugins/dap.lua b/lua/custom/plugins/dap.lua deleted file mode 100644 index ed8c2d2c3b..0000000000 --- a/lua/custom/plugins/dap.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "mfussenegger/nvim-dap", - init = function() - require("core.utils").load_mappings "dap" - end, -} diff --git a/lua/custom/plugins/lspconfig.lua b/lua/custom/plugins/lspconfig.lua deleted file mode 100644 index 48beca770c..0000000000 --- a/lua/custom/plugins/lspconfig.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "neovim/nvim-lspconfig", - config = function() - require "plugins.configs.lspconfig" - require "custom.configs.lspconfig" - end, -} diff --git a/lua/custom/plugins/none-ls.lua b/lua/custom/plugins/none-ls.lua deleted file mode 100644 index fb95f792de..0000000000 --- a/lua/custom/plugins/none-ls.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - "nvimtools/none-ls.nvim", - ft = { - "bash", - "c", - "cpp", - "css", - "go", - "graphql", - "html", - "javascript", - "javascriptreact", - "json", - "lua", - "markdown", - "python", - "ruby", - "scss", - "sh", - "terraform", - "typescript", - "typescriptreact", - "yaml", - "zsh", - }, - opts = function() - return require "custom.configs.none-ls" - end, -} diff --git a/lua/custom/plugins/nvim-tree.lua b/lua/custom/plugins/nvim-tree.lua deleted file mode 100644 index 8346dbfe58..0000000000 --- a/lua/custom/plugins/nvim-tree.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "nvim-tree/nvim-tree.lua", - lazy = false, - opts = { - filters = { - dotfiles = true, - }, - git = { - enable = true, - }, - renderer = { - highlight_git = true, - indent_markers = { - enable = true, - }, - icons = { - show = { - git = true, - }, - }, - }, - }, -} diff --git a/lua/custom/plugins/nvterm.lua b/lua/custom/plugins/nvterm.lua deleted file mode 100644 index e212d2e06d..0000000000 --- a/lua/custom/plugins/nvterm.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "NvChad/nvterm", - opts = { - terminals = { - type_opts = { - horizontal = { - split_ratio = 0.5, - }, - }, - }, - }, -} diff --git a/lua/mappings.lua b/lua/mappings.lua new file mode 100644 index 0000000000..44c4e972cb --- /dev/null +++ b/lua/mappings.lua @@ -0,0 +1,115 @@ +local map = vim.keymap.set + +-- LSP +map("n", "[d", vim.diagnostic.goto_prev, { desc = "LSP Go to previous diagnostic" }) +map("n", "]d", vim.diagnostic.goto_next, { desc = "LSP Go to next diagnostic" }) + +-- tabufline +map("n", "b", "enew", { desc = "Buffer New" }) + +map("n", "", function() + require("nvchad.tabufline").next() +end, { desc = "Buffer Goto next" }) + +map("n", "", function() + require("nvchad.tabufline").prev() +end, { desc = "Buffer Goto prev" }) + +map("n", "x", function() + require("nvchad.tabufline").close_buffer() +end, { desc = "Buffer Close" }) + +-- Comment +map("n", "/", function() + require("Comment.api").toggle.linewise.current() +end, { desc = "Comment Toggle comment" }) + +map( + "v", + "/", + "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", + { desc = "Comment Toggle comment" } +) + +-- NvimTree +map("n", "", "NvimTreeToggle", { desc = "NvimTree Toggle window" }) +map("n", "e", "NvimTreeFocus", { desc = "NvimTree Focus window" }) + +-- Telescope +map("n", "fw", "Telescope live_grep", { desc = "Telescope Live grep" }) +map("n", "fb", "Telescope buffers", { desc = "Telescope Find buffers" }) +map("n", "cm", "Telescope git_commits", { desc = "Telescope Git commits" }) +map("n", "gt", "Telescope git_status", { desc = "Telescope Git status" }) +map("n", "pt", "Telescope terms", { desc = "Telescope Pick hidden term" }) +map("n", "ff", "Telescope find_files", { desc = "Telescope Find files" }) +map( + "n", + "fa", + "Telescope find_files follow=true no_ignore=true hidden=true", + { desc = "Telescope Find all files" } +) + +-- Terminal +map("t", "", "", { desc = "Terminal Escape terminal mode" }) +map("n", "h", function() + require("nvchad.term").new { pos = "sp", size = 0.3 } +end, { desc = "Terminal New horizontal term" }) +map("t", "", function() + local win = vim.api.nvim_get_current_win() + vim.api.nvim_win_close(win, true) +end, { desc = "Terminal Close term in terminal mode" }) + +-- NvChad +map("n", "ch", "NvCheatsheet", { desc = "NvChad Toggle NvCheatsheet" }) +map("n", "th", "Telescope themes", { desc = "NvChad Show themes" }) + +-- General +map("i", "", "", { desc = "General Move Left" }) +map("i", "", "", { desc = "General Move Right" }) +map("i", "", "", { desc = "General Move Down" }) +map("i", "", "", { desc = "General Move Up" }) +map("n", "", "noh", { desc = "General Clear highlights" }) +map("n", "", "h", { desc = "General Switch Window left" }) +map("n", "", "l", { desc = "General Switch Window right" }) +map("n", "", "j", { desc = "General Switch Window down" }) +map("n", "", "k", { desc = "General Switch Window up" }) +map("n", "", "%y+", { desc = "General File Copy whole" }) + +map("n", "", "", { desc = "General Redo" }) +map("n", "", "zz", { desc = "General Move half page down and center" }) +map("n", "", "zz", { desc = "General Move half page up and center" }) +map("n", "", "zz", { desc = "General Move half down and center" }) +map("n", "", "zz", { desc = "General Move half up and center" }) +map("n", "s", " w ", { desc = "General Save file" }) +map("n", "v", " vsplit ", { desc = "General Vertical split" }) +map("n", "lu", " Lazy update ", { desc = "General Update Lazy plugins" }) +map("n", "pr", " MarkdownPreviewToggle ", { desc = "General Preview Markdown File" }) +map("i", "jk", "", { desc = "General Escape with jk" }) + +-- DAP +map("n", "db", " DapToggleBreakpoint ", { desc = "DAP Add breakpoint at line" }) +map("n", "dso", " DapStepOver ", { desc = "DAP Step over" }) +map("n", "dsi", " DapStepIn ", { desc = "DAP Step in" }) +map("n", "dc", " DapContinue ", { desc = "DAP Continue" }) +map("n", "dt", " DapTerminate ", { desc = "DAP Terminate" }) +map("n", "dtg", function() + require("dap-go").debug_test() +end, { desc = "DAP Debug Go test" }) +map("n", "dtg", function() + require("dap-go").debug_last_test() +end, { desc = "DAP Debug last Go test" }) +map("n", "dtp", function() + require("dap-python").test_method() +end, { desc = "DAP Debug Python test" }) + +-- Copilot +map("n", "cp", function() + if vim.g.copilot_enabled then + vim.cmd "Copilot disable" + print "Copilot disabled" + else + vim.cmd "Copilot enable" + print "Copilot enabled" + end + vim.g.copilot_enabled = not vim.g.copilot_enabled +end, { desc = "General Toggle Copilot" }) diff --git a/lua/custom/init.lua b/lua/options.lua similarity index 89% rename from lua/custom/init.lua rename to lua/options.lua index 7ffee7cbca..f123202df0 100644 --- a/lua/custom/init.lua +++ b/lua/options.lua @@ -1,3 +1,5 @@ +require "nvchad.options" + local opt = vim.opt opt.backup = false @@ -8,5 +10,4 @@ opt.list = true opt.listchars = "tab:➝ ,lead:·,space:·,trail:·,nbsp:+,eol:¬" -- feature toggles -vim.g.format_on_save = true vim.g.copilot_enabled = true diff --git a/lua/custom/plugins/cmp.lua b/lua/plugins/cmp.lua similarity index 100% rename from lua/custom/plugins/cmp.lua rename to lua/plugins/cmp.lua diff --git a/lua/plugins/configs/cmp.lua b/lua/plugins/configs/cmp.lua deleted file mode 100644 index 444da73145..0000000000 --- a/lua/plugins/configs/cmp.lua +++ /dev/null @@ -1,120 +0,0 @@ -local cmp = require "cmp" - -dofile(vim.g.base46_cache .. "cmp") - -local cmp_ui = require("core.utils").load_config().ui.cmp -local cmp_style = cmp_ui.style - -local field_arrangement = { - atom = { "kind", "abbr", "menu" }, - atom_colored = { "kind", "abbr", "menu" }, -} - -local formatting_style = { - -- default fields order i.e completion word + item.kind + item.kind icons - fields = field_arrangement[cmp_style] or { "abbr", "kind", "menu" }, - - format = function(_, item) - 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 - icon = " " .. icon .. " " - item.menu = cmp_ui.lspkind_text and " (" .. item.kind .. ")" or "" - item.kind = icon - else - icon = cmp_ui.lspkind_text and (" " .. icon .. " ") or icon - item.kind = string.format("%s %s", icon, cmp_ui.lspkind_text and item.kind or "") - end - - return item - end, -} - -local function border(hl_name) - return { - { "╭", hl_name }, - { "─", hl_name }, - { "╮", hl_name }, - { "│", hl_name }, - { "╯", hl_name }, - { "─", hl_name }, - { "╰", hl_name }, - { "│", hl_name }, - } -end - -local options = { - completion = { - completeopt = "menu,menuone", - }, - - window = { - completion = { - side_padding = (cmp_style ~= "atom" and cmp_style ~= "atom_colored") and 1 or 0, - winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None", - scrollbar = false, - }, - documentation = { - border = border "CmpDocBorder", - winhighlight = "Normal:CmpDoc", - }, - }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - - formatting = formatting_style, - - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }, - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif require("luasnip").expand_or_jumpable() then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-expand-or-jump", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif require("luasnip").jumpable(-1) then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-jump-prev", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - }, - sources = { - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "nvim_lua" }, - { name = "path" }, - }, -} - -if cmp_style ~= "atom" and cmp_style ~= "atom_colored" then - options.window.completion.border = border "CmpBorder" -end - -return options diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua deleted file mode 100644 index 37685e35bf..0000000000 --- a/lua/plugins/configs/lspconfig.lua +++ /dev/null @@ -1,67 +0,0 @@ -dofile(vim.g.base46_cache .. "lsp") -require "nvchad.lsp" - -local M = {} -local utils = require "core.utils" - --- export on_attach & capabilities for custom lspconfigs -M.on_attach = function(client, bufnr) - utils.load_mappings("lspconfig", { buffer = bufnr }) - - if client.server_capabilities.signatureHelpProvider then - require("nvchad.signature").setup(client) - end -end - --- 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 - -M.capabilities = vim.lsp.protocol.make_client_capabilities() - -M.capabilities.textDocument.completion.completionItem = { - documentationFormat = { "markdown", "plaintext" }, - snippetSupport = true, - preselectSupport = true, - insertReplaceSupport = true, - labelDetailsSupport = true, - deprecatedSupport = true, - commitCharactersSupport = true, - tagSupport = { valueSet = { 1 } }, - resolveSupport = { - properties = { - "documentation", - "detail", - "additionalTextEdits", - }, - }, -} - -require("lspconfig").lua_ls.setup { - on_init = M.on_init, - on_attach = M.on_attach, - capabilities = M.capabilities, - - settings = { - Lua = { - diagnostics = { - globals = { "vim" }, - }, - workspace = { - 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, - }, - }, - }, -} - -return M diff --git a/lua/plugins/configs/mason.lua b/lua/plugins/configs/mason.lua deleted file mode 100644 index 3692a15837..0000000000 --- a/lua/plugins/configs/mason.lua +++ /dev/null @@ -1,28 +0,0 @@ -local options = { - ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim - - PATH = "skip", - - ui = { - icons = { - package_pending = " ", - package_installed = "󰄳 ", - package_uninstalled = " 󰚌", - }, - - keymaps = { - toggle_server_expand = "", - install_server = "i", - update_server = "u", - check_server_version = "c", - update_all_servers = "U", - check_outdated_servers = "C", - uninstall_server = "X", - cancel_installation = "", - }, - }, - - max_concurrent_installers = 10, -} - -return options diff --git a/lua/plugins/configs/nvimtree.lua b/lua/plugins/configs/nvimtree.lua deleted file mode 100644 index b4a8aee6e3..0000000000 --- a/lua/plugins/configs/nvimtree.lua +++ /dev/null @@ -1,77 +0,0 @@ -local options = { - filters = { - dotfiles = false, - exclude = { vim.fn.stdpath "config" .. "/lua/custom" }, - }, - disable_netrw = true, - hijack_netrw = true, - hijack_cursor = true, - hijack_unnamed_buffer_when_opening = false, - sync_root_with_cwd = true, - update_focused_file = { - enable = true, - update_root = false, - }, - view = { - adaptive_size = false, - side = "left", - width = 30, - preserve_window_proportions = true, - }, - git = { - enable = false, - ignore = true, - }, - filesystem_watchers = { - enable = true, - }, - actions = { - open_file = { - resize_window = true, - }, - }, - renderer = { - root_folder_label = false, - highlight_git = false, - highlight_opened_files = "none", - - indent_markers = { - enable = false, - }, - - icons = { - show = { - file = true, - folder = true, - folder_arrow = true, - git = false, - }, - - glyphs = { - default = "󰈚", - symlink = "", - folder = { - default = "", - empty = "", - empty_open = "", - open = "", - symlink = "", - symlink_open = "", - arrow_open = "", - arrow_closed = "", - }, - git = { - unstaged = "✗", - staged = "✓", - unmerged = "", - renamed = "➜", - untracked = "★", - deleted = "", - ignored = "◌", - }, - }, - }, - }, -} - -return options diff --git a/lua/plugins/configs/others.lua b/lua/plugins/configs/others.lua deleted file mode 100644 index dafd5a471f..0000000000 --- a/lua/plugins/configs/others.lua +++ /dev/null @@ -1,66 +0,0 @@ -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 diff --git a/lua/plugins/configs/telescope.lua b/lua/plugins/configs/telescope.lua deleted file mode 100644 index 8de35a8a35..0000000000 --- a/lua/plugins/configs/telescope.lua +++ /dev/null @@ -1,54 +0,0 @@ -local options = { - defaults = { - vimgrep_arguments = { - "rg", - "-L", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - }, - prompt_prefix = "  ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "ascending", - layout_strategy = "horizontal", - layout_config = { - horizontal = { - prompt_position = "top", - preview_width = 0.55, - }, - vertical = { - mirror = false, - }, - width = 0.87, - height = 0.80, - preview_cutoff = 120, - }, - file_sorter = require("telescope.sorters").get_fuzzy_file, - file_ignore_patterns = { "node_modules" }, - generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = { "truncate" }, - winblend = 0, - border = {}, - borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - color_devicons = true, - set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, - file_previewer = require("telescope.previewers").vim_buffer_cat.new, - grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, - qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, - mappings = { - n = { ["q"] = require("telescope.actions").close }, - }, - }, - - extensions_list = { "themes", "terms" }, -} - -return options diff --git a/lua/plugins/configs/treesitter.lua b/lua/plugins/configs/treesitter.lua deleted file mode 100644 index 897c4e3fee..0000000000 --- a/lua/plugins/configs/treesitter.lua +++ /dev/null @@ -1,12 +0,0 @@ -local options = { - ensure_installed = { "lua", "vim", "vimdoc" }, - - highlight = { - enable = true, - use_languagetree = true, - }, - - indent = { enable = true }, -} - -return options diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000000..a4d1e65600 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,7 @@ +return { + "stevearc/conform.nvim", + event = { "BufReadPre", "BufNewFile" }, + config = function() + require "configs.conform" + end, +} diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/plugins/copilot-cmp.lua similarity index 100% rename from lua/custom/plugins/copilot-cmp.lua rename to lua/plugins/copilot-cmp.lua diff --git a/lua/custom/plugins/copilot.lua b/lua/plugins/copilot.lua similarity index 100% rename from lua/custom/plugins/copilot.lua rename to lua/plugins/copilot.lua diff --git a/lua/custom/plugins/dap-go.lua b/lua/plugins/dap-go.lua similarity index 80% rename from lua/custom/plugins/dap-go.lua rename to lua/plugins/dap-go.lua index 0057e54cb6..30a9c3e38d 100644 --- a/lua/custom/plugins/dap-go.lua +++ b/lua/plugins/dap-go.lua @@ -7,6 +7,5 @@ return { }, config = function(_, opts) require("dap-go").setup(opts) - require("core.utils").load_mappings "dap_go" end, } diff --git a/lua/custom/plugins/dap-python.lua b/lua/plugins/dap-python.lua similarity index 84% rename from lua/custom/plugins/dap-python.lua rename to lua/plugins/dap-python.lua index c8079fbb95..d97043a4f9 100644 --- a/lua/custom/plugins/dap-python.lua +++ b/lua/plugins/dap-python.lua @@ -8,6 +8,5 @@ return { config = function(_, _) local path = "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python" require("dap-python").setup(path) - require("core.utils").load_mappings "dap_python" end, } diff --git a/lua/custom/plugins/dap-ui.lua b/lua/plugins/dap-ui.lua similarity index 100% rename from lua/custom/plugins/dap-ui.lua rename to lua/plugins/dap-ui.lua diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua new file mode 100644 index 0000000000..99e174107f --- /dev/null +++ b/lua/plugins/dap.lua @@ -0,0 +1,3 @@ +return { + "mfussenegger/nvim-dap", +} diff --git a/lua/custom/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua similarity index 100% rename from lua/custom/plugins/gitsigns.lua rename to lua/plugins/gitsigns.lua diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua deleted file mode 100644 index 390f4b8355..0000000000 --- a/lua/plugins/init.lua +++ /dev/null @@ -1,252 +0,0 @@ --- All plugins have lazy=true by default,to load a plugin on startup just lazy=false --- List of all default plugins & their definitions -local default_plugins = { - - "nvim-lua/plenary.nvim", - - { - "NvChad/base46", - branch = "v2.0", - build = function() - require("base46").load_all_highlights() - end, - }, - - { - "NvChad/ui", - branch = "v2.0", - lazy = false, - }, - - { - "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", - config = function(_, opts) - require("colorizer").setup(opts) - - -- execute colorizer as soon as possible - vim.defer_fn(function() - require("colorizer").attach_to_buffer(0) - end, 0) - end, - }, - - { - "nvim-tree/nvim-web-devicons", - opts = function() - return { override = require "nvchad.icons.devicons" } - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "devicons") - require("nvim-web-devicons").setup(opts) - end, - }, - - { - "lukas-reineke/indent-blankline.nvim", - version = "2.20.7", - event = "User FilePost", - 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) - end, - }, - - { - "nvim-treesitter/nvim-treesitter", - event = { "BufReadPost", "BufNewFile" }, - cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" }, - build = ":TSUpdate", - opts = function() - return require "plugins.configs.treesitter" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "syntax") - require("nvim-treesitter.configs").setup(opts) - end, - }, - - -- git stuff - { - "lewis6991/gitsigns.nvim", - event = "User FilePost", - opts = function() - return require("plugins.configs.others").gitsigns - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "git") - require("gitsigns").setup(opts) - end, - }, - - -- lsp stuff - { - "williamboman/mason.nvim", - cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" }, - opts = function() - return require "plugins.configs.mason" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "mason") - require("mason").setup(opts) - - -- 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 - end, - }, - - { - "neovim/nvim-lspconfig", - event = "User FilePost", - config = function() - require "plugins.configs.lspconfig" - end, - }, - - -- load luasnips + cmp related in insert mode only - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - { - -- snippet plugin - "L3MON4D3/LuaSnip", - dependencies = "rafamadriz/friendly-snippets", - opts = { history = true, updateevents = "TextChanged,TextChangedI" }, - config = function(_, opts) - require("plugins.configs.others").luasnip(opts) - end, - }, - - -- autopairing of (){}[] etc - { - "windwp/nvim-autopairs", - opts = { - fast_wrap = {}, - disable_filetype = { "TelescopePrompt", "vim" }, - }, - config = function(_, opts) - require("nvim-autopairs").setup(opts) - - -- setup cmp for autopairs - local cmp_autopairs = require "nvim-autopairs.completion.cmp" - require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, - }, - - -- cmp sources plugins - { - "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - }, - }, - opts = function() - return require "plugins.configs.cmp" - end, - config = function(_, opts) - require("cmp").setup(opts) - end, - }, - - { - "numToStr/Comment.nvim", - 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(_, opts) - require("Comment").setup(opts) - end, - }, - - -- file managing , picker etc - { - "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, - config = function(_, opts) - dofile(vim.g.base46_cache .. "nvimtree") - require("nvim-tree").setup(opts) - end, - }, - - { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - cmd = "Telescope", - init = function() - require("core.utils").load_mappings "telescope" - end, - opts = function() - return require "plugins.configs.telescope" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "telescope") - local telescope = require "telescope" - telescope.setup(opts) - - -- load extensions - for _, ext in ipairs(opts.extensions_list) do - telescope.load_extension(ext) - end - end, - }, - - -- Only load whichkey after all the gui - { - "folke/which-key.nvim", - keys = { "", "", "", '"', "'", "`", "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) - end, - }, -} - -local config = require("core.utils").load_config() - -if #config.plugins > 0 then - table.insert(default_plugins, { import = config.plugins }) -end - -require("lazy").setup(default_plugins, config.lazy_nvim) diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua new file mode 100644 index 0000000000..afd8489ba7 --- /dev/null +++ b/lua/plugins/lint.lua @@ -0,0 +1,7 @@ +return { + "mfussenegger/nvim-lint", + event = { "BufReadPre", "BufNewFile" }, + config = function() + require "configs.lint" + end, +} diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua new file mode 100644 index 0000000000..23c65c17c4 --- /dev/null +++ b/lua/plugins/lspconfig.lua @@ -0,0 +1,7 @@ +return { + "neovim/nvim-lspconfig", + config = function() + require("nvchad.configs.lspconfig").defaults() + require "configs.lspconfig" + end, + } diff --git a/lua/custom/plugins/markdown-preview.lua b/lua/plugins/markdown-preview.lua similarity index 100% rename from lua/custom/plugins/markdown-preview.lua rename to lua/plugins/markdown-preview.lua diff --git a/lua/custom/plugins/mason.lua b/lua/plugins/mason.lua similarity index 100% rename from lua/custom/plugins/mason.lua rename to lua/plugins/mason.lua diff --git a/lua/plugins/tree.lua b/lua/plugins/tree.lua new file mode 100644 index 0000000000..fe684e19b7 --- /dev/null +++ b/lua/plugins/tree.lua @@ -0,0 +1,4 @@ +return { + "nvim-tree/nvim-tree.lua", + lazy = false, +} diff --git a/lua/custom/plugins/treesitter.lua b/lua/plugins/treesitter.lua similarity index 98% rename from lua/custom/plugins/treesitter.lua rename to lua/plugins/treesitter.lua index e708469f4d..af70c9bd48 100644 --- a/lua/custom/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,6 +3,7 @@ return { opts = { ensure_installed = { "bash", + "c", "cpp", "css", "csv",