diff --git a/install.sh b/install.sh index a2c5998..33fb9ac 100644 --- a/install.sh +++ b/install.sh @@ -238,10 +238,16 @@ if [ -d ~/.config/dein/repos/github.com/Shougo/dein.vim/ ]; then echo "dein.vim is already installed" else echo "install dein" - echo "" sh -c "$(curl -fsSL https://raw.githubusercontent.com/Shougo/dein-installer.vim/master/installer.sh)" fi +LINK_FILES=(.vimrc) +for file in ${LINK_FILES[@]}; do \ + rm -f ~/$file + ln -sf $DOTPATH/vim/$file ~/$file + echo "Linked: ${file}"; \ +done + # Permission deniedでinstallに失敗するので、予めsudoで作成 MAKE_DIRS=(. .cache repos/github.com) for dir in ${MAKE_DIRS[@]}; do \ @@ -249,13 +255,6 @@ for dir in ${MAKE_DIRS[@]}; do \ sudo chmod -R 777 ~/.config/dein/$dir; \ done -LINK_FILES=(.vimrc) -for file in ${LINK_FILES[@]}; do \ - rm -f ~/$file&>/dev/null - ln -sf $DOTPATH/vim/$file ~/$file - echo "Linked: ${file}"; \ -done - echo "##### finish to setup vim #####" cd ~ @@ -281,20 +280,24 @@ case "$(os)" in esac echo "----- install linuxbrew -----" -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + +(echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/hiroh/.zprofile(echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/hiroh/.zprofile +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" test -d /home/linuxbrew/.linuxbrew && eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) test -r ~/.zshrc && echo "eval \$($(brew --prefix)/bin/brew shellenv)" >> ~/.zshrc echo "----- install command using linuxbrew -----" -brew install fzf -brew install jq +brew install gcc brew install exa brew install procs brew install fd brew install ripgrep brew install gh brew install lazygit +brew install fzf +brew install jq echo "##### finish to setup linuxbrew #####" diff --git a/vim/.vimrc b/vim/.vimrc index 147e229..9b65f8f 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -170,7 +170,6 @@ set backspace=indent,eol,start " ファイル名補完 set wildmenu set wildmode=full -set rtp+=/home/linuxbrew/.linuxbrew/opt/fzf " マウス対応 "set mouse=a "set ttymouse=xterm2