From c84b4dc17917028a2119705bcc133d8a833ae0c1 Mon Sep 17 00:00:00 2001
From: "Matthieu Fortin [CPC/CCP]" <matthieu@royfortin.ca>
Date: Tue, 12 Nov 2024 08:40:04 -0500
Subject: [PATCH] merge

---
 bash/.bashrc                   | 27 ++++++++++++++++++++++-----
 scripts/.local/bin/mountbackup |  2 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index f904f17..4e3e80a 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -28,12 +28,15 @@ if [[ $iatest -gt 0 ]]; then bind "set show-all-if-ambiguous on"; fi
 # Default editor
 export EDITOR=nvim
 export VISUAL=nvim
+alias edit='nvim'
 alias pico='edit'
 alias spico='sedit'
 alias nano='edit'
 alias snano='sedit'
 alias vim='nvim'
 alias cat='bat'
+alias browser='librewolf'
+
 
 # To have colors for ls and all grep commands such as grep, egrep and zgrep
 export CLICOLOR=1
@@ -74,14 +77,12 @@ alias da='date "+%Y-%m-%d %A %T %Z"'
 alias cp='cp -i'
 alias mv='mv -i'
 alias rm='trash -v'
-alias mkdir='mkdir -p'
+alias mkdir='mkdir -pv'
 alias ps='ps auxf'
 alias ping='ping -c 10'
 alias less='less -R'
 alias cls='clear'
-alias apt-get='sudo apt-get'
 alias multitail='multitail --no-repeat -c'
-alias freshclam='sudo freshclam'
 alias vi='nvim'
 alias svi='sudo vi'
 alias vis='nvim "+set si"'
@@ -98,7 +99,8 @@ alias .....='cd ../../../..'
 alias bd='cd "$OLDPWD"'
 
 # Remove a directory and all files
-alias rmd='/bin/rm  --recursive --force --verbose '
+#alias rmd='/bin/rm  --recursive --force --verbose '
+alias rmd='trash  --recursive --force --verbose '
 
 # Alias's for multiple directory listing commands
 alias la='ls -Alh'                # show hidden files
@@ -142,6 +144,7 @@ alias checkcommand="type -t"
 
 # Show open ports
 alias openports='netstat -nape --inet'
+alias ports='netstat -tulanp'
 
 # Alias's for safe and forced reboots
 alias rebootsafe='sudo shutdown -r now'
@@ -163,6 +166,8 @@ alias untar='tar -xvf'
 alias unbz2='tar -xvjf'
 alias ungz='tar -xvzf'
 
+alias wget='wget -c'
+
 # Show all logs in /var/log
 alias logs="sudo find /var/log -type f -exec file {} \; | grep 'text' | cut -d' ' -f1 | sed -e's/:$//g' | grep -v '[0-9]$' | xargs tail -f"
 
@@ -269,6 +274,9 @@ mkdirg() {
 	cd "$1"
 }
 
+mkdircd() { mkdir -p -- "$@" && cd -- "$@"; }
+alias mcd='mkdircd'
+
 # Goes up a specified number of directories  (i.e. up 4)
 up() {
 	local d=""
@@ -280,7 +288,7 @@ up() {
 	if [ -z "$d" ]; then
 		d=..
 	fi
-	cd $d
+	cd "$d"
 }
 
 # Automatically do an ls after each cd, z, or zoxide
@@ -400,6 +408,15 @@ trim() {
 	echo -n "$var"
 }
 
+if [ $UID -ne 0 ]; then
+  alias reboot='sudo reboot'
+  alias freshclam='sudo freshclam'
+  alias apt-get='sudo apt-get'
+  alias apt='sudo apt'
+  alias pacman='sudo pacman'
+fi
+
+
 # OS Specific aliases
 if [[ "$(distribution)" = "arch" ]]; then
 	alias \
diff --git a/scripts/.local/bin/mountbackup b/scripts/.local/bin/mountbackup
index d4a7740..74eda0b 100755
--- a/scripts/.local/bin/mountbackup
+++ b/scripts/.local/bin/mountbackup
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sshfs matthieu.fortin@172.31.180.4:/home/matthieu.fortin/backups /home/matt/backups_remote
+sshfs matthieu.fortin@172.31.180.4:/home/matthieu.fortin "$HOME/backups_remote"