From c4e5eba65af4a6b98ba8766a5fbf7cc4f4041e4d Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Wed, 8 Feb 2023 12:32:43 +0100
Subject: [PATCH 1/2] [zsh] Fix plugin timer positioning

---
 zsh/plugins.zsh | 4 ++--
 zsh/zshrc       | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zsh/plugins.zsh b/zsh/plugins.zsh
index 09158bd..ab4c7db 100755
--- a/zsh/plugins.zsh
+++ b/zsh/plugins.zsh
@@ -1,9 +1,9 @@
 #!/usr/bin/env zsh
 
 _plugin() {
-  _perf_timer_start "plugin $1"
+  [ -z "$DOTFILES_LOAD_SILENT" ] && _perf_timer_start "plugin $1"
   plugin "$@"
-  _perf_timer_stop "plugin $1"
+  [ -z "$DOTFILES_LOAD_SILENT" ] && _perf_timer_stop  "plugin $1"
 }
 
 _plugin gitio 'denysdovhan/gitio-zsh'
diff --git a/zsh/zshrc b/zsh/zshrc
index 2c3ad04..fb8ebb1 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
+DOTFILES_DISABLE_WELCOME=1
+
 # Get this file's current directory and source Dima's zshrc from there
 K_ZSH_DOTFILES="$( dirname "$( readlink -f "$0" )" )"
 source $K_ZSH_DOTFILES/../dmitmel-dotfiles/zsh/zshrc
@@ -13,3 +15,7 @@ if [[ -d "$K_ZSH_DOTFILES/custom" ]]; then
     source "$script"
   done
 fi
+
+if [[ -z "$KDOTFILES_DISABLE_WELCOME" && -z "$POETRY_ACTIVE" ]]; then
+  welcome
+fi

From 9d05d657599618e532bbd3af6b87e92fdff47a85 Mon Sep 17 00:00:00 2001
From: Alyxia Sother <alyxia@riseup.net>
Date: Wed, 8 Feb 2023 12:33:11 +0100
Subject: [PATCH 2/2] [zsh] Fix ls on macOS

---
 zsh/aliases.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index cd06c14..269a220 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1 +1,9 @@
 alias welcome="welcome --extra-logos-dir $K_ZSH_DOTFILES/../script-resources/welcome/logos"
+
+if (( _is_macos )); then
+  if command_exists exa; then
+    alias ls="exa --classify --group-directories-first"
+  else
+    alias ls="ls --group-directories-first --color=auto"
+  fi
+fi