From 930949b4ac3db550a633e048c45bde2be0c7c55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 11 Jan 2023 05:38:02 +0200
Subject: [PATCH] pass: use standard paths

---
 .envrc     | 4 +---
 tools/pass | 9 ---------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100755 tools/pass

diff --git a/.envrc b/.envrc
index fb376db..46c260f 100644
--- a/.envrc
+++ b/.envrc
@@ -5,6 +5,4 @@ if [ "$(git config diff.gpg.textconv)" != "$_gpgconv" ]; then
     git config diff.gpg.textconv "$_gpgconv"
 fi
 
-export PASSWORD_STORE_DIR=$PWD/secrets
-export REAL_PASS=$(which pass)
-PATH_add tools
+export PASSWORD_STORE_DIR=$PWD
diff --git a/tools/pass b/tools/pass
deleted file mode 100755
index d67b535..0000000
--- a/tools/pass
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This hack allows passwords to be in a sub-directory "secrets", and
-# still visible for git.
-#
-# This is not a good setup, because `pass git status` will show
-# relative paths to `secrets/`. We need a better solution, but I
-# don't know a good one yet.
-grep -v "export GIT_CEILING_DIRECTORIES=" "$REAL_PASS" | bash -s -- "$@"