From 6b6e91707ecf621a0bedad154351db8f1ccc2123 Mon Sep 17 00:00:00 2001
From: Jacob McDonnell <jacob@simplelittledream.com>
Date: Wed, 26 Oct 2022 11:10:13 -0400
Subject: Working on merging to one branch

---
 .config/shells/aliasrc    | 33 ++++++++++++++++++---------------
 .config/shells/funcrc     |  2 ++
 .config/shells/zsh/.zshrc |  1 +
 3 files changed, 21 insertions(+), 15 deletions(-)

(limited to '.config/shells')

diff --git a/.config/shells/aliasrc b/.config/shells/aliasrc
index a477175..6fd6fb7 100755
--- a/.config/shells/aliasrc
+++ b/.config/shells/aliasrc
@@ -1,8 +1,20 @@
 #!/bin/sh
+
+# OpenBSD does not have the -G flag
+if [[ "$(uname -s)" == "OpenBSD" ]]
+then
+	alias \
+		la="ls -Ah" \
+		ls="ls -h" \
+		l="ls -lAh"
+else
+	alias \
+		la="ls -AhG" \
+		ls="ls -Gh" \
+		l="ls -lAhG"
+fi
+
 alias \
- 	la="ls -AhG" \
-	ls="ls -Gh" \
-	l="ls -lAhG" \
 	cp="cp -v" \
 	rm="rm -v" \
 	mv="mv -v" \
@@ -13,19 +25,10 @@ alias \
 	.4="cd ../../../../" \
 	.5="cd ../../../../.." \
 	zshup="source $HOME/.config/shells/zsh/.zshrc" \
-	b="cd ~/.local/bin" \
-	d="cd ~/Documents" \
-	bk="cd ~/Documents/Books" \
-	dw="cd ~/Downloads" \
-	g="cd ~/Documents/Projects/git" \
-	c="cd ~/.config" \
-	bc="bc -ls" \
-	serv="ssh -Y jmm@jacobmcdonnell.com" \
-	sfiles="sftp files@jacobmcdonnell.com" \
 	gc="git clone" \
+	gu="git add -u" \
 	m="micro" \
-	e="	cd ~/Documents/Projects/Experiments" \
 	v="nvim" \
 	python="python3.10" \
-	pip="pip3.10" \
-	cmpsc="cd /Users/jmm/OneDrive\ -\ The\ Pennsylvania\ State\ University/2022/Semester\ 1/CMPSC\ 131/Worksheets/"
+	pip="pip3.10"
+
diff --git a/.config/shells/funcrc b/.config/shells/funcrc
index 25ffd52..b001f3f 100755
--- a/.config/shells/funcrc
+++ b/.config/shells/funcrc
@@ -1,3 +1,5 @@
 #!/bin/sh
 
 cdl () { cd "${@}" && ls ;}
+mkc () { mkdir "${@}" && cd "${@}" ;}
+
diff --git a/.config/shells/zsh/.zshrc b/.config/shells/zsh/.zshrc
index 8bb2458..9f934a9 100644
--- a/.config/shells/zsh/.zshrc
+++ b/.config/shells/zsh/.zshrc
@@ -5,6 +5,7 @@ autoload -U +X compinit
 compinit -d $XDG_CACHE_HOME/zcompdump-artix-5.8
 fpath=($ZSH/plugins/zsh-completions/src $fpath)
 source $SHELLDIR/aliasrc
+source $SHELLDIR/dirrc
 source $SHELLDIR/colorsrc # contians color substituions
 source $SHELLDIR/cpwdrc # contains _collapsed_pwd
 bindkey -v
-- 
cgit v1.2.3