From 37ba49d7a18bcd5e7170249427193995250f6998 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 11 Nov 2024 18:29:01 -0800 Subject: [PATCH] chore: optimize flake inputs with flake follows --- flake.lock | 161 +++++++++++++++-------------------------------------- flake.nix | 14 ++++- 2 files changed, 56 insertions(+), 119 deletions(-) diff --git a/flake.lock b/flake.lock index 3b5c16d..9d4a465 100755 --- a/flake.lock +++ b/flake.lock @@ -104,26 +104,10 @@ "type": "github" } }, - "bleedingpkgs": { - "locked": { - "lastModified": 1731295903, - "narHash": "sha256-9T4S/rndz6zD9suTtJMBnAbIDMb1Kkqi6IERvYngaTA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e635cf8d9fb548dd4190988696621180a3114601", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "blink-cmp": { "inputs": { "fenix": "fenix", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "viminal", "nixpkgs" @@ -269,7 +253,9 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730504689, @@ -287,28 +273,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1727826117, @@ -324,46 +289,10 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, - "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" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -378,9 +307,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -396,12 +325,27 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_4": { "inputs": { - "systems": [ - "stylix", - "systems" - ] + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -419,7 +363,10 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": [ + "stylix", + "systems" + ] }, "locked": { "lastModified": 1710146030, @@ -582,8 +529,10 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils", + "flake-parts": [ + "flake-parts" + ], + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -621,7 +570,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -681,7 +630,7 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" @@ -750,18 +699,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1727825735, "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", @@ -773,18 +710,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -912,8 +837,8 @@ "inputs": { "apple-firmware": "apple-firmware", "apple-silicon": "apple-silicon", - "bleedingpkgs": "bleedingpkgs", "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", @@ -1018,11 +943,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1168,7 +1093,9 @@ }, "vesktop-bin": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -1249,7 +1176,9 @@ }, "zen-browser-source": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": "nixpkgs_4" }, "locked": { diff --git a/flake.nix b/flake.nix index f412571..3c46e77 100755 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - bleedingpkgs.url = "github:nixos/nixpkgs/master"; + # bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; home-manager = { @@ -12,6 +12,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + + flake-utils.url = "github:numtide/flake-utils"; + nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; @@ -35,6 +42,7 @@ lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; }; lix-module = { @@ -42,8 +50,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - flake-parts.url = "github:hercules-ci/flake-parts"; - apple-silicon = { # url = "github:tpwrules/nixos-apple-silicon"; url = "github:zzywysm/nixos-asahi"; @@ -68,6 +74,7 @@ vesktop-bin = { url = "github:youwen5/vesktop-bin-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; stylix.url = "github:danth/stylix"; @@ -88,6 +95,7 @@ }; zen-browser-source.url = "github:youwen5/zen-browser-source-flake"; + zen-browser-source.inputs.flake-parts.follows = "flake-parts"; }; outputs =