From be9e7c0ce89d857c588bdf8e49d3e57204a343d2 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Thu, 17 Sep 2026 20:45:34 +0300 Subject: [PATCH] flake: add nixpkgs.follows --- flake.lock | 114 +++++++++++------------------------------------------ flake.nix | 66 ++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 111 deletions(-) diff --git a/flake.lock b/flake.lock index c6847b7..844a5f0 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "aagl": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -23,7 +25,9 @@ "ags": { "inputs": { "astal": "astal", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1744557573, @@ -431,7 +435,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -714,15 +718,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", - "owner": "nixos", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -761,38 +765,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1789149629, "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", @@ -808,54 +780,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -912,7 +836,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-pinned": "nixpkgs-pinned", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", @@ -987,7 +911,9 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1788914643, @@ -1012,7 +938,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur", "systems": "systems_2", "tinted-kitty": "tinted-kitty", @@ -1209,7 +1137,9 @@ "yazi": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index ccdfefe..5545416 100644 --- a/flake.nix +++ b/flake.nix @@ -19,44 +19,72 @@ }; inputs = { - aagl.url = "github:ezKEa/aagl-gtk-on-nix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05"; - nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011"; + aagl = { + url = "github:ezKEa/aagl-gtk-on-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + ags = { + url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - sops-nix.url = "github:Mic92/sops-nix"; - stylix.url = "github:danth/stylix"; - ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; helix-steel = { url = "github:mattwparas/helix/steel-event-system"; inputs.nixpkgs.follows = "nixpkgs"; }; - yazi.url = "github:sxyazi/yazi"; - yazi-plugins = { - url = "github:yazi-rs/plugins"; - flake = false; - }; - - hyprland.url = "github:hyprwm/Hyprland/v0.56.1"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland = { + url = "github:hyprwm/Hyprland/v0.56.1"; + # inputs.nixpkgs.follows = "nixpkgs"; + }; + + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs = { + hyprland.follows = "hyprland"; + # nixpkgs.follows = "nixpkgs"; + }; + }; + + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05"; + + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + waybar = { url = "github:Alexays/Waybar"; inputs.nixpkgs.follows = "nixpkgs"; }; + + yazi = { + url = "github:sxyazi/yazi"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + yazi-plugins = { + url = "github:yazi-rs/plugins"; + flake = false; + }; }; outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let