Permalink
Browse files

stuff

  • Loading branch information...
1 parent 1fdf589 commit 7eedba7cca77ae71882d70cfae3daba23f3e6e42 @myfreeweb committed Aug 12, 2012
View
@@ -14,10 +14,10 @@ But are you really going to use all my dotfiles? No. You're not me. You should s
## The good parts
- git&hg alias system, one letter == one thing, like vi commands, but the object comes before the verb, which makes more sense for version control
- extremely awesome `irb` (ruby), `python`, `lein` (clojure)
-- [powerline](https://github.com/Lokaltog/vim-powerline) in vim and a similar thing for tmux, stolen from [sjl/dotfiles](https://github.com/sjl/dotfiles/), but with keyboard layout instead of music and mail. cool if you're bilingual. customize `bin/keylayout.sh` for your language if it's not russian.
-- [Tarsnap](http://www.tarsnap.com/)-based backup script `bin/backup.sh` and backup deletion script `bin/rmbackups.sh`
-- `bin/pinboard_html.py` writes my recent [Pinboard](http://pinboard.in) bookmarks to ~/.bookmarks.html, I add it to LaunchBar, I can search it
-- solid, robust, UNIX-way mail configuration: mutt + offlineimap + msmtp + notmuch + urlview + `bin/addressbook.py` work together. like a boss!
+- [powerline](https://github.com/Lokaltog/vim-powerline) in vim and a similar thing for tmux, stolen from [sjl/dotfiles](https://github.com/sjl/dotfiles/), but with keyboard layout instead of music and mail. cool if you're bilingual. customize `bin/keylayout` for your language if it's not russian.
+- [Tarsnap](http://www.tarsnap.com/)-based backup script `bin/backup` and backup deletion script `bin/rmbackups`
+- `bin/pinboard_html` writes my recent [Pinboard](http://pinboard.in) bookmarks to ~/.bookmarks.html, I add it to LaunchBar, I can search it
+- solid, robust, UNIX-way mail configuration: mutt + offlineimap + msmtp + notmuch + urlview + `bin/addressbook` work together. like a boss!
- zsh from the future! [zshuery](https://github.com/myfreeweb/zshuery), [history search](https://github.com/zsh-users/zsh-history-substring-search) and [syntax highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)
## The weird parts
File renamed without changes.
File renamed without changes.
Submodule fasd updated 4 files
+3 −3 README.md
+2 −2 fasd
+5 −5 fasd.1
+2 −2 fasd.1.md
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -32,12 +32,18 @@ set -gx PYTHONSTARTUP "$DOTFILES/pythonrc.py"
set -gx WORKON_HOME "$CODEDIR"
# Ruby
+set -gx RUBY_HEAP_MIN_SLOTS 1000000
+set -gx RUBY_HEAP_SLOTS_INCREMENT 1000000
+set -gx RUBY_HEAP_SLOTS_GROWTH_FACTOR 1
+set -gx RUBY_GC_MALLOC_LIMIT 1000000000
+set -gx RUBY_HEAP_FREE_MIN 500000
set PATH "$HOME/.rbenv/bin" $PATH
set PATH "$HOME/.rbenv/shims" $PATH
rbenv rehash 2>/dev/null
# Java
set -gx JAVA_HOME "/Library/Java/Home"
+set PATH "/Library/Java/Home/bin" $PATH
# Fish
set -gx fish_greeting ''
@@ -63,6 +69,7 @@ set -gx LEDGER_FILE "$HOME/Documents/my.ledger"
# Functions {{{
. $DOTFILES/rc
+alias z 'pushd (fasd -d $argv)'
function mcd
mkdir -p "$argv"
@@ -125,6 +132,7 @@ end
# Prompt {{{
function fish_prompt
+ command fasd --proc (fasd --sanitize $1)
set last_status $status
echo
@@ -145,6 +153,13 @@ function fish_prompt
printf ' (%s)' (basename "$VIRTUAL_ENV")
set_color normal
end
+
+ if test -s $HOME/.rbenv/version
+ set_color red
+ printf ' <%s>' (cat $HOME/.rbenv/version)
+ set_color normal
+ end
+
if test $last_status -eq 0
set_color green -o
printf ' :) '
View
@@ -1,4 +1,4 @@
#min hour day mon wday
-0 */5 * * * zsh ~/Code/dotfiles/bin/backup.sh
-0 */5 */5 * * zsh ~/Code/dotfiles/bin/rmbackups.sh
-*/5 * * * * zsh ~/Code/dotfiles/bin/sync_mail.sh
+0 */5 * * * zsh ~/Code/dotfiles/bin/backup
+0 */5 */5 * * zsh ~/Code/dotfiles/bin/rmbackups
+*/5 * * * * zsh ~/Code/dotfiles/bin/sync_mail
View
@@ -1,3 +1,3 @@
#min hour day mon wday
-*/30 * * * * ~/Code/dotfiles/bin/pinboard_html.py
+*/30 * * * * ~/Code/dotfiles/bin/pinboard_html
30 * * * * purge
View
@@ -84,7 +84,7 @@ set mailcap_path = ~/.mutt/mailcap
auto_view text/html
# sending
-set query_command = '~/Code/dotfiles/bin/addressbook.py %s'
+set query_command = '~/Code/dotfiles/bin/addressbook %s'
set sendmail = /usr/local/bin/msmtp
set sendmail_wait = 0
set envelope_from
View
@@ -48,7 +48,7 @@ set -g status-left ""
set -g status-fg white
set -g status-bg black
set -g status-interval 1
-set -g status-left "#[fg=black,bg=yellow,bold] #S #[fg=yellow,bg=cyan,nobold]⮀#[fg=black,bold] #(keylayout.sh)#[bg=black,fg=cyan,nobold]⮀"
+set -g status-left "#[fg=black,bg=yellow,bold] #S #[fg=yellow,bg=cyan,nobold]⮀#[fg=black,bold] #(keylayout)#[bg=black,fg=cyan,nobold]⮀"
set -g status-right "#[fg=gray]⮃ %R ⮃ %d %b #[fg=white,bg=black]⮂#[fg=black,bg=white,bold] #h "
set -g window-status-format "#[fg=white,bg=black,nobold] #I #W "
set -g window-status-current-format "#[fg=black,bg=green,nobold]⮀#[fg=black,bg=green,noreverse,bold] #I #[nobold]⮁#[bold] #W #[fg=green,bg=black,nobold]⮀"
@@ -58,7 +58,7 @@ set -g set-titles-string "tmux.#I.#W"
set -g base-index 1
set -s escape-time 0
setw -g aggressive-resize on
-set -g default-command "sh ~/Code/dotfiles/bin/reattach.sh $SHELL"
+set -g default-command "sh ~/Code/dotfiles/bin/reattach $SHELL"
set -g default-terminal "screen-256color"
set -ga update-environment " SOLARIZED"
set -g history-limit 50000
@@ -6,3 +6,5 @@ setlocal smarttab
setlocal expandtab
setlocal nosmartindent
setlocal wrap
+setlocal define=^\s*\\(def\\\\|class\\)
+inoremap <buffer> <c-b> """"""<left><left><left>
View
@@ -27,6 +27,7 @@ set autoread autowrite
set magic
set nojoinspaces
set modelines=3
+set synmaxcol=500 " don't highlight minified js and stuff
" }}}
" formatting {{{
set nowrap
@@ -38,14 +39,15 @@ set whichwrap+=<,>,[,]
set virtualedit=block
" }}}
" ui {{{
+set notimeout ttimeout ttimeoutlen=10
set relativenumber
set hlsearch
set backspace=indent,eol,start
set noerrorbells
set showbreak=
set list listchars=tab:▸\ ,eol:¬,extends:❯,precedes:
-set fillchars+=vert:│
-set ttyfast title
+set fillchars=diff:⣿,vert:│
+set ttyfast lazyredraw title
set cursorline
set hidden
set mouse=a
@@ -57,6 +59,7 @@ set showmatch
set mat=5
set virtualedit=onemore
set viewoptions=folds,options,cursor,unix,slash
+set t_ti= t_te= " http://www.shallowsky.com/linux/noaltscreen.html
" }}}
" completion {{{
set completeopt=longest,menuone,preview
@@ -95,6 +98,7 @@ nnoremap Y y$
nnoremap <CR> :nohlsearch<CR>
imap <C-l> <Space>=><Space>
map <Leader>d :bd<CR>
+nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr> " Unfuck my screen
" }}}
" windows {{{
map <C-h> <C-w>h
@@ -132,9 +136,31 @@ map <Leader>a :Ack!
map <Leader>m :Rename
nnoremap <Leader>b :silent !open <C-R>=escape("<C-R><C-F>", "#?&;\|%")<CR><CR> " open URLs
" }}}
+" motion for numbers {{{
+" Motion for numbers. Great for CSS. Lets you do things like this:
+" margin-top: 200px; -> daN -> margin-top: px;
+onoremap N :<c-u>call <SID>NumberTextObject(0)<cr>
+xnoremap N :<c-u>call <SID>NumberTextObject(0)<cr>
+onoremap aN :<c-u>call <SID>NumberTextObject(1)<cr>
+xnoremap aN :<c-u>call <SID>NumberTextObject(1)<cr>
+onoremap iN :<c-u>call <SID>NumberTextObject(1)<cr>
+xnoremap iN :<c-u>call <SID>NumberTextObject(1)<cr>
+function! s:NumberTextObject(whole)
+ normal! v
+ while getline('.')[col('.')] =~# '\v[0-9]'
+ normal! l
+ endwhile
+ if a:whole
+ normal! o
+ while col('.') > 1 && getline('.')[col('.') - 2] =~# '\v[0-9]'
+ normal! h
+ endwhile
+ endif
+endfunction
+" }}}
" Autocommands {{{
-au BufRead,BufNewFile {Gemfile,Rakefile,Capfile,Vagrantfile,Thorfile,Guardfile,config.ru} setf ruby
+au BufRead,BufNewFile {Gem,Rake,Cap,Vagrant,Thor,Guard}file,config.ru setf ruby
au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn,ronn} setf markdown
au BufRead,BufNewFile {SConstruct,SConscript,*.py} setf python.django
au BufRead,BufNewFile *.{nu,nujson},Nukefile setf nu
@@ -146,27 +172,24 @@ au BufRead,BufNewFile nginx.conf setf nginx
au BufRead,BufNewFile *.gradle setf groovy
au BufRead,BufNewFile *.sbt setf scala
au BufRead,BufNewFile *.scaml setf haml
-au BufRead,BufNewFile *.muttrc setf muttrc
+au BufRead,BufNewFile *muttrc setf muttrc
au BufRead,BufNewFile quakelive.cfg setf quake
au BufRead,BufNewFile *.{css,sass,scss,less,styl} setlocal omnifunc=csscomplete#CompleteCSS
+au BufRead,BufNewFile *.{css,sass,scss,less,styl} setlocal iskeyword+=-
au BufRead,BufNewFile {*.go,Makefile,.git*,*gitconfig} setlocal noexpandtab
au BufRead,BufNewFile *.{jar,war,ear,sar} setf zip
-au BufRead,BufNewFile {,.}zshrc setlocal foldmethod=marker
+au BufRead,BufNewFile {,.}zshrc,*.fish setlocal foldmethod=marker
+au BufRead,BufNewFile *.fish setf tcsh
au BufWritePost {g,.g,,.}vimrc source $MYVIMRC | exe ":PowerlineReloadColorscheme"
au BufReadPost fugitive://* setlocal bufhidden=delete
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
au VimResized * exe "normal! \<c-w>="
au FileType {vim,javascript} setlocal foldmethod=marker
-au FileType help setlocal textwidth=78
au BufWinEnter *.txt if &ft == 'help' | wincmd L | endif
au InsertEnter * set number
au InsertLeave * set relativenumber
" }}}
" Vars {{{
-let mapleader=','
-let maplocalleader=','
-let g:mapleader=','
-let g:CommandTMaxHeight=20
let g:maintainer='{"name": "Greg V", "web": "http://floatboth.com"}'
let vimclojure#SplitPos='bottom'
let g:vimclojure#DynamicHighlighting=1

0 comments on commit 7eedba7

Please sign in to comment.