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

install.sh

@@ -27,7 +27,6 @@ function deploy_for_desktop()
 	ln -s $WAI/inputrc ./.inputrc
 	ln -s $WAI/Xmodmap ./.Xmodmap
 	ln -s $WAI/octaverc ./.octaverc
-	ln -s $WAI/gitconfig ./.gitconfig
 	ln -s $WAI/lynxrc ./.lynxrc
 
 	cd ~
@@ -49,38 +48,8 @@ function deploy_vim()
 
 	cd ~
 	ln -s $WAI/vim/vimrc ./.vimrc
+	ln -s $WAI/vim ./.vim
 
-	if [ ! -d "~/.vim" ]; then mkdir ~/.vim/; fi;
-	cd ~/.vim
-
-	if [ ! -d "./colors" ]; then mkdir colors; fi;
-	cd colors
-	ln -s $WAI/vim/colors/wombat256modv1.vim ./wombat256modv1.vim
-
-	cd ..
-	if [ ! -d "./skeletons" ]; then mkdir skeletons; fi;
-	cd skeletons
-	for i in `ls $WAI/vim/skeletons`; do ln -s $WAI/vim/skeletons/$i ./$i; done
-
-	cd ..
-	if [ ! -d "./spell" ]; then mkdir spell; fi;
-	cd spell
-	for i in `ls $WAI/vim/spell`; do ln -s $WAI/vim/spell/$i ./$i; done
-
-	cd ..
-	if [ ! -d "./plugin" ]; then mkdir plugin; fi;
-	cd plugin
-	for i in `ls $WAI/vim/plugin`; do ln -s $WAI/vim/plugin/$i ./$i; done
-
-	cd ..
-	if [ ! -d "./scripts" ]; then mkdir scripts; fi;
-	cd scripts
-	for i in `ls $WAI/vim/scripts`; do ln -s $WAI/vim/scripts/$i ./$i; done
-
-	cd ..
-	if [ ! -d "./ftplugin" ]; then mkdir ftplugin; fi;
-	cd ftplugin 
-	for i in `ls $WAI/vim/ftplugin`; do ln -s $WAI/vim/ftplugin/$i ./$i; done
 } # }}}
 
 function deploy_ssh()
@@ -154,17 +123,18 @@ fi;
 
 #simple files
 cd ~
-ln -s ~/Programmation/dotfiles/Utils/ .my_utils
+ln -s $WAI/Utils/ .my_utils
 ln -s $WAI/bashrc ./.bashrc
 ln -s $WAI/bash_ps1 ./.bash_ps1
 ln -s $WAI/signature ./.signature
+ln -s $WAI/gitconfig ./.gitconfig
 ln -s $WAI/vacation.msg ./.vacation.msg
 
-deploy_for_desktop
-deploy_encryption
+#deploy_for_desktop
+#deploy_encryption
 deploy_vim
 deploy_ssh
-deploy_mutt
+#deploy_mutt
 
 
 cd ~

vim/spell/en.utf-8.add

@@ -49,3 +49,8 @@ hédonique
 quartiquement
 quadratiquement
 Hopfield
+générationelle
+intergénérationelle
+PVD
+Milanković
+anthropogène

vim/vimrc

@@ -165,6 +165,7 @@ autocmd BufRead,BufNewFile *.tex set filetype=tex tw=80 fo+=aw
 autocmd BufRead,BufNewFile *.latex set tw=80 fo+=aw ts=4 sw=4
 autocmd BufRead,BufNewFile *.lista set filetype=lisp
 autocmd BufRead,BufNewFile *.xml set ts=4 sw=4
+autocmd BufRead,BufNewFile *.html set ts=4 sw=4
 autocmd BufRead,BufNewFile *.md set filetype=markdown tw=80 fo+=aw
 
 "autocmd BufRead,BufNewFile *.m set nospell