diff --git a/vim/ideavimrc b/vim/ideavimrc
new file mode 100644
index 0000000..92a4841
--- /dev/null
+++ b/vim/ideavimrc
@@ -0,0 +1,12 @@
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase
+set showmode
+set number
+set relativenumber
+set scrolloff=3
+set history=100000
+nmap q :q<CR>
+"nnoremap [ ^
+nnoremap & $
diff --git a/vim/vimrc b/vim/vimrc
index f1b532c..c67c571 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -7,13 +7,19 @@ call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
 
+" 中文输入法
+"Plugin 'humiaozuzu/fcitx-status'
 
 Plugin 'junegunn/fzf.vim'
 " 搜索
 nmap <Leader>l :BLines
 nmap <Leader>L :Lines
 
-Plugin 'easymotion/vim-easymotion'
+"Plugin 'easymotion/vim-easymotion'
+"Plugin 'ctrlpvim/ctrlp.vim'
+let g:ctrlp_working_path_mode = 'wa'
+let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard']
+
 
 " 全局搜索，即使文件没打开
 Plugin 'rking/ag.vim'
@@ -155,19 +161,20 @@ Plugin 'prettier/vim-prettier', { 'do': 'yarn install' }
 
 
 Plugin 'Chiel92/vim-autoformat'
-noremap <F6> :Autoformat<CR>:w<CR>
+noremap <F4> :Autoformat<CR>:w<CR>
 let g:autoformat_verbosemode=1
 
 
 
 Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 let g:airline_theme='bubblegum'
 "vim-airline配置:优化vim界面"
 "let g:airline#extensions#tabline#enabled = 1
 " airline设置
 " 显示颜色
-set t_Co=256
-set laststatus=2
+"set t_Co=256
+"set laststatus=2
 " 使用powerline打过补丁的字体
 let g:airline_powerline_fonts = 1
 " 开启tabline
@@ -180,6 +187,8 @@ let g:airline#extensions#tabline#left_alt_sep = ' '
 let g:airline#extensions#tabline#buffer_nr_show = 1
 nnoremap <leader>[ :bp<CR>
 nnoremap <leader>] :bn<CR>
+nnoremap <A-Left> :bp<CR>
+nnoremap <A-Right> :bn<CR>
 " 映射<leader>num到num buffer
 "nmap <tab> :bn<cr>
 map <leader>1 :b 1<CR>
@@ -197,6 +206,7 @@ nmap J 5j
 nmap K 5k
 nmap H 5h
 nmap L 5l
+nmap & $
 
 nnoremap <c-h> <c-w>h
 nnoremap <c-l> <c-w>l
@@ -206,8 +216,8 @@ nnoremap <c-k> <c-w>k
 
 
 " ctags 配置
-map <F4> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags .<CR><CR>
-imap <F4> <ESC>:!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags .<CR><CR>
+"map <F4> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags .<CR><CR>
+"imap <F4> <ESC>:!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --languages=Python,C++ -f .tags .<CR><CR>
 set tags=tags
 set tags+=.tags
 set tags+=./.tags
@@ -218,16 +228,17 @@ Plugin 'https://github.com/majutsushi/tagbar.git'
 "ctags 配置:F3快捷键显示程序中的各种tags，包括变量和函数等。
 map <F3> :TagbarToggle<CR>
 let g:tagbar_ctags_bin="/usr/bin/ctags"
+let g:tagbar_sort=0
 let g:tagbar_type_go = {
-    \ 'ctagstype': 'go',
-    \ 'kinds' : [
-        \'p:package',
-        \'f:function',
-        \'v:variables',
-        \'t:type',
-        \'c:const'
-    \]
-\}
+            \ 'ctagstype': 'go',
+            \ 'kinds' : [
+            \'p:package',
+            \'f:function',
+            \'v:variables',
+            \'t:type',
+            \'c:const'
+            \]
+            \}
 
 Plugin 'The-NERD-tree'
 let NERDTreeIgnore=['\.pyc','\~$','\.swp']
@@ -243,7 +254,7 @@ Plugin 'Xuyuanp/nerdtree-git-plugin'
 
 Plugin 'fatih/vim-go'
 let g:go_def_mode="godef"
-
+let g:go_doc_keywordprg_enabled=0
 
 "Plugin 'https://github.com/taketwo/vim-ros.git'
 
@@ -315,6 +326,7 @@ set expandtab
 set smarttab
 " 显示行号
 set number
+set rnu
 " 历史记录数
 set history=1000
 "禁止生成临时文件
@@ -433,3 +445,5 @@ au BufNewFile,BufRead *.vue syntax sync fromstart
 
 
 au BufNewFile,BufRead *.launch,*.urdf  set filetype=xml
+set timeoutlen=1000 ttimeoutlen=0
+