Merge branch 'main' of github.com:ebkn/dotfiles

.gitconfig

@@ -29,7 +29,6 @@
   date = short
 
 [diff]
-  external = difft
   algorithm = histogram
   submodule = log
 

.sshconfig

@@ -0,0 +1,4 @@
+Host github.com
+        HostName github.com
+        User git
+        IdentityFile ~/.ssh/github_ed25519

.zshrc

@@ -1,7 +1,3 @@
-# start tmux
-# export PATH="/opt/homebrew/bin:$PATH" # to recognize tmux
-# [[ -z "$TMUX" ]] && tmux -u
-
 ENABLE_CORRECTION="true"
 
 source "$HOME/dotfiles/zsh/path.zsh"

README.md

@@ -9,7 +9,7 @@ macos
 ```sh
 # macos
 xcode-select --install
-curl -s https://raw.githubusercontent.com/ebkn/dotfiles/master/bin/init/macos.sh | bash
+curl -s https://raw.githubusercontent.com/ebkn/dotfiles/master/bin/init/macos.sh | zsh
 ```
 
 ubuntu
@@ -23,7 +23,6 @@ curl -s https://raw.githubusercontent.com/ebkn/dotfiles/master/bin/init/ubuntu.s
   - install by [homebrew-bundle](https://github.com/Homebrew/homebrew-bundle), [homebrew-cask](https://github.com/Homebrew/homebrew-cask)(mac only)
 - [zsh](https://github.com/zsh-users/zsh)
   - install [plugins](https://github.com/ebkn/dotfiles/blob/master/zsh/plugin.zsh) by [zinit](https://github.com/zdharma/zinit)
-- [tmux](https://github.com/tmux/tmux)
 - [neovim](https://github.com/neovim/neovim)
   - install [plugins](https://github.com/ebkn/dotfiles/blob/master/vim/dein) by [dein](https://github.com/Shougo/dein.vim)
 - and some setting files

bin/init/macos.sh

@@ -32,6 +32,9 @@ brew install git
 printf "\n--- Installing openssl ---\n"
 brew install openssl
 
+printf "\n--- Installing zsh ---\n"
+brew install zsh
+
 printf "\n--- Cloning dotfiles ---\n"
 if [ ! -d ~/dotfiles ]; then
   git clone https://github.com/ebkn/dotfiles ~/dotfiles
@@ -56,7 +59,6 @@ rm ~/installer.sh
 
 printf "\n--- Installing shell packages ---\n"
 brew bundle --file="~/dotfiles/brewfiles/Brewfile-shell"
-[ -f ~/.tmux.conf ] && mv ~/.tmux.conf ~/backup/
 [ -f ~/.bash_profile ] && mv ~/.bash_profile ~/backup/
 [ -f ~/.bashrc ] && mv ~/.bashrc ~/backup/
 [ -f ~/.vimrc ] && mv ~/.vimrc ~/backup/
@@ -67,10 +69,10 @@ brew bundle --file="~/dotfiles/brewfiles/Brewfile-shell"
 
 "$(brew --prefix)/opt/fzf/install"
 
+mv ~/.sshconfig ~/.ssh/config
 ln -s ~/dotfiles/.gitignore_global ~
 ln -s ~/dotfiles/.bash_profile ~
 ln -s ~/dotfiles/.bashrc ~
-ln -s ~/dotfiles/.tmux.conf ~
 ln -s ~/dotfiles/.vimrc ~
 ln -s ~/dotfiles/.xvimrc ~
 ln -s ~/dotfiles/.ideavimrc ~
@@ -83,22 +85,20 @@ ln -s ~/dotfiles/vim/coc/package.json ~/.config/coc/extensions/
 
 sudo ln -s /usr/local/share/git-core/contrib/diff-highlight/diff-highlight /usr/local/bin/diff-highlight
 
-source ~/.zshrc
-
-printf "\n--- Starting tmux ---\n"
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-tmux
-tmux source-file ~/.tmux.conf
+[ -f ~/.gitconfig ] && mv ~/.gitconfig ~/backup/
+ln -s ~/dotfiles/.gitconfig ~/.gitconfig
+ln -s ~/dotfiles/.gitconfig-ebkn ~/.gitconfig-ebkn
 
-printf "\n--- Installing languages from homebrew ---\n"
-brew bundle --file="~/dotfiles/brewfiles/Brewfile-lang"
+mkdir -p ~/.config/wezterm
+ln -s ~/dotfiles/wezterm.lua ~/.config/wezterm/wezterm.lua
 
 # ruby
 ln -s ~/dotfiles/.pryrc ~
 ln -s ~/dotfiles/.irbrc ~
 ln -s ~/dotfiles/.rspec ~
 
 # node
+mkdir -p ~/.nvm
 ln -s ~/dotfiles/.eslintrc.json ~
 ln -s ~/dotfiles/tsconfig.json ~
 
@@ -113,15 +113,13 @@ ln -s ~/dotfiles/.tigrc ~
 # Java
 sudo ln -sfn "$(brew --prefix)/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk"
 
-printf "\n--- Installing apps by Homebrew-Cask.. ---\n"
-brew bundle --file="~/dotfiles/brewfiles/Brewfile-cask"
+source ~/.zshrc
 
-mkdir -p ~/.config/wezterm
-ln -s ~/dotfiles/wezterm.lua ~/.config/wezterm/wezterm.lua
+printf "\n--- Installing languages from homebrew ---\n"
+brew bundle --file="~/dotfiles/brewfiles/Brewfile-lang"
 
-[ -f ~/.gitconfig ] && mv ~/.gitconfig ~/backup/
-ln -s ~/dotfiles/.gitconfig ~/.gitconfig
-ln -s ~/dotfiles/.gitconfig-ebkn ~/.gitconfig-ebkn
+printf "\n--- Installing apps by Homebrew-Cask.. ---\n"
+brew bundle --file="~/dotfiles/brewfiles/Brewfile-cask"
 
 if "$CI"; then
   printf "\n--- Skipping to install apps by mas.. ---\n"
@@ -130,10 +128,3 @@ else
   brew install mas
   brew bundle --file="~/dotfiles/brewfiles/Brewfile-mas"
 fi
-
-# neovim
-npm i -g neovim
-sudo gem install neovim
-# install python2
-# python2 -m pip install --user --upgrade pynvim
-python3 -m pip install --user --upgrade pynvim

bin/init/ubuntu.sh

@@ -24,7 +24,6 @@ git clone \
   https://github.com/adobe-fonts/source-code-pro ~/.local/share/fonts/source-code-pro
 fc-cache -f  -v ~/.local/share/fonts/adobe-fonts/source-code-pro
 
-
 printf "\n--- Installing zsh ---\n"
 sudo apt install zsh
 
@@ -42,16 +41,6 @@ printf "\n--- Starting zsh ---\n"
 zsh
 source ~/.zshrc
 
-printf "\n--- Installing tmux ---\n"
-sudo apt install tmux
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-[ -f ~/.tmux.conf ] && mv ~/.tmux.conf ~/backup/
-ln -s ~/dotfiles/.tmux.conf ~
-
-printf "\n--- Starting tmux ---\n"
-tmux
-tmux source-file ~/.tmux.conf
-
 printf "\n--- Installing vim ---\n"
 sudo apt install vim
 

brewfiles/Brewfile-cask

@@ -17,3 +17,4 @@ cask 'kindle'
 cask 'zoom'
 cask 'deepl'
 cask 'typora'
+cask 'wezterm'

brewfiles/Brewfile-lang

@@ -22,14 +22,13 @@ brew 'hadolint'
 brew 'shellcheck'
 
 # Terraform
-brew 'terraform'
 brew 'tflint'
 
 # Java
 brew 'java'
 
 # C
-brew 'clangd-format'
+brew 'clang-format'
 
 # PHP
 brew 'php'

brewfiles/Brewfile-shell

@@ -1,5 +1,4 @@
 brew 'zsh'
-brew 'tmux'
 brew 'vim'
 brew 'fzf'
 brew 'neovim'
@@ -24,4 +23,3 @@ brew 'procs'
 brew 'tig'
 brew 'bat'
 brew 'direnv'
-brew 'difft'

vim/color.vim

@@ -1,7 +1,6 @@
 " enable 256 colors
 set t_Co=256
 
-" tmux
 if (empty($TMUX))
   if (has("nvim"))
     let $NVIM_TUI_ENABLE_TRUE_COLOR=1

vim/dein/instantly/base.toml

@@ -26,10 +26,6 @@ nnoremap <silent>sd <Plug>(operator-surround-delete)
 nnoremap <silent>sr <Plug>(operator-surround-replace)
 '''
 
-# improved autoread
-[[plugins]]
-repo = 'tmux-plugins/vim-tmux-focus-events'
-
 # for vim-delve
 [[plugins]]
 repo = 'benmills/vimux'

vim/nvim/init.vim

@@ -1,9 +1,3 @@
-" requires
-" python2 -m pip install --user --upgrade pynvim
-" python3 -m pip install --user --upgrade pynvim
-" sudo gem install neovim
-" npm i -g neovim
-
 set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath=&runtimepath
 source ~/.vimrc

zsh/alias.zsh

@@ -11,7 +11,6 @@ alias vim='nvim'
 
 # dotfiles
 alias dot='cd ~/dotfiles'
-alias tmuxs='tmux source-file ~/.tmux.conf'
 alias zshrc='vim ~/.zshrc'
 
 # requires procs