Better handle encrypted files

4 files changed, 13 insertions, 2 deletions

diff --git a/dm b/dm
index db05ab2..c548bcc 100755
--- a/dm
+++ b/dm
@@ -20,6 +20,12 @@ LOCAL_FILES = \
     .zshrc \
     bin/run-mailcheck
 
+# GPG encrypted files
+GPG_FILES = \
+    .mutt/alias.rc \
+    .ssh/id_ecdsa \
+    .ssh/id_rsa
+
 # Files that are system independent.
 # IMPORTANT: directories must have trailing slash
 GLOBAL_FILES = \
@@ -96,8 +102,11 @@ build/.xmonad/xmonad.hs: FORCE
 build/.zsh/func/prompt_wunjo_setup: FORCE
 FORCE:
 
-.mutt/alias.rc: .mutt/alias.rc.gpg
-	gpg --decrypt $^ > $@
+.mutt/alias.rc: gpg/.mutt/alias.rc.gpg
+.ssh/id_%: gpg/.ssh/id_%.gpg
+# $(patsubst gpg/,,$(wildcard gpg/.* gpg/*))
+$(GPG_FILES):
+	gpg --decrypt gpg/$@.gpg > $@
 
 build/%: % $(SUBSTS_FILE)
 	[ -d $(dir $@) ] || mkdir -p $(dir $@)
@@ -181,4 +190,6 @@ verify:
 clean:
 	rm -fr build
 
+clobber: clean
+	rm -f $(GPG_FILES)
 .PHONY: build install clean verify merge
diff --git a/.mutt/alias.rc.gpg b/gpg/.mutt/alias.rc.gpg
index 74b849b..74b849b 100644
--- a/.mutt/alias.rc.gpg
+++ b/gpg/.mutt/alias.rc.gpg
diff --git a/gpg/.ssh/id_ecdsa.gpg b/gpg/.ssh/id_ecdsa.gpg
new file mode 100644
index 0000000..d35d079
--- /dev/null
+++ b/gpg/.ssh/id_ecdsa.gpg
diff --git a/gpg/.ssh/id_rsa.gpg b/gpg/.ssh/id_rsa.gpg
new file mode 100644
index 0000000..91047ab
--- /dev/null
+++ b/gpg/.ssh/id_rsa.gpg