From 661f5e002ce7236a7bb7dac63e2b8b38412957d7 Mon Sep 17 00:00:00 2001
From: Rob Harbaugh <rob@rharbaugh.com>
Date: Mon, 20 Apr 2026 15:12:50 -0400
Subject: [PATCH] Fix Outlook Inbox IMAP conflict, add PipelineDepth 1

Outlook IMAP lists 'Inbox' as a folder AND uses INBOX as the special inbox,
causing mbsync to fail with 'cannot use unqualified Inbox'. Excluding 'Inbox'
from Patterns lets the MaildirStore Inbox directive handle it correctly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 laptop/.config/isyncrc                   | 3 ++-
 laptop/.config/neomutt/accounts/personal | 2 +-
 laptop/.zshrc                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/laptop/.config/isyncrc b/laptop/.config/isyncrc
index 9afcb55..e8f6aef 100644
--- a/laptop/.config/isyncrc
+++ b/laptop/.config/isyncrc
@@ -6,6 +6,7 @@ AuthMechs XOAUTH2
 PassCmd "python3 /usr/share/neomutt/oauth2/mutt_oauth2.py ~/.config/neomutt/outlook.tokens --decryption-pipe 'gpg --decrypt'"
 TLSType IMAPS
 CertificateFile /etc/ssl/certs/ca-bundle.crt
+PipelineDepth 1
 
 IMAPStore outlook-remote
 Account outlook
@@ -18,7 +19,7 @@ Inbox ~/mail/outlook/Inbox/
 Channel outlook
 Far :outlook-remote:
 Near :outlook-local:
-Patterns * !Junk !Deleted
+Patterns * !Inbox !Junk
 Create Near
 Sync All
 Expunge Near
diff --git a/laptop/.config/neomutt/accounts/personal b/laptop/.config/neomutt/accounts/personal
index f0926cb..b8da06b 100644
--- a/laptop/.config/neomutt/accounts/personal
+++ b/laptop/.config/neomutt/accounts/personal
@@ -5,7 +5,7 @@ set mbox_type	=	Maildir
 set folder	=	~/mail/outlook
 set spoolfile	=	+Inbox
 set postponed	=	+Drafts
-set trash	=	+Trash
+set trash	=	+Deleted
 
 set signature	=	~/.config/neomutt/signature
 set sendmail	=	"/usr/bin/msmtp -a outlook"
diff --git a/laptop/.zshrc b/laptop/.zshrc
index 96c005f..a50ae58 100644
--- a/laptop/.zshrc
+++ b/laptop/.zshrc
@@ -19,7 +19,7 @@ export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$HOME/.local/bin:$PA
 
 # Aliases
 alias e="emacsclient -t -a \"\""
-alias mbsync="mbsync -a"
+alias mailsync="mbsync -a"
 alias calsync="vdirsyncer sync"
 alias c="clear"
 alias cat="bat --paging=never --style=plain"