From d780a9378b1d890cef5c089e9672bd83d466cd19 Mon Sep 17 00:00:00 2001 From: hellerve Date: Thu, 2 Jun 2016 12:06:16 +0200 Subject: [PATCH] i hate vim bundles --- .vim/bundle/ctrlp.vim | 2 +- .vim/bundle/ghcmod-vim | 2 +- .vim/bundle/haskell-vim | 2 +- .vim/bundle/neco-ghc | 2 +- .vim/bundle/nerdtree | 2 +- .vim/bundle/rust.vim/.gitignore | 0 .vim/bundle/rust.vim/README.md | 0 .vim/bundle/rust.vim/after/syntax/rust.vim | 0 .vim/bundle/rust.vim/autoload/rust.vim | 0 .vim/bundle/rust.vim/compiler/cargo.vim | 0 .vim/bundle/rust.vim/compiler/rustc.vim | 0 .vim/bundle/rust.vim/doc/rust.txt | 0 .vim/bundle/rust.vim/ftdetect/rust.vim | 0 .vim/bundle/rust.vim/ftplugin/rust.vim | 0 .vim/bundle/rust.vim/indent/rust.vim | 0 .vim/bundle/rust.vim/plugin/rust.vim | 0 .vim/bundle/rust.vim/syntax/rust.vim | 0 .vim/bundle/rust.vim/syntax_checkers/rust/rustc.vim | 0 .vim/bundle/supertab | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/tagbar | 2 +- .vim/bundle/tslime.vim | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-commentary | 2 +- .vim/bundle/vim-extradite | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-haskellConcealPlus | 2 +- .vim/bundle/vim-indent-guides | 2 +- .vim/bundle/vim-indent-object | 2 +- .vim/bundle/vim-jade | 2 +- .vim/bundle/vim-tmux-navigator | 2 +- .vim/bundle/vimproc.vim | 2 +- .vim/bundle/vundle | 2 +- vimrc | 3 --- zshrc | 10 ++-------- 35 files changed, 22 insertions(+), 31 deletions(-) mode change 100644 => 100755 .vim/bundle/rust.vim/.gitignore mode change 100644 => 100755 .vim/bundle/rust.vim/README.md mode change 100644 => 100755 .vim/bundle/rust.vim/after/syntax/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/autoload/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/compiler/cargo.vim mode change 100644 => 100755 .vim/bundle/rust.vim/compiler/rustc.vim mode change 100644 => 100755 .vim/bundle/rust.vim/doc/rust.txt mode change 100644 => 100755 .vim/bundle/rust.vim/ftdetect/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/ftplugin/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/indent/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/plugin/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/syntax/rust.vim mode change 100644 => 100755 .vim/bundle/rust.vim/syntax_checkers/rust/rustc.vim diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim index 564176f..b5d3fe6 160000 --- a/.vim/bundle/ctrlp.vim +++ b/.vim/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981 +Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim index 1cab596..7e5f610 160000 --- a/.vim/bundle/ghcmod-vim +++ b/.vim/bundle/ghcmod-vim @@ -1 +1 @@ -Subproject commit 1cab59653ef0fba71574c7f64e60a27df2bc38fc +Subproject commit 7e5f6102aa709244f5d4cedec807eac4b901c4cb diff --git a/.vim/bundle/haskell-vim b/.vim/bundle/haskell-vim index 72900a1..890395d 160000 --- a/.vim/bundle/haskell-vim +++ b/.vim/bundle/haskell-vim @@ -1 +1 @@ -Subproject commit 72900a16f73f93de33c9ae4374a4fbd7cc3e660e +Subproject commit 890395d5f5dc32d4cb76d00a2bd3b496e3d5e9c7 diff --git a/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc index 53a3d63..7d2c360 160000 --- a/.vim/bundle/neco-ghc +++ b/.vim/bundle/neco-ghc @@ -1 +1 @@ -Subproject commit 53a3d63bc4ecc10d8506a40a0472987f262050da +Subproject commit 7d2c360736679064986925873b8d1e2b1978d9f8 diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree index 4ebbb53..3b98a7f 160000 --- a/.vim/bundle/nerdtree +++ b/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 4ebbb533c3faf2c480211db2b547972bb3b60f2b +Subproject commit 3b98a7fcae8f9fff356907171f0406ff8cd28921 diff --git a/.vim/bundle/rust.vim/.gitignore b/.vim/bundle/rust.vim/.gitignore old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/README.md b/.vim/bundle/rust.vim/README.md old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/after/syntax/rust.vim b/.vim/bundle/rust.vim/after/syntax/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/autoload/rust.vim b/.vim/bundle/rust.vim/autoload/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/compiler/cargo.vim b/.vim/bundle/rust.vim/compiler/cargo.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/compiler/rustc.vim b/.vim/bundle/rust.vim/compiler/rustc.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/doc/rust.txt b/.vim/bundle/rust.vim/doc/rust.txt old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/ftdetect/rust.vim b/.vim/bundle/rust.vim/ftdetect/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/ftplugin/rust.vim b/.vim/bundle/rust.vim/ftplugin/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/indent/rust.vim b/.vim/bundle/rust.vim/indent/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/plugin/rust.vim b/.vim/bundle/rust.vim/plugin/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/syntax/rust.vim b/.vim/bundle/rust.vim/syntax/rust.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/rust.vim/syntax_checkers/rust/rustc.vim b/.vim/bundle/rust.vim/syntax_checkers/rust/rustc.vim old mode 100644 new mode 100755 diff --git a/.vim/bundle/supertab b/.vim/bundle/supertab index 9f7da6d..c8bfece 160000 --- a/.vim/bundle/supertab +++ b/.vim/bundle/supertab @@ -1 +1 @@ -Subproject commit 9f7da6d4988daf863ebc414f221bb12c2614f59e +Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index 281b294..e1217a8 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 281b29487fdcfa201411e0d1d5db3a0f6fc3b71e +Subproject commit e1217a888a6d1f3266ca610b04d1752cea837438 diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar index 7b36c46..c6b473f 160000 --- a/.vim/bundle/tagbar +++ b/.vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 7b36c46d17d57db34fdb0adac9ba6382d0bb5e66 +Subproject commit c6b473f5593a1cb9e567bb1a9a897f196f1f720a diff --git a/.vim/bundle/tslime.vim b/.vim/bundle/tslime.vim index 4a80919..71ec1cb 160000 --- a/.vim/bundle/tslime.vim +++ b/.vim/bundle/tslime.vim @@ -1 +1 @@ -Subproject commit 4a8091956e331d7b1d4187a2883b720dfec7e9dd +Subproject commit 71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 14d14cf..f45ecda 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23 +Subproject commit f45ecdac15d99ed2354873a8b4d40432fd0a85a3 diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary index e0f4850..9c68513 160000 --- a/.vim/bundle/vim-commentary +++ b/.vim/bundle/vim-commentary @@ -1 +1 @@ -Subproject commit e0f4850d78137a35b9461c530078bd77f39e4dce +Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170 diff --git a/.vim/bundle/vim-extradite b/.vim/bundle/vim-extradite index 52326f6..a1dc4b6 160000 --- a/.vim/bundle/vim-extradite +++ b/.vim/bundle/vim-extradite @@ -1 +1 @@ -Subproject commit 52326f6d333cdbb9e9c6d6772af87f4f39c00526 +Subproject commit a1dc4b63befd5032e65a0c94e7257d4636aa6a3f diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index 8851b8f..4cc201c 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 8851b8fe643517af160f59dfc3d88a0c4eed1fa5 +Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c diff --git a/.vim/bundle/vim-haskellConcealPlus b/.vim/bundle/vim-haskellConcealPlus index fdd4e15..9c12f6d 160000 --- a/.vim/bundle/vim-haskellConcealPlus +++ b/.vim/bundle/vim-haskellConcealPlus @@ -1 +1 @@ -Subproject commit fdd4e15800121edcb72e050650b02537af2d64ce +Subproject commit 9c12f6d816fc73e1262683a5293daee79790623a diff --git a/.vim/bundle/vim-indent-guides b/.vim/bundle/vim-indent-guides index 49bde6f..184e558 160000 --- a/.vim/bundle/vim-indent-guides +++ b/.vim/bundle/vim-indent-guides @@ -1 +1 @@ -Subproject commit 49bde6fa30648345ffabfe55b3a095a293568a2e +Subproject commit 184e55848de2304cabc5c03d2afe9b8fd098c58c diff --git a/.vim/bundle/vim-indent-object b/.vim/bundle/vim-indent-object index 1d3e4aa..78fffa6 160000 --- a/.vim/bundle/vim-indent-object +++ b/.vim/bundle/vim-indent-object @@ -1 +1 @@ -Subproject commit 1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b +Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e diff --git a/.vim/bundle/vim-jade b/.vim/bundle/vim-jade index f760e23..fb47bb8 160000 --- a/.vim/bundle/vim-jade +++ b/.vim/bundle/vim-jade @@ -1 +1 @@ -Subproject commit f760e239386df055eb1892243624fdf7f7c58392 +Subproject commit fb47bb8303e81fc17b4340ccd01a462332f7d90a diff --git a/.vim/bundle/vim-tmux-navigator b/.vim/bundle/vim-tmux-navigator index 1298b71..928a52f 160000 --- a/.vim/bundle/vim-tmux-navigator +++ b/.vim/bundle/vim-tmux-navigator @@ -1 +1 @@ -Subproject commit 1298b71c420f1d0abceba3f35cc710131f84d73b +Subproject commit 928a52fbda90ec70b2eb6edaf570654df4521af0 diff --git a/.vim/bundle/vimproc.vim b/.vim/bundle/vimproc.vim index f96e476..0f68bcd 160000 --- a/.vim/bundle/vimproc.vim +++ b/.vim/bundle/vimproc.vim @@ -1 +1 @@ -Subproject commit f96e476e41ab4cdb9c37242c8cf76f1e5aa5b91d +Subproject commit 0f68bcd93399ecbcde3eaa4efd09107314c9bdee diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle index 5f70ae6..cfd3b2d 160000 --- a/.vim/bundle/vundle +++ b/.vim/bundle/vundle @@ -1 +1 @@ -Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88 +Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 diff --git a/vimrc b/vimrc index 3362ab2..442dec5 100644 --- a/vimrc +++ b/vimrc @@ -168,9 +168,6 @@ nnoremap ma :set mouse=a " Turn mouse mode off nnoremap mo :set mouse= -" remove trailing spaces -command Remtrail %s/ +$//g - " Default to mouse mode on set mouse=a " }}} diff --git a/zshrc b/zshrc index 0d49bcb..5144740 100644 --- a/zshrc +++ b/zshrc @@ -39,7 +39,6 @@ alias g++="g++-5" alias psh="perl ~/.scripts/psh" alias push="git push" alias pull="git pull" -alias zploc="find . -name '*zp' -exec grep -E -v \"((^[[:space:]]*$)|(^[[:space:]]*;.*$))\" {} \; | wc -l" alias pupgrade2="pip2.7 install --upgrade pip; python2.7 ~/.pip-upgrade 2" alias pupgrade3="pip3 install --upgrade pip; python3 ~/.pip-upgrade 3" alias pupgrade="pupgrade2 && pupgrade3" @@ -49,21 +48,17 @@ alias ghc-sandbox="ghc -no-user-package-db -package-db .cabal-sandbox/*-packages alias ghci-sandbox="ghci -no-user-package-db -package-db .cabal-sandbox/*-packages.conf.d" alias runhaskell-sandbox="runhaskell -no-user-package-db -package-db .cabal-sandbox/*-packages.conf.d" alias psg="ps aux | grep -v grep | grep -i -e VSZ -e" -alias qmake="/usr/local/Cellar/qt5/5.3.2/bin/qmake" -alias lupdate="/usr/local/Cellar/qt5/5.3.2/bin/lupdate" -alias lrelease="/usr/local/Cellar/qt5/5.3.2/bin/lrelease" alias python="python3" alias pysh="ipython" alias pip2="/usr/local/bin/pip" alias pip="pip3" alias pypy="pypy3" alias setjdk="launchctl setenv STUDIO_JDK /Library/Java/JavaVirtualMachines/jdk1.8.0_05.jdk" -alias cdtan="cd ~/Documents/Code/Github/Detanglement/src/server/detanglement" alias cdz="cd ~/Documents/Code/Github/zepto" alias cdg="cd ~/Documents/Code/Github" alias cdd="cd ~/Documents/Code/Github/decode" alias cdot="cd ~/Documents/Code/Github/.dotfiles" -alias cdh="cd ~/Documents/Code/Github/hiss" +alias cdgo="cd ~/.go/src" alias cdw="cd ~/Documents/Code/Work" alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl" alias dud="du -d 1" @@ -72,7 +67,6 @@ alias ls="ls -a" alias quit="exit" alias howmuch="git ls-tree -r -z --name-only HEAD -- . | xargs -0 -n1 git blame --line-porcelain HEAD | grep '^author '| sort | uniq -c | sort -nr" alias clipboard_clear="echo lol | pbcopy" -alias vlc="/Applications/VLC.app/Contents/MacOS/VLC" alias tmv="tmux split-window" alias tmh="tmux split-window -h" alias tms="tmux select-pane -t" @@ -418,4 +412,4 @@ function zeptosay () { fortune | zeptosay -source ~/.zshrc.priv +#source ~/.zshrc.priv