diff --git a/.alacritty.yml b/.alacritty.yml index 177ffb2..6763819 100644 --- a/.alacritty.yml +++ b/.alacritty.yml @@ -41,7 +41,7 @@ font: # 環境変数 env: - TERM: alacritty + TERM: xterm-256color # Colors (Horizon Dark) colors: diff --git a/.tmux.conf b/.tmux.conf index 53c2654..e60a0c7 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -36,6 +36,7 @@ bind-key -n M-Up select-pane -U bind-key -n M-Down select-pane -D bind-key -n M-w new-window +bind-key -n M-e popup bind-key -n M-Tab select-window -t :+ bind-key -n M-1 select-window -t 1 @@ -74,7 +75,8 @@ bind-key -r L resize-pane -R 3 # 256F’[––‚ðŽg—p‚·‚é set -g default-terminal "tmux-256color" -set -ga terminal-overrides ",$TERM:Tc" +set-option -sa terminal-overrides ",xterm-256color:RGB" +set-option -ga terminal-overrides ",$TERM:Tc" # ƒyƒCƒ“‚̘gü set -g pane-border-lines single @@ -111,4 +113,3 @@ set-window-option -g monitor-activity on set -g visual-activity on ## Alcritty‚Åtmux‚ð—LŒø‚É‚·‚é -set-option -ga terminal-overrides ",alacritty:RGB" diff --git a/.zshrc b/.zshrc index 2aa71e8..30165b5 100644 --- a/.zshrc +++ b/.zshrc @@ -43,21 +43,21 @@ alias tlsc='sudo tailscale up --exit-node-allow-lan-access --exit-node=mystech' alias tlscd='sudo tailscale down' # fzf関連 -export PATH="$PATH:$HOME/.fzf/bin" -export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git"' +export FZF_TMUX_OPTS="-p 40%" +export FZF_CTRL_R_OPTS="--reverse --preview 'echo {}' --preview-window down:3:hidden:wrap --bind '?:toggle-preview'" +export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --iglob "!.git/*"' export FZF_DEFAULT_OPTS='--ansi --height 40% --reverse --border=none' - -export FZF_CTRL_T_COMMAND='rg --files --hidden --follow --glob "!**/.git/*"' +export FZF_CTRL_T_COMMAND='rg --files --hidden --follow --iglob "!.git/*"' export FZF_CTRL_T_OPTS=" --preview 'bat --color=always --style=header,grid {}' - --preview-window=right:60%" + --preview-window=right:40%" fadd() { local out q n addfiles while out=$( git status --short | awk '{if (substr($0,2,1) !~ / /) print $2}' | - fzf-tmux --multi --exit-0 --expect=ctrl-d); do + fzf-tmux -p 30% --multi --exit-0 --expect=ctrl-d); do q=$(head -1 <<< "$out") n=$[$(wc -l <<< "$out") - 1] addfiles=(`echo $(tail "-$n" <<< "$out")`) @@ -92,6 +92,10 @@ fi alias ta='tmux attach' +if [[ -n ${TMUX-} ]];then + export TERM=tmux-256color +fi + # 履歴関連 HISTFILE=~/.zsh_history # ヒストリをä¿å­˜ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ« HISTSIZE=10000 # メモリã«ä¿å­˜ã•ã‚Œã‚‹ãƒ’ストリã®ä»¶æ•° @@ -100,4 +104,5 @@ setopt bang_hist # !を使ã£ãŸãƒ’ストリ展開を行ã†(d) setopt extended_history # ヒストリã«å®Ÿè¡Œæ™‚é–“ã‚‚ä¿å­˜ã™ã‚‹ setopt hist_reduce_blanks # 余分ãªã‚¹ãƒšãƒ¼ã‚¹ã‚’削除ã—ã¦ãƒ’ストリã«ä¿å­˜ã™ã‚‹ -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh +[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh