diff --git a/config/.bash_profile b/config/.bash_profile index b0d3fa8..893cb84 100644 --- a/config/.bash_profile +++ b/config/.bash_profile @@ -4,9 +4,10 @@ END="\[\e[m\]" HOST_NAME="my-vim" export PS1="${BEGIN} \u@${HOST_NAME} ${MIDDLE} \w ${END} " +export GOENV_ROOT="$HOME/.goenv" +export PATH="$GOENV_ROOT/bin:$PATH" +eval "$(goenv init -)" +# export GOROOT=`go env GOROOT` +# export PATH=$PATH:$GOROOT/bin export GOPATH=`go env GOPATH` -export GOROOT=`go env GOROOT` -export GOBIN=$GOROOT/bin -export PATH=$PATH:`go env GOPATH` -export PATH=$PATH:`go env GOPATH`/bin -export PATH=$PATH:`go env GOROOT`/bin +export PATH=$PATH:$GOPATH/bin diff --git a/config/.vimrc b/config/.vimrc index 0b2cf08..da08c12 100644 --- a/config/.vimrc +++ b/config/.vimrc @@ -173,12 +173,15 @@ nnoremap o :NERDTreeToggle " https://github.com/dense-analysis/ale/blob/master/doc/ale-go.txt let g:ale_fix_on_save = 1 let b:ale_fixers = ['prettier', 'eslint'] -let b:ale_fixers = {'javascript': ['prettier', 'eslint']} +let b:ale_fixers = { + \ 'javascript': ['prettier', 'eslint'], + \ 'go': ['gofmt'] + \ } let g:airline#extensions#ale#enabled = 1 " let g:ale_set_loclist = 1 " let g:ale_set_quickfix = 1 let g:ale_open_list = 1 -let g:ale_linters = {'go': ['go vet']} +let g:ale_linters = {'go': ['go vet', 'gofmt']} """ " Python setting - autopep8 diff --git a/config/dein.toml b/config/dein.toml index 8be1006..f3fa759 100644 --- a/config/dein.toml +++ b/config/dein.toml @@ -76,8 +76,8 @@ merged = '0' [[plugins]] repo = 'mattn/vim-lsp-icons' -[[plugins]] -repo = 'mattn/vim-goimports' +# [[plugins]] +# repo = 'mattn/vim-goimports' ################### # Auto complete and linter diff --git a/vim.dockerfile b/vim.dockerfile index aae2a7e..6a6df01 100644 --- a/vim.dockerfile +++ b/vim.dockerfile @@ -25,10 +25,16 @@ RUN mkdir /root/.vim/servers \ nodejs npm \ && npm install -g yarn \ #################### - # Go + # Go, goenv + && git clone https://github.com/syndbg/goenv.git /root/.goenv \ + && ln -s /root/.goenv/bin/* /usr/local/bin \ + # && GO_LATEST=`goenv install --list | sort -V | tail -1 | xargs` \ + # && goenv install ${GO_LATEST} \ + # && goenv global ${GO_LATEST} \ + # && export PATH="$PATH:/root/.goenv/versions/${GO_LATEST}/bin" \ && GO_REGEX_PATTERN='go[0-9]\.[0-9]{1,2}\.[0-9]{1,2}\.linux-amd64\.tar\.gz' \ - && GO_LATEST=`curl -s https://golang.org/dl/ | egrep -o ${GO_REGEX_PATTERN}| sort -V | tail -1` \ - && GO_URL="https://dl.google.com/go/"`echo $GO_LATEST` \ + && GO_LATEST=`curl -s https://golang.org/dl/ | egrep -o ${GO_REGEX_PATTERN} | sort -V | tail -1` \ + && GO_URL="https://dl.google.com/go/${GO_LATEST}" \ && wget ${GO_URL} \ && tar -C /usr/local -xzf ${GO_LATEST} \ && rm ${GO_LATEST} \ @@ -40,10 +46,10 @@ RUN mkdir /root/.vim/servers \ && npm install -g eslint eslint-plugin-vue eslint-plugin-react eslint-plugin-node eslint_d \ #################### # Terraform - && TERRAFORM_REGEX_PATTERN='terraform_[0-9]\.[0-9]{1,2}\.[0-9]{1,2}_linux.*amd64' \ - && TERRAFORM_URL=`curl -sL https://releases.hashicorp.com/terraform/index.json | jq -r '.versions[].builds[].url' | egrep ${TERRAFORM_REGEX_PATTERN} | sort -V | tail -1` \ - && wget ${TERRAFORM_URL} \ - && unzip -q `ls | egrep ${TERRAFORM_REGEX_PATTERN}` -d /usr/local/bin/ \ + && git clone https://github.com/tfutils/tfenv.git /root/.tfenv \ + && ln -s /root/.tfenv/bin/* /usr/local/bin \ + && tfenv install latest \ + && tfenv use latest \ #################### # Vim && add-apt-repository ppa:jonathonf/vim \