Skip to content
Browse files

Clean up ZSH environment

  • Loading branch information...
1 parent 2745804 commit 04b1f28287040b0b91c1d13d245242736bf6bd92 @codebeige committed Mar 24, 2013
2 oh-my-zsh
@@ -1 +1 @@
-Subproject commit fce68bbba0be99cfd49f9e46572b2d12d0a86d45
+Subproject commit 0ab0e67ecfc52b4779b700149a9c51feeb05318e
View
5 oh-my-zsh-custom/example.zsh
@@ -1,5 +0,0 @@
-# Add yourself some shortcuts to projects you often work on
-# Example:
-#
-# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
-#
View
2 oh-my-zsh-custom/plugins/example.plugin.zsh
@@ -1,2 +0,0 @@
-# Add your own custom plugins in the custom/plugins directory. Plugins placed
-# here will override ones with the same name in the main plugins directory.
View
18 oh-my-zsh-custom/themes/codebeige.zsh-theme
@@ -1,18 +0,0 @@
-# https://github.com/blinks zsh theme
-
-function _prompt_char() {
- if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
- echo "%{%F{blue}%}±%{%f%k%b%}"
- else
- echo ' '
- fi
-}
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{black}%B%F{green}%}]"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{%F{red}%}*%{%f%k%b%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-PROMPT='%{%f%k%b%}
-%{%K{black}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{black}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%}
-%{%K{black}%}$(_prompt_char)%{%K{black}%} %#%{%f%k%b%} '
View
2 vim/UltiSnips/coffee.snippets
@@ -1,6 +1,6 @@
clearsnippets
-snippet l "console.log" b
+snippet l "console.log" w
console.log ${1:output}
endsnippet
View
2 vim/UltiSnips/mocha.snippets
@@ -29,7 +29,7 @@ snippet e "expect" b
expect( ${1:actual} ).$0
endsnippet
-snippet rsh "require spec_helper" b
+snippet #=sh "require spec_helper" b
#= require spec_helper
#= require ${1:`!p snip.rv = re.sub("_?spec/?(\..*)?", "", path)`}
View
37 vim/UltiSnips/mocha_chai.snippets
@@ -30,3 +30,40 @@ snippet .sbai "should be an instanceof" i
.should.be.an.instanceof ${1:Class}
endsnippet
+snippet .shp "should have property" i
+.should.have.property "${1:prop}"${2:, ${3:value}}
+endsnippet
+
+snippet .shdp "should have deep property" i
+.should.have.deep.property "${1:prop}"${2:, ${3:value}}
+endsnippet
+
+snippet .se "should exist" i
+.should.exist
+endsnippet
+
+snippet .sne "should not exist" i
+.should.not.exist
+endsnippet
+
+snippet .sbt "should be true" i
+.should.be.true
+endsnippet
+
+snippet .sbf "should be false" i
+.should.be.false
+endsnippet
+
+snippet .sbn "should be null" i
+.should.be.null
+endsnippet
+
+snippet .sm "should match" i
+.should.match "${1:selector}"
+endsnippet
+
+snippet .shl "should have length" i
+.should.have.lengthOf ${1:0}
+endsnippet
+
+
View
36 vim/UltiSnips/mocha_chai_jquery.snippets
@@ -14,38 +14,6 @@ snippet .sht "should have text" i
.should.have.text "${1:class}"
endsnippet
-snippet .sm "should match" i
-.should.match "${1:selector}"
-endsnippet
-
-snippet .shl "should have length" i
-.should.have.length ${1:0}
-endsnippet
-
-snippet .shp "should have property" i
-.should.have.property "${1:prop}"${2:, ${3:value}}
-endsnippet
-
-snippet .shdp "should have deep property" i
-.should.have.deep.property "${1:prop}"${2:, ${3:value}}
-endsnippet
-
-snippet .sne "should exist" i
-.should.exist
-endsnippet
-
-snippet .sne "should not exist" i
-.should.not.exist
-endsnippet
-
-snippet .sbt "should be true" i
-.should.be.true
-endsnippet
-
-snippet .sbf "should be false" i
-.should.be.false
-endsnippet
-
-snippet .sbn "should be null" i
-.should.be.null
+snippet .sha "should have attr" i
+.should.have.attr "${1:attr}"${2:, ${3:value}}
endsnippet
View
9 vimrc
@@ -94,7 +94,7 @@ nnoremap ca\| F\|c,
nnoremap yi\| T\|y,
nnoremap ya\| F\|y,
nnoremap vi\| T\|v,
-nnoremap va\| F\|v,
+nnoremap va\| F\|v,https://github.com/rking/ag.vim.git
" toggle hlsearch
map <leader>hl :set hlsearch!<cr>
@@ -172,8 +172,8 @@ autocmd BufNewFile,BufReadPost *_spec.js.coffee UltiSnipsAddFiletypes mocha.coff
autocmd BufNewFile,BufReadPost *.coffee normal zR
" Smartinput
-call smartinput#map_to_trigger('i', '#', '#', '#')
-call smartinput#define_rule({'at': '\%#', 'char': '#', 'input': '#{}<left>', 'filetype': ['ruby'], 'syntax': ['Constant', 'Special']})
+" call smartinput#map_to_trigger('i', '#', '#', '#')
+" call smartinput#define_rule({'at': '\%#', 'char': '#', 'input': '#{}<left>', 'filetype': ['ruby'], 'syntax': ['Constant', 'Special']})
call smartinput#map_to_trigger('i', '<bar>', '<bar>', '<bar>')
call smartinput#define_rule({'at': '\({\|\<do\>\)\s*\%#', 'char': '<bar>', 'input': '<bar><bar><left>', 'filetype': ['ruby']})
@@ -190,6 +190,9 @@ autocmd BufNewFile,BufReadPost *.mkd,*.md,*.markdown,*.mdown,*.html,*.xhtml map
" RagTag
let g:ragtag_global_maps = 1
+" DWM
+let g:dwm_map_keys=0
+
""" Scripts & commands
" processing
View
2 zprofile
@@ -0,0 +1,2 @@
+eval "$(rbenv init -)"
+export PATH=$PATH:$HOME/bin:/usr/local/share/npm/bin
View
7 zshenv
@@ -1,7 +0,0 @@
-export PATH=$HOME/.rbenv/bin:/Users/tc/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:$PATH
-export PROCESSING_HOME=$HOME/lab/processing
-export MAVEN_OPTS="-Xmx1024m"
-export HOMEBREW_NO_EMOJI=1
-# export CC=/usr/local/bin/gcc-4.2
-
-eval "$(rbenv init -)"
View
16 zshrc
@@ -1,12 +1,11 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
-ZSH_CUSTOM=$HOME/.oh-my-zsh-custom
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
-# ZSH_THEME="codebeige"
+ZSH_THEME="codebeige"
# Set to this to use case-sensitive completion
@@ -26,19 +25,22 @@ ZSH_CUSTOM=$HOME/.oh-my-zsh-custom
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git git-flow osx ruby bundler brew pow powder rails3 vi-mode node npm)
+plugins=(git git-flow osx ruby bundler brew pow powder rails3 rake rbenv vi-mode node npm coffee)
source $ZSH/oh-my-zsh.sh
-source $ZSH_CUSTOM/themes/codebeige.zsh-theme # source theme ourselves until themes in custom folder are fully supported
unsetopt correct_all
setopt correct
+bindkey -M viins '' vi-cmd-mode
+
export EDITOR='vim'
+export PROCESSING_HOME=$HOME/lab/processing
+export MAVEN_OPTS="-Xmx1024m"
+export HOMEBREW_NO_EMOJI=1
export PSQL_EDITOR='vim -c"set syntax=pgsql"'
+export NODE_PATH="/usr/local/lib/node"
+
alias cdd='cd ~/dev'
alias cdl='cd ~/lab'
-
-bindkey -M viins '' vi-cmd-mode
-bindkey -M viins '^ ' vi-cmd-mode

0 comments on commit 04b1f28

Please sign in to comment.
Something went wrong with that request. Please try again.