From f207bcbd9f0a07b5615b5e259d45ca0e55d242ba Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sun, 26 Oct 2014 09:51:57 -0400
Subject: [PATCH] Switched Bundles to Plugins for Vundle. Added smon command
 for monitors. Fixed synapse startup

---
 i3/config           |   2 +-
 scripts/desktop.txt |   1 +
 scripts/sync.sh     |   2 +-
 shells/zshrc        |   3 ++
 vim/vimrc           | 117 ++++++++++++++++++++++----------------------
 5 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/i3/config b/i3/config
index 36d2ea5..068e7d2 100644
--- a/i3/config
+++ b/i3/config
@@ -170,5 +170,5 @@ exec --no-startup-id /usr/bin/nm-applet
 exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
 exec --no-startup-id /usr/bin/diodon
 exec --no-startup-id /usr/bin/numlockx
-exec --no-startup-id /usr/bin/synapse
+exec --no-startup-id /usr/bin/synapse -s
 # vim: ts=2:sw=2:et
diff --git a/scripts/desktop.txt b/scripts/desktop.txt
index ea14651..1f0a0d1 100644
--- a/scripts/desktop.txt
+++ b/scripts/desktop.txt
@@ -71,3 +71,4 @@ x11vnc
 xvnc4viewer
 ntop
 gnome-dictionary
+powermanagement-interface
diff --git a/scripts/sync.sh b/scripts/sync.sh
index a05bd54..8aaa950 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -22,7 +22,7 @@ while getopts ":hbsdclw" VALUE "$@"; do
       echo "Installing vundle"
       git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
     fi
-    vim +BundleClean +BundleInstall +qa
+    vim +PluginClean +PluginInstall +qa
   fi
   if [ "$VALUE" = "s" ] ; then
     if [ "$(uname)" != "Darwin" ]; then
diff --git a/shells/zshrc b/shells/zshrc
index 37ee2a4..61e834e 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -101,6 +101,9 @@ alias -g nifyd=" > /dev/null 2>&1 & disown"
 alias -g G='|& egrep -i'
 alias -g AW='austenwares.com'
 export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'
+function smon(){
+  dsh -M -w -g monitor -- "$@"
+}
 function dnstest(){
   echo "Testing ping:"
   ping -c 2 8.8.8.8
diff --git a/vim/vimrc b/vim/vimrc
index 9961128..79a1362 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,4 +1,3 @@
-let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
 if has('conceal')
   set conceallevel=2 concealcursor=i
 endif
@@ -66,7 +65,7 @@ vnoremap <silent> # :call VisualSelection('b')<CR>
 nnoremap <BS> :nohlsearch<CR>g<C-g>zo
 nnoremap U <C-r>
 nnoremap K i<CR><Esc>k$
-nnoremap <Enter> :up<CR>g<C-g>
+nnoremap <Enter> :up<CR>:silent! call sy#start()<CR>g<C-g>
 vnoremap gj j
 vnoremap gk k
 vnoremap j gj
@@ -98,13 +97,13 @@ nnoremap <Leader>= yypv$r=
 nnoremap <Leader>- yypv$r-
 nnoremap <Leader>^ yypv$r^
 nnoremap <Leader>" yypv$r"
-"inoremap '' ''<Left>
-"inoremap "" ""<Left>
-"inoremap () ()<Left>
-"inoremap <> <><Left>
+inoremap '' ''<Left>
+inoremap "" ""<Left>
+inoremap () ()<Left>
+inoremap <> <><Left>
 inoremap {} <Right>{}<Left><CR><Esc>O
-"inoremap {% {%  %}<Left><Left><Left>
-"inoremap [] []<Left>
+inoremap {% {%  %}<Left><Left><Left>
+inoremap [] []<Left>
 inoremap ;;; <Esc>A
 inoremap ;; <Esc>m`A;<Esc>``a
 inoremap ;;<Space> <Esc>A;<Esc>o
@@ -120,7 +119,7 @@ nnoremap <Down> <C-w>W
 nnoremap <Left> :bp<CR>
 nnoremap <Right> :bn<CR>
 nnoremap <C-w>z <C-w>_<C-w>\|
-nnoremap <Leader>bun G?Bundle<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:BundleInstall
+nnoremap <Leader>bun G?Plugin<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
 nnoremap <Leader><C-p> :CtrlPFunky<CR>
 nnoremap <F2> :set invpaste<CR>
 nnoremap <C-Up> [e
@@ -225,96 +224,96 @@ let loaded_matchit=1
 let g:UltiSnipsEditSplit="vertical"
 filetype off
 call vundle#rc()
-"Bundle 'Floobits/floobits-vim'
-"Bundle 'tsaleh/vim-matchit'
-"Bundle 'Shougo/neosnippet'
-"Bundle 'msanders/snipmate.vim'
-"Bundle 'vim-scripts/YankRing.vim'
-Bundle 'gmarik/vundle'
-  "Required: manages all bundles | https://github.com/gmarik/vundle
-Bundle 'Chiel92/vim-autoformat'
+"Plugin 'Floobits/floobits-vim'
+"Plugin 'tsaleh/vim-matchit'
+"Plugin 'Shougo/neosnippet'
+"Plugin 'msanders/snipmate.vim'
+"Plugin 'vim-scripts/YankRing.vim'
+Plugin 'gmarik/vundle'
+  "Required: manages all Plugins | https://github.com/gmarik/vundle
+Plugin 'Chiel92/vim-autoformat'
   "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
-Bundle 'tpope/vim-surround'
+Plugin 'tpope/vim-surround'
   "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
-Bundle 'scrooloose/syntastic'
+Plugin 'scrooloose/syntastic'
   "Syntax checker | https://github.com/scrooloose/syntastic
-"Bundle 'Shougo/neocomplcache.vim'
+"Plugin 'Shougo/neocomplcache.vim'
 "  "Tab complete everything | https://github.com/Shougo/neocomplcache.vim
-Bundle 'nathanaelkane/vim-indent-guides'
+Plugin 'nathanaelkane/vim-indent-guides'
   "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
-Bundle 'elzr/vim-json'
+Plugin 'elzr/vim-json'
   "JSON highlighting | https://github.com/elzr/vim-json
-Bundle 'groenewege/vim-less'
+Plugin 'groenewege/vim-less'
   "LESS highlighting | https://github.com/groenewege/vim-less
-Bundle 'pangloss/vim-javascript'
+Plugin 'pangloss/vim-javascript'
   "JS syntax and indentation | https://github.com/pangloss/vim-javascript
-Bundle 'briancollins/vim-jst'
+Plugin 'briancollins/vim-jst'
   "Actually, I do not know what this does | https://github.com/briancollins/vim-jst
-Bundle 'kchmck/vim-coffee-script'
+Plugin 'kchmck/vim-coffee-script'
   "Coffeescript syntax | https://github.com/kchmck/vim-coffee-script
-Bundle 'Lokaltog/powerline-fonts'
+Plugin 'Lokaltog/powerline-fonts'
   "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts
-Bundle 'bling/vim-airline'
+Plugin 'bling/vim-airline'
   "Bottom status bar | https://github.com/bling/vim-airline
-Bundle 'terryma/vim-multiple-cursors'
+Plugin 'terryma/vim-multiple-cursors'
   "Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors
-Bundle 'scrooloose/nerdtree'
+Plugin 'scrooloose/nerdtree'
   "File browser | https://github.com/scrooloose/nerdtree
-Bundle 'altercation/vim-colors-solarized'
+Plugin 'altercation/vim-colors-solarized'
   "Theme | https://github.com/altercation/vim-colors-solarized
-Bundle 'stonewareslord/vim-colors'
+Plugin 'stonewareslord/vim-colors'
   "Theme pack | https://github.com/spf13/vim-colors
-Bundle 'spf13/PIV'
+Plugin 'spf13/PIV'
   "PHP tools | https://github.com/spf13/PIV
-Bundle 'vim-scripts/AutoTag'
+Plugin 'vim-scripts/AutoTag'
   "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag
-Bundle 'Lokaltog/vim-easymotion'
+Plugin 'Lokaltog/vim-easymotion'
   "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
-Bundle 'sjl/gundo.vim'
+Plugin 'sjl/gundo.vim'
   "Visual undo | https://github.com/sjl/gundo.vim
-Bundle 'tommcdo/vim-exchange'
+Plugin 'tommcdo/vim-exchange'
   "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
-Bundle 'tpope/vim-repeat'
+Plugin 'tpope/vim-repeat'
   "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
-Bundle 'tpope/vim-commentary'
+Plugin 'tpope/vim-commentary'
   "Comment selection | https://github.com/tpope/vim-commentary
-Bundle 'vim-php/vim-php-refactoring'
+Plugin 'vim-php/vim-php-refactoring'
   "PHP refactoring | https://github.com/vim-php/vim-php-refactoring
-Bundle 'tpope/vim-fugitive'
+Plugin 'tpope/vim-fugitive'
   "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
-Bundle 'tpope/vim-unimpaired'
+Plugin 'tpope/vim-unimpaired'
   "Bracket shortcuts | https://github.com/tpope/vim-unimpaired
-Bundle 'kien/ctrlp.vim'
+Plugin 'kien/ctrlp.vim'
   "Fuzzy file search | https://github.com/kien/ctrlp.vim
-Bundle 'tacahiroy/ctrlp-funky'
+Plugin 'tacahiroy/ctrlp-funky'
   "Fuzzy function search | https://github.com/tacahiroy/ctrlp-funky
-Bundle 'godlygeek/tabular'
+Plugin 'godlygeek/tabular'
   "Quickly make tables in vim | https://github.com/godlygeek/tabular
-Bundle 'tpope/vim-abolish'
+Plugin 'tpope/vim-abolish'
   "Better abbrivation | https://github.com/tpope/vim-abolish
-Bundle 'godlygeek/csapprox'
+Plugin 'godlygeek/csapprox'
   "256 color vim in terminal | https://github.com/godlygeek/csapprox
-Bundle 'sirver/UltiSnips'
+Plugin 'sirver/UltiSnips'
   "Adds snippets | https://github.com/sirver/UltiSnips
-Bundle 'honza/vim-snippets'
+Plugin 'honza/vim-snippets'
   "More snippets | https://github.com/honza/vim-snippets
-Bundle 'Shougo/neocomplete.vim'
+Plugin 'Shougo/neocomplete.vim'
   "Autocompletes | https://github.com/Shougo/neocomplete.vim
-Bundle 'othree/eregex.vim'
+Plugin 'othree/eregex.vim'
   "Real regexes in vim | https://github.com/othree/eregex.vim
-Bundle 'vim-scripts/sessionman.vim'
+Plugin 'vim-scripts/sessionman.vim'
   "Session manager | https://github.com/vim-scripts/sessionman.vim
-Bundle 'mattn/flappyvird-vim'
+Plugin 'mattn/flappyvird-vim'
   "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-Bundle 'morhetz/gruvbox'
+Plugin 'morhetz/gruvbox'
   "Colorscheme | https://github.com/morhetz/gruvbox
-Bundle 'superbrothers/vim-vimperator'
+Plugin 'superbrothers/vim-vimperator'
   "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
-Bundle 'Rykka/colorv.vim'
+Plugin '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'
+"Plugin 'Townk/vim-autoclose'
+"  "Autoclose brackets | https://github.com/Townk/vim-autoclose
+Plugin 'mhinz/vim-signify'
   "Git information inline | https://github.com/mhinz/vim-signify
   " | 
   "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK