From 5cd1c5022e615462330df5634b5285b7b213692b Mon Sep 17 00:00:00 2001
From: jiangyinzuo <jiangyinzuo@foxmail.com>
Date: Thu, 11 Apr 2024 19:08:45 +0800
Subject: [PATCH] feat: add matze/vim-move

also remove some install scripts
---
 install/setup-bash.sh                     |  4 --
 install/setup-cmake.sh                    |  3 -
 install/setup-common.sh                   |  2 +-
 install/setup-python.sh                   | 10 ---
 install/setup-ubuntu.sh                   |  3 -
 root/.config/nvim/lua/plugins/vimplug.lua |  1 +
 root/.vim/doc/mydoc.txt                   |  9 +++
 root/.vim/vimrc.d/ai.vim                  | 17 -----
 root/.vim/vimrc.d/plugin_setup.vim        | 19 +++++
 root/.vim/vimrc.d/vimplug.vim             |  2 +
 root/scripts/checkrepo.py                 | 88 -----------------------
 11 files changed, 32 insertions(+), 126 deletions(-)
 delete mode 100755 install/setup-bash.sh
 delete mode 100755 install/setup-cmake.sh
 delete mode 100755 install/setup-python.sh
 delete mode 100755 root/scripts/checkrepo.py

diff --git a/install/setup-bash.sh b/install/setup-bash.sh
deleted file mode 100755
index f56a0f3..0000000
--- a/install/setup-bash.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-npm i -g bash-language-server
-sudo apt install shellcheck -y
diff --git a/install/setup-cmake.sh b/install/setup-cmake.sh
deleted file mode 100755
index 1caf9e3..0000000
--- a/install/setup-cmake.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pip install cmake-language-server cmakelang
diff --git a/install/setup-common.sh b/install/setup-common.sh
index 9be6f6e..dc3742f 100755
--- a/install/setup-common.sh
+++ b/install/setup-common.sh
@@ -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() {
diff --git a/install/setup-python.sh b/install/setup-python.sh
deleted file mode 100755
index e804c52..0000000
--- a/install/setup-python.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/setup-common.sh
-
-soft_link_files+=( .condarc )
-
-setup
-
-# Docstring generator.
-pip3 install doq --break-system-packages
diff --git a/install/setup-ubuntu.sh b/install/setup-ubuntu.sh
index 3b40247..8189c58 100755
--- a/install/setup-ubuntu.sh
+++ b/install/setup-ubuntu.sh
@@ -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
diff --git a/root/.config/nvim/lua/plugins/vimplug.lua b/root/.config/nvim/lua/plugins/vimplug.lua
index 90361e7..798d120 100644
--- a/root/.config/nvim/lua/plugins/vimplug.lua
+++ b/root/.config/nvim/lua/plugins/vimplug.lua
@@ -53,6 +53,7 @@ local M = {
 		end
 	},
 	'justinmk/vim-sneak',
+	'matze/vim-move',
 	'ap/vim-css-color',
 	{
 		'LunarWatcher/auto-pairs',
diff --git a/root/.vim/doc/mydoc.txt b/root/.vim/doc/mydoc.txt
index 3f04247..6080458 100644
--- a/root/.vim/doc/mydoc.txt
+++ b/root/.vim/doc/mydoc.txt
@@ -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*
 
diff --git a/root/.vim/vimrc.d/ai.vim b/root/.vim/vimrc.d/ai.vim
index 195a898..2b1a8f5 100644
--- a/root/.vim/vimrc.d/ai.vim
+++ b/root/.vim/vimrc.d/ai.vim
@@ -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)
@@ -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)
diff --git a/root/.vim/vimrc.d/plugin_setup.vim b/root/.vim/vimrc.d/plugin_setup.vim
index 9352d64..f10aef8 100644
--- a/root/.vim/vimrc.d/plugin_setup.vim
+++ b/root/.vim/vimrc.d/plugin_setup.vim
@@ -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
diff --git a/root/.vim/vimrc.d/vimplug.vim b/root/.vim/vimrc.d/vimplug.vim
index 7d8eefc..21f4504 100644
--- a/root/.vim/vimrc.d/vimplug.vim
+++ b/root/.vim/vimrc.d/vimplug.vim
@@ -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'
@@ -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(运行在浏览器上)同步，
diff --git a/root/scripts/checkrepo.py b/root/scripts/checkrepo.py
deleted file mode 100755
index fe584ee..0000000
--- a/root/scripts/checkrepo.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python3
-
-import git
-import sys
-import os
-
-
-def is_git_worktree(repo_path):
-    """
-    检查指定仓库是否为 Git worktree
-    """
-    git_path = os.path.join(repo_path, '.git')
-    if os.path.isfile(git_path):
-        with open(git_path, 'r') as file:
-            content = file.read()
-            if content.startswith('gitdir:'):
-                return True
-    return False
-
-
-def check_git_status(repo_path='.') -> bool:
-    try:
-        repo = git.Repo(repo_path)
-    except git.InvalidGitRepositoryError:
-        print("无效的Git仓库：", repo_path)
-        return False
-
-    # 检查是否有未提交的更改
-    if repo.is_dirty(untracked_files=True):
-        print("存在未提交的更改或未跟踪的文件")
-        print(repo.git.status())
-        return False
-
-    # 检查所有本地分支
-    for branch in repo.branches:
-        if branch.tracking_branch() is None:
-            print(f"分支 {branch} 没有追踪的远程分支。")
-            return False
-
-        # 比较本地分支和远程分支
-        commits_ahead = list(repo.iter_commits(
-            f'{branch}..{branch.tracking_branch()}'))
-        commits_behind = list(repo.iter_commits(
-            f'{branch.tracking_branch()}..{branch}'))
-
-        if commits_ahead:
-            print(
-                f"分支 {branch} 落后于 {branch.tracking_branch()} {len(commits_ahead)} 个提交。")
-            sys.exit(1)
-        if commits_behind:
-            print(
-                f"分支 {branch} 超前于 {branch.tracking_branch()} {len(commits_behind)} 个提交。")
-            return False
-
-    print("所有检查完成，本地仓库与远程仓库同步。")
-    return True
-
-
-if __name__ == "__main__":
-    import argparse
-    # checkrepo.py status --repo /path/to/repo
-    # checkrepo.py isworktree --repo /path/to/repo
-    arg_parser = argparse.ArgumentParser(
-        description='检查 Git 仓库状态',
-        prog=__file__)
-    arg_parser.add_argument(
-        'command', help="""
-            status: 检查 Git 仓库状态
-            isworktree: 检查是否为 Git worktree
-            safersync: 同时检查 Git 仓库状态和是否为 Git worktree，仅当Git仓库没有未提交更改、且为Git worktree时，返回0
-            """, choices=['status', 'isworktree', 'safersync'])
-    arg_parser.add_argument(
-        '--repo', help='Git 仓库路径', default='.')
-
-    args = arg_parser.parse_args()
-    match args.command:
-        case 'status':
-            if not check_git_status(args.repo):
-                sys.exit(1)
-        case 'isworktree':
-            print(is_git_worktree(args.repo))
-        case 'safersync':
-            if not (is_git_worktree(args.repo) and check_git_status(args.repo)):
-                print("不是 Git worktree")
-                sys.exit(1)
-        case _:
-            print("未知命令")
-            sys.exit(1)