diff --git a/vim/plugin/gruvbox.vim b/vim/colors/gruvbox.vim similarity index 100% rename from vim/plugin/gruvbox.vim rename to vim/colors/gruvbox.vim diff --git a/vim/gvim/_vimrc b/vim/gvim/_vimrc deleted file mode 100644 index f0ece80..0000000 --- a/vim/gvim/_vimrc +++ /dev/null @@ -1,81 +0,0 @@ -let mapleader=" " -set number -syntax enable -filetype on -set vb t_vb= -" colorscheme morning -colorscheme gruvbox -" set background=light -set guifont=FiraCode\ Nerd\ Font\ Mono:h12 -set incsearch -set lines=40 columns=160 -set backspace=2 -set shiftwidth=4 -set expandtab -set cursorline -set autoindent -set scrolloff=5 -set laststatus=2 -set hlsearch -set noswapfile -set undofile -set undodir=$VIM\.undo -set history=1000 -set encoding=utf-8 -set termencoding=utf-8 -set fileencoding=utf-8 -set fileencodings=ucs-bom,utf-8,chinese,cp936 -set clipboard=unnamed -set relativenumber - -if has("gui_running") - autocmd GUIEnter * simalt ~x -endif - -if(has("win32") || has("win64") || has("win95") || has("win16")) - let g:iswindows = 1 -else - let g:islinux = 1 -endif - -:nnoremap s :wa -:nnoremap h :noh -:nnoremap 4j -:nnoremap 4k -:nnoremap 9k -:nnoremap 9j - -:vnoremap < >gv -:vnoremap J :move '>+1gv-gv -:vnoremap K :move '<-2gv-gv - -" 状态栏介绍 -" 设置状态行显示常用信息 -" %F 完整文件路径名 -" %m 当前缓冲被修改标记 -" %m 当前缓冲只读标记 -" %h 帮助缓冲标记 -" %w 预览缓冲标记 -" %Y 文件类型 -" %b ASCII值 -" %B 十六进制值 -" %l 行数 -" %v 列数 -" %p 当前行数占总行数的的百分比 -" %L 总行数 -" %{...} 评估表达式的值,并用值代替 -" %{"[fenc=".(&fenc==""?&enc:&fenc).((exists("+bomb") && &bomb)?"+":"")."]"} 显示文件编码 -" %{&ff} 显示文件类型 -" 设置 laststatus = 0 ,不显式状态行 -" 设置 laststatus = 1 ,仅当窗口多于一个时,显示状态行 -" 设置 laststatus = 2 ,总是显式状态行 -" 一个示例:set statusline=%<%0.32F[%M]\ %r%10.(%l,%c%)\ %p%%\ %=%{strftime(\"%H:%M\ -\ %d/%m/20%y")} -" %< "超过最长部分显示为< -" %0.32F "最短0,最长32 -" [%M] "内容发生修改后显示为+ -" %r%10.(%l,%c%) “显示行数和列数,10让这个单元的内容和前面的内容保持10格字符的距离 -" %= “对齐方向改变的分界点 -" %- ”对齐方向改变为右对齐 - -set statusline=[%Y]\%{\"[\".(&fenc==\"\"?&enc:&fenc).((exists(\"+bomb\")\ &&\ &bomb)?\"+\":\"\").\"]\"}\[%{&ff}]\[%03.3b]\[%02.2B]\[%04l,%04v][%p%%]\[%L]\ %=%{strftime(\"%d/%m/%y\ -\ %H:%M\")}\%=%F%m%r%h%w diff --git a/vim/install.bat b/vim/install.bat new file mode 100644 index 0000000..ef3ddd5 --- /dev/null +++ b/vim/install.bat @@ -0,0 +1,23 @@ +@echo off + +rem ԴļĿļ· +set "source_vimrc=%~dp0vimrc" +set "source_colors=%~dp0colors" +set "target_vimfiles=%USERPROFILE%\vimfiles" +set "target_colors=%USERPROFILE%\vimfiles\colors" + +rem ĿļУڣ +if not exist "%target_vimfiles%" ( + mkdir "%target_vimfiles%" +) + +rem vimrc ļĿļ +copy /Y "%source_vimrc%" "%target_vimfiles%" + +rem colors ļеĿļ +if exist "%source_colors%" ( + xcopy /S /Y /I "%source_colors%" "%target_colors%" +) + +echo "" +pause diff --git a/vim/plugin/gruvbox_readme.txt b/vim/plugin/gruvbox_readme.txt deleted file mode 100644 index 2914d73..0000000 --- a/vim/plugin/gruvbox_readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -colorscheme gruvbox -set background=light/dark -https://github.com/morhetz/gruvbox \ No newline at end of file diff --git a/vim/readme.txt b/vim/readme.txt index 439d3a4..f553142 100644 --- a/vim/readme.txt +++ b/vim/readme.txt @@ -1,2 +1,6 @@ 配置文件中未写明的快捷键: -zz 光标所在行居中 \ No newline at end of file +zz 光标所在行居中 + +colorscheme gruvbox +set background=light/dark +https://github.com/morhetz/gruvbox \ No newline at end of file diff --git a/vim/vimrc b/vim/vimrc index 1d50f92..5c554d5 100755 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,9 +3,10 @@ set number syntax enable filetype on set vb t_vb= -colorscheme morning -set guifont=Consolas:h14 -" set lines=40 columns=150 +colorscheme gruvbox +" set background=light +set incsearch +set backspace=2 set shiftwidth=4 set expandtab set cursorline @@ -15,7 +16,7 @@ set laststatus=2 set hlsearch set noswapfile set undofile -set undodir=$VIM\.undo +set undodir=$HOME\.undo set history=1000 set encoding=utf-8 set termencoding=utf-8 @@ -24,12 +25,26 @@ set fileencodings=ucs-bom,utf-8,chinese,cp936 set clipboard=unnamed set relativenumber +if has("gui_running") + autocmd GUIEnter * simalt ~x + set lines=40 columns=160 +endif + +if(has("win32") || has("win64") || has("win95") || has("win16")) + set guifont=FiraCode\ Nerd\ Font\ Mono:h12 +endif + :nnoremap s :wa :nnoremap h :noh :nnoremap 4j :nnoremap 4k -:nnoremap 4k -:nnoremap 4j +:nnoremap 9k +:nnoremap 9j + +:vnoremap < >gv +:vnoremap J :move '>+1gv-gv +:vnoremap K :move '<-2gv-gv " 状态栏介绍 " 设置状态行显示常用信息 @@ -59,4 +74,4 @@ set relativenumber " %= “对齐方向改变的分界点 " %- ”对齐方向改变为右对齐 -set statusline=%{strftime(\"%d/%m/%y\ -\ %H:%M\")}\ [%Y]\%{\"[\".(&fenc==\"\"?&enc:&fenc).((exists(\"+bomb\")\ &&\ &bomb)?\"+\":\"\").\"]\"}\[%{&ff}]\[%03.3b]\[%02.2B]\[%04l,%04v][%p%%]\[%L]\ %=%F%m%r%h%w +set statusline=[%Y]\%{\"[\".(&fenc==\"\"?&enc:&fenc).((exists(\"+bomb\")\ &&\ &bomb)?\"+\":\"\").\"]\"}\[%{&ff}]\[%03.3b]\[%02.2B]\[%04l,%04v][%p%%]\[%L]\ %=%{strftime(\"%d/%m/%y\ -\ %H:%M\")}\%=%F%m%r%h%w diff --git a/vim/vim其他.txt b/vim/vim其他.txt deleted file mode 100644 index 22e9219..0000000 --- a/vim/vim其他.txt +++ /dev/null @@ -1,17 +0,0 @@ -1.如何让Vim Gui启动时默认自动最大化 -(1)Unix Like -if has("gui_running") - " GUI is running or is about to start. - " Maximize gvim window (for an alternative on Windows, see simalt below). - set lines=999 columns=999 -else - " This is console Vim. - if exists("+lines") - set lines=50 - endif - if exists("+columns") - set columns=100 - endif -endif -(2)gvim -autocmd GUIEnter * simalt ~x \ No newline at end of file