From 8841d92e870da05e3644263df052cf2c094da3f1 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Fri, 31 Dec 2021 10:14:41 -0500
Subject: [PATCH] Working on cleaning up zshrc and aliases

---
 scripts/.local/scripts/allfigl |  8 ++++++--
 scripts/.local/scripts/banner  |  8 ++++++++
 scripts/.local/scripts/dots    |  7 +++++++
 scripts/.local/scripts/l       |  5 +++++
 zsh/.config/zsh/.zshrc         | 19 +++++++++++++------
 zsh/.config/zsh/banner         | 10 ----------
 zsh/.config/zsh/zsh-aliases    |  6 +++---
 7 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100755 scripts/.local/scripts/banner
 create mode 100755 scripts/.local/scripts/dots
 create mode 100755 scripts/.local/scripts/l
 delete mode 100644 zsh/.config/zsh/banner

diff --git a/scripts/.local/scripts/allfigl b/scripts/.local/scripts/allfigl
index 6523f9f..8520565 100755
--- a/scripts/.local/scripts/allfigl
+++ b/scripts/.local/scripts/allfigl
@@ -1,8 +1,12 @@
 #!/bin/sh
 
-for font in /opt/homebrew/share/figlet/fonts/*.flf; do
+set -e
+
+font_dir="$(brew --prefix)/share/figlet/fonts"
+
+for font in "${font_dir}"/*.flf; do
   clear
   echo "FONT: $font"
   figlet -f "${font}" hello
-  read line
+  read -r line
 done
diff --git a/scripts/.local/scripts/banner b/scripts/.local/scripts/banner
new file mode 100755
index 0000000..a6f5341
--- /dev/null
+++ b/scripts/.local/scripts/banner
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+message="${1:-m-housh}"
+font="${2:-puffy}"
+
+echo "${message}" | figlet -c -f "${font}"
diff --git a/scripts/.local/scripts/dots b/scripts/.local/scripts/dots
new file mode 100755
index 0000000..fb8767e
--- /dev/null
+++ b/scripts/.local/scripts/dots
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+# Open dotfiles.
+
+cd "$DOTFILES" && vim .
diff --git a/scripts/.local/scripts/l b/scripts/.local/scripts/l
new file mode 100755
index 0000000..b1eef16
--- /dev/null
+++ b/scripts/.local/scripts/l
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Lists files and directories, including hidden files.
+
+ls -lah --color "$@"
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index a21386b..3d90cda 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -1,7 +1,18 @@
 #!/usr/bin/env zsh
 
+#              _
+#      _______| |__  _ __ ___
+#     |_  / __| '_ \| '__/ __|
+#     / /\__ \ | | | | | (__
+#    /___|___/_| |_|_|  \___|
+#
+#
 #------------------------------ utilites ------------------------------
-_source_if() { [[ -r "$1" ]] && source "$1" }
+
+_source_if() { test -r "$1" && source "$1" || return 0 }
+
+# Load Useful Functions
+_source_if "$ZDOTDIR/zsh-functions"
 
 #------------------------------ exports ------------------------------
 export ZDOTDIR="$HOME/.config/zsh"
@@ -34,9 +45,6 @@ zle -N down-line-or-beginning-search
 # Colors
 autoload -Uz colors && colors
 
-# Load Useful Functions
-_source_if "$ZDOTDIR/zsh-functions"
-
 #------------------------------ path ------------------------------
 
 path_append() {
@@ -120,7 +128,7 @@ setopt aliases
 bindkey -v
 
 #zsh_add_file "zsh-exports"
-zsh_add_file "zsh-aliases"
+#zsh_add_file "zsh-aliases"
 
 # Plugins
 zsh_add_plugin "zsh-users/zsh-autosuggestions"
@@ -147,4 +155,3 @@ prompt pure
 #------------------------------ local configs ------------------------------
 _source_if "$ZDOTDIR/.zshrc-local"
 
-cat < "$ZDOTDIR/banner"
diff --git a/zsh/.config/zsh/banner b/zsh/.config/zsh/banner
deleted file mode 100644
index f4a0da5..0000000
--- a/zsh/.config/zsh/banner
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-                   _                         _
- _ __ ___         | |__    ___   _   _  ___ | |__
-| '_ ` _ \  _____ | '_ \  / _ \ | | | |/ __|| '_ \
-| | | | | ||_____|| | | || (_) || |_| |\__ \| | | |
-|_| |_| |_|       |_| |_| \___/  \__,_||___/|_| |_|
-
-
-
diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases
index ac42525..91d1ada 100644
--- a/zsh/.config/zsh/zsh-aliases
+++ b/zsh/.config/zsh/zsh-aliases
@@ -18,7 +18,7 @@ alias cl() {
 }
 
 # move into the ~/.dotfiles directory
-alias cdots="cd ${HOME}/.dotfiles"
+alias cdots() { cd "${HOME}/.dotfiles" }
 
 # move into zsh config files
 alias zdots="vi ${ZDOTDIR}"
@@ -33,7 +33,7 @@ alias dots="vi $DOTFILES"
 #alias mkcd() { mkdir $1 && cd $1 }
 
 # list files and directories, including hidden files
-alias l() { ls -lah "$@" }
+#alias l() { ls -lah --color "$@" }
 
 # editor
 alias vim() { nvim "$@" }
@@ -50,7 +50,7 @@ alias gp() { git push }
 alias gs() { git status }
 
 # move back to old cwd
-alias bk() { cd "$OLDPWD" }
+alias bk="cd $OLDPWD"
 
 # My mac-mini specific aliases
 # if [ $(hostname -s) = "Michaels-Mac-mini" ]; then