Backing up current changes

profile

@@ -82,7 +82,8 @@ alias cls='clear && ls'
 alias doit='sudo $(history -p !-1)'
 alias f="pushd"
 alias b="popd"
-alias psql="'/Applications/Postgres.app/Contents/Versions/9.3/bin'/psql -p5432"
+alias screen_pwd='screen -X eval "chdir $PWD"'
+#alias psql="'/Applications/Postgres.app/Contents/Versions/9.3/bin'/psql -p5432"
 
 macos_magic_fix() {
     killall Dock

vimrc

@@ -1,28 +1,36 @@
-set nocompatible
+"set nocompatible
-filetype off
+"filetype off
-
+"
-" set the runtime path to include Vundle and initialize
+"" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
+"set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+"call vundle#begin()
-
+"
-" let Vundle manage Vundle, required
+"" let Vundle manage Vundle, required
-Plugin 'gmarik/Vundle.vim'
+"Plugin 'gmarik/Vundle.vim'
-
+"
-" Plugin 'scala.vim'
+"" Plugin 'scala.vim'
-" Plugin 'vim-scala'
+"" Plugin 'vim-scala'
-Bundle 'derekwyatt/vim-scala'
+"Bundle 'derekwyatt/vim-scala'
-" Plugin 'git@github.com:Valloric/YouCompleteMe.git'
+"" Plugin 'git@github.com:Valloric/YouCompleteMe.git'
-
+"
-call vundle#end()
+"call vundle#end()
-
+"
+"filetype plugin indent on
 filetype plugin indent on
 
 " Tabbing
+function! SetupTabbing()
   set tabstop=2
-set shiftwidth=2
   set expandtab
+  set shiftwidth=2
+  set softtabstop=2
+  set sw=2
   set autoindent
   set smartindent
+  set smarttab
+endfunction
+command! -bar SetupTabbing call SetupTabbing()
+SetupTabbing
 
 " Window settings
 set winminwidth=20
@@ -44,6 +52,7 @@ set scrolloff=2
 autocmd FileType tex set wrap spell
 autocmd FileType make set noexpandtab
 autocmd FileType *gitconfig set noexpandtab
+autocmd FileType python SetupTabbing
 
 " set term=xterm