diff --git a/flake.lock b/flake.lock index 198ad75..4008f22 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1734906446, - "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", + "lastModified": 1737636397, + "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", + "rev": "7fe006981fae53e931f513026fc754e322f13145", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1736151656, - "narHash": "sha256-iBg+s0gYUZEoJkS03PbiYl1jSHLGCitHPxQgLtkxsXU=", + "lastModified": 1737911494, + "narHash": "sha256-XnQRqqRZZ5x28y4vy3yL25dMJk9s6wxnmwKQBfUlQCw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a757dd117b066d5ee1527ce77c5e3d3ff6014b44", + "rev": "b8e32860b5c94c75e9efb1779b9b5a4bd4a7d655", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1735695978, - "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", + "lastModified": 1736917206, + "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", + "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "lastModified": 1737634937, + "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "lastModified": 1737634889, + "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", "type": "github" }, "original": { @@ -262,8 +262,8 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -273,11 +273,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736115553, - "narHash": "sha256-nFagWe+VST+UL+Y/sp4P007PoMpsm6iW+PrWw1VH/Xk=", + "lastModified": 1737925585, + "narHash": "sha256-+Y0fBW4G2KCmf9NY0bjgHM1W/mrTmm22uO/0aDVScNM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f390f48a07d117e24acec59dcf6791bcb3a81110", + "rev": "2f55806d6f11a1e81e3e821cb0327779d5cc50e6", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1735278118, - "narHash": "sha256-KHPfZtAgY4qpJJ6wfFzvNf/Ru93IW7dNOc4XHfm5Dn8=", + "lastModified": 1737937753, + "narHash": "sha256-qLP21Pp4++nMKdgb3bSpmHSzW412CEb99xAhZ2dzxE0=", "owner": "outfoxxed", "repo": "hy3", - "rev": "80bbd2ff4b01da0397e35879d9c00b5036af56a8", + "rev": "021b746d11d5a16737f5c7c290e65e4aff229d73", "type": "github" }, "original": { @@ -318,11 +318,11 @@ ] }, "locked": { - "lastModified": 1735734474, - "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -356,8 +356,37 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support", "hyprutils": [ "hyprland", "hyprutils" @@ -372,11 +401,11 @@ ] }, "locked": { - "lastModified": 1734906472, - "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "lastModified": 1737811848, + "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", "type": "github" }, "original": { @@ -386,6 +415,36 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "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", @@ -401,11 +460,11 @@ ] }, "locked": { - "lastModified": 1734906259, - "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0404833ea18d543df44df935ebf1b497310eb046", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -416,7 +475,7 @@ }, "hyprpicker": { "inputs": { - "hyprutils": "hyprutils_2", + "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" @@ -424,11 +483,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1735584197, - "narHash": "sha256-B1PqiHp/jmDVXVrvyh/eu2KP3LCyi1JL0h3vuy/wVnM=", + "lastModified": 1737635601, + "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", "ref": "refs/heads/main", - "rev": "444c40e5e3dc4058a6a762ba5e73ada6d6469055", - "revCount": 93, + "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", + "revCount": 96, "type": "git", "url": "https://github.com/hyprwm/hyprpicker" }, @@ -440,7 +499,7 @@ "hyprsunset": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "hyprutils": "hyprutils_3", + "hyprutils": "hyprutils_4", "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" @@ -448,11 +507,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1731163989, - "narHash": "sha256-+M6/ZLT2g6l2JCBBQSNMp8oqXPMMUckWTNhHSXzvlXE=", + "lastModified": 1737635828, + "narHash": "sha256-e3vsaQSB9F6p8KMRzrK4l+wCgMytw7ocUvxjgmJfjp8=", "ref": "refs/heads/main", - "rev": "adaae9d2adac611151224b054f59db8cb0976779", - "revCount": 9, + "rev": "cdcf145eec3e4bbb5e07ae16012c825b59efd44e", + "revCount": 11, "type": "git", "url": "https://github.com/hyprwm/hyprsunset" }, @@ -465,19 +524,25 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", "nixpkgs" ], "systems": [ "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", "systems" ] }, "locked": { - "lastModified": 1735316583, - "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -489,20 +554,20 @@ "hyprutils_2": { "inputs": { "nixpkgs": [ - "hyprpicker", + "hyprland", "nixpkgs" ], "systems": [ - "hyprpicker", + "hyprland", "systems" ] }, "locked": { - "lastModified": 1733502241, - "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", + "lastModified": 1737725508, + "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", + "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", "type": "github" }, "original": { @@ -512,6 +577,31 @@ } }, "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprpicker", + "nixpkgs" + ], + "systems": [ + "hyprpicker", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprsunset", @@ -523,11 +613,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -548,11 +638,11 @@ ] }, "locked": { - "lastModified": 1734793513, - "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -573,11 +663,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -598,11 +688,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -633,11 +723,11 @@ ] }, "locked": { - "lastModified": 1736047960, - "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", + "lastModified": 1737861961, + "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", + "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "type": "github" }, "original": { @@ -675,11 +765,11 @@ ] }, "locked": { - "lastModified": 1735784878, - "narHash": "sha256-Bb6DGP2cCpEGaNsEO4eVZ7Hbq+znzx0ZFybHU3S5bZM=", + "lastModified": 1737599681, + "narHash": "sha256-sFzfMxH7c9UWyrFsC2wsPRJqTCHchz7q2zd04+9/yvw=", "owner": "nixpak", "repo": "nixpak", - "rev": "463bdadd6e870c6143dd23fdf2e714fccd090eee", + "rev": "68beced51b937d506187431bec4847e78fd34911", "type": "github" }, "original": { @@ -690,11 +780,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -705,11 +795,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -719,29 +809,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -758,11 +832,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736149541, - "narHash": "sha256-44F5DCgQxNMA9OAVJWFlHqk+okiJuqfcoc+H5hEjL9E=", + "lastModified": 1737928024, + "narHash": "sha256-E3Y7NbbguVWz+J/xG20Grbns3v+y42QAxFuTxEiQN60=", "owner": "nix-community", "repo": "NUR", - "rev": "a3f27a4ae0a5e2695355f7365c8fe42ee974961f", + "rev": "d8b236e8d1ecd476478d45d5fcad21af4a2c46ca", "type": "github" }, "original": { @@ -778,15 +852,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -802,11 +875,11 @@ ] }, "locked": { - "lastModified": 1736149983, - "narHash": "sha256-CAe5j6gO3ltAD6Q7j9pJHzmTPgLdGxkb62U4XYZKd48=", + "lastModified": 1737892627, + "narHash": "sha256-Ax7XTB7rG6vKocFcfg2EE/RhB+iwnvQW2EYN1Aj7UL4=", "ref": "refs/heads/master", - "rev": "af86d5fd19fea627b484e825402629a5aae5747f", - "revCount": 452, + "rev": "4f2610dece8b1b5f1d24b4d046a2bfbe2f2e2cc6", + "revCount": 476, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -842,11 +915,11 @@ ] }, "locked": { - "lastModified": 1736130662, - "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=", + "lastModified": 1737858462, + "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52", + "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", "type": "github" }, "original": { @@ -979,11 +1052,11 @@ ] }, "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0b3b298..1a6fae3 100755 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - stable.url = "nixpkgs/nixos-23.05"; + stable.url = "nixpkgs/nixos-24.05"; flake-utils.url = "github:numtide/flake-utils"; nix-index-database = { diff --git a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml index 9a764f7..e9a1d9f 100644 --- a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml +++ b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml @@ -32,11 +32,7 @@ BarWidgetInner { Text { Layout.alignment: Qt.AlignHCenter - text: { - const hours = clock.hours.toString().padStart(2, '0') - const minutes = clock.minutes.toString().padStart(2, '0') - return `${hours}\n${minutes}` - } + text: Qt.formatDateTime(clock.date, "hh\nmm") font.pointSize: 18 color: "white" } @@ -52,15 +48,7 @@ BarWidgetInner { Loader { active: tooltip.visible sourceComponent: Label { - text: { - // SystemClock can send an update slightly (<50ms) before the - // time changes. We use its readout so the widget and tooltip match. - const hours = clock.hours.toString().padStart(2, '0'); - const minutes = clock.minutes.toString().padStart(2, '0'); - const seconds = clock.seconds.toString().padStart(2, '0'); - - return `${hours}:${minutes}:${seconds}\n` + new Date().toLocaleString(Qt.locale("en_US"), "dddd, MMMM d, yyyy"); - } + text: Qt.formatDateTime(clock.date, "hh:mm:ss\ndddd, MMMM d, yyyy"); } } } diff --git a/modules/user/modules/quickshell/shell/bar/Tooltip.qml b/modules/user/modules/quickshell/shell/bar/Tooltip.qml index 463036e..10b8c5a 100644 --- a/modules/user/modules/quickshell/shell/bar/Tooltip.qml +++ b/modules/user/modules/quickshell/shell/bar/Tooltip.qml @@ -87,6 +87,19 @@ Scope { HyprlandWindow.opacity: root.scaleMul + HyprlandWindow.visibleMask: Region { + id: visibleMask + item: tooltipItem + } + + Connections { + target: root + + function onScaleMulChanged() { + visibleMask.changed(); + } + } + //height: bar.height width: Math.max(700, tooltipItem.largestAnimWidth) // max due to qtwayland glitches height: { @@ -96,7 +109,7 @@ Scope { } visible: true color: "transparent" - //color: "#20000000" + //color: "#20ff0000" mask: Region { item: (shownItem?.hoverable ?? false) ? tooltipItem : null diff --git a/modules/user/modules/quickshell/shell/greeter.qml b/modules/user/modules/quickshell/shell/greeter.qml index 5dc98b4..f272ccb 100644 --- a/modules/user/modules/quickshell/shell/greeter.qml +++ b/modules/user/modules/quickshell/shell/greeter.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Wayland import Quickshell.Services.Greetd -import ".." +import "background" import "lock" ShellRoot { diff --git a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml index a7013fd..cca2581 100644 --- a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml +++ b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml @@ -5,6 +5,8 @@ import "../components" Item { id: root + readonly property Region mask: Region { item: displayContainer } + enum FlingState { Inert, Returning, diff --git a/modules/user/modules/quickshell/shell/notifications/NotificationOverlay.qml b/modules/user/modules/quickshell/shell/notifications/NotificationOverlay.qml index 498ef16..4a554c0 100644 --- a/modules/user/modules/quickshell/shell/notifications/NotificationOverlay.qml +++ b/modules/user/modules/quickshell/shell/notifications/NotificationOverlay.qml @@ -1,11 +1,13 @@ import QtQuick import Quickshell import Quickshell.Wayland +import Quickshell.Hyprland PanelWindow { WlrLayershell.namespace: "shell:notifications" exclusionMode: ExclusionMode.Ignore color: "transparent" + //color: "#30606000" anchors { left: true @@ -28,6 +30,9 @@ PanelWindow { visible: display.stack.children.length != 0 mask: Region { item: display.stack } + HyprlandWindow.visibleMask: Region { + regions: display.stack.children.map(child => child.mask) + } Component.onCompleted: { NotificationManager.overlay = this;