Merge branch 'master' into add/keymap-ex

dot_config/nvim/init.lua

@@ -1,5 +1,6 @@
 if not vim.g.vscode then
-    require("core.keymaps")
+  require("core.keymaps")
+  vim.cmd[[colorscheme tokyonight]]
 	local opt = vim.opt
 	opt.tabstop = 4
 	opt.expandtab = true
@@ -31,6 +32,14 @@ if not vim.g.vscode then
 	vim.opt.undodir = undodir
 	vim.opt.undofile = true
 
+    vim.diagnostic.config({
+        virtual_text = {
+            format = function(diagnostic)
+                return string.format("%s (%s: %s)", diagnostic.message, diagnostic.source, diagnostic.code)
+            end,
+        },
+    })
+
 	-- manage plugins.
 	vim.cmd.packadd("packer.nvim")
 	require("packer").startup(function()
@@ -159,6 +168,9 @@ if not vim.g.vscode then
 			}),
 			{ name = "buffer" },
 		})
+
+        -- Color
+        use("folke/tokyonight.nvim")
 	end)
 end
 

dot_wezterm.lua

@@ -3,6 +3,7 @@ local wezterm = require("wezterm")
 local config = wezterm.config_builder()
 config.font = wezterm.font("Ricty Diminished")
 config.font_size = 18
+config.color_scheme = 'tokyonight'
 
 local act = wezterm.action
 config.keys = {