Update

3 files changed, 11 insertions, 38 deletions

diff --git a/vim/init.vim b/vim/init.vim
index 20a1c74..9145855 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -29,9 +29,6 @@ source ~/helper/vim/init/keymaps.vim
 " Extra config for different contexts
 source ~/helper/vim/init/config.vim
 
-" Set tabsize
-source ~/helper/vim/init/tabsize.vim
-
 if has('nvim')
   " For neovim
   source ~/.config/nvim/lazy.lua
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 8c92886..b74f988 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -11,6 +11,7 @@
 " JUMP
 " SEARCH
 " BUFFERS
+" TABSIZE
 " ENCODING_PREFERENCE
 " FOLDING
 " BACKUP
@@ -179,6 +180,16 @@ function SetPasswordFile()
 endfunction
 
 
+"----------------------------------------------------------------------
+" TABSIZE
+"----------------------------------------------------------------------
+set expandtab
+set shiftwidth=2
+set autoindent
+set tabstop=4
+set softtabstop=0
+set smartindent
+
 
 "----------------------------------------------------------------------
 " ENCODING_PREFERENCE
diff --git a/vim/init/tabsize.vim b/vim/init/tabsize.vim
deleted file mode 100644
index 6cb0f63..0000000
--- a/vim/init/tabsize.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-"======================================================================
-"
-" init-tabsize.vim - 大部分人对 tabsize 都有自己的设置，改这里即可
-"
-" Created by skywind on 2018/05/30
-" Last Modified: 2018/05/30 22:05:44
-"
-"======================================================================
-" vim: set ts=4 sw=4 tw=78 noet :
-
-
-"----------------------------------------------------------------------
-" 默认缩进模式（可以后期覆盖）
-"----------------------------------------------------------------------
-
-set expandtab
-set shiftwidth=2
-set autoindent
-set tabstop=4
-set softtabstop=0
-set smartindent
-
-" 设置缩进宽度
-"set sw=4
-
-" 设置 TAB 宽度
-set ts=2
-
-" 禁止展开 tab (noexpandtab)
-"set noet
-
-" 如果后面设置了 expandtab 那么展开 tab 为多少字符
-set tabstop=4
-set softtabstop=0
-