diff --git a/flake.lock b/flake.lock index f45b56d..ad7d115 100644 --- a/flake.lock +++ b/flake.lock @@ -76,7 +76,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -172,14 +174,16 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": [], - "systems": "systems_3", + "systems": [ + "systems" + ], "xdph": "xdph" }, "locked": { @@ -245,15 +249,16 @@ }, "hyprland-qt-support": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", - "hyprland-qtutils", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", "systems" ] }, @@ -273,7 +278,9 @@ }, "hyprland-qtutils": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", + "hyprland-qt-support": [ + "hyprland-qt-support" + ], "hyprutils": [ "hyprland", "hyprutils" @@ -302,30 +309,6 @@ } }, "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprutils" - ], - "nixpkgs": "nixpkgs", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -595,13 +578,13 @@ "locked": { "lastModified": 1737469691, "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -647,22 +630,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pixi": { "inputs": { "nixpkgs": [ @@ -690,6 +657,7 @@ "flake-utils": "flake-utils", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", + "hyprland-qt-support": "hyprland-qt-support", "hyprman": "hyprman", "jj": "jj", "lib-aggregate": "lib-aggregate", @@ -699,12 +667,13 @@ "nim2nix": "nim2nix", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", "nixpkgs-wayland": "nixpkgs-wayland", "pixi": "pixi", "sops-nix": "sops-nix", "stable": "stable", + "systems": "systems", "treefmt-nix": "treefmt-nix", "tsm": "tsm", "utils": "utils" @@ -769,46 +738,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", + "repo": "x86_64-linux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index fdc7be2..0d41752 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,16 @@ # zls.inputs.zig-overlay.follows = "zig-overlay"; # further flake.lock minimization shenanigans + hyprland-qt-support.url = "github:hyprwm/hyprland-qt-support"; + hyprland-qt-support.inputs.hyprlang.follows = "hyprland/hyprlang"; + hyprland-qt-support.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + hyprland-qt-support.inputs.systems.follows = "hyprland/systems"; + hyprland.inputs.hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; + + systems.url = "github:nix-systems/x86_64-linux"; + hyprland.inputs.systems.follows = "systems"; + flake-utils.inputs.systems.follows = "systems"; + flake-utils.url = "github:numtide/flake-utils"; jj.inputs.flake-utils.follows = "flake-utils"; lib-aggregate.inputs.flake-utils.follows = "flake-utils";