diff --git a/.gitmodules b/.gitmodules
index fd3f6a9..ccf08ce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "vim/pack/def/start/vim-gitgutter"]
 	path = vim/pack/def/start/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter
+[submodule "vim/pack/def/start/editorconfig"]
+	path = vim/pack/def/start/editorconfig
+	url = https://github.com/editorconfig/editorconfig-vim.git
diff --git a/vim/pack/def/start/editorconfig b/vim/pack/def/start/editorconfig
new file mode 160000
index 0000000..047c4b4
--- /dev/null
+++ b/vim/pack/def/start/editorconfig
@@ -0,0 +1 @@
+Subproject commit 047c4b455b9d56adee63a52d6d7cdf5bb6521d53
diff --git a/vimrc b/vimrc
index 29c6952..d3e1a74 100644
--- a/vimrc
+++ b/vimrc
@@ -244,11 +244,6 @@ hi x253_Grey85 ctermfg=253 guifg=#dadada "rgb=218,218,218
 hi x254_Grey89 ctermfg=254 guifg=#e4e4e4 "rgb=228,228,228
 hi x255_Grey93 ctermfg=255 guifg=#eeeeee "rgb=238,238,238
 
-
-
-
-
-
 " ----- Visual Behaviors
 set laststatus=2           " Show status bar (lightbar)
 set noshowmode             " Hide mode (in lightbar)
@@ -258,7 +253,10 @@ set number                 " Show line numbers
 
 highlight clear SignColumn
 
+" ----- EditorConfig configuration
+let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
 
+" ----- LightLine Plugin Configuration
 " set lightline to include git-branch
 let g:lightline = {
       \ 'colorscheme': 'wombat',