diff --git a/nvim/lua/lang/go.lua b/nvim/lua/lang/go.lua index 3cd5d4b..253be68 100644 --- a/nvim/lua/lang/go.lua +++ b/nvim/lua/lang/go.lua @@ -1,6 +1,7 @@ -- LSP require'lspconfig'.gopls.setup{ - cmd = {DATA_PATH .. "/lspinstall/go/gopls"}, + -- cmd = {DATA_PATH .. "/lspinstall/go/gopls"}, + cmd = {"gopls"}, -- use cmd in path, I can update it easily settings = {gopls = {analyses = {unusedparams = true}, staticcheck = true}}, root_dir = require'lspconfig'.util.root_pattern(".git","go.mod"), init_options = {usePlaceholders = true, completeUnimported = true}, diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 2d3070f..28e7fd7 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -19,9 +19,9 @@ vim.o.termguicolors = true -- set term gui colors most terminals support this vim.o.splitright = true -- Vertical splits will automatically be to the right -- vim.o.t_Co = "256" -- Support 256 colors vim.o.conceallevel = 0 -- So that I can see `` in markdown files -vim.cmd('set ts=4') -- Insert 2 spaces for a tab -vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation -vim.cmd('set expandtab') -- Converts tabs to spaces +-- vim.cmd('set ts=4') -- Insert 2 spaces for a tab +-- vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation +-- vim.cmd('set expandtab') -- Converts tabs to spaces vim.bo.smartindent = true -- Makes indenting smart vim.wo.number = true -- set numbered lines vim.wo.relativenumber = true -- set relative number