balkian/dotfiles
1
0
Fork 0
mirror of https://github.com/balkian/dotfiles.git synced 2024-11-23 12:42:29 +00:00
Code Issues Releases Wiki Activity

Several fixes found when installing in Sputnik

Browse Source
This commit is contained in:
J.Fernando Sánchez 2013-04-04 18:17:43 +02:00
parent 905e3cc6c4
commit be555f96c5
6 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bashrc
View File

@ -1,3 +1,4 @@
export PATH="$PATH:$HOME/.bin"
# If not running interactively, don't do anything # If not running interactively, don't do anything
[ -z "$PS1" ] && return [ -z "$PS1" ] && return
@ -173,8 +174,6 @@ PS0="$PS0 \\[\033[1;32m\]\$(parse_git_branch)\\[\033[0m\]\$ "
# export PROMPT_COMMAND="$PROMPT_COMMAND&&updateWindowTitle" # export PROMPT_COMMAND="$PROMPT_COMMAND&&updateWindowTitle"
#fi #fi
#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* #[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
export PATH="$PATH:$HOME/.bin"
export CDPATH="$CDPATH:/media/Data/"
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

2
bin

@ -1 +1 @@
Subproject commit 3e52be8becafe793a3394fd9f9f1069908e0ea67 Subproject commit 74f36c4a4d5003a7b952ad4f42da3376d96e3902

0
starttmux Normal file → Executable file
View File

43
vimrc
View File

@ -8,12 +8,15 @@ call vundle#rc()
" let Vundle manage Vundle " let Vundle manage Vundle
" required! " required!
Bundle 'gmarik/vundle' Bundle "gmarik/vundle"
Bundle 'LaTeX-Box-Team/LaTeX-Box' Bundle "LaTeX-Box-Team/LaTeX-Box"
Bundle 'tpope/vim-fugitive' Bundle "tpope/vim-fugitive"
Bundle "tpope/vim-unimpaired" Bundle "tpope/vim-unimpaired"
Bundle 'scrooloose/nerdtree' Bundle "scrooloose/nerdtree"
Bundle 'taglist.vim' Bundle "scrooloose/nerdcommenter"
Bundle "scrooloose/syntastic"
Bundle "ervandew/supertab"
Bundle "majutsushi/tagbar"
Bundle "MarcWeber/vim-addon-mw-utils" Bundle "MarcWeber/vim-addon-mw-utils"
Bundle "tomtom/tlib_vim" Bundle "tomtom/tlib_vim"
Bundle "honza/snipmate-snippets" Bundle "honza/snipmate-snippets"
@ -21,6 +24,7 @@ Bundle "garbas/vim-snipmate"
Bundle "SpellCheck" Bundle "SpellCheck"
Bundle "mattn/gist-vim" Bundle "mattn/gist-vim"
Bundle "mattn/webapi-vim" Bundle "mattn/webapi-vim"
Bundle "kien/ctrlp.vim.git"
filetype plugin indent on " required! filetype plugin indent on " required!
@ -32,6 +36,7 @@ set list
set tabstop=4 set tabstop=4
set shiftwidth=4 set shiftwidth=4
autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
au FileType py set textwidth=79
autocmd Filetype javascript set ts=4 sts=4 sw=4 expandtab smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class autocmd Filetype javascript set ts=4 sts=4 sw=4 expandtab smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
set expandtab set expandtab
set autoindent set autoindent
@ -52,23 +57,24 @@ set hlsearch
let mapleader="," let mapleader=","
noremap \ , noremap \ ,
" Commenting blocks of code. " Commenting blocks of code. I don't need it with NerdCommenter
autocmd FileType c,cpp,java,scala,javascript let b:comment_leader = '// ' " autocmd FileType c,cpp,java,scala,javascript let b:comment_leader = '// '
autocmd FileType sh,ruby,python let b:comment_leader = '# ' " autocmd FileType sh,ruby,python let b:comment_leader = '# '
autocmd FileType conf,fstab let b:comment_leader = '# ' " autocmd FileType conf,fstab let b:comment_leader = '# '
autocmd FileType tex let b:comment_leader = '% ' " autocmd FileType tex let b:comment_leader = '% '
autocmd FileType mail let b:comment_leader = '> ' " autocmd FileType mail let b:comment_leader = '> '
autocmd FileType vim let b:comment_leader = '" ' " autocmd FileType vim let b:comment_leader = '" '
noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR> " noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR> " noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
"
imap <C-v> <C-O>"+gP<CR> imap <C-v> <C-O>"+gP<CR>
noremap <C-S> :w<CR> noremap <C-S> :w<CR>
imap <C-S> <C-O>:w<CR> imap <C-S> <C-O>:w<CR>
"Custom maps "Custom maps
noremap <Leader>n :NERDTreeToggle<CR> noremap <Leader>n :NERDTreeToggle<CR>
noremap <Leader>t :TlistToggle<CR> noremap <Leader>t :TagbarToggle<CR>
noremap <Leader>f :CtrlPMixed<CR>
"Omni "Omni
set completeopt=longest,menuone set completeopt=longest,menuone
@ -132,7 +138,4 @@ call InsertStatuslineColor('')
au InsertEnter * call InsertStatuslineColor(v:insertmode) au InsertEnter * call InsertStatuslineColor(v:insertmode)
au InsertLeave * call InsertStatuslineColor('') au InsertLeave * call InsertStatuslineColor('')
set guifont=DejaVu\ Sans\ Mono
" Encryption
" set cm=blowfish
" Transparent editing of gpg encrypted files.

4
xinitrc
View File

@ -1,2 +1,4 @@
setxkbmap -option ctrl:nocaps #!/bin/sh
[ -f /etc/xprofile ] && source /etc/xprofile
[ -f ~/.xprofile ] && source ~/.xprofile
#caps:swapescape #caps:swapescape

4
xprofile
View File

@ -1,4 +1,4 @@
# echo "pasado(xprofile)" $(date) >> /tmp/LOG # echo "pasado(xprofile)" $(date) >> /tmp/LOG
#setxkbmap -option ctrl:nocaps setxkbmap -option ctrl:nocaps
#xmodmap ~/.Xmodmap #xmodmap ~/.Xmodmap
source ~/.xinitrc #source ~/.xinitrc