From d63039fc5482a32f08fe96156ea6d0e8399e0d16 Mon Sep 17 00:00:00 2001
From: self <george@gabbott.dev>
Date: Wed, 19 Oct 2022 16:09:29 +0100
Subject: Moved atd, cld, and various changes in zshrc-mk

---
 zsh/.zshrc    | 10 ----------
 zsh/.zshrc-mk | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4c3ab20..0c2ed40 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -51,7 +51,6 @@ alias sudo="sudo "
 alias ls='exa -a --color=always'
 alias ll="exa -a --header --long --git --time-style=long-iso --group"
 abbrev-alias x="clear; ls"
-abbrev-alias c="clear"
 abbrev-alias t="ls --tree"
 
 # vim / nvim
@@ -75,15 +74,6 @@ alias rbg='feh --no-fehbg --bg-fill $(shuf -n1 -e ~/bgs/*)'
 abbrev-alias cb="cargo build"
 abbrev-alias cbr="cargo build --release"
 
-# todos... (changed to a~ so it doesn't clash with orgd binaries)
-abbrev-alias atd="mkwr td/todos"
-abbrev-alias atdcmp="mkwr td/todos-cmp"
-abbrev-alias atdntd="mkwr td/todos-ntd"
-
-abbrev-alias cld="mkwr cld/calendar" 
-abbrev-alias cldcmp="mkwr cld/calendar-cmp"
-abbrev-alias cldrec="mkwr cld/calendar-recurring"
-
 # other 
 abbrev-alias r="newsboat"
 
diff --git a/zsh/.zshrc-mk b/zsh/.zshrc-mk
index ce1e387..c2a9ac0 100644
--- a/zsh/.zshrc-mk
+++ b/zsh/.zshrc-mk
@@ -1,8 +1,8 @@
-mkwr() {
+wr() {
 	nvim "$HOME/docs/wr/$1"
 }
 
-mksec() { # Make an encrypted (secure entry).
+mnsec() { # Make an encrypted (secure entry).
 	[ -z "$DEFAULT_GPG" ] && echo "DEFAULT_GPG not set" && return 
 	mkdir -p "/tmp/mksec"
 	nvim "/tmp/mksec/$1"
@@ -29,22 +29,31 @@ mdsec() { # Modify a secure entry, writing it back after.
 
 }
 
-mkrec() {
-	mkwr "rec/$1"
+mnrec() {
+	wr "rec/$1"
 }
 
-mkkic() {
-	mkwr "kic/$1"
+mnkic() {
+	wr "kic/$1"
 }
 
-mkdream() { # Dream Record: D~
+mndream() { # Dream Record: D~
 	if [ -z $1 ] ; then DT="yesterday" else DT="$1" fi 
 	mkdir -p "$HOME/docs/wr/dream"
 	nvim "$HOME/docs/wr/dream/D$(date --iso-8601 -d $DT).txt"
 }
 
+rddream() {
+	if [ -z "$1" ] ; then 
+		nvim "$HOME/docs/wr/dream"
+		return 
+	else
+		nvim "$HOME/docs/wr/dream/D$(date --iso-8601 -d $DT).txt"
+	fi
+}
+
 mn() { # Make note 
-	mkwr "mn/$1"
+	wr "mn/$1"
 }
 
 lle() { # Life Log Entry: L~
@@ -70,3 +79,15 @@ yer() { # Year End Recap: Y~
     mkdir -p "$HOME/docs/wr/lle/$(date +%Y -d $DT)-12"
     nvim "$HOME/docs/wr/lle/$(date +%Y -d $DT)-12/Y$(date +%Y -d $DT).txt"
 }
+
+# old atd and cld, soon to be gotten rid of anyways
+# todos... (changed to a~ so it doesn't clash with orgd binaries)
+abbrev-alias atd="wr td/todos"
+abbrev-alias atdcmp="wr td/todos-cmp"
+abbrev-alias atdntd="wr td/todos-ntd"
+
+abbrev-alias cld="wr cld/calendar" 
+abbrev-alias cldcmp="wr cld/calendar-cmp"
+abbrev-alias cldrec="wr cld/calendar-recurring"
+
+
-- 
cgit v1.2.1