diff --git a/shellscript/.bashrc b/dotfiles/.bashrc
similarity index 97%
rename from shellscript/.bashrc
rename to dotfiles/.bashrc
index 7e85185..1a47f6f 100644
--- a/shellscript/.bashrc
+++ b/dotfiles/.bashrc
@@ -28,7 +28,7 @@ export HISTFILESIZE=$((HISTSIZE*2))
 export HISTCONTROL=ignoredups
 export HISTTIMEFORMAT='%Y-%m-%d %T '
 
-export TRASH="~/.Trash/"
+export TRASH="${HOME}/.Trash/"
 #complete -c man sudo gksu
 complete -c man sudo
 
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
new file mode 100644
index 0000000..568bea6
--- /dev/null
+++ b/dotfiles/.vimrc
@@ -0,0 +1,51 @@
+filetype off
+autocmd BufNewFile,BufRead *.ino setfiletype arduino
+colorscheme desert
+nnoremap <Space> <C-w>
+nnoremap <Space>, :edit $MYVIMRC<CR>
+nnoremap <Space>. :source $MYVIMRC<CR>
+nnoremap <Space><Space> <Space>
+nnoremap <Space>Q :quit!<CR>
+nnoremap <Space>S :saveas 
+nnoremap <Space>b :buffers<CR>
+nnoremap <Space>d :bdelete<CR>
+nnoremap <Space>e :Explore<CR>
+nnoremap <Space>m :make<CR>
+nnoremap <Space>n :bnext<CR>
+nnoremap <Space>p :bprevious<CR>
+nnoremap <Space>q :quit<CR>
+nnoremap <Space>s :write<CR>
+nnoremap <Space>t :tabnew<CR>
+nnoremap <Space>u :update<CR>
+set autoindent
+set backup
+set backupdir=$HOME/.vim/tmp
+set expandtab
+set foldmethod=marker
+set ignorecase
+set laststatus=2
+set modeline
+set modelines=1
+set nocompatible
+set nowrap
+set number
+set shiftwidth=2
+set smartcase
+set smartindent
+set softtabstop=2
+set statusline=%<%f\ %h%m%r%=\ %l/%L,%c%y
+set visualbell
+set whichwrap=b,s,h,l,<,>,~,[,]
+syntax on
+
+"for matchit.vim
+source $VIMRUNTIME/macros/matchit.vim
+let b:match_words = &matchpairs.'<\([A-Za-z_\:][A-Za-z0-9.\-_\:]*\):</\1'
+
+"for Vundle
+set rtp+=~/.vim/bundle/vundle
+call vundle#rc()
+Bundle 'gmarik/vundle'
+Bundle 'Shougo/git-vim'
+
+filetype plugin indent on