From 45f3b07c428034e40857ae44a956c9acb71eb533 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Mon, 15 Jun 2015 01:35:29 -0400 Subject: [PATCH] Made some changes --- shells/zshrc | 2 +- vim/vimrc | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/shells/zshrc b/shells/zshrc index 746df17..fa9fd3c 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -106,7 +106,7 @@ function ctar(){ tar -cf - $@|pv -WcN tar -s $(echo $(du -sb $@|awk '{print $1}'|tr '\n' '+')0|bc)|pv -WcN gzip|gzip|pv -WcN dest } function pcat(){ - pygmentize -f terminal "$1" | less -R + pygmentize -f terminal "$1" | less -R } function offline(){ echo unshare -n -- sh -c "sudo -u stonewareslord zsh -c '$@'" diff --git a/vim/vimrc b/vim/vimrc index 5947d0d..237e22f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -12,6 +12,9 @@ command! WW %!sudo tee > /dev/null % "autocmd BufRead,BufNewFile * RainbowParenthesesLoadRound "autocmd BufRead,BufNewFile * RainbowParenthesesLoadSquare "autocmd BufRead,BufNewFile * RainbowParenthesesLoadChevrons +let g:indent_guides_auto_colors = 0 +autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=red ctermbg=8 +autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=green ctermbg=8 "match Error /\s\+$/ @@ -250,22 +253,22 @@ Plug 'groenewege/vim-less' "LESS highlighting | https://github.com/groenewege/vim-less Plug 'pangloss/vim-javascript' "JS syntax and indentation | https://github.com/pangloss/vim-javascript -Plug 'Lokaltog/powerline-fonts' - "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts +"Plug 'Lokaltog/powerline-fonts' +" "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts Plug 'bling/vim-airline' "Bottom status bar | https://github.com/bling/vim-airline Plug 'terryma/vim-multiple-cursors' "Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } "File browser | https://github.com/scrooloose/nerdtree -Plug 'altercation/vim-colors-solarized' - "Theme | https://github.com/altercation/vim-colors-solarized +"Plug 'altercation/vim-colors-solarized' +" "Theme | https://github.com/altercation/vim-colors-solarized Plug 'stonewareslord/vim-colors' "Theme pack | https://github.com/spf13/vim-colors "Plug 'spf13/PIV' " "PHP tools | https://github.com/spf13/PIV -Plug 'vim-scripts/AutoTag' - "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag +"Plug 'vim-scripts/AutoTag' +" "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag Plug 'Lokaltog/vim-easymotion' "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion Plug 'sjl/gundo.vim' @@ -274,36 +277,36 @@ Plug 'tommcdo/vim-exchange' "Exchange two selections of text | https://github.com/tommcdo/vim-exchange Plug 'tpope/vim-repeat' "Repeat last tpope command with . | https://github.com/tpope/vim-repeat -Plug 'tpope/vim-commentary' - "Comment selection | https://github.com/tpope/vim-commentary +"Plug 'tpope/vim-commentary' +" "Comment selection | https://github.com/tpope/vim-commentary "Plug 'vim-php/vim-php-refactoring' " "PHP refactoring | https://github.com/vim-php/vim-php-refactoring Plug 'tpope/vim-fugitive' "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive -Plug 'tpope/vim-unimpaired' - "Bracket shortcuts | https://github.com/tpope/vim-unimpaired +"Plug 'tpope/vim-unimpaired' +" "Bracket shortcuts | https://github.com/tpope/vim-unimpaired Plug 'kien/ctrlp.vim' "Fuzzy file search | https://github.com/kien/ctrlp.vim -Plug 'tacahiroy/ctrlp-funky' - "Fuzzy function search | https://github.com/tacahiroy/ctrlp-funky +"Plug 'tacahiroy/ctrlp-funky' +" "Fuzzy function search | https://github.com/tacahiroy/ctrlp-funky Plug 'godlygeek/tabular' "Quickly make tables in vim | https://github.com/godlygeek/tabular -Plug 'tpope/vim-abolish' - "Better abbrivation | https://github.com/tpope/vim-abolish +"Plug 'tpope/vim-abolish' +" "Better abbrivation | https://github.com/tpope/vim-abolish Plug 'godlygeek/csapprox' "256 color vim in terminal | https://github.com/godlygeek/csapprox Plug 'sirver/UltiSnips' "Adds snippets | https://github.com/sirver/UltiSnips Plug 'honza/vim-snippets' "More snippets | https://github.com/honza/vim-snippets -if has("lua") - Plug 'Shougo/neocomplete.vim' - "Autocompletes | https://github.com/Shougo/neocomplete.vim -endif +"if has("lua") +" Plug 'Shougo/neocomplete.vim' +" "Autocompletes | https://github.com/Shougo/neocomplete.vim +"endif Plug 'othree/eregex.vim' "Real regexes in vim | https://github.com/othree/eregex.vim -Plug 'vim-scripts/sessionman.vim' - "Session manager | https://github.com/vim-scripts/sessionman.vim +"Plug 'vim-scripts/sessionman.vim' +" "Session manager | https://github.com/vim-scripts/sessionman.vim Plug 'mattn/flappyvird-vim' "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim Plug 'morhetz/gruvbox' @@ -336,6 +339,8 @@ Plug 'https://github.com/jiangmiao/auto-pairs' " | https://github.com/jiangmiao/auto-pairs "Plug 'https://github.com/Valloric/YouCompleteMe' " " | https://github.com/Valloric/YouCompleteMe +Plug 'https://github.com/evidens/vim-twig' + " | https://github.com/evidens/vim-twig call plug#end() filetype plugin indent on if exists("+undofile")