From e22e2cb4165c97f14f7032a281a4732c88fda017 Mon Sep 17 00:00:00 2001
From: SqrtMinusOne <thexcloud@gmail.com>
Date: Mon, 10 Jun 2024 01:11:56 +0300
Subject: [PATCH] mail: add tag

---
 .notmuch-config              | 25 +++++++++++++------------
 Mail.org                     |  1 +
 Mail/.notmuch/hooks/post-new |  2 ++
 Mail/.notmuch/hooks/pre-new  |  3 ++-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.notmuch-config b/.notmuch-config
index a0329e5..5165dfc 100644
--- a/.notmuch-config
+++ b/.notmuch-config
@@ -1,27 +1,28 @@
-# [[file:Mail.org::*Config][Config:1]]
+# [[file:Mail.org::*Config][Config:2]]
 [database]
 path=/home/pavel/Mail
-# Config:1 ends here
+# Config:2 ends here
 
-# [[file:Mail.org::*Config][Config:2]]
+# [[file:Mail.org::*Config][Config:3]]
 [user]
 name=Pavel Korytov
 primary_email=thexcloud@gmail.com
 other_email=progin6304@gmail.com;pvkorytov@etu.ru
-# Config:2 ends here
-
-# [[file:Mail.org::*Config][Config:3]]
-[new]
-tags=new;
-ignore=.osync_workdir;.mbsyncstate;.uidvalidity;.lock;/.*gmailieer\.json.*/
 # Config:3 ends here
 
 # [[file:Mail.org::*Config][Config:4]]
-[search]
-exclude_tags=trash;spam;
+[new]
+tags=new;
+# ignore=.osync_workdir;.mbsyncstate;.uidvalidity;.lock;/.*gmailieer\.json.*/
+ignore=/.*[.](json|lock|bak|osync_workdir|mbsyncstate|uidvalidity)$/
 # Config:4 ends here
 
 # [[file:Mail.org::*Config][Config:5]]
+[search]
+exclude_tags=trash;spam;
+# Config:5 ends here
+
+# [[file:Mail.org::*Config][Config:6]]
 [maildir]
 synchronize_flags=true
-# Config:5 ends here
+# Config:6 ends here
diff --git a/Mail.org b/Mail.org
index a9e4744..2d085db 100644
--- a/Mail.org
+++ b/Mail.org
@@ -192,6 +192,7 @@ So, here are the rules which match tags & folders:
 | job.digital.testers      | Job_Digital.Testers      |
 | job.moevm                | Job_Moevm                |
 | etu                      | Etu                      |
+| etu.grad-school          | Etu.Grad_School          |
 
 And below is a noweb function, which generates the following commands for notmuch to execute:
 - /before/ sync:
diff --git a/Mail/.notmuch/hooks/post-new b/Mail/.notmuch/hooks/post-new
index 27b3508..590b733 100755
--- a/Mail/.notmuch/hooks/post-new
+++ b/Mail/.notmuch/hooks/post-new
@@ -29,6 +29,8 @@ notmuch tag +job.moevm "path:pvkorytov_etu/Job_Moevm/cur/** AND NOT tag:job.moev
 notmuch tag -job.moevm "NOT path:pvkorytov_etu/Job_Moevm/cur/** AND tag:job.moevm AND tag:pvkorytov"
 notmuch tag +etu "path:pvkorytov_etu/Etu/cur/** AND NOT tag:etu"
 notmuch tag -etu "NOT path:pvkorytov_etu/Etu/cur/** AND tag:etu AND tag:pvkorytov"
+notmuch tag +etu.grad-school "path:pvkorytov_etu/Etu.Grad_School/cur/** AND NOT tag:etu.grad-school"
+notmuch tag -etu.grad-school "NOT path:pvkorytov_etu/Etu.Grad_School/cur/** AND tag:etu.grad-school AND tag:pvkorytov"
 echo "Post-new filters done"
 notmuch tag -new "tag:new"
 # =post_new=:2 ends here
diff --git a/Mail/.notmuch/hooks/pre-new b/Mail/.notmuch/hooks/pre-new
index 06410b2..a9a8418 100755
--- a/Mail/.notmuch/hooks/pre-new
+++ b/Mail/.notmuch/hooks/pre-new
@@ -16,7 +16,8 @@ notmuch search --output=files "NOT path:pvkorytov_etu/Job_Digital.Applicants/cur
 notmuch search --output=files "NOT path:pvkorytov_etu/Job_Digital.Testers/cur/** AND tag:job.digital.testers AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Job_Digital.Testers/cur/
 notmuch search --output=files "NOT path:pvkorytov_etu/Job_Moevm/cur/** AND tag:job.moevm AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Job_Moevm/cur/
 notmuch search --output=files "NOT path:pvkorytov_etu/Etu/cur/** AND tag:etu AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Etu/cur/
-notmuch search --output=files "NOT path:pvkorytov_etu/Archive/cur/** AND NOT tag:inbox AND NOT tag:sent AND NOT tag:spam AND NOT tag:trash AND NOT tag:job.digital AND NOT tag:job.digital.docs AND NOT tag:job.digital.support AND NOT tag:job.digital.superservice AND NOT tag:job.digital.applicants AND NOT tag:job.digital.testers AND NOT tag:job.moevm AND NOT tag:etu AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Archive/cur/
+notmuch search --output=files "NOT path:pvkorytov_etu/Etu.Grad_School/cur/** AND tag:etu.grad-school AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Etu.Grad_School/cur/
+notmuch search --output=files "NOT path:pvkorytov_etu/Archive/cur/** AND NOT tag:inbox AND NOT tag:sent AND NOT tag:spam AND NOT tag:trash AND NOT tag:job.digital AND NOT tag:job.digital.docs AND NOT tag:job.digital.support AND NOT tag:job.digital.superservice AND NOT tag:job.digital.applicants AND NOT tag:job.digital.testers AND NOT tag:job.moevm AND NOT tag:etu AND NOT tag:etu.grad-school AND tag:pvkorytov" | xargs -I ! mv ! ~/Mail/pvkorytov_etu/Archive/cur/
 echo "Pre-new filters done"
 
 parallel --link -j0 "(cd /home/pavel/Mail/{1}/ && {2} {3})" ::: thexcloud progin6304 pvkorytov_etu ::: "$GMI" "$GMI" "offlineimap" ::: sync sync ""