Merge branch 'dev' into 'master'
update dotfiles - new git repos - switch to zsh See merge request !1
This commit is contained in:
commit
660dbaffda
@ -8,7 +8,7 @@ we will use script makesymlinks.sh to install dotfiles
|
|||||||
change files var to suit yours need, then launch it :
|
change files var to suit yours need, then launch it :
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
git clone git@grimbergen.fino.fr:flo/dotfiles.git ~/dotfiles
|
git clone git@git.fino.fr:flo/dotfiles.git ~/dotfiles
|
||||||
cd ~/dotfiles
|
cd ~/dotfiles
|
||||||
./makesymlinks.sh
|
./makesymlinks.sh
|
||||||
```
|
```
|
||||||
|
|||||||
132
bashrc
132
bashrc
@ -1,49 +1,113 @@
|
|||||||
# Flo .bashrc
|
# ~/.bashrc: executed by bash(1) for non-login shells.
|
||||||
|
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
||||||
|
# for examples
|
||||||
|
|
||||||
### set user bin path
|
# If not running interactively, don't do anything
|
||||||
PATH="~/bin:$PATH"
|
case $- in
|
||||||
|
*i*) ;;
|
||||||
|
*) return;;
|
||||||
|
esac
|
||||||
|
|
||||||
### colors for ls, etc.
|
# don't put duplicate lines or lines starting with space in the history.
|
||||||
eval `dircolors -b /etc/DIR_COLORS`
|
# See bash(1) for more options
|
||||||
alias ls="ls --color=always"
|
HISTCONTROL=ignoreboth
|
||||||
|
|
||||||
### common aliases
|
# append to the history file, don't overwrite it
|
||||||
alias ll="ls -l"
|
shopt -s histappend
|
||||||
alias la="ls -a"
|
|
||||||
alias lh="ll -h"
|
|
||||||
alias l="ls -alh"
|
|
||||||
alias ..="cd .."
|
|
||||||
alias rm="rm -i"
|
|
||||||
alias cp="cp -i"
|
|
||||||
alias mv="mv -i"
|
|
||||||
|
|
||||||
# man in english
|
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
||||||
alias man="LANG=\"en_US.UTF-8\" man"
|
HISTSIZE=1000
|
||||||
export PAGER="/usr/bin/most -s"
|
HISTFILESIZE=2000
|
||||||
|
|
||||||
### Change the window title of X terminals
|
# check the window size after each command and, if necessary,
|
||||||
case $TERM in
|
# update the values of LINES and COLUMNS.
|
||||||
xterm*|rxvt|Eterm|eterm)
|
shopt -s checkwinsize
|
||||||
PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
|
|
||||||
|
# If set, the pattern "**" used in a pathname expansion context will
|
||||||
|
# match all files and zero or more directories and subdirectories.
|
||||||
|
#shopt -s globstar
|
||||||
|
|
||||||
|
# make less more friendly for non-text input files, see lesspipe(1)
|
||||||
|
#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
||||||
|
|
||||||
|
# set variable identifying the chroot you work in (used in the prompt below)
|
||||||
|
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
||||||
|
debian_chroot=$(cat /etc/debian_chroot)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# set a fancy prompt (non-color, unless we know we "want" color)
|
||||||
|
case "$TERM" in
|
||||||
|
xterm-color) color_prompt=yes;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# uncomment for a colored prompt, if the terminal has the capability; turned
|
||||||
|
# off by default to not distract the user: the focus in a terminal window
|
||||||
|
# should be on the output of commands, not on the prompt
|
||||||
|
force_color_prompt=yes
|
||||||
|
|
||||||
|
if [ -n "$force_color_prompt" ]; then
|
||||||
|
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
||||||
|
# We have color support; assume it's compliant with Ecma-48
|
||||||
|
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
||||||
|
# a case would tend to support setf rather than setaf.)
|
||||||
|
color_prompt=yes
|
||||||
|
else
|
||||||
|
color_prompt=
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$color_prompt" = yes ]; then
|
||||||
|
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||||
|
else
|
||||||
|
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||||
|
fi
|
||||||
|
unset color_prompt force_color_prompt
|
||||||
|
|
||||||
|
# If this is an xterm set the title to user@host:dir
|
||||||
|
case "$TERM" in
|
||||||
|
xterm*|rxvt*)
|
||||||
|
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||||
;;
|
;;
|
||||||
screen)
|
*)
|
||||||
PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"'
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
### activate bash-completion:
|
# enable color support of ls and also add handy aliases
|
||||||
[ -f /etc/profile.d/bash-completion ] && source /etc/profile.d/bash-completion
|
if [ -x /usr/bin/dircolors ]; then
|
||||||
|
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||||
|
alias ls='ls --color=auto'
|
||||||
|
#alias dir='dir --color=auto'
|
||||||
|
#alias vdir='vdir --color=auto'
|
||||||
|
|
||||||
complete -cf sudo
|
#alias grep='grep --color=auto'
|
||||||
complete -cf man
|
#alias fgrep='fgrep --color=auto'
|
||||||
|
#alias egrep='egrep --color=auto'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# colored GCC warnings and errors
|
||||||
|
export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||||
|
|
||||||
|
# some more ls aliases
|
||||||
|
alias ll='ls -l'
|
||||||
|
alias la='ls -A'
|
||||||
|
alias l='ls -CF'
|
||||||
|
|
||||||
|
# Alias definitions.
|
||||||
|
# You may want to put all your additions into a separate file like
|
||||||
|
# ~/.bash_aliases, instead of adding them here directly.
|
||||||
|
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||||
|
|
||||||
# aliases
|
|
||||||
if [ -f ~/.bash_aliases ]; then
|
if [ -f ~/.bash_aliases ]; then
|
||||||
. ~/.bash_aliases
|
. ~/.bash_aliases
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## load aliases
|
# enable programmable completion features (you don't need to enable
|
||||||
#source $HOME/.bash_aliases
|
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
|
||||||
#
|
# sources /etc/bash.bashrc).
|
||||||
## enable bash completion
|
if ! shopt -oq posix; then
|
||||||
#source /etc/profile.d/bash-completion.sh
|
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||||
|
. /usr/share/bash-completion/bash_completion
|
||||||
|
elif [ -f /etc/bash_completion ]; then
|
||||||
|
. /etc/bash_completion
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|||||||
61
vimrc
61
vimrc
@ -1,59 +1,4 @@
|
|||||||
" Use Vim settings, rather then Vi settings (much better!).
|
|
||||||
" This must be first, because it changes other options as a side effect.
|
|
||||||
set nocompatible
|
|
||||||
|
|
||||||
"set tabstop=4
|
|
||||||
"set shiftwidth=4
|
|
||||||
|
|
||||||
" allow backspacing over everything in insert mode
|
|
||||||
set backspace=indent,eol,start
|
|
||||||
|
|
||||||
set history=50 " keep 50 lines of command line history
|
|
||||||
set ruler " show the cursor position all the time
|
|
||||||
set showcmd " display incomplete commands
|
|
||||||
"set incsearch " do incremental searching
|
|
||||||
|
|
||||||
" Don't use Ex mode, use Q for formatting
|
|
||||||
"map Q gq
|
|
||||||
|
|
||||||
" This is an alternative that also works in block mode, but the deleted
|
|
||||||
" text is lost and it only works for putting the current register.
|
|
||||||
"vnoremap p "_dp
|
|
||||||
|
|
||||||
" Switch syntax highlighting on, when the terminal has colors
|
|
||||||
" Also switch on highlighting the last used search pattern.
|
|
||||||
"if &t_Co > 2 || has("gui_running")
|
|
||||||
" syntax on
|
|
||||||
" set hlsearch
|
|
||||||
"endif
|
|
||||||
|
|
||||||
" Enable file type detection.
|
|
||||||
" Use the default filetype settings, so that mail gets 'tw' set to 72,
|
|
||||||
" 'cindent' is on in C files, etc.
|
|
||||||
" Also load indent files, to automatically do language-dependent indenting.
|
|
||||||
filetype plugin on
|
|
||||||
filetype indent on
|
|
||||||
|
|
||||||
set autoindent " always set autoindenting on
|
|
||||||
set encoding=utf-8
|
|
||||||
set fileencoding=utf-8
|
|
||||||
|
|
||||||
set showmode
|
|
||||||
set backspace=indent,eol,start
|
|
||||||
set sm
|
|
||||||
syntax on
|
|
||||||
set hlsearch
|
|
||||||
set nobackup
|
|
||||||
set ts=4
|
|
||||||
set sw=4
|
|
||||||
set tw=0
|
|
||||||
set expandtab
|
|
||||||
|
|
||||||
set cryptmethod=blowfish
|
|
||||||
|
|
||||||
|
|
||||||
au BufRead,BufNewFile *.pde set filetype=arduino
|
|
||||||
au BufRead,BufNewFile *.ino set filetype=arduino
|
|
||||||
|
|
||||||
" pathogen
|
|
||||||
execute pathogen#infect()
|
execute pathogen#infect()
|
||||||
|
syntax on
|
||||||
|
filetype plugin indent on
|
||||||
|
colors molokai
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user