diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 269a220..cd06c14 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,9 +1 @@ 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 diff --git a/zsh/plugins.zsh b/zsh/plugins.zsh index ab4c7db..09158bd 100755 --- a/zsh/plugins.zsh +++ b/zsh/plugins.zsh @@ -1,9 +1,9 @@ #!/usr/bin/env zsh _plugin() { - [ -z "$DOTFILES_LOAD_SILENT" ] && _perf_timer_start "plugin $1" + _perf_timer_start "plugin $1" plugin "$@" - [ -z "$DOTFILES_LOAD_SILENT" ] && _perf_timer_stop "plugin $1" + _perf_timer_stop "plugin $1" } _plugin gitio 'denysdovhan/gitio-zsh' diff --git a/zsh/zshrc b/zsh/zshrc index fb8ebb1..2c3ad04 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,7 +1,5 @@ #!/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 @@ -15,7 +13,3 @@ if [[ -d "$K_ZSH_DOTFILES/custom" ]]; then source "$script" done fi - -if [[ -z "$KDOTFILES_DISABLE_WELCOME" && -z "$POETRY_ACTIVE" ]]; then - welcome -fi