diff --git a/.zshrc b/.zshrc index dc66230..cba8283 100644 --- a/.zshrc +++ b/.zshrc @@ -73,7 +73,6 @@ alias kns='kubens' alias kctx='kubectx' alias kd='kubectl debug' alias kk='kubectl krew' -alias vim='nvim' alias vi='nvim' 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' @@ -134,22 +133,35 @@ function klogs() { k get pods --sort-by=.metadata.creationTimestamp | grep "$keyword" | head -n 1 | awk '{print $1}' | xargs kubectl logs -f } -function rsync_debank() { - local_debank=`pwd` +function rsync_work() { + remote_dir="/home/tangli" + local_work=`pwd` local_dir=${PWD##*/} local_dir=${local_dir:-/} if [ $# -eq 0 ]; then - remote_debank="aws-optimus-1:/home/tangli/$local_dir" + remote_work="aws-optimus-1:$remote_dir/$local_dir" elif [ $# -eq 1 ]; then - remote_debank="aws-optimus-$1:/home/tangli/$local_dir" + remote_work="aws-optimus-$1:$remote_dir/$local_dir" + elif [ $# -eq 2 ]; then + remote_work="aws-optimus-$1:$remote_dir/$local_dir" + if [ "$2" = "back" ]; then + # swap local and remote + t=$local_work + local_work=$remote_work + remote_work=$t + else + echo "Invalid argument! should be 'back'" + exit(1) + fi else - echo 'error!' + echo "invalid argument!" + exit(1) fi - rsync_exclude="$local_debank/rsync_exclude.txt" + rsync_exclude="$local_work/rsync_exclude.txt" if [ -f $rsync_exclude ]; then - rsync -r -h -v --exclude-from=$rsync_exclude --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank + rsync -r -h -v --exclude-from=$rsync_exclude --exclude=/venv --exclude=/.vscode --exclude=/.git $local_work/ $remote_work else - rsync -r -h -v --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank + rsync -r -h -v --exclude=/venv --exclude=/.vscode --exclude=/.git $local_work/ $remote_work fi } diff --git a/nvim/lua/config/lsp-setup.lua b/nvim/lua/config/lsp-setup.lua index d1e1147..05e8359 100644 --- a/nvim/lua/config/lsp-setup.lua +++ b/nvim/lua/config/lsp-setup.lua @@ -41,15 +41,13 @@ local servers = { pylsp = {}, rust_analyzer = { - server = { - settings = { - ['rust-analyzer'] = { - cargo = { - loadOutDirsFromCheck = true, - }, - procMacro = { - enable = true, - }, + settings = { + ['rust-analyzer'] = { + cargo = { + loadOutDirsFromCheck = true, + }, + procMacro = { + enable = true, }, }, }, @@ -61,6 +59,11 @@ local servers = { end, }, }), + beancount = { + init_options = { + journal_file = "", + } + } } local settings = { diff --git a/nvim/lua/config/nvim_cmp.lua b/nvim/lua/config/nvim_cmp.lua index 61c8bff..83a5703 100644 --- a/nvim/lua/config/nvim_cmp.lua +++ b/nvim/lua/config/nvim_cmp.lua @@ -24,7 +24,7 @@ cmp.setup({ mapping = cmp.mapping.preset.insert({ [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), + [''] = cmp.mapping.complete(), --[""] = cmp.mapping.close(), -- [''] = function(fallback) -- fallback() @@ -34,12 +34,10 @@ cmp.setup({ select = true, }), [''] = cmp.mapping.confirm({ select = true }), + -- [''] = cmp.mapping.select_next_item(), + -- [''] = cmp.mapping.select_prev_item(), --}, }), - --mapping = { - ----[''] = cmp.mapping.select_next_item(), - ----[''] = cmp.mapping.select_prev_item(), - sources = { { name = 'nvim_lsp' }, { name = 'buffer' }, diff --git a/setup.sh b/setup.sh index d686011..b5d3cc2 100755 --- a/setup.sh +++ b/setup.sh @@ -182,7 +182,7 @@ function recover() { } function post_recover() { - mkdir -p ~/.1password && ln -s ~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock ~/.1password/agent.sock + mkdir -p ~/.1password && ln -s /Users/d0zingcat/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock /Users/d0zingcat/.1password/agent.sock } option=$1