Merge with upstream

lua/mappings.lua

@@ -1,11 +1,17 @@
 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>")
+
 -- restore shift-y line copy
 map('n', 'Y', 'Y')
 
---
 -- Copilot mappings
 map('i', '<C-]>', 'copilot#Accept("\\<CR>")', {
   expr = true,