From 37bcd75df315d925ae3a475dd3480e9b02499da4 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Wed, 31 Mar 2021 17:35:33 +0200
Subject: [PATCH] More modular loading of zsh.

---
 zsh/.zshrc                   | 22 +++++-----------------
 zsh/aliases.zsh              | 25 +++++++++++++++++++++++++
 zsh/{fzf-git.zsh => fzf.zsh} | 13 ++++++++++++-
 3 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 zsh/aliases.zsh
 rename zsh/{fzf-git.zsh => fzf.zsh} (72%)

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a1952e2..45a8260 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -14,23 +14,11 @@ autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump
 zstyle ':completion:*' menu select
 zstyle ':completion:*' list-colors ''
 
-# fzf
-if [ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ]; then
-  source $XDG_CONFIG_HOME/fzf/fzf.zsh
-  export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
-  export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
-  export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
-  export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''"
-  _fzf_compgen_path() {
-    fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd . "$1"
-  }
-  _fzf_compgen_dir() {
-    fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd --type d . "$1"
-  }
-  source $ZDOTDIR/fzf-git.zsh
-fi
+# aliases
+source $ZDOTDIR/aliases.zsh
 
-# plugins
+# plugins & addons
+[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && source $ZDOTDIR/fzf.zsh
 source $ZDOTDIR/modules/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
 wd () {
@@ -44,5 +32,5 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
-# local addons
+# local settings
 [ -e $XDG_CONFIG_HOME/local/zsh ] && source $XDG_CONFIG_HOME/local/zsh
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
new file mode 100644
index 0000000..bc485dc
--- /dev/null
+++ b/zsh/aliases.zsh
@@ -0,0 +1,25 @@
+alias grep='grep --color'
+alias less='less -r'
+if [ $(command -v bat) ]; then
+  alias cat='/usr/local/bin/bat --color=always --tabs=2 --style plain --theme=Monokai\ Extended\ Bright'
+fi
+if [ $(command -v exa) ]; then
+  alias ls='exa --group-directories-first'
+  alias ll='ls -l --git'
+else
+  case $(uname -s) in;
+    Darwin) alias ls='ls -G';;
+    Linux)  alias ls='ls --color';;
+  esac
+  alias ll='ls -l'
+fi
+if [ $(command -v fd) ]; then
+  alias fd='/usr/local/bin/fd -H -L --ignore-file ~/.config/local/fd'
+fi
+if [ $(command -v nvim) ]; then
+  export EDITOR='nvim'
+  alias vim='nvim'
+  alias vimdiff='nvim -d'
+else
+  export EDITOR='vim'
+fi
diff --git a/zsh/fzf-git.zsh b/zsh/fzf.zsh
similarity index 72%
rename from zsh/fzf-git.zsh
rename to zsh/fzf.zsh
index 719bcd0..48a0392 100644
--- a/zsh/fzf-git.zsh
+++ b/zsh/fzf.zsh
@@ -1,5 +1,16 @@
-# heavily inspired (and sometimes stolen from): https://github.com/wfxr/forgit.git
+source $XDG_CONFIG_HOME/fzf/fzf.zsh
+export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
+export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
+export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
+export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''"
+_fzf_compgen_path() {
+  fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd . "$1"
+}
+_fzf_compgen_dir() {
+  fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd --type d . "$1"
+}
 
+# heavily inspired (and sometimes stolen from): https://github.com/wfxr/forgit.git
 _am_i_git_repo() { git rev-parse --is-inside-work-tree >/dev/null; }
 
 gl() {