From 5f3018804ad59bf3322fda6c669911908b018b23 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 20 Sep 2024 10:52:53 -0400
Subject: [PATCH] Services: git pull submodules in autoupgrade script

---
 flake.lock                       | 6 +++---
 modules/services/autoupgrade.nix | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0df4344..e7a24c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726592409,
-        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
+        "lastModified": 1726818100,
+        "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
+        "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d",
         "type": "github"
       },
       "original": {
diff --git a/modules/services/autoupgrade.nix b/modules/services/autoupgrade.nix
index 3cf0a05..ec8fc47 100644
--- a/modules/services/autoupgrade.nix
+++ b/modules/services/autoupgrade.nix
@@ -67,7 +67,8 @@ in
           # If we have changes (git diff returns 1), pull changes and run the update
           if [ $? -eq 1 ]; then
             echo "Updates found, running nixos-rebuild..."
-            /run/wrappers/bin/sudo -u ${cfg.user} git pull --recurse-submodules
+            /run/wrappers/bin/sudo -u ${cfg.user} git pull
+            /run/wrappers/bin/sudo -u ${cfg.user} git submodule update --remote
             nixos-rebuild switch --flake .
           else
             echo "No updates found. Exiting."
@@ -99,7 +100,8 @@ in
           cd ${cfg.configDir}
           # Make sure we're up-to-date
           echo "Pulling the latest version..."
-          /run/wrappers/bin/sudo -u ${cfg.user} git pull --recurse-submodules
+          /run/wrappers/bin/sudo -u ${cfg.user} git pull
+          /run/wrappers/bin/sudo -u ${cfg.user} git submodule update --remote
           /run/wrappers/bin/sudo -u ${cfg.user} nix flake update --commit-lock-file
           /run/wrappers/bin/sudo -u ${cfg.user} git push
         '';