8 files changed, 216 insertions, 0 deletions
diff --git a/mac/.config/NvChad/lua/autocmds.lua b/mac/.config/NvChad/lua/autocmds.lua
new file mode 100644
index 0000000..d2db0bb
--- /dev/null
+++ b/mac/.config/NvChad/lua/autocmds.lua
@@ -0,0 +1 @@
+require "nvchad.autocmds"
diff --git a/mac/.config/NvChad/lua/chadrc.lua b/mac/.config/NvChad/lua/chadrc.lua
new file mode 100644
index 0000000..86cccf1
--- /dev/null
+++ b/mac/.config/NvChad/lua/chadrc.lua
@@ -0,0 +1,30 @@
+-- This file needs to have same structure as nvconfig.lua
+-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua
+-- Please read that file to know all available options :(
+
+---@type ChadrcConfig
+local M = {}
+
+M.base46 = {
+  theme = "onedark", -- default theme
+  hl_add = {},
+  hl_override = {},
+  integrations = {},
+  changed_themes = {},
+  transparency = false,
+  theme_toggle = { "onedark", "one_light" },
+
+  -- hl_override = {
+  -- 	Comment = { italic = true },
+  -- 	["@comment"] = { italic = true },
+  -- },
+}
+
+-- M.nvdash = { load_on_startup = true }
+-- M.ui = {
+--       tabufline = {
+--          lazyload = false
+--      }
+--}
+
+return M
diff --git a/mac/.config/NvChad/lua/configs/conform.lua b/mac/.config/NvChad/lua/configs/conform.lua
new file mode 100644
index 0000000..35ba6cf
--- /dev/null
+++ b/mac/.config/NvChad/lua/configs/conform.lua
@@ -0,0 +1,15 @@
+local options = {
+  formatters_by_ft = {
+    lua = { "stylua" },
+    -- css = { "prettier" },
+    -- html = { "prettier" },
+  },
+
+  -- format_on_save = {
+  --   -- These options will be passed to conform.format()
+  --   timeout_ms = 500,
+  --   lsp_fallback = true,
+  -- },
+}
+
+return options
diff --git a/mac/.config/NvChad/lua/configs/lazy.lua b/mac/.config/NvChad/lua/configs/lazy.lua
new file mode 100644
index 0000000..cd170bd
--- /dev/null
+++ b/mac/.config/NvChad/lua/configs/lazy.lua
@@ -0,0 +1,47 @@
+return {
+  defaults = { lazy = true },
+  install = { colorscheme = { "nvchad" } },
+
+  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",
+      },
+    },
+  },
+}
diff --git a/mac/.config/NvChad/lua/configs/lspconfig.lua b/mac/.config/NvChad/lua/configs/lspconfig.lua
new file mode 100644
index 0000000..7bcabca
--- /dev/null
+++ b/mac/.config/NvChad/lua/configs/lspconfig.lua
@@ -0,0 +1,55 @@
+require("nvchad.configs.lspconfig").defaults()
+
+local servers = { "html", "cssls" }
+vim.lsp.enable(servers)
+
+-- read :h vim.lsp.config for changing options of lsp servers
+vim.lsp.config("lua_ls", {
+  on_init = function(client)
+    if client.workspace_folders then
+      local path = client.workspace_folders[1].name
+      if
+        path ~= vim.fn.stdpath "config"
+        and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc"))
+      then
+        return
+      end
+    end
+
+    client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
+      runtime = {
+        -- Tell the language server which version of Lua you're using (most
+        -- likely LuaJIT in the case of Neovim)
+        version = "LuaJIT",
+        -- Tell the language server how to find Lua modules same way as Neovim
+        -- (see `:h lua-module-load`)
+        path = {
+          "lua/?.lua",
+          "lua/?/init.lua",
+        },
+      },
+      -- Make the server aware of Neovim runtime files
+      workspace = {
+        checkThirdParty = false,
+        library = {
+          vim.env.VIMRUNTIME,
+          -- Depending on the usage, you might want to add additional paths
+          -- here.
+          -- '${3rd}/luv/library'
+          -- '${3rd}/busted/library'
+        },
+        -- Or pull in all of 'runtimepath'.
+        -- NOTE: this is a lot slower and will cause issues when working on
+        -- your own configuration.
+        -- See https://github.com/neovim/nvim-lspconfig/issues/3189
+        -- library = {
+        --   vim.api.nvim_get_runtime_file('', true),
+        -- }
+      },
+    })
+  end,
+  settings = {
+    Lua = {},
+  },
+})
+vim.lsp.enable "lua_ls"
diff --git a/mac/.config/NvChad/lua/mappings.lua b/mac/.config/NvChad/lua/mappings.lua
new file mode 100644
index 0000000..783b78f
--- /dev/null
+++ b/mac/.config/NvChad/lua/mappings.lua
@@ -0,0 +1,10 @@
+require "nvchad.mappings"
+
+-- add yours here
+
+local map = vim.keymap.set
+
+map("n", ";", ":", { desc = "CMD enter command mode" })
+map("i", "jk", "<ESC>")
+
+-- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
diff --git a/mac/.config/NvChad/lua/options.lua b/mac/.config/NvChad/lua/options.lua
new file mode 100644
index 0000000..738f20b
--- /dev/null
+++ b/mac/.config/NvChad/lua/options.lua
@@ -0,0 +1,6 @@
+require "nvchad.options"
+
+-- add yours here!
+
+-- local o = vim.o
+-- o.cursorlineopt ='both' -- to enable cursorline!
diff --git a/mac/.config/NvChad/lua/plugins/init.lua b/mac/.config/NvChad/lua/plugins/init.lua
new file mode 100644
index 0000000..e67fc7e
--- /dev/null
+++ b/mac/.config/NvChad/lua/plugins/init.lua
@@ -0,0 +1,52 @@
+return {
+  {
+    "stevearc/conform.nvim",
+    -- event = 'BufWritePre', -- uncomment for format on save
+    opts = require "configs.conform",
+  },
+
+  -- These are some examples, uncomment them if you want to see them work!
+  {
+    "neovim/nvim-lspconfig",
+    config = function()
+      require "configs.lspconfig"
+    end,
+  },
+
+  -- test new blink
+  { import = "nvchad.blink.lazyspec" },
+
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "vim",
+        "lua",
+        "vimdoc",
+        "html",
+        "css",
+      },
+    },
+  },
+
+  "nvim-lua/plenary.nvim",
+  { "nvim-tree/nvim-web-devicons", lazy = true },
+
+  {
+    "nvchad/ui",
+    config = function()
+      require "nvchad"
+    end,
+  },
+
+  {
+    "nvchad/base46",
+    lazy = true,
+    build = function()
+      require("base46").load_all_highlights()
+    end,
+  },
+
+  "nvchad/volt", -- optional, needed for theme switcher
+  -- or just use Telescope themes
+}