flake: add git-sync-rs as top-level input and deduplicate

Move git-sync-rs from a nixpkgs PR patch to a direct flake input,
add overlay and package, and have org-agenda-api follow it.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nixos/essential.nix

@@ -25,6 +25,7 @@
     git-fame
     git-lfs
     git-sync
+    git-sync-rs
     gitFull
     gnumake
     gparted

nixos/flake.lock

@@ -175,6 +175,22 @@
         "type": "github"
       }
     },
+    "dbus-hslogger": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1770613712,
+        "narHash": "sha256-Az7USYfzylaIduPoOzxaz+6Evpn+TvVcThbPpWORt8k=",
+        "owner": "IvanMalison",
+        "repo": "dbus-hslogger",
+        "rev": "56195c6e46e04e2454fa0fa643e06eb7ef2a0952",
+        "type": "github"
+      },
+      "original": {
+        "owner": "IvanMalison",
+        "repo": "dbus-hslogger",
+        "type": "github"
+      }
+    },
     "dbus-menu": {
       "inputs": {
         "flake-utils": [
@@ -204,6 +220,22 @@
         "type": "github"
       }
     },
+    "dbus-menu_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1770613478,
+        "narHash": "sha256-WWg433uoU8qjiz3jdmX0gRQOCjVoxVX7Rn415QTtrv4=",
+        "owner": "taffybar",
+        "repo": "dbus-menu",
+        "rev": "29656af7126d8753881b16b6cfef7e3e98c9ef65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "taffybar",
+        "repo": "dbus-menu",
+        "type": "github"
+      }
+    },
     "emacs-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -507,18 +539,15 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "org-agenda-api",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1769370203,
+        "lastModified": 1770629526,
-        "narHash": "sha256-J52a10KE7GrR4EZjZiKdOOOeSe2uJiCYmUz1nVqC+Ec=",
+        "narHash": "sha256-G2i5VheRDTuicGs6E45zWkjVbfa6mmo0xu9Ndhegsxo=",
         "owner": "colonelpanic8",
         "repo": "git-sync-rs",
-        "rev": "a0a68207460cc8ffed6b0f7a3045d5c4cae826c9",
+        "rev": "7bca0825e631f62fd5e669bfd27839bcbba98d17",
         "type": "github"
       },
       "original": {
@@ -771,7 +800,7 @@
     "hercules-ci-effects_2": {
       "inputs": {
         "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1701009247,
@@ -939,7 +968,7 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -1305,7 +1334,7 @@
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
         "git-hooks-nix": "git-hooks-nix",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-23-11": "nixpkgs-23-11",
         "nixpkgs-regression": "nixpkgs-regression"
       },
@@ -1383,11 +1412,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
+        "lastModified": 1755186698,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {
@@ -1464,6 +1493,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1769089682,
         "narHash": "sha256-Xu+7iYcAuOvsI2wdkUcIEmkqEJbvvE6n7qR9QNjJyP4=",
@@ -1476,7 +1521,7 @@
         "url": "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1770562336,
         "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
@@ -1492,7 +1537,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1697723726,
         "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
@@ -1508,7 +1553,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1703255338,
         "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
@@ -1528,7 +1573,7 @@
       "inputs": {
         "flake-parts": "flake-parts_4",
         "hercules-ci-effects": "hercules-ci-effects_2",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "osx-kvm": "osx-kvm"
       },
       "locked": {
@@ -1578,7 +1623,9 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "git-sync-rs": "git-sync-rs",
+        "git-sync-rs": [
+          "git-sync-rs"
+        ],
         "mova": "mova",
         "nixpkgs": [
           "nixpkgs"
@@ -1789,6 +1836,7 @@
         "codex-cli-nix": "codex-cli-nix",
         "flake-utils": "flake-utils",
         "git-ignore-nix": "git-ignore-nix",
+        "git-sync-rs": "git-sync-rs",
         "gtk-sni-tray": "gtk-sni-tray",
         "gtk-strut": "gtk-strut_2",
         "home-manager": "home-manager",
@@ -1800,7 +1848,7 @@
         "nixified-ai": "nixified-ai",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixtheplanet": "nixtheplanet",
         "notifications-tray-icon": "notifications-tray-icon",
         "org-agenda-api": "org-agenda-api",
@@ -1903,6 +1951,8 @@
     },
     "taffybar": {
       "inputs": {
+        "dbus-hslogger": "dbus-hslogger",
+        "dbus-menu": "dbus-menu_2",
         "flake-utils": [
           "flake-utils"
         ],
@@ -1927,8 +1977,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1770616189,
+        "lastModified": 1770628285,
-        "narHash": "sha256-WN/s2Evrk6g6HEWP3Qjh3RVcZB1sa3k9IrwhNm6hxHk=",
+        "narHash": "sha256-YYDynXBBGSmQQGEKhIIy40zJ/AZUGQbbuBIvVkSICRo=",
         "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
         "type": "path"
       },

nixos/flake.nix

@@ -37,13 +37,20 @@
       };
     };
 
+    git-sync-rs = {
+      url = "github:colonelpanic8/git-sync-rs";
+      inputs = {
+        flake-utils.follows = "flake-utils";
+        rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+      };
+    };
+
     org-agenda-api = {
       url = "github:colonelpanic8/org-agenda-api";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
-        git-sync-rs.inputs.flake-utils.follows = "flake-utils";
+        git-sync-rs.follows = "git-sync-rs";
-        git-sync-rs.inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
         emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
       };
     };
@@ -219,10 +226,6 @@
   }: let
     # Nixpkgs PR patches - just specify PR number and hash
     nixpkgsPRPatches = [
-      {
-        pr = 434160; # git-sync-rs package
-        hash = "sha256-0j0IcyHd7rE+MXc0SHu8UixW7Jbtzu1NnzSjEVeZmTA=";
-      }
       {
         pr = 488591; # happy-coder: 0.11.2 -> 0.13.0
         hash = "sha256-mlmZcwxP7IV93mQEAR3PYw8MRmNPRWXKbk9ZEKHqZc8=";

nixos/nix.nix

@@ -61,6 +61,7 @@
       (final: prev: {
         codex = inputs.codex-cli-nix.packages.${prev.stdenv.hostPlatform.system}.default;
         claude-code = inputs.claude-code-nix.packages.${prev.stdenv.hostPlatform.system}.default;
+        git-sync-rs = inputs.git-sync-rs.packages.${prev.stdenv.hostPlatform.system}.default;
       })
     ] ++ (if config.imalison.nixOverlay.enable then [ inputs.nix.overlays.default ] else []);