Skip to content

Commit

Permalink
feat: add matze/vim-move
Browse files Browse the repository at this point in the history
also remove some install scripts
  • Loading branch information
jiangyinzuo committed Apr 11, 2024
1 parent a0f5852 commit 5cd1c50
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 126 deletions.
4 changes: 0 additions & 4 deletions install/setup-bash.sh

This file was deleted.

3 changes: 0 additions & 3 deletions install/setup-cmake.sh

This file was deleted.

2 changes: 1 addition & 1 deletion install/setup-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
soft_link_files=(
.vim .ripgreprc .globalrc .tmux.conf .config/ctags .config/lazygit
.config/vifm .gitconfig .gitconfig-ict .config/himalaya .config/clangd
.config/nnn/plugins .config/nvim
.config/nnn/plugins .config/nvim .condarc
)

echo_green() {
Expand Down
10 changes: 0 additions & 10 deletions install/setup-python.sh

This file was deleted.

3 changes: 0 additions & 3 deletions install/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@ apt-get install -y libgtk-3-dev libxt-dev vim-gtk3 ripgrep fd-find tree bat node
# See: https://github.com/phiresky/ripgrep-all/issues/113
# apt install ripgrep pandoc poppler-utils ffmpeg

# checkrepo.py needs GitPython
pip3 install GitPython

# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
cargo install git-delta
1 change: 1 addition & 0 deletions root/.config/nvim/lua/plugins/vimplug.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ local M = {
end
},
'justinmk/vim-sneak',
'matze/vim-move',
'ap/vim-css-color',
{
'LunarWatcher/auto-pairs',
Expand Down
9 changes: 9 additions & 0 deletions root/.vim/doc/mydoc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ ocaml: ocaml-lsp(不直接通过`opam user-setup install`使用merlin)

https://github.com/ocaml-ppx/ocamlformat

bash ~

npm i -g bash-language-server
sudo apt install shellcheck -y

cmake ~

pip install cmake-language-server cmakelang

-------------------------------------------------------------------------------
*fzf.vim*

Expand Down
17 changes: 0 additions & 17 deletions root/.vim/vimrc.d/ai.vim
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,6 @@ if v:version >= 900

" Load the plugin on InsertEnter
" autocmd InsertEnter * ++once call plug#load('copilot.vim')

" showkey -a 查看组合键的编码
" M-c M-[ 存在bug
" 在终端下按下 ALT+X,那么终端软件将会发送 <ESC>x 两个字节过去,字节码为:0x27, 0x78。
" See Also:
" https://superuser.com/questions/1554782/why-was-the-meta-key-replaced-on-modern-terminals
" https://vi.stackexchange.com/questions/2350/how-to-map-alt-key
" https://www.skywind.me/blog/archives/2021
" :h set-termcap
execute "set <M-n>=\en"
execute "set <M-p>=\ep"
execute "set <M-x>=\ex"
execute "set <M-w>=\ew"
execute "set <M-l>=\el"
imap <M-p> <Plug>(copilot-previous)
imap <M-n> <Plug>(copilot-next)
imap <M-x> <Plug>(copilot-dismiss)
Expand All @@ -43,9 +29,6 @@ if v:version >= 900
endif
let g:codeium_disable_bindings = 1
command -nargs=0 CodeiumChat call codeium#Chat()
execute "set <M-n>=\en"
execute "set <M-p>=\ep"
execute "set <M-x>=\ex"
if g:no_plug == 0
imap <script><silent><nowait><expr> <Tab> codeium#Accept()
imap <M-p> <Plug>(codeium-previous)
Expand Down
19 changes: 19 additions & 0 deletions root/.vim/vimrc.d/plugin_setup.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
" Plug 'justinmk/vim-sneak'
let g:sneak#label = 1
let g:sneak#s_next = 1

" showkey -a 查看组合键的编码
" M-c M-[ 存在bug
" 在终端下按下 ALT+X,那么终端软件将会发送 <ESC>x 两个字节过去,字节码为:0x27, 0x78。
" See Also:
" https://superuser.com/questions/1554782/why-was-the-meta-key-replaced-on-modern-terminals
" https://vi.stackexchange.com/questions/2350/how-to-map-alt-key
" https://www.skywind.me/blog/archives/2021
" :h set-termcap
" 给copilot.vim, vim-move, codeium.vim插件使用
execute "set <M-h>=\eh"
execute "set <M-j>=\ej"
execute "set <M-k>=\ek"
execute "set <M-l>=\el"
execute "set <M-n>=\en"
execute "set <M-p>=\ep"
execute "set <M-x>=\ex"
execute "set <M-w>=\ew"

" default s: delete [count] charaters and start insert
nmap s <Plug>Sneak_s
nmap S <Plug>Sneak_S
Expand Down
2 changes: 2 additions & 0 deletions root/.vim/vimrc.d/vimplug.vim
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ call plug#begin(g:vim_plug_dir)

" similar Plugin: Plug 'easymotion/vim-easymotion'
Plug 'justinmk/vim-sneak'
Plug 'matze/vim-move'

if has('nvim') || v:version >= 801
Plug 'ap/vim-css-color'
Expand Down Expand Up @@ -222,6 +223,7 @@ if !exists('g:vscode')
source ~/.vim/vimrc.d/fzf.vim

" require +job
" pip3 install doq --break-system-packages
Plug 'heavenshell/vim-pydocstring', { 'for': 'python' }

" vim和jupyter notebook(运行在浏览器上)同步,
Expand Down
88 changes: 0 additions & 88 deletions root/scripts/checkrepo.py

This file was deleted.

0 comments on commit 5cd1c50

Please sign in to comment.