diff --git a/README.md b/README.md index dc0deaa..769fbdf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -**This repo is supposed to used as config by NvChad users!** +**This repo is supposed to be used as config by NvChad users!** - The main nvchad repo (NvChad/NvChad) is used as a plugin by this repo. - So you just import its modules , like `require "nvchad.options" , require "nvchad.mappings"` diff --git a/init.lua b/init.lua index bbbfad1..faf2738 100644 --- a/init.lua +++ b/init.lua @@ -30,7 +30,7 @@ dofile(vim.g.base46_cache .. "defaults") dofile(vim.g.base46_cache .. "statusline") require "options" -require "nvchad.autocmds" +require "autocmds" vim.schedule(function() require "mappings" diff --git a/lua/autocmds.lua b/lua/autocmds.lua new file mode 100644 index 0000000..d2db0bb --- /dev/null +++ b/lua/autocmds.lua @@ -0,0 +1 @@ +require "nvchad.autocmds" diff --git a/lua/chadrc.lua b/lua/chadrc.lua index 6f6a16e..bb35f47 100644 --- a/lua/chadrc.lua +++ b/lua/chadrc.lua @@ -14,4 +14,11 @@ M.base46 = { -- }, } +-- M.nvdash = { load_on_startup = true } +-- M.ui = { +-- tabufline = { +-- lazyload = false +-- } +-- } + return M diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index 478df01..20a0cce 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -1,24 +1,6 @@ --- load defaults i.e lua_lsp require("nvchad.configs.lspconfig").defaults() -local lspconfig = require "lspconfig" - --- EXAMPLE local servers = { "html", "cssls" } -local nvlsp = require "nvchad.configs.lspconfig" +vim.lsp.enable(servers) --- lsps with default config -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = nvlsp.on_attach, - on_init = nvlsp.on_init, - capabilities = nvlsp.capabilities, - } -end - --- configuring single server, example: typescript --- lspconfig.ts_ls.setup { --- on_attach = nvlsp.on_attach, --- on_init = nvlsp.on_init, --- capabilities = nvlsp.capabilities, --- } +-- read :h vim.lsp.config for changing options of lsp servers diff --git a/lua/mappings.lua b/lua/mappings.lua index c063bb3..524e955 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,4 +1,5 @@ require "nvchad.mappings" +require "td_mappings" -- add yours here @@ -69,10 +70,8 @@ end, { desc = "Format buffer / selection" }) vim.keymap.del({ "n", "t" }, "") vim.keymap.del({ "n", "t" }, "") + -- Vault-wide find-and-replace with confirmation popup vim.keymap.set("n", "rn", function() require("rename_term").run() end, { desc = "Rename term across vault (find → replace)" }) - --- td: time-track markdown todos — all in ~/setup_env/dotfiles/nvim/{td,td_mappings}.lua -require("td_mappings") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 7dea79a..203810b 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -68,7 +68,7 @@ return { "lewis6991/gitsigns.nvim", opts = { preview_config = { - border = "rounded", -- Options: "single", "double", "rounded", "solid", "shadow" + border = "rounded", style = "minimal", relative = "cursor", row = 0, @@ -113,13 +113,4 @@ return { end) end, }, - -- { - -- "nvim-treesitter/nvim-treesitter", - -- opts = { - -- ensure_installed = { - -- "vim", "lua", "vimdoc", - -- "html", "css" - -- }, - -- }, - -- }, } diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua index a0c7051..17d268e 100644 --- a/lua/plugins/obsidian.lua +++ b/lua/plugins/obsidian.lua @@ -20,6 +20,7 @@ return { version = "*", lazy = true, ft = "markdown", + cond = #workspaces > 0, dependencies = { "nvim-lua/plenary.nvim", },