[tmux] fix tmux-plug url

manbaaaa · Aug 13, 2022 · 0f8d4b9 · 0f8d4b9
1 parent 88342dc
commit 0f8d4b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/setup.sh b/setup.sh
@@ -62,7 +62,7 @@ mkdir -p $HOME/.vim/autoload
 cp $CURRENT_DIR/vim/vim-plug/plug.vim $HOME/.vim/autoload
 mkdir -p $HOME/.tmux
 mkdir -p $HOME/.tmux/plugins
-cp -R $CURRENT_DIR/tmux/tpm $HOME/.tmux/plugins
+ln -sf $CURRENT_DIR/tmux/tpm $HOME/.tmux/plugins/tpm
 
 # 3. python3-pip clang ctags
 # see scripts/install_pkg.sh

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
@@ -1,16 +1,16 @@
 # -------------------------------------------------------------------------------
 # tmux-plug
 # -------------------------------------------------------------------------------
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tpm'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-sensible'
-set -g @plugin 'https://github.com.cnpmjs.org/thewtex/tmux-mem-cpu-load'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-prefix-highlight'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-resurrect'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-continuum'
-set -g @plugin 'https://github.com.cnpmjs.org/schasse/tmux-jump'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-copycat'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-pain-control'
-set -g @plugin 'https://github.com.cnpmjs.org/tmux-plugins/tmux-net-speed'
+set -g @plugin 'https://github.com/tmux-plugins/tpm'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-sensible'
+set -g @plugin 'https://github.com/thewtex/tmux-mem-cpu-load'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-prefix-highlight'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-resurrect'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-continuum'
+set -g @plugin 'https://github.com/schasse/tmux-jump'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-copycat'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-pain-control'
+set -g @plugin 'https://github.com/tmux-plugins/tmux-net-speed'
 
 # tmux-prefix-highlight
 set -g @prefix_highlight_fg 'white' # default is 'colour231'

diff --git a/zsh/zshrc b/zsh/zshrc
@@ -268,6 +268,8 @@ fi
 if [[ $(hostname -f) == SongXingchen-PC* || $(hostname -f) == songxingchen*.hobot.cc ]]; then
   export PATH=$PATH:$HOME/tools/go/bin
   source ~/proxy.sh
+  # https://github.com/conda/conda/issues/9392#issuecomment-617345019
+  unset CONDA_SHLVL
   # >>> conda initialize >>>
   # !! Contents within this block are managed by 'conda init' !!
   __conda_setup="$('/home/xcsong/tools/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"