diff --git a/.zshrc b/.zshrc index cba8283..3220b5d 100644 --- a/.zshrc +++ b/.zshrc @@ -44,7 +44,8 @@ antigen bundle pip #antigen bundle pipenv antigen bundle asdf #antigen bundle dotenv -antigen bundle poetry +# antigen bundle poetry +antigen bundle "MichaelAquilina/zsh-autoswitch-virtualenv" antigen bundle nvim antigen bundle Aloxaf/fzf-tab antigen bundle wbingli/zsh-wakatime @@ -159,9 +160,9 @@ function rsync_work() { fi 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_work/ $remote_work + rsync -rvht --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_work/ $remote_work + rsync -rvht --exclude=/venv --exclude=/.vscode --exclude=/.git $local_work/ $remote_work fi } diff --git a/nvim/init.lua b/nvim/init.lua index 9fef173..d27318f 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -53,6 +53,7 @@ cmd( ) cmd([[iabbrev pdb import pdb; pdb.set_trace()]]) +cmd([[iabbrev ipdb import ipdb; ipdb.set_trace()]]) -- auto compile packer cmd([[ augroup packer_user_config diff --git a/nvim/lua/config/lsp-setup.lua b/nvim/lua/config/lsp-setup.lua index 05e8359..2f0f380 100644 --- a/nvim/lua/config/lsp-setup.lua +++ b/nvim/lua/config/lsp-setup.lua @@ -4,7 +4,8 @@ local mappings = { gd = 'lua require"telescope.builtin".lsp_definitions({jump_type="vsplit"})', gi = 'lua require"telescope.builtin".lsp_implementations({jump_type="vsplit"})', gr = 'lua require"telescope.builtin".lsp_references({jump_type="vsplit"})', - go = 'lua require"telescope.builtin".lsp_document_symbols({jump_type="vsplit"})' + go = 'lua require"telescope.builtin".lsp_document_symbols({jump_type="vsplit"})', + ['f'] = 'lua vim.lsp.buf.format({async=true})', } local servers = { @@ -23,7 +24,7 @@ local servers = { }, eslint = {}, jsonls = {}, - clangd = require('nvim-lsp-setup.clangd_extensions').setup(), + clangd = {}, gopls = { settings = { golsp = {