diff --git a/flake.lock.orig b/flake.lock.orig deleted file mode 100644 index 07806ec..0000000 --- a/flake.lock.orig +++ /dev/null @@ -1,96 +0,0 @@ -{ - "nodes": { - "darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { -<<<<<<< HEAD - "lastModified": 1743496612, - "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "73d59580d01e9b9f957ba749f336a272869c42dd", -======= - "lastModified": 1739553546, - "narHash": "sha256-L4ou3xfOr17EAe836djRoQ7auVkYOREMtiQa82wVGqU=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "353846417f985e74fdc060555f17939e4472ea2c", ->>>>>>> f85c89b (nix darwin branch fix) - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "nix-darwin-24.11", - "repo": "nix-darwin", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "nix-flatpak": { - "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.4.1", - "repo": "nix-flatpak", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -}