diff --git a/ackrc b/ackrc index 3c15747..15885c9 100644 --- a/ackrc +++ b/ackrc @@ -14,5 +14,3 @@ --sort-files -# search in everything else --a diff --git a/gitconfig b/gitconfig index b57acf6..4cfefc8 100644 --- a/gitconfig +++ b/gitconfig @@ -26,6 +26,7 @@ untracked = cyan [alias] + git = !git st = status cm = commit co = checkout diff --git a/other/com.googlecode.iterm2.plist b/other/com.googlecode.iterm2.plist index 69fef8c..64dc10b 100644 --- a/other/com.googlecode.iterm2.plist +++ b/other/com.googlecode.iterm2.plist @@ -2,6 +2,10 @@ + AdjustWindowForFontSizeChange + + AllowClipboardAccess + AnimateDimming AppleAntiAliasingThreshold @@ -433,11 +437,13 @@ MaxVertically NSNavLastRootDirectory - ~/Dotfiles + ~/dotfiles/other NSQuotedKeystrokeBinding NSRepeatCountBinding + NSScrollAnimationEnabled + NSTableView Columns KeyBingingTable @@ -458,9 +464,9 @@ NSWindow Frame NSFontPanel 831 50 445 270 0 0 1280 778 NSWindow Frame Preferences - 169 519 924 485 0 0 1920 1058 + 286 262 924 485 0 0 1280 800 NSWindow Frame iTerm Window 0 - 2406 355 1130 656 1920 0 1920 1080 + 146 78 1130 656 0 0 1280 800 New Bookmarks @@ -1229,7 +1235,7 @@ PrefsCustomFolder - /Users/nebelschwade/Dotfiles + /Users/nebelschwade/dotfiles/other PromptOnQuit QuitWhenAllWindowsClosed @@ -1245,7 +1251,7 @@ SUHasLaunchedBefore SULastCheckTime - 2012-11-20T19:43:07Z + 2013-05-07T06:13:45Z SavePasteHistory ShowBookmarkName @@ -1278,13 +1284,21 @@ UseLionStyleFullscreen + WebKitDefaultFontSize + 11 + WebKitStandardFont + Lucida Grande WindowNumber WindowStyle 0 WordCharacters /-+\~_. + findIgnoreCase_iTerm + + findRegex_iTerm + iTerm Version - 1.0.0.20120724 + 1.0.0.20130319 diff --git a/slate.js b/slate.js index 59776fe..16ee221 100644 --- a/slate.js +++ b/slate.js @@ -56,6 +56,10 @@ var iterm = slate.operation("focus", { "app": "iTerm" }); var chrome = slate.operation("focus", { "app": "Google Chrome" }); var mail = slate.operation("focus", { "app": "Mail" }); var fork = slate.operation("focus", { "app": "ForkLift" }); +var ical = slate.operation("focus", { "app": "iCal" }); +var shop = slate.operation("focus", { "app": "Photoshop" }); +var launch = slate.operation("focus", { "app": "Launchbar" }); +var ecoute = slate.operation("focus", { "app": "Ecoute" }); var fullscreen = slate.operation("move", { @@ -135,9 +139,14 @@ slate.bind("]" + hyper, grid, false); // most important apps on easy accesible keys slate.bind("a" + hyper, iterm, false); -slate.bind("s" + hyper, fork, false); -slate.bind("d" + hyper, chrome, false); -slate.bind("f" + hyper, mail, false); +slate.bind("s" + hyper, chrome, false); +slate.bind("d" + hyper, mail, false); +slate.bind("f" + hyper, fork, false); + +slate.bind("j" + hyper, ical, false); +slate.bind("k" + hyper, ecoute, false); +slate.bind("l" + hyper, launch, false); +slate.bind(";" + hyper, shop, false); // movements in modal mode with m slate.bind("1" + hyperModal, lefthalf, false); diff --git a/vim/bundle/ack b/vim/bundle/ack index 34d0b2f..f183a34 160000 --- a/vim/bundle/ack +++ b/vim/bundle/ack @@ -1 +1 @@ -Subproject commit 34d0b2fbc182b31d926632d170bc07d6a6fc3f9b +Subproject commit f183a345a0c10caed7684d07dabae33e007c7590 diff --git a/vim/bundle/buffergator b/vim/bundle/buffergator index e3d24db..23a575c 160000 --- a/vim/bundle/buffergator +++ b/vim/bundle/buffergator @@ -1 +1 @@ -Subproject commit e3d24db7313c1375d3694e48b62c53ed125f6fbf +Subproject commit 23a575c32f1b36d6b1e96b977a978938fc18ce66 diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp index c1646e3..287b9c1 160000 --- a/vim/bundle/ctrlp +++ b/vim/bundle/ctrlp @@ -1 +1 @@ -Subproject commit c1646e3c28d75bcc834af4836f4c6e12296ba891 +Subproject commit 287b9c12aad2420269576504d1c05d36111a4562 diff --git a/vim/bundle/editorconfig b/vim/bundle/editorconfig index 749adb8..c1c0fa0 160000 --- a/vim/bundle/editorconfig +++ b/vim/bundle/editorconfig @@ -1 +1 @@ -Subproject commit 749adb8e61fcd47d08d22d363afff7d1cca47d4c +Subproject commit c1c0fa01514d8d83d293ae3493f820b09844a99d diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive index 0103538..54ead5a 160000 --- a/vim/bundle/fugitive +++ b/vim/bundle/fugitive @@ -1 +1 @@ -Subproject commit 0103538d7a8e03c061c031e33459aeaa4cf040ab +Subproject commit 54ead5abcbfdd776e1160b5510a129884c39f29c diff --git a/vim/bundle/gist b/vim/bundle/gist index f42ceff..865fe18 160000 --- a/vim/bundle/gist +++ b/vim/bundle/gist @@ -1 +1 @@ -Subproject commit f42ceff6b8eab96ddc917df020824370526e871b +Subproject commit 865fe18acbea457537bfb4c67c318e9521e48731 diff --git a/vim/bundle/html5 b/vim/bundle/html5 index 7d75d81..9518ec3 160000 --- a/vim/bundle/html5 +++ b/vim/bundle/html5 @@ -1 +1 @@ -Subproject commit 7d75d817e2ea432dc063d2b8ff47a8f441a4f43b +Subproject commit 9518ec38a412b786c3bff9bbd5fa75bc70e72424 diff --git a/vim/bundle/javascript b/vim/bundle/javascript index 4ff3b73..f07cc67 160000 --- a/vim/bundle/javascript +++ b/vim/bundle/javascript @@ -1 +1 @@ -Subproject commit 4ff3b73b8067fdd65f9512ad3ec11d7f7d659fa7 +Subproject commit f07cc6708f628260f442a62d4af655e80b8a9589 diff --git a/vim/bundle/markdown b/vim/bundle/markdown index 5ed43c2..ec0abb3 160000 --- a/vim/bundle/markdown +++ b/vim/bundle/markdown @@ -1 +1 @@ -Subproject commit 5ed43c22bcdd8f6b639e74231c6c8816f538d22d +Subproject commit ec0abb3064ce7af81d5d1141a5fba043ac9e8a1c diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index 40d05ac..448ad6f 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 40d05ace57fb51cc2c2b2e9eb81c4832ed291630 +Subproject commit 448ad6f1bce0308329ccb020b51710227108b578 diff --git a/vim/bundle/php-indent b/vim/bundle/php-indent index 31de6b5..44e81b1 160000 --- a/vim/bundle/php-indent +++ b/vim/bundle/php-indent @@ -1 +1 @@ -Subproject commit 31de6b555d0992fa2fa87a4a0d9a05a7238a81fe +Subproject commit 44e81b129722e4956cc7a42ef5003111c085afad diff --git a/vim/bundle/scss b/vim/bundle/scss index 7c9c53f..448ba4a 160000 --- a/vim/bundle/scss +++ b/vim/bundle/scss @@ -1 +1 @@ -Subproject commit 7c9c53f9ede46a5295acea2b2714b358f841ce71 +Subproject commit 448ba4af14d5c793fa1317bc75f9e62ac33eb88c diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate index d209d22..6bed4c3 160000 --- a/vim/bundle/snipmate +++ b/vim/bundle/snipmate @@ -1 +1 @@ -Subproject commit d209d220358d67d630c6f166d277b88ed9e480c6 +Subproject commit 6bed4c390464ce70bafc6ffdccd6b3c57d0fe6bf diff --git a/vim/bundle/supertab b/vim/bundle/supertab index a2268b6..e4133ef 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit a2268b61edc4ba38d152ecfa7c853a7f1bc71370 +Subproject commit e4133ef6dda72712b71f70ab85b251e7a20c70bc diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 2519d83..7f0412e 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2519d835694e9aee41b0aa607b9e1d9c5685fd7a +Subproject commit 7f0412e91dd6e2b48cbe8ae54bddcfeca0c127c1 diff --git a/vim/bundle/tcomment b/vim/bundle/tcomment index bac346f..16a9e4c 160000 --- a/vim/bundle/tcomment +++ b/vim/bundle/tcomment @@ -1 +1 @@ -Subproject commit bac346f4958b1abb4ad268754d8ef0d75febe465 +Subproject commit 16a9e4c843748bddaae41ec04614efdd29abe6fa diff --git a/vim/bundle/tlib b/vim/bundle/tlib index 9649dfb..964c6a4 160000 --- a/vim/bundle/tlib +++ b/vim/bundle/tlib @@ -1 +1 @@ -Subproject commit 9649dfbd78410300ca4231cb6bfcc7e822868cad +Subproject commit 964c6a4848b7ce2b2181e413278964c715fc5418 diff --git a/vim/bundle/unimpaired b/vim/bundle/unimpaired index 728535b..cabf4b7 160000 --- a/vim/bundle/unimpaired +++ b/vim/bundle/unimpaired @@ -1 +1 @@ -Subproject commit 728535be8d2a689f2d83de09ac36e0c73a5053c9 +Subproject commit cabf4b79b1c0cd9c9a8beec303c2e6172c82d19f diff --git a/vim/bundle/webapi b/vim/bundle/webapi index 45139de..cbeda14 160000 --- a/vim/bundle/webapi +++ b/vim/bundle/webapi @@ -1 +1 @@ -Subproject commit 45139defdc70ae2be7daaf9f3b63b2072e68b743 +Subproject commit cbeda149b04cdc8cd8c286e1283f7c954819de6d diff --git a/vimrc b/vimrc index d95c9b2..b7cf92e 100644 --- a/vimrc +++ b/vimrc @@ -15,7 +15,7 @@ set nocompatible " activate vim awesomeness set ruler " show where you are in the document set cursorline " highligh current line set ttyfast " faster terminal usage -set ttyscroll=3 " faster terminal scrolling +" set ttyscroll=3 " faster terminal scrolling set showcmd " show me what im doing. helps alot set showmode " show active mode set hidden " allows for switching buffers without writing @@ -34,7 +34,7 @@ set iskeyword+=- " Syntax coloring lines that are too long just slows down the world " " set synmaxcol=256 -set lazyredraw " to avoid scrolling problems +" set lazyredraw " to avoid scrolling problems " Tabs and Whitespace set tabstop=2 @@ -132,11 +132,10 @@ vnoremap / /\v inoremap jj -" brackets and other stuff doubling - very basic, fine by me -inoremap { {}ki inoremap < <>i inoremap ( ()i inoremap [ []i +inoremap { {}i " Switch between windows @@ -206,6 +205,7 @@ vnoremap nnoremap Q nnoremap K + " upper/lower word nmap U mQviwU`Q nmap L mQviwu`Q @@ -267,7 +267,6 @@ nnoremap b :BuffergatorToggle " CtrlP let g:ctrlp_map = 't' -let g:ctrlp_by_filename = 1 let g:ctrlp_switch_buffer = 0 " easier split screens let g:ctrlp_working_path_mode = 0 let g:ctrlp_max_height = 12 @@ -319,3 +318,4 @@ endfunction " Don't strip whitespace for files like md,txt or csv/sql - define files here au BufWritePre *.{php,html,scss,css,js,ts,xml,json,inc,vim,rb} :call StripTrailingWhitespaces() +