From 7f5abf064a7bbd9bf4ce991462f99e40c29932cb Mon Sep 17 00:00:00 2001
From: thomasba <git@thomasba.de>
Date: Wed, 23 Sep 2015 20:47:37 +0200
Subject: [PATCH] Switched to Plug

---
 vim/bundle/.keep |  0
 vim/plug.vim     | 68 ++++++++++++++++++++++++++++++++++++++++++++
 vim/vimrc        |  6 ++--
 vim/vundle.vim   | 73 ------------------------------------------------
 zsh/commands     |  6 ++++
 5 files changed, 78 insertions(+), 75 deletions(-)
 delete mode 100644 vim/bundle/.keep
 create mode 100644 vim/plug.vim
 delete mode 100644 vim/vundle.vim

diff --git a/vim/bundle/.keep b/vim/bundle/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/vim/plug.vim b/vim/plug.vim
new file mode 100644
index 0000000..cdff0ec
--- /dev/null
+++ b/vim/plug.vim
@@ -0,0 +1,68 @@
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+if !filereadable(expand("~/.vim/autoload/plug.vim"))
+	if has("win32")
+		!curl -fLo \%USERPROFILE\%\.vim\autoload\plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+	else
+		!curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+	endif
+endif
+
+call plug#begin('~/.vim/plugged')
+
+" color
+Plug 'thomasba/wombat256.vim'
+
+
+" filetype
+Plug 'vim-scripts/mcabberlog.vim', {'for': 'mcabberlog'}
+Plug 'vim-scripts/apachelogs.vim', {'for': 'apachelogs'}
+Plug 'vim-scripts/syslog-syntax-file', {'for': 'messages'}
+Plug 'othree/html5.vim', {'for': ['html','php']}
+Plug 'vim-scripts/bbcode', {'for': 'bbcode'}
+Plug 'tpope/vim-markdown',{'for': 'markdown'}
+Plug 'vim-scripts/JSON.vim', {'for': 'json'}
+Plug 'PProvost/vim-ps1', {'for': 'ps1'}
+
+" Files
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle'  }
+Plug 'kien/ctrlp.vim'
+if executable('ag')
+	Plug 'rking/ag.vim'
+elseif executable('ack')
+	Plug 'mileszs/ack.vim'
+endif
+
+" Utility
+Plug 'tpope/vim-speeddating'
+Plug 'Lokaltog/vim-powerline'
+Plug 'vim-scripts/Tagbar'
+Plug 'vim-scripts/loremipsum', { 'on': 'Loremipsum' }
+Plug 'vim-scripts/LanguageTool', {'on': 'LanguageToolCheck'}
+Plug 'thinca/vim-localrc'
+Plug 'mtth/scratch.vim'
+Plug 'scrooloose/syntastic'
+Plug 'tpope/vim-surround'
+Plug 'vim-scripts/tComment'
+Plug 'tpope/vim-fugitive'
+Plug 'tmhedberg/matchit'
+Plug 'chase/vim-ansible-yaml', { 'for': 'yaml' }
+Plug 'jamessan/vim-gnupg', { 'for': 'gpg' }
+Plug 'docunext/closetag.vim', { 'for': ['html','php']  }
+Plug 'lilydjwg/colorizer', { 'for': ['html','php','css','sass','scss'] }
+Plug 'Townk/vim-autoclose'
+" Interact with tmux from vim
+Plug 'benmills/vimux'
+Plug 'junegunn/vim-github-dashboard', { 'on': ['GHDashboard', 'GHActivity'] }
+
+" test:
+"Plugin 'Yggdroot/indentLine'
+"Plugin 'honza/vim-snippets'
+"Plugin 'junegunn/vim-easy-align'
+"Plugin 'lervag/vimtex'
+"Plugin 'reedes/vim-pencil'
+"Plugin 'terryma/vim-multiple-cursors'
+"Plugin 'mbbill/undotree'
+
+call plug#end()
diff --git a/vim/vimrc b/vim/vimrc
index 4b7495e..f543a90 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,9 +1,9 @@
 " load plugins using vundle
 
 if has("win32")
-	source ~/vimfiles/vundle.vim
+	source ~/vimfiles/plug.vim
 else
-	source ~/.vim/vundle.vim
+	source ~/.vim/plug.vim
 endif
 
 syntax on
@@ -191,6 +191,8 @@ let g:syntastic_php_checkers = ['php']
 " syntastic
 let g:syntastic_html_tidy_ignore_errors = ['warning: <div> proprietary attribute "data-role"', '<input> proprietary attribute "required"', '<input> proprietary attribute "pattern"', '<select> proprietary attribute "required"']
 
+let g:github_dashboard = { 'username': $GITHUB_USERNAME, 'password': $GITHUB_TOKEN }
+
 " vimux
 " Set tmux pane percentage
 let g:VimuxHeight = "30"
diff --git a/vim/vundle.vim b/vim/vundle.vim
deleted file mode 100644
index b314616..0000000
--- a/vim/vundle.vim
+++ /dev/null
@@ -1,73 +0,0 @@
-set nocompatible              " be iMproved, required
-filetype off                  " required
-
-if has("win32")
-	if !isdirectory(expand("~/.vim/bundle/Vundle.vim/.git"))
-		!git clone https://github.com/gmarik/Vundle.vim.git \%USERPROFILE\%\.vim\bundle\Vundle.vim
-	endif
-else
-	if !isdirectory(expand("~/.vim/bundle/Vundle.vim/.git"))
-		!git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-	endif
-endif
-
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-" required!
-Plugin 'gmarik/Vundle.vim'
-
-" color
-Plugin 'thomasba/wombat256.vim'
-
-
-" filetype
-Plugin 'vim-scripts/mcabberlog.vim'
-Plugin 'vim-scripts/apachelogs.vim'
-Plugin 'vim-scripts/syslog-syntax-file'
-Plugin 'othree/html5.vim'
-Plugin 'vim-scripts/bbcode'
-Plugin 'tpope/vim-markdown'
-Plugin 'vim-scripts/JSON.vim'
-Plugin 'PProvost/vim-ps1'
-
-" Files
-Plugin 'scrooloose/nerdtree'
-Plugin 'kien/ctrlp.vim'
-if executable('ag')
-	Plugin 'rking/ag.vim'
-elseif executable('ack')
-	Plugin 'mileszs/ack.vim'
-endif
-
-" Utility
-Plugin 'tpope/vim-speeddating'
-Plugin 'Lokaltog/vim-powerline'
-Plugin 'vim-scripts/Tagbar'
-Plugin 'vim-scripts/loremipsum'
-Plugin 'vim-scripts/LanguageTool'
-Plugin 'thinca/vim-localrc'
-Plugin 'mtth/scratch.vim'
-Plugin 'scrooloose/syntastic'
-Plugin 'tpope/vim-surround'
-Plugin 'vim-scripts/tComment'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tmhedberg/matchit'
-Plugin 'chase/vim-ansible-yaml'
-Plugin 'jamessan/vim-gnupg'
-Plugin 'docunext/closetag.vim'
-Plugin 'lilydjwg/colorizer'
-Plugin 'Townk/vim-autoclose'
-" Interact with tmux from vim
-Plugin 'benmills/vimux'
-
-" test:
-"Plugin 'Yggdroot/indentLine'
-"Plugin 'honza/vim-snippets'
-"Plugin 'junegunn/vim-easy-align'
-"Plugin 'lervag/vimtex'
-"Plugin 'reedes/vim-pencil'
-"Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'mbbill/undotree'
-
-call vundle#end()
diff --git a/zsh/commands b/zsh/commands
index e35f5b5..190901f 100644
--- a/zsh/commands
+++ b/zsh/commands
@@ -19,6 +19,12 @@ alias logout='exit'
 alias -g NUL="> /dev/null 2>&1"
 alias -g V="|vim -"
 alias -g R="|tr N-ZA-Mn-za-m A-Za-z"
+alias -g G="|grep"
+
+alias fucking=sudo
+whothefuckisusingport() {
+	sudo lsof -i tcp:$*
+}
 
 # functions