diff --git a/flake.lock b/flake.lock index 72da990..0b6a21e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1751740947, - "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1751940880, - "narHash": "sha256-lzPU5X3b8w68mUsGHgkRDOJ1DK+gzfov91vsBx2dsAM=", + "lastModified": 1740763725, + "narHash": "sha256-KumD2s9L4YjSQu92w42dM0ZXNwen6lKykmjrfL7GS0o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "82937ee6d83abf5a9a5a8ae05329c37c0e9380cf", + "rev": "4a462936ca22eae70fd47fa3c9bef7f00153d2a1", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1748000383, - "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "231726642197817d20310b9d39dd4afb9e899489", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1751990210, - "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", + "lastModified": 1740699498, + "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "218da00bfa73f2a61682417efe74549416c16ba6", + "rev": "b71edac7a3167026aabea82a54d08b1794088c21", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1751808145, - "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751995875, - "narHash": "sha256-ud9sl1RjmzAzalH2ocmGPs182xvr7GktjVIYvzJamwo=", + "lastModified": 1740707551, + "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9517d0eaa4ef93de67dc80fecca7a826f7ad556d", + "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1747077256, - "narHash": "sha256-ryaXKevnISRiJb93QIAv7tGc6ZJqSkwETKm4oGh8HWI=", + "lastModified": 1740038356, + "narHash": "sha256-V63ssPc9zja75PzL9PyOmOFWQL9PUkIEmJtDl8KZXUc=", "owner": "outfoxxed", "repo": "hy3", - "rev": "567dc9dd20e15d95a56a81c516a70dba30bc2c9c", + "rev": "0caaffd61445e9e82ba4cc6beb6eb81bbc3ae69a", "type": "github" }, "original": { @@ -318,11 +318,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", + "rev": "8810df502cdee755993cb803eba7b23f189db795", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1750371999, - "narHash": "sha256-de87tFOEhJiXTHNzG3LcwxGR1a/D6v+nC+9+V1GW1Zs=", + "lastModified": 1740169928, + "narHash": "sha256-TmCJ9oXar+CGw7Mnm/Y77C/Rb2J/HzHojpjnSgMOMxY=", "ref": "refs/heads/main", - "rev": "d6a1363a86cd99460f0020134e455d921e8bacd8", - "revCount": 114, + "rev": "b85b06577d8dcaa9ea4cd519b2b26dc575b06296", + "revCount": 98, "type": "git", "url": "https://github.com/hyprwm/hyprpicker" }, @@ -487,11 +487,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1751567624, - "narHash": "sha256-tUVODSZhvafXmuN+5SwZpNWV+2cvhSd+5IJ5TXu3YgI=", + "lastModified": 1739712272, + "narHash": "sha256-hWsYFTWgpZvKipKt1LCsG1DA+QpX3A0ccaYuHqwIzmg=", "ref": "refs/heads/main", - "rev": "4b2f0f9f46a6552930eecb979d18ac48d7079312", - "revCount": 23, + "rev": "d1811e4b6b91e0de8aa29b8bde78ec1c44f3debb", + "revCount": 15, "type": "git", "url": "https://github.com/hyprwm/hyprsunset" }, @@ -512,11 +512,11 @@ ] }, "locked": { - "lastModified": 1751888065, - "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "a8229739cf36d159001cfc203871917b83fdf917", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1749135356, - "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1749135356, - "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -587,11 +587,11 @@ ] }, "locked": { - "lastModified": 1751881472, - "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -612,11 +612,11 @@ ] }, "locked": { - "lastModified": 1749145760, - "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -637,11 +637,11 @@ ] }, "locked": { - "lastModified": 1749145760, - "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -665,22 +665,6 @@ "type": "github" } }, - "logseq": { - "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -688,11 +672,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -730,11 +714,11 @@ ] }, "locked": { - "lastModified": 1751509240, - "narHash": "sha256-ejnxldFzqwnY791ycFOxqtPswYZ6dVtj2G4GfhSL4Fo=", + "lastModified": 1740623111, + "narHash": "sha256-gzy5AT6SWUlJm5N/l03/QZ9dyV3TIQ23m0Oqi/KEiy8=", "owner": "nixpak", "repo": "nixpak", - "rev": "9361c8e7d5d43c64d60d2d858d2ed754f549b969", + "rev": "94deaa9e812a0e206f01bff124c2df4d8efcda7d", "type": "github" }, "original": { @@ -745,11 +729,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -760,11 +744,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { @@ -776,11 +760,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -793,14 +777,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1752007280, - "narHash": "sha256-9KEYoE5sew1DUsq/HhpvR0HXirSs5qzg1mesgFyl/18=", + "lastModified": 1740776117, + "narHash": "sha256-zQuEScC1oP5q9Qtu+IthuD9AUeYx0f9dGCqHYxkVUDE=", "owner": "nix-community", "repo": "NUR", - "rev": "c997e0952b5b79e642f56cd00c2165573c2466a3", + "rev": "2efd087395c3c3a0778af4bfb79ea8955a5dbb17", "type": "github" }, "original": { @@ -819,11 +804,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -839,11 +824,11 @@ ] }, "locked": { - "lastModified": 1752146885, - "narHash": "sha256-ZJK989GL+bTCQSxbG8v8/7tHMCEl/FPovkeDBNyClQE=", + "lastModified": 1740134292, + "narHash": "sha256-fwPikeafRlou5yWgLArYDwY1VlJ3v/WFk3uRmYR3QCs=", "ref": "refs/heads/master", - "rev": "d7079b75241c6e2b67f2429996fa7679ffc052e2", - "revCount": 616, + "rev": "d1a172751d62af47c6b5bccd7545768ebd2cb2c4", + "revCount": 486, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -862,7 +847,6 @@ "hyprpicker": "hyprpicker", "hyprsunset": "hyprsunset", "impurity": "impurity", - "logseq": "logseq", "nix-index-database": "nix-index-database", "nix-qml-support": "nix-qml-support", "nixpak": "nixpak", @@ -880,11 +864,11 @@ ] }, "locked": { - "lastModified": 1751942411, - "narHash": "sha256-01uMHCt2U9tP4f24DGch145tT8YQppLY5TC9mWK7O0A=", + "lastModified": 1740709839, + "narHash": "sha256-4dF++MXIXna/AwlZWDKr7bgUmY4xoEwvkF1GewjNrt0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c587235f892930a61c9e415f0d9792a1b27a41a2", + "rev": "b4270835bf43c6f80285adac6f66a26d83f0f277", "type": "github" }, "original": { @@ -895,16 +879,16 @@ }, "stable": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -968,6 +952,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -996,11 +1001,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 3b24625..ca40607 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -70,6 +70,7 @@ misc { } render { + explicit_sync = true #direct_scanout = true } diff --git a/modules/overlay-pkgs/cantata/default.nix b/modules/overlay-pkgs/cantata/default.nix index 3dfa576..448b8bc 100644 --- a/modules/overlay-pkgs/cantata/default.nix +++ b/modules/overlay-pkgs/cantata/default.nix @@ -83,13 +83,13 @@ let in stdenv.mkDerivation rec { pname = "cantata"; - version = "3.3.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "nullobsi"; repo = "cantata"; - rev = "a19efdf9649c50320f8592f07d82734c352ace9c"; - sha256 = "TVqgTYpHyU1OM9XddJ915GM1XQQrhH9V7yhSxQOaXRs="; + rev = "1ced66aaf82dad2137c01e887a88c10a4269467e"; + sha256 = "NLHkX9kZeb0ED48I6qOajj2/e9rsGbtLX9+BSzG00tI="; }; patches = [ diff --git a/modules/user/modules/quickshell/shell/background/BackgroundImage.qml b/modules/user/modules/quickshell/shell/background/BackgroundImage.qml index eccf02a..c2d48c2 100644 --- a/modules/user/modules/quickshell/shell/background/BackgroundImage.qml +++ b/modules/user/modules/quickshell/shell/background/BackgroundImage.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import qs.lock as Lock +import "../lock" as Lock Item { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Bar.qml b/modules/user/modules/quickshell/shell/bar/Bar.qml index 955993c..ac7edbf 100644 --- a/modules/user/modules/quickshell/shell/bar/Bar.qml +++ b/modules/user/modules/quickshell/shell/bar/Bar.qml @@ -3,11 +3,11 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import qs.bar.systray as SysTray -import qs.bar.audio as Audio -import qs.bar.mpris as Mpris -import qs.bar.power as Power -import qs.notifications as Notifs +import "systray" as SysTray +import "audio" as Audio +import "mpris" as Mpris +import "power" as Power +import "../notifications" as Notifs BarContainment { id: root diff --git a/modules/user/modules/quickshell/shell/bar/BarContainment.qml b/modules/user/modules/quickshell/shell/bar/BarContainment.qml index f0a6317..c9d9b25 100644 --- a/modules/user/modules/quickshell/shell/bar/BarContainment.qml +++ b/modules/user/modules/quickshell/shell/bar/BarContainment.qml @@ -2,8 +2,8 @@ import QtQuick import Quickshell import Quickshell.Hyprland import Quickshell.Wayland -import qs -import qs.lock as Lock +import ".." +import "../lock" as Lock PanelWindow { id: root diff --git a/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml b/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml index 2b943d8..619e7e7 100644 --- a/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml +++ b/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml @@ -1,5 +1,5 @@ import QtQuick -import qs +import ".." Rectangle { color: ShellGlobals.colors.widget diff --git a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml index 08c7f44..e9a1d9f 100644 --- a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml +++ b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import qs +import ".." BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Tooltip.qml b/modules/user/modules/quickshell/shell/bar/Tooltip.qml index bf68795..10b8c5a 100644 --- a/modules/user/modules/quickshell/shell/bar/Tooltip.qml +++ b/modules/user/modules/quickshell/shell/bar/Tooltip.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland -import qs +import "root:/" Scope { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Workspaces.qml b/modules/user/modules/quickshell/shell/bar/Workspaces.qml index a7456e9..5dc18d4 100644 --- a/modules/user/modules/quickshell/shell/bar/Workspaces.qml +++ b/modules/user/modules/quickshell/shell/bar/Workspaces.qml @@ -3,8 +3,8 @@ pragma ComponentBehavior: Bound; import QtQuick import QtQuick.Layouts import Quickshell.Hyprland -import qs -import qs.bar +import ".." +import "root:." FullwidthMouseArea { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml b/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml index 4e33856..ab19af8 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.Pipewire -import qs.bar +import ".." ClickableIcon { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml b/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml index f910307..737f721 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.Services.Pipewire -import qs.bar +import ".." BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml b/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml index 1a44257..98d8d6d 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml @@ -2,8 +2,8 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.Services.Pipewire -import qs -import qs.bar +import ".." +import "../.." ColumnLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml b/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml index 52d3278..36491b6 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts import Quickshell.Services.Pipewire -import qs.bar +import ".." RowLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml index 4c7b81c..bfdacc8 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml @@ -2,8 +2,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import qs -import qs.bar +import ".." +import "../.." BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml b/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml index 09ec3e0..24977f7 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml @@ -6,7 +6,7 @@ import QtQuick import Quickshell import Quickshell.Io import Quickshell.Services.Mpris -import qs +import "../.." Singleton { id: root; diff --git a/modules/user/modules/quickshell/shell/bar/mpris/Players.qml b/modules/user/modules/quickshell/shell/bar/mpris/Players.qml index c772d4f..4f52d96 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/Players.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/Players.qml @@ -6,8 +6,8 @@ import QtQuick.Layouts import Qt5Compat.GraphicalEffects import Quickshell import Quickshell.Services.Mpris -import qs -import qs.bar +import ".." +import "../.." FullwidthMouseArea { id: root @@ -679,8 +679,8 @@ FullwidthMouseArea { onColorsChanged: console.log(colors) } - grooveColor: quant.colors.length === 0 ? "#30ceffff" : Qt.alpha(quant.colors[0], 0.5) - barColor: quant.colors.length === 0 ? "#80ceffff" : Qt.alpha(Qt.lighter(quant.colors[0]), 0.9) + grooveColor: quant.colors.length === 0 ? "#30ceffff" : Qt.alpha(quant.colors[0], 0.2) + barColor: quant.colors.length === 0 ? "#80ceffff" : Qt.alpha(Qt.lighter(quant.colors[0]), 0.5) Behavior on grooveColor { ColorAnimation { duration: 200 } } Behavior on barColor { ColorAnimation { duration: 200 } } diff --git a/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml b/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml index 3c08eee..335e8d9 100644 --- a/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml +++ b/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.UPower -import qs +import "root:." Item { id: root diff --git a/modules/user/modules/quickshell/shell/bar/power/Power.qml b/modules/user/modules/quickshell/shell/bar/power/Power.qml index 3df1991..93a8ac6 100644 --- a/modules/user/modules/quickshell/shell/bar/power/Power.qml +++ b/modules/user/modules/quickshell/shell/bar/power/Power.qml @@ -4,9 +4,10 @@ import QtQuick.Controls import Quickshell import Quickshell.Services.UPower import Quickshell.Widgets -import qs -import qs.bar -import qs.components +import ".." +import "root:." +import "root:components" +import "power" BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml index 257229d..c01e8fe 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Shapes -import qs +import "../.." Rectangle { property var checkState: Qt.Unchecked; diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml index 7271841..e7592e2 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Widgets import Quickshell.DBusMenu -import qs +import "../.." MouseArea { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml index adabdf5..9a2d8d0 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml @@ -1,5 +1,5 @@ import QtQuick -import qs +import "../.." Rectangle { property var checkState: Qt.Unchecked; diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml index fc80aea..da02e5c 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.DBusMenu -import qs +import "../.." ColumnLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml b/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml index 2a08868..b393268 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import QtQuick.Effects import Quickshell import Quickshell.Services.SystemTray -import qs.bar +import ".." BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/lock/Controller.qml b/modules/user/modules/quickshell/shell/lock/Controller.qml index ffa6ac0..5d9b860 100644 --- a/modules/user/modules/quickshell/shell/lock/Controller.qml +++ b/modules/user/modules/quickshell/shell/lock/Controller.qml @@ -7,8 +7,8 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Hyprland import Quickshell.Services.Pam -import qs -import qs.background +import ".." +import "../background" Singleton { id: root diff --git a/modules/user/modules/quickshell/shell/lock/LockButton.qml b/modules/user/modules/quickshell/shell/lock/LockButton.qml index a7cf394..74beede 100644 --- a/modules/user/modules/quickshell/shell/lock/LockButton.qml +++ b/modules/user/modules/quickshell/shell/lock/LockButton.qml @@ -1,5 +1,5 @@ import QtQuick -import qs +import "root:." Item { id: root diff --git a/modules/user/modules/quickshell/shell/lock/LockContent.qml b/modules/user/modules/quickshell/shell/lock/LockContent.qml index a2389e3..c8b6eb2 100644 --- a/modules/user/modules/quickshell/shell/lock/LockContent.qml +++ b/modules/user/modules/quickshell/shell/lock/LockContent.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import qs +import ".." Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml index 192b332..cca2581 100644 --- a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml +++ b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import qs.components +import "../components" Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml b/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml index a395a7b..c71a2c8 100644 --- a/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml +++ b/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml @@ -1,8 +1,8 @@ import QtQuick import QtQuick.Effects import Qt5Compat.GraphicalEffects -import qs.components -import qs.shaders as Shaders +import "../components" +import "../shaders" as Shaders Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml b/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml index 6d3d723..ec75697 100644 --- a/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml +++ b/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Controls -import qs.bar +import "../bar" BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml b/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml index 88d2946..26cad48 100644 --- a/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml +++ b/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import Quickshell.Services.Notifications -import qs +import ".." Rectangle { id: root diff --git a/modules/user/modules/quickshell/shell/screenshot/Controller.qml b/modules/user/modules/quickshell/shell/screenshot/Controller.qml index ad864a8..ffb92a2 100644 --- a/modules/user/modules/quickshell/shell/screenshot/Controller.qml +++ b/modules/user/modules/quickshell/shell/screenshot/Controller.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import Quickshell.Io import Quickshell.Wayland -import qs +import ".." Scope { id: root