Merge branch 'master' of vi-di.fr:dotfiles

Utils/octopus.sh

@@ -3,7 +3,7 @@
 #OCTOPUS=~/Programmation/Utils/octopus.sh
 #This octopus handles all the actions like volume up, refresh status bar, etc..
 
-SNU=1
+SNU=2
 VGA=VGA$SNU
 LVDS=LVDS$SNU
 
@@ -152,6 +152,7 @@ case $1 in
 		ifconfig eth0 | grep netmask > /dev/null
 		if [ $? -eq 0 ]; then
 			sudo ifconfig wlan0 down
+			true
 		else
 			sudo ifconfig wlan0 up
 		fi

Utils/slock_bis/slock.c

@@ -191,10 +191,11 @@ lockscreen(Display *dpy, int screen)
 
 	/* init */
 	wa.override_redirect = 1;
-	wa.background_pixel = BlackPixel(dpy, lock->screen);
+	wa.background_pixel = WhitePixel(dpy, lock->screen);
 	lock->win = XCreateWindow(dpy, lock->root, 0, 0,
 		                  DisplayWidth(dpy, lock->screen),
-		                  DisplayHeight(dpy, lock->screen), 0,
+		                  20, //DisplayHeight(dpy, lock->screen),
+		                  0,
 		                  DefaultDepth(dpy, lock->screen),
 		                  CopyFromParent,
 		                  DefaultVisual(dpy, lock->screen),

bashrc

@@ -120,6 +120,7 @@ alias vmi='vim'
 
 alias gl='git log --graph --abbrev-commit --pretty=oneline --decorate'
 alias gitst='git status'
+alias gti='git'
 alias git_mail='git send-email --annotate --compose origin'
 alias poule='git pull'
 alias gs='git status'
@@ -128,6 +129,7 @@ alias push='git push'
 
 alias makew='make'
 alias mkae='make'
+alias amke='make'
 alias mak='make'
 alias amek='make'
 
@@ -158,7 +160,7 @@ alias shm='cd /dev/shm'
 
 alias ip6='ip -6'
 alias disk-usage-analyser='baobab'
-alias o='octave --quiet'
+alias o='octave --quiet --no-gui'
 alias R='R --quiet'
 alias cdu='cdu -idh'
 alias dus='du -sh * | sort -h'
@@ -167,6 +169,7 @@ alias eclipseJEE='/home/frank/Programmation/J2EE/eclipse/eclipse'
 alias mst='mvn install -DskipTests'
 alias arc='tig'
 alias ccat='pygmentize -g' #python-fragments
+alias phpserver='php -S localhost:8080'
 # }}}
 
 
@@ -202,8 +205,8 @@ function back {
 
 function pdfsearch #{{{
 {
-	for pdf in `find ./ -name "*.pdf"`; do
-		pdftotext $pdf - | grep --color --with-filename --label="$pdf" "$1";
+	for pdf in *.pdf; do
+		pdftotext "$pdf" - | grep --color --with-filename --label="$pdf" "$1";
 	done
 }
 #}}}

gitconfig

@@ -16,9 +16,12 @@
 	co = checkout
 	br = branch
 	pu = push
+	psuh = push
+	undo-commit = reset --soft HEAD^
 
 [core]
 	editor = vim
+	excludesfile = ~/.gitignore
 
 [merge]
 	tool = vimdiff

gitignore

@@ -0,0 +1 @@
+*.swp

mutt/colors.test1

@@ -86,3 +86,8 @@ color markers brightcyan black
 mono bold bold
 mono underline underline
 mono indicator reverse
+
+color body brightblue  white "(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$)" # *Bold* text.
+color body brightblue  white "(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)"     # _Underlined_ text.
+color body brightblue  white "(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)"     # /Italic/ text.
+

mutt/muttrc

@@ -7,6 +7,7 @@
 ############################
 
 
+
 macro index <f2> '<change-folder>imaps://frank_mail@villaro-dixon.eu<enter>'
 
 folder-hook 'frank_mail@villaro-dixon.eu' 'source ~/.mutt/account.frank'
@@ -122,3 +123,5 @@ set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"
 set sleep_time=0
 
 macro attach 'V' "<pipe-entry>cat > /dev/shm/mail.html && firefox /dev/shm/mail.html && rm /dev/shm/mail.html<enter>"
+
+set display_filter=~/.mutt/test.sh

octaverc

@@ -1,6 +1,6 @@
 # Set up a prettier prompt
 #PS1('\[\e[1;32m\]>>> \[\e[m\]\[\e[0;20m\]')
-PS1('\W\[\e[m\] \[\e[1;32m\]>>> \[\e[m\]\[\e[0;20m\]')
+#PS1('\W\[\e[m\] \[\e[1;32m\]>>> \[\e[m\]\[\e[0;20m\]')
 
 function man (name)
 	help (char (name))

procmailrc

@@ -27,6 +27,11 @@ VACATION="no"
 	* ^Subject:.*Finance News.*Investment.*returns
 	$MAILDIR/.SPAM/new
 
+#Univ-savoie fucking spam
+:0
+	* ^From:.*2univ-savoie.com.*
+	$MAILDIR/.SPAM/new
+
 :0
 	* ^From:.*diffusion-messages.com
 	$MAILDIR/.SPAM/new

ssh/config

@@ -50,3 +50,6 @@ host cui
 host scylla
 	hostname 129.194.69.109
 	user villaro0
+
+host darwin.maison.local
+	ProxyCommand ssh vi-di.fr -W %h:%p

texmf/tex/latex/frank_tex/frank_tex.sty

@@ -13,10 +13,17 @@
 \usepackage{amsmath}
 \usepackage{amsfonts}
 \usepackage{amssymb}
+\usepackage{hyperref}
 
 \usepackage{microtype}
 
 \usepackage[french]{babel}
+\usepackage[french]{varioref}
+
+
+\usepackage{boiboites}
+
+\usepackage{acronym}
 
 
 % Lenny, Conny ,Bjarne, Rejne, Glenn, Sonny, PetersLenny, Bjornstrup
@@ -27,13 +34,22 @@
 %\usepackage{fancyhdr}
 %\pagestyle{fancyplain}
 
+
+\usepackage{eurosym}
 \usepackage{siunitx}
+%%%%\sisetup{group-separator = {`}}
+\DeclareSIUnit{\EUR}{\text{\euro}}
+\DeclareSIUnit{\month}{mo}
+\sisetup{
+%	per-mode = fraction,
+	inter-unit-product = \ensuremath{{}\cdot{}},
+}
 
 \usepackage{indentfirst}
 \setlength{\parindent}{1cm}
 
 
-
+\date{\today}
 \author{\Large{Frank Villaro-Dixon}\\\texttt{Frank@Villaro-Dixon.eu}}
 \def\@maketitle{%
 	\newpage

vim/skeletons/skel.latex

@@ -1,4 +1,4 @@
-\documentclass[11pt]{article}
+\documentclass[a4paper,11pt]{article}
 \usepackage{frank_tex}
 
 \title{\textbf{<+TITLE+>}}

vim/spell/en.utf-8.add

@@ -54,3 +54,24 @@ intergénérationelle
 PVD
 Milanković
 anthropogène
+thermiquement
+transfrontière
+bouzin
+GES
+d'Aarhus
+extrapolable
+péjorer
+Paravalanches
+Surpuissance
+infréquentes
+incentives
+conservatif
+Levenshtein
+fi
+l'EPFL
+conscientiser
+Braess
+environnementalement
+irradiance
+d'irradiance
+relayage

vim/vimrc

@@ -215,6 +215,4 @@ noremap! <Left> <Esc>
 noremap  <Right> ""
 noremap! <Right> <Esc>
 
-noremap A<Enter> iSale Con <Esc>
-
 "Languagetool - :LanguageToolCheck

xinitrc

@@ -61,6 +61,8 @@ redshift -l 46:6 || true &
 mpc ls | mpc add
 mpc random on
 
+dvorak
+
 
 #ssh-agent -t 10 /home/frank/Programmation/dotfiles/dwm/dwm
 /home/frank/Programmation/dotfiles/dwm/dwm