From f1f349f7ec7b71c2689038fcc6ac0081cc26b148 Mon Sep 17 00:00:00 2001 From: Lee Tang Date: Thu, 15 Sep 2022 12:09:29 +0800 Subject: [PATCH] update Signed-off-by: Lee Tang --- .zshrc | 14 ++++++++++---- nvim/init.lua | 8 ++++---- nvim/lua/config/nvim_cmp.lua | 6 +++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.zshrc b/.zshrc index e94c486..775ecee 100644 --- a/.zshrc +++ b/.zshrc @@ -134,16 +134,22 @@ function klogs() { } function rsync_debank() { + local_debank=`pwd` + local_dir=${PWD##*/} + local_dir=${local_dir:-/} if [ $# -eq 0 ]; then - remote_debank="aws-optimus-1:/home/tangli/DeBankCore" + remote_debank="aws-optimus-1:/home/tangli/$local_dir" elif [ $# -eq 1 ]; then - remote_debank="aws-optimus-$1:/home/tangli/DeBankCore" + remote_debank="aws-optimus-$1:/home/tangli/$local_dir" else echo 'error!' fi - local_debank="$HOME/Workspace/employment/debank/DeBankCore" rsync_exclude="$local_debank/rsync_exclude.txt" - rsync -r -h -v --exclude-from=$rsync_exclude --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank + if [ -f $rsync_exclude ]; then + rsync -r -h -v --exclude-from=$rsync_exclude --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank + else + rsync -r -h -v --exclude=/venv --exclude=/.vscode --exclude=/.git $local_debank/ $remote_debank + fi } #export LESS_TERMCAP_so=$'\E[30;43m' diff --git a/nvim/init.lua b/nvim/init.lua index 10c1012..9fef173 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -152,10 +152,10 @@ map('i', '', '') -- map('n', 'e', '1w') -- map('n', 'p', ':wincmd p') -map('i', '', 'copilot#Accept()', { expr = true }) -vim.g.copilot_no_tab_map = 1 -vim.g.copilot_no_maps = 1 -vim.g.copilot_assume_mapped = 1 +-- map('i', '', 'copilot#Accept()', { expr = true }) +-- vim.g.copilot_no_tab_map = 1 +-- vim.g.copilot_no_maps = 1 +-- vim.g.copilot_assume_mapped = 1 require('plugins') require('funcs') diff --git a/nvim/lua/config/nvim_cmp.lua b/nvim/lua/config/nvim_cmp.lua index 9f8ba75..61c8bff 100644 --- a/nvim/lua/config/nvim_cmp.lua +++ b/nvim/lua/config/nvim_cmp.lua @@ -26,9 +26,9 @@ cmp.setup({ [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete(), --[""] = cmp.mapping.close(), - [''] = function(fallback) - fallback() - end, + -- [''] = function(fallback) + -- fallback() + -- end, [''] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true,