From 27144d7e49ea1f944fdcf861783af7e372d3e0e1 Mon Sep 17 00:00:00 2001
From: Szymon P <szymon_jozef@proton.me>
Date: Tue, 3 Mar 2026 22:25:00 +0100
Subject: [PATCH] chore: state before home-manager update

---
 modules/cli/fish.nix | 61 ++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix
index c6e4b44..4df93f5 100644
--- a/modules/cli/fish.nix
+++ b/modules/cli/fish.nix
@@ -81,39 +81,56 @@
           if isNixOS then
             # fish
             ''
-              echo "=== System packages update==="
+              echo "=== System packages update ==="
               pushd /etc/nixos
-              git add -A
-              git commit -m "before system update"
-              nix flake update
-              if test $status -eq 0
-                  git add ./flake.lock
-                  git commit -m "flake lock update"
-                  reload_system 
+
+              if git pull
+                git add -A
+                git commit --allow-empty -m "chore: state before system update"
+                
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update system flake.lock"
+                    reload_system 
+                else
+                    echo "Error while updating system flake!"
+                end
               else
-                  echo "Error while updating system flake!"
+                echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
               end
+
               popd
 
-              echo "===User packages update==="
+              echo "=== User packages update ==="
               pushd $HOME/.config/home-manager
-              git add -A
-              git commit -m "before home-manager update"
-              nix flake update
-              if test $status -eq 0
-                  git add ./flake.lock
-                  git commit -m "flake lock update"
-                  reload_dotfiles
+
+              if git pull
+                git add -A
+                git commit --allow-empty -m "chore: state before home-manager update"
+                
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update home flake.lock"
+                    reload_dotfiles
+                else
+                    echo "Error while updating home flake!"
+                end
               else
-                  echo "Error while updating home flake!"
+                echo "Error: 'git pull' failed in home-manager. Skipping user update."
               end
+
               popd
 
               if type -q flatpak
-                  echo "===Flatpak update==="
-                  flatpak update --noninteractive
-                  echo "===Flatpak remove unused==="
-                  flatpak uninstall --unused
+                echo "=== Flatpak update ==="
+                flatpak update --noninteractive
+                
+                echo "=== Flatpak remove unused ==="
+                flatpak uninstall --unused --noninteractive
               end
             ''
           else