From 88daa38bdd5165fa3c44edf69de7789331941007 Mon Sep 17 00:00:00 2001
From: Shrinivas Vishnu Kumbhar <librewish@mystrand.org>
Date: Fri, 9 Jul 2021 12:35:53 +0530
Subject: [PATCH] revert to nohang and disable systemd-oomd

---
 PKGBUILD                       |  3 ++-
 garuda-common-settings.install | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index fcce920..357ed82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=garuda-common-settings
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname"
 license=('GPL')
@@ -17,6 +17,7 @@ depends=('btrfsmaintenance'
     'garuda-icons'
     'haveged'
     'memavaild'
+    'nohang'
     'preload'
     'prelockd'
     'profile-sync-daemon'
diff --git a/garuda-common-settings.install b/garuda-common-settings.install
index bc5afdd..4ffc2ad 100644
--- a/garuda-common-settings.install
+++ b/garuda-common-settings.install
@@ -15,16 +15,16 @@ post_install() {
   systemctl enable grub-btrfs.path
   systemctl enable haveged
   systemctl enable memavaild
+  systemctl enable nohang-desktop
   systemctl enable preload
   systemctl enable prelockd
-  systemctl enable systemd-oomd
-}
+  }
 
 post_upgrade() {
   msg "Disable conflicting services..."
   systemctl disable --now ananicy
   systemctl disable --now irqbalance
-  systemctl disable --now nohang-desktop
+  systemctl disable --now systemd-oomd
   systemctl disable --now systemd-swap
   systemctl disable --now uresourced
 
@@ -37,9 +37,9 @@ post_upgrade() {
   systemctl enable grub-btrfs.path
   systemctl enable haveged
   systemctl enable memavaild
+  systemctl enable nohang-desktop
   systemctl enable preload
   systemctl enable prelockd
-  systemctl enable systemd-oomd
   
   msg "Updating font cache..."
   mkfontscale /usr/share/fonts/TTF /usr/share/fonts/OTF /usr/share/fonts/misc > /dev/null 2>&1
@@ -54,6 +54,6 @@ post_upgrade() {
   
   echo ""
   msg "Done! 
-  This update replaces systemd-swap with zram-generator, nohang with systemd-oomd & makes irqbalance, uresourced and ananicy optdepends. If please remove the resulting orphans after this update by using the Garuda Assistant option!"
+  This update replaces systemd-swap with zram-generator & makes irqbalance, uresourced and ananicy optdepends. If please remove the resulting orphans after this update by using the Garuda Assistant option!"
   echo ""
 }