~petersanchez/dotfiles commit

3 files changed, 19 insertions(+), 2 deletions(-)

M .config/aerc/binds.conf
M .gitconfig
M bin/betterlockscreen

M .config/aerc/binds.conf +3 -0

@@ 53,7 53,9 @@ zR = :unfold -a<Enter>
 <Enter> = :view<Enter>
 B = :view -b<Enter>
 d = :read<Enter>:mv trash<Enter>
+D = :mv -m act-one-delete-rest trash<Enter>
 e = :read<Enter>:mv archive<Enter>
+E = :mv -m act-one-delete-rest archive<Enter>
 S = :read<Enter>:mv junk<Enter>
 H = :read<Enter>:mv INBOX<Enter>
 u = :unread<Enter>

          
@@ 214,6 216,7 @@ A = :pipe -m khard add-email -a netlandi
 d = :read<Enter>:mv Trash<Enter>
 #e = :read<Enter>:mv "[Gmail]/All Mail"<Enter>
 e = :read<Enter>:mv archive<Enter>
+E = :mv -m act-one-delete-rest archive<Enter>
 S = :read<Enter>:mv Junk<Enter>
 / = :query -f -n "Search Results" -a Netlandish<Space>
 o = :term mbsync PeterNL-inbox<Enter>

M .gitconfig +12 -1

@@ 1,18 1,23 @@ 
 [user]
 	name = Peter Sanchez
 	email = peter@netlandish.com
+	signingkey = 90956225167A28F5A0B461A2838FFCD2312235D1
 [alias]
 	st = status
 	ci = commit
 	mergetest = "!f(){ git merge --no-commit --no-ff \"$1\"; git merge --abort; echo \"Merge aborted\"; };f "
 	undo-commit = reset --soft HEAD^
+	undo-hard = reset --hard origin/master
 [push]
 	default = matching
 [sendemail]
 	smtpserver = /usr/bin/msmtp
 	smtpserveroption=-a
-	smtpserveroption=pscom
+	smtpserveroption=netlandish
 	annotate = yes
+	confirm = always
+	envelopesender = auto
+	assume8bitEncoding = UTF-8
 [pull]
 	rebase = true
 [http]

          
@@ 22,3 27,9 @@ 
 	pager = /usr/bin/less -X -F -R
 [branch]
 	sort = -committerdate
+[advice]
+	skippedCherryPicks = false
+[pretty]
+	fixes = Fixes: %h (\"%s\")
+	lineauthor = %C(auto)%h %C(auto,cyan)%ad %C(auto,magenta)%<(14,trunc)%an%C(auto)%d %C(auto,reset)%s%C(auto,cyan)%<(60,trunc) %(trailers:key=Acked-by,key=Reviewed-by,key=Tested-by,unfold,separator=%x2C )%C(auto,reset)
+	line = %C(auto)%h %C(auto,cyan)%ad %C(auto,magenta)%<(14,trunc)%an%C(auto)%d %C(auto,reset)%s%C(auto,cyan)

M bin/betterlockscreen +4 -1

@@ 187,6 187,7 @@ lock() {
         --pass-screen-keys \
         --pass-volume-keys \
         --pass-power-keys \
+	--ignore-empty-password \
         "${lockargs[@]}"
 }
 

          
@@ 254,6 255,7 @@ failsafe() {
         --pass-media-keys \
         --pass-screen-keys \
         --pass-volume-keys \
+	--ignore-empty-password \
         --pass-power-keys
 }
 

          
@@ 270,6 272,7 @@ postlock() {
     if [[ "$DUNST_INSTALLED" == "true" && "$DUNST_IS_PAUSED" == "false" ]]; then
         dunstctl set-paused false
     fi
+
     sleep 5 && [[ 4000 -lt $(xssstate -i) ]] && pgrep -x i3lock && xset dpms force off
 }
 

          
@@ 969,6 972,6 @@ echof header "Betterlockscreen"
 # Activate lockscreen
 [[ $runsuspend ]] || lockargs+=(-n)
 [[ $runlock ]] && lockselect "$lockstyle" && \
-    { [[ $runsuspend ]] && systemctl suspend; }
+    { [[ $runsuspend ]] && powerctl mem; }
 
 exit 0