Fix Darwin switch after remote reconciliation

2026-04-25 17:34:58 -07:00
parent 222228742f
commit 1a06382365
8 changed files with 53 additions and 26 deletions
--- a/nix-darwin/flake.lock
+++ b/nix-darwin/flake.lock
@@ -319,11 +319,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1777159280,
-        "narHash": "sha256-Ee14+tYJi5uKL912+99acc/ouWVhpHzrOjZuBQOGTmY=",
+        "lastModified": 1777163228,
+        "narHash": "sha256-cJDlhBik9s65QyN55EAlKWUpFf86u8XNhDGU0Fb028A=",
        "owner": "colonelpanic8",
        "repo": "git-sync-rs",
-        "rev": "45ffa4301f740fa0193ecd5bc493ef1ffb4feb05",
+        "rev": "ab34487bc966a920d3c02798bba43f2a5951b12f",
        "type": "github"
      },
      "original": {
--- a/nix-darwin/flake.nix
+++ b/nix-darwin/flake.nix
@@ -114,7 +114,7 @@
            just
            git-lfs
            isort
-            gitFull
+            git
            gnused
            ncdu
            nixVersions.stable
--- a/nix-darwin/flake.nix.save
+++ b/nix-darwin/flake.nix.save
@@ -58,7 +58,7 @@
            just
            git-lfs
            isort
-            gitFull
+            git
            gnused
            ncdu
            nixFlakes
@@ -118,7 +118,7 @@
        emacs
        alejandra
        cocoapods
-        gitFull
+        git
        just
        tmux
        htop