Browse files

Merge branch 'master' of https://github.com/ilja/dotfiles

  • Loading branch information...
2 parents 06fccc6 + 89e0067 commit a73be374c1131c05d97cd26ce2e2e6777e85e2cd @ilja committed May 17, 2011
Showing with 130 additions and 29 deletions.
  1. +3 −12 README.md
  2. +0 −1 dotvim
  3. +78 −0 gvimrc.local
  4. +16 −16 install.sh
  5. +10 −0 janus.rake
  6. +22 −0 vimrc.local
  7. +1 −0 zshrc
View
15 README.md
@@ -1,19 +1,10 @@
##### Installation
-Clone repo in home directory
-
-* `cd dotfiles`
-
-Init and update dotvim repo
+Clone janus to~/.vim
-* `git submodule init`
-* `git submodule update`
+Clone repo in home directory
Create symlinks
-
+* `cd dotfiles`
* `./install.sh`
-Build commant-T
-
-* `cd dotvim`
-* `make`
1 dotvim
@@ -1 +0,0 @@
-Subproject commit 5788b7b8899f2eb89d302fd42c9b3b71c8b96c26
View
78 gvimrc.local
@@ -0,0 +1,78 @@
+" append local runtime
+set runtimepath+=~/.vim.local
+" load local plugins
+runtime! plugin/*.vim
+
+set background=light
+color solarized
+
+set guioptions=aAce
+set guioptions+=m
+set guifont=Inconsolata\ 14
+
+set sessionoptions+=resize,winpos
+
+" use tabs as tabs
+"set tabstop=2
+"set shiftwidth=2
+"set softtabstop=2
+set noexpandtab
+
+" Control-T for CommandT
+map <C-t> :CommandT<CR>
+imap <C-t> <Esc>:CommandT<CR>
+
+" Command-Return for fullscreen
+"macmenu Window.Toggle\ Full\ Screen\ Mode key=<D-CR>
+
+" Control-Shift-F for Ack
+map <C-F> :Ack<space>
+
+" Control-e for ConqueTerm
+map <C-e> :call StartTerm()<CR>
+
+" Control-/ to toggle comments
+map <A-/> <plug>NERDCommenterToggle<CR>
+imap <A-/> <Esc><plug>NERDCommenterToggle<CR>i
+
+" Control-][ to increase/decrease indentation
+vmap <C-]> >gv
+vmap <C-[> <gv
+
+" Map ctrl-movement keys to window switching
+map <C-k> <C-w><Up>
+map <C-j> <C-w><Down>
+map <C-l> <C-w><Right>
+map <C-h> <C-w><Left>
+
+" Switch to alternate file
+map <C-Tab> :bnext<cr>
+map <C-S-Tab> :bprevious<cr>
+
+" And also with page up/down
+map <C-PageUp> :bprevious<cr>
+map <C-PageDown> :bnext<cr>
+
+" Map Control-# to switch tabs
+map <C-0> 0gt
+imap <C-0> <Esc>0gt
+map <C-1> 1gt
+imap <C-1> <Esc>1gt
+map <C-2> 2gt
+imap <C-2> <Esc>2gt
+map <C-3> 3gt
+imap <C-3> <Esc>3gt
+map <C-4> 4gt
+imap <C-4> <Esc>4gt
+map <C-5> 5gt
+imap <C-5> <Esc>5gt
+map <C-6> 6gt
+imap <C-6> <Esc>6gt
+map <C-7> 7gt
+imap <C-7> <Esc>7gt
+map <C-8> 8gt
+imap <C-8> <Esc>8gt
+map <C-9> 9gt
+imap <C-9> <Esc>9gt
+
+
View
32 install.sh
@@ -4,42 +4,42 @@
cd;
# link .vimrc
-if test -f .vimrc
+if test -f .vimrc.local
then
- echo "Your ~/.vimrc already exists, i'll move it to ~/.vimrc.old"
- mv -i .vimrc .vimrc-old
+ echo "Your ~/.vimrc.local already exists, i'll move it to ~/.vimrc.local.old"
+ mv -i .vimrc.local .vimrc.local.old
fi
-ln -s dotfiles/dotvim/vimrc .vimrc
+ln -s dotfiles/vimrc.local .vimrc.local
# link .gvimrc
-if test -f .gvimrc
+if test -f .gvimrc.local
then
- echo "Your ~/.gvimrc already exists, i'll move it to ~/.gvimrc.old"
- mv -i .gvimrc .gvimrc-old
+ echo "Your ~/.gvimrc.local already exists, i'll move it to ~/.gvimrc.local.old"
+ mv -i .gvimrc.local .gvimrc.local.old
fi
-ln -s dotfiles/dotvim/gvimrc .gvimrc
+ln -s dotfiles/gvimrc.local .gvimrc.local
-# link .vim
-if test -d .vim
-then
- echo "Your ~/.vim already exists, i'll move it to ~/.vim.old"
- mv -i .vim .vim-old
+# link .janus.rake
+if test -f .janus.rake
+ then
+ echo "Your ~/.janus.rake already exists, i'll move it to ~/.janus.rake.old"
+ mv -i .janus.rake .janus.rake.old
fi
-ln -s dotfiles/dotvim .vim
+ln -s dotfiles/janus.rake .janus.rake
# link .zshrc
if test -f .zshrc
then
echo "Your ~/.zshrc already exists, i'll move it to ~/.zshrc.old"
- mv -i .zshrc .zshrc-old
+ mv -i .zshrc .zshrc.old
fi
ln -s dotfiles/zshrc .zshrc
# link .aliases
if test -f .aliases
then
echo "Your ~/.aliases already exists, i'll move it to ~/.aliases.old"
- mv -i .aliases .aliases-old
+ mv -i .aliases .aliases.old
fi
ln -s dotfiles/aliases .aliases
View
10 janus.rake
@@ -0,0 +1,10 @@
+vim_plugin_task "nerdtree", "git://github.com/hyperbolist/nerdtree.git"
+vim_plugin_task "minibufexpl", "git://github.com/fholgado/minibufexpl.vim.git"
+vim_plugin_task "bufkill", "git://github.com/vim-scripts/bufkill.vim.git"
+vim_plugin_task "vim-ruby-debugger", "git://github.com/astashov/vim-ruby-debugger.git"
+vim_plugin_task "birds-of-paradise" do
+ sh " curl https://github.com/kennethlove/Birds-of-Paradise-VIM-Theme/raw/master/birds_of_paradise.vim > colors/birds-of-paradise.vim"
+end
+skip_vim_plugin "color-sampler"
+skip_vim_plugin "conque"
+skip_vim_plugin "haml"
View
22 vimrc.local
@@ -0,0 +1,22 @@
+
+"nmap <C-W>! <Plug>Kwbd
+
+" Control-q to close buffer
+" using the bufkill.vim plugin
+map <C-q> :BD<cr>
+
+" use mouse double click to open files
+let g:NERDTreeMouseMode=2
+
+
+set background=light
+
+let g:solarized_termcolors=16
+let g:solarized_termtrans=1
+let g:solarized_style="light"
+let g:solarized_contrast="normal"
+
+color solarized
+
+" guarantees that the NERDTrees for all tabs will be one and the same
+map <F2> :NERDTreeToggle \| :silent NERDTreeMirror<CR>
View
1 zshrc
@@ -24,6 +24,7 @@ plugins=(git rails ruby)
source $ZSH/oh-my-zsh.sh
# Customize to your needs...
+export PATH=$PATH:$HOME/apps/android-sdk-linux_x86/tools:$HOME/apps/android-sdk-linux_x86/platform-tools
# fix names in rvm
unsetopt auto_name_dirs

0 comments on commit a73be37

Please sign in to comment.