From c338e3079082aa980aac10237319099cc505fee0 Mon Sep 17 00:00:00 2001
From: Vladimir Hodakov <vladimir@hodakov.me>
Date: Thu, 18 Jun 2026 22:14:21 +0300
Subject: [PATCH 1/3] Get rid of lsb-release dependency

---
 zsh/03-vars.zsh                        | 6 +++---
 zsh/plugins/autosuggestions.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zsh/03-vars.zsh b/zsh/03-vars.zsh
index 7c0e48c..a8a6640 100644
--- a/zsh/03-vars.zsh
+++ b/zsh/03-vars.zsh
@@ -6,9 +6,9 @@ OS_RELEASE=`uname -r`
 OS_ARCH=`uname -m`
 
 # Distro detection.
-LSBRELEASE=$(which lsb_release)
-if [ $? -eq 0 ]; then
-  DISTRO=`lsb_release -i -s`
+if [[ -f /etc/os-release ]]; then
+  . /etc/os-release
+  DISTRO=${ID}
 else
   # BSDs OS and macOS can be detected via uname.
   DISTRO=${OS}
diff --git a/zsh/plugins/autosuggestions.plugin.zsh b/zsh/plugins/autosuggestions.plugin.zsh
index 026d95c..37fcad7 100644
--- a/zsh/plugins/autosuggestions.plugin.zsh
+++ b/zsh/plugins/autosuggestions.plugin.zsh
@@ -1,10 +1,10 @@
 AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
 
-if [ "${DISTRO}" = "Arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
-if [ "${DISTRO}" = "EnveavourOS" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
+if [ "${DISTRO}" = "arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
+if [ "${DISTRO}" = "endeavouros" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
 if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "arm64" ]]; then AUTOSUGGESTIONS_PATH="/opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
 if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "x86_64" ]]; then AUTOSUGGESTIONS_PATH="/usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
-if [ "${DISTRO}" = "VoidLinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi
+if [ "${DISTRO}" = "voidlinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi
 
 if [ -f "${AUTOSUGGESTIONS_PATH}" ]; then
   source "${AUTOSUGGESTIONS_PATH}"
-- 
2.54.0


From a1cde15a2d654500510ffd9060dcbafa4160bdfe Mon Sep 17 00:00:00 2001
From: Vladimir Viatskii <vladimir@vtsk.online>
Date: Sun, 8 Nov 2026 23:26:15 +0300
Subject: [PATCH 2/3] Fix aliases for Bazzite CLI

---
 zsh/aliases/00-default.conf  | 9 +++++++--
 zsh/apps/bazzite-cli.app.zsh | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/zsh/aliases/00-default.conf b/zsh/aliases/00-default.conf
index e189c97..c5025ba 100644
--- a/zsh/aliases/00-default.conf
+++ b/zsh/aliases/00-default.conf
@@ -2,8 +2,13 @@
 # index.
 
 # Files navigation.
-alias ls="ls --color"
-alias sl="ls --color"
+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"
diff --git a/zsh/apps/bazzite-cli.app.zsh b/zsh/apps/bazzite-cli.app.zsh
index 52b5cf6..cbf3a5a 100644
--- a/zsh/apps/bazzite-cli.app.zsh
+++ b/zsh/apps/bazzite-cli.app.zsh
@@ -1,7 +1,5 @@
 function bazzite-cli() {
-    # Those two are conflicting with Bazzite CLI aliases.
-    unalias ls
-    unalias sl
+    BAZZITE_CLI=1
 
     source /usr/share/bazzite-cli/bling.sh
 }
-- 
2.54.0


From faa279d80ddc01ad49d6a0ecf3632b7af9fb47b3 Mon Sep 17 00:00:00 2001
From: Vladimir Viatskii <vladimir@vtsk.online>
Date: Sun, 8 Nov 2026 23:27:45 +0300
Subject: [PATCH 3/3] Small fix

---
 zsh/aliases/00-default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh/aliases/00-default.conf b/zsh/aliases/00-default.conf
index c5025ba..2513b83 100644
--- a/zsh/aliases/00-default.conf
+++ b/zsh/aliases/00-default.conf
@@ -2,7 +2,7 @@
 # index.
 
 # Files navigation.
-if [[ -z "$BAZZITE_CLI" ]]; then
+if [[ -z "${BAZZITE_CLI}" ]]; then
     alias ls="ls --color"
     alias sl="ls --color"
 else
-- 
2.54.0