citadel

commit 61e76dd99e0a817fdf3562cd4ce55a2b2d4cf7dc
parent 02f41fb1ff35fb7295b23625566c086b7114abe1
Author: William Casarin <jb55@jb55.com>
Date:   Sun,  2 Jul 2023 12:55:42 -0700

misc updates

Diffstat:
M
dotfiles/.gitconfig
 | 
4
++++
M
dotfiles/.notmuch-config
 | 
2
+-
M
dotfiles/commands
 | 
8
++++++++

3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
@@ -40,6 +40,7 @@
   f = fetch -p
   br = symbolic-ref --short HEAD
   ca = commit --amend
+  cp = cherry-pick
   mlap = push monad HEAD:laptop
   c = commit
   cloner = clone --recursive
@@ -71,6 +72,7 @@
   stat2 = log --stat --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%cr %C(auto,green)%aN %C(auto,red)%D %n%n   %C(auto,reset)%s%n'
   st = status
   tagd = !"git tag --format='%(creatordate:short)%09%(refname:strip=2)' | sort"
+  authors = !"git log --format='%aN <%aE>' | sort -u"
   tg = log --date-order --tags --simplify-by-decoration --pretty=format:'%ai %h %d'
   try = merge --no-commit --no-ff
   co = checkout
@@ -91,6 +93,8 @@
 	program = /home/jb55/bin/ots-git
 [magit]
 	hideCampaign = true
+[nostr]
+	relays = wss://relay.damus.io wss://nos.lol wss://nostr.wine
 [github]
 	user = jb55
 [grep]
diff --git a/dotfiles/.notmuch-config b/dotfiles/.notmuch-config
@@ -33,7 +33,7 @@ path=/Users/jb55/mail/personal
 [user]
 name=William Casarin
 primary_email=jb55@jb55.com
-other_email=jackbox55@gmail.com;will.casarin@commit.dev;will.casarin@steamoji.com
+other_email=jackbox55@gmail.com;will@damus.io
 
 # Configuration for "notmuch new"
 #
diff --git a/dotfiles/commands b/dotfiles/commands
@@ -44,9 +44,17 @@ gpm	git mlap	echo git mlap
 h	run history	fuzz-run-hist
 jt	jump tag	fuzz-jump-tag
 nai	notmuch archive inbox	fuzz-notmuch-archive-inbox
+nep	notmuch edit poll	echo vim scp://charon//home/jb55/bin/notmuch-poll
 nam	notmuch am	fuzz-notmuch-am
 ng	notmuch github patch	fuzz-notmuch-gam
 nat	notmuch archive	fuzz-notmuch-archive
+nm	notmuch muchsync	echo muchsync charon
+m	mutt	echo neomutt
+mp	mutt prs	echo neomutt -f damus-prs
+mi	mutt issues	echo neomutt -f damus-issues
+min	mutt issues noelsat	echo neomutt -f damus-issues-no-elsat
+mai	mutt all issues	echo neomutt -f damus-all-issues
+main	mutt all issues noelsat	echo neomutt -f damus-all-issues-no-elsat
 Nc	new command	echo make-script
 ni	notmuch inbox	fuzz-notmuch-inbox
 nT	email today	echo f nt query:today