akhayyat/dotfiles

zsh: split programs into path and programs; use lsd if installed

Commit 4b54b799d99b · Ahmad Khayyat · 2019-11-10 21:55 +0300

Changeset

4b54b799d99b4d4ad96196cbc3d08dcc08c19c95

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/zsh/path.zsh b/zsh/path.zsh
new file mode 100644
--- /dev/null
+++ b/zsh/path.zsh
@@ -0,0 +1,24 @@
+#
+# PATH
+#
+
+# Correct commands
+setopt correct
+
+# pip
+export PATH=~/.local/bin:$PATH
+
+# rvm
+if [ -x $HOME/.rvm/scripts/rvm ]; then
+    source $HOME/.rvm/scripts/rvm
+fi
+export PATH=$HOME/.rvm/bin:$PATH
+
+# grails
+if [ -x $HOME/local/software/grails/bin/grails ]; then
+   export GRAILS_HOME=$HOME/local/software/grails
+   export PATH=$PATH:$GRAILS_HOME/bin
+fi
+
+# rust
+export PATH=$HOME/.cargo/bin:$PATH
diff --git a/zsh/programs.zsh b/zsh/programs.zsh
--- a/zsh/programs.zsh
+++ b/zsh/programs.zsh
@@ -2,48 +2,8 @@
 # Program-specific settings
 #
 
-# Correct commands
-setopt correct
-
-# ls
-eval "$(dircolors)"
-alias ls="ls --color=auto --group-directories-first"
-alias l=ls
-alias lh="ls -lh"
-alias ll="ls -l"
-alias la="ls -A"
-
-# grep
-alias grep='grep --color=auto'
-
-# less
-export LESS='-i -M -R -w -z-2'
-
-# Set the less input preprocessor
-# pless (pretty less) is less with syntax hilighting
-# requies the source-highlight package
-if (( $+commands[lesspipe] )); then
-    export LESSOPEN='| /usr/bin/env lesspipe %s 2>&-'
-    alias pless='LESSOPEN="| /usr/share/source-highlight/src-hilite-lesspipe.sh %s" less '
-fi
-
 # virtualenvwrapper
 export VIRTUAL_ENV_DISABLE_PROMPT=1
-fi
-
-# pip
-export PATH=~/.local/bin:$PATH
-
-# rvm
-if [ -x $HOME/.rvm/scripts/rvm ]; then
-    source $HOME/.rvm/scripts/rvm
-fi
-export PATH=$HOME/.rvm/bin:$PATH
-
-# grails
-if [ -x $HOME/local/software/grails/bin/grails ]; then
-   export GRAILS_HOME=$HOME/local/software/grails
-   export PATH=$PATH:$GRAILS_HOME/bin
 if [ -r /usr/share/bash-completion/completions/virtualenvwrapper ]; then
     source /usr/share/bash-completion/completions/virtualenvwrapper
 fi
@@ -77,3 +37,32 @@
 alias -g L="| less -R"
 alias -g C="| wc -l"
 alias -g T="| tail"
+
+# ls
+eval "$(dircolors)"
+# use lsd if installed
+if [ -x "$(which lsd)" ]; then
+    alias ls="lsd --group-dirs first"
+    alias lt="ls --tree"
+else
+    alias ls="ls --color=auto --group-directories-first"
+fi
+alias l=ls
+alias lh="ls -lh"
+alias ll="ls -l"
+alias la="ls -A"
+alias lla="ls -lA"
+
+# grep
+alias grep='grep --color=auto'
+
+# less
+export LESS='-i -M -R -w -z-2'
+
+# Set the less input preprocessor
+# pless (pretty less) is less with syntax hilighting
+# requies the source-highlight package
+if (( $+commands[lesspipe] )); then
+    export LESSOPEN='| /usr/bin/env lesspipe %s 2>&-'
+    alias pless='LESSOPEN="| /usr/share/source-highlight/src-hilite-lesspipe.sh %s" less '
+fi
diff --git a/zsh/zshrc b/zsh/zshrc
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -6,6 +6,7 @@
 source $ZSHROOT/history-substring-search.zsh
 source $ZSHROOT/editor.zsh
 source $ZSHROOT/directory.zsh
+source $ZSHROOT/path.zsh
 source $ZSHROOT/programs.zsh
 source $ZSHROOT/completion.zsh
 source $ZSHROOT/prompt.zsh