diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf index b5526379..6736ed0e 100644 --- a/.config/aerc/accounts.conf +++ b/.config/aerc/accounts.conf @@ -1,63 +1,64 @@ [personal] -source = notmuch://~/.mail/ -maildir-store = ~/.mail/ -maildir-account-path = personal -query-map = ~/.config/aerc/personal-map.conf -outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 -outgoing-cred-cmd = pass show proton/bridge -default = InboxNM -from = Daniel Fichtinger +source = notmuch://~/.mail/ +maildir-store = ~/.mail/ +maildir-account-path = personal +query-map = ~/.config/aerc/personal-map.conf +outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 +outgoing-cred-cmd = pass show proton/bridge +default = inbox +from = Daniel Fichtinger # copy-to = sent -cache-headers = true -signature-file = /home/fic/mail/daniel@ficd.ca.sig -check-mail-cmd = /home/fic/.config/mail/mail-sync.sh -check-mail = 5m -exclude-tags = spam,archive,deleted -folders-sort = InboxNM, SentNM, to-me, sr.ht, git, archive -# folders = inbox, -archive = archive -pgp-auto-sign = true -pgp-self-encrypt = true -pgp-attach-key = true -pgp-opportunistic-encrypt = false -pgp-error-level = warn -pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 +cache-headers = true +signature-file = /home/fic/mail/daniel@ficd.ca.sig +check-mail-cmd = /home/fic/.config/mail/mail-sync.sh +check-mail = 5m +exclude-tags = spam,archive,deleted +postpone = drafts +folders = inbox, sent, to-me, sr.ht, git, archive +archive = archive +pgp-auto-sign = true +pgp-self-encrypt = true +pgp-attach-key = true +pgp-opportunistic-encrypt = false +pgp-error-level = warn +pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 [school] -archive = archive -source = notmuch://~/.mail/ -maildir-store = ~/.mail/ -maildir-account-path = school -query-map = ~/.config/aerc/school-map.conf -outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 -outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -default = InboxNM -from = Daniel Fichtinger -# copy-to = sent -signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig -check-mail-cmd = /home/fic/.config/mail/mail-sync.sh -check-mail = 5m -exclude-tags = spam,archive,deleted -folders-sort = InboxNM, SentNM, to-me +archive = archive +source = notmuch://~/.mail/ +maildir-store = ~/.mail/ +maildir-account-path = school +query-map = ~/.config/aerc/school-map.conf +outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 +outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +default = inbox +from = Daniel Fichtinger +postpone = drafts +# copy-to = sent +signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig +check-mail-cmd = /home/fic/.config/mail/mail-sync.sh +check-mail = 5m +exclude-tags = spam,archive,deleted +folders = inbox, sent, to-me -[Personal-IMAP] -source = imap://daniel%40ficd.ca@127.0.0.1:1143 -source-cred-cmd = pass show proton/bridge -outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 -outgoing-cred-cmd = pass show proton/bridge -default = INBOX -from = Daniel Fichtinger -copy-to = Sent -cache-headers = true -signature-file = /home/fic/mail/daniel@ficd.ca.sig +# [Personal-IMAP] +# source = imap://daniel%40ficd.ca@127.0.0.1:1143 +# source-cred-cmd = pass show proton/bridge +# outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 +# outgoing-cred-cmd = pass show proton/bridge +# default = INBOX +# from = Daniel Fichtinger +# copy-to = Sent +# cache-headers = true +# signature-file = /home/fic/mail/daniel@ficd.ca.sig -[School-IMAP] -source = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753 -# source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -source-cred-cmd = gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token' -outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 -outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -from = Daniel Fichtinger -default = INBOX -copy-to = Sent -signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig +# [School-IMAP] +# source = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753 +# # source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +# source-cred-cmd = gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token' +# outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 +# outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +# from = Daniel Fichtinger +# default = INBOX +# copy-to = Sent +# signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig diff --git a/.config/aerc/personal-map.conf b/.config/aerc/personal-map.conf index 4eba0621..1c7babeb 100644 --- a/.config/aerc/personal-map.conf +++ b/.config/aerc/personal-map.conf @@ -1,5 +1,5 @@ -InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:git and not tag:srht and not (from:daniel@ficd.ca or from:ficcdaf@proton.me) -SentNM=(from:daniel@ficd.ca or from:ficcdaf@proton.me) +inbox=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:git and not tag:srht and not (from:daniel@ficd.ca or from:ficcdaf@proton.me) +sent=(from:daniel@ficd.ca or from:ficcdaf@proton.me) to-me=tag:to-me and tag:personal sr.ht=tag:inbox and tag:srht and tag:personal git=tag:inbox and tag:git and tag:personal diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf index 908744c3..98a598ea 100644 --- a/.config/aerc/school-map.conf +++ b/.config/aerc/school-map.conf @@ -1,5 +1,5 @@ -InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) -SentNM=tag:sent and tag:school and (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) +inbox=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) +sent=tag:sent and tag:school and (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) to-me=tag:to-me and tag:school # sr.ht=tag:inbox and tag:srht # git=tag:inbox and tag:git diff --git a/.config/helix/config.toml b/.config/helix/config.toml index a93840a8..e527a4ec 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -69,6 +69,10 @@ v = "select_regex" V = "split_selection" s = "select_mode" +# reload file, reload lsp +C-r = ":lsp-restart" +C-S-r = ":reload" + # Treesitter selections # Left <-> Right: Sibling nodes # Up <-> Down: Parent/Child nodes @@ -107,7 +111,7 @@ J = ["search_prev", "align_view_center"] N = "join_selections" A-N = "join_selections_space" C-q = ":qa" -C-Q = ":qa!" +C-S-q = ":qa!" C-m = "jump_view_left" M = ":bp" I = ":bn" diff --git a/.config/yazi/package.toml b/.config/yazi/package.toml index 003a1143..2be8aca3 100644 --- a/.config/yazi/package.toml +++ b/.config/yazi/package.toml @@ -103,6 +103,11 @@ use = "Rolv-Apneseth/starship" rev = "6c639b4" hash = "5614c46d5de76623c283d415bfac8025" +[[plugin.deps]] +use = "h-hg/yamb" +rev = "22af003" +hash = "7cc42012a7c2099f80064d228feb8d44" + [[flavor.deps]] use = "ashen-org/ashen:ashen" rev = "7a53969" diff --git a/.config/yazi/plugins/custom-shell.yazi/yazi_cmd_history b/.config/yazi/plugins/custom-shell.yazi/yazi_cmd_history index 41b251e8..ad7b40f0 100644 --- a/.config/yazi/plugins/custom-shell.yazi/yazi_cmd_history +++ b/.config/yazi/plugins/custom-shell.yazi/yazi_cmd_history @@ -12,3 +12,4 @@ zsh -ic 'attach-picker;exit' zsh -ic 'mksh attach-picker;exit' zsh -ic 'wl-paste > email_1.png;exit' zsh -ic 'wl-paste > email_2.png;exit' +zsh -ic 'ya pack -a h-hg/yamb;exit'