Skip to content
Browse files

lots of stuff

  • Loading branch information...
1 parent b9fc146 commit 1b9d5880598730b09d8373a810371a5f17e8500a @myfreeweb committed Nov 19, 2012
Showing with 119 additions and 28 deletions.
  1. +0 −1 bin/backup
  2. +8 −0 bin/supermarkdown.py
  3. +2 −2 config.fish
  4. +4 −1 gitconfig
  5. +0 −1 hgrc
  6. +1 −0 install.sh
  7. BIN scpt/enjournal.scpt
  8. +26 −3 vim/bindings.vim
  9. +28 −19 vim/bundles.vim
  10. +3 −1 vim/vimrc
  11. +47 −0 weechat/script.conf
View
1 bin/backup
@@ -27,6 +27,5 @@ backup_last_file() {
}
APPSUP=$HOME/Library/Application\ Support
-backup_file $HOME/Documents/my.ledger
backup_last_file textexpander $APPSUP/TextExpander/Backups
backup_last_file 1password $APPSUP/1Password/Backups
View
8 bin/supermarkdown.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+import sys
+from markdown import Markdown
+
+print Markdown(extensions=[
+ "meta", "extra", "codehilite", "headerid(level=2)",
+ "sane_lists", "smartypants"
+]).convert(sys.stdin.read())
View
4 config.fish
@@ -26,8 +26,8 @@ set PATH (brew --prefix coreutils)/libexec/gnubin $PATH
set PATH "$DOTFILES/bin" $PATH
# Java
-set -gx JAVA_HOME "/Library/Java/Home"
-set PATH "/Library/Java/Home/bin" $PATH
+set -gx JAVA_HOME (/usr/libexec/java_home)
+set PATH "$JAVA_HOME/bin" $PATH
# Fish
set -gx fish_greeting ''
View
5 gitconfig
@@ -27,7 +27,7 @@
prompt = false
[diff]
renames = copy
- tool = vimdiff
+ tool = Kaleidoscope
wordRegex = [^[:space:]]
mnemonicprefix = true
[mergetool "splice"]
@@ -68,6 +68,7 @@
# [f]ile
fa = add
faa = !git add --all && git ws
+ fap = add --patch
fc = !touch $@ && git add $@ && $EDITOR $1
ff = rm --cached # [f]orget
fm = mv # [m]ove
@@ -102,3 +103,5 @@
pushInsteadOf = "git://github.com/"
[url "git@github.com:myfreeweb/"]
insteadOf = my:
+[difftool "Kaleidoscope"]
+ cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
View
1 hgrc
@@ -14,7 +14,6 @@ progress =
graphlog =
transplant =
hgext.extdiff =
-onsub = $DOTFILES/bin/hg-onsub.py
[schemes]
bb = ssh://hg@bitbucket.org/
View
1 install.sh
@@ -52,6 +52,7 @@ if [[ $(uname) = 'Linux' ]]; then
QUAKE=$HOME/.quakelive/quakelive/home/baseq3
elif [[ $(uname) = 'Darwin' ]]; then
cat ./crontab ./crontab_mac | crontab
+ link_custom scpt $HOME/Library/Scripts
mkdir -p $HOME/Library/KeyBindings
link_custom keybindings/DefaultKeyBinding.dict $HOME/Library/KeyBindings/DefaultKeyBinding.dict
LAUNCHBAR=$HOME/Library/Application\ Support/LaunchBar
View
BIN scpt/enjournal.scpt
Binary file not shown.
View
29 vim/bindings.vim
@@ -34,6 +34,20 @@ nnoremap <CR> :nohlsearch<CR>
" unfuck the screen
nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
+" select (charwise) the contents of the current line, excluding indentation.
+" great for pasting Python lines into REPLs.
+nnoremap vv ^vg_
+
+" keep the cursor in place while joining lines
+nnoremap J mzJ`z
+
+" insert mode completion
+inoremap <c-f> <c-x><c-f>
+inoremap <c-]> <c-x><c-]>}
+
+" don't move on *
+nnoremap * *<C-o>
+
" windows
map <C-h> <C-w>h
map <C-k> <C-w>j
@@ -47,13 +61,19 @@ command! Q q
command! Wq wq
command! WQ wq
-" emacs bindings in insert
+" emacs bindings in insert and command
inoremap <C-a> <home>
inoremap <C-e> <end>
+cnoremap <C-a> <home>
+cnoremap <C-e> <end>
" buffer nav
-map <Right> :bnext<CR>
-map <Left> :bprev<CR>
+nnoremap <Right> :bnext<CR>
+nnoremap <Left> :bprev<CR>
+
+" List nav
+nnoremap <Up> :cprev<CR>zvzz
+nnoremap <Down> :cnext<CR>zvzz
" plugins and stuff
nmap <Leader>T= :Tabularize /=<CR>
@@ -73,6 +93,9 @@ map <Leader>c :VimuxPromptCommand<CR>
map <Leader>vq :VimuxCloseRunner<CR>
map <Leader>vx :VimuxInterruptRunner<CR>
nnoremap <Leader>b :silent !open <C-R>=escape("<C-R><C-F>", "#?&;\|%")<CR><CR> " open URLs
+autocmd FileType python map <Leader>8 :call Flake8()<CR>
+let g:ctrlp_map = '<Leader>p'
+nnoremap <Leader>t :CtrlPTag<CR>
" Motion for numbers. Great for CSS. Lets you do things like this:
" margin-top: 200px; -> daN -> margin-top: px;
View
47 vim/bundles.vim
@@ -3,53 +3,62 @@ set rtp+=~/.vim/vundle/
call vundle#rc()
Bundle 'gmarik/vundle'
+
+" Languages
Bundle 'kchmck/vim-coffee-script'
-Bundle 'mattn/zencoding-vim'
-Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-haml'
-Bundle 'pangloss/vim-javascript'
Bundle 'digitaltoad/vim-jade'
-Bundle 'mileszs/ack.vim'
Bundle 'othree/html5.vim'
Bundle 'hail2u/vim-css3-syntax'
Bundle 'wavded/vim-stylus'
-Bundle 'vim-scripts/delimitMate.vim'
-Bundle 'altercation/vim-colors-solarized'
-Bundle 'tpope/vim-unimpaired'
Bundle 'bbommarito/vim-slim'
Bundle 'jnwhiteh/vim-golang'
-Bundle 'godlygeek/tabular'
Bundle 'vim-scripts/VimClojure'
+Bundle 'cypok/vim-ledger'
+Bundle 'derekwyatt/vim-scala'
+Bundle 'elixir-lang/vim-elixir'
+Bundle 'pangloss/vim-javascript'
+Bundle 'nelstrom/vim-markdown-folding'
+
+" Colors
+Bundle 'altercation/vim-colors-solarized'
+
+" Features
+Bundle 'tpope/vim-fugitive'
+Bundle 'tpope/vim-unimpaired'
Bundle 'tpope/vim-speeddating'
Bundle 'tpope/vim-surround'
Bundle 'tpope/vim-endwise'
Bundle 'tpope/vim-abolish'
+Bundle 'tpope/vim-commentary'
+Bundle 'tpope/vim-eunuch'
+Bundle 'tpope/vim-bundler'
+Bundle 'tpope/vim-repeat'
+Bundle 'tpope/vim-git'
Bundle 'sjl/strftimedammit.vim'
Bundle 'sjl/gundo.vim'
+Bundle 'sjl/splice.vim'
+Bundle 'sjl/vitality.vim'
+Bundle 'vim-scripts/delimitMate.vim'
+Bundle 'vim-scripts/argtextobj.vim'
+Bundle 'mattn/zencoding-vim'
+Bundle 'mileszs/ack.vim'
+Bundle 'godlygeek/tabular'
Bundle 'michaeljsmith/vim-indent-object'
Bundle 'Lokaltog/vim-easymotion'
-Bundle 'tpope/vim-repeat'
-Bundle 'cypok/vim-ledger'
Bundle 'ervandew/supertab'
Bundle 'thinca/vim-quickrun'
-Bundle 'vim-scripts/argtextobj.vim'
Bundle 'itfrombit/nuvim'
Bundle 'AndrewRadev/splitjoin.vim'
Bundle 'kien/ctrlp.vim'
Bundle 'sickill/vim-pasta'
Bundle 'Lokaltog/vim-powerline'
Bundle 'emezeske/paredit.vim'
-Bundle 'tpope/vim-commentary'
-Bundle 'tpope/vim-eunuch'
-Bundle 'tpope/vim-bundler'
-Bundle 'tpope/vim-git'
-Bundle 'derekwyatt/vim-scala'
-Bundle 'sjl/vitality.vim'
Bundle 'benmills/vimux'
Bundle 'pgr0ss/vimux-ruby-test'
-Bundle 'sjl/splice.vim'
-Bundle 'elixir-lang/vim-elixir'
Bundle 'editorconfig/editorconfig-vim'
Bundle 'troydm/easybuffer.vim'
+Bundle 'nvie/vim-flake8'
+Bundle 'fs111/pydoc.vim'
filetype plugin indent on
View
4 vim/vimrc
@@ -60,7 +60,7 @@ 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
+set complete=.,w,b,u,t completeopt=longest,menuone,preview
set wildmenu wildmode=list:longest,list:full
set wildignore+=.hg,.git,.bzr,.svn " Version control
set wildignore+=*.aux,*.out,*.toc " LaTeX intermediate files
@@ -70,6 +70,7 @@ set wildignore+=*.o,*.obj,*.exe,*.dll,*.manifest " compiled object files
set wildignore+=*.spl " compiled spelling word lists
set wildignore+=*.sw? " Vim swap files
set wildignore+=.DS_Store,Thumbs.db " Shit
+set wildignore+=target " JVM compiled stuff
" paths
set shell=zsh
@@ -90,6 +91,7 @@ let g:vimclojure#DynamicHighlighting=1
let g:SuperTabDefaultCompletionType='context'
let g:Powerline_symbols='fancy'
let delimitMate_excluded_ft='clojure'
+let g:flake8_ignore='E128'
set background=light
if $SOLARIZED == "dark"
set background=dark
View
47 weechat/script.conf
@@ -0,0 +1,47 @@
+#
+# script.conf -- weechat v0.3.9
+#
+
+[look]
+columns = "%s %n %V %v %u | %d | %t"
+diff_color = on
+diff_command = "auto"
+display_source = on
+quiet_actions = on
+sort = "p,n"
+translate_description = on
+use_keys = on
+
+[color]
+status_autoloaded = cyan
+status_held = white
+status_installed = lightcyan
+status_obsolete = lightmagenta
+status_popular = yellow
+status_running = lightgreen
+status_unknown = lightred
+text = default
+text_bg = default
+text_bg_selected = red
+text_date = default
+text_date_selected = white
+text_delimiters = darkgray
+text_description = default
+text_description_selected = white
+text_extension = default
+text_extension_selected = white
+text_name = cyan
+text_name_selected = lightcyan
+text_selected = white
+text_tags = brown
+text_tags_selected = yellow
+text_version = magenta
+text_version_loaded = default
+text_version_loaded_selected = white
+text_version_selected = lightmagenta
+
+[scripts]
+cache_expire = 60
+dir = "%h/script"
+hold = ""
+url = "http://www.weechat.org/files/plugins.xml.gz"

0 comments on commit 1b9d588

Please sign in to comment.
Something went wrong with that request. Please try again.