diff --git a/.gitmodules b/.gitmodules index 63a855d..d99b3a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,9 +25,6 @@ [submodule "bundle/scala.vim"] path = bundle/scala.vim url = git://github.com/jergason/scala.vim.git -[submodule "bundle/zencoding.vim"] - path = bundle/zencoding.vim - url = git://github.com/mattn/zencoding-vim.git [submodule "bundle/tagbar.vim"] path = bundle/tagbar.vim url = git://github.com/majutsushi/tagbar.git @@ -40,3 +37,6 @@ [submodule "bundle/bling"] path = bundle/bling url = https://github.com/ivyl/vim-bling.git +[submodule "bundle/emmet.vim"] + path = bundle/emmet.vim + url = https://github.com/mattn/emmet-vim.git diff --git a/bundle/bling b/bundle/bling index aa646d0..f6821bd 160000 --- a/bundle/bling +++ b/bundle/bling @@ -1 +1 @@ -Subproject commit aa646d08711b8cba7eb67a8075be682104b4fec0 +Subproject commit f6821bdb25464fdc4e5e6a6904c14f82fed72978 diff --git a/bundle/emmet.vim b/bundle/emmet.vim new file mode 160000 index 0000000..6baf3c1 --- /dev/null +++ b/bundle/emmet.vim @@ -0,0 +1 @@ +Subproject commit 6baf3c12100dd319f20b89e43f0345762cafff61 diff --git a/bundle/fugitive b/bundle/fugitive index 124550c..61fac2f 160000 --- a/bundle/fugitive +++ b/bundle/fugitive @@ -1 +1 @@ -Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9 +Subproject commit 61fac2f738306119ddc0052de3da031777c855e0 diff --git a/bundle/surround b/bundle/surround index 02199ea..42e9b46 160000 --- a/bundle/surround +++ b/bundle/surround @@ -1 +1 @@ -Subproject commit 02199ea0080d744ec76b79d74ce56d51d25cf7ae +Subproject commit 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a diff --git a/bundle/syntastic.vim b/bundle/syntastic.vim index 3a03fee..c035ac2 160000 --- a/bundle/syntastic.vim +++ b/bundle/syntastic.vim @@ -1 +1 @@ -Subproject commit 3a03fee48c24d0116c529769664750a43a206ee7 +Subproject commit c035ac24269b999a4caebb5bb7b318ee96614129 diff --git a/bundle/tagbar.vim b/bundle/tagbar.vim index 97d7b04..fd79a17 160000 --- a/bundle/tagbar.vim +++ b/bundle/tagbar.vim @@ -1 +1 @@ -Subproject commit 97d7b04bdd10cae424f8cb6be50ae7893b106ff4 +Subproject commit fd79a1718902f3eee78a40547d9a792b0e54927f diff --git a/bundle/vim-airline b/bundle/vim-airline index cf798d8..592cc41 160000 --- a/bundle/vim-airline +++ b/bundle/vim-airline @@ -1 +1 @@ -Subproject commit cf798d8783fe1ee49a9f18b1ab26047d471fc52f +Subproject commit 592cc412cfe7df63120b0b8afc9dd205f37ae681 diff --git a/bundle/vim-erlang b/bundle/vim-erlang index 7e38e24..942984c 160000 --- a/bundle/vim-erlang +++ b/bundle/vim-erlang @@ -1 +1 @@ -Subproject commit 7e38e2451b42e365ec7220602f7bc26db3427b72 +Subproject commit 942984c10e1c468149e7ace05a45051f1422a3d1 diff --git a/bundle/vimerl b/bundle/vimerl index 7e38e24..942984c 160000 --- a/bundle/vimerl +++ b/bundle/vimerl @@ -1 +1 @@ -Subproject commit 7e38e2451b42e365ec7220602f7bc26db3427b72 +Subproject commit 942984c10e1c468149e7ace05a45051f1422a3d1 diff --git a/bundle/zencoding.vim b/bundle/zencoding.vim deleted file mode 160000 index 5d54856..0000000 --- a/bundle/zencoding.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5d54856b498749a6e1b4274c028944b1352b7a57 diff --git a/vimrc b/vimrc index b81e75a..3a24177 100644 --- a/vimrc +++ b/vimrc @@ -3,28 +3,30 @@ scriptencoding utf-8 set encoding=utf-8 call pathogen#infect() -syntax on "enable syntax hightlighting +syntax on "enable syntax hightlighting set nocompatible set modelines=0 set visualbell -set laststatus=2 "show 2 status lines -set number "show line numbers -set autoindent "enable autoindent -set hidden "enable multiple dirty buffers -set encoding=utf-8 "set encoding -set autoread "automatically reload files +set laststatus=2 "show 2 status lines +set number "show line numbers +set autoindent "enable autoindent +set hidden "enable multiple dirty buffers +set encoding=utf-8 "set encoding +set autoread "automatically reload files +set wildmode=full +set wildmenu "show autocomplete menu colorscheme hybrid if has("autocmd") - "Autoexit to normal mode after 15 seconds of inactivity - autocmd CursorHoldI * stopinsert - autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000 - autocmd InsertLeave * let &updatetime=updaterestore - "Automatically reload VIMRC file after saving - autocmd bufwritepost .vimrc source $MYVIMRC - autocmd bufwritepost _vimrc source $MYVIMRC + "Autoexit to normal mode after 15 seconds of inactivity + autocmd CursorHoldI * stopinsert + autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000 + autocmd InsertLeave * let &updatetime=updaterestore + "Automatically reload VIMRC file after saving + autocmd bufwritepost .vimrc source $MYVIMRC + autocmd bufwritepost _vimrc source $MYVIMRC "Mappings for diff mode autocmd filterwritepre * if &diff | map { :diffget \\2| endif @@ -49,6 +51,9 @@ nmap f* :call JsFunctionLookup()zz nnoremap :nohlsearch "highlight search results set hlsearch +"ignore capitalization +set ignorecase +set smartcase "highlight current line set cursorline "show whitespace @@ -61,6 +66,7 @@ highlight SpecialKey guifg=#4a4a59 "toggle whitespace nmap l :set list! +noremap R :! echo reload \| nc vsviryda01vl 32000 "tab settings set shiftwidth=4 set tabstop=4 @@ -89,20 +95,20 @@ imap jk nmap zz if has("gui_running") - set guifont=Consolas:h10:cRUSSIAN,Lucida\ Console:h10:cRUSSIAN - "set guifont=Menlo_for_Powerline:h10:cANSI + set guifont=Consolas:h10:cRUSSIAN,Lucida\ Console:h10:cRUSSIAN + "set guifont=Menlo_for_Powerline:h10:cANSI else - "let g:Powerline_symbols = 'fancy' + "let g:Powerline_symbols = 'fancy' set mouse=a -endif +endif "Powerline fonts for Airline let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 if exists("g:loaded_syntastic_c_autoload") - nmap c :SyntasticCheck - nmap e :Errors + nmap c :SyntasticCheck + nmap e :Errors endif nmap ] :bn