@@ -9,6 +9,9 @@ bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq v

 bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"

 bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"

+bind m set -g mouse on

+bind m set -g mouse off

+

 # Open new windows/panes in same directory

 bind '"' split-window -c "#{pane_current_path}"

 bind % split-window -h -c "#{pane_current_path}"

@@ -198,6 +198,7 @@ zstyle ':completion:*' prompt '%e errors:'

 zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s

 zstyle ':completion:*' use-compctl false

+export fpath=($HOME/.zsh.d/completion $fpath)

 autoload -Uz compinit

 compinit

@@ -514,10 +515,12 @@ PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

 export GOPATH=$HOME/go

 export PATH=$PATH:$GOPATH/bin

+export PATH=$HOME/vim8/bin:$PATH

 export CPATH=$CPATH:$HOME/include

 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib

 export VIMCLOJURE_SERVER_JAR="$HOME/lib/vimclojure/server-2.3.6.jar"

+export CLON_THEME=el

 pmkdir() {

   mkdir $1

@@ -543,7 +546,11 @@ export PROMPT

 set -o vi

 bindkey -M vicmd '?' history-incremental-search-backward

+#zprof

+

+export NVM_DIR="/home/edwlan/.nvm"

+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm

+

 #THIS MUST BE AT THE END OF THE FILE FOR GVM TO WORK!!!

 [[ -s "/Users/edwlan/.gvm/bin/gvm-init.sh" ]] && source "/Users/edwlan/.gvm/bin/gvm-init.sh"

-#zprof

@@ -1,4 +1,8 @@

-#!/usr/bin/env python3.4

+#!/usr/bin/env python3

+import gi

+gi.require_version('Gtk', '3.0')

+gi.require_version('WebKit', '3.0')

+

 from gi.repository import Gtk, WebKit

 import os.path

 print(__file__)

@@ -14,16 +14,19 @@ xmodmap $HOME/.xmodmap

 xsetroot -solid black

 xsetbg $HOME/.xmonad/cheatsheet.png

-if [ -e $HOME/Pictures/backgrund.png ]; then

+if [ -e $HOME/Pictures/background.png ]; then

    xloadimage -onroot -quiet $HOME/Pictures/background.png

 fi

-conky -bd

+

+conky -bd -a middle_left &

 xscreensaver -no-splash &

 # Set up an icon tray

-trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x000000 --height 17 &

+#trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x000000 --height 17 &

+

+#synergy

 synergys

 # notifications

@@ -51,7 +54,7 @@ $HOME/github_repos/shairport/shairport -a srv2 -o pulse -d | swap_variable SHAIR

 sonata --hidden &

 if [[ -x /usr/bin/nm-applet ]] ; then

-   nm-applet --sm-disable &

+  nm-applet --sm-disable &

 fi

 gnome-settings-daemon &

@@ -12,4 +12,4 @@ fi

 	else

 		/home/edwlan/.local/bin/yeganesh "$@" < "$cache"

 	fi

-) | ${SHELL:-"/bin/sh"} &

+)# | ${SHELL:-"/bin/sh"} &

@@ -1,19 +1,59 @@

 (in-package :stumpwm)

+

+(load-module "stumptray")

+(mode-line)

+(stumptray:stumptray)

+(setf *window-format* "%s%m%n: %15t")

+(setf *window-format-by-class* "%m%n %c %s%92t")

+

 (eval-when (:load-toplevel :compile-toplevel :execute)

+  (set-prefix-key (kbd "s-space"))

   (load "~/quicklisp/setup.lisp")

+  (ql:quickload :mpd-remote)

+  (ql:quickload :ubiquitous) 

   (ql:quickload :swank))

 (defcommand start-swank () ()

-  (swank:start-server :port 4587 :dont-close t))

-

-

-(set-prefix-key (kbd "s-space"))

+  "Start a swank server on port 4587"

+  (swank:create-server :port 4587 :dont-close nil))

+

+

+(defcommand pause-mpd () ()

+  "Pause MPD"

+  (mpd-remote:with-mpd-connection (so st)

+    (declare (ignorable so))

+    (mpd-remote:send-command st :pause)))

+

+(defcommand next-mpd () ()

+  "Next MPD"

+  (mpd-remote:with-mpd-connection (so st)

+    (declare (ignorable so))

+    (mpd-remote:send-command st :next)

+    (current-song)))

+

+(defcommand prev-mpd () ()

+  "Prev MPD"

+  (mpd-remote:with-mpd-connection (so st)

+    (declare (ignorable so))

+    (mpd-remote:send-command st :previous)

+    (current-song)))

+

+(defcommand current-song () ()

+  "Display information about the current song"

+  (mpd-remote:with-mpd-connection (so st)

+    (declare (ignorable so))

+    (let ((current-song (mpd-remote:send-command st :current-song)))

+      (message "~a ~a: ~a - ~a"

+	       (mpd-remote.song::track current-song)

+	       (mpd-remote.song::artist current-song)

+	       (mpd-remote.song::album current-song)

+	       (mpd-remote.song::title current-song)))))

 (defparameter *browser-command* "/usr/bin/google-chrome-beta")

 (defun cat (&rest strings)

-  (apply 'concatenate 'string strings))

+  (uiop:escape-sh-command strings))

 (defgeneric get-search-url (provider &rest strings)

   (:method-combination append :most-specific-last)

@@ -49,6 +89,11 @@

   (:lisp "lisp")

   (:wikipedia "w"))

+(defcommand slack-copy () ()

+  (ubiquitous:restore :atomampd-slack)

+  (push (get-x-selection) (ubiquitous:value :clip))

+  (ubiquitous:offload))

+

 (defcommand google (provider search-string) ((:string "Search Provider? ") (:string "Search Google for: "))

   "Search google for a given string"

   (check-type search-string (or null string))

@@ -84,11 +129,18 @@

   "Search for the x selection with provider"

   (do-search provider (get-x-selection)))

+(defcommand jira-ticket (number) ((:string "Ticket Number? "))

+  "get moi a jira ticket"

+  (unless (alpha-char-p (elt number 0))

+    (setf number (format nil "ATOMOS-~a" number)))

+  (run-shell-command #1=(cat *browser-command*

+			  (format nil "https://atomampd.atlassian.net/browse/~a" number))))

+

 (defparameter *selection-search-map* nil "selection search map")

 (fill-keymap *selection-search-map*

-             (kbd "g") "search-for-search google"

-             (kbd "/") "search-for-search google"

-             (kbd "s-/") "search-for-search google" 

+             (kbd "g") "search-for-selection google"

+             (kbd "/") "search-for-selection google"

+             (kbd "s-/") "search-for-selection google" 

              (kbd "l") "search-for-selection lisp")

 (defparameter *search-map* nil "search map")

@@ -107,8 +159,32 @@

              (kbd "Return") "search-for-selection google"

              (kbd "s-/") "do-search google")

+(defcommand run-yeganesh () ()

+  "Run Command given by yeganesh"

+  (let ((cmd (run-shell-command "/home/edwlan/bin/yeganesh_run" t)))

+    (run-shell-command cmd)))

+

+(define-key *top-map* (kbd "s-!") "run-yeganesh")

 (define-key *top-map* (kbd "s-/") *search-map*)

 (define-key *top-map* (kbd "s-TAB") "fnext")

 (define-key *top-map* (kbd "s-ISO_Left_Tab") "fother")

+(define-key *root-map* (kbd "\"") "windowlist-by-class")

+(define-key *root-map* (kbd "n") "next-in-frame")

+(define-key *root-map* (kbd "p") "prev-in-frame")

+

+(defparameter *passwords* '())

+(defcommand put-password (identifier) ((:string "Password Identifier? "))

+  "Put a password into a text-input"

+  (window-send-string (cdr (assoc (alexandria:make-keyword (string-upcase identifier))

+				  *passwords*))))

+(defcommand store-password (identifier password) ((:string "Password Identifier? ") (:string "Password? "))

+  "Store a password..."

+  (setf *passwords* (acons (alexandria:make-keyword (string-upcase identifier))

+			   password

+			   *passwords*))

+  "stored")

+

+;(defi)

+

 ; vim: set ft=lisp:

@@ -1,19 +1,25 @@

 let counter = 0

-let g:syntastic_auto_loc_list=1

-let g:sql_type_default = 'pgsql'

 let g:airline_theme="murmur"

+let g:easytags_async=1

+let g:easytags_by_filetype="~/.tags"

 let g:haddock_browser_callformat = "%s %s"

 let g:haddock_browser = "open"

 let g:lisp_rainbow=1

+"let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+"let g:pandoc_formatting_settings = "h"

+"let g:pandoc#modules#disabled =  ["command", "bibliographies"]

+"let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

 "let g:pandoc_no_empty_implicits=1

 "let g:pandoc_use_hard_wraps = 1

-"let g:pandoc#modules#enabled =  ["formatting", "folding", "completion", "metadata","menu"]

-"let g:pandoc#modules#disabled =  ["command", "bibliographies"]

-"let g:pandoc_formatting_settings = "h"

-"let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"]

+"let g:phpcomplete_index_composer_command = "composer"

 let g:snips_author="Edward Langley"

 let g:solarized_termtrans=1

+let g:sql_type_default = 'pgsql'

+let g:syntastic_auto_loc_list=1

 let g:syntastic_python_checkers = ['python']

+let g:syntastic_scss_sass_args = "-r sass-css-importer -r susy"

+let g:syntastic_html_tidy_ignore_errors=[" proprietary attribute " ,"trimming empty <", "unescaped &" , "lacks \"action", "is not recognized!", "discarding unexpected", "attribute name \":", "attribute name \"@"]

+

 let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

 let g:tex_flavor='xelatex'

 let g:unite_force_overwrite_statusline = 0

@@ -22,15 +28,13 @@ let g:vimclojure#HighlightBuiltins = 1

 let g:vimclojure#ParenRainbow = 1

 let g:vimclojure#ParenRainbow = 1

 let g:virtualenv_directory = "$HOME/python_envs"

-let g:phpcomplete_index_composer_command = "composer"

 let maplocalleader=','

 let $PAGER=''

 let python_highlight_all = 1

 let python_no_tab_space_error=1

 let python_space_errors=1

 let vimclojure#WantNailgun = 1

-let g:syntastic_scss_sass_args = "-r sass-css-importer -r susy"

-

+let g:assistant_show_help_shortcut=" K"

 " This goes here in case a filetype overrides it

 "NeoBundle Scripts-----------------------------

@@ -49,76 +53,84 @@ call neobundle#begin(expand("$HOME/.vim/bundle"))

 NeoBundleFetch 'Shougo/neobundle.vim'

 " My Bundles here:

-

-

-

+NeoBundle 'alvan/vim-assistant'

+NeoBundle 'posva/vim-vue'

+NeoBundle 'evidens/vim-twig'

+NeoBundle 'tpope/vim-fugitive'

+NeoBundle 'joonty/vdebug'

+NeoBundle 'shawncplus/phpcomplete.vim'

+NeoBundle 'editorconfig/editorconfig-vim'

+"NeoBundle 'lukaszb/vim-web-indent'

+NeoBundle 'KabbAmine/zeavim.vim'

 NeoBundle 'dbakker/vim-paragraph-motion'

- NeoBundle 'jceb/vim-editqf'

- NeoBundle 'mustache/vim-mustache-handlebars'

- NeoBundle 'davidoc/taskpaper.vim'

- NeoBundle 'altercation/vim-colors-solarized'

- NeoBundle 'bitc/vim-hdevtools'

- NeoBundle 'Blackrush/vim-gocode'

- NeoBundle 'bling/vim-airline'

- NeoBundle 'bling/vim-airline-themes'

- NeoBundle 'burnettk/vim-angular'

- NeoBundle 'christoomey/vim-tmux-navigator'

- NeoBundle 'curist/vim-angular-template'

- NeoBundle 'eagletmt/ghcmod-vim'

- NeoBundle 'eagletmt/neco-ghc'

- NeoBundle 'edsono/vim-matchit'

- "NeoBundle 'enomsg/vim-haskellConcealPlus'

- NeoBundle 'exu/pgsql.vim'

- NeoBundle 'fiddlerwoaroof/htmljinja'

- NeoBundle 'fiddlerwoaroof/vim-jinja'

- NeoBundle 'godlygeek/tabular'

- NeoBundle 'groenewege/vim-less'

- NeoBundle 'guns/vim-clojure-static'

- NeoBundle 'ivanov/vim-ipython'

- NeoBundle 'jmcantrell/vim-virtualenv'

- NeoBundle 'kien/rainbow_parentheses.vim'

- NeoBundle 'kovisoft/slimv'

- NeoBundle 'lukerandall/haskellmode-vim'

- "NeoBundle 'm2mdas/phpcomplete-extended'

- NeoBundle 'markcornick/vim-vagrant'

- NeoBundle 'matthewsimo/angular-vim-snippets'

- NeoBundle 'mattn/emmet-vim.git'

- NeoBundle 'msanders/snipmate.vim'

- NeoBundle 'othree/javascript-libraries-syntax.vim'

- NeoBundle 'pangloss/vim-javascript'

- NeoBundle 'raichoo/haskell-vim'

- NeoBundle 'rking/ag.vim' "Ag search utility

- NeoBundle 'rust-lang/rust.vim'

- NeoBundle 'scrooloose/nerdcommenter'

- NeoBundle 'scrooloose/nerdtree'

- NeoBundle 'scrooloose/syntastic'

- NeoBundle 'Shougo/unite.vim'

- NeoBundle 'Shougo/unite-outline'

- NeoBundle 'tsukkee/unite-tag'

- NeoBundle 'Shougo/vimfiler.vim'

- NeoBundle 'Shougo/vimproc'

- NeoBundle 'Shougo/vimshell.vim'

- NeoBundle 'sjl/gundo.vim'

- NeoBundle 'sjl/vitality.vim'

- NeoBundle 'sophacles/vim-bundle-mako'

- NeoBundle 'terryma/vim-multiple-cursors'

- NeoBundle 'tpope/vim-fireplace'

- NeoBundle 'tpope/vim-fugitive'

- NeoBundle 'tpope/vim-repeat'

- NeoBundle 'tpope/vim-surround'

- NeoBundle 'Twinside/vim-haskellFold'

- NeoBundle 'Twinside/vim-hoogle'

- "NeoBundle 'Valloric/YouCompleteMe'

- "NeoBundle 'vim-pandoc/vim-pandoc'

- NeoBundle 'vim-scripts/dbext.vim'

- NeoBundle 'vim-scripts/php.vim--Garvin'

- NeoBundle 'vim-scripts/pydoc.vim'

- NeoBundle 'vim-scripts/VimClojure'

- NeoBundle 'vim-voom/VOoM'

- NeoBundle 'ytsunetsune/unite-outline-euslisp'

- NeoBundle 'xolox/vim-misc'

- NeoBundle 'xolox/vim-easytags'

- NeoBundle 'majutsushi/tagbar'

+NeoBundle 'jceb/vim-editqf'

+"NeoBundle 'mustache/vim-mustache-handlebars'

+NeoBundle 'davidoc/taskpaper.vim'

+NeoBundle 'altercation/vim-colors-solarized'

+"NeoBundle 'bitc/vim-hdevtools'

+"NeoBundle 'Blackrush/vim-gocode'

+NeoBundle 'bling/vim-airline'

+NeoBundle 'bling/vim-airline-themes'

+"NeoBundle 'burnettk/vim-angular'

+NeoBundle 'christoomey/vim-tmux-navigator'

+"NeoBundle 'curist/vim-angular-template'

+"NeoBundle 'eagletmt/ghcmod-vim'

+"NeoBundle 'eagletmt/neco-ghc'

+NeoBundle 'edsono/vim-matchit'

+""NeoBundle 'enomsg/vim-haskellConcealPlus'

+"NeoBundle 'exu/pgsql.vim'

+"NeoBundle 'fiddlerwoaroof/htmljinja'

+"NeoBundle 'fiddlerwoaroof/vim-jinja'

+"NeoBundle 'godlygeek/tabular'

+"NeoBundle 'groenewege/vim-less'

+"NeoBundle 'guns/vim-clojure-static'

+NeoBundle 'ivanov/vim-ipython'

+NeoBundle 'jmcantrell/vim-virtualenv'

+NeoBundle 'kien/rainbow_parentheses.vim'

+NeoBundle 'kovisoft/slimv'

+"NeoBundle 'lukerandall/haskellmode-vim'

+""NeoBundle 'm2mdas/phpcomplete-extended'

+"NeoBundle 'markcornick/vim-vagrant'

+"NeoBundle 'matthewsimo/angular-vim-snippets'

+NeoBundle 'mattn/emmet-vim.git'

+NeoBundle 'msanders/snipmate.vim'

+""NeoBundle 'othree/javascript-libraries-syntax.vim'

+"NeoBundle 'pangloss/vim-javascript'

+NeoBundle 'gavocanov/vim-js-indent'

+"NeoBundle 'vim-scripts/JavaScript-Indent'

+NeoBundle 'jelera/vim-javascript-syntax'

+"NeoBundle 'raichoo/haskell-vim'

+NeoBundle 'rking/ag.vim' "Ag search utility

+NeoBundle 'rust-lang/rust.vim'

+NeoBundle 'scrooloose/nerdcommenter'

+NeoBundle 'scrooloose/nerdtree'

+NeoBundle 'scrooloose/syntastic'

+NeoBundle 'Shougo/unite.vim'

+NeoBundle 'Shougo/unite-outline'

+NeoBundle 'tsukkee/unite-tag'

+NeoBundle 'Shougo/vimfiler.vim'

+NeoBundle 'Shougo/vimproc'

+"NeoBundle 'Shougo/vimshell.vim'

+NeoBundle 'sjl/gundo.vim'

+"NeoBundle 'sjl/vitality.vim'

+"NeoBundle 'sophacles/vim-bundle-mako'

+NeoBundle 'terryma/vim-multiple-cursors'

+"NeoBundle 'tpope/vim-fireplace'

+NeoBundle 'tpope/vim-repeat'

+NeoBundle 'tpope/vim-surround'

+"NeoBundle 'Twinside/vim-haskellFold'

+"NeoBundle 'Twinside/vim-hoogle'

+""NeoBundle 'Valloric/YouCompleteMe'

+""NeoBundle 'vim-pandoc/vim-pandoc'

+"NeoBundle 'vim-scripts/dbext.vim'

+"NeoBundle 'vim-scripts/php.vim--Garvin'

+"NeoBundle 'vim-scripts/pydoc.vim'

+"NeoBundle 'vim-scripts/VimClojure'

+NeoBundle 'vim-voom/VOoM'

+NeoBundle 'ytsunetsune/unite-outline-euslisp'

+NeoBundle 'xolox/vim-misc'

+NeoBundle 'xolox/vim-easytags'

+NeoBundle 'majutsushi/tagbar'

 " Required:

@@ -201,7 +213,7 @@ au BufWrite /private/etc/pw.* set nowritebackup

 set omnifunc=syntaxcomplete#Complete

 set ignorecase

 set smartcase

-set autoindent

+"set autoindent

 set nu

 set expandtab

 set tabstop=3 softtabstop=2

@@ -229,20 +241,20 @@ set backspace=2      " more powerful backspacing

 syntax enable

 colorscheme solarized

-if &term =~ "xterm\\|rxvt"

-  " use an orange cursor in insert mode

-  let &t_SI = "\<Esc>]12;blue\x7"

-  " use a red cursor otherwise

-  let &t_EI = "\<Esc>]12;yellow\x7"

-  silent !echo -ne "\033]12;yellow\007"

-  " reset cursor when vim exits

-  autocmd VimLeave * silent !echo -ne "\033]112\007"

-  " use \003]12;gray\007 for gnome-terminal

-endif

-

-"SmartIndent for Python

-autocmd BufEnter *.hs compiler ghc

-au FocusLost * :wa

+"if &term =~ "xterm\\|rxvt"

+"  " use an orange cursor in insert mode

+"  let &t_SI = "\<Esc>]12;blue\x7"

+"  " use a red cursor otherwise

+"  let &t_EI = "\<Esc>]12;yellow\x7"

+"  silent !echo -ne "\033]12;yellow\007"

+"  " reset cursor when vim exits

+"  autocmd VimLeave * silent !echo -ne "\033]112\007"

+"  " use \003]12;gray\007 for gnome-terminal

+"endif

+

+""SmartIndent for Python

+"autocmd BufEnter *.hs compiler ghc

+"au FocusLost * :wa

 function Checkft()

   if &filetype==""

@@ -254,14 +266,14 @@ endfunction

 " when we reload, tell vim to restore the cursor to the saved position

 "autocmd FileType python map K \pW

 autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

-autocmd BufRead,BufNewFile *.twig set filetype=htmljinja

-autocmd BufRead,BufNewFile *.mako set ft=mako

-autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words ft=markdown

-autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

-autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

-autocmd BufRead,BufNewFile *.tac set ft=python

+"autocmd BufRead,BufNewFile *.twig set filetype=htmljinja

+"autocmd BufRead,BufNewFile *.mako set ft=mako

+"autocmd BufRead,BufNewFile *.md set dictionary+=/usr/share/dict/words ft=markdown

+"autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

+"autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

+"autocmd BufRead,BufNewFile *.tac set ft=python

 autocmd bufwritepost * call Checkft()

-autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+"autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

 "autocmd FileType haskell set omnifunc=necoghc#omnifunc

 autocmd FileType lisp set omnifunc=SlimvOmniComplete

@@ -300,10 +312,10 @@ map ZX :wq<cr>

 map ZZ :w<CR>

 nmap <Leader>ci <Plug>VCSCommit

-nnoremap <C-H> <C-W><C-H>

-nnoremap <C-J> <C-W><C-J>

-nnoremap <C-K> <C-W><C-K>

-nnoremap <C-L> <C-W><C-L>

+nnoremap <C-h> <C-W><C-H>

+nnoremap <C-j> <C-W><C-J>

+nnoremap <C-k> <C-W><C-K>

+nnoremap <C-l> <C-W><C-L>

 nnoremap <F2> :set nonumber!<CR>:set foldcolumn=0<CR>

 python << EOF

@@ -385,24 +397,37 @@ endif

 nnoremap [unite] <Nop>

 nmap <space> [unite]

-nmap [unite]s :<C-u>Unite -auto-preview grep:.<C-m>

-nmap [unite]o :<C-u>Unite outline -start-insert<C-m>

-nmap  [unite]f  :<C-u>Unite file_rec/async -start-insert<C-m>

-nmap  [unite]F  :<C-u>Unite file -start-insert<C-m>

-nmap  [unite]g  :<C-u>Unite file_rec/git -start-insert<C-m>

-nmap [unite]j :<C-u>Unite buffer -start-insert<C-m>

-nmap [unite]k :<C-u>Unite tab:no-current<C-m>

-nmap [unite]t :NERDTreeToggle<CR>

-nmap [unite]u :GundoToggle<CR>

-nmap [unite]r :!vagrant rsync<CR>

-nmap [unite]h :set hlsearch!<CR>

-nmap [unite]l :set list!<CR>

+

+nmap                 [unite]s :<C-u>Unite -auto-preview grep:.<C-m>

+nmap                 [unite]o :<C-u>Unite outline -start-insert<C-m>

+nmap                 [unite]f :<C-u>Unite file_rec/async -start-insert<C-m>

+nmap                 [unite]F :<C-u>Unite file -start-insert<C-m>

+nmap                 [unite]g :<C-u>Unite file_rec/git -start-insert<C-m>

+nmap                 [unite]j :<C-u>Unite buffer -start-insert<C-m>

+nmap                 [unite]k :<C-u>Unite tab:no-current<C-m>

+

+nmap                 [unite]t :NERDTreeToggle<CR>

+nmap                 [unite]u :GundoToggle<CR>

+"nmap                 [unite]r :!vagrant rsync<CR>

+nmap                 [unite]h :set hlsearch!<CR>

+nmap                 [unite]l :set list!<CR>

+nmap <silent> <expr> [unite]z FS_ToggleFoldAroundSearch({'context':2})

+nmap          <expr> [unite]x FS_ToggleFoldAroundSearch({'context':0})

+nmap                 [unite]w :let @/='\<<C-r><C-w>\>'<CR>:set hlsearch<CR>

+nmap                 [unite]r :s/<C-r><C-w>/<C-r>=input('replacement? ').'/g'<CR>

+nmap                 [unite]R :%s/<C-r><C-w>/<C-r>=input('replacement? ').'/g'<CR>

+

+nmap                 <C-x>o <C-w><C-w>

+

+:autocmd BufRead,BufNewFile .vimrc nmap [unite]1 /\(["].*\)\@<!\<[ni]\?\(no\)\?\(re\)\?map\><cr> x

 " Reload

 map <silent> tu :call GHC_BrowseAll()<CR>

 " Type Lookup

 map <silent> tw :call GHC_ShowType(1)<CR>

 autocmd BufRead,BufNewFile *.css,*.scss,*.less setlocal foldmethod=marker foldmarker={,}

+autocmd BufRead,BufNewFile *.php setlocal breakindent breakindentopt=sbr,shift:7,min:5

 command -nargs=+ Gadd Git add <q-args>

 " set runtimepath+=/Applications/LilyPond.app/Contents/Resources/share/lilypond/current/vim

+au BufNewFile,BufRead *.phn set filetype=clojure

@@ -1,23 +1,66 @@

+GIT_DEBUG=0

+

+git-ufgrep() {

+  PATTERN="$1"

+  if [[ ${PATTERN}x == ""x ]]; then

+    PATTERN='.*'

+  fi

+  PATTERN="${PATTERN//\//\\/}"

+

+  if [[ "$GIT_DEBUG" == 1 ]]; then

+    echo "$PATTERN"

+  fi

+

+  git status --porcelain | awk '$1 == "??" && $2 ~ /[.]'"$PATTERN"'$/'

+}

+

+git-run() {

+  (

+    DIR="$1"

+    shift

+    git cd "$DIR"

+    exec "$@"

+  )

+}

+

+git-back() {

+  git checkout -

+}

+

+git-ff() {

+  git pull --ff-only

+}

+

 git-root() {

-  cd `git rev-parse --show-toplevel`

+  git rev-parse --show-toplevel

+}

+

+git-ag() {

+  ag "$@" -- $(git-root)

 }

-alias groot=git-root

+

+git-cd() {

+  cd "$(git-root)/$1"

+}

+alias groot=git-cd

 is-function () {

   whence -w $1 | grep --color=auto -I function > /dev/null

 }

-GIT_CMD="`which git 2>/dev/null`"

+GIT_CMD="`which -p git 2>/dev/null`"

 if [[ "$GIT_CMD"x != ""x ]]; then

   # git wrapper that mimics the functionality of git for commandlets but also

   # searches shell functions.

-  g() {

+  git() {

     POSSIBLE_CMD="git-$1"

     if is-function $POSSIBLE_CMD; then

       $POSSIBLE_CMD "${@[2,-1]}"

     else

-      git "$@"

+      $GIT_CMD "$@"

     fi

   }

 fi

+

+