From 9588582505356951c61a7b2f727e4673211958a0 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Tokuda <108762+tokuda109@users.noreply.github.com> Date: Sun, 1 Oct 2023 22:36:44 +0900 Subject: [PATCH] rm default option and add comments --- nvim/lua/base.lua | 10 +++++----- nvim/lua/mappings.lua | 2 +- nvim/lua/plugins/_lsp.lua | 2 ++ nvim/lua/plugins/_treesitter.lua | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nvim/lua/base.lua b/nvim/lua/base.lua index 2bb07c4..acca0c3 100644 --- a/nvim/lua/base.lua +++ b/nvim/lua/base.lua @@ -5,26 +5,26 @@ vim.opt.encoding = 'utf-8' vim.opt.fileencoding = 'utf-8' vim.opt.number = true -- Show line number -vim.opt.wrap = false +vim.opt.wrap = false -- Disable line wrapping vim.opt.hlsearch = true -- Highlight all search results vim.opt.incsearch = true -- Search strings incrementally vim.opt.ignorecase = true -- Ignore case letters when search vim.opt.showmatch = true -- Highlight matching parenthesis -vim.opt.cursorline = true +vim.opt.cursorline = true -- Highlight the current cursor line vim.opt.background = 'dark' vim.opt.termguicolors = true -- Enable 24-bit RGB colors vim.opt.smartindent = true vim.opt.autoindent = true -- Autoindent new lines -vim.opt.tabstop = 2 -vim.opt.shiftwidth = 2 +vim.opt.tabstop = 2 -- 2 spaces for tabs +vim.opt.shiftwidth = 2 -- 2 spaces for indent width vim.opt.smarttab = true vim.opt.expandtab = true -- Insert space character -vim.opt.swapfile = false -- Disable swapfile +vim.opt.swapfile = false -- Disable swap file vim.opt.cmdheight = 0 -- Set zero height to command line area diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index 40f1082..ad47785 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -1,4 +1,4 @@ -local opt = { noremap = true, silent = true } +local opt = { silent = true } -- Remap leader as space key vim.g.mapleader = ' ' diff --git a/nvim/lua/plugins/_lsp.lua b/nvim/lua/plugins/_lsp.lua index a24d8a2..cbd472b 100644 --- a/nvim/lua/plugins/_lsp.lua +++ b/nvim/lua/plugins/_lsp.lua @@ -38,8 +38,10 @@ end mason.setup() mason_lspconfig.setup({ + -- List of LSP servers to install ensure_installed = { 'cssls', + 'html', 'gopls', 'graphql', 'lua_ls', diff --git a/nvim/lua/plugins/_treesitter.lua b/nvim/lua/plugins/_treesitter.lua index 3d3efeb..07b0099 100644 --- a/nvim/lua/plugins/_treesitter.lua +++ b/nvim/lua/plugins/_treesitter.lua @@ -4,6 +4,7 @@ if not status_ok then end configs.setup({ + -- Ensure these language parsers are installed ensure_installed = { 'css', 'dockerfile',