Backing up current changes

This commit is contained in:
Nicole Tietz-Sokolskaya 2016-02-03 22:34:00 -05:00
parent 6ccba036aa
commit 16ec51c217
2 changed files with 33 additions and 23 deletions

View File

@ -82,7 +82,8 @@ alias cls='clear && ls'
alias doit='sudo $(history -p !-1)' alias doit='sudo $(history -p !-1)'
alias f="pushd" alias f="pushd"
alias b="popd" 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() { macos_magic_fix() {
killall Dock killall Dock

45
vimrc
View File

@ -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 filetype plugin indent on
" Tabbing " Tabbing
function! SetupTabbing()
set tabstop=2 set tabstop=2
set shiftwidth=2
set expandtab set expandtab
set shiftwidth=2
set softtabstop=2
set sw=2
set autoindent set autoindent
set smartindent set smartindent
set smarttab
endfunction
command! -bar SetupTabbing call SetupTabbing()
SetupTabbing
" Window settings " Window settings
set winminwidth=20 set winminwidth=20
@ -44,6 +52,7 @@ set scrolloff=2
autocmd FileType tex set wrap spell autocmd FileType tex set wrap spell
autocmd FileType make set noexpandtab autocmd FileType make set noexpandtab
autocmd FileType *gitconfig set noexpandtab autocmd FileType *gitconfig set noexpandtab
autocmd FileType python SetupTabbing
" set term=xterm " set term=xterm