Adjustment install.sh

init/install.sh

@@ -36,7 +36,7 @@ elif [ "$(uname)" == 'Darwin' ]  && [ "$(uname -m)" == 'arm64' ]; then
   echo '====================================== Mac(arm64) ======================================'
   # TODO install MacPorts
   export PATH=/opt/local/bin:$PATH
-  ~/dotfiles/init/setup/mac.sh
+  # ~/dotfiles/init/setup/mac.sh
   ~/dotfiles/init/setup/port.sh
   IS_INSTALL_BREW=false
 elif [ -e /etc/debian_version ]; then
@@ -55,7 +55,7 @@ elif [ -e /etc/system-release ]; then
   fi
 fi
 
-if [ "${IS_INSTALL_BREW}" ]; then
+if "${IS_INSTALL_BREW}"; then
   echo '====================================== run brew ======================================'
   ~/dotfiles/init/setup/brew.sh
 fi
@@ -67,8 +67,8 @@ echo '====================================== symbolic link nvim ================
 ~/dotfiles/nvim/link.sh
 echo '====================================== symbolic link tools ======================================'
 ~/dotfiles/tools/link.sh
-echo '====================================== install fisher plugins ======================================'
-~/dotfiles/fish/fish_plug.sh
-exit
+# echo '====================================== install fisher plugins ======================================'
+# ~/dotfiles/fish/fish_plug.sh
+# exit
 echo '====================================== setting zsh ======================================'
 ~/dotfiles/zsh/install_link.sh # TODO test

init/setup/brew.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-brew install npm
 brew install fish
 brew install fzf
 brew install go
@@ -17,18 +16,18 @@ brew install tree
 brew install ren
 brew install direnv
 brew install wget
-brew install tig
 brew install rg
 brew install tmux-xpanes
 brew install exa
 brew install fd
 brew install bat
 brew install fontforge
 brew install reattach-to-user-namespace # tmux
-brew install terraform
-brew unlink terraform
-brew install tfenv   # terraform version manager
 brew install gnu-sed # replace \t
 brew install asciidoctor
 brew install --HEAD pyenv-virtualenv
 brew install --HEAD pyenv-virtualenvwrapper
+# brew install tig
+# brew install terraform
+# brew unlink terraform
+# brew install tfenv   # terraform version manager

init/setup/common.sh

@@ -10,6 +10,9 @@ curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fi
 export PATH="$HOME/.anyenv/bin:$PATH"
 git clone https://github.com/anyenv/anyenv ~/.anyenv
 anyenv install --init
+anyenv install pyenv
+pyenv install 3.7.4 --force
+
 
 # install dein
 curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh >~/installer.sh
@@ -18,7 +21,7 @@ rm ~/installer.sh
 
 # install go binaries
 export GOPATH=~/go
-go get github.com/motemen/ghq
+go get github.com/x-motemen/ghq
 go get github.com/mrtazz/checkmake
 go get github.com/gohugoio/hugo
 go get github.com/mattn/memo
@@ -32,11 +35,6 @@ go get -d github.com/skanehira/docui
 cd $GOPATH/src/github.com/skanehira/docui
 GO111MODULE=on go install
 
-# install prezto
-export PATH="$HOME/go/bin:$PATH"
-export GHQ_ROOT=~/repos
-ghq get https://github.com/shuntaka9576/prezto.git
-
 # install pip3 packages
 pip3 install python-language-server
 pip3 install neovim

init/setup/port.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 sudo port install tmux
 sudo port install go
-sudo port install nodejs
+sudo port install fzf
+# sudo port install exa # not work
+# sudo port install nodejs15 # not work

nvim/init.vim

@@ -21,9 +21,9 @@ set runtimepath+=~/.cache/dein/repos/github.com/Shougo/dein.vim
 let s:dein_dir = expand('~/.cache/dein')
 let s:toml_dir = expand('~/.config/nvim/dein')
 
-if has('nvim') && isdirectory( $PYENV_ROOT."/versions/nvim-python3" )
-  let g:python3_host_prog = $PYENV_ROOT.'/versions/nvim-python3/bin/python'
-endif
+" if has('nvim') && isdirectory( $PYENV_ROOT."/versions/nvim-python3" )
+"   let g:python3_host_prog = $PYENV_ROOT.'/versions/nvim-python3/bin/python'
+" endif
 
 if dein#load_state(s:dein_dir)
   call dein#begin(s:dein_dir)

zsh/.zshenv

@@ -3,9 +3,8 @@
 # ------------------------------------------------------------------------------
 # Enviroment value
 
-if [ "$(uname)" == 'Darwin' ]  && [ "$(uname -m)" == 'arm64' ]; then
-  export PATH="/opt/local/bin:$PATH"
-end
+# MacPorts # TODO Darwin arm64 only
+export PATH="/opt/local/bin:$PATH"
 
 # zsh
 export ZDOTDIR="$HOME/.zsh"
@@ -19,7 +18,7 @@ export GHQ_ROOT=~/repos
 # Golang
 export GOPATH=~/go
 export GO111MODULE=on
-export PATH="~/go/bin:$PATH"
+export PATH="$HOME/go/bin:$PATH"
 
 # Rust
 export RUST_BACKTRACE=1