diff --git a/.vim/nvim.lua b/.vim/nvim.lua
index 5d719d2..ed03b61 100644
--- a/.vim/nvim.lua
+++ b/.vim/nvim.lua
@@ -30,6 +30,7 @@ local runtime_path = vim.split(package.path, ';')
 table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
 
+
 require'lspconfig'.sumneko_lua.setup {
   settings = {
     Lua = {
@@ -55,13 +56,13 @@ require'lspconfig'.sumneko_lua.setup {
   },
 }
 
+require('go').setup()
+
 function org_imports(wait_ms)
 	local params = vim.lsp.util.make_range_params()
-
 	params.context = {only = {"source.organizeImports"}}
 
 	local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, wait_ms)
-
 	for _, res in pairs(result or {}) do
 		for _, r in pairs(res.result or {}) do
 			if r.edit then
diff --git a/.vimrc b/.vimrc
index 0dc1b9b..eb8a754 100644
--- a/.vimrc
+++ b/.vimrc
@@ -144,7 +144,7 @@ Plug 'SirVer/ultisnips'
 Plug 'honza/vim-snippets'
 "Plug 'fatih/vim-go'
 Plug 'tpope/vim-abolish'
-Plug 'sheerun/vim-polyglot'
+"Plug 'sheerun/vim-polyglot'
 Plug 'Shougo/denite.nvim'
 Plug 'plytophogy/vim-virtualenv'
 "Plug 'ervandew/supertab'
@@ -212,6 +212,7 @@ Plug 'kyazdani42/nvim-web-devicons' " for file icons
 "Plug 'kyazdani42/nvim-tree.lua'
 
 Plug 'ray-x/lsp_signature.nvim'
+Plug 'ray-x/go.nvim'
 
 Plug 'RishabhRD/popfix'
 Plug 'RishabhRD/nvim-lsputils'
@@ -272,9 +273,10 @@ nnoremap <silent> gr   <cmd>lua require('telescope.builtin').lsp_references({ini
 nnoremap <silent> g0    <cmd>lua vim.lsp.buf.document_symbol()<CR>
 nnoremap <silent> gW    <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
 "nnoremap <silent> gd    <cmd>lua vim.lsp.buf.declaration()<CR>
-"nnoremap <silent> ga    <cmd>lua vim.lsp.buf.code_action()<CR>
-nnoremap <silent> ga   <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr>
-vnoremap <silent> ga   :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr>
+nnoremap <silent> ga    <cmd>lua vim.lsp.buf.code_action()<CR>
+"nnoremap <silent> ga   <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr>
+vnoremap <silent> ga    <cmd>lua vim.lsp.buf.range_code_actions()<CR>
+"vnoremap <silent> ga   :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr>
 "nnoremap <silent> ge    <cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false})<CR>
 "nnoremap <silent> ge    <cmd>lua vim.diagnostic.open_float({focusable = false})<CR>