From bc47a2b82c5a35022a55774bb59616d4db1d21ba Mon Sep 17 00:00:00 2001
From: z3rOR0ne <z3rOR0ne@protonmail.com>
Date: Sun, 18 Dec 2022 03:20:01 -0800
Subject: [PATCH] :sparkles: Vim now returns to saved line, savable in vim

---
 .config/espanso/match/base.yml |  7 +++++--
 espanso/base.yml               |  7 +++++--
 scripts/sdir                   | 14 +++++++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.config/espanso/match/base.yml b/.config/espanso/match/base.yml
index 2b9dde8f..ef98431e 100644
--- a/.config/espanso/match/base.yml
+++ b/.config/espanso/match/base.yml
@@ -78,10 +78,13 @@ matches:
     replace: "########################\n\n#######################"
 
   - trigger: ":rdr"
-    replace: "source $HOME/.sdrc && cd $sdir && nvim $sdoc"
+    replace: "source $HOME/.sdrc && cd $sdir && nvim +$sdline $sdoc"
 
   - trigger: ":rdd"
-    replace: "source $HOME/.sdrc && cd $sdir"
+    replace: "source $HOME/.sdrc && cd $sdir && ls"
+
+  - trigger: ":rds"
+    replace: ":! echo 'export sdline=' >> $HOME/.sdrc"
 
   - trigger: ":for"
     replace: "for (;;) {}"
diff --git a/espanso/base.yml b/espanso/base.yml
index 2b9dde8f..ef98431e 100644
--- a/espanso/base.yml
+++ b/espanso/base.yml
@@ -78,10 +78,13 @@ matches:
     replace: "########################\n\n#######################"
 
   - trigger: ":rdr"
-    replace: "source $HOME/.sdrc && cd $sdir && nvim $sdoc"
+    replace: "source $HOME/.sdrc && cd $sdir && nvim +$sdline $sdoc"
 
   - trigger: ":rdd"
-    replace: "source $HOME/.sdrc && cd $sdir"
+    replace: "source $HOME/.sdrc && cd $sdir && ls"
+
+  - trigger: ":rds"
+    replace: ":! echo 'export sdline=' >> $HOME/.sdrc"
 
   - trigger: ":for"
     replace: "for (;;) {}"
diff --git a/scripts/sdir b/scripts/sdir
index e23c2211..423974e6 100755
--- a/scripts/sdir
+++ b/scripts/sdir
@@ -1,4 +1,5 @@
 #!/bin/bash
+# used with espanso :rdr and :rdd command
 # A simple bookmarking script used in conjunction with rdir
 # to save a directory for easy navigation later
 
@@ -13,11 +14,18 @@ if [[ ! -f "$sdir" ]] ; then
     /usr/bin/touch "$sdir"
 fi
 
-if [[ $# -gt 0 ]] ; then
+if [[ $# -eq 1 ]] ; then
     sdoc="$1"
+    sdline="0"
+else
+    sdoc=""
+fi
+
+if [[ $# -eq 2 ]] ; then
+    sdoc="$1"
+    sdline="$2"
 fi
 
 echo 'export sdir='"$sdir" > "$sdrc"
 echo 'export sdoc='"$sdoc" >> "$sdrc"
-# immediately source ~/.sdrc
-source "$sdrc"
+echo 'export sdline='"$sdline" >> "$sdrc"