diff --git a/.config/espanso/match/base.yml b/.config/espanso/match/base.yml
index abd73fd6..72ec69ce 100644
--- a/.config/espanso/match/base.yml
+++ b/.config/espanso/match/base.yml
@@ -83,9 +83,6 @@ matches:
   - trigger: ":rdd"
     replace: "source $HOME/.sdrc && cd $sdir && ls"
 
-  - trigger: ":sdir"
-    replace: ":! $HOME/scripts/sdir $sdoc "
-
   - trigger: ":for"
     replace: "for (;;) {}"
 
diff --git a/.config/nvim/after/plugin/lastplace.lua b/.config/nvim/after/plugin/lastplace.lua
new file mode 100644
index 00000000..61d5171a
--- /dev/null
+++ b/.config/nvim/after/plugin/lastplace.lua
@@ -0,0 +1 @@
+require'nvim-lastplace'.setup{}
diff --git a/.config/nvim/lua/neovim/packer.lua b/.config/nvim/lua/neovim/packer.lua
index d388058b..91225a8d 100644
--- a/.config/nvim/lua/neovim/packer.lua
+++ b/.config/nvim/lua/neovim/packer.lua
@@ -31,6 +31,7 @@ use {'simeji/winresizer'}
 use {'sbdchd/neoformat'}
 use {'rhysd/vim-clang-format'}
 use {'sangdol/mintabline.vim'}
+use {'ethanholz/nvim-lastplace'}
 use({
    "iamcco/markdown-preview.nvim",
     run = function() vim.fn["mkdp#util#install"]() end,
diff --git a/espanso/base.yml b/espanso/base.yml
index abd73fd6..72ec69ce 100644
--- a/espanso/base.yml
+++ b/espanso/base.yml
@@ -83,9 +83,6 @@ matches:
   - trigger: ":rdd"
     replace: "source $HOME/.sdrc && cd $sdir && ls"
 
-  - trigger: ":sdir"
-    replace: ":! $HOME/scripts/sdir $sdoc "
-
   - trigger: ":for"
     replace: "for (;;) {}"
 
diff --git a/scripts/sdir b/scripts/sdir
index 1ae4721b..0b8c005b 100755
--- a/scripts/sdir
+++ b/scripts/sdir
@@ -6,7 +6,6 @@
 # save our current working directory
 sdir=$(pwd)
 sdoc="${1:-''}"
-sdline="${2:-0}"
 # allow overwriting of sdrc
 set +o noclobber
 
@@ -25,4 +24,3 @@ fi
 
 echo 'export sdir='"$sdir" > "$sdrc"
 echo 'export sdoc='"$sdoc" >> "$sdrc"
-echo 'export sdline='"$sdline" >> "$sdrc"