Merge branch 'main' of github.com:nidionis/svr

usr/home/.bash_aliases

@@ -24,9 +24,19 @@ alias val="valgrind --leak-check=full --show-leak-kinds=all"
 alias mvj='rsync -aH --remove-source-files'
 alias cpj='rsync -aH'
 alias git_light="git filter-repo --strip-blobs-bigger-than 10M"
-alias src="source ~/.bashrc"
 alias s="sudo -E"
 
+function src() {
+	source $HOME/.bashrc || true
+	d="$PWD"; while [ "$d" != "/" ]; do
+		for a in "$d/bin/activate" "$d/.env/bin/activate"; do
+			[ -f $a ] && echo "found at $a" && . "$a" && break 2
+		done
+		d=$(dirname "$d")
+	done
+}
+
+
 ##convert mp3 to wav
 #to_wav () {
 #	OUTDIR_NAME="wav_files"

usr/home/.bashrc

@@ -4,9 +4,9 @@
 
 
 if [ -f /etc/env ]; then
-	set -a
-	. /etc/env
-	set +a
+       set -a
+       . /etc/env
+       set +a
 fi
 
 set -o vi
@@ -104,7 +104,7 @@ RESET_COLOR="$NO_COLOR"
 export GIT_EDITOR=vim
 
 BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-PS1="\n${DATE_COLOR}\D{%y%m%d}${RESET_COLOR}-${TIME_COLOR}\t${RESET_COLOR}-${USER_COLOR}\u${RESET_COLOR}@${HOST_COLOR}\H${RESET_COLOR}-${DIR_COLOR}\w${RESET_COLOR}\n=> "
+PS1="\n\n${DATE_COLOR}\D{%y%m%d}${RESET_COLOR}-${TIME_COLOR}\t${RESET_COLOR}-${USER_COLOR}\u${RESET_COLOR}@${HOST_COLOR}\H${RESET_COLOR}-${DIR_COLOR}\w${RESET_COLOR}\n=> "
 
 export HISTCONTROL=ignorespace
 
@@ -122,21 +122,16 @@ export AWK_GREP_KEY="'{
     }
 }'"
 
-#ctags -R .
-
 bind -f  /home/.inputrc
 
-
 if [ -f /home/.bash_aliases ]; then
-	. /home/.bash_aliases
+       . /home/.bash_aliases
 fi
 
 # permet les accents
 setxkbmap us -variant intl
-source $PY_ENV/bin/activate
 
 #envsubst < ${MACHINE_PATH}/dotfiles/ssh/config.template > ~/.ssh/config
 
 #export PATH=~/.npm-global/bin:$PATH
 
-

usr/home/.vimrc

@@ -87,8 +87,7 @@ autocmd BufNewFile *.c 0r ./.vim/templates/template.c
 
 set mouse=a
 
-inoremap {{ {}<ESC>O
-inoremap {;{ ;}<ESC>O
+inoremap { {<CR>}<Esc>O
 
 :nnoremap <Space> @q
 
@@ -102,3 +101,5 @@ set tags=./tags;,tags;
 
 syntax on
 set tags=./tags;/
+
+set smartindent