diff --git a/scripts/sync.sh b/scripts/sync.sh index 8169d95..a05bd54 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -31,11 +31,10 @@ while getopts ":hbsdclw" VALUE "$@"; do sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") else if [ -d "/usr/local/Library/Taps/phinze/homebrew-cask" ] ; then - brew tap phinze/cask - brew install brew-cask + brew install caskroom/cask/brew-cask brew cask fi - brew cask install gimp inkscape adium vlc iterm2 steam adobe-reader + brew cask install gimp inkscape adium vlc iterm2 steam adobe-reader spectacle xquartz fi fi if [ "$VALUE" = "d" ] ; then @@ -44,7 +43,9 @@ while getopts ":hbsdclw" VALUE "$@"; do echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ") sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ") else - brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld + brew install macvim --with-cscope --with-lua --HEAD + brew install vim --with-lua + brew install ncdu htop youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld fi fi if [ "$VALUE" = "c" ] ; then @@ -69,6 +70,7 @@ while getopts ":hbsdclw" VALUE "$@"; do fi if [ ! -d ~/.fzf ] ; then git clone https://github.com/junegunn/fzf.git ~/.fzf + ~/.fzf/install fi if [ ! -d ~/.antigen ] ; then git clone https://github.com/zsh-users/antigen ~/.antigen diff --git a/vim/vimrc b/vim/vimrc index cde7b56..9961128 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -98,13 +98,13 @@ nnoremap = yypv$r= nnoremap - yypv$r- nnoremap ^ yypv$r^ nnoremap " yypv$r" -inoremap '' '' -inoremap "" "" -inoremap () () -inoremap <> <> +"inoremap '' '' +"inoremap "" "" +"inoremap () () +"inoremap <> <> inoremap {} {}O -inoremap {% {% %} -inoremap [] [] +"inoremap {% {% %} +"inoremap [] [] inoremap ;;; A inoremap ;; m`A;``a inoremap ;; A;o @@ -297,23 +297,26 @@ Bundle 'godlygeek/csapprox' Bundle 'sirver/UltiSnips' "Adds snippets | https://github.com/sirver/UltiSnips Bundle 'honza/vim-snippets' - " | https://github.com/honza/vim-snippets + "More snippets | https://github.com/honza/vim-snippets Bundle 'Shougo/neocomplete.vim' "Autocompletes | https://github.com/Shougo/neocomplete.vim Bundle 'othree/eregex.vim' "Real regexes in vim | https://github.com/othree/eregex.vim - "Real regexes in vim | https://github.com/othree/eregex.vim Bundle 'vim-scripts/sessionman.vim' - " |https://github.com/vim-scripts/sessionman.vim + "Session manager | https://github.com/vim-scripts/sessionman.vim Bundle 'mattn/flappyvird-vim' - " |https://github.com/mattn/flappyvird-vim + "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim Bundle 'morhetz/gruvbox' - " |https://github.com/morhetz/gruvbox + "Colorscheme | https://github.com/morhetz/gruvbox Bundle 'superbrothers/vim-vimperator' - " |https://github.com/superbrothers/vim-vimperator + "Vimperator for vim | https://github.com/superbrothers/vim-vimperator Bundle 'Rykka/colorv.vim' - " |https://github.com/Rykka/colorv.vim - " | + "Color selection in vim | https://github.com/Rykka/colorv.vim +Bundle 'Townk/vim-autoclose' + "Autoclose brackets | https://github.com/Townk/vim-autoclose +Bundle 'mhinz/vim-signify' + "Git information inline | https://github.com/mhinz/vim-signify + " | "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK filetype plugin indent on if exists("+undofile")