From eb647f3ef2793725d8775d0193025e4bc535d1e7 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 19:24:29 +0100 Subject: [PATCH 01/13] Added vim-gradle --- .gitmodules | 3 +++ vim/bundle/vim-gradle | 1 + 2 files changed, 4 insertions(+) create mode 160000 vim/bundle/vim-gradle diff --git a/.gitmodules b/.gitmodules index 576f5ca..489485c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,3 +35,6 @@ [submodule "vim/bundle/vim-matchparenalways"] path = vim/bundle/vim-matchparenalways url = git@github.com:justinmk/vim-matchparenalways.git +[submodule "vim/bundle/vim-gradle"] + path = vim/bundle/vim-gradle + url = git@github.com:tfnico/vim-gradle.git diff --git a/vim/bundle/vim-gradle b/vim/bundle/vim-gradle new file mode 160000 index 0000000..e77153d --- /dev/null +++ b/vim/bundle/vim-gradle @@ -0,0 +1 @@ +Subproject commit e77153d120d23e3dc659e4b2148e469696c11022 From 519f40ffdd8a098c1fd86df35cc3931aa599ed1b Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 20:11:19 +0100 Subject: [PATCH 02/13] Disable execute keybind and added buffer switch keybind --- vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 3a42eca..1e959d7 100644 --- a/vimrc +++ b/vimrc @@ -28,6 +28,7 @@ nnoremap :TmuxNavigateDown nnoremap :TmuxNavigateUp nnoremap :TmuxNavigateRight nnoremap :noh +nnoremap :buffers:buffer map :NERDTreeToggle map :TagbarToggle -map :!./% +" map :!./% From e3c4b611efab3cd7ad64974b853231058a3fa06f Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 20:24:55 +0100 Subject: [PATCH 03/13] Made install script easier to use --- install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 17b6fad..d42886d 100755 --- a/install.sh +++ b/install.sh @@ -1,10 +1,7 @@ #!/bin/bash - -dotfiles="$HOME/$1" - # Show help function show_help { - echo "Specify directory"; + echo "Specify existing directory"; } # Ask user @@ -56,7 +53,9 @@ function symlink { echo "All symlink have been made" } +dotfiles="$1" if [ -z "$1" ]; then show_help; exit 0; fi; +if [ ! -d $1 ]; then show_help; exit 0; fi; cd $dotfiles From a4f1d946a0eefd0337976eec5111c88f8fcb5ab5 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 20:25:12 +0100 Subject: [PATCH 04/13] Updated install instuctions --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e914c25..44ce419 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,8 @@ These are my personal dotfiles. You are free to use and change them to your liking. ##Instal -To install these dotfiles clone into _~/.dotfiles_ and run _install.sh_. +```` +git clone https://github.com/DreadedX/dotfiles.git ~/.dotfiles +cd .dotfiles +./install.sh ~/.dotfiles +```` From ddd90177e7c73dfc83476bc04272c45821dfa681 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 22:53:42 +0100 Subject: [PATCH 05/13] Added indentLine --- .gitmodules | 3 +++ vim/bundle/indentLine | 1 + vimrc | 1 + 3 files changed, 5 insertions(+) create mode 160000 vim/bundle/indentLine diff --git a/.gitmodules b/.gitmodules index 489485c..38aebdb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,3 +38,6 @@ [submodule "vim/bundle/vim-gradle"] path = vim/bundle/vim-gradle url = git@github.com:tfnico/vim-gradle.git +[submodule "vim/bundle/indentLine"] + path = vim/bundle/indentLine + url = git@github.com:Yggdroot/indentLine.git diff --git a/vim/bundle/indentLine b/vim/bundle/indentLine new file mode 160000 index 0000000..547ceb5 --- /dev/null +++ b/vim/bundle/indentLine @@ -0,0 +1 @@ +Subproject commit 547ceb5b04356b87653cb763810871fd51b33781 diff --git a/vimrc b/vimrc index 1e959d7..7a44aba 100644 --- a/vimrc +++ b/vimrc @@ -20,6 +20,7 @@ set t_ZR= let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 let g:airline_theme='gruvbox' +let g:indentLine_char = '│' " let g:EclimCompletionMethod = 'omnifunc' " let b:EclimPhpHtmlValidate = 1 From 47cb3ce5c5c13f07904aa83b61fdf80f651f8f69 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 7 Feb 2015 23:39:19 +0100 Subject: [PATCH 06/13] Binds F5 to build and F6 to run if build.gradle file exists --- vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vimrc b/vimrc index 7a44aba..24d7899 100644 --- a/vimrc +++ b/vimrc @@ -33,3 +33,8 @@ nnoremap :buffers:buffer map :NERDTreeToggle map :TagbarToggle " map :!./% + +if !empty(glob("./build.gradle")) + map :!clear && gradle build + map :!clear && gradle run +endif From d57645576a7cbb1bf2a40fdba60e8e98b336d065 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 8 Feb 2015 16:35:21 +0100 Subject: [PATCH 07/13] Re-enabled eclim autocompletion --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 24d7899..f21d1b8 100644 --- a/vimrc +++ b/vimrc @@ -21,7 +21,7 @@ let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 let g:airline_theme='gruvbox' let g:indentLine_char = '│' -" let g:EclimCompletionMethod = 'omnifunc' +let g:EclimCompletionMethod = 'omnifunc' " let b:EclimPhpHtmlValidate = 1 nnoremap :TmuxNavigateLeft From 2137b1bb28eaaf1d4e9e877c5435b5f01b1e4c99 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 8 Feb 2015 16:37:34 +0100 Subject: [PATCH 08/13] Switched out vim-autolose for delimitMate --- .gitmodules | 6 +++--- vim/bundle/delimitMate | 1 + vim/bundle/vim-autoclose | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) create mode 160000 vim/bundle/delimitMate delete mode 160000 vim/bundle/vim-autoclose diff --git a/.gitmodules b/.gitmodules index 38aebdb..af4346a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,9 +14,6 @@ [submodule "vim/bundle/tcomment_vim"] path = vim/bundle/tcomment_vim url = git@github.com:tomtom/tcomment_vim.git -[submodule "vim/bundle/vim-autoclose"] - path = vim/bundle/vim-autoclose - url = git@github.com:Townk/vim-autoclose.git [submodule "vim/bundle/vim-exchange"] path = vim/bundle/vim-exchange url = git@github.com:tommcdo/vim-exchange.git @@ -41,3 +38,6 @@ [submodule "vim/bundle/indentLine"] path = vim/bundle/indentLine url = git@github.com:Yggdroot/indentLine.git +[submodule "vim/bundle/delimitMate"] + path = vim/bundle/delimitMate + url = git@github.com:Raimondi/delimitMate.git diff --git a/vim/bundle/delimitMate b/vim/bundle/delimitMate new file mode 160000 index 0000000..470c053 --- /dev/null +++ b/vim/bundle/delimitMate @@ -0,0 +1 @@ +Subproject commit 470c053a3ba673007a85237a1ac8415428fd8446 diff --git a/vim/bundle/vim-autoclose b/vim/bundle/vim-autoclose deleted file mode 160000 index a9a3b73..0000000 --- a/vim/bundle/vim-autoclose +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9a3b7384657bc1f60a963fd6c08c63fc48d61c3 From b56ce65cd28bef2a511946f0238cbb5e0cbcf517 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 8 Feb 2015 16:52:24 +0100 Subject: [PATCH 09/13] Updated delimitMate settings --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index f21d1b8..1602048 100644 --- a/vimrc +++ b/vimrc @@ -21,6 +21,7 @@ let g:airline_powerline_fonts = 1 let g:airline#extensions#tabline#enabled = 1 let g:airline_theme='gruvbox' let g:indentLine_char = '│' +let delimitMate_expand_cr = 1 let g:EclimCompletionMethod = 'omnifunc' " let b:EclimPhpHtmlValidate = 1 From ec7d04bbabb093d5e7b0363cf69b93cfe49c68d4 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Tue, 10 Feb 2015 18:24:43 +0100 Subject: [PATCH 10/13] Added CtrlP --- .gitmodules | 3 +++ vim/bundle/ctrlp.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 vim/bundle/ctrlp.vim diff --git a/.gitmodules b/.gitmodules index af4346a..5423fc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,3 +41,6 @@ [submodule "vim/bundle/delimitMate"] path = vim/bundle/delimitMate url = git@github.com:Raimondi/delimitMate.git +[submodule "vim/bundle/ctrlp.vim"] + path = vim/bundle/ctrlp.vim + url = git@github.com:kien/ctrlp.vim.git diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim new file mode 160000 index 0000000..b5d3fe6 --- /dev/null +++ b/vim/bundle/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f From 8f6696dc9dfd496dade4d1db7d77c4f5dbba7cdc Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Tue, 10 Feb 2015 18:25:07 +0100 Subject: [PATCH 11/13] Made NERDTree and TagExplorer keybinds silent --- vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 1602048..4dbd9ea 100644 --- a/vimrc +++ b/vimrc @@ -31,8 +31,8 @@ nnoremap :TmuxNavigateUp nnoremap :TmuxNavigateRight nnoremap :noh nnoremap :buffers:buffer -map :NERDTreeToggle -map :TagbarToggle +map :NERDTreeToggle +map :TagbarToggle " map :!./% if !empty(glob("./build.gradle")) From 12dfc153cf494d7dcc3d16202a179a1c2f512339 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Tue, 10 Feb 2015 19:25:50 +0100 Subject: [PATCH 12/13] Added CtrlP ignored folders and made tab switch trough buffers --- vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vimrc b/vimrc index 4dbd9ea..cb5d043 100644 --- a/vimrc +++ b/vimrc @@ -29,6 +29,8 @@ nnoremap :TmuxNavigateLeft nnoremap :TmuxNavigateDown nnoremap :TmuxNavigateUp nnoremap :TmuxNavigateRight +nnoremap :bnext +nnoremap :bprev nnoremap :noh nnoremap :buffers:buffer map :NERDTreeToggle @@ -39,3 +41,5 @@ if !empty(glob("./build.gradle")) map :!clear && gradle build map :!clear && gradle run endif + +let g:ctrlp_custom_ignore = '\v[\/](build|bin)$' From 13bb9f9eb14d047e1e4fcd31ea324f8578f47bbb Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Wed, 11 Feb 2015 23:50:49 +0100 Subject: [PATCH 13/13] Made F5 and F6 work with eclipse functions --- vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimrc b/vimrc index cb5d043..8e288f5 100644 --- a/vimrc +++ b/vimrc @@ -38,8 +38,8 @@ map :TagbarToggle " map :!./% if !empty(glob("./build.gradle")) - map :!clear && gradle build - map :!clear && gradle run + map :ProjectRefresh + map :Java endif let g:ctrlp_custom_ignore = '\v[\/](build|bin)$'