From 1378e5c75239855fc3e786b5856f5c0c828f8841 Mon Sep 17 00:00:00 2001
From: Alex Karle <alex@alexkarle.com>
Date: Wed, 24 Feb 2021 19:21:53 -0500
Subject: [PATCH] passwords: Replace pash with pass

Patch replaces pash [1] with pass [2] for a couple of reasons:

  1) Builtin git support is nice
  2) iOS clients exist
  3) Bigger community => safety in numbers?
  4) It's packaged on all of the systems I use -> easy to install

(1) means we can get rid of psync, which was starting to show issues
as soon as I had category/password{1,2,3,.bak} all stored :) git is
much more elegant as a synchronization method, and while I *could*
roll my own git synchronization, it doesn't hurt to use the one the
community is already behind.
---
 .config/mutt/accounts/karleco.muttrc |  2 +-
 .gitmodules                          |  3 ---
 bin/psync                            | 30 ------------------------------
 etc/deps/pash                        |  1 -
 etc/mbsyncrc                         |  2 +-
 5 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100755 bin/psync
 delete mode 160000 etc/deps/pash

diff --git a/.config/mutt/accounts/karleco.muttrc b/.config/mutt/accounts/karleco.muttrc
index eb9f27f..b30b82c 100644
--- a/.config/mutt/accounts/karleco.muttrc
+++ b/.config/mutt/accounts/karleco.muttrc
@@ -12,5 +12,5 @@ set record="=Sent"
 set postponed="=Drafts"
 
 # Uncomment if sendmail not configured on machine
-# set smtp_pass=`pash show mail/karleco`
+# set smtp_pass=`pass show mail/karleco`
 # set smtp_url="smtps://$from:$smtp_pass@smtp.fastmail.com:465"
diff --git a/.gitmodules b/.gitmodules
index 375fe39..706910a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,6 +19,3 @@
 [submodule ".vim/pack/plugins/start/vim-gitgutter"]
 	path = .vim/pack/plugins/start/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter
-[submodule "deps/pash"]
-	path = etc/deps/pash
-	url = https://github.com/dylanaraps/pash
diff --git a/bin/psync b/bin/psync
deleted file mode 100755
index b0b805b..0000000
--- a/bin/psync
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Synchronize pash passwords with a central host
-PHOST=${PSYNC_HOST:="raspberrypi"}
-PUSER=${PSYNC_USER:="pi"}
-
-die() {
-    echo "$1" 1>&2
-    exit 1
-}
-
-push() {
-    rsync -av $HOME/.local/share/pash/ $PUSER@$PHOST:.local/share/pash/ 
-}
-
-pull() {
-    rsync -av $PUSER@$PHOST:.local/share/pash/ $HOME/.local/share/pash/
-}
-
-sync() {
-    # Assume current passwords are latest (push then pull)
-    push
-    pull
-}
-
-case "$1" in
-    push) push ;;
-    pull) pull ;;
-    sync) sync ;;
-    *) die "usage: psync push|pull|sync"
-esac
diff --git a/etc/deps/pash b/etc/deps/pash
deleted file mode 160000
index 2fb2092..0000000
--- a/etc/deps/pash
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2fb2092447b1577b47fbf9bc682e7fcb7e98efce
diff --git a/etc/mbsyncrc b/etc/mbsyncrc
index 0fd6a68..84b6ac4 100644
--- a/etc/mbsyncrc
+++ b/etc/mbsyncrc
@@ -3,7 +3,7 @@ IMAPAccount karleco
 User alex@karle.co
 Host imap.fastmail.com
 SSLType IMAPS
-PassCmd "+pash show mail/karleco"
+PassCmd "+pass show mail/karleco"
 
 IMAPStore karleco-fastmail
 Account karleco
--
libgit2 0.28.4