Permalink
Browse files

updates

  • Loading branch information...
1 parent aaeb73e commit 070c0a62035f48bfc0ffe3451f2218de228f6877 @myfreeweb committed Oct 8, 2012
View
@@ -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
Submodule fasd updated 1 files
+1 −1 fasd
View
@@ -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,3 +1,4 @@
#min hour day mon wday
*/30 * * * * ~/Code/dotfiles/bin/pinboard_html
30 * * * * purge
+0 0 */5 * * brew cleanup
Submodule evil updated from 414b58 to a9a0f7
Submodule popwin updated 6 files
+2 −0 .gitignore
+16 −0 Makefile
+31 −0 NEWS.md
+17 −3 README.md
+132 −36 popwin.el
+387 −155 test/popwin-test.el
View
@@ -40,7 +40,6 @@
default = tracking
[branch]
autosetupmerge = always
- autosetuprebase = always
[color]
ui = auto
interactive = auto
View
@@ -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
@@ -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
@@ -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
@@ -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
Submodule easybuffer added at 61bc85
Submodule fugitive updated 1 files
+25 −7 plugin/fugitive.vim
Submodule git updated 1 files
+1 −2 ftdetect/git.vim
Submodule jade updated from 6a1f80 to d3598f
Submodule supertab updated 1 files
+2 −2 plugin/supertab.vim
Submodule vimux updated 1 files
+1 −0 README.mkd
Submodule vimux-ruby updated 1 files
+3 −1 plugin/ruby.vim
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

0 comments on commit 070c0a6

Please sign in to comment.