diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9a7bb84 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ + +lazy-lock.json diff --git a/lua/chadrc.lua b/lua/chadrc.lua index 9eca87c..f8b0be6 100644 --- a/lua/chadrc.lua +++ b/lua/chadrc.lua @@ -1,24 +1,22 @@ --- This file needs to have same structure as nvconfig.lua +-- 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 :( +-- Please read that file to know all available options :( ---@type ChadrcConfig local M = {} M.base46 = { - theme = "onedark", - - -- hl_override = { - -- Comment = { italic = true }, - -- ["@comment"] = { italic = true }, - -- }, + theme = "one_light", + changed_themes = { "one_light", "doomchad" }, + transparency = true, + hl_override = { + Comment = { + italic = true, + }, + }, + hl_add = { + NvimTreeOpenedFolderName = { fg = "green", bold = true }, + }, } --- M.nvdash = { load_on_startup = true } --- M.ui = { --- tabufline = { --- lazyload = false --- } --- } - return M diff --git a/lua/configs/conform.lua b/lua/configs/conform.lua index 35ba6cf..48e34ff 100644 --- a/lua/configs/conform.lua +++ b/lua/configs/conform.lua @@ -1,8 +1,12 @@ local options = { formatters_by_ft = { lua = { "stylua" }, - -- css = { "prettier" }, - -- html = { "prettier" }, + + javascript = { "prettier" }, + css = { "prettier" }, + html = { "prettier" }, + + sh = { "shfmt" }, }, -- format_on_save = { diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index 20a0cce..8567bf3 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -1,6 +1,16 @@ require("nvchad.configs.lspconfig").defaults() -local servers = { "html", "cssls" } +local servers = { + -- front-end + "html", + "cssls", + -- static files + "jsonls", + "yamlls", + -- docker + "dockerls", + "docker_compose_language_service", +} vim.lsp.enable(servers) -- read :h vim.lsp.config for changing options of lsp servers diff --git a/lua/mappings.lua b/lua/mappings.lua index 783b78f..ddb7ff7 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -6,5 +6,6 @@ local map = vim.keymap.set map("n", ";", ":", { desc = "CMD enter command mode" }) map("i", "jk", "") +map("v", ">", ">gv", { desc = "indent" }) -- map({ "n", "i", "v" }, "", " w ") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index d028655..107b9df 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -12,17 +12,13 @@ return { require "configs.lspconfig" end, }, - - -- test new blink - -- { import = "nvchad.blink.lazyspec" }, - - -- { - -- "nvim-treesitter/nvim-treesitter", - -- opts = { - -- ensure_installed = { - -- "vim", "lua", "vimdoc", - -- "html", "css" - -- }, - -- }, - -- }, + { + "mistweaverco/kulala.nvim", + ft = {"http", "rest"}, + opts = { + global_keymaps = true, + global_keymaps_prefix = "k", + kulala_keymaps_prefix = "", + }, + }, }