From 0b32914be25f81dbf640c2152dfae520da8b82a0 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Thu, 16 May 2024 17:59:50 +0200
Subject: [PATCH] Update

---
 home/scripts/startup/default.nix | 11 ++++++-----
 home/themes/default.nix          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/home/scripts/startup/default.nix b/home/scripts/startup/default.nix
index 7634219..7083ed9 100644
--- a/home/scripts/startup/default.nix
+++ b/home/scripts/startup/default.nix
@@ -4,11 +4,12 @@ let
   variable = import ../../../variables.nix;
 
   nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" ''
-    # Start nextcloud if I'm on my networks
+    # Start nextcloud if I'm on my local network
     while true;do
+      sleep 120
       ssid=$(nmcli -t -f name connection show --active | head -n1)
-      status=$(pgrep -n nextcloud)
-      if [[ -z $status ]]; then
+      nextcloud_status=$(ps -aux | grep -E "/bin/nextcloud --background$")
+      if [[ $nextcloud_status == "" ]]; then
         service_status="inactive"
       else
         service_status="active"
@@ -20,10 +21,10 @@ let
         fi
       else
         if [[ $service_status == "active" ]]; then
-            pkill nextcloud
+            nextcloud_pid=$(pgrep -n nextcloud)
+            kill $nextcloud_pid
         fi
       fi
-      sleep 120
     done
   '';
 
diff --git a/home/themes/default.nix b/home/themes/default.nix
index b2b09b6..cb350f1 100644
--- a/home/themes/default.nix
+++ b/home/themes/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./wip.nix ./wallpapers ./config/load_colors.nix ]; }
+{ ... }: { imports = [ ./nixy.nix ./wallpapers ./config/load_colors.nix ]; }