merge upstream

zsh/aliases/00-default.conf

@@ -2,13 +2,8 @@
 # index.
 
 # Files navigation.
-if [[ -z "${BAZZITE_CLI}" ]]; then
 alias ls="ls --color"
 alias sl="ls --color"
-else
-    alias ls="eza"
-    alias sl="eza"
-fi
 
 # Git.
 alias got="git"

zsh/apps/bazzite-cli.app.zsh

@@ -1,5 +1,7 @@
 function bazzite-cli() {
-    BAZZITE_CLI=1
+    # Those two are conflicting with Bazzite CLI aliases.
+    unalias ls
+    unalias sl
 
     source /usr/share/bazzite-cli/bling.sh
 }