From cb377b5264bf166cbcff42ae8c3b73ad8fc71e4e Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Fri, 12 Jul 2024 12:50:09 +0300
Subject: [PATCH] {bash,zsh}rc: workaround tmux/nvim crash

---
 rc/bashrc | 12 +++++++-----
 rc/zshrc  | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index 558aa531..a67ca91e 100755
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -301,8 +301,8 @@ PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS;
 
 #####	Aliases						RJ706I	#####
 
-# To get sudo work with aliases.
-alias sudo="\sudo "
+# To get sudo work with aliases. And workaround nvim/tmux crash.
+alias sudo="\sudo --preserve-env=tmux"
 
 # Moving between directories:
 alias ..="cd .."
@@ -442,9 +442,11 @@ alias ex-tarbz2="tar xfvj "
 # To have less handle ls colours
 alias less="less -R "
 
-# "su -" with/without sudo
-alias ssu="sudo su -"
-alias suu="su -"
+# "su -" with/without sudo. Conflicts with SailfishOS, to learn to use sui
+# instead.
+alias ssu="sudo -i"
+alias sui="sudo -i"
+#alias suu="su -"
 
 # systemd runlevels/targets
 alias currenttargets="systemctl list-units --type=target"
diff --git a/rc/zshrc b/rc/zshrc
index 36c6791d..f65fded8 100755
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -267,8 +267,8 @@ PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS;
 
 #####	Aliases						RJ706I	#####
 
-# To get sudo work with aliases.
-alias sudo="\sudo "
+# To get sudo work with aliases. And workaround nvim/tmux crash.
+alias sudo="\sudo --preserve-env=tmux"
 
 # Moving between directories:
 alias ..="cd .."
@@ -436,9 +436,11 @@ alias history="history -i "
 # To have less handle ls colours
 alias less="less -R "
 
-# "su -" with/without sudo
-alias ssu="sudo su -"
-alias suu="su -"
+# "su -" with/without sudo. Conflicts with SailfishOS, to learn to use sui
+# instead.
+alias ssu="sudo -i"
+alias sui="sudo -i"
+#alias suu="su -"
 
 # Who command which I use with Conky
 alias cwho="who -H -w -u"