From 85f6d8799c795f59f721146bd91ffae4e04b1cc8 Mon Sep 17 00:00:00 2001 From: js0ny Date: Thu, 19 Dec 2024 20:09:50 +0000 Subject: [PATCH] sync: from WSL --- .gitignore | 2 ++ common/tmux.conf | 19 ++++++++++++++----- platforms/wsl/winterop.zsh | 2 +- tools/zsh/mod/alias.zsh | 7 +++++-- tools/zsh/mod/config.zsh | 3 +++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 29e966f..1658eab 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,8 @@ PowerToys/ Justfile # Nushell tools/nushell/ +# fzf +common/fzfrc # OS generated files .DS_Store diff --git a/common/tmux.conf b/common/tmux.conf index be831e1..d603667 100644 --- a/common/tmux.conf +++ b/common/tmux.conf @@ -9,7 +9,7 @@ bind C-a send-prefix # Options set-option -g mouse on -set-option -g default-terminal "screen-256color" +set-option -g default-terminal "tmux-256color" set-option -g allow-rename on set-option -g alternate-screen on set-option -g visual-activity on @@ -54,8 +54,17 @@ bind ` resize-pane -Z # Status Bar # ----------------- +# set -g status-position top +# set-option -g status-bg black +# set-option -g status-fg white +# set-option -g status-left '#[fg=green][#S] ' +# setw -g window-status-current-format '#[fg=colour236,bg=colour39] #I #W ' + set -g status-position top -set-option -g status-bg black -set-option -g status-fg white -set-option -g status-left '#[fg=green][#S] ' -setw -g window-status-current-format '#[fg=colour236,bg=colour39] #I #W ' +set -g @catppuccin_flavor "frappe" +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux +set -g status-right-length 100 +set -g status-left-length 100 +set -g status-left "" +set -g status-right "#{E:@catppuccin_status_application}" +set -ag status-right "#{E:@catppuccin_status_session}" diff --git a/platforms/wsl/winterop.zsh b/platforms/wsl/winterop.zsh index 8e30dbc..e053174 100644 --- a/platforms/wsl/winterop.zsh +++ b/platforms/wsl/winterop.zsh @@ -3,7 +3,7 @@ # Defines the interop commands between WSL and Windows -export FILE_EXPLORER="dopus.exe" # Directory Opus +export FILE_EXPLORER="explorer.exe" # Directory Opus alias clip="clip.exe" alias xclip="clip.exe" diff --git a/tools/zsh/mod/alias.zsh b/tools/zsh/mod/alias.zsh index f9c51cd..9af0607 100644 --- a/tools/zsh/mod/alias.zsh +++ b/tools/zsh/mod/alias.zsh @@ -26,8 +26,8 @@ alias pulldots="cd $DOTFILES && git pull" # Editors # alias v=nvim alias c=code -alias sv="sudo vim" -alias sn="sudo nvim" +alias sv="sudo vim -u ~/.config/vim/vimrc" +alias sn="sudo nvim -u ~/.config/nvim/init.lua" # lsd - modern ls if command -v lsd > /dev/null; then @@ -37,6 +37,9 @@ if command -v lsd > /dev/null; then alias tree='lsd --tree -I .DS_Store -I .git' fi +# fzf - Fuzzy Finder +# export FZF_DEFAULT_OPTS_FILE=~/.dotfiles/common/fzfrc + # Functions # mkcd() { mkdir -p $1 && cd $1 diff --git a/tools/zsh/mod/config.zsh b/tools/zsh/mod/config.zsh index f8cd08b..86d1885 100644 --- a/tools/zsh/mod/config.zsh +++ b/tools/zsh/mod/config.zsh @@ -9,6 +9,9 @@ HIST_STAMPS="yyyy-mm-dd" HISTSIZE=10000 SAVEHIST=10000 +export LANG=zh_CN.UTF-8 +export LC_ALL=zh_CN.UTF-8 + # Manually manage plugins 手动管理插件 # Load zsh-syntax-highlighting before zsh-history-substring-search