diff --git a/flake.lock b/flake.lock index 316fb12..32a8428 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1735048446, - "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", + "lastModified": 1736199437, + "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "owner": "nix-community", "repo": "disko", - "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", + "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "type": "github" }, "original": { @@ -233,24 +233,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flox": { "inputs": { "crane": "crane", @@ -342,11 +324,11 @@ ] }, "locked": { - "lastModified": 1735427049, - "narHash": "sha256-rTpBl3xmKYDQTRWF8CRk/r1FoKPDVwqLHGoU7tfECvY=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "53a0c2fe6ed46ab33fc4a221c9f907a7b4c8a91c", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -355,31 +337,13 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-flatpak": { "locked": { - "lastModified": 1734864618, - "narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=", + "lastModified": 1735913600, + "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "13be795cac27df7044a425c0b2de3a42b10ddb18", + "rev": "78ed84ff81e8d8510926e7165d508bcacef49ff1", "type": "github" }, "original": { @@ -391,16 +355,19 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_3", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_3" + "nix-darwin": [ + "nix-darwin" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1732145543, - "narHash": "sha256-VRQh/lvCSko9YV7haXyPt7DSp+EkgjjBv/9U4cY9c50=", + "lastModified": 1736041957, + "narHash": "sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH+ohzxKBptMzzg=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "ac3945ee614f69ab89c6935b3f0567028de5f012", + "rev": "a6d99cc7436fc18c097b3536d9c45c0548c694c8", "type": "github" }, "original": { @@ -444,11 +411,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1735430720, - "narHash": "sha256-WZDkLAgqUiLCWfcDBFbHDUBylSZ+eV1LRPsCUTGvVa4=", + "lastModified": 1736214624, + "narHash": "sha256-Pi70vbASZ1O9cR8RO5d2hBiNjIJBKKLoABl4sxWyOgg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "14ab32fdd713a199b904f8bc7df76d435b873205", + "rev": "0830abeebf3b2d1bae44652ffb2c89cf0d56ddaa", "type": "github" }, "original": { @@ -459,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736237814, + "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "type": "github" }, "original": { @@ -576,14 +543,14 @@ "nixpkgs-1_9": [ "nixpkgs-unstable" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1732844581, - "narHash": "sha256-BwHD1d6Bl5LL/HciTf+mQmBN3I3S6nYqcB+5BXVozNk=", + "lastModified": 1735874994, + "narHash": "sha256-fXqrujohpWrs+LqRhNWYxoAGvzmomAw7nLiZsGQQTHQ=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "b4db1b59d8f62cd37b6f9540e368d0e2627c4a2d", + "rev": "6a084f0760bbc81cd9838b0f91a9d6fa0949a6e7", "type": "github" }, "original": { @@ -594,11 +561,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", + "lastModified": 1736166416, + "narHash": "sha256-U47xeACNBpkSO6IcCm0XvahsVXpJXzjPIQG7TZlOToU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", + "rev": "b30f97d8c32d804d2d832ee837d0f1ca0695faa5", "type": "github" }, "original": { @@ -610,40 +577,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { @@ -712,7 +650,7 @@ "nix-homebrew": "nix-homebrew", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-terraform": "nixpkgs-terraform", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -744,11 +682,11 @@ ] }, "locked": { - "lastModified": 1735266518, - "narHash": "sha256-2XkWYGgT+911gOLjgBj+8W8ZJk6P0qHJNz8RfKgT/5o=", + "lastModified": 1736130662, + "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e0b3654b716098b47f3643c65fbb75ef49c033e1", + "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52", "type": "github" }, "original": { @@ -791,11 +729,11 @@ ] }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -870,24 +808,9 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, diff --git a/flake.nix b/flake.nix index c06734b..f5d89f9 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,11 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref= to pin releases. # Manage Homebrew itself - nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; + nix-homebrew = { + url = "github:zhaofengli-wip/nix-homebrew"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nix-darwin.follows = "nix-darwin"; + }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic";