From cd39adec67e12a621ff96af94b895629ebcd78e5 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Fri, 8 Mar 2024 18:22:40 -0600
Subject: [PATCH] Fix restore.sh FOR REAL THIS TIME, update claws filtering,
 update vesktop settings

---
 claws-mail/matcherrc           | 2 +-
 restore.sh                     | 6 ++++--
 vesktop/settings/settings.json | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/claws-mail/matcherrc b/claws-mail/matcherrc
index 4aaa421..35c5b8b 100644
--- a/claws-mail/matcherrc
+++ b/claws-mail/matcherrc
@@ -48,6 +48,6 @@ enabled rulename "Move more YouTube comments to low-priority" subject matchcase
 enabled rulename "Move Windscribe to spam and mark as read" from matchcase "noreply@windscribe.com" mark_as_read move "#mh/Mailbox/Spam"
 enabled rulename "Move GeeksforGeeks to spam and mark as read" from matchcase "no-reply@geeksforgeeks.org" mark_as_read move "#mh/Mailbox/Spam"
 enabled rulename "Move Tallo to spam and mark as read" from regexp ".*@tallo.com" mark_as_read move "#mh/Mailbox/Spam"
-enabled rulename "Run gpg-email-helper" test "grep -- \"-----BEGIN PGP SIGNATURE-----\" %F" execute "python3 /home/askiiart/gpg-email-helper/gpg-email-helper.py %F"
+disabled rulename "Run gpg-email-helper" test "grep -- \"-----BEGIN PGP SIGNATURE-----\" %F" execute "python3 /home/askiiart/gpg-email-helper/gpg-email-helper.py %F"
 enabled rulename "Move Microsoft sign-ins to low-priority" from matchcase "account-security-noreply@accountprotection.microsoft.com" & subject matchcase "New sign-in detected" move "#mh/Mailbox/Low-priority"
 
diff --git a/restore.sh b/restore.sh
index 13a1954..74bceae 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -x
 GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 # fish
@@ -22,8 +23,8 @@ mkdir $HOME/.gnupg
 cp -r $GIT_DIR/gnupg/* $HOME/.gnupg/
 
 # vesktop
-mkdir $HOME/vesktop
-cp -r $GIT_DIR/vesktop/* $HOME/vesktop/
+mkdir $HOME/.config/vesktop
+cp -r $GIT_DIR/vesktop/* $HOME/.config/vesktop/
 
 # i3
 rm -rf $HOME/.config/i3
@@ -43,6 +44,7 @@ fi
 cp $GIT_DIR/other-files/.xinitrc $HOME/.xinitrc
 
 # Claws Mail configs
+mkdir $HOME/.claws-mail/
 cp $GIT_DIR/claws-mail/clawsrc $HOME/.claws-mail/clawsrc
 cp $GIT_DIR/claws-mail/matcherrc $HOME/.claws-mail/matcherrc
 
diff --git a/vesktop/settings/settings.json b/vesktop/settings/settings.json
index ca058af..c5ae80d 100644
--- a/vesktop/settings/settings.json
+++ b/vesktop/settings/settings.json
@@ -163,7 +163,8 @@
             "enabled": true
         },
         "GameActivityToggle": {
-            "enabled": true
+            "enabled": true,
+            "oldIcon": false
         },
         "GifPaste": {
             "enabled": true
@@ -560,6 +561,9 @@
         },
         "ReviewDB": {
             "enabled": false
+        },
+        "XSOverlay": {
+            "enabled": false
         }
     },
     "notifications": {
@@ -572,6 +576,6 @@
         "authenticated": true,
         "url": "https://api.vencord.dev/",
         "settingsSync": true,
-        "settingsSyncVersion": 1709751296550
+        "settingsSyncVersion": 1709943427384
     }
 }
\ No newline at end of file