From 7bf177756d66de1134f37f35c7fecc102c6874a4 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 11 Feb 2025 18:16:25 -0600 Subject: [PATCH] updated: but at what cost.... for what is unclear reasons I had to compile a lot of qt packages this is not sustainable and could be enough to encourage me to switch to the nixos-unstable hyprland --- flake.lock | 164 ++++++++++++++++++----------------------------------- flake.nix | 24 ++++---- 2 files changed, 68 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index 16f2cbf..6f69e19 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1738456976, - "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1738178255, - "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1738437059, - "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -189,9 +189,11 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprland-qtutils": [ + "hyprland-qtutils" + ], + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -203,17 +205,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738457237, - "narHash": "sha256-dSKR1VpjpdJVZ5dmLgIvAu3K+DYrSbohZkqxSQhjw8U=", - "ref": "refs/tags/v0.47.2", - "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", - "revCount": 5767, + "lastModified": 1739368482, + "narHash": "sha256-t/YNy0Z/gpXTMyL9uPNg1IYCkwVj5H1dbBu+XbqiNjA=", + "ref": "refs/heads/main", + "rev": "68bb3e7f0a1d528a8b2da1f92d2005889587561d", + "revCount": 5809, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland/" }, "original": { - "ref": "refs/tags/v0.47.2", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland/" @@ -226,11 +227,11 @@ ] }, "locked": { - "lastModified": 1738176500, - "narHash": "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg=", + "lastModified": 1739218873, + "narHash": "sha256-DUqU/X18hBRH/yB56ijTdtshX/+qchQR6XU+Xp5Z+l0=", "owner": "hyprwm", "repo": "contrib", - "rev": "d449f6e1fc31084437ebc0c45057ee656f593efd", + "rev": "8724de5851da5cdb1ab8a913a664d004c1e26368", "type": "github" }, "original": { @@ -268,17 +269,14 @@ "inputs": { "hyprlang": [ "hyprland", - "hyprland-qtutils", "hyprlang" ], "nixpkgs": [ "hyprland", - "hyprland-qtutils", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", "systems" ] }, @@ -298,8 +296,13 @@ }, "hyprland-qtutils": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": "hyprlang", + "hyprland-qt-support": [ + "hyprland-qt-support" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", "hyprutils" @@ -328,34 +331,6 @@ } }, "hyprlang": { - "inputs": { - "hyprutils": "hyprutils", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "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", @@ -371,11 +346,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -408,35 +383,6 @@ } }, "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -448,11 +394,11 @@ ] }, "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -473,11 +419,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -539,11 +485,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1739137265, - "narHash": "sha256-WejZuOso5ElVYLA/17uVw7Noqi72ZbydPwMrbqNzC0c=", - "rev": "7d4912bcf9028db491fe1061d3efcf2392c4bd76", + "lastModified": 1739192059, + "narHash": "sha256-r40TUIL6zij0kWBpqKyI7O2brT3Myaa3aAGamkZEvfc=", + "rev": "3bca42eb0049772d9079f29f25186575f8e5a4ae", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7d4912bcf9028db491fe1061d3efcf2392c4bd76.tar.gz?rev=7d4912bcf9028db491fe1061d3efcf2392c4bd76" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3bca42eb0049772d9079f29f25186575f8e5a4ae.tar.gz?rev=3bca42eb0049772d9079f29f25186575f8e5a4ae" }, "original": { "type": "tarball", @@ -679,11 +625,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -719,11 +665,11 @@ ] }, "locked": { - "lastModified": 1739192507, - "narHash": "sha256-5TZsjmKIh8YIIwyfFuFSWWO1so/1u1f8SW/e2zW4/9A=", + "lastModified": 1739365329, + "narHash": "sha256-OXXiLEh7fZBtsF/LDx/wnwL7tu1eBBjnR/wHG2otpA4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d2628e461e7d5b68b2b7bef28f72a489a150df04", + "rev": "aa13cfafacad104ce67c961be48461d3fc52f57b", "type": "github" }, "original": { @@ -788,6 +734,8 @@ "flake-utils": "flake-utils", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", + "hyprland-qt-support": "hyprland-qt-support", + "hyprland-qtutils": "hyprland-qtutils", "hyprman": "hyprman", "jj": "jj", "lib-aggregate": "lib-aggregate", @@ -818,11 +766,11 @@ ] }, "locked": { - "lastModified": 1739154531, - "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=", + "lastModified": 1739327257, + "narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea", + "rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c", "type": "github" }, "original": { @@ -838,11 +786,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7818255..523e842 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ nixos-wsl.url = "github:nix-community/NixOS-WSL"; nix-index-database.url = "github:nix-community/nix-index-database"; sops-nix.url = "github:Mic92/sops-nix"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&ref=refs/tags/v0.47.2"; + hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland-contrib.url = "github:hyprwm/contrib"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; @@ -77,17 +77,17 @@ utils.inputs.nim2nix.follows = "nim2nix"; # 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-qtutils.url = "github:hyprwm/hyprland-qtutils"; - # hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; - # hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; - # hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; - # hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; - # hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; - # hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + 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-qtutils.url = "github:hyprwm/hyprland-qtutils"; + hyprland-qtutils.inputs.hyprland-qt-support.follows = "hyprland-qt-support"; + hyprland-qtutils.inputs.hyprlang.follows = "hyprland/hyprlang"; + hyprland-qtutils.inputs.hyprutils.follows = "hyprland/hyprutils"; + hyprland-qtutils.inputs.nixpkgs.follows = "hyprland/nixpkgs"; + hyprland-qtutils.inputs.systems.follows = "hyprland/systems"; + hyprland.inputs.hyprland-qtutils.follows = "hyprland-qtutils"; systems.url = "github:nix-systems/x86_64-linux"; hyprland.inputs.systems.follows = "systems";