From 91ee9a3087944b4a36bb11cc1072b02140cea238 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Tue, 5 Mar 2024 22:30:48 +0200 Subject: [PATCH] Tweaks --- shell/.aliases | 9 ++++----- shell/.zshrc | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/shell/.aliases b/shell/.aliases index 48c7193..5272511 100644 --- a/shell/.aliases +++ b/shell/.aliases @@ -11,17 +11,16 @@ alias ll='ls -alhFG' alias la='ls -AG' alias l='ls -CFG' -if test $(which zoxide); then - alias cd="z" -fi; +# if test $(which zoxide); then +# alias cd="z" +# fi; # eza aliases, if available if test $(which eza); then eza_params=( '--git' '--icons' '--group' '--group-directories-first' - '--time-style=relative' '--total-size' + '--time-style=relative' ) - alias ls='eza $eza_params -1' alias l='eza --git-ignore $eza_params' alias ll='eza --all --header --long $eza_params' diff --git a/shell/.zshrc b/shell/.zshrc index 220c812..6ed452b 100644 --- a/shell/.zshrc +++ b/shell/.zshrc @@ -2,7 +2,6 @@ ZDOTDIR=~/.zsh source $ZDOTDIR/.zprompt - setopt AUTO_CD setopt NO_CASE_GLOB setopt GLOB_COMPLETE @@ -12,8 +11,6 @@ setopt correct_all setopt completeinword # not just at the end -autoload -Uz compinit && compinit - # -------- # History @@ -43,15 +40,13 @@ setopt no_beep # Don't beep on command input error fpath+=~/Git/dotfiles/functions autoload extract -# Load bashcompinit for some old bash completions -autoload bashcompinit && bashcompinit - -source $ZDOTDIR/.zshrc.local -source ~/.aliases -source ~/.aliases.local - [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +[ -f $ZDOTDIR/.zshrc.local ] && source $ZDOTDIR/.zshrc.local +[ -f ~/.aliases ] && source ~/.aliases +[ -f ~/.aliases.local ] && source ~/.aliases.local + + # -------- # Plugins # -------- @@ -70,3 +65,13 @@ source "$ZDOTDIR/plugins/zsh-ssh/zsh-ssh.zsh" # https://github.com/Tarrasch/zsh-bd source "$ZDOTDIR/plugins/bd/bd.zsh" + + +# -------- +# Comp init +# -------- + +autoload -Uz compinit && compinit -i + +# Load bashcompinit for some old bash completions +autoload bashcompinit && bashcompinit