remove obsolete stuff, fix roles errors and update dns role

1 files changed, 23 insertions, 10 deletions

diff --git a/roles/common/files/bashrc b/roles/common/files/bashrc
index f506493..9fb69d2 100644
--- a/roles/common/files/bashrc
+++ b/roles/common/files/bashrc
@@ -5,37 +5,50 @@
 alias rm='rm -i'
 alias cp='cp -i'
 alias mv='mv -i'
-alias pop='popd'
-alias up='popd'
-alias myip='curl https://lancaster.casperlefantom.net/ipclient.php'
-alias torip='torsocks curl https://lancaster.casperlefantom.net/ipclient.php'
+alias ll='ls -lh'
 alias f='find . -iname'
+alias up='popd'
+alias pop='popd'
+alias myip='curl https://lancaster.casperlefantom.net:4433/ipclient.php'
+alias torip='torsocks curl https://lancaster.casperlefantom.net:4433/ipclient.php'
 alias beep='echo -e "\a"'
 alias screenoff='xset dpms force off'
+alias wifion='nmcli r wifi on'
+alias wifioff='nmcli r wifi off'
 alias ltx='tmux ls'
 alias atx='tmux attach -t'
 alias addkey='gpg --keyserver hkp://keys.fedoraproject.org --recv-key'
 alias poezio='tmux -2 new-session -s poezio -n "poezio-debug by tor" "proxychains4 poezio --debug ~/.local/share/poezio/debug.log"'
+alias tssh='torsocks ssh -F /home/$USER/.ssh/config2'
+alias tscp='torsocks scp -F /home/$USER/.ssh/config2'
+alias trsync='torsocks rsync -e "ssh -F /home/$USER/.ssh/config2"'
+alias mnt='mount | column -t'
+
 
 # Source global definitions
 if [ -f /etc/bashrc ]; then
-        . /etc/bashrc
+    . /etc/bashrc
 fi
 
 # Define personal variables
 if [ -f $HOME/bin/setvars ]; then
-        . $HOME/bin/setvars
+    . $HOME/bin/setvars
+fi
+# Define personal functions
+if [ -f $HOME/bin/setfunctions ]; then
+    . $HOME/bin/setfunctions
 fi
 
 # Print fedora linux logo in interactive shell
 if [ -n "$PS1" ]; then
     if which linux_logo >/dev/null 2>&1; then
-    linux_logo -L fedora -F "Bienvenue sur l'hôte #H\n#V, Compilé #C \n#P #X #T, #R, #U"
+        linux_logo -L fedora -F "Bienvenue sur l'hôte #H\n#V, Compilé #C \n#P #X #T, #R, #U"
     fi
 fi
 
-HISTSIZE=2500
+HISTSIZE=25000
 HISTIGNORE="history:exit:logout:[ ]*"
+HISTTIMEFORMAT="%d/%m/%y %T "
 
 RESET='\[$(tput sgr0)\]'
 BOLD='\[$(tput bold)\]'
@@ -48,8 +61,8 @@ YELLOW='\[$(tput setaf 3)\]'
 CYAN='\[$(tput setaf 6)\]'
 
 if [ $UID -eq 0 ]; then
-        PS1="$BOLD$RED\h$BLUE:$YELLOW\w$RED\\$ $RESET$RED"
+    PS1="$BOLD$RED\h$BLUE:$YELLOW\w$RED\\$ $RESET$RED"
 else
-        PS1="$BOLD$GREEN\u$BLUE@$YELLOW\h$BLUE:\w$GREEN\\$ $RESET$GREEN"
+    PS1="$BOLD$GREEN\u$BLUE@$YELLOW\h$BLUE:\w$GREEN\\$ $RESET$GREEN"
 fi
 PS2='suite-> '