From 2d09e180427a8fc601d926f7057e2c44233222c4 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 24 Jan 2016 11:04:49 +0100 Subject: Updates --- dot_Xdefaults | 78 ++++++++++++++++++++++++++++++----------------------- dot_bashrc | 65 -------------------------------------------- dot_bashrc_chitanda | 53 ++++++++++++++++++++++++++++++++++++ dot_bashrc_konata | 65 ++++++++++++++++++++++++++++++++++++++++++++ dot_inputrc | 6 ----- dot_vimrc | 2 ++ 6 files changed, 164 insertions(+), 105 deletions(-) delete mode 100644 dot_bashrc create mode 100644 dot_bashrc_chitanda create mode 100644 dot_bashrc_konata diff --git a/dot_Xdefaults b/dot_Xdefaults index e031469..24fcfbc 100644 --- a/dot_Xdefaults +++ b/dot_Xdefaults @@ -1,30 +1,6 @@ -URxvt.matcher.button: 1 -URxvt*scrollstyle: rxvt - -URxvt.perl-ext-common: default,matcher -URxvt.urlLauncher: /usr/bin/firefox -URxvt.scrollBar: off - -URxvt*transparent: true -Rxvt*shading: 30 - -Xft.autohint: 1 -Xft.antialiasing: 1 - -#URxvt.font: -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 -#URxvt.font: -misc-fixed-medium-r-normal--15-120-90--c-90-iso8859-1 -URxvt.font: xft:inconsolata:size=12 - -URxvt.perl-ext: default,url-select,font-size -URxvt.keysym.M-u: perl:url-select:select_next -URxvt.url-select.launcher: /usr/bin/firefox -new-tab -URxvt.url-select.underline: true -URxvt.keysym.C-Up: perl:font-size:increase -URxvt.keysym.C-Down: perl:font-size:decrease - -*visualBell: false +# General terminal configuration -sterm*scrollTtyOutput: false +#xterm*scrollTtyOutput: false xterm*rightScrollBar: true xterm*faceName: inconsolata:pixelsize=14 xterm*utf8: 2 @@ -37,12 +13,7 @@ xterm*jumpScroll: true xterm*eightBitInput: true xterm*multiScroll: true xterm*toolBar: false -#xft.rgba: rgb -#xft.hinting: true -#xft.antialias: true -#xft.hintstyle: hintfull -#xft.dpi: 96 -Xcursor*theme: Adwaita + *Text.background: #efefef *foreground: #dddddd *background: #111111 @@ -63,5 +34,44 @@ Xcursor*theme: Adwaita *color14: #46a4ff *color15: #ffffff -rxvt*modifier: alt -urxvt*modifier: alt + +# Configuration for urxvt + +URxvt.keysym.C-Right : \033[1;5C +URxvt.keysym.C-Left : \033[1;5D + +URxvt.matcher.button: 1 +#rxvt*modifier: alt +#urxvt*modifier: alt + +URxvt.scrollBar: off +URxvt*scrollstyle: rxvt + +URxvt*transparent: false +Rxvt*shading: 30 + +#URxvt.font: -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +#URxvt.font: -misc-fixed-medium-r-normal--15-120-90--c-90-iso8859-1 +URxvt.font: xft:inconsolata:size=11 + +#xft.rgba: rgb +#xft.hinting: true +#xft.antialias: true +#xft.hintstyle: hintfull +#xft.dpi: 96 +Xft.autohint: true +Xft.antialias: true + +URxvt.perl-ext-common: default,clipboard,url-select,matcher,resize-font +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.url-select.launcher: /usr/bin/firefox -new-tab +URxvt.url-select.underline: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up + + +# Other configuration + +Xcursor*theme: Adwaita + +*visualBell: false diff --git a/dot_bashrc b/dot_bashrc deleted file mode 100644 index d4a765f..0000000 --- a/dot_bashrc +++ /dev/null @@ -1,65 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -complete -cf sudo -complete -cf man -shopt -s autocd - -alias ls='ls --color=auto' -alias df='dfc' -PS1='[\u@\h \W]\$ ' - -export EDITOR='vim' - -export GOPATH=$HOME/go - -export PATH=$PATH:$HOME/usr/bin:$HOME/go/bin -export LD_LIBRARY_PATH=$HOME/usr/lib - -# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' - -export WINEARCH=win32 - -# -- GIT prompt -GIT_PROMPT_FETCH_REMOTE_STATUS=0 -GIT_PROMPT_START="\n\[\033[0m\][\$(if [[ \$? == 0 ]]; then echo \"\[\033[0;32m\]\$?\"; else echo \"\[\033[0;31m\]\$?\"; fi)\[\033[00m\]] \[\033[0;36m\]\u@\h \[\033[0;33m\]\w\[\033[0m\]" -GIT_PROMPT_END="\[\033[0m\]\n \$ " -source ~/usr/src/bash-git-prompt/gitprompt.sh - - -# ------------ GOOGLE CLOUD SDK -# The next line updates PATH for the Google Cloud SDK. -source /home/katchup/usr/google-cloud-sdk/path.bash.inc -# The next line enables bash completion for gcloud. -source /home/katchup/usr/google-cloud-sdk/completion.bash.inc - -# ------------ OPAM configuration -. /home/katchup/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -export PATH=$PATH:$HOME/usr/google-cloud-sdk/bin:$HOME/.opam/system/bin:$HOME/.local/bin - -export SDL_VIDEO_X11_DGAMOUSE=0 - -export PYLEARN2_DATA_PATH=/home/katchup/s/dataset -export PATH=$PATH:$HOME/s/pylearn2/pylearn2/scripts - - -alias clipper='ssh -R 9876:localhost:9872 auvolat@sas.eleves.ens.fr' -alias cargo='ssh auvolat@cargo.ens.fr' -alias tremble='ssh auvolat@tremble.ens.fr' -alias tulipier='ssh auvolat@tulipier.ens.fr' -# conseil : utiliser tulipier pour bosser, sas.eleves pour IRC - -alias vps='ssh katchup@vps46149.ovh.net' -alias irc='TERM=xterm ssh -t adnab.me /usr/local/bin/irc' - -alias ocamltop='rlwrap ocaml "$@"' - -alias drsync='rsync -arzv --delete --progress' - -expand -t 4 $HOME/Core/TODO - - diff --git a/dot_bashrc_chitanda b/dot_bashrc_chitanda new file mode 100644 index 0000000..b6a95ac --- /dev/null +++ b/dot_bashrc_chitanda @@ -0,0 +1,53 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +complete -cf sudo +complete -cf man +shopt -s autocd + +alias ls='ls --color=auto' +#alias df='dfc' +PS1='[\u@\h \W]\$ ' + +export EDITOR='vim' + +export GOPATH=$HOME/go + +export PATH=$HOME/usr/bin:$HOME/go/bin:$PATH +export LD_LIBRARY_PATH=$HOME/usr/lib + +# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' + +export WINEARCH=win32 + +# -- GIT prompt +GIT_PROMPT_FETCH_REMOTE_STATUS=0 +GIT_PROMPT_START="\n\[\033[0m\][\$(if [[ \$? == 0 ]]; then echo \"\[\033[0;32m\]\$?\"; else echo \"\[\033[0;31m\]\$?\"; fi)\[\033[00m\]] \[\033[0;36m\]\u@\h \[\033[0;33m\]\w\[\033[0m\]" +GIT_PROMPT_END="\[\033[0m\]\n \$ " +source ~/usr/src/bash-git-prompt/gitprompt.sh + + +export SDL_VIDEO_X11_DGAMOUSE=0 + + +alias clipper='ssh auvolat@sas.eleves.ens.fr' +alias cargo='ssh auvolat@cargo.ens.fr' +alias tremble='ssh auvolat@tremble.ens.fr' +alias tulipier='ssh auvolat@tulipier.ens.fr' +# conseil : utiliser tulipier pour bosser, sas.eleves pour IRC + +alias dgsas='ssh dg@sas.eleves.ens.fr' +alias dgwww='ssh -t dg@sas.eleves.ens.fr ssh www2.eleves.ens.fr' + +alias irc='TERM=xterm ssh -t katchup@adnab.me /usr/local/bin/irc' + + +alias drsync='rsync -arzv --delete --progress' + +# expand -t 4 $HOME/Core/TODO + +keychain ~/.ssh/id_rsa --quiet diff --git a/dot_bashrc_konata b/dot_bashrc_konata new file mode 100644 index 0000000..d4a765f --- /dev/null +++ b/dot_bashrc_konata @@ -0,0 +1,65 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +complete -cf sudo +complete -cf man +shopt -s autocd + +alias ls='ls --color=auto' +alias df='dfc' +PS1='[\u@\h \W]\$ ' + +export EDITOR='vim' + +export GOPATH=$HOME/go + +export PATH=$PATH:$HOME/usr/bin:$HOME/go/bin +export LD_LIBRARY_PATH=$HOME/usr/lib + +# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' + +export WINEARCH=win32 + +# -- GIT prompt +GIT_PROMPT_FETCH_REMOTE_STATUS=0 +GIT_PROMPT_START="\n\[\033[0m\][\$(if [[ \$? == 0 ]]; then echo \"\[\033[0;32m\]\$?\"; else echo \"\[\033[0;31m\]\$?\"; fi)\[\033[00m\]] \[\033[0;36m\]\u@\h \[\033[0;33m\]\w\[\033[0m\]" +GIT_PROMPT_END="\[\033[0m\]\n \$ " +source ~/usr/src/bash-git-prompt/gitprompt.sh + + +# ------------ GOOGLE CLOUD SDK +# The next line updates PATH for the Google Cloud SDK. +source /home/katchup/usr/google-cloud-sdk/path.bash.inc +# The next line enables bash completion for gcloud. +source /home/katchup/usr/google-cloud-sdk/completion.bash.inc + +# ------------ OPAM configuration +. /home/katchup/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true +export PATH=$PATH:$HOME/usr/google-cloud-sdk/bin:$HOME/.opam/system/bin:$HOME/.local/bin + +export SDL_VIDEO_X11_DGAMOUSE=0 + +export PYLEARN2_DATA_PATH=/home/katchup/s/dataset +export PATH=$PATH:$HOME/s/pylearn2/pylearn2/scripts + + +alias clipper='ssh -R 9876:localhost:9872 auvolat@sas.eleves.ens.fr' +alias cargo='ssh auvolat@cargo.ens.fr' +alias tremble='ssh auvolat@tremble.ens.fr' +alias tulipier='ssh auvolat@tulipier.ens.fr' +# conseil : utiliser tulipier pour bosser, sas.eleves pour IRC + +alias vps='ssh katchup@vps46149.ovh.net' +alias irc='TERM=xterm ssh -t adnab.me /usr/local/bin/irc' + +alias ocamltop='rlwrap ocaml "$@"' + +alias drsync='rsync -arzv --delete --progress' + +expand -t 4 $HOME/Core/TODO + + diff --git a/dot_inputrc b/dot_inputrc index 80a8419..eae4e53 100644 --- a/dot_inputrc +++ b/dot_inputrc @@ -12,12 +12,6 @@ set bell-style none # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving "\e[1;5C": forward-word "\e[1;5D": backward-word -"\e[5C": forward-word -"\e[5D": backward-word -"\e\e[C": forward-word -"\e\e[D": backward-word -"\e[0c": forward-word -"\e[0d": backward-word # Execute 'jobs' "\ej": "\C-a\C-kjobs\n" diff --git a/dot_vimrc b/dot_vimrc index dde409f..885a5d2 100644 --- a/dot_vimrc +++ b/dot_vimrc @@ -66,6 +66,7 @@ set linebreak set breakindent let &showbreak = '> ' +set display+=lastline " set completeopt=menuone,menu,longest,preview @@ -76,3 +77,4 @@ set backupdir=~/.vim/backup set undofile set undodir=~/.vim/undo + -- cgit v1.2.3