From 2a9f635cd67770c65944aa4588164737329f4350 Mon Sep 17 00:00:00 2001 From: d0zingcat Date: Thu, 2 Jun 2022 20:28:30 +0800 Subject: [PATCH] updates on 220602 --- .ssh_config | 40 ++++++++++++++++++++++++++++++ .zshrc | 10 +++++--- nvim/lua/config/nvim_hop.lua | 3 --- nvim/lua/config/nvim_telescope.lua | 1 + 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/.ssh_config b/.ssh_config index 713f31e..11f3dcc 100644 --- a/.ssh_config +++ b/.ssh_config @@ -1,3 +1,43 @@ +Host * + TCPKeepAlive yes + ServerAliveInterval 10 + ServerAliveCountMax 3 + +#Host jumper + #Hostname jumper.dbkops.com + #User tangli + #IdentityFile ~/.ssh/id_rsa + +Host * + TCPKeepAlive yes + ServerAliveInterval 10 + ServerAliveCountMax 3 + +Host speedy + Hostname speedy.dbkops.com + # Port 22 + Port 2022 + User tangli + IdentityFile ~/.ssh/id_rsa + +Host jumper + ProxyCommand ssh speedy -W %h:%p + Hostname jumper.dbkops.com + User tangli + IdentityFile ~/.ssh/id_rsa + +Host aws-optimus-1 + ProxyCommand ssh jumper -W %h:%p + Hostname 172.21.7.29 + User tangli + IdentityFile ~/.ssh/id_rsa + +Host aws-optimus-2 + ProxyCommand ssh jumper -W %h:%p + Hostname 172.21.9.172 + User tangli + IdentityFile ~/.ssh/id_rsa + Host centos.htilil HostName 10.1.4.28 User root diff --git a/.zshrc b/.zshrc index e22198f..715e772 100644 --- a/.zshrc +++ b/.zshrc @@ -2,12 +2,12 @@ export GOPATH=$HOME/.go export GOPROXY=https://goproxy.cn,direct export CARGO_PATH=$HOME/.cargo - export PATH="/opt/homebrew/sbin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" export PATH="/home/linuxbrew/.linuxbrew/sbin:/home/linuxbrew/.linuxbrew/bin:$PATH" export PATH="$CARGO_PATH/bin:$GOPATH/bin:$PYENV_ROOT/shims:$PATH" export PATH="$HOME/.local/bin:${HOME}/.krew/bin:$PATH" + source $HOME/.antigen/antigen.zsh antigen use oh-my-zsh @@ -32,7 +32,6 @@ eval "$(starship init zsh)" zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} - export LC_ALL=en_US.UTF-8 export EDITOR=vim export LANG=en_US.UTF-8 @@ -99,7 +98,6 @@ alias kd='kubectl debug' alias kk='kubectl krew' alias vim='nvim' alias vi='nvim' -alias jumper='ssh tangli@10.1.4.14 -p 32200' alias wol_xps8940="host home.d0zingcat.xyz | cut -d ' ' -f 4 | cat | xargs -I {} wakeonlan -i {} -p 200 'FC:44:82:13:BA:0F'" #alias nerdctl='lima nerdctl' #alias docker='lima docker' @@ -158,7 +156,6 @@ if [ $arch = 'arm64' ]; then . /opt/homebrew/opt/asdf/libexec/asdf.sh fi -#neofetch #export LDFLAGS="-L/usr/local/opt/llvm/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib -L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib" #export CPPFLAGS="-I/usr/local/opt/llvm/include -I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include" #export PKG_CONFIG_PATH="/usr/local/opt/zlib/lib/pkgconfig" @@ -174,3 +171,8 @@ compdef __start_kubectl k #autoload -U +X compinit && compinit #autoload -U +X bashcompinit && bashcompinit +# work +remote_debank="aws-optimus-2:/home/tangli/DeBankCore" +rsync_exclude="$local_debank/rsync_exclude.txt" +local_debank="$HOME/Documents/work/employment/debank/DeBankCore" +alias rsyncDebankCore="rsync -r -h -v --exclude-from=$rsync_exclude --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank" diff --git a/nvim/lua/config/nvim_hop.lua b/nvim/lua/config/nvim_hop.lua index 46a3e46..c1ae650 100644 --- a/nvim/lua/config/nvim_hop.lua +++ b/nvim/lua/config/nvim_hop.lua @@ -3,7 +3,6 @@ local map = require('utils').map -- hopworld require('hop').setup({ keys = 'etovxqpdygfblzhckisuran' }) -map('n', 'w', 'HopWordAC') map('n', 'fw', 'HopWord') map('n', 's', 'HopChar1') map('n', 'k', 'HopLineStartBC') @@ -11,6 +10,4 @@ map('n', 'j', 'HopLineStartAC') map('v', 'k', 'HopLineStartBC') map('v', 'j', 'HopLineStartAC') map('n', 'h', 'HopWordBC') -map('n', 'l', 'HopWordAC') -map('v', 'h', 'HopWordBC') map('v', 'l', 'HopWordAC') diff --git a/nvim/lua/config/nvim_telescope.lua b/nvim/lua/config/nvim_telescope.lua index 03e8485..d00fec8 100644 --- a/nvim/lua/config/nvim_telescope.lua +++ b/nvim/lua/config/nvim_telescope.lua @@ -27,4 +27,5 @@ require('telescope').setup({ map('n', 'ff', 'Telescope find_files') map('n', 'fg', 'Telescope live_grep') map('n', 'fb', 'Telescope buffers') +map('n', 'fh', 'Telescope help_tags') map('n', ';', 'Telescope commands')