Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

vim: Add Eco bundle for CoffeeScript templating

  • Loading branch information...
commit 828b89f860a6ae7e4c6d3484c69b6bd80b8a32a8 1 parent 2b6d807
Ches Martin authored
2  .hgrc
@@ -43,7 +43,7 @@ hgext.zeroconf =
43 43 hgattic = ~/.hglib/hgattic/hgattic.py
44 44 prompt = ~/.hglib/hg-prompt/prompt.py
45 45 histedit = ~/.hglib/histedit/hg_histedit.py
46   -qct=/usr/local/lib/hg/qct.py
  46 +#qct=/usr/local/lib/hg/qct.py
47 47 hggit =
48 48
49 49 [alias]
33 .proxy.pac
... ... @@ -1,16 +1,35 @@
1 1 function FindProxyForURL(url, host) {
2 2 /**
  3 + * RAILS MACHINE
  4 + * Stuff inside gateways. Use something like
  5 + *
  6 + * ssh -NCfq -D 2444 you@gw01.pnap.railsmachine.net
  7 + *
  8 + * to get a SOCKS proxy on localhost port 2444. Since you need
  9 + * a couple, using a tunnel manager app or a shell alias is helpful.
  10 + */
  11 + if (dnsDomainIs(host, "cacti.gnax.railsmachine.net") ||
  12 + dnsDomainIs(host, "sflow.gnax.railsmachine.net"))
  13 + {
  14 + return "SOCKS localhost:3444; DIRECT";
  15 + }
  16 + else if (dnsDomainIs(host, "cacti.pnap.railsmachine.net")) {
  17 + return "SOCKS localhost:2444; DIRECT";
  18 + }
  19 +
  20 + /**
3 21 * PERSONAL
4 22 * Stuff that tries to deny IPs based on region. That's lame. And
5 23 * Americans travel y'know.
6 24 */
7   - if (dnsDomainIs(host, ".pandora.com") ||
8   - dnsDomainIs(host, ".amazon.com") ||
9   - dnsDomainIs(host, ".hulu.com") ||
10   - dnsDomainIs(host, ".last.fm") ||
11   - dnsDomainIs(host, ".ustream.tv") ||
12   - dnsDomainIs(host, "music.google.com") ||
13   - dnsDomainIs(host, "*.annualcreditreport.com"))
  25 + else if (dnsDomainIs(host, ".pandora.com") ||
  26 + dnsDomainIs(host, ".amazon.com") ||
  27 + dnsDomainIs(host, ".hulu.com") ||
  28 + dnsDomainIs(host, ".last.fm") ||
  29 + dnsDomainIs(host, ".netflix.com") ||
  30 + dnsDomainIs(host, ".ustream.tv") ||
  31 + dnsDomainIs(host, "music.google.com") ||
  32 + dnsDomainIs(host, "*.annualcreditreport.com"))
14 33 {
15 34 return "SOCKS localhost:8080; DIRECT";
16 35 }
11 .tmux.conf
@@ -41,12 +41,18 @@ set -g bell-action any
41 41 # purdy status bar
42 42 set -g status-bg colour236
43 43 set -g status-fg white
44   -set -g status-left "#[fg=green][#[fg=cyan]#S#[fg=green]]#[fg=colour250] %a %Y-%m-%d %H:%M#[default]"
  44 +set -g status-left "#[fg=green][#[fg=cyan]#S#[fg=green]]#[fg=colour250] %a %m/%d %H:%M#[default]"
45 45 set -g status-left-length 35
46 46 set -g status-justify centre
47 47 setw -g window-status-current-bg colour98
  48 +setw -g window-status-current-format '#[fg=black,bg=yellow] #I #[fg=white,bg=colour98] #W #F '
  49 +setw -g window-status-current-attr bold
48 50 set -g status-right "#H #[fg=cyan][#(uptime|cut -d ' ' -f 12-)]#[default]"
49 51
  52 +# set -g message-attr bold
  53 +# set -g message-fg black
  54 +# set -g message-bg yellow
  55 +
50 56 # try to set wm window titles with xterm codes
51 57 set -g set-titles on
52 58
@@ -125,6 +131,9 @@ new-session -d -s throwaway
125 131 if '[ `hostname -s` = lupin ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/lupin.conf'
126 132 if '[ `hostname -s` = kodama ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/kodama.conf'
127 133
  134 +# Migrating new active machine
  135 +if '[ `hostname -s` = Fio ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/lupin.conf'
  136 +
128 137 # switch-client -t main
129 138 # select-window -t main:0
130 139
2  .tmux/lupin.conf
... ... @@ -1,4 +1,4 @@
1   -VIM=/Applications/Development/MacVim.app/Contents/MacOS/Vim
  1 +VIM=/Applications/MacVim.app/Contents/MacOS/Vim
2 2
3 3 # first session
4 4 new-session -d -s main -n tunes 'ncmpcpp'
1  .vim/include/bundles.vim
@@ -9,6 +9,7 @@ Bundle 'gmarik/vundle'
9 9 Bundle 'alfredodeza/chapa.vim'
10 10 Bundle 'alfredodeza/konira.vim'
11 11 Bundle 'altercation/vim-colors-solarized'
  12 +Bundle 'AndrewRadev/vim-eco'
12 13 Bundle 'bronson/vim-ruby-block-conv'
13 14 Bundle 'claco/jasmine.vim'
14 15 Bundle 'derekwyatt/vim-scala'
2  bin/mpc
@@ -2,7 +2,7 @@
2 2
3 3 # Wrapper to talk to my media center MPD when I'm at home
4 4
5   -REMOTE_MPD="kodama.local"
  5 +REMOTE_MPD="mini.local"
6 6
7 7 if [[ "$(hostname)" == "$REMOTE_MPD" ]]; then
8 8 exec /usr/local/bin/mpc "$@"

0 comments on commit 828b89f

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