update zsh

This commit is contained in:
jay 2021-12-27 23:01:23 +08:00
parent 90339758bc
commit e9ab23f5e1
8 changed files with 72 additions and 2 deletions

View File

@ -12,10 +12,15 @@ js_linter = "\"standard\""
js_fixer = "\"standard\"" js_fixer = "\"standard\""
[zsh.files] [zsh.files]
zshrc = "~/.zshrc"
zprofile = "~/.zprofile" zprofile = "~/.zprofile"
zsh = "~/.zsh" zsh = "~/.zsh"
[zsh_zplug.files]
zshrc_zplug = "~/.zshrc"
[zsh_zinit.files]
zshrc_zinit = "~/.zshrc"
[shell.files] [shell.files]
# Optional variables email+git_username # Optional variables email+git_username
gitconfig = "~/.gitconfig" gitconfig = "~/.gitconfig"

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
/global.toml /global.toml
.dotter/cache.toml .dotter/cache.toml
.dotter/local.toml .dotter/local.toml
.dotter/cache/
.dotter/cache.toml

View File

@ -3,3 +3,15 @@ Host *
UserKnownHostsFile /dev/null UserKnownHostsFile /dev/null
ForwardAgent yes ForwardAgent yes
Host git.lawsnote.com
Port 2222
User git
HostName git.lawsnote.com
Host dev
User mtfos
HostName 192.168.200.14
Host vpn
User root
HostName 192.168.201.254

View File

@ -22,11 +22,12 @@ else
start_agent; start_agent;
fi fi
export FLUTTER_ROOT="$HOME/apps/flutter"
export GOPATH="$HOME/go" export GOPATH="$HOME/go"
export GOROOT="$HOME/apps/go" export GOROOT="$HOME/apps/go"
export NODE_ROOT="$HOME/apps/node" export NODE_ROOT="$HOME/apps/node"
export PATH="$GOPATH/bin:$GOROOT/bin:$NODE_ROOT/bin:$PATH" export PATH="$GOPATH/bin:$GOROOT/bin:$NODE_ROOT/bin:$FLUTTER_ROOT/bin:$PATH"
if [ -f "$HOME/.cargo/env" ]; then if [ -f "$HOME/.cargo/env" ]; then
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
@ -35,3 +36,9 @@ fi
if [ -d "$HOME/bin" ]; then if [ -d "$HOME/bin" ]; then
export PATH="$HOME/bin:$PATH" export PATH="$HOME/bin:$PATH"
fi fi
# The next line updates PATH for the Google Cloud SDK.
if [ -f '/Users/jay/apps/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/jay/apps/google-cloud-sdk/path.zsh.inc'; fi
# The next line enables shell command completion for gcloud.
if [ -f '/Users/jay/apps/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/jay/apps/google-cloud-sdk/completion.zsh.inc'; fi

View File

@ -4,6 +4,8 @@ bindkey -v
autoload -U edit-command-line autoload -U edit-command-line
zle -N edit-command-line zle -N edit-command-line
bindkey ',' autosuggest-accept
bindkey -M viins '^X^E' edit-command-line bindkey -M viins '^X^E' edit-command-line
# Add emacs-like keybind to viins mode # Add emacs-like keybind to viins mode
bindkey -M viins '^F' forward-char bindkey -M viins '^F' forward-char

8
zsh/zsh.sh Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
dir=$(dirname $0)
for i in $(ls $dir/*.zsh);
do
source "$i"
done

34
zshrc_zinit Normal file
View File

@ -0,0 +1,34 @@
source ~/.zinit/bin/zinit.zsh
# theme
zinit ice wait
zinit light "tinyRatP/ys"
zinit light zsh-users/zsh-completions
zinit light zsh-users/zsh-autosuggestions
zinit light zdharma-continuum/fast-syntax-highlighting
zinit light zsh-users/zsh-completions
zinit light mattbangert/kubectl-zsh-plugin
# OhMyZSH Plugs
zinit snippet OMZ::lib/completion.zsh
zinit snippet OMZ::lib/git.zsh
zinit snippet OMZ::lib/theme-and-appearance.zsh
zinit snippet OMZP::tmux
zinit ice as="completion"
zinit snippet OMZ::plugins/docker/_docker
zinit snippet OMZP::composer
zinit snippet OMZ::plugins/sudo/sudo.plugin.zsh
zinit ice lucid wait='1'
zinit snippet OMZ::plugins/git/git.plugin.zsh
# Load OMZ extract folder
zinit ice svn
zinit snippet OMZ::plugins/extract
# auto load other zshfiles
[ -f "$HOME/.zsh/zsh.sh" ] && source "$HOME/.zsh/zsh.sh"
[ -f "$HOME/.zprofile" ] && source "$HOME/.zprofile"
# vim: set ft=zsh:

View File