From 7a53b18ed5060e038c0dc30f56fa6f1f05455b47 Mon Sep 17 00:00:00 2001 From: Frank Villaro-Dixon Date: Wed, 18 Dec 2013 23:08:34 +0100 Subject: [PATCH] monitor programming, xmodmap, op function --- Utils/octopus.sh | 28 ++++++++++--------- Xmodmap | 15 ++++++----- bashrc | 36 +++++++++++++++++++------ mutt/muttrc | 2 +- ssh/config | 9 +++++++ texmf/tex/latex/frank_tex/frank_tex.sty | 14 +++++++--- vim/spell/en.utf-8.add | 4 +++ xinitrc | 6 ++--- 8 files changed, 80 insertions(+), 34 deletions(-) diff --git a/Utils/octopus.sh b/Utils/octopus.sh index ac6e4e2..5095904 100755 --- a/Utils/octopus.sh +++ b/Utils/octopus.sh @@ -45,26 +45,30 @@ case $1 in "monitor") case $2 in "extern") - xrandr --output LVDS1 --off \ - --output VGA1 --auto --rotate normal + xrandr --output LVDS2 --off \ + --output VGA2 --auto --rotate normal ;; "laptop") - xrandr --output LVDS1 --auto --rotate normal \ - --output VGA1 --off + xrandr --output LVDS2 --auto --rotate normal \ + --output VGA2 --off ;; "dual") - xrandr --output LVDS1 --auto --rotate normal \ - --output VGA1 --auto --rotate normal \ - --right-of LVDS1 + xrandr --output LVDS2 --auto --rotate normal \ + --output VGA2 --auto --rotate normal \ + --right-of LVDS2 ;; + "programming") + xrandr --output VGA2 --auto --rotate left \ + --output LVDS2 --off + ;; "pdfpc") - xrandr --output LVDS1 --auto --rotate normal \ - --output VGA1 --auto --rotate normal \ - --left-of LVDS1 + xrandr --output LVDS2 --auto --rotate normal \ + --output VGA2 --auto --rotate normal \ + --left-of LVDS2 ;; "clone") - xrandr --output LVDS1 --auto \ - --output VGA1 --auto --same-as LVDS1 + xrandr --output LVDS2 --auto \ + --output VGA2 --auto --same-as LVDS2 ;; "off") xset dpms force off diff --git a/Xmodmap b/Xmodmap index 3b3423b..6c33398 100644 --- a/Xmodmap +++ b/Xmodmap @@ -7,10 +7,13 @@ !remove mod1 = Alt_L !remove Control = Control_L -clear Control -clear mod1 -keysym Control_L = Alt_L -keysym Alt_L = Control_L -add mod1 = Alt_L -add Control = Control_L +!clear Control +!clear mod1 +!keysym Control_L = Alt_L +!keysym Alt_L = Control_L +!add mod1 = Alt_L +!add Control = Control_L ! Control_R + +!Espace insécable: Shift-Space ou Compose-Space-Space +keycode 65 = space nobreakspace emspace diff --git a/bashrc b/bashrc index dbe4f79..6e40b72 100644 --- a/bashrc +++ b/bashrc @@ -125,6 +125,8 @@ alias git_mail='git send-email --annotate --compose origin' alias poule='git pull' alias makew='make' +alias mkae='make' +alias amek='make' alias BSI2='cd ~/Documents/UniGE/BSI2*/' BSI3_PATH='/home/frank/Documents/UniGE/BSI3 - 2013-2014/' @@ -152,7 +154,6 @@ alias shm='cd /dev/shm' alias ip6='ip -6' alias disk-usage-analyser='baobab' -alias op='xdg-open' alias o='octave' alias cdu='cdu -idh' alias dus='du -sh * | sort -h' @@ -288,9 +289,7 @@ _StudyCompletion() complete -F _StudyCompletion -o filenames study -## FIXME TO IMPROVE WITH VARIOUS locations (ex: ro 1; ro 2; ro 3) RO_ROOT_DIRECTORY=/dev/shm/ro_$USER - ro() { # {{{ if [ ! -d $RO_ROOT_DIRECTORY ]; then @@ -313,7 +312,6 @@ ro() fi fi; } # }}} - roset() { # {{{ if [ ! -d $RO_ROOT_DIRECTORY ]; then @@ -326,7 +324,6 @@ roset() pwd > $RO_ROOT_DIRECTORY/$1 fi } # }}} - _RoRosetCompletion() { # {{{ local cur # Pointer to current completion word. @@ -444,10 +441,33 @@ function bpm diff=`echo "scale=1; $beats / (($actual - $start) / 60)" | bc` echo $diff bpm done - - - } + +function op +{ + file="$1" + ext=${file##*\.} + echo file is "$ext" + case $ext in + "pdf") + echo "toto" + evince "$1" + ;; + "zip") + file-roller "$1" + ;; + "latex"|"tex") + vim "$1" + ;; + "java") + vim "$1" + ;; + *) + xdg-open "$1" + ;; + esac +} + # }}} SSHAGENT=/usr/bin/ssh-agent diff --git a/mutt/muttrc b/mutt/muttrc index 027c8b0..35b76c4 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -111,12 +111,12 @@ source ~/.mutt/crypto # LISTE DE CONTACTS +#set query_command="~/.mutt/grep_ldap.sh '%s'" #Alias set alias_file=~/.mutt/alias set sort_alias = alias set reverse_alias = yes source $alias_file -set query_command="~/.mutt/grep_ldap.sh '%s'" set date_format="%y-%m-%d %T" set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s" diff --git a/ssh/config b/ssh/config index 8304e04..0a820af 100644 --- a/ssh/config +++ b/ssh/config @@ -38,3 +38,12 @@ host pc69240 host cuilxa hostname cuilxa.unige.ch + user villaro0 + +host cui + hostname cui.unige.ch + user villaro0 + +host scylla + hostname 129.194.69.109 + user villaro0 diff --git a/texmf/tex/latex/frank_tex/frank_tex.sty b/texmf/tex/latex/frank_tex/frank_tex.sty index 8ce6606..a81374a 100644 --- a/texmf/tex/latex/frank_tex/frank_tex.sty +++ b/texmf/tex/latex/frank_tex/frank_tex.sty @@ -16,14 +16,20 @@ \usepackage[french]{babel} + +%\usepackage[Sonny]{fncychap} % Lenny, Conny ,Bjarne, Rejne, Glenn, Sonny +%\usepackage{fancyhdr} + +\usepackage{fancyhdr} +\pagestyle{fancyplain} + +\usepackage{sistyle} +\SIthousandsep{'} %to use with \num{1337} + \usepackage{indentfirst} \setlength{\parindent}{1cm} -%% Déclaration des options -%\DeclareOption{option}{...} -%\DeclareOption*{...} -%\ProcessOptions \author{Frank Villaro-Dixon} diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add index 9500baf..cd3ffa4 100644 --- a/vim/spell/en.utf-8.add +++ b/vim/spell/en.utf-8.add @@ -31,3 +31,7 @@ ventilo l'ordi skippé stacktrace +mouhahahhahahha +mouhahahahahha +circlip +BrainFuck diff --git a/xinitrc b/xinitrc index e7f0240..940a856 100644 --- a/xinitrc +++ b/xinitrc @@ -26,9 +26,9 @@ setxkbmap -model pc104 -layout ch -variant fr -option compose:lwin #My pinkie hurts :'( -#if [ -s ~/.Xmodmap ]; then -# xmodmap ~/.Xmodmap -#fi +if [ -s ~/.Xmodmap ]; then + xmodmap ~/.Xmodmap +fi $OCTOPUS init-all 1>> /dev/shm/Octopus_logs 2>> /dev/shm/Octopus_logs & ftpfct.sh >/dev/null &