4 files changed, 30 insertions, 45 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index e18423d..a54bf59 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -13,7 +13,7 @@ augroup filetype_vim
     autocmd FileType vim setlocal foldmethod=marker foldlevel=0
 augroup END
 " }}}
-" VIM_BEHAVIOR ----------------{{{
+" GERERNAL ----------------{{{
 let mapleader = ","         " Always use comma as leader key
 set nocompatible          " Disable vi compatible, today is 20XX
 set path=.,**               " Allow :find with completion
@@ -24,7 +24,6 @@ set winaltkeys=no	    " Allow alt key for mapping
 " means that you can undo even when you close a buffer/VIM
 set undofile
 set undodir=~/.vim/.undodir
-set conceallevel=1
 
 " Apply plugin and indent by filetype
 filetype plugin indent on
@@ -36,10 +35,9 @@ autocmd FocusGained,BufEnter .* checktime
 " }}}
 " VISUAL ----------------{{{
 
-" colorscheme desert            " I like desert!
+" colorscheme desert
 
 " Editing Area
-set number relativenumber   " Use relativenumber
 set wrap                                " enable wrap by default
 set scrolloff=3                   " Leave some buffer when scrolling down
 set showmatch                       " Show pairing brackets
@@ -49,6 +47,9 @@ set formatoptions+=m        " 遇到Unicode值大於255的文本，不必等到�
 set formatoptions+=B        " 合併兩行中文時，不在中間加空格
 set whichwrap=b,s
 
+" Side column
+set signcolumn=yes number relativenumber
+
 " Cursor
 set cursorline
 set guicursor=n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20
@@ -65,6 +66,7 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 
 " 顯示分隔符號
 set listchars=tab:\|\ ,trail:.,extends:>,precedes:<
+
 " }}}
 " EDIT ----------------{{{
 
@@ -77,8 +79,17 @@ set ttimeoutlen=50
 " autocmd CursorHold * normal! m'
 
 imap <C-c> <Esc>l
-" Change IM to US when exit to Normal mode
-autocmd InsertLeave * :silent !fcitx-remote -c &>/dev/null || true
+
+" TABSIZE ----------------{{{
+
+set expandtab
+set shiftwidth=2
+set autoindent
+set tabstop=4
+set softtabstop=0
+set smartindent
+
+" }}}
 
 " }}}
 " JUMP to anoterh file ----------------{{{
@@ -94,6 +105,7 @@ set hlsearch		    " Hilight all matched texts
 set incsearch               " Show matched strings when typing
 " }}}
 " BUFFERS ----------------{{{
+
 " Use <C-c> to quit the last buffer ----------------{{{
 let g:quitVimWhenPressingCtrlC = 1
 function! ToggleQuit()
@@ -134,15 +146,6 @@ augroup vimStartup
 augroup END
 
 " }}}
-" }}}
-" TABSIZE ----------------{{{
-
-set expandtab
-set shiftwidth=2
-set autoindent
-set tabstop=4
-set softtabstop=0
-set smartindent
 
 " }}}
 " ENCODING_PREFERENCE ----------------{{{
@@ -176,6 +179,7 @@ set writebackup
 " }}}
 " HIGHLIGHT ----------------{{{
 syntax enable
+set conceallevel=1
 
 function! GetHighlightGroupName()
   let l:syntaxID = synID(line('.'), col('.'), 1)
@@ -224,4 +228,5 @@ set wildignore+=*.ppt,*.pptx,*.docx,*.xlt,*.xls,*.xlsx,*.odt,*.wps
 set wildignore+=*.msi,*.crx,*.deb,*.vfd,*.apk,*.ipa,*.bin,*.msu
 set wildignore+=*.gba,*.sfc,*.078,*.nds,*.smd,*.smc
 set wildignore+=*.linux2,*.win32,*.darwin,*.freebsd,*.linux,*.android
+
 " }}}
diff --git a/vim/init/config.vim b/vim/init/config.vim
index b34ed81..1910004 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -2,11 +2,17 @@
 " init-config.vim - 正常模式下的配置，在 init-basic.vim 后调用
 "======================================================================
 
-" Unnamed Buffer ----------------{{{
+" foo Unnamed Buffer ----------------{{{
 augroup DeleteUnnamedEmptBuffer!
   au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
 augroup END
 " }}}
+" X11 ----------------{{{
+
+" Change IM to US when exit to Normal mode
+autocmd InsertLeave * :silent !fcitx-remote -c &>/dev/null || true
+
+" }}}
 " TMUX ----------------{{{
 
 " 有 tmux 何没有的功能键超时（毫秒）
@@ -89,11 +95,11 @@ call s:key_escape('<S-F12>', '[24;2~')
 
 " }}}
 " Filetype ----------------{{{
-"----------------------------------------------------------------------
-augroup InitFileTypesGroup
 
-  au!
+augroup InitFileTypes
 
+  au!
+source
   " Filetype for Vim ----------------{{{
 
   " Help page
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index f7098a6..6978f63 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -1,10 +1,5 @@
 "======================================================================
-"
 " Only for key mapping
-"
-"  终端支持
-"  编译运行
-"
 "======================================================================
 " vim: set ts=4 sw=4 tw=78 noet :
 
diff --git a/vim/init/style.vim b/vim/init/style.vim
index 4a3d712..f2b1a5a 100644
--- a/vim/init/style.vim
+++ b/vim/init/style.vim
@@ -13,14 +13,7 @@
 " 显示设置
 "----------------------------------------------------------------------
 
-" 总是显示状态栏
-set laststatus=2
-
-" 总是显示行号
-set number
-
 " 总是显示侧边栏（用于显示 mark/gitdiff/诊断信息）
-set signcolumn=yes
 
 " 总是显示标签栏
 set showtabline=2
@@ -36,7 +29,6 @@ set showcmd
 " set showmode
 
 " 水平切割窗口时，默认在右边显示新窗口
-set splitright
 
 
 "----------------------------------------------------------------------
@@ -112,16 +104,6 @@ if has('terminal') && exists(':terminal') == 2
   endif
 endif
 
-
-"----------------------------------------------------------------------
-" quickfix 设置，隐藏行号
-"----------------------------------------------------------------------
-augroup VimInitStyle
-  au!
-  au FileType qf setlocal nonumber
-augroup END
-
-
 "----------------------------------------------------------------------
 " 标签栏文字风格：默认为零，GUI 模式下空间大，按风格 3显示
 " 0: filename.txt
@@ -286,6 +268,3 @@ endfunc
 set tabline=%!Vim_NeatTabLine()
 set guitablabel=%{Vim_NeatGuiTabLabel()}
 set guitabtooltip=%{Vim_NeatGuiTabTip()}
-
-
-