Skip to content

Commit

Permalink
moar
Browse files Browse the repository at this point in the history
  • Loading branch information
sjl committed Jun 27, 2012
1 parent fbb66ee commit 0aef6c1
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dotjs/github.com.js
Expand Up @@ -26,7 +26,7 @@ $(function() {
return;
}
t = $(this).find('a.message').text().substring(0, 65);
if (t === 'Updated transiflex translations -- through update_translations.sh') {
if (t === 'Updated transifex translations -- through update_translations.sh') {
$(this).hide();
return;
}
Expand Down
29 changes: 26 additions & 3 deletions fish/config.fish
Expand Up @@ -10,12 +10,34 @@ alias paththis 'set PATH (pwd) $PATH'
alias clc './get-last-commit-url.py | pbcopy'

alias ef 'vim ~/.config/fish/config.fish'
alias ev 'vim ~/.vimrc'
alias ed 'vim ~/.vim/custom-dictionary.utf-8.add'
alias eo 'vim ~/Dropbox/Org'
alias eh 'vim ~/.hgrc'
alias ep 'vim ~/.pentadactylrc'
alias em 'vim ~/.mutt/muttrc'
alias ez 'vim ~/lib/dotfiles/zsh'
alias ek 'vim ~/lib/dotfiles/keymando/keymandorc.rb'
alias et 'vim ~/.tmux.conf'

alias spotlight-off 'sudo mdutil -a -i off ; and sudo mv /System/Library/CoreServices/Search.bundle/ /System/Library/CoreServices/SearchOff.bundle/ ; and killall SystemUIServer'
alias spotlight-on 'sudo mdutil -a -i on ; and sudo mv /System/Library/CoreServices/SearchOff.bundle/ /System/Library/CoreServices/Search.bundle/ ; and killall SystemUIServer'
alias spotlight-wat 'sudo fs_usage -w -f filesys mdworker | grep "open"'

set MUTT_BIN (which mutt)
alias mutt "cd ~/Desktop; $MUTT_BIN"

alias h 'hg'
alias g 'git'

alias pbc 'pbcopy'
alias pbp 'pbpaste'

alias weechat 'weechat-curses'

alias collapse="sed -e 's/ */ /g'"
alias cuts "cut -d' '"

alias pbc 'pbcopy'
alias pbp 'pbpaste'

Expand All @@ -31,6 +53,10 @@ alias oo 'open .'
alias wo 'workon'
alias deact 'deactivate'

function psg -d "Grep for a running process, returning its PID and full string"
ps auxww | grep --color=always $argv | grep -v grep | collapse | cuts -f 2,11-
end

# }}}
# Environment variables {{{

Expand Down Expand Up @@ -183,9 +209,6 @@ alias ll 'll1'
# }}}
# Misc {{{

set MUTT_BIN (which mutt)
alias mutt "cd ~/Desktop; $MUTT_BIN"

# }}}
# Local Settings {{{

Expand Down
4 changes: 2 additions & 2 deletions keymando/keymandorc.rb
Expand Up @@ -8,13 +8,13 @@
# map "<Ctrl-Shift-R>", lambda { reload() }

# Application Switching -------------------------------------------------------
map "<Ctrl-Shift-J>", lambda { activate('Firefox') }
map "<Ctrl-Shift-K>", lambda { activate('Firefox') }
map "<Ctrl-Shift-P>", lambda { activate('Pixelmator') }
map "<Ctrl-Shift-H>", lambda { activate('Pixen') }
map "<Ctrl-Shift-O>", lambda { activate('Rdio') }
map "<Ctrl-Shift-Y>", lambda { activate('Twitter') }

map "<Ctrl-Shift-K>" do
map "<Ctrl-Shift-J>" do
activate('iTerm')
send('<Cmd-Option-2>')
end
Expand Down
Binary file modified moom/com.manytricks.Moom.plist
Binary file not shown.
5 changes: 2 additions & 3 deletions vim/vimrc
Expand Up @@ -376,12 +376,13 @@ nnoremap _d :set ft=diff<CR>
inoremap <c-f> <c-x><c-f>
inoremap <c-]> <c-x><c-]>
" }}}

" }}}
" Quick editing {{{

nnoremap <leader>ev :vsplit $MYVIMRC<cr>
nnoremap <leader>ef :vsplit ~/.config/fish/config.fish<cr>
nnoremap <leader>es :vsplit ~/.vim/snippets/<cr>
nnoremap <leader>ed :vsplit ~/.vim/custom-dictionary.utf-8.add<cr>
nnoremap <leader>eo :vsplit ~/Dropbox/Org<cr>4j
nnoremap <leader>eh :vsplit ~/.hgrc<cr>
Expand All @@ -391,8 +392,6 @@ nnoremap <leader>ez :vsplit ~/lib/dotfiles/zsh<cr>4j
nnoremap <leader>ek :vsplit ~/lib/dotfiles/keymando/keymandorc.rb<cr>
nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
" }}}

" }}}
" Searching and movement -------------------------------------------------- {{{

Expand Down
1 change: 0 additions & 1 deletion zshrc
Expand Up @@ -8,7 +8,6 @@ plugins=(command-coloring pip fabric lein redis-cli vagrant)

source $ZSH/oh-my-zsh.sh


# Custom options -------------------------------------------------------------
unsetopt promptcr

Expand Down

0 comments on commit 0aef6c1

Please sign in to comment.