Merge branch 'master' into update-for-external

home/dot_local/bin/server/aliases.sh

@@ -1,4 +1,16 @@
 #!/usr/bin/env bash
 
+#
+# Use nvidia-smi alternative command
+#
 alias ns="watch -n 4 -cd nvinfo"
-alias ls="eza --long --group --header --binary --time-style=long-iso --icons"
+
+#
+# Use eza or exa for ls command
+#
+if command -v "eza" >/dev/null 2>&1; then
+    my_ls="eza"
+else
+    my_ls="exa"
+fi
+alias ls="${my_ls} --long --group --header --binary --time-style=long-iso --icons"

install/ubuntu/common/eza.sh

@@ -6,11 +6,24 @@ if [ "${DOTFILES_DEBUG:-}" ]; then
     set -x
 fi
 
+function apt_install_eza() {
+    sudo apt install -y eza
+}
+
+function apt_install_exa() {
+    sudo apt install -y exa
+}
+
 function install_eza() {
-    wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo tee /etc/apt/trusted.gpg.d/gierens.asc
-    echo "deb http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
-    sudo apt-get update
-    sudo apt-get install -y eza
+    sudo mkdir -p /etc/apt/keyrings
+    wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | sudo gpg --yes --dearmor -o /etc/apt/keyrings/gierens.gpg
+    echo "deb [signed-by=/etc/apt/keyrings/gierens.gpg] http://deb.gierens.de stable main" | sudo tee /etc/apt/sources.list.d/gierens.list
+    sudo chmod 644 /etc/apt/keyrings/gierens.gpg /etc/apt/sources.list.d/gierens.list
+    sudo apt update
+
+    if ! apt_install_eza; then
+        apt_install_exa
+    fi
 }
 
 function uninstall_eza() {