Commits

Ches Martin committed 8023c0f

vim: Add Eco bundle for CoffeeScript templating

  • Participants
  • Parent commits b7fc4fc

Comments (0)

Files changed (6)

 hgattic = ~/.hglib/hgattic/hgattic.py
 prompt = ~/.hglib/hg-prompt/prompt.py
 histedit = ~/.hglib/histedit/hg_histedit.py
-qct=/usr/local/lib/hg/qct.py
+#qct=/usr/local/lib/hg/qct.py
 hggit =
 
 [alias]
 function FindProxyForURL(url, host) {
     /**
+     *  RAILS MACHINE
+     *  Stuff inside gateways. Use something like
+     *
+     *    ssh -NCfq -D 2444 you@gw01.pnap.railsmachine.net
+     *
+     *  to get a SOCKS proxy on localhost port 2444. Since you need
+     *  a couple, using a tunnel manager app or a shell alias is helpful.
+     */
+    if (dnsDomainIs(host, "cacti.gnax.railsmachine.net") ||
+        dnsDomainIs(host, "sflow.gnax.railsmachine.net"))
+    {
+        return "SOCKS localhost:3444; DIRECT";
+    }
+    else if (dnsDomainIs(host, "cacti.pnap.railsmachine.net")) {
+        return "SOCKS localhost:2444; DIRECT";
+    }
+
+    /**
      *  PERSONAL
      *  Stuff that tries to deny IPs based on region. That's lame. And
      *  Americans travel y'know.
      */
-    if (dnsDomainIs(host, ".pandora.com")     ||
-        dnsDomainIs(host, ".amazon.com")      ||
-        dnsDomainIs(host, ".hulu.com")        ||
-        dnsDomainIs(host, ".last.fm")         ||
-        dnsDomainIs(host, ".ustream.tv")      ||
-        dnsDomainIs(host, "music.google.com") ||
-        dnsDomainIs(host, "*.annualcreditreport.com"))
+    else if (dnsDomainIs(host, ".pandora.com")     ||
+             dnsDomainIs(host, ".amazon.com")      ||
+             dnsDomainIs(host, ".hulu.com")        ||
+             dnsDomainIs(host, ".last.fm")         ||
+             dnsDomainIs(host, ".netflix.com")     ||
+             dnsDomainIs(host, ".ustream.tv")      ||
+             dnsDomainIs(host, "music.google.com") ||
+             dnsDomainIs(host, "*.annualcreditreport.com"))
     {
         return "SOCKS localhost:8080; DIRECT";
     }
 # purdy status bar
 set -g status-bg colour236
 set -g status-fg white
-set -g status-left "#[fg=green][#[fg=cyan]#S#[fg=green]]#[fg=colour250] %a %Y-%m-%d %H:%M#[default]"
+set -g status-left "#[fg=green][#[fg=cyan]#S#[fg=green]]#[fg=colour250] %a %m/%d %H:%M#[default]"
 set -g status-left-length 35
 set -g status-justify centre
 setw -g window-status-current-bg colour98
+setw -g window-status-current-format '#[fg=black,bg=yellow] #I #[fg=white,bg=colour98] #W #F '
+setw -g window-status-current-attr bold
 set -g status-right "#H #[fg=cyan][#(uptime|cut -d ' ' -f 12-)]#[default]"
 
+# set -g message-attr bold
+# set -g message-fg black
+# set -g message-bg yellow
+
 # try to set wm window titles with xterm codes
 set -g set-titles on
 
 if '[ `hostname -s` = lupin ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/lupin.conf'
 if '[ `hostname -s` = kodama ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/kodama.conf'
 
+# Migrating new active machine
+if '[ `hostname -s` = Fio ] && ! tmux has-session -t main' 'source-file $HOME/.tmux/lupin.conf'
+
 # switch-client -t main
 # select-window -t main:0
 

File .tmux/lupin.conf

-VIM=/Applications/Development/MacVim.app/Contents/MacOS/Vim
+VIM=/Applications/MacVim.app/Contents/MacOS/Vim
 
 # first session
 new-session -d -s main -n tunes 'ncmpcpp'

File .vim/include/bundles.vim

 Bundle 'alfredodeza/chapa.vim'
 Bundle 'alfredodeza/konira.vim'
 Bundle 'altercation/vim-colors-solarized'
+Bundle 'AndrewRadev/vim-eco'
 Bundle 'bronson/vim-ruby-block-conv'
 Bundle 'claco/jasmine.vim'
 Bundle 'derekwyatt/vim-scala'
 
 # Wrapper to talk to my media center MPD when I'm at home
 
-REMOTE_MPD="kodama.local"
+REMOTE_MPD="mini.local"
 
 if [[ "$(hostname)" == "$REMOTE_MPD" ]]; then
     exec /usr/local/bin/mpc "$@"