Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moar.

  • Loading branch information...
commit c3aa223a85090439626eb171f5e69b85d7da3087 1 parent 6c5395c
@sjl authored
View
24 bash_profile
@@ -6,12 +6,28 @@ shopt -s expand_aliases
# This file contains aliases and functions that duplicate some fish
# functionality, because Vim will use bash as its external command shell.
-function a() {
- if [ -f '.agignorevcs' ]; then
- ag -U $*
+AG_BIN="`which ag`"
+function ag() {
+ if test -f '.agignore' && grep -q 'pragma: skipvcs' '.agignore'; then
+ $AG_BIN --search-files -U $*
else
- ag $*
+ $AG_BIN --search-files $*
fi
}
export PATH=~/bin:~/lib/dotfiles/bin:/usr/local/share/python:$PATH
+
+alias h='hg'
+alias g='git'
+alias pbc='pbcopy'
+alias pbp='pbpaste'
+alias pbpb='pbp | pb'
+alias vu='vagrant up'
+alias vs='vagrant suspend'
+alias o='open'
+alias oo='open .'
+alias t='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt'
+
+function psg() {
+ ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11-
+}
View
35 fish/config.fish
@@ -24,7 +24,6 @@ alias ek 'vim ~/lib/dotfiles/keymando/keymandorc.rb'
alias et 'vim ~/.tmux.conf'
alias eg 'vim ~/.gitconfig'
-
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"'
@@ -67,11 +66,34 @@ function hey_virtualbox_shut_down_or_i_will_fucking_cut_you
VBoxManage controlvm $argv poweroff
end
-function a -d "Run Ag with appropriate options."
- if test -f '.agignorevcs'
- ag -U $argv
+set AG_BIN (which ag)
+function actual_ag
+ # Fuck you fish this is fucking ridiculous. Let me use $AG_BIN as
+ # a command. Or at least give me a way to do it like run $AG_BIN args or
+ # something jesus.
@nvie
nvie added a note

Wouldn't this do the trick?

eval (which ag) \$args
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ if test $AG_BIN = '/usr/local/bin/ag'
+ /usr/local/bin/ag $argv
+ else
+ if test $AG_BIN = '/usr/bin/ag'
+ /usr/bin/ag $argv
+ else
+ echo "Fish is a dick, sorry."
+ end
+ end
+end
+function ag -d "Run Ag with appropriate options."
+ if test -f '.agignore'
+ # Extra if statement because I can't figure out how to && things in
+ # a fish conditional and the documentation does not see fit to explain
+ # that little tidbit and can we please get a shell without complete
+ # bullshit as a scripting language syntax?
+ if grep -q 'pragma: skipvcs' '.agignore'
@nvie
nvie added a note

A classic foo && bar would be foo; and bar in fish's syntax.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ actual_ag --search-files -U $argv
+ else
+ actual_ag --search-files $argv
+ end
else
- ag $argv
+ actual_ag --search-files $argv
end
end
@@ -258,7 +280,10 @@ if test -s $HOME/.config/fish/local.fish
end
# }}}
+# Fortune {{{
if status --is-interactive
command fortune -s | cowsay -n | lolcat
end
+
+# }}}
View
2  keyremap4macbook/cadet.py
@@ -39,7 +39,7 @@
('n', u'' , u'', u'', u''),
('o', u'', u'', u'', u''),
('r', u'', u'', u'', u''),
- ('t', u'', u'', u'', u''),
+ # ('t', u'⊢', u'⊥', u'', u''),
('u', u'', u'', u'', u''),
('x', u'', u'', u'', u''),
('z', u'' , u'', u'', u''),
View
195 keyremap4macbook/private.xml
@@ -4,10 +4,73 @@
<item>
<name>Space Cadet Mode</name>
<appendix>This mode emulates a few of the features of the Space Cadet keyboard.</appendix>
+ <appendix>It also adds a few other helpful mappings.</appendix>
+ <appendix>It requires the Unicode Hex Input keyboard layout for the Greek and Math layers.</appendix>
<item>
+ <name>Force yourself to use the correct shift keys.</name>
+ <identifier>space_cadet.force_correct_shifts</identifier>
+
+ <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+
+ <autogen>--KeyToKey-- KeyCode::Y, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::U, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::I, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::O, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::P, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::H, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::J, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::K, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::L, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::N, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::M, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::COMMA, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::DOT, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ <autogen>--KeyToKey-- KeyCode::QUOTE, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+ </item>
+ <item>
+ <name>Shifts to Parentheses</name>
+ <appendix>Shifts, when pressed alone, type parentheses.</appendix>
+ <appendix>When used with other keys they're normal shifts.</appendix>
+
+ <identifier>space_cadet.shifts_to_parens</identifier>
+
+ <!-- This is the basic mapping. -->
+ <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
+ <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
+
+ <!--
+ Remap the "rolls" of () and )( because it's too easy to hit one
+ before finishing the other, and there's no other reason to be
+ pressing both shift keys at once anyway
+ -->
+ <autogen>--KeyToKey-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L</autogen>
+ <autogen>--KeyToKey-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
+
+ <!--
+ Remap Rshift+Space to ') ', because when typing an end paren and
+ then a space I tend to hit space before I let go of rshift.
+ -->
+ <autogen>--KeyToKey-- KeyCode::SPACE, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::SPACE</autogen>
+ </item>
+ <item>
<name>Remap Left Control to Hyper</name>
<appendix>OS X doesn't have a Hyper. This maps Left Control to Control + Shift + Option + Command.</appendix>
+ <appendix>You can use this key in your own custom keyboard shortcuts you create in apps.</appendix>
<identifier>space_cadet.left_control_to_hyper</identifier>
@@ -20,6 +83,42 @@
</autogen>
</item>
<item>
+ <name>Restore [Shift-]Opt-(Left/Right)</name>
+ <appendix>The Unicode Hex Input keyboard layout disables these keys for some reason.</appendix>
+
+ <identifier>space_cadet.fix_opt_arrows</identifier>
+
+ <autogen>
+ --KeyToKey--
+ KeyCode::CURSOR_LEFT, VK_OPTION | VK_SHIFT,
+
+ KeyCode::B,
+ ModifierFlag::OPTION_L | ModifierFlag::SHIFT_L | ModifierFlag::CONTROL_L
+ </autogen>
+ <autogen>
+ --KeyToKey--
+ KeyCode::CURSOR_LEFT, VK_OPTION,
+
+ KeyCode::B,
+ ModifierFlag::OPTION_L | ModifierFlag::CONTROL_L
+ </autogen>
+ <autogen>
+ --KeyToKey--
+ KeyCode::CURSOR_RIGHT, VK_OPTION | VK_SHIFT,
+
+ KeyCode::F,
+ ModifierFlag::OPTION_L | ModifierFlag::SHIFT_L | ModifierFlag::CONTROL_L
+ </autogen>
+ <autogen>
+ --KeyToKey--
+ KeyCode::CURSOR_RIGHT, VK_OPTION,
+
+ KeyCode::F,
+ ModifierFlag::OPTION_L | ModifierFlag::CONTROL_L
+ </autogen>
+ </item>
+
+ <item>
<name>Math Layer</name>
<appendix>Right Control key activates the Math key layer.</appendix>
@@ -164,26 +263,6 @@
<autogen>
--KeyToKey--
- KeyCode::T, ModifierFlag::EXTRA3 | VK_SHIFT,
- KeyCode::KEY_2, ModifierFlag::OPTION_L,
- KeyCode::KEY_2, ModifierFlag::OPTION_L,
- KeyCode::A, ModifierFlag::OPTION_L,
- KeyCode::KEY_5, ModifierFlag::OPTION_L,
- </autogen>
-
-
- <autogen>
- --KeyToKey--
- KeyCode::T, ModifierFlag::EXTRA3,
- KeyCode::KEY_2, ModifierFlag::OPTION_L,
- KeyCode::KEY_2, ModifierFlag::OPTION_L,
- KeyCode::A, ModifierFlag::OPTION_L,
- KeyCode::KEY_2, ModifierFlag::OPTION_L,
- </autogen>
-
-
- <autogen>
- --KeyToKey--
KeyCode::U, ModifierFlag::EXTRA3,
KeyCode::KEY_2, ModifierFlag::OPTION_L,
KeyCode::KEY_2, ModifierFlag::OPTION_L,
@@ -1037,81 +1116,5 @@
</item>
</item>
</list>
-
- <list>
- <item>
- <name>sjl Swap parens and brackets</name>
- <identifier>private.swap_parens_and_brackets</identifier>
- <autogen>--KeyToKey-- KeyCode::BRACKET_LEFT, ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
- <autogen>--KeyToKey-- KeyCode::BRACKET_RIGHT, ModifierFlag::NONE, KeyCode::KEY_0, ModifierFlag::SHIFT_R</autogen>
- <autogen>--KeyToKey-- KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::BRACKET_LEFT</autogen>
- <autogen>--KeyToKey-- KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::BRACKET_RIGHT</autogen>
- </item>
- </list>
-
- <list>
- <item>
- <name>sjl Shifts to Parentheses</name>
- <appendix>Shifts, when pressed alone, type parentheses. When used with other keys they're normal shifts.</appendix>
-
- <identifier>private.shifts_to_parens</identifier>
-
- <!-- This is the basic mapping. -->
- <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
- <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
-
- <!--
- Remap the "rolls" of () and )( because it's too easy to hit one
- before finishing the other, and there's no other reason to be
- pressing both shift keys at once anyway
- -->
- <autogen>--KeyToKey-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L</autogen>
- <autogen>--KeyToKey-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
-
- <!--
- Remap Rshift+Space to ') ', because when typing an end paren and
- then a space I tend to hit space before I let go of rshift.
- -->
- <autogen>--KeyToKey-- KeyCode::SPACE, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::SPACE</autogen>
- </item>
- </list>
-
- <list>
- <item>
- <name>sjl Use the correct goddamned shift keys.</name>
- <identifier>private.fucking_shift_keys_how_do_they_work</identifier>
-
- <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-
- <autogen>--KeyToKey-- KeyCode::Y, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::U, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::I, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::O, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::P, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::H, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::J, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::K, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::L, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::N, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::M, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::COMMA, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::DOT, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- <autogen>--KeyToKey-- KeyCode::QUOTE, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
- </item>
- </list>
</root>
View
BIN  moom/com.manytricks.Moom.plist
Binary file not shown
View
1  mutt/muttrc
@@ -105,6 +105,7 @@ set forward_quote # include message in forwards
ignore * # ignore all headers
unignore from: to: cc: date: subject: # show only these
+unhdr_order *
hdr_order from: to: cc: date: subject: # and in this order
# }}}
View
2  vim/vimrc
@@ -981,7 +981,7 @@ augroup END
" Ack {{{
nnoremap <leader>a :Ack!<space>
-let g:ackprg = 'a --nogroup --nocolor --column'
+let g:ackprg = 'ag --nogroup --nocolor --column'
" }}}
" Autoclose {{{
Please sign in to comment.
Something went wrong with that request. Please try again.