Rewrite

init.lua

@@ -1,30 +1,30 @@
 vim.loader.enable()
 vim.g.base46_cache = vim.fn.stdpath("data") .. "/nvchad/base46/"
+vim.g.mapleader = " "
 
-require("settings")
-require("settings.options")
-require("settings.autocmd")
-require("plugins")
-
-vim.api.nvim_create_autocmd("User", {
-  group = vim.api.nvim_create_augroup("LazyVim", { clear = true }),
-  pattern = "VeryLazy",
-  callback = function()
-    require("settings.keymap")
-  end,
-})
-
-for name, icon in pairs(dots.UI.icons.LSP.diagnostics) do
-  name = "DiagnosticSign" .. name
-  vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
+-- bootstrap lazy and all plugins
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+
+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
 
--- https://www.reddit.com/r/neovim/comments/1ayx62p/config_for_diagnostics/
-vim.diagnostic.config({
-  virtual_text = {
-    source = "if_many",
-  },
-})
+vim.opt.rtp:prepend(lazypath)
+
+require("settings")
+
+require("lazy").setup({
+  { import = "plugins.specs" },
+  dots.languages.enable,
+}, require("configs.lazy"))
 
 dofile(vim.g.base46_cache .. "defaults")
 dofile(vim.g.base46_cache .. "statusline")
+
+require("settings.options")
+require("settings.autocmd")
+
+vim.schedule(function()
+  require("settings.keymap")
+end)

lazy-lock.json

@@ -1,49 +1,52 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
-  "actions-preview.nvim": { "branch": "master", "commit": "ceb6e06d1c8c30d8ddfe3afb03cd2c47b08b2798" },
-  "base46": { "branch": "v2.5", "commit": "bcc9ed2e88ef55b7e9d50b2f80f6a2d4b8080b1d" },
+  "LuaSnip": { "branch": "master", "commit": "ba3ea5bcfd969679f38fefb1bc801cd45524045b" },
+  "base46": { "branch": "v2.5", "commit": "bbbdde83001701047b88f4978f05ea43ea4462e1" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" },
-  "crates.nvim": { "branch": "main", "commit": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4" },
-  "cutlass.nvim": { "branch": "main", "commit": "1ac7e4b53d79410be52a9e464d44c60556282b3e" },
-  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
-  "flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
-  "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" },
-  "grapple.nvim": { "branch": "main", "commit": "493f174a1ace3f2d55ba2191129e43b3875b9124" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" },
-  "mini.ai": { "branch": "main", "commit": "55e9b7217f29e62f734e239bfeed5731a065d801" },
-  "mini.clue": { "branch": "main", "commit": "bde26d6f142eee03ea63015e73b6ac984d49a382" },
-  "mini.diff": { "branch": "main", "commit": "10cc9d370737b8b8c8d996fc537394635da0a4b1" },
-  "mini.files": { "branch": "main", "commit": "17684f78d0499f11e54fc980838cfef3cf5c7c72" },
-  "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
-  "mini.operators": { "branch": "main", "commit": "2edc808e32fbf3e0d4759bdef26a7a143a19f509" },
-  "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" },
-  "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" },
-  "nui.nvim": { "branch": "main", "commit": "274fa89a9b4bed746647c2917091902f882509ec" },
-  "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
-  "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "4e21361e15b1d4147830c5fe571556eb1b14e6f9" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
-  "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
-  "smart-open.nvim": { "branch": "main", "commit": "028bb71d20e8212da3514bf6dabfb17038d81ee4" },
+  "conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" },
+  "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
+  "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" },
+  "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
+  "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" },
+  "lazy.nvim": { "branch": "main", "commit": "aa1c9572aa1916e582f9b9c3d43e272b4f23b326" },
+  "lazydev.nvim": { "branch": "main", "commit": "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8" },
+  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "mini.ai": { "branch": "main", "commit": "ebf806de0292ef89b2756cfb0b55040901d1c441" },
+  "mini.clue": { "branch": "main", "commit": "c3eaa29d7e875b3a80b4db4067a04726646ce2db" },
+  "mini.diff": { "branch": "main", "commit": "9d451672f2f4f8613c859618b5a7a5bf0c4cfa08" },
+  "mini.extra": { "branch": "main", "commit": "2a3dc0293fbbe5a27d54957ed149cbdf4f2ddbbf" },
+  "mini.files": { "branch": "main", "commit": "34602e87159c3b0e270da103f37a2860bbfd62bd" },
+  "mini.git": { "branch": "main", "commit": "54220269adaf9788175b05877f406dfaba68df09" },
+  "mini.hipatterns": { "branch": "main", "commit": "5d28a7e3f399de64c4dbf71f8c6c3b633d986f15" },
+  "mini.move": { "branch": "main", "commit": "0977d909000510b9d3c16981e16580b8433c8697" },
+  "mini.notify": { "branch": "main", "commit": "08aa3be5b99234715bf8d2e56504dccea8a0e212" },
+  "mini.operators": { "branch": "main", "commit": "76ac9104d9773927053ea4eb12fc78ccbb5be813" },
+  "mini.splitjoin": { "branch": "main", "commit": "6e0c320c2c3a9cc4beb0db9284f3ee5888371f3a" },
+  "mini.surround": { "branch": "main", "commit": "af280fc18792b4d142aab4c1638a8949a38ff33a" },
+  "mini.visits": { "branch": "main", "commit": "ba562001b033943f2f0ee943f0d0f1ee621aa90f" },
+  "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
+  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" },
+  "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" },
+  "nvim-treesitter": { "branch": "main", "commit": "fece55077cd7d6f6e79e0deb4397db248e2f5817" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "cd8fd01677e0cfe9dc2c715f305d653269232c1a" },
+  "nvim-various-textobjs": { "branch": "main", "commit": "bde0481460bfaf0833bd5df7213e6bddcf9b0d8e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "smart-open.nvim": { "branch": "main", "commit": "f4e39e9a1b05a6b82b1182a013677acc44b27abb" },
   "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
-  "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
-  "treesj": { "branch": "main", "commit": "e1e82ab4237619d342c7102c9f13d4b9833bfd39" },
-  "ui": { "branch": "v2.5", "commit": "9c16efc915346c7bde5288ad94f0ea40a7267d31" },
-  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "6ecf7461d44513af89f8257f057fcc99e9297612" },
+  "telescope.nvim": { "branch": "master", "commit": "61a4a615366c470a4e9ca8f8b45718b6b92af73f" },
+  "ts-comments.nvim": { "branch": "main", "commit": "c075b4ee00f6e111b44bf99a8cfd5a4cfce9258a" },
+  "ui": { "branch": "v2.5", "commit": "a44793fc405d11edc40a694ca9687a36b9dae503" },
+  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "035d92eab05ac1390afef7204e3fcad9a50fa443" },
   "vscode-svelte-snippets": { "branch": "master", "commit": "564ac3300bfeda01ff0bf6b89152cef43f85a4ce" },
-  "yanky.nvim": { "branch": "main", "commit": "7c5cbf0122ff2dfbb6a92f14885894f65949cc8b" }
+  "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" }
 }

lua/chadrc.lua

@@ -1,7 +1,9 @@
+---@type ChadrcConfig
 local M = {}
+local utils = require("nvchad.stl.utils")
 
 M.ui = {
-  theme = "onedark",
+  theme = "everblush",
   statusline = {
     order = {
       "mode",
@@ -12,6 +14,37 @@ M.ui = {
       "cwd",
       "cursor",
     },
+    modules = {
+      git = function()
+        local git_status = vim.b[utils.stbufnr()].minigit_summary_string or ""
+
+        local summary = vim.b[utils.stbufnr()].minigit_summary
+        local branch_name = (summary ~= nil and summary.head_name) and (" " .. git_status) or ""
+
+        summary = vim.b.minidiff_summary
+        return "%#St_gitIcons# "
+          .. branch_name
+          .. (
+            summary ~= nil
+              and " " .. ((summary.add ~= nil and summary.add > 0) and dots.UI.icons.Git.added .. summary.add or "") .. ((summary.change ~= nil and summary.change > 0) and dots.UI.icons.Git.changed .. summary.change or "") .. ((summary.delete ~= nil and summary.delete > 0) and dots.UI.icons.Git.remove .. summary.delete or "")
+            or ""
+          )
+      end,
+    },
+  },
+  hl_override = {
+    DiffAdd = { fg = "green" },
+    DiffModified = { fg = "yellow" },
+
+    FloatBorder = { fg = "darker_black", bg = "darker_black" },
+    NormalFloat = { bg = "darker_black" },
+  },
+  hl_add = {
+    MiniDiffSignAdd = { fg = "green" },
+    MiniDiffSignChange = { fg = "yellow" },
+    MiniDiffSignDelete = { fg = "red" },
+
+    MiniNotifyNormal = { link = "Normal" },
   },
 }
 

lua/configs/conform.lua

@@ -0,0 +1,18 @@
+local options = {
+  format_on_save = { timeout_ms = 500, lsp_fallback = true },
+  formatters_by_ft = {
+    c = { "clang_format" },
+    javascript = { "prettierd" },
+    typescript = { "prettierd" },
+    css = { "prettierd" },
+    html = { "prettierd" },
+    fish = { "fish_indent" },
+    nix = { "nixfmt" },
+    markdown = { { "prettierd", "prettier" } },
+    lua = { "stylua" },
+    svelte = { { "prettierd", "prettier" } },
+    python = { "black" },
+  },
+}
+
+return options

lua/configs/hipatterns.lua

@@ -0,0 +1,7 @@
+local hi = require("mini.hipatterns")
+
+return {
+  highlighters = {
+    hex_color = hi.gen_highlighter.hex_color(),
+  },
+}

lua/configs/lazy.lua

@@ -0,0 +1,50 @@
+return {
+  defaults = { lazy = true },
+  install = { colorscheme = { "nvchad", "habamax" } },
+
+  ui = {
+    icons = {
+      ft = "",
+      lazy = "󰂠 ",
+      loaded = "",
+      not_loaded = "",
+    },
+  },
+
+  performance = {
+    rtp = {
+      disabled_plugins = {
+        "2html_plugin",
+        "tohtml",
+        "getscript",
+        "getscriptPlugin",
+        "gzip",
+        "logipat",
+        "netrw",
+        "netrwPlugin",
+        "netrwSettings",
+        "netrwFileHandlers",
+        "matchit",
+        "tar",
+        "tarPlugin",
+        "rrhelper",
+        "spellfile_plugin",
+        "vimball",
+        "vimballPlugin",
+        "zip",
+        "zipPlugin",
+        "tutor",
+        "rplugin",
+        "syntax",
+        "synmenu",
+        "optwin",
+        "compiler",
+        "bugreport",
+        "ftplugin",
+      },
+    },
+  },
+  change_detection = {
+    notify = false,
+  },
+}