Skip to content
Browse files

upgrade'

  • Loading branch information...
2 parents c800625 + dbe90b2 commit 47dcb95c1c4a051c2b88ebe9791f06295d1f9ca5 bartes committed
Showing with 487 additions and 44 deletions.
  1. +6 −0 .gitmodules
  2. +77 −0 Xresources
  3. +19 −0 ctags
  4. +14 −0 gitconfig
  5. +1 −2 install_dependencies.sh
  6. +1 −0 konsole-colors-solarized
  7. +6 −4 link_configs.py
  8. +1 −0 oh-my-zsh
  9. +187 −0 tmux.conf
  10. +57 −0 vim/colors/ambient.vim
  11. BIN vim/spell/pl.utf-8.spl
  12. +1 −1 vim/vundle.git
  13. +86 −37 vimrc
  14. +31 −0 zshrc
View
6 .gitmodules
@@ -1,3 +1,9 @@
[submodule "vim/vundle.git"]
path = vim/vundle.git
url = https://github.com/gmarik/vundle.git
+[submodule "oh-my-zsh"]
+ path = oh-my-zsh
+ url = git://github.com/robbyrussell/oh-my-zsh.git
+[submodule "konsole-colors-solarized"]
+ path = konsole-colors-solarized
+ url = git://github.com/phiggins/konsole-colors-solarized.git
View
77 Xresources
@@ -0,0 +1,77 @@
+!! drop in Solarized colorscheme for Xresources/Xdefaults
+
+!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
+!!--------- ------- ---- ------- ----------- ---------- ----------- -----------
+!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
+!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
+!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
+!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
+!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
+!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
+!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
+!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
+!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
+!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
+!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
+!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
+!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
+!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
+!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
+!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
+
+#define S_base03 #002b36
+#define S_base02 #073642
+#define S_base01 #586e75
+#define S_base00 #657b83
+#define S_base0 #839496
+#define S_base1 #93a1a1
+#define S_base2 #eee8d5
+#define S_base3 #fdf6e3
+#define S_yellow #b58900
+#define S_orange #cb4b16
+#define S_red #dc322f
+#define S_magenta #d33682
+#define S_violet #6c71c4
+#define S_blue #268bd2
+#define S_cyan #2aa198
+#define S_green #859900
+
+*background: S_base03
+*foreground: S_base00
+*fading: 40
+*fadeColor: S_base03
+*cursorColor: S_base1
+*pointerColorBackground:S_base01
+*pointerColorForeground:S_base1
+
+!! black dark/light
+*color0: S_base02
+*color8: S_base03
+
+!! red dark/light
+*color1: S_red
+*color9: S_orange
+
+!! green dark/light
+*color2: S_green
+*color10: S_base01
+
+!! yellow dark/light
+*color3: S_yellow
+*color11: S_base00
+
+!! blue dark/light
+*color4: S_blue
+*color12: S_base0
+
+!! magenta dark/light
+*color5: S_magenta
+*color13: S_violet
+
+!! cyan dark/light
+*color6: S_cyan
+*color14: S_base1
+
+!! white dark/light
+*color7: S_base2
+*color15: S_base3
View
19 ctags
@@ -0,0 +1,19 @@
+--langdef=js
+--langmap=js:.js
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*\{/\5/,object/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*function[ \t]*\(/\5/,function/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*\[/\5/,array/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*[^"]'[^']*/\5/,string/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*(true|false)/\5/,boolean/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*[0-9]+/\5/,number/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*=[ \t]*.+([,;=]|$)/\5/,variable/
+--regex-js=/(,|(;|^)[ \t]*(var|let|([A-Za-z_$][A-Za-z0-9_$.]+\.)*))[ \t]*([A-Za-z0-9_$]+)[ \t]*[ \t]*([,;]|$)/\5/,variable/
+--regex-js=/function[ \t]+([A-Za-z0-9_$]+)[ \t]*\([^)]*\)/\1/,function/
+
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*\{/\2/,object/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*function[ \t]*\(/\2/,function/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*\[/\2/,array/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*[^"]'[^']*/\2/,string/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*(true|false)/\2/,boolean/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*[0-9]+/\2/,number/
+--regex-js=/(,|^)[ \t]*([A-Za-z_$][A-Za-z0-9_$]+)[ \t]*:[ \t]*[^=]+([,;]|$)/\2/,variable/
View
14 gitconfig
@@ -0,0 +1,14 @@
+[alias]
+ st = status
+ ci = commit
+ co = checkout
+ br = branch
+[user]
+ name = Adam Pohorecki
+ email = adam.pohorecki@llp.pl
+[color]
+ ui = auto
+[push]
+ default = matching
+[fetch]
+ recursesubmodules = true
View
3 install_dependencies.sh
@@ -1,3 +1,2 @@
#!/bin/bash
-
-brew install git macvim ack ctags yajl
+brew install git macvim ack ctags yajl zsh node npm
1 konsole-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 9d7eb2e708cbcdc7bcfdb3c22c0fd72a6c65a150
View
10 link_configs.py
@@ -9,11 +9,13 @@ def current_dir():
def link_local_to_home(local_name, home_name):
local_path = os.path.join(current_dir(), local_name)
- home_path = os.path.expanduser(home_name)
+ home_path = os.path.join('~', home_name)
+ home_path = os.path.expanduser(home_path)
if os.path.exists(home_path): os.remove(home_path)
os.symlink(local_path, home_path)
-link_local_to_home('vim', '.vim')
-link_local_to_home('vimrc', '.vimrc')
-link_local_to_home('gvimrc', '.gvimrc')
+files = ['vim', 'vimrc', 'gvimrc', 'zshrc', 'Xresources', 'gitconfig', 'tmux.conf', 'ctags']
+
+for file in files:
+ link_local_to_home(file, '.'+file)
1 oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 82568cc7e64502c953226bfa30a34fb4bcd46d99
View
187 tmux.conf
@@ -0,0 +1,187 @@
+# ~/.tmux.conf
+#
+# See the following files:
+#
+# /opt/local/share/doc/tmux/t-williams.conf
+# /opt/local/share/doc/tmux/screen-keys.conf
+# /opt/local/share/doc/tmux/vim-keys.conf
+#
+# URLs to read:
+#
+# http://blog.yjl.im/2009/11/migrating-to-tmux-from-gnuscreen.html
+# http://blog.hawkhost.com/2010/06/28/tmux-the-terminal-multiplexer/
+# http://blog.hawkhost.com/2010/07/02/tmux-%E2%80%93-the-terminal-multiplexer-part-2/
+# http://www.dayid.org/os/notes/tm.html
+#
+# Other sample tmux.conf files
+#
+# http://www.mindfuzz.net/?p=178
+#
+# -----------------------------------------------------------------------------
+# Global settings
+
+# Set prefix key to Ctrl-a
+unbind-key C-b
+set-option -g prefix C-a
+
+# send the prefix to client inside window
+bind-key C-a send-prefix
+
+# toggle last window like screen
+bind-key C-a last-window
+
+# open a man page in new window
+bind-key / command-prompt "split-window 'exec man %%'"
+
+# scrollback buffer n lines
+set -g history-limit 5000
+
+# listen for activity on all windows
+set -g bell-action any
+#set -g bell-action none
+
+# start window indexing at zero (default)
+set -g base-index 0
+
+# instructs tmux to expect UTF-8 sequences
+setw -g utf8 on
+#sest -g utf8 on
+
+# tell tmux to use 256 colour terminal
+set -g default-terminal "screen-256color"
+
+# enable wm window titles
+#set -g set-titles on
+
+# Key bindings
+
+# reload settings
+bind-key R source-file ~/.tmux.conf
+
+# detach client
+bind-key d detach
+bind-key C-d detach
+
+# choose a client to detach
+bind-key D choose-client
+
+# choose window/session
+bind-key "'" choose-window
+bind-key '"' choose-session
+
+# display visible indicator of each pane
+bind-key w display-panes
+
+# swap panes
+#bind-key -r J swap-pane -D
+#bind-key -r K swap-pane -U
+
+# Ctrl-Left/Right cycles thru windows (no prefix)
+bind-key -n "C-Left" select-window -t :-
+bind-key -n "C-Right" select-window -t :+
+
+# Ctrl-Up/Down cyles thru panes (no prefix)
+bind-key -n "C-Up" select-pane -t :.-
+bind-key -n "C-Down" select-pane -t :.+
+
+# Cycle to next pane
+bind-key -r Tab select-pane -t :.+
+
+# kill current pane/window
+bind-key q confirm-before kill-pane
+bind-key Q confirm-before kill-window
+bind-key C-q confirm-before kill-pane
+#bind-key x kill-pane
+#bind-key X kill-window
+
+# window layouts (emacs-like)
+#bind-key 1 break-pane
+#bind-key 2 select-layout even-vertical
+#bind-key 3 select-layout even-horizontal
+#bind-key o select-pane -U
+
+# specific window layouts
+#bind -r y next-layout
+#bind o select-layout "active-only"
+#bind O select-layout "main-vertical"
+
+# copying and pasting
+bind-key [ copy-mode
+bind-key ] paste-buffer -s \015
+
+# vi-style controls for copy mode
+setw -g mode-keys vi
+
+# enable mouse selection in copy mode
+setw -g mode-mouse on
+
+# list all paste buffers (default key is '#')
+bind-key b list-buffers
+
+# choose buffer to paste interactively (default key was '=')
+bind-key p choose-buffer
+
+# delete the most recently copied buffer of text (default key was '-')
+bind-key x delete-buffer
+
+# Split windows like vim
+
+# vim's definition of a horizontal/vertical split is reversed from tmux's
+bind-key s split-window -v
+bind-key v split-window -h
+
+# resize panes like vim
+bind-key -r < resize-pane -L 3
+bind-key -r > resize-pane -R 3
+bind-key -r + resize-pane -U 1
+bind-key -r = resize-pane -D 1
+
+# Statusbar settings
+
+# toggle statusbar
+bind-key S set status
+
+# use vi-style key bindings in the status line
+set -g status-keys vi
+
+# amount of time for which status line messages and other indicators
+# are displayed. time is in milliseconds.
+set -g display-time 2000
+
+# default statusbar colors
+set -g status-fg white
+set -g status-bg default
+set -g status-attr default
+
+# default window title colors
+setw -g window-status-fg white
+setw -g window-status-bg default
+setw -g window-status-attr dim
+
+# active window title colors
+setw -g window-status-current-fg cyan
+setw -g window-status-current-bg default
+#setw -g window-status-current-attr bright
+setw -g window-status-current-attr underscore
+
+# command/message line colors
+set -g message-fg white
+set -g message-bg black
+set -g message-attr bright
+
+
+# Session initialization
+
+# create a session and its windows/panes
+new -n default zsh
+neww -n default zsh
+
+splitw -h
+splitw -v
+splitw -v
+
+select-window -t1
+select-pane -t0
+
+# -----------------------------------------------------------------------------
+# vim: fen fdl=0 fdm=marker
View
57 vim/colors/ambient.vim
@@ -0,0 +1,57 @@
+" Maintainer: Kevin Hamer <kevin@imarc.net>
+" Version: 1.1
+" Last Change: Tue Aug 9 14:39:46 EDT 2011
+
+"" Based off the colors for Ambiance, the 2011 Ubuntu dark human theme.
+"" Derived from Mustang by Henrique C. Alves (hcarvalhoalves@gmail.com)
+"" Offers 256 color support.
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let colors_name = "ambient"
+
+" Vim >= 7.0 specific colors
+if version >= 700
+ hi CursorLine guibg=#3c3c3c ctermbg=237
+ hi CursorColumn guibg=#3c3c3c ctermbg=237
+ hi MatchParen guifg=#e69c0d ctermfg=178 guibg=#3c3c3c ctermbg=237 gui=bold cterm=bold
+ hi Pmenu guifg=#ffffff ctermfg=15 guibg=#4c4c4c ctermbg=239
+ hi PmenuSel guifg=#000000 ctermfg=0 guibg=#f07746 ctermbg=209
+endif
+
+" General colors
+hi Cursor guifg=NONE guibg=#4c4c4c ctermbg=239 gui=none
+hi Normal guifg=#f2f1f0 ctermfg=7 guibg=#202020 ctermbg=234 gui=none
+hi NonText guifg=#3c3c3c ctermfg=237 gui=none
+hi LineNr guifg=#4c4c4c ctermfg=239 gui=none
+hi StatusLine guifg=#d3d3d5 ctermfg=188 guibg=#3c3c3c ctermbg=237
+hi StatusLineNC guifg=#939395 ctermfg=246 guibg=#3c3c3c ctermbg=237 gui=none
+hi VertSplit guifg=#202020 ctermfg=234 guibg=#3c3c3c ctermbg=237 gui=none
+hi Folded guifg=#0999e0 ctermfg=32 guibg=#3c3c3c ctermbg=237 gui=none
+hi Title guifg=#f2f1f0 ctermfg=7 guibg=NONE gui=bold cterm=bold
+hi Visual guifg=#ffffff ctermfg=15 guibg=#4c4c4c ctermbg=239 gui=none
+hi SpecialKey guifg=#4c4c4c ctermfg=239 gui=none
+
+" Syntax highlighting
+hi Comment guifg=#7c7c7c ctermfg=8
+hi Boolean guifg=#94d9a8 ctermfg=115 gui=none
+hi String guifg=#f07746 ctermfg=209
+hi Identifier guifg=#d9c634 ctermfg=185 gui=none
+hi Function guifg=#ffffff ctermfg=15 gui=bold cterm=bold
+hi Type guifg=#e69c0d ctermfg=178 gui=none
+hi Statement guifg=#f2f1f0 ctermfg=7 gui=bold cterm=bold
+hi Keyword guifg=#d9c634 ctermfg=185 gui=none
+hi Constant guifg=#d9c634 ctermfg=185 gui=none
+hi Number guifg=#94d9a8 ctermfg=115 gui=none
+hi Special guifg=#d9c634 ctermfg=185 gui=none
+hi PreProc guifg=#faf4c6 ctermfg=230 gui=none
+hi Todo guifg=#202020 ctermfg=234 guibg=#d9c634 ctermbg=185
+
+" Code-specific colors
+hi pythonOperator guifg=#f07746 ctermfg=209 gui=none
View
BIN vim/spell/pl.utf-8.spl
Binary file not shown.
2 vim/vundle.git
@@ -1 +1 @@
-Subproject commit f1bac10257387adfba940af21647171dd27f9c98
+Subproject commit 37e82d1e181ea7943d20061d63dd132184f9f602
View
123 vimrc
@@ -17,6 +17,9 @@ call vundle#rc()
" PLUGINS
"----------------------------------------------------------
+" LaTeX support
+Bundle 'AutomaticTexPlugin'
+
" FuzzyFinder - finally I can go to a class or method like in RubyMine
Bundle 'L9'
Bundle 'FuzzyFinder'
@@ -24,8 +27,11 @@ Bundle 'FuzzyFinder'
" javascript indentation in vim sucks
Bundle 'Better-Javascript-Indentation'
+" CSS
+Bundle 'Better-CSS-Syntax-for-Vim'
+
" JSON.vim - JSON syntax highlighting
-Bundle 'JSON.vim'
+"Bundle 'JSON.vim'
" LustyJuggler - switch between buffers easier
Bundle 'LustyJuggler'
@@ -39,8 +45,8 @@ Bundle 'The-NERD-tree'
" ack - use ack to search through files
Bundle 'ack.vim'
-" command-T - file opener/finder
-Bundle 'git://github.com/wincent/Command-T.git'
+" replacement for command-t
+Bundle 'ctrlp.vim'
" csapprox - make gvim colorschemes work in console
Bundle 'CSApprox'
@@ -54,6 +60,9 @@ Bundle 'd.vim'
" delimitMate - autoclosing of (", etc. that does not clash with endwise
Bundle 'delimitMate.vim'
+" generate project tags automatically
+Bundle 'easytags.vim'
+
" greplace.vim - plugin that allows search and replace across all of the project files
Bundle 'greplace.vim'
@@ -63,8 +72,8 @@ Bundle 'jslint.vim'
" syntastic - plugin for displaying syntax errors
Bundle 'Syntastic'
-" No longer count letters or words when jumping
-Bundle 'Lokaltog/vim-easymotion'
+" Linting for Python code
+Bundle 'pyflakes.vim'
" vim-endwise - wisely add 'end' in ruby
Bundle 'endwise.vim'
@@ -75,6 +84,9 @@ Bundle 'fugitive.vim'
" vim-git - a couple more basic commands to work with git
Bundle 'tpope/vim-git'
+" vim-bundler to include gems from Gemfile.lock in ctags
+Bundle 'tpope/vim-git'
+
" vim-markdown - syntax highlighting for markdown
Bundle 'Markdown'
@@ -90,7 +102,7 @@ Bundle 'tpope/vim-rake'
" vim-rails - awesome vim-rails integration
Bundle 'rails.vim'
-" vim-repeat - repeat comnmands from plugins using .
+" vim-repeat - repeat commands from plugins using .
Bundle 'repeat.vim'
" vim-ruby - ruby integration
@@ -99,15 +111,31 @@ Bundle 'ruby.vim'
" vim-ruby-refactoring - automatic refactorings for ruby
Bundle 'ecomba/vim-ruby-refactoring'
+" A nice color scheme
+Bundle 'Solarized'
+
+" cuztomizable tab completion, continued is the newer version
+Bundle 'SuperTab-continued.'
+
" vim-surround - surrounding text with braces, quotes, html tags...
Bundle 'surround.vim'
+" Snipmate - the new version
+Bundle "git://github.com/MarcWeber/vim-addon-mw-utils.git"
+Bundle "git://github.com/tomtom/tlib_vim.git"
+Bundle "git://github.com/honza/snipmate-snippets.git"
+
+Bundle "git://github.com/garbas/vim-snipmate.git"
+
" vim-textobj - dependency of rubyblock
Bundle 'textobj-user'
" vim-textobj-rubyblock - allow selecting blocks in ruby as text objects
Bundle 'textobj-rubyblock'
+" Display a tree structure with current file tags
+Bundle 'Tagbar'
+
" vim-unimpaired - some useful mappings, for example to swap code lines
Bundle 'unimpaired.vim'
@@ -117,6 +145,8 @@ Bundle 'ZoomWin'
" zencoding-vim - plugin for expanding css-like syntax to html
Bundle 'ZenCoding.vim'
+" change font size in gvim
+Bundle 'zoom.vim'
"----------------------------------------------------------
syntax enable " Turn on syntax highlighting.
@@ -183,9 +213,12 @@ set diffopt+=iwhite " ignore whitespace in vimdiff
set foldmethod=indent " indent based on syntax
set foldnestmax=3 " deepest fold is 3 levels
set foldlevel=3
-set nofoldenable " dont fold by default
+set nofoldenable " don't fold by default
-set matchpairs+=<:> " add < and > to the chars thac can be navigated with %
+set matchpairs+=<:> " add < and > to the chars that can be navigated with %
+
+set spell " enable spell check
+set spelllang=en_us " default spell check language
" Useful status information at bottom of screen
set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %{exists('*CapsLockStatusline')?CapsLockStatusline():''}%=%-16(\ %l,%c-%v\ %)%P
@@ -220,25 +253,6 @@ map <C-DOWN> <C-w>j
map <C-UP> <C-w>k
map <C-RIGHT> <C-w>l
-
-if (&term == "linux")
- let g:CSApprox_loaded = 1
-else
- " Colors for console
- if !has("gui_running")
- set t_Co=256
- endif
-
- " Scheme
- colors railscasts
-endif
-
-" set some different setting for the diff mode
-if &diff
- colorscheme fu_patched " different scheme
- set nonumber " no line numbers
-endif
-
" NERDTree
let g:NERDChristmasTree = 1
let g:NERDTreeMapOpenSplit = "s"
@@ -261,21 +275,25 @@ map <silent> <leader>n :NERDTreeFind<CR>
nmap <silent> <leader>ft :FufTag<cr>
nmap <silent> <leader>fb :FufBuffer<cr>
-" a key mapping for running tests
-nmap <silent> <leader>r :Rake<cr>
-nmap <silent> <leader>rs :Rake spec<cr>
-
-" regenarate tags and reload the list of files used by Command-T plugin
-nmap <silent> <leader>g :CommandT<cr>
-nmap <silent> <leader>G :CommandTFlush<cr>:Rtags<cr>
-" unmap other ,g bindings
-" nunmap <leader>ge
-" nunmap <leader>gE
+" spell-checking related shortcuts
+nmap <silent> <leader>s :set spell!<CR>
+nmap <silent> <leader>lp :set spelllang=pl_pl<CR>
+nmap <silent> <leader>le :set spelllang=en_us<CR>
" ignore gems bundled in the project directory
set wildignore+=vendor/gems,vendor/bundle
+" some Git mappings
+nmap <silent> <leader>gt :Gstatus<cr>
+nmap <silent> <leader>gl :Git pull --rebase<cr>
+nmap <silent> <leader>gp :Git push<cr>
+nmap <silent> <leader>gs :Git stash<cr>
+nmap <silent> <leader>gsp :Git stash pop<cr>
+
+" this is how often easytags script runs (I think)
+set updatetime=4000
+
cmap w!! w !sudo tee % >/dev/null " w!! lets you save files that you would have to use sudo vim to open
" Make the 'cw' and like commands put a $ at the end instead of just deleting
@@ -285,5 +303,36 @@ set cpoptions=ces$
" some plugin was overriding the redo command
nmap <silent> <c-r> :redo<cr>
+" no idea what breaks redo, so let's add a replacement mapping
+nmap <silent> <leader>r :redo<cr>
+
+" switch between two last open files faster
+nmap <silent> <leader><leader> <c-^>
+
" map ,c to colorizer
nmap ,c <Plug>Colorizer
+
+" solarized settings
+"set background=dark
+"let g:solarized_termtrans=1
+"let g:solarized_termcolors=256
+"let g:solarized_contrast="high"
+"let g:solarized_visibility="high"
+
+" Colors for console
+if !has("gui_running")
+ set t_Co=256
+endif
+
+" Scheme
+"colorscheme solarized
+"colors railscasts
+
+" Tagbar
+nnoremap <F3> :TagbarToggle<CR>
+
+" set some different setting for the diff mode
+if &diff
+ colorscheme fu_patched " different scheme
+ set nonumber " no line numbers
+endif
View
31 zshrc
@@ -0,0 +1,31 @@
+# Path to your oh-my-zsh configuration.
+export ZSH=$HOME/dotfiles/oh-my-zsh
+
+# Set to the name theme to load.
+# Look in ~/.oh-my-zsh/themes/
+export ZSH_THEME="gallois"
+
+# Set to this to use case-sensitive completion
+# export CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+# export DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# export DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# export DISABLE_AUTO_TITLE="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(bundler cap command-not-found deb gem git github rails3 ruby vi-mode ssh-agent)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
+export PATH=/Users/bartes/scripts:$PATH
+
+export EDITOR=mvim
+
+"[[ -s "$HOME/.tmuxinator/scripts/tmuxinator" ]] && source "$HOME/.tmuxinator/scripts/tmuxinator"

0 comments on commit 47dcb95

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