From d8054026033e1ff492dee7bf92b35627e62b9979 Mon Sep 17 00:00:00 2001
From: We-unite <3205135446@qq.com>
Date: Sat, 6 Jan 2024 18:28:24 +0800
Subject: Update vim scripts in use and my shell scripts.

---
 README.md                 |   3 ++
 mypath/compare.sh         |  14 ++++++
 mypath/count.sh           |  30 ++++++++++++
 mypath/dif.sh             |  10 ++++
 mypath/exe.sh             |  24 ++++++++++
 mypath/g.sh               |  22 +++++++++
 mypath/gitadd.sh          |  45 ++++++++++++++++++
 mypath/gitk.sh            |   2 +
 mypath/md2html.sh         |  29 ++++++++++++
 mypath/runjv.c            |  39 ++++++++++++++++
 mypath/runjv.sh           |  17 +++++++
 vim/vimrc                 |  12 ++---
 vim/vimrcs/autocmd.vim    |  81 --------------------------------
 vim/vimrcs/codecmd.vim    | 116 ++++++++++++++++++++++++++++++++++++++++++++++
 vim/vimrcs/fuck.vim       |  69 ---------------------------
 vim/vimrcs/match.vim      |   9 ++--
 vim/vimrcs/myset.vim      |  57 ++++++-----------------
 vim/vimrcs/plugs.vim      |  52 +++++++++++----------
 vim/vimrcs/statusline.vim |  69 +++++++++++++++++++++++++++
 19 files changed, 475 insertions(+), 225 deletions(-)
 create mode 100644 README.md
 create mode 100755 mypath/compare.sh
 create mode 100755 mypath/count.sh
 create mode 100755 mypath/dif.sh
 create mode 100755 mypath/exe.sh
 create mode 100755 mypath/g.sh
 create mode 100755 mypath/gitadd.sh
 create mode 100755 mypath/gitk.sh
 create mode 100755 mypath/md2html.sh
 create mode 100644 mypath/runjv.c
 create mode 100755 mypath/runjv.sh
 delete mode 100644 vim/vimrcs/autocmd.vim
 create mode 100644 vim/vimrcs/codecmd.vim
 delete mode 100644 vim/vimrcs/fuck.vim
 create mode 100644 vim/vimrcs/statusline.vim

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3fd6798
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+[Pardon?]
+
+这里是我自己用的一些代码的暂存。
diff --git a/mypath/compare.sh b/mypath/compare.sh
new file mode 100755
index 0000000..2643b42
--- /dev/null
+++ b/mypath/compare.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+file1="file1.txt"
+file2="file2.txt"
+
+diff_output=$(diff "$file1" "$file2")
+
+if [ -z "$diff_output" ]; then
+  echo "两个文件完全一致"
+else
+  echo "两个文件不完全一致"
+  echo "$diff_output"
+fi
+
diff --git a/mypath/count.sh b/mypath/count.sh
new file mode 100755
index 0000000..5105b42
--- /dev/null
+++ b/mypath/count.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+count_lines() {
+    local filename=$1
+    local sum=0
+    local buf
+
+    while IFS= read -r buf; do
+        ((sum++))
+    done < "$filename"
+
+    echo "$sum"
+}
+
+extensions=("c" "tex" "cpp" "py" "h")
+sum=0
+
+for extension in "${extensions[@]}"; do
+    files=$(find . -type f -name "*.$extension")
+    for file in $files; do
+        tmp=$(count_lines "$file")
+        ((sum+=tmp))
+        echo "文件路径: $file"
+        echo "行数: $tmp"
+        echo
+    done
+done
+
+echo "总行数: $sum"
+
diff --git a/mypath/dif.sh b/mypath/dif.sh
new file mode 100755
index 0000000..138522e
--- /dev/null
+++ b/mypath/dif.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+diff_output=$(diff "$1" "$2")
+
+if [ -z "$diff_output" ];then
+    echo "The two files are totally the same!"
+else
+    echo "There's something different: "
+    echo "$diff_output"
+fi
+exit 0
diff --git a/mypath/exe.sh b/mypath/exe.sh
new file mode 100755
index 0000000..0588058
--- /dev/null
+++ b/mypath/exe.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# 检查参数个数
+if [ $# -ne 1 ]; then
+    echo "参数个数错误！"
+    exit 1
+fi
+
+if [ $1 == "run" ]; then
+    for file in *.sh; do
+        filename="${file%.*}"
+        ln -s "$file" "$filename"
+    done
+    echo "软链接创建完成！"
+elif [ $1 == "del" ];then
+    for file in *.sh; do
+        filename="${file%.*}"
+        rm -f "$filename"
+    done
+    echo "软链接删除成功！"
+else
+    echo "参数错误！"
+    exit 1
+fi
diff --git a/mypath/g.sh b/mypath/g.sh
new file mode 100755
index 0000000..27a1bc0
--- /dev/null
+++ b/mypath/g.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# 检查参数数量,小于一报错
+# if [ $# -e 0 ]; then
+#   echo "请提供一个文件名作为参数"
+#   exit 1
+# fi
+
+filename=$1
+extension="${filename##*.}"  # 获取文件名的扩展名部分
+
+# 检查文件后缀并执行相应的编译命令
+if [ "$extension" = "c" ]; then
+  gcc -g -o "${filename%.*}" -g "$filename" $2
+elif [ "$extension" = "cpp" ]; then
+  g++ -g -o "${filename%.*}" -g "$filename" $2
+else
+  echo "不支持的文件类型"
+  exit 1
+fi
+
+exit 0
diff --git a/mypath/gitadd.sh b/mypath/gitadd.sh
new file mode 100755
index 0000000..79e750f
--- /dev/null
+++ b/mypath/gitadd.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+read -p "Local repo name: " local_name
+read -p "Remote repo name: " remote_name
+
+# 远程仓库创建
+tmp="ssh aliyun-git git init --bare $remote_name.git"
+eval "$tmp"
+
+# 本地仓库创建
+mkdir "$local_name"
+cd "$local_name"
+git init
+
+# 本地仓库初始化
+# 编写.gitignore
+cat > .gitignore << EOF
+*.sh
+*.bat
+*.exe
+*.[oa]
+*.pyc
+__pycache__
+*.vscode
+*.swp
+EOF
+
+# 编写push.sh
+cat > push.sh << EOF
+git add .
+git commit
+git push
+EOF
+chmod +x push.sh
+
+# 提交初始化commit
+git add .
+git commit -m "Initial commit"
+tmp="git remote add origin aliyun-git:$remote_name.git"
+eval "$tmp"
+git push --set-upstream origin master
+git push
+
+echo "Success!"
+
diff --git a/mypath/gitk.sh b/mypath/gitk.sh
new file mode 100755
index 0000000..aa6e515
--- /dev/null
+++ b/mypath/gitk.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+git log --oneline --all --graph
diff --git a/mypath/md2html.sh b/mypath/md2html.sh
new file mode 100755
index 0000000..bb316f1
--- /dev/null
+++ b/mypath/md2html.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+##########################################################################
+# File Name    : md2html.sh
+# Encoding     : utf-8
+# Author       : We-unite
+# Email        : weunite1848@gmail.com
+# Created Time : 2023-12-15
+##########################################################################
+
+# origin是输入的第一个参数，指源文件名
+# src是原文件名前边加一个.，是源文件的复制
+# dst是原文件名的md后缀改成html
+origin=$1
+src="."$origin
+dst=${origin%.*}".html"
+title="$2"
+
+cp $origin $src
+# src中所有的“```...”替换成“```”，其中...指换行前的所有内容
+sed -i 's/```.*$/```/g' $src
+pandoc -s $src -o $dst --metadata title="$title"
+rm $src
+
+sed -i '/<style/,/<\/style>/d' $dst
+sed -i 's/<body>/<body>\n<div class="pandoc">\n<div class="main">/' $dst
+sed -i 's/<\/body>/<script src="https:\/\/www.qin-juan-ge-zhu.top\/common\/js\/comment.js"><\/script>\n<\/div>\n<\/div>\n<\/body>/' $dst
+sed -i 's/\t/    /g' $dst
+sed -i 's/<\/head>/<link rel="stylesheet" href="https:\/\/www.qin-juan-ge-zhu.top\/common\/CSS\/pandoc.css">\n<script type="text\/javascript" src="https:\/\/www.qin-juan-ge-zhu.top\/common\/script4code.js"><\/script><\/head>/' $dst
diff --git a/mypath/runjv.c b/mypath/runjv.c
new file mode 100644
index 0000000..74efb72
--- /dev/null
+++ b/mypath/runjv.c
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _WIN32
+#define DELETE_COMMAND "del"
+#else
+#define DELETE_COMMAND "rm -rf"
+#endif
+
+
+int main(int argc, char* argv[])
+{
+    char* command;
+    if(argc!=2)
+    {
+        printf("Number of parameters Wrong!\n");
+        printf("Usage: runjv <filename>\n");
+        return 1;
+    }
+    command=(char*)malloc(sizeof(char)*(strlen(argv[1])+10));
+
+    char* classname=strtok(argv[1],".");
+
+    sprintf(command,"javac %s.java",classname);
+    int command_status=system(command);
+
+    if(command_status!=0)
+    {
+        printf("Compile Failed!\n");
+        return -1;
+    }
+    sprintf(command,"java %s",classname);
+    system(command);
+
+    sprintf(command,"%s %s.class",DELETE_COMMAND,classname);
+    system(command);
+    return 0;
+}
diff --git a/mypath/runjv.sh b/mypath/runjv.sh
new file mode 100755
index 0000000..56eaa05
--- /dev/null
+++ b/mypath/runjv.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# 检查参数数量
+if [ $# -ne 1 ]; then
+  echo "请提供一个Java文件名作为参数"
+  exit 1
+fi
+
+filename=$1
+classname="${filename%.*}"
+javac "$filename"
+if [ $? -eq 0 ]; then
+    java "$classname"
+    rm "$classname.class"
+else
+    echo "Java文件编译失败！"
+fi
diff --git a/vim/vimrc b/vim/vimrc
index 34bb9cc..0b19922 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,9 +13,9 @@ if filereadable(expand("/etc/vim/vimrcs/match.vim"))
   source /etc/vim/vimrcs/match.vim
 endif
 
-" 不知道是什么
-if filereadable(expand("/etc/vim/vimrcs/fuck.vim"))
-  source /etc/vim/vimrcs/fuck.vim
+" 状态栏与标签页设置
+if filereadable(expand("/etc/vim/vimrcs/statusline.vim"))
+  source /etc/vim/vimrcs/statusline.vim
 endif
 
 " 自己设的快捷键
@@ -23,7 +23,7 @@ if filereadable(expand("/etc/vim/vimrcs/keybind.vim"))
   source /etc/vim/vimrcs/keybind.vim
 endif
 
-" 自动命令
-if filereadable(expand("/etc/vim/vimrcs/autocmd.vim"))
-  source /etc/vim/vimrcs/autocmd.vim
+" 代码设置
+if filereadable(expand("/etc/vim/vimrcs/codecmd.vim"))
+  source /etc/vim/vimrcs/codecmd.vim
 endif
diff --git a/vim/vimrcs/autocmd.vim b/vim/vimrcs/autocmd.vim
deleted file mode 100644
index c974344..0000000
--- a/vim/vimrcs/autocmd.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-autocmd BufReadPost,BufWritePre *.html,*.c,*.cpp,*.vim normal gg=G
-"autocmd FileType * :normal gg=G<c-o><c-o>
-autocmd Filetype c,cpp map <buffer><C-d> 0xx<esc>ta
-autocmd Filetype python map <buffer><C-d> 0xx<esc>ta
-
-"新建.c,.h,.sh,.java文件，自动插入文件头 
-autocmd BufNewFile *.cpp,*.[ch],*.sh exec ":call SetTitle()" 
-func SetTitle() 
-    if &filetype == 'sh' 
-        call setline(1,"#!/bin/bash")
-        call append(line("."),   "" )
-        call append(line(".")+1, "\##########################################################################" )
-        call append(line(".")+2, "\# File Name    : ".expand("%")) 
-        call append(line(".")+3, "\# Encoding     : utf-8") 
-        call append(line(".")+4, "\# Author       : We-unite") 
-        call append(line(".")+5, "\# Email        : weunite1848@gmail.com")
-        call append(line(".")+6, "\# Created Time : ".strftime("%Y-%m-%d",localtime()))    
-        call append(line(".")+7, "\##########################################################################" )
-        call append(line(".")+8, "")
-    elseif &filetype =='py'
-        call setline(1,"#!/usr/bin/env python")
-        call append(line("."),   "" )
-        call append(line(".")+1, "\##########################################################################" )
-        call append(line(".")+2, "\# File Name    : ".expand("%")) 
-        call append(line(".")+3, "\# Encoding     : utf-8") 
-        call append(line(".")+4, "\# Author       : We-unite") 
-        call append(line(".")+5, "\# Email        : weunite1848@gmail.com") 
-        call append(line(".")+6, "\# Created Time : ".strftime("%Y-%m-%d",localtime()))    
-        call append(line(".")+7, "\##########################################################################" )
-        call append(line(".")+8, "")
-    else 
-        call setline(1, "/*************************************************************************") 
-        call append(line("."),   "  > File Name    : ".expand("%")) 
-        call append(line(".")+1, "  > Encoding     : utf-8")
-        call append(line(".")+2, "  > Author       : We-unite") 
-        call append(line(".")+3, "  > Email        : weunite1848@gmail.com ") 
-        call append(line(".")+4, "  > Created Time : ".strftime("%Y-%m-%d-%H:%M:%S",localtime()))
-        call append(line(".")+5, " ************************************************************************/") 
-        call append(line(".")+6, "")
-        if &filetype == 'cpp'
-            call append(line(".")+7, "#include <iostream>")
-            call append(line(".")+8, "using namespace std;")
-            call append(line(".")+9, "")
-        elseif &filetype == 'c'
-            call append(line(".")+7, "#include <stdio.h>")
-            call append(line(".")+8, "#include <stdlib.h>")
-            call append(line(".")+9, "")
-        endif
-    endif
-    " 光标移动到文件末尾
-    normal G
-endfunc 
-
-"C，C++ 按F5编译运行
-map <F5> :call CompileRunGcc()<CR>
-
-func CompileRunGcc()
-    exec "w"
-    if &filetype == 'c'
-        exec "!gcc -g -o %< %"
-        exec "! ./%<"
-    elseif &filetype == 'cpp'
-        exec "!g++ -g -o %< %"
-        exec "! ./%<"
-        "elseif &filetype == 'java' 
-    "    exec "!javac %" 
-    "    exec "!java %<"
-    elseif &filetype == 'sh'
-        :!./%
-    elseif &filetype == 'python'
-        exec "!python %"
-    endif
-endfunc
-
-"C,C++的调试
-map <F8> :call RunGdb()<CR>
-
-func RunGdb()
-    exec "w"
-    exec "!gdb ./%<"
-endfunc
diff --git a/vim/vimrcs/codecmd.vim b/vim/vimrcs/codecmd.vim
new file mode 100644
index 0000000..82b0bfe
--- /dev/null
+++ b/vim/vimrcs/codecmd.vim
@@ -0,0 +1,116 @@
+set expandtab		"设置tab键替换为tabstop规定的空格数
+set tabstop=4
+set shiftwidth=4	"设置tab的间隔
+set softtabstop=4
+autocmd FileType asm,nasm,vim set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab
+
+set showmatch		"在输入括号时光标会短暂地跳到与之相匹配的括号处
+set wrap		"设置自动折行
+set textwidth=500	"设置自动换行的长度
+set lbr
+"set autoindent		"设置自动缩进
+"set smartindent	"设置智能缩进
+"set foldmethod=indent	"设置按缩进折叠代码
+set foldmethod=syntax	"设置按语法折叠代码
+"set foldlevel=99	"折叠层级
+"在打开文件时不要折叠
+set nofoldenable
+
+
+"自动补全配置
+autocmd FileType python set omnifunc=pythoncomplete#Complete
+autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
+autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
+autocmd FileType css set omnifunc=csscomplete#CompleteCSS
+autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
+autocmd FileType php set omnifunc=phpcomplete#CompletePHP
+autocmd FileType c set omnifunc=ccomplete#Complete
+" 要求格式化之后的代码不要移动光标，并且不要删除换行符和空行，保留原来的视图
+autocmd BufReadPost,BufWritePre *.html,*.vim normal! g1G=G`"z<CR>
+" 在保存时自动使用clang-format格式化代码
+augroup FormatAutocmd
+    autocmd!
+    autocmd BufWritePre *.c,*.cpp :normal! ggVG
+    autocmd BufWritePre *.c,*.cpp :let save_cursor = getpos(".")
+    autocmd BufWritePre *.c,*.cpp :ClangFormat
+    autocmd BufWritePost *.c,*.cpp :call setpos('.', save_cursor)
+augroup END
+" 定义ClangFormat命令
+command! -nargs=0 ClangFormat :silent %!clang-format -style="{IndentWidth: 4}"
+" 映射gg=G到ClangFormat
+autocmd FileType c,cpp nnoremap <buffer> gg=G :ClangFormat<CR>
+
+"新建.c,.h,.sh,.java文件，自动插入文件头
+autocmd BufNewFile *.cpp,*.[ch],*.sh exec ":call SetTitle()"
+func SetTitle()
+    if &filetype == 'sh' 
+        call setline(1,"#!/bin/bash")
+        call append(line("."),   "" )
+        call append(line(".")+1, "\##########################################################################" )
+        call append(line(".")+2, "\# File Name    : ".expand("%")) 
+        call append(line(".")+3, "\# Encoding     : utf-8") 
+        call append(line(".")+4, "\# Author       : We-unite") 
+        call append(line(".")+5, "\# Email        : weunite1848@gmail.com")
+        call append(line(".")+6, "\# Created Time : ".strftime("%Y-%m-%d",localtime()))
+        call append(line(".")+7, "\##########################################################################" )
+        call append(line(".")+8, "")
+    elseif &filetype =='py'
+        call setline(1,"#!/usr/bin/env python")
+        call append(line("."),   "" )
+        call append(line(".")+1, "\##########################################################################" )
+        call append(line(".")+2, "\# File Name    : ".expand("%"))
+        call append(line(".")+3, "\# Encoding     : utf-8")
+        call append(line(".")+4, "\# Author       : We-unite")
+        call append(line(".")+5, "\# Email        : weunite1848@gmail.com")
+        call append(line(".")+6, "\# Created Time : ".strftime("%Y-%m-%d",localtime()))
+        call append(line(".")+7, "\##########################################################################" )
+        call append(line(".")+8, "")
+    else
+        call setline(1, "/*************************************************************************")
+        call append(line("."),   "  > File Name    : ".expand("%"))
+        call append(line(".")+1, "  > Encoding     : utf-8")
+        call append(line(".")+2, "  > Author       : We-unite") 
+        call append(line(".")+3, "  > Email        : weunite1848@gmail.com ")
+        call append(line(".")+4, "  > Created Time : ".strftime("%Y-%m-%d %H:%M:%S",localtime()))
+        call append(line(".")+5, " ************************************************************************/")
+        call append(line(".")+6, "")
+        if &filetype == 'cpp'
+            call append(line(".")+7, "#include <iostream>")
+            call append(line(".")+8, "using namespace std;")
+            call append(line(".")+9, "")
+        elseif &filetype == 'c'
+            call append(line(".")+7, "#include <stdio.h>")
+            call append(line(".")+8, "#include <stdlib.h>")
+            call append(line(".")+9, "")
+        endif
+    endif
+    " 光标移动到文件末尾
+    normal G
+endfunc
+
+"C，C++编译运行
+map <leader>r :call CompileRunGcc()<CR>
+func CompileRunGcc()
+    exec "w"
+    if &filetype == 'c'
+        exec "!gcc -g -o %< %"
+        exec "! ./%<"
+    elseif &filetype == 'cpp'
+        exec "!g++ -g -o %< %"
+        exec "! ./%<"
+        "elseif &filetype == 'java'
+    "    exec "!javac %" 
+    "    exec "!java %<"
+    elseif &filetype == 'sh'
+        :!./%
+    elseif &filetype == 'python'
+        exec "!python %"
+    endif
+endfunc
+
+"C,C++调试
+map <leader>d :call RunGdb()<CR>
+func RunGdb()
+    exec "w"
+    exec "!gdb ./%<"
+endfunc
diff --git a/vim/vimrcs/fuck.vim b/vim/vimrcs/fuck.vim
deleted file mode 100644
index d149b0b..0000000
--- a/vim/vimrcs/fuck.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-set guitablabel=%{ShortTabLabel()}
-function ShortTabLabel ()
-    let bufnrlist = tabpagebuflist (v:lnum)
-    let label = bufname (bufnrlist[tabpagewinnr (v:lnum) -1])
-    let filename = fnamemodify (label, ':t')
-    return filename
-endfunction
-
-set tabline=%!MyTabLine()
-function MyTabLine()
-    let s = ''
-    for i in range(tabpagenr('$'))
-        " 选择高亮
-        if i + 1 == tabpagenr()
-            let s .= '%#TabLineSel#'
-        else
-            let s .= '%#TabLine#'
-        endif
-        " 设置标签页号 (用于鼠标点击)
-        let s .= '%' . (i + 1) . 'T'
-        " MyTabLabel() 提供完整路径标签 MyShortTabLabel 提供文件名标签
-        let s .= ' %{MyShortTabLabel(' . (i + 1) . ')} '
-    endfor
-    " 最后一个标签页之后用 TabLineFill 填充并复位标签页号
-    let s .= '%#TabLineFill#%T'
-    " 右对齐用于关闭当前标签页的标签
-    if tabpagenr('$') > 1
-        let s .= '%=%#TabLine#%999Xclose'
-    endif
-    return s
-endfunction
-" 文件名标签
-function MyShortTabLabel(n)
-    let buflist = tabpagebuflist(a:n)
-    let label = bufname (buflist[tabpagewinnr (a:n) -1])
-    let filename = fnamemodify (label, ':t')
-    return filename
-endfunction
-"完整路径标签
-function MyTabLabel(n)
-    let buflist = tabpagebuflist(a:n)
-    let winnr = tabpagewinnr(a:n)
-    return bufname(buflist[winnr - 1])
-endfunction
-
-" 状态栏显示git分支函数
-function! GitBranch()
-    " 获取当前所在分支名，注意不要保留开头的*和行末的空符号
-    let s:branch = system("git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \\(.*\\)/\\1/' | tr -d '\n' | tr -d ' '")
-    return strlen(s:branch) ? 'b: '.s:branch.'> ' : ''
-endfunction
-
-set laststatus=2 "显示状态栏(默认值为 1，无法显示状态栏)
-set statusline=%f%m%r%h%w\ >\ %{GitBranch()}%=\ <\ %{&ff}\ <\ %y\ <\ %l,%v\ <\ %p%%\ <\ lines=%L
-
-function! CurDir()
-    let curdir = substitute(getcwd(), '/Users/amir/', "~/", "g")
-    return curdir
-endfunction
-
-"标签样式
-"  TabLineFill  tab pages line, where there are no labels
-hi TabLineFill term=none
-hi TabLineFill ctermfg=DarkGrey
-hi TabLineFill guifg=#777777
-"  TabLineSel   tab pages line, active tab page label
-hi TabLineSel term=inverse
-hi TabLineSel cterm=none ctermfg=yellow ctermbg=Black
-hi TabLineSel gui=none guifg=yellow guibg=Black
diff --git a/vim/vimrcs/match.vim b/vim/vimrcs/match.vim
index 279a33f..b01f35d 100644
--- a/vim/vimrcs/match.vim
+++ b/vim/vimrcs/match.vim
@@ -1,11 +1,14 @@
 "各类符号自动匹配
+inoremap { {<CR>}<ESC>O
+" :inoremap { {}<ESC>i
+" :inoremap } <c-r>=ClosePair('}')<CR>
 :inoremap ( ()<ESC>i
 :inoremap ) <c-r>=ClosePair(')')<CR>
-:inoremap { {}<ESC>i
-:inoremap } <c-r>=ClosePair('}')<CR>
 :inoremap [ []<ESC>i
 :inoremap ] <c-r>=ClosePair(']')<CR>
- 
+:inoremap " ""<ESC>i
+:inoremap ' ''<ESC>i
+
 function ClosePair(char)
     if getline('.')[col('.') - 1] == a:char
         return "<Right>"
diff --git a/vim/vimrcs/myset.vim b/vim/vimrcs/myset.vim
index 37e65b5..1664ddb 100644
--- a/vim/vimrcs/myset.vim
+++ b/vim/vimrcs/myset.vim
@@ -1,52 +1,26 @@
-set expandtab            "设置tab键替换为tabstop规定的空格数
-set tabstop=4
-set shiftwidth=4         "设置tab的间隔
-                         "set softtabstop=4
-set sts=4
-set showmatch            "在输入括号时光标会短暂地跳到与之相匹配的括号处
-set wrap                 "设置自动折行
-set textwidth=80         "设置自动换行的长度
-set lbr
-"set autoindent          "设置自动缩进
-"set smartindent         "设置智能缩进
-"set foldmethod=indent   "设置按缩进折叠代码
-set foldmethod=syntax    "设置按语法折叠代码
-"set foldlevel=99        "折叠层级
-"nnoremap <space> za
-
-
 "set guifont=Monospace
 set guifont=:b:h16
 set encoding=utf-8
 set fileencoding=utf-8
 set fileencodings=ucs-bom,utf-8,GB18030,cp936,big5,euc-jp,euc-kr,latin1
 set fileformat=unix
-set helplang=cn          "帮助中文支持
-set mouse=a              " 设置鼠标
-set noeb                 " 去掉输入错误的提示声音
-set confirm              " 在处理未保存或只读文件的时候，弹出确认
+set helplang=cn		"帮助中文支持
+set mouse=a		" 设置鼠标
+set noeb		" 去掉输入错误的提示声音
+set confirm		" 在处理未保存或只读文件的时候，弹出确认
 set langmenu=zh_CN.UTF-8
-set scrolloff=3          " 光标移动到buffer的顶部和底部时保持3行距离
-
-"自动补全配置
-autocmd FileType python set omnifunc=pythoncomplete#Complete
-autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
-autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
-autocmd FileType css set omnifunc=csscomplete#CompleteCSS
-autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
-autocmd FileType php set omnifunc=phpcomplete#CompletePHP
-autocmd FileType c set omnifunc=ccomplete#Complete
+set scrolloff=3		" 光标移动到buffer的顶部和底部时保持3行距离
 
 set rnu "设置相对行号
 set nu "设置绝对行号
 " Set cursor shape and color
 if &term =~ "xterm"
-  " INSERT mode
-  let &t_SI = "\<Esc>[6 q" . "\<Esc>]12;blue\x7"
-  " REPLACE mode
-  let &t_SR = "\<Esc>[3 q" . "\<Esc>]12;black\x7"
-  " NORMAL mode
-  let &t_EI = "\<Esc>[2 q" . "\<Esc>]12;green\x7"
+    " INSERT mode
+    let &t_SI = "\<Esc>[6 q" . "\<Esc>]12;blue\x7"
+    " REPLACE mode
+    let &t_SR = "\<Esc>[3 q" . "\<Esc>]12;black\x7"
+    " NORMAL mode
+    let &t_EI = "\<Esc>[2 q" . "\<Esc>]12;green\x7"
 endif
 " 1 -> blinking block  闪烁的方块
 " 2 -> solid block  不闪烁的方块
@@ -59,8 +33,7 @@ syntax on
 set cul
 set cuc
 hi CursorLine   cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
-colorscheme industry "设置颜色主题
-""set lines=35 columns=118
-"set list "显示tab和空格
-"set listchars=tab:>-,trail:. "设置tab和空格的显示 
-"hi SpecialKey ctermfg=red guifg=red
+colorscheme industry		"设置颜色主题
+set list			"显示tab和空格
+set listchars=tab:>-,trail:-	"设置tab和空格的显示
+hi SpecialKey ctermfg=red guifg=red
diff --git a/vim/vimrcs/plugs.vim b/vim/vimrcs/plugs.vim
index cfd0136..4606f3d 100644
--- a/vim/vimrcs/plugs.vim
+++ b/vim/vimrcs/plugs.vim
@@ -1,21 +1,21 @@
 " Vundle插件管理器配置
-set nocompatible               "去除VIM一致性，必须
-filetype off                   "必须
+set nocompatible	"去除VIM一致性，必须
+filetype off		"必须
 
 "设置包括vundle和初始化相关的运行时路径"
 set rtp+=/home/player/useful/bundle/Vundle.vim
 call vundle#begin('/home/player/useful/bundle')
 
-Plugin 'VundleVim/Vundle.vim'                                                "启用vundle管理插件，必须
-Plugin 'Valloric/YouCompleteMe'                                              "代码补全插件
-Plugin 'preservim/nerdtree'                                                  "文件目录树插件
-Plugin 'Xuyuanp/nerdtree-git-plugin'                                         "nerdtree git支持
-Plugin 'skywind3000/vim-terminal-help'                                       "vim-terminal-help插件
-Plugin 'scrooloose/syntastic'                                                "语法检查插件
+Plugin 'VundleVim/Vundle.vim'		"启用vundle管理插件，必须
+Plugin 'Valloric/YouCompleteMe'		"代码补全插件
+Plugin 'preservim/nerdtree'		"文件目录树插件
+Plugin 'Xuyuanp/nerdtree-git-plugin'	"nerdtree git支持
+Plugin 'skywind3000/vim-terminal-help'	"vim-terminal-help插件
+Plugin 'scrooloose/syntastic'		"语法检查插件
 "Plugin 'Lokaltog/powerline',{'rtp':'powerline/bindings/vim/'}                "状态栏信息插件
-Plugin 'github/copilot.vim'                                                  "GitHub Copilot插件
-Plugin 'voldikss/vim-translator'                                             "翻译插件
-Plugin 'yegappan/taglist'                                                    "taglist插件
+Plugin 'github/copilot.vim'		"GitHub Copilot插件
+Plugin 'voldikss/vim-translator'	"翻译插件
+Plugin 'yegappan/taglist'		"taglist插件
 
 call vundle#end()
 filetype plugin indent on     "加载vim自带和插件相应的语法和文件类型相关脚本，必须
@@ -44,11 +44,10 @@ autocmd bufenter * if(winnr('$') ==1 && exists('b:NERDTree') && b:NERDTree.isTab
 nmap <F2> :NERDTreeToggle<CR>
 nmap T :NERDTreeToggle<CR>
 let g:NERDTreeDirArrowExpandable  = '+'
-let g:NERDTreeDirArrowCollapsible = '-'                                        "修改树的显示图标
-"let g:NERDTreeWinPos='left'                                                   "窗口位置
-let g:NERDTreeSize=10                                                          "窗口尺寸
-let g:NERDTreeShowLineNumbers=1                                                "窗口是否显示行号
-"let g:NERDTreeHidden=1                                                        "似乎是隐藏文件的旧命令？没看到作用
+let g:NERDTreeDirArrowCollapsible = '-'	"修改树的显示图标
+let g:NERDTreeWinPos='left'		"窗口位置
+let g:NERDTreeSize=10			"窗口尺寸
+let g:NERDTreeShowLineNumbers=1		"窗口是否显示行号
 let NERDTreeShowHidden=1                                                       "显示隐藏文件
 let NERDTreeIgnore = ['\.pyc$', '\.swp', '\.swo', '\.vscode', '__pycache__']   "过滤: 所有指定文件和文件夹不显示
 autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif "在每个标签页打开相同的文件树
@@ -109,13 +108,18 @@ nmap <silent> <Leader>x <Plug>TranslateX
 
 "进行Taglist的设置
 map <F3> :TlistToggle<CR>
-map <F3> :silent Tlist<CR>                   "按下F3就可以呼出了
-let Tlist_Ctags_Cmd='/usr/local/bin/ctags'    "因为我们放在环境变量里，所以可以直接执行
-let Tlist_Use_Right_Window=1                  "让窗口显示在右边，0的话就是显示在左边
-let Tlist_Show_One_File=0                     "让taglist可以同时展示多个文件的函数列表
-let Tlist_File_Fold_Auto_Close=0              "非当前文件列表折叠隐藏
+map <F3> :silent Tlist<CR>			" 按下F3就可以呼出了
+map <space>tl :silent Tlist<CR>			" 按下F3就可以呼出了
+let Tlist_Ctags_Cmd='/usr/local/bin/ctags'	"因为我们放在环境变量里，所以可以直接执行
+let Tlist_Use_Right_Window=1			"让窗口显示在右边，0的话就是显示在左边
+let Tlist_Show_One_File=0			"让taglist可以同时展示多个文件的函数列表
+let Tlist_File_Fold_Auto_Close=0		"非当前文件列表折叠隐藏
+let Tlist_Exit_OnlyWindow=1			"当taglist是最后一个分割窗口时，自动推出vim
+let Tlist_Process_File_Always=1			"是否一直处理tags.1:处理;0:不处理
+let Tlist_Inc_Winwidth=1			"不是一直实时更新tags，因为没有必要
+" 每隔多少秒更新一次tags，如果为0则不更新
+let Tlist_Update_Time=5
 " 在每个标签页打开相同的函数列表
 autocmd BufWinEnter * if getcmdwintype() == '' | silent TlistUpdate | endif
-let Tlist_Exit_OnlyWindow=1                   "当taglist是最后一个分割窗口时，自动推出vim
-let Tlist_Process_File_Always=0               "是否一直处理tags.1:处理;0:不处理
-let Tlist_Inc_Winwidth=1                      "不是一直实时更新tags，因为没有必要
+" 打开新标签页时自动打开函数列表
+autocmd BufWinEnter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.IsTabTree()) | silent TlistToggle | endif
diff --git a/vim/vimrcs/statusline.vim b/vim/vimrcs/statusline.vim
new file mode 100644
index 0000000..7bdee34
--- /dev/null
+++ b/vim/vimrcs/statusline.vim
@@ -0,0 +1,69 @@
+set guitablabel=%{ShortTabLabel()}
+function ShortTabLabel ()
+    let bufnrlist = tabpagebuflist (v:lnum)
+    let label = bufname (bufnrlist[tabpagewinnr (v:lnum) -1])
+    let filename = fnamemodify (label, ':t')
+    return filename
+endfunction
+
+set tabline=%!MyTabLine()
+function MyTabLine()
+    let s = ''
+    for i in range(tabpagenr('$'))
+        " 选择高亮
+        if i + 1 == tabpagenr()
+            let s .= '%#TabLineSel#'
+        else
+            let s .= '%#TabLine#'
+        endif
+        " 设置标签页号 (用于鼠标点击)
+        let s .= '%' . (i + 1) . 'T'
+        " MyTabLabel() 提供完整路径标签 MyShortTabLabel 提供文件名标签
+        let s .= ' %{MyShortTabLabel(' . (i + 1) . ')} '
+    endfor
+    " 最后一个标签页之后用 TabLineFill 填充并复位标签页号
+    let s .= '%#TabLineFill#%T'
+    " 右对齐用于关闭当前标签页的标签
+    if tabpagenr('$') > 1
+        let s .= '%=%#TabLine#%999Xclose'
+    endif
+    return s
+endfunction
+" 文件名标签
+function MyShortTabLabel(n)
+    let buflist = tabpagebuflist(a:n)
+    let label = bufname (buflist[tabpagewinnr (a:n) -1])
+    let filename = fnamemodify (label, ':t')
+    return filename
+endfunction
+"完整路径标签
+function MyTabLabel(n)
+    let buflist = tabpagebuflist(a:n)
+    let winnr = tabpagewinnr(a:n)
+    return bufname(buflist[winnr - 1])
+endfunction
+
+" 状态栏显示git分支函数
+function! GitBranch()
+    " 获取当前所在分支名，注意不要保留开头的*和行末的空符号
+    let s:branch = system("git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \\(.*\\)/\\1/' | tr -d '\n' | tr -d ' '")
+    return strlen(s:branch) ? 'b: '.s:branch.'> ' : ''
+endfunction
+
+set laststatus=2 "显示状态栏(默认值为 1，无法显示状态栏)
+set statusline=%f%m%r%h%w\ >\ %{GitBranch()}%=\ <\ %{&ff},\ %{&fenc}\ <\ %y\ <\ %l,%v\ <\ %p%%\ <\ lines=%L
+
+function! CurDir()
+    let curdir = substitute(getcwd(), '/Users/amir/', "~/", "g")
+    return curdir
+endfunction
+
+"标签样式
+"  TabLineFill  tab pages line, where there are no labels
+hi TabLineFill term=none
+hi TabLineFill ctermfg=DarkGrey
+hi TabLineFill guifg=#777777
+"  TabLineSel   tab pages line, active tab page label
+hi TabLineSel term=inverse
+hi TabLineSel cterm=none ctermfg=yellow ctermbg=Black
+hi TabLineSel gui=none guifg=yellow guibg=Black
-- 
cgit v1.2.3-70-g09d2