From 061981201d09ea3c8a747865ebf1ffe47791342f Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Fri, 7 Nov 2025 15:48:13 +0000 Subject: [PATCH] core: qtutils -> guiutils (#12231) * core: qtutils -> guiutils * nix: qtutils -> guiutils * flake.lock: update --------- Co-authored-by: Mihai Fufezan --- flake.lock | 200 +++++++++++------- flake.nix | 7 +- nix/default.nix | 4 +- nix/overlays.nix | 2 +- src/Compositor.cpp | 8 +- src/config/ConfigDescriptions.hpp | 4 +- src/config/ConfigManager.cpp | 2 +- .../permissions/DynamicPermissionManager.cpp | 2 +- 8 files changed, 138 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index d382f8a40..bd87048c3 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1761420899, - "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -118,6 +118,42 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "aquamarine" + ], + "hyprgraphics": [ + "hyprgraphics" + ], + "hyprlang": [ + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprutils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -141,67 +177,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprlang" - ], - "hyprutils": [ - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -228,6 +203,48 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -238,11 +255,11 @@ ] }, "locked": { - "lastModified": 1762208756, - "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "164a30b3d8b3174a32ac7326782476f1188e6118", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -252,6 +269,33 @@ } }, "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland-guiutils", + "hyprtoolkit", + "nixpkgs" + ], + "systems": [ + "hyprland-guiutils", + "hyprtoolkit", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -276,11 +320,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -299,11 +343,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -317,11 +361,11 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", diff --git a/flake.nix b/flake.nix index c0076e687..cfc7cb19b 100644 --- a/flake.nix +++ b/flake.nix @@ -35,10 +35,13 @@ inputs.systems.follows = "systems"; }; - hyprland-qtutils = { - url = "github:hyprwm/hyprland-qtutils"; + hyprland-guiutils = { + url = "github:hyprwm/hyprland-guiutils"; inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; + inputs.aquamarine.follows = "aquamarine"; + inputs.hyprgraphics.follows = "hyprgraphics"; + inputs.hyprutils.follows = "hyprutils"; inputs.hyprlang.follows = "hyprlang"; }; diff --git a/nix/default.nix b/nix/default.nix index 275727860..0fe57191a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -15,7 +15,7 @@ hyprcursor, hyprgraphics, hyprland-protocols, - hyprland-qtutils, + hyprland-guiutils, hyprlang, hyprutils, hyprwayland-scanner, @@ -201,7 +201,7 @@ in wrapProgram $out/bin/Hyprland \ --suffix PATH : ${makeBinPath [ binutils - hyprland-qtutils + hyprland-guiutils pciutils pkgconf ]} diff --git a/nix/overlays.nix b/nix/overlays.nix index 8dcd35fd5..7f6bf2ae3 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -24,7 +24,7 @@ in { inputs.hyprcursor.overlays.default inputs.hyprgraphics.overlays.default inputs.hyprland-protocols.overlays.default - inputs.hyprland-qtutils.overlays.default + inputs.hyprland-guiutils.overlays.default inputs.hyprlang.overlays.default inputs.hyprutils.overlays.default inputs.hyprwayland-scanner.overlays.default diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 3d0b5173a..2dc798e47 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2758,8 +2758,8 @@ std::vector CCompositor::getWorkspacesCopy() { } void CCompositor::performUserChecks() { - static auto PNOCHECKXDG = CConfigValue("misc:disable_xdg_env_checks"); - static auto PNOCHECKQTUTILS = CConfigValue("misc:disable_hyprland_qtutils_check"); + static auto PNOCHECKXDG = CConfigValue("misc:disable_xdg_env_checks"); + static auto PNOCHECKGUIUTILS = CConfigValue("misc:disable_hyprland_guiutils_check"); if (!*PNOCHECKXDG) { const auto CURRENT_DESKTOP_ENV = getenv("XDG_CURRENT_DESKTOP"); @@ -2771,10 +2771,10 @@ void CCompositor::performUserChecks() { } } - if (!*PNOCHECKQTUTILS) { + if (!*PNOCHECKGUIUTILS) { if (!NFsUtils::executableExistsInPath("hyprland-dialog")) { g_pHyprNotificationOverlay->addNotification( - "Your system does not have hyprland-qtutils installed. This is a runtime dependency for some dialogs. Consider installing it.", CHyprColor{}, 15000, ICON_WARNING); + "Your system does not have hyprland-guiutils installed. This is a runtime dependency for some dialogs. Consider installing it.", CHyprColor{}, 15000, ICON_WARNING); } } diff --git a/src/config/ConfigDescriptions.hpp b/src/config/ConfigDescriptions.hpp index 6b97c1c00..5501339d3 100644 --- a/src/config/ConfigDescriptions.hpp +++ b/src/config/ConfigDescriptions.hpp @@ -1310,8 +1310,8 @@ inline static const std::vector CONFIG_OPTIONS = { .data = SConfigOptionDescription::SBoolData{false}, }, SConfigOptionDescription{ - .value = "misc:disable_hyprland_qtutils_check", - .description = "disable the warning if hyprland-qtutils is missing", + .value = "misc:disable_hyprland_guiutils_check", + .description = "disable the warning if hyprland-guiutils is missing", .type = CONFIG_OPTION_BOOL, .data = SConfigOptionDescription::SBoolData{false}, }, diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index b93808b29..159dabff2 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -517,7 +517,7 @@ CConfigManager::CConfigManager() { registerConfigVar("misc:middle_click_paste", Hyprlang::INT{1}); registerConfigVar("misc:render_unfocused_fps", Hyprlang::INT{15}); registerConfigVar("misc:disable_xdg_env_checks", Hyprlang::INT{0}); - registerConfigVar("misc:disable_hyprland_qtutils_check", Hyprlang::INT{0}); + registerConfigVar("misc:disable_hyprland_guiutils_check", Hyprlang::INT{0}); registerConfigVar("misc:lockdead_screen_delay", Hyprlang::INT{1000}); registerConfigVar("misc:enable_anr_dialog", Hyprlang::INT{1}); registerConfigVar("misc:anr_missed_pings", Hyprlang::INT{5}); diff --git a/src/managers/permissions/DynamicPermissionManager.cpp b/src/managers/permissions/DynamicPermissionManager.cpp index 3f9d58dd1..af1de990b 100644 --- a/src/managers/permissions/DynamicPermissionManager.cpp +++ b/src/managers/permissions/DynamicPermissionManager.cpp @@ -280,7 +280,7 @@ void CDynamicPermissionManager::askForPermission(wl_client* client, const std::s rule->m_dialogBox->m_priority = true; if (!rule->m_dialogBox) { - Debug::log(ERR, "CDynamicPermissionManager::askForPermission: hyprland-qtutils likely missing, cannot ask! Disabling permission control..."); + Debug::log(ERR, "CDynamicPermissionManager::askForPermission: hyprland-guiutils likely missing, cannot ask! Disabling permission control..."); rule->m_allowMode = PERMISSION_RULE_ALLOW_MODE_ALLOW; return; }