diff --git a/.vim/startup/vundle_vimrc b/.vim/startup/vundle_vimrc index 2dd934e..ec42e8b 100644 --- a/.vim/startup/vundle_vimrc +++ b/.vim/startup/vundle_vimrc @@ -242,6 +242,8 @@ let g:NERDTreePatternMatchHighlightColor['.*_spec\.rb$'] = s:rspec_red " sets th let g:WebDevIconsDefaultFolderSymbolColor = s:beige " sets the color for folders that did not match any rule let g:WebDevIconsDefaultFileSymbolColor = s:blue " sets the color for files that did not match any rule +let g:snipMate = {'snippet_version': 1} + " beancount filetype plugin on set omnifunc=syntaxcomplete#Complete @@ -251,3 +253,6 @@ let g:beancount_detailed_first = 1 autocmd FileType bean inoremap . .:AlignCommodity autocmd FileType bean inoremap +let b:beancount_root = '~/Sync/beancount/main.bean' + + diff --git a/.zshrc b/.zshrc index 5bb541c..e999b7d 100644 --- a/.zshrc +++ b/.zshrc @@ -85,7 +85,7 @@ if [ -d "$HOME/.asdf" ]; then # zinit light asdf-vm/asdf # OR load_asdf() { - source $HOME/.asdf/asdf.sh + . $HOME/.asdf/asdf.sh } zinit light-mode wait lucid for \ @@ -127,12 +127,12 @@ if type brew &>/dev/null; then fi fpath=(${ASDF_DIR}/completions $fpath) autoload -Uz compinit -if [ $(date +'%j') != $(stat -f '%Sm' -t '%j' ~/.zcompdump) ]; then - compinit; -else - compinit -C; -fi -kitty + complete setup zsh | source /dev/stdin +# if [ $(date +'%j') != $(stat -f '%Sm' -t '%j' ~/.zcompdump) ]; then +# compinit; +# else +# compinit -C; +# fi +# kitty + complete setup zsh | source /dev/stdin # Load the theme. # zinit theme agnoster @@ -208,3 +208,5 @@ alias adbcap="adb shell screencap -p" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh diff --git a/git/global.gitconfig b/git/global.gitconfig index 075f08b..52d5830 100644 --- a/git/global.gitconfig +++ b/git/global.gitconfig @@ -1,7 +1,7 @@ [user] email = einverne@gmail.com name = Ein Verne - signingkey = 926634D64ACAD792 + signingkey = EA6859610FD61EEACDFA27CCF80B65F734D9DD7D [push] default = matching #[http] diff --git a/git/work.gitconfig b/git/work.gitconfig index f560356..d75aefa 100644 --- a/git/work.gitconfig +++ b/git/work.gitconfig @@ -1,3 +1,3 @@ [user] - name = Ein Verne - email = i@einverne.info + name = wuijawei + email = wujiawei@xiaomi.com diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 73bb407..6ce5583 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,6 +1,6 @@ # https://github.com/gpakosz/.tmux # ---- general ---------------------------------------------------- -set -g default-terminal "screen-256color" # colors! +set -g default-terminal "xterm-256color" # colors! setw -g xterm-keys on set -s escape-time 10 # faster command sequences set -sg repeat-time 600 # increase repeat timeout diff --git a/zsh/alias.zsh b/zsh/alias.zsh index fb789a7..c0b9c51 100644 --- a/zsh/alias.zsh +++ b/zsh/alias.zsh @@ -1,8 +1,8 @@ # https://sw.kovidgoyal.net/kitty/faq.html#i-get-errors-about-the-terminal-being-unknown-or-opening-the-terminal-failing-when-sshing-into-a-different-computer -alias ssh="kitty +kitten ssh" +#alias ssh="kitty +kitten ssh" alias tmux="TERM=screen-256color tmux -2" alias vi="vim" -alias ls="exa" +#alias ls="exa" alias cd="z" alias mux="TERM=screen-256color tmuxinator" #alias ls="ls -alh"