diff --git a/nixos/flake.lock b/nixos/flake.lock index 973d64c0..a4e15cc8 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -720,11 +720,11 @@ ] }, "locked": { - "lastModified": 1783912502, - "narHash": "sha256-eN7+87SwVX+s1dr5GF+t7z6c+0u3TkBmVWp7RtprA84=", + "lastModified": 1783914427, + "narHash": "sha256-qrzwgZN4rjLbC5G2FkdhzJAlup0US8eTO9FUH1NjJjo=", "owner": "colonelpanic8", "repo": "gmcli", - "rev": "9f44bb911bf231071f90194a2934c72932c4617b", + "rev": "7d198b8362de0e1126b9647fffa252c3ffe2ac7b", "type": "github" }, "original": { diff --git a/nixos/git-sync.nix b/nixos/git-sync.nix index e64f2647..71c5c44c 100644 --- a/nixos/git-sync.nix +++ b/nixos/git-sync.nix @@ -16,7 +16,6 @@ gmcliArchiveRoot = "/home/imalison/Backups/gmcli/git-sync"; gmcliArchiveOutput = "${gmcliArchiveRoot}/archive"; gmcliTelephonyOutput = "${gmcliArchiveRoot}/telephony"; - gmcliUnifiedOutput = "${gmcliArchiveRoot}/unified"; gmcliTelephonyFullOutput = "/home/imalison/Backups/gmcli/android-telephony-full"; gmcliBackupLock = "/home/imalison/.local/state/gmcli/backup.lock"; gmcliChromeCookieDB = "/home/imalison/.config/google-chrome/Default/Cookies"; @@ -48,14 +47,6 @@ --force --include-part-data=false ${gmcliPackage}/bin/gmcli android verify-telephony --dir ${lib.escapeShellArg gmcliTelephonyOutput} ''; - exportGmcliUnifiedArchive = pkgs.writeShellScript "export-gmcli-unified-archive" '' - set -euo pipefail - ${gmcliPackage}/bin/gmcli export unified-jsonl \ - --relay-dir ${lib.escapeShellArg gmcliArchiveOutput} \ - --telephony-dir ${lib.escapeShellArg gmcliTelephonyOutput} \ - --out ${lib.escapeShellArg gmcliUnifiedOutput} --force - ${gmcliPackage}/bin/gmcli export verify-unified --dir ${lib.escapeShellArg gmcliUnifiedOutput} - ''; exportGmcliTelephonyFullArchive = pkgs.writeShellScript "export-gmcli-telephony-full-archive" '' set -euo pipefail ${gmcliPackage}/bin/gmcli android export-telephony \ @@ -70,7 +61,6 @@ ${refreshGmcliCookies} || status=1 ${gmcliPackage}/bin/gmcli sync --include-spam=false --include-archive=false || status=1 ${exportGmcliArchive} || status=1 - ${exportGmcliUnifiedArchive} || status=1 exit "$status" ''; backfillGmcliArchiveUnlocked = pkgs.writeShellScript "backfill-gmcli-archive-unlocked" '' @@ -113,7 +103,6 @@ fi ${exportGmcliArchive} || status=1 ${exportGmcliTelephonyArchive} || status=1 - ${exportGmcliUnifiedArchive} || status=1 ${gmcliPackage}/bin/gmcli coverage verify || status=1 exit "$status" '';