diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 74b8ba8..2627c70 100644
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -7,7 +7,8 @@
     "python",
     "css",
     "markdown",
-    "ruby"
+    "ruby",
+    "go"
   ],
   "diagnostic.virtualText": true,
   "diagnostic.virtualTextCurrentLineOnly": false,
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 75d47ea..78c2753 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -8,6 +8,8 @@ endif
 let mapleader = "\<Space>"
 let g:python3_host_prog = expand('/usr/src/python')
 set laststatus=2
+set autoindent
+set noexpandtab
 set shiftwidth=4
 set softtabstop=4
 set tabstop=4
@@ -138,7 +140,6 @@ set title
 " indent
 set backspace=indent,eol,start
 set shiftwidth=4
-set expandtab
 set list listchars=nbsp:¬,tab:»·,trail:·,extends:>
 
 " editing
diff --git a/.zshrc b/.zshrc
index 673d3a8..2ec96b9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -110,5 +110,9 @@ alias update-brew="brew upgrade --cask"
 # Cleaning-up
 export PATH=$HOME/.local/bin:$PATH
 export PATH=/sbin:$PATH
+export GOPATH=$HOME/golang
+export GOROOT=/usr/local/opt/go/libexec
+export PATH=$PATH:$GOPATH/bin
+export PATH=$PATH:$GOROOT/bin
 [ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH
 export HISTTIMEFORMAT="%F %T "