Browse code
Merge branch 'master' of github.com:fiddlerwoaroof/dotfiles
Ed L authored on 05/01/2015 07:35:23
Showing 6 changed files
Showing 6 changed files
... | ... |
@@ -1,3 +1,33 @@ |
1 |
+let counter = 0 |
|
2 |
+let g:airline_theme="murmur" |
|
3 |
+let g:ghc="/usr/bin/ghc" |
|
4 |
+let g:haddock_browser_callformat = "%s %s" |
|
5 |
+let g:haddock_browser = "open" |
|
6 |
+let g:lisp_rainbow=1 |
|
7 |
+let g:pandoc_no_empty_implicits=1 |
|
8 |
+let g:pandoc_use_hard_wraps = 1 |
|
9 |
+let g:pandoc#modules#enabled = ["formatting", "folding", "completion", "externals", "metadata","menu", "executors", "motions"] |
|
10 |
+let g:pandoc#modules#disabled = ["command", "bibliographies"] |
|
11 |
+let g:pandoc_formatting_settings = "h" |
|
12 |
+let g:pandoc#filetypes#handled = ["markdown", "rst", "textile"] |
|
13 |
+let g:slimv_disable_clojure=1 |
|
14 |
+let g:snips_author="Edward Langley" |
|
15 |
+let g:solarized_termtrans=1 |
|
16 |
+let g:syntastic_python_checkers = ['python'] |
|
17 |
+let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*' |
|
18 |
+let g:tex_flavor='xelatex' |
|
19 |
+let g:vimclojure#HighlightBuiltins = 1 |
|
20 |
+let g:vimclojure#HighlightBuiltins = 1 |
|
21 |
+let g:vimclojure#ParenRainbow = 1 |
|
22 |
+let g:vimclojure#ParenRainbow = 1 |
|
23 |
+let g:virtualenv_directory = "$HOME/python_envs" |
|
24 |
+let maplocalleader=',' |
|
25 |
+let $PAGER='' |
|
26 |
+let python_highlight_all = 1 |
|
27 |
+let python_no_tab_space_error=1 |
|
28 |
+let python_space_errors=1 |
|
29 |
+let vimclojure#WantNailgun = 1 |
|
30 |
+ |
|
1 | 31 |
"NeoBundle Scripts----------------------------- |
2 | 32 |
if has('vim_starting') |
3 | 33 |
set nocompatible " Be iMproved |
... | ... |
@@ -45,6 +75,12 @@ NeoBundle 'sjl/gundo.vim' |
45 | 75 |
NeoBundle 'jmcantrell/vim-virtualenv' |
46 | 76 |
NeoBundle 'vim-scripts/pydoc.vim' |
47 | 77 |
NeoBundle 'msanders/snipmate.vim' |
78 |
+NeoBundle 'burnettk/vim-angular' |
|
79 |
+NeoBundle 'pangloss/vim-javascript' |
|
80 |
+NeoBundle 'othree/javascript-libraries-syntax.vim' |
|
81 |
+NeoBundle 'matthewsimo/angular-vim-snippets' |
|
82 |
+NeoBundle 'curist/vim-angular-template' |
|
83 |
+NeoBundle 'sophacles/vim-bundle-mako' |
|
48 | 84 |
|
49 | 85 |
" Required: |
50 | 86 |
call neobundle#end() |
... | ... |
@@ -94,13 +130,13 @@ au BufWrite /private/etc/pw.* set nowritebackup |
94 | 130 |
|
95 | 131 |
|
96 | 132 |
|
97 |
-"Diable the anti-python smart indent of # |
|
98 | 133 |
set ignorecase |
99 | 134 |
set smartcase |
100 | 135 |
set autoindent |
101 | 136 |
set nu |
102 | 137 |
set expandtab |
103 | 138 |
set tabstop=3 softtabstop=2 |
139 |
+set smarttab |
|
104 | 140 |
set shiftwidth=2 |
105 | 141 |
set incsearch |
106 | 142 |
set scrolloff=4 |
... | ... |
@@ -122,37 +158,6 @@ set grepprg=grep\ -nH\ $* |
122 | 158 |
set modelines=1 " CVE-2007-2438 |
123 | 159 |
set backspace=2 " more powerful backspacing |
124 | 160 |
|
125 |
-let counter = 0 |
|
126 |
-let g:airline_theme="murmur" |
|
127 |
-let g:ghc="/usr/bin/ghc" |
|
128 |
-let g:haddock_browser_callformat = "%s %s" |
|
129 |
-let g:haddock_browser = "open" |
|
130 |
-let g:lisp_rainbow=1 |
|
131 |
-let g:pandoc_no_empty_implicits=1 |
|
132 |
-let g:pandoc_use_hard_wraps = 1 |
|
133 |
-let g:pantondoc_enabled_modules = ["formatting", "folding", "bibliographies", |
|
134 |
- \"completion", "externals", "metadata", |
|
135 |
- \"menu", "executors", "motions"] |
|
136 |
-let g:pantondoc_formatting_settings = "h" |
|
137 |
-let g:pantondoc_handled_filetypes = ["markdown", "rst", "textile"] |
|
138 |
-let g:slimv_disable_clojure=1 |
|
139 |
-let g:snips_author="Edward Langley" |
|
140 |
-let g:solarized_termtrans=1 |
|
141 |
-let g:syntastic_python_checkers = ['python'] |
|
142 |
-let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*' |
|
143 |
-let g:tex_flavor='xelatex' |
|
144 |
-let g:vimclojure#HighlightBuiltins = 1 |
|
145 |
-let g:vimclojure#HighlightBuiltins = 1 |
|
146 |
-let g:vimclojure#ParenRainbow = 1 |
|
147 |
-let g:vimclojure#ParenRainbow = 1 |
|
148 |
-let g:virtualenv_directory = "$HOME/python_envs" |
|
149 |
-let maplocalleader=',' |
|
150 |
-let $PAGER='' |
|
151 |
-let python_highlight_all = 1 |
|
152 |
-let python_no_tab_space_error=1 |
|
153 |
-let python_space_errors=1 |
|
154 |
-let vimclojure#WantNailgun = 1 |
|
155 |
- |
|
156 | 161 |
syntax enable |
157 | 162 |
colorscheme solarized |
158 | 163 |
|
... | ... |
@@ -186,7 +191,8 @@ autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoin |
186 | 191 |
autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,( |
187 | 192 |
" when we reload, tell vim to restore the cursor to the saved position |
188 | 193 |
|
189 |
-"inoremap X# |
|
194 |
+"Diable the anti-python smart indent of # |
|
195 |
+inoremap # X# |
|
190 | 196 |
|
191 | 197 |
"Turn Syntax Highlighting on by default, and assume the xterm background is black |
192 | 198 |
imap <C-g> :Unite outline i |
... | ... |
@@ -188,7 +188,7 @@ switchWorkspace target = do |
188 | 188 |
|
189 | 189 |
main = do |
190 | 190 |
xmproc <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc" |
191 |
- xmproc1 <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc1" |
|
191 |
+ --xmproc1 <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc1" |
|
192 | 192 |
xmonad $ defaultConfig |
193 | 193 |
{ |
194 | 194 |
manageHook = myManageHook <+> manageSpawn <+> manageHook defaultConfig, |
... | ... |
@@ -82,7 +82,6 @@ PATH=/home/edwlan/bin:/usr/local/bin:$PATH |
82 | 82 |
export PATH="/opt/local/bin:/usr/sbin:/sbin/usr/sbin:/sbin:$HOME/.cabal/bin:$HOME/bin:/Developer/usr/bin:$PATH" |
83 | 83 |
export VIMCLOJURE_SERVER_JAR="$HOME/bin/jars/server-2.3.6.jar" |
84 | 84 |
export INFOPATH=/usr/local/share/info:/usr/local/texlive/2009/texmf/doc/info |
85 |
- |
|
86 | 85 |
export SAVEHIST=10000000 |
87 | 86 |
export HISTSIZE=10000000 |
88 | 87 |
export HISTFILE=$HOME/.zshistory |
... | ... |
@@ -98,6 +97,7 @@ export MANPATH="/opt/local/share/man:$MANPATH" |
98 | 97 |
export PAGER="less" |
99 | 98 |
|
100 | 99 |
export RGBDEF='/opt/X11/share/X11/rgb.txt' |
100 |
+export GREP_COLORS='ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36' |
|
101 | 101 |
|
102 | 102 |
if [ -x /usr/local/bin/vim ]; then |
103 | 103 |
export VISUAL="/usr/local/bin/vim" |
... | ... |
@@ -185,6 +185,8 @@ alias e=$EDITOR |
185 | 185 |
alias cvsdiff='cvs diff -wbB | colordiff' |
186 | 186 |
alias cp.='gcp --target-directory=.' |
187 | 187 |
alias notep='note post' |
188 |
+alias bower='noglob bower' |
|
189 |
+alias node='nodejs' |
|
188 | 190 |
|
189 | 191 |
echo "done variables and options" |
190 | 192 |
|
... | ... |
@@ -392,6 +394,12 @@ ge() { |
392 | 394 |
} |
393 | 395 |
|
394 | 396 |
messages() { |
397 |
+ if [[ -d .git ]]; then |
|
398 |
+ echo "Git log messages:" |
|
399 |
+ git log -n 5 | egrep --color=yes -Io '(TODO|NOTE|FIXME|BUG|DONE):.*$' |
|
400 |
+ fi |
|
401 |
+ |
|
402 |
+ echo "Messages from files:" |
|
395 | 403 |
egrep --color=yes -IHnro '(TODO|NOTE|FIXME|BUG):.*$' . | |
396 | 404 |
psc ' |
397 | 405 |
for line in sys.stdin: |
... | ... |
@@ -0,0 +1 @@ |
1 |
+print('hello') |