Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updates

  • Loading branch information...
commit 070c0a62035f48bfc0ffe3451f2218de228f6877 1 parent aaeb73e
@myfreeweb authored
View
3  .gitmodules
@@ -220,3 +220,6 @@
[submodule "bin/spot"]
path = bin/spot
url = git://github.com/guille/spot.git
+[submodule "vim/bundle/easybuffer"]
+ path = vim/bundle/easybuffer
+ url = git://github.com/troydm/easybuffer.vim.git
2  bin/fasd
@@ -1 +1 @@
-Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58
+Subproject commit 391e555f8eb01a01e152bb2d3613dc6bd7ebfde9
View
10 config.fish
@@ -17,8 +17,10 @@ end
set PATH "/usr/local/bin" $PATH
set PATH "/usr/local/sbin" $PATH
-for dir in $DOTFILES/bin/*/
- set PATH $dir $PATH
+for dir in $DOTFILES/bin/*
+ if test -d $dir
+ set PATH $dir $PATH
+ end
end
set PATH (brew --prefix coreutils)/libexec/gnubin $PATH
set PATH "$DOTFILES/bin" $PATH
@@ -87,9 +89,9 @@ function fish_prompt
printf '%s ' (prompt_pwd)
set -g lastc green
- if git rev-parse --show-toplevel >/dev/null 2>&1
+ if git root >/dev/null 2>&1
p_arrow blue
- printf ' \u2b60 '
+ printf ' '
printf '%s ' (git branch --contains HEAD ^/dev/null | grep '*' | tr -s ' ' | cut -d ' ' -f2)
set -g lastc blue
end
View
1  crontab_mac
@@ -1,3 +1,4 @@
#min hour day mon wday
*/30 * * * * ~/Code/dotfiles/bin/pinboard_html
30 * * * * purge
+0 0 */5 * * brew cleanup
2  emacs.d/clojure
@@ -1 +1 @@
-Subproject commit 2081c932ac584ec078515e2ee2f5b73d7631a060
+Subproject commit 7bb63a54758ed9abd5288313f965bcab100f9d7e
2  emacs.d/color-theme-solarized
@@ -1 +1 @@
-Subproject commit 553ce32da3a99b8305ebccd49f2c37204d3fc754
+Subproject commit 9a0019332c239a17f0fac310c7d9f08905222522
2  emacs.d/evil
@@ -1 +1 @@
-Subproject commit 414b58c14839bf05de60f2ef4fac98d4c1a6dfd8
+Subproject commit a9a0f70823da94351d36990db590174d0d80ab5f
2  emacs.d/popwin
@@ -1 +1 @@
-Subproject commit 83c836a552a3905602e0a1b16c520b233cce8fc2
+Subproject commit bd130a65d832669d6763cba170216937e04f692e
View
1  gitconfig
@@ -40,7 +40,6 @@
default = tracking
[branch]
autosetupmerge = always
- autosetuprebase = always
[color]
ui = auto
interactive = auto
2  keybindings
@@ -1 +1 @@
-Subproject commit 7d437b3ff6bb539747b8dcf0e7ca76f94708628f
+Subproject commit 0ab98dbea60920ce7f271ac6acfb705a6280930d
View
10 keymandorc.rb
@@ -30,7 +30,15 @@ def ctrlshift(k, &block)
ctrlshift "o" { activate "MacVim" }
ctrlshift "y" { activate "Pixelmator" }
ctrlshift "m" { activate "Messages" }
-ctrlshift "/" { activate "WrapTunes"; send "<Cmd-0>" }
+ctrlshift "." { activate "WrapTunes"; send "<Cmd-0>" }
+ctrlshift "u" { activate "Finder" }
+ctrlshift "/" {
+ activate "Ecoute"
+ # opens the window even after cmd+w closing it
+ sleep 0.1
+ ecoute = Accessibility::Gateway.get_application_by_name "Ecoute"
+ ecoute.menu_bar.find.first_item_matching(:role => Matches.partial("menuitem"), :title => Matches.exact("Ecoute")).press
+}
# Automation -----------------------------------------------------------
ctrlshift ";" {
View
26 mutt/muttrc
@@ -9,23 +9,25 @@
# viewing, managing
set folder = ~/Mail
set mbox_type = Maildir
-set record = +sent
set postponed = +drafts
-set nomove
+unset move
set delete
-set noconfirmappend
-set nomark_old
+unset confirmappend
+unset mark_old
set quit
set sort = threads
set sort_aux = reverse-last-date-received
set sort_re
set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+""])"
-set nobeep
+unset beep
set smart_wrap
set tilde
-set nomarkers
+unset markers
set menu_scroll
+set uncollapse_jump
+set timeout = 3
+set mail_check = 0
set pager_stop
set pager_context = 3
ignore *
@@ -63,10 +65,10 @@ bind index j previous-entry
bind index gg first-entry
bind index G last-entry
macro index / \
- "<enter-command>set nowait_key<enter><shell-escape>mutt-notmuch --prompt search<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
+ "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch --prompt search<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
"search mail (using notmuch)"
macro index T \
- "<enter-command>set nowait_key<enter><pipe-message>mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
+ "<enter-command>unset wait_key<enter><pipe-message>mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
"search and reconstruct owning thread (using notmuch)"
macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
@@ -82,6 +84,8 @@ bind pager n next-entry
bind pager gg top
bind pager G bottom
macro pager \Cu "|urlview<enter>"
+bind compose p postpone-message
+bind index p recall-message
# attachments
set mailcap_path = ~/.mutt/mailcap
@@ -92,7 +96,7 @@ set query_command = '~/Code/dotfiles/bin/addressbook %s'
set sendmail = /usr/local/bin/msmtp
set sendmail_wait = 0
set envelope_from
-set nomime_forward
+unset mime_forward
set include
set forward_quote
set forward_format = "Fwd: %s"
@@ -109,6 +113,10 @@ set send_charset = "utf-8:windows-1251:us-ascii:iso-8859-1"
alternates ^greg@wm\\.ru$ ^floatboth@me\\.com$
set reverse_name
+# misc
+set pipe_decode
+set thorough_search
+
# accounts
folder-hook iCloud/* source ~/.mutt/icloud.muttrc
folder-hook WM/* source ~/.mutt/wm.muttrc
View
6 ssh_config
@@ -7,3 +7,9 @@ HashKnownHosts no
Host nfsn
Hostname ssh.phx.nearlyfreespeech.net
+
+Host floatboth-me-com
+ HostName git01.phpfog.com
+ User git
+ IdentityFile /Users/myfreeweb/.ssh/floatboth-me-com
+
View
8 tmux.conf
@@ -31,12 +31,20 @@ bind T command-prompt "new-window \"exec teamocil '%%'\""
bind , command-prompt "rename-window '%%'"
bind S choose-session
bind R command-prompt "rename-session '%%'"
+bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
+
+# Copying
bind [ copy-mode
setw -g mode-keys vi
bind -t vi-copy v begin-selection
bind -t vi-copy y copy-selection
bind -t vi-copy k cursor-down # reversed for colemak
bind -t vi-copy j cursor-up
+bind -t vi-copy H start-of-line
+bind -t vi-copy L end-of-line
+bind -t vi-copy v begin-selection
+bind -t vi-copy y copy-selection
+bind -t vi-copy Escape cancel
# Mouse
set -g mouse-select-pane on
2  vim/bundle/clojure
@@ -1 +1 @@
-Subproject commit ab5086fc7f85fa62adbd2c519206eb4fe0a4b71a
+Subproject commit 2a17c249571395a7f45523d38cac6a9326ecf8f1
2  vim/bundle/ctrlp
@@ -1 +1 @@
-Subproject commit b7cb2f539d6f14443ccff7c3fa14da9049bcaab0
+Subproject commit 309d29d0c7e40d2de7b81a19ba96234640a17157
1  vim/bundle/easybuffer
@@ -0,0 +1 @@
+Subproject commit 61bc85358e96aa4e8f032386f30cc66dec8302db
2  vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit f5b50f822bad212b18be5d7e2717006a70991995
+Subproject commit 41383131b861c12abd82ad55a9546b9b715925a0
2  vim/bundle/git
@@ -1 +1 @@
-Subproject commit 2d54fb2b87fe3b74c2fb00edcfaa1f711944e6ea
+Subproject commit 75bc1628833ee1f1d8ecb8a66c5df852554c9a19
2  vim/bundle/jade
@@ -1 +1 @@
-Subproject commit 6a1f80934605cd200bb646c4997b1b0e5d3bcf28
+Subproject commit d3598f469f7f81cf84e900246fb211d282ca7756
2  vim/bundle/quickrun
@@ -1 +1 @@
-Subproject commit f0563323fc1ecbed78ceba7089b91595f0194061
+Subproject commit 23d2a78ba4ace29d670d52e5f8996ced785beaaa
2  vim/bundle/speeddating
@@ -1 +1 @@
-Subproject commit 249457192214e34ce678a8730f379d1b6b5c42c1
+Subproject commit 6c1501abd4ff33a68127d5b4a64b190062fffb8a
2  vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit ee35ab6954a11337a2b52003d07fabe442843b68
+Subproject commit 12f3dc40fdfa3572a5b923e7a174516d46f2f78c
2  vim/bundle/vimux
@@ -1 +1 @@
-Subproject commit ea99609f5613f243d8313df941c2fd3461ec80d4
+Subproject commit c5216bb34590a42b272d3045d6097a82e86df326
2  vim/bundle/vimux-ruby
@@ -1 +1 @@
-Subproject commit 4c15496f35986b7d0ee5de2e341536515a6b5baf
+Subproject commit 73e0a57f6737808108dee9d29e58093836ee0286
View
2  vimrc
@@ -85,6 +85,8 @@ set undodir=~/.vim/tmp/undo/
" Bindings
" basics {{{
+let mapleader = ","
+let maplocalleader = "\\"
" j and k inverted for colemak
noremap k gj
noremap j gk
Please sign in to comment.
Something went wrong with that request. Please try again.