25 files changed, 8 insertions, 110 deletions
diff --git a/.vim/.gitignore b/.vim/.gitignore
new file mode 100644
index 0000000..3c1968e
--- /dev/null
+++ b/.vim/.gitignore
@@ -0,0 +1,3 @@
+plugged
+autoload
+.swp
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
new file mode 100644
index 0000000..4d7e2c5
--- /dev/null
+++ b/.vim/filetype.vim
@@ -0,0 +1,3 @@
+augroup filetypedetect
+    autocmd BufRead,BufNewFile *mutt-* setfiletype mail
+augroup end
diff --git a/.vim/init.vim b/.vim/init.vim
deleted file mode 100644
index 73c025b..0000000
--- a/.vim/init.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" General Config
-
-set nocompatible
-set number 
-set backspace=indent,eol,start
-syntax on
-set fileencodings=ucs=bom,utf-8,utf-16,gbk,big5,gb18030,latin1
-set t_Co=256
-set showcmd
-set autoread
-set mouse=a
-filetype indent on
-set modeline
-set textwidth=72
-set formatoptions+=mB
-set formatoptions-=tc
-set secure
-
-set hidden
-
-set completeopt=menu,menuone
-
-if $COLORTERM is 'truecolor'
-    set termguicolors
-endif
-
-" Correct background rendering in some terminal
-let &t_ut=''
-
-" MacVim
-
-if has("gui_running")
-    if has("gui_macvim")
-        set guifont=Monaco:h15
-        set transparency=10
-        set noimdisable
-
-        noremap <D-1> :tabn 1<CR>
-        noremap <D-2> :tabn 2<CR>
-        noremap <D-3> :tabn 3<CR>
-        noremap <D-4> :tabn 4<CR>
-        noremap <D-5> :tabn 5<CR>
-        noremap <D-6> :tabn 6<CR>
-        noremap <D-7> :tabn 7<CR>
-        noremap <D-8> :tabn 8<CR>
-        noremap <D-9> :tabn 9<CR>
-        noremap <D-0> :tablat<CR>
-    endif
-endif
-
-" Identation
-
-set autoindent
-set tabstop=4
-set shiftwidth=4
-set expandtab
-set softtabstop=4
-
-autocmd FileType html setlocal shiftwidth=2 softtabstop=2 expandtab
-autocmd FileType css setlocal shiftwidth=2 softtabstop=2 expandtab
-autocmd FileType javascript setlocal shiftwidth=2 softtabstop=2 expandtab
-
-set wrap
-"set nowrap
-"set wrapmargin=4
-set scrolloff=5
-"set sidescrolloff=5
-set laststatus=2
-set ruler
-
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
-
-" Completion
-
-set wildmenu
-set wildmode=longest:list,full
-set wildignore=*.o,*.obj,*~
-set wildignore+=*DS_Store*
-set wildignore+=*.gem
-set wildignore+=*.png,*.jpg,*.gif
-
-" change default directory
-let s:vim_swapfiles_dir = expand('~/.vim/.swp/')
-if !isdirectory(s:vim_swapfiles_dir)
-    silent! call mkdir(s:vim_swapfiles_dir, 'p')
-endif
-set directory=~/.vim/.swp//
-
-" tags
-set tags=./.tags;,.tags
-
-" mapping
-let mapleader=',' " change the key <leader>
-nnoremap <leader>cd :cd %:p:h<CR> :pwd<CR>
-
-source ~/.dotfiles/.vim/plugins/init.vim
-source ~/.dotfiles/.vim/keybindings.vim
-
-silent colorscheme onedark
-
-highlight Pmenu ctermbg=grey
-set exrc
diff --git a/.vim/plugins/airline.plug b/.vim/plugin/airline.plug
index a1c1b94..a1c1b94 100644
--- a/.vim/plugins/airline.plug
+++ b/.vim/plugin/airline.plug
diff --git a/.vim/plugins/ale.vim b/.vim/plugin/ale.vim
index 105bfa8..105bfa8 100644
--- a/.vim/plugins/ale.vim
+++ b/.vim/plugin/ale.vim
diff --git a/.vim/plugins/asyncrun.plug b/.vim/plugin/asyncrun.plug
index bed9473..bed9473 100644
--- a/.vim/plugins/asyncrun.plug
+++ b/.vim/plugin/asyncrun.plug
diff --git a/.vim/plugins/easymotion.plug b/.vim/plugin/easymotion.plug
index ce87f12..ce87f12 100644
--- a/.vim/plugins/easymotion.plug
+++ b/.vim/plugin/easymotion.plug
diff --git a/.vim/plugins/fugitive.plug b/.vim/plugin/fugitive.plug
index 8dd25b2..8dd25b2 100644
--- a/.vim/plugins/fugitive.plug
+++ b/.vim/plugin/fugitive.plug
diff --git a/.vim/plugins/general.plug b/.vim/plugin/general.plug
index 4bbc709..4bbc709 100644
--- a/.vim/plugins/general.plug
+++ b/.vim/plugin/general.plug
diff --git a/.vim/plugins/godot.vim b/.vim/plugin/godot.vim
index 49354f8..49354f8 100644
--- a/.vim/plugins/godot.vim
+++ b/.vim/plugin/godot.vim
diff --git a/.vim/plugins/gutentags.plug b/.vim/plugin/gutentags.plug
index c2a7090..c2a7090 100644
--- a/.vim/plugins/gutentags.plug
+++ b/.vim/plugin/gutentags.plug
diff --git a/.vim/plugins/init.vim b/.vim/plugin/init.vim
index 6b8bff2..7f71d9c 100644
--- a/.vim/plugins/init.vim
+++ b/.vim/plugin/init.vim
@@ -4,8 +4,8 @@ if empty(glob('~/.vim/autoload/plug.vim'))
   autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
-let s:plugins = split(expand('~/.dotfiles/.vim/plugins/*.plug'))
-let s:settings = split(expand('~/.dotfiles/.vim/plugins/*.vim'))
+let s:plugins = split(expand('~/.vim/plugin/*.plug'))
+let s:settings = split(expand('~/.vim/plugin/*.vim'))
 
 function! s:load_plugins()
     for plugin in s:plugins
diff --git a/.vim/plugins/lang.plug b/.vim/plugin/lang.plug
index 338de43..338de43 100644
--- a/.vim/plugins/lang.plug
+++ b/.vim/plugin/lang.plug
diff --git a/.vim/plugins/leaderf.vim b/.vim/plugin/leaderf.vim
index 043fe1b..043fe1b 100644
--- a/.vim/plugins/leaderf.vim
+++ b/.vim/plugin/leaderf.vim
diff --git a/.vim/plugins/ledger.plug b/.vim/plugin/ledger.plug
index b3a1e25..b3a1e25 100644
--- a/.vim/plugins/ledger.plug
+++ b/.vim/plugin/ledger.plug
diff --git a/.vim/plugins/lsp.plug b/.vim/plugin/lsp.plug
index 1a5704b..1a5704b 100644
--- a/.vim/plugins/lsp.plug
+++ b/.vim/plugin/lsp.plug
diff --git a/.vim/plugins/markdown.plug b/.vim/plugin/markdown.plug
index 1e12dad..1e12dad 100644
--- a/.vim/plugins/markdown.plug
+++ b/.vim/plugin/markdown.plug
diff --git a/.vim/plugins/misc.plug b/.vim/plugin/misc.plug
index 34de763..a634210 100644
--- a/.vim/plugins/misc.plug
+++ b/.vim/plugin/misc.plug
@@ -11,6 +11,4 @@ Plug 'mhinz/vim-signify'
 Plug 'tpope/vim-unimpaired'
 Plug 'godlygeek/tabular'
 
-" colorscheme
-" Plug 'sonph/onehalf', { 'rtp': 'vim' }
 Plug 'joshdick/onedark.vim'
diff --git a/.vim/plugins/slime.plug b/.vim/plugin/slime.plug
index 0989a66..0989a66 100644
--- a/.vim/plugins/slime.plug
+++ b/.vim/plugin/slime.plug
diff --git a/.vim/plugins/tex.plug b/.vim/plugin/tex.plug
index 6c3f788..6c3f788 100644
--- a/.vim/plugins/tex.plug
+++ b/.vim/plugin/tex.plug
diff --git a/.vim/plugins/vimspector.plug b/.vim/plugin/vimspector.plug
index a39d4bd..a39d4bd 100644
--- a/.vim/plugins/vimspector.plug
+++ b/.vim/plugin/vimspector.plug
diff --git a/.vim/plugins/vimwiki.plug b/.vim/plugin/vimwiki.plug
index cba8593..cba8593 100644
--- a/.vim/plugins/vimwiki.plug
+++ b/.vim/plugin/vimwiki.plug
diff --git a/.vim/plugins/vista.plug b/.vim/plugin/vista.plug
index 02264b9..02264b9 100644
--- a/.vim/plugins/vista.plug
+++ b/.vim/plugin/vista.plug
diff --git a/.vim/plugins/youcompleteme.vim b/.vim/plugin/youcompleteme.vim
index 4c9f570..4c9f570 100644
--- a/.vim/plugins/youcompleteme.vim
+++ b/.vim/plugin/youcompleteme.vim
diff --git a/.vim/plugins/startify.plug b/.vim/plugins/startify.plug
deleted file mode 100644
index a4f7c1d..0000000
--- a/.vim/plugins/startify.plug
+++ /dev/null
@@ -1 +0,0 @@
-Plug 'mhinz/vim-startify'