From 876c8abe9dd49d10d84ee804635843fb5ca11b98 Mon Sep 17 00:00:00 2001 From: Wittano Bonarotti Date: Sat, 10 Aug 2024 11:22:28 +0200 Subject: [PATCH] refactor(qtile): format files and renamed variables --- Pipfile.lock | 223 --------------------------- Pipfile => dotfiles/qtile/Pipfile | 2 +- dotfiles/qtile/Pipfile.lock | 238 +++++++++++++++++++++++++++++ dotfiles/qtile/binds/keyboard.py | 196 +++++++++++++++--------- dotfiles/qtile/config.py | 13 +- dotfiles/qtile/layout/floating.py | 2 +- dotfiles/qtile/layout/layouts.py | 78 +++++----- dotfiles/qtile/scripts/monitors.py | 14 +- 8 files changed, 416 insertions(+), 350 deletions(-) delete mode 100644 Pipfile.lock rename Pipfile => dotfiles/qtile/Pipfile (90%) create mode 100644 dotfiles/qtile/Pipfile.lock diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index a4c10397..00000000 --- a/Pipfile.lock +++ /dev/null @@ -1,223 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "1dc790625e7420c361a4caa073df67c1f7d987b32dd00b9e2f1cab82099f55b3" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.11" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "black": { - "hashes": [ - "sha256:257d724c2c9b1660f353b36c802ccece186a30accc7742c176d29c146df6e474", - "sha256:37aae07b029fa0174d39daf02748b379399b909652a806e5708199bd93899da1", - "sha256:415e686e87dbbe6f4cd5ef0fbf764af7b89f9057b97c908742b6008cc554b9c0", - "sha256:48a85f2cb5e6799a9ef05347b476cce6c182d6c71ee36925a6c194d074336ef8", - "sha256:7768a0dbf16a39aa5e9a3ded568bb545c8c2727396d063bbaf847df05b08cd96", - "sha256:7e122b1c4fb252fd85df3ca93578732b4749d9be076593076ef4d07a0233c3e1", - "sha256:88c57dc656038f1ab9f92b3eb5335ee9b021412feaa46330d5eba4e51fe49b04", - "sha256:8e537d281831ad0e71007dcdcbe50a71470b978c453fa41ce77186bbe0ed6021", - "sha256:98e123f1d5cfd42f886624d84464f7756f60ff6eab89ae845210631714f6db94", - "sha256:accf49e151c8ed2c0cdc528691838afd217c50412534e876a19270fea1e28e2d", - "sha256:b1530ae42e9d6d5b670a34db49a94115a64596bc77710b1d05e9801e62ca0a7c", - "sha256:b9176b9832e84308818a99a561e90aa479e73c523b3f77afd07913380ae2eab7", - "sha256:bdde6f877a18f24844e381d45e9947a49e97933573ac9d4345399be37621e26c", - "sha256:be8bef99eb46d5021bf053114442914baeb3649a89dc5f3a555c88737e5e98fc", - "sha256:bf10f7310db693bb62692609b397e8d67257c55f949abde4c67f9cc574492cc7", - "sha256:c872b53057f000085da66a19c55d68f6f8ddcac2642392ad3a355878406fbd4d", - "sha256:d36ed1124bb81b32f8614555b34cc4259c3fbc7eec17870e8ff8ded335b58d8c", - "sha256:da33a1a5e49c4122ccdfd56cd021ff1ebc4a1ec4e2d01594fef9b6f267a9e741", - "sha256:dd1b5a14e417189db4c7b64a6540f31730713d173f0b63e55fabd52d61d8fdce", - "sha256:e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb", - "sha256:eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063", - "sha256:ef703f83fc32e131e9bcc0a5094cfe85599e7109f896fe8bc96cc402f3eb4b6e" - ], - "index": "pypi", - "version": "==24.4.2" - }, - "cairocffi": { - "extras": [ - "xcb" - ], - "hashes": [ - "sha256:1f29a8d41dbda4090c0aa33bcdea64f3b493e95f74a43ea107c4a8a7b7f632ef", - "sha256:7761863603894305f3160eca68452f373433ca8745ab7dd445bd2c6ce50dcab7" - ], - "markers": "python_version >= '3.8'", - "version": "==1.7.0" - }, - "cffi": { - "hashes": [ - "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc", - "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a", - "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417", - "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab", - "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520", - "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36", - "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743", - "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8", - "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed", - "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684", - "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56", - "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324", - "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d", - "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235", - "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e", - "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088", - "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000", - "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7", - "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e", - "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673", - "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c", - "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe", - "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2", - "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098", - "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8", - "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a", - "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0", - "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b", - "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896", - "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e", - "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9", - "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2", - "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b", - "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6", - "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404", - "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f", - "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0", - "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4", - "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc", - "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936", - "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba", - "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872", - "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb", - "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614", - "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1", - "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d", - "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969", - "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b", - "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4", - "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627", - "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956", - "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357" - ], - "markers": "python_version >= '3.8'", - "version": "==1.16.0" - }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, - "mypy": { - "hashes": [ - "sha256:075cbf81f3e134eadaf247de187bd604748171d6b79736fa9b6c9685b4083061", - "sha256:12b6bfc1b1a66095ab413160a6e520e1dc076a28f3e22f7fb25ba3b000b4ef99", - "sha256:1ec404a7cbe9fc0e92cb0e67f55ce0c025014e26d33e54d9e506a0f2d07fe5de", - "sha256:28d0e038361b45f099cc086d9dd99c15ff14d0188f44ac883010e172ce86c38a", - "sha256:2b0695d605ddcd3eb2f736cd8b4e388288c21e7de85001e9f85df9187f2b50f9", - "sha256:3236a4c8f535a0631f85f5fcdffba71c7feeef76a6002fcba7c1a8e57c8be1ec", - "sha256:3be66771aa5c97602f382230165b856c231d1277c511c9a8dd058be4784472e1", - "sha256:3d087fcbec056c4ee34974da493a826ce316947485cef3901f511848e687c131", - "sha256:3f298531bca95ff615b6e9f2fc0333aae27fa48052903a0ac90215021cdcfa4f", - "sha256:4a2b5cdbb5dd35aa08ea9114436e0d79aceb2f38e32c21684dcf8e24e1e92821", - "sha256:4cf18f9d0efa1b16478c4c129eabec36148032575391095f73cae2e722fcf9d5", - "sha256:8b2cbaca148d0754a54d44121b5825ae71868c7592a53b7292eeb0f3fdae95ee", - "sha256:8f55583b12156c399dce2df7d16f8a5095291354f1e839c252ec6c0611e86e2e", - "sha256:92f93b21c0fe73dc00abf91022234c79d793318b8a96faac147cd579c1671746", - "sha256:9e36fb078cce9904c7989b9693e41cb9711e0600139ce3970c6ef814b6ebc2b2", - "sha256:9fd50226364cd2737351c79807775136b0abe084433b55b2e29181a4c3c878c0", - "sha256:a781f6ad4bab20eef8b65174a57e5203f4be627b46291f4589879bf4e257b97b", - "sha256:a87dbfa85971e8d59c9cc1fcf534efe664d8949e4c0b6b44e8ca548e746a8d53", - "sha256:b808e12113505b97d9023b0b5e0c0705a90571c6feefc6f215c1df9381256e30", - "sha256:bc6ac273b23c6b82da3bb25f4136c4fd42665f17f2cd850771cb600bdd2ebeda", - "sha256:cd777b780312ddb135bceb9bc8722a73ec95e042f911cc279e2ec3c667076051", - "sha256:da1cbf08fb3b851ab3b9523a884c232774008267b1f83371ace57f412fe308c2", - "sha256:e22e1527dc3d4aa94311d246b59e47f6455b8729f4968765ac1eacf9a4760bc7", - "sha256:f8c083976eb530019175aabadb60921e73b4f45736760826aa1689dda8208aee", - "sha256:f90cff89eea89273727d8783fef5d4a934be2fdca11b47def50cf5d311aff727", - "sha256:fa7ef5244615a2523b56c034becde4e9e3f9b034854c93639adb667ec9ec2976", - "sha256:fcfc70599efde5c67862a07a1aaf50e55bce629ace26bb19dc17cece5dd31ca4" - ], - "index": "pypi", - "version": "==1.10.0" - }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, - "packaging": { - "hashes": [ - "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9" - ], - "markers": "python_version >= '3.7'", - "version": "==24.0" - }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee", - "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" - ], - "markers": "python_version >= '3.8'", - "version": "==4.2.2" - }, - "pycparser": { - "hashes": [ - "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", - "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc" - ], - "markers": "python_version >= '3.8'", - "version": "==2.22" - }, - "qtile": { - "hashes": [ - "sha256:2c806f94dbf67a8ce1e0cd3fa425b95e3fdc5258e28d766dfecd866a7f5806b5", - "sha256:6674b0702ef149012f47c59a8fc0dcfdbf7bf017e4a4a4286bf1baf661864e09", - "sha256:7bfd065cd1835ed6405bf3ab65eec6982be409bcd93f924ac6a7cf78d3c0920c", - "sha256:7e61d052ee53440be84068ecd8eb1b150f21b24a74375301def97bc52f2bba97" - ], - "index": "pypi", - "version": "==0.26.0" - }, - "typing-extensions": { - "hashes": [ - "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a", - "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1" - ], - "markers": "python_version >= '3.8'", - "version": "==4.12.1" - }, - "xcffib": { - "hashes": [ - "sha256:a95c9465f2f97b4fcede606bd1e08407a32df71cb760fd57bfe53677db691acc" - ], - "version": "==1.5.0" - } - }, - "develop": {} -} diff --git a/Pipfile b/dotfiles/qtile/Pipfile similarity index 90% rename from Pipfile rename to dotfiles/qtile/Pipfile index 4cc53961..ec5aebcf 100644 --- a/Pipfile +++ b/dotfiles/qtile/Pipfile @@ -4,7 +4,7 @@ verify_ssl = true name = "pypi" [packages] -qtile = "*" +qtile = "0.25.0" mypy = "*" black = "*" diff --git a/dotfiles/qtile/Pipfile.lock b/dotfiles/qtile/Pipfile.lock new file mode 100644 index 00000000..d5fd484e --- /dev/null +++ b/dotfiles/qtile/Pipfile.lock @@ -0,0 +1,238 @@ +{ + "_meta": { + "hash": { + "sha256": "ca0fed4eda84492e01c73a85d81cc7d57af0b8c97b757dfc8e1608ef4a2c30c3" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.11" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "black": { + "hashes": [ + "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6", + "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e", + "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f", + "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018", + "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e", + "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd", + "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4", + "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed", + "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2", + "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42", + "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af", + "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb", + "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368", + "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb", + "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af", + "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed", + "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47", + "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2", + "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a", + "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c", + "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920", + "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1" + ], + "index": "pypi", + "version": "==24.8.0" + }, + "cairocffi": { + "extras": [ + "xcb" + ], + "hashes": [ + "sha256:2e48ee864884ec4a3a34bfa8c9ab9999f688286eb714a15a43ec9d068c36557b", + "sha256:9803a0e11f6c962f3b0ae2ec8ba6ae45e957a146a004697a1ac1bbf16b073b3f" + ], + "markers": "python_version >= '3.8'", + "version": "==1.7.1" + }, + "cffi": { + "hashes": [ + "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f", + "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab", + "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499", + "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058", + "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693", + "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb", + "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377", + "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885", + "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2", + "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401", + "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4", + "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b", + "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59", + "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f", + "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c", + "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555", + "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa", + "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424", + "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb", + "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2", + "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8", + "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e", + "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9", + "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82", + "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828", + "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759", + "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc", + "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118", + "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf", + "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932", + "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a", + "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29", + "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206", + "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2", + "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c", + "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c", + "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0", + "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a", + "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195", + "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6", + "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9", + "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc", + "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb", + "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0", + "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7", + "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb", + "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a", + "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492", + "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720", + "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42", + "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7", + "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d", + "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d", + "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb", + "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4", + "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2", + "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b", + "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8", + "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e", + "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204", + "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3", + "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150", + "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4", + "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76", + "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e", + "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb", + "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91" + ], + "markers": "python_version >= '3.8'", + "version": "==1.17.0" + }, + "click": { + "hashes": [ + "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", + "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" + ], + "markers": "python_version >= '3.7'", + "version": "==8.1.7" + }, + "mypy": { + "hashes": [ + "sha256:0624bdb940255d2dd24e829d99a13cfeb72e4e9031f9492148f410ed30bcab54", + "sha256:0bc71d1fb27a428139dd78621953effe0d208aed9857cb08d002280b0422003a", + "sha256:0bd53faf56de9643336aeea1c925012837432b5faf1701ccca7fde70166ccf72", + "sha256:11965c2f571ded6239977b14deebd3f4c3abd9a92398712d6da3a772974fad69", + "sha256:1a81cf05975fd61aec5ae16501a091cfb9f605dc3e3c878c0da32f250b74760b", + "sha256:2684d3f693073ab89d76da8e3921883019ea8a3ec20fa5d8ecca6a2db4c54bbe", + "sha256:2c63350af88f43a66d3dfeeeb8d77af34a4f07d760b9eb3a8697f0386c7590b4", + "sha256:45df906e8b6804ef4b666af29a87ad9f5921aad091c79cc38e12198e220beabd", + "sha256:4c956b49c5d865394d62941b109728c5c596a415e9c5b2be663dd26a1ff07bc0", + "sha256:64f4a90e3ea07f590c5bcf9029035cf0efeae5ba8be511a8caada1a4893f5525", + "sha256:749fd3213916f1751fff995fccf20c6195cae941dc968f3aaadf9bb4e430e5a2", + "sha256:79c07eb282cb457473add5052b63925e5cc97dfab9812ee65a7c7ab5e3cb551c", + "sha256:7b6343d338390bb946d449677726edf60102a1c96079b4f002dedff375953fc5", + "sha256:886c9dbecc87b9516eff294541bf7f3655722bf22bb898ee06985cd7269898de", + "sha256:a2b43895a0f8154df6519706d9bca8280cda52d3d9d1514b2d9c3e26792a0b74", + "sha256:a32fc80b63de4b5b3e65f4be82b4cfa362a46702672aa6a0f443b4689af7008c", + "sha256:a707ec1527ffcdd1c784d0924bf5cb15cd7f22683b919668a04d2b9c34549d2e", + "sha256:a831671bad47186603872a3abc19634f3011d7f83b083762c942442d51c58d58", + "sha256:b639dce63a0b19085213ec5fdd8cffd1d81988f47a2dec7100e93564f3e8fb3b", + "sha256:b868d3bcff720dd7217c383474008ddabaf048fad8d78ed948bb4b624870a417", + "sha256:c1952f5ea8a5a959b05ed5f16452fddadbaae48b5d39235ab4c3fc444d5fd411", + "sha256:d44be7551689d9d47b7abc27c71257adfdb53f03880841a5db15ddb22dc63edb", + "sha256:e1e30dc3bfa4e157e53c1d17a0dad20f89dc433393e7702b813c10e200843b03", + "sha256:e4fe9f4e5e521b458d8feb52547f4bade7ef8c93238dfb5bbc790d9ff2d770ca", + "sha256:f39918a50f74dc5969807dcfaecafa804fa7f90c9d60506835036cc1bc891dc8", + "sha256:f404a0b069709f18bbdb702eb3dcfe51910602995de00bd39cea3050b5772d08", + "sha256:fca4a60e1dd9fd0193ae0067eaeeb962f2d79e0d9f0f66223a0682f26ffcc809" + ], + "index": "pypi", + "version": "==1.11.1" + }, + "mypy-extensions": { + "hashes": [ + "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", + "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" + ], + "markers": "python_version >= '3.5'", + "version": "==1.0.0" + }, + "packaging": { + "hashes": [ + "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", + "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" + ], + "markers": "python_version >= '3.8'", + "version": "==24.1" + }, + "pathspec": { + "hashes": [ + "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", + "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" + ], + "markers": "python_version >= '3.8'", + "version": "==0.12.1" + }, + "platformdirs": { + "hashes": [ + "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee", + "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" + ], + "markers": "python_version >= '3.8'", + "version": "==4.2.2" + }, + "pycparser": { + "hashes": [ + "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", + "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc" + ], + "markers": "python_version >= '3.8'", + "version": "==2.22" + }, + "qtile": { + "hashes": [ + "sha256:30b530d83f5d283a48504bb1b9fcf34156591b5353e70bc245af7ee79264b16b", + "sha256:32430248561a0a48945db05233e035d63893de890e440267f992983d0d7e544d", + "sha256:46a3069257abe1219cb1cf548be004f6cf400a143aaa00527e042b23ba3a8deb", + "sha256:53387a09732fb494dc4e42f4417a29eea50884d2ac466082b51f89b1bf3f92db" + ], + "index": "pypi", + "version": "==0.27.0" + }, + "typing-extensions": { + "hashes": [ + "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", + "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" + ], + "markers": "python_version >= '3.8'", + "version": "==4.12.2" + }, + "xcffib": { + "hashes": [ + "sha256:a95c9465f2f97b4fcede606bd1e08407a32df71cb760fd57bfe53677db691acc" + ], + "version": "==1.5.0" + } + }, + "develop": {} +} diff --git a/dotfiles/qtile/binds/keyboard.py b/dotfiles/qtile/binds/keyboard.py index cc59ba22..fe8b9643 100644 --- a/dotfiles/qtile/binds/keyboard.py +++ b/dotfiles/qtile/binds/keyboard.py @@ -1,96 +1,154 @@ from typing import List -from libqtile.config import Key, Group +from libqtile.config import Group, Key from libqtile.lazy import lazy -from const import SUPER_KEY, SHIFT_KEY, ALT_KEY, CONTROL_KEY, TERMINAL, VOLUME_PERCENT_RATIO +from const import (ALT_KEY, CONTROL_KEY, SHIFT_KEY, SUPER_KEY, TERMINAL, + VOLUME_PERCENT_RATIO) from scripts import monitors def get_keybindings(groups: List[Group]) -> List[Key]: binds = [ Key([SUPER_KEY], "h", lazy.layout.left(), desc="Move focus to left"), - Key([SUPER_KEY], "l", lazy.layout.right(), desc="Move focus to right"), - Key([SUPER_KEY], "j", lazy.layout.down(), desc="Move focus down"), - Key([SUPER_KEY], "k", lazy.layout.up(), desc="Move focus up"), - - Key([SUPER_KEY, SHIFT_KEY], "h", lazy.layout.shuffle_left(), desc="Move window to the left"), - Key([SUPER_KEY, SHIFT_KEY], "l", lazy.layout.shuffle_right(), desc="Move window to the right"), - Key([SUPER_KEY, SHIFT_KEY], "j", lazy.layout.shuffle_down(), desc="Move window down"), - Key([SUPER_KEY, SHIFT_KEY], "k", lazy.layout.shuffle_up(), desc="Move window up"), - + Key( + [SUPER_KEY, SHIFT_KEY], + "h", + lazy.layout.shuffle_left(), + desc="Move window to the left", + ), + Key( + [SUPER_KEY, SHIFT_KEY], + "l", + lazy.layout.shuffle_right(), + desc="Move window to the right", + ), + Key( + [SUPER_KEY, SHIFT_KEY], + "j", + lazy.layout.shuffle_down(), + desc="Move window down", + ), + Key( + [SUPER_KEY, SHIFT_KEY], "k", lazy.layout.shuffle_up(), desc="Move window up" + ), Key([SUPER_KEY], "Return", lazy.spawn(TERMINAL), desc="Launch terminal"), - Key([SUPER_KEY], "Tab", lazy.next_layout(), desc="Toggle between layout"), - Key([SUPER_KEY], "q", lazy.window.kill(), desc="Kill focused window"), - Key([SUPER_KEY, ALT_KEY], "r", lazy.reload_config(), desc="Reload the config"), - Key([SUPER_KEY, ALT_KEY], "q", lazy.shutdown(), desc="Shutdown Qtile"), - - Key([SUPER_KEY], "f", lazy.window.toggle_fullscreen(), - desc="Put the focused window to/from fullscreen mode"), - - Key([SUPER_KEY], "s", lazy.window.toggle_floating(), - desc="Put the focused window to/from floating mode"), - - Key([SUPER_KEY, SHIFT_KEY], "p", lazy.spawn("flameshot gui"), - desc="Make screenshot"), - - Key([SUPER_KEY], "e", lazy.spawn("rofi -show drun"), - desc="Run rofi in dmenu mode"), - - Key([SUPER_KEY], "w", lazy.spawn("rofi -show window"), + Key( + [SUPER_KEY], + "f", + lazy.window.toggle_fullscreen(), + desc="Put the focused window to/from fullscreen mode", + ), + Key( + [SUPER_KEY], + "s", + lazy.window.toggle_floating(), + desc="Put the focused window to/from floating mode", + ), + Key( + [SUPER_KEY, SHIFT_KEY], + "p", + lazy.spawn("flameshot gui"), + desc="Make screenshot", + ), + Key( + [SUPER_KEY], + "e", + lazy.spawn("rofi -show drun"), + desc="Run rofi in dmenu mode", + ), + Key( + [SUPER_KEY], + "w", + lazy.spawn("rofi -show window"), desc=""" - Run rofi in window mode - special mode, + Run rofi in window mode - special mode, that show every opened applications on each workspaces - """), - - Key([SUPER_KEY], "m", lazy.spawn("amixer sset Master toggle"), - desc="Toggle mute/unmute volume"), - - Key([SUPER_KEY], "p", lazy.spawn(f"amixer sset Master {VOLUME_PERCENT_RATIO}%+"), - desc="Increases volume"), - - Key([SUPER_KEY], "o", lazy.spawn(f"amixer sset Master {VOLUME_PERCENT_RATIO}%-"), - desc="Decreases volume"), - - Key([SUPER_KEY], "space", monitors.swap_monitor, - desc="Toggle focused window between monitors"), - - Key([SUPER_KEY], "n", lazy.next_screen(), - desc="Toggle focused screen"), - - Key([SUPER_KEY, SHIFT_KEY], "q", lazy.spawn("switch-off"), - desc="Shutdown Linux"), - - Key([SUPER_KEY], "r", lazy.spawn("rollWallpaper"), - desc="Change wallpaper using rollWallpaper script"), + """, + ), + Key( + [SUPER_KEY], + "m", + lazy.spawn("amixer sset Master toggle"), + desc="Toggle mute/unmute volume", + ), + Key( + [SUPER_KEY], + "p", + lazy.spawn(f"amixer sset Master {VOLUME_PERCENT_RATIO}%+"), + desc="Increases volume", + ), + Key( + [SUPER_KEY], + "o", + lazy.spawn(f"amixer sset Master {VOLUME_PERCENT_RATIO}%-"), + desc="Decreases volume", + ), + Key( + [SUPER_KEY], + "space", + monitors.swap_monitor, + desc="Toggle focused window between monitors", + ), + Key([SUPER_KEY], "n", lazy.next_screen(), desc="Toggle focused screen"), + Key( + [SUPER_KEY, SHIFT_KEY], "q", lazy.spawn("switch-off"), desc="Shutdown Linux" + ), + Key( + [SUPER_KEY], + "r", + lazy.spawn("rollWallpaper"), + desc="Change wallpaper using rollWallpaper script", + ), ] for group in groups: additional_group_name = str((int(group.name) + 5) % 10) - binds.extend([ - Key([SUPER_KEY], group.name, lazy.group[group.name].toscreen(), - desc=f"Switch to group {group.name}"), - - Key([SUPER_KEY, SHIFT_KEY], group.name, lazy.window.togroup(group.name, switch_group=True), - desc=f"Switch to & move focused window to group {group.name}"), - - Key([SUPER_KEY, CONTROL_KEY], group.name, lazy.group[group.name].toscreen(1)), - - Key([SUPER_KEY], additional_group_name, lazy.group[group.name].toscreen(), - desc=f"Switch to group {additional_group_name}"), - - Key([SUPER_KEY, SHIFT_KEY], additional_group_name, lazy.window.togroup(group.name, switch_group=True), - desc=f"Switch to & move focused window to group {additional_group_name}"), - - Key([SUPER_KEY, CONTROL_KEY], additional_group_name, lazy.group[group.name].toscreen(1)) - ]) + binds.extend( + [ + Key( + [SUPER_KEY], + group.name, + lazy.group[group.name].toscreen(), + desc=f"Switch to group {group.name}", + ), + Key( + [SUPER_KEY, SHIFT_KEY], + group.name, + lazy.window.togroup(group.name, switch_group=True), + desc=f"Switch to & move focused window to group {group.name}", + ), + Key( + [SUPER_KEY, CONTROL_KEY], + group.name, + lazy.group[group.name].toscreen(1), + ), + Key( + [SUPER_KEY], + additional_group_name, + lazy.group[group.name].toscreen(), + desc=f"Switch to group {additional_group_name}", + ), + Key( + [SUPER_KEY, SHIFT_KEY], + additional_group_name, + lazy.window.togroup(group.name, switch_group=True), + desc=f"Switch to & move focused window to group {additional_group_name}", + ), + Key( + [SUPER_KEY, CONTROL_KEY], + additional_group_name, + lazy.group[group.name].toscreen(1), + ), + ] + ) return binds diff --git a/dotfiles/qtile/config.py b/dotfiles/qtile/config.py index f3b67cfb..303d4553 100755 --- a/dotfiles/qtile/config.py +++ b/dotfiles/qtile/config.py @@ -11,11 +11,9 @@ from libqtile.log_utils import logger import groups -from groups import games_staff +from layout import layouts from binds import keyboard, mouse -from const import DEFAULT_THEME from layout.floating import FLOATING_LAYOUT -from layout.layouts import LayoutsCollection from scripts import monitors from theme.screen import PRIMARY_SCREEN @@ -23,11 +21,10 @@ groups: List[Group] = groups.get_default_groups() keys: List[Key] = keyboard.get_keybindings(groups) -layout_collection = LayoutsCollection(DEFAULT_THEME) layouts = [ - layout_collection.max_layout, - layout_collection.monad_tall_layout + layouts.MAX, + layouts.MONAD_TALL ] widget_defaults = dict( @@ -79,14 +76,14 @@ async def move_non_games_from_game_workspace(_: Window): try: games_regex.append(re.compile(rex)) except re.error as err: - libqtile.log_utils.logger.error(f"Failed compile regex '{rex}', cause: {err}") + logger.error(f"Failed compile regex '{rex}', cause: {err}") windows: List[Window] = list( filter(lambda window: True not in [bool(x.search(window.get_wm_class()[0])) for x in games_regex], QTILE.groups_map["5"].windows)) if len(windows) == len(QTILE.groups_map["5"].windows): - libqtile.log_utils.logger.warning("No found any non-game window on gaming workspace") + logger.warning("No found any non-game window on gaming workspace") return for win in windows: diff --git a/dotfiles/qtile/layout/floating.py b/dotfiles/qtile/layout/floating.py index dafb0bd9..a847b73b 100644 --- a/dotfiles/qtile/layout/floating.py +++ b/dotfiles/qtile/layout/floating.py @@ -18,4 +18,4 @@ Match(title='branchdialog'), Match(wm_class=re.compile('[pP]inentry*')), ] -) \ No newline at end of file +) diff --git a/dotfiles/qtile/layout/layouts.py b/dotfiles/qtile/layout/layouts.py index 72889443..41ec8ff5 100644 --- a/dotfiles/qtile/layout/layouts.py +++ b/dotfiles/qtile/layout/layouts.py @@ -1,45 +1,41 @@ -from typing import Dict - from libqtile import layout +from const import DEFAULT_THEME -class LayoutsCollection: - - def __init__(self, theme: Dict[str, str]): - layout_theme = { - "margin": 30, - "border_width": 2, - "border_focus": theme["selection"], - "border_normal": theme["background"] - } +__layout_theme = { + "margin": 30, + "border_width": 2, + "border_focus": DEFAULT_THEME["selection"], + "border_normal": DEFAULT_THEME["background"] +} - self.column_layout = layout.Columns( - border_on_single=True, - border_normal_stack=layout_theme["border_normal"], - border_focus_stack=layout_theme["border_focus"], - **layout_theme - ) - self.max_layout = layout.Max(margin=0) - self.stack_layout = layout.Stack(num_stacks=2) - self.bspwm_layout = layout.Bsp(**layout_theme) - self.matrix_layout = layout.Matrix() - self.monad_tall_layout = layout.MonadTall( - change_ratio=0.2, - **layout_theme - ) - self.monad_wide_layout = layout.MonadWide(**layout_theme) - self.ratio_tile_layout = layout.RatioTile(**layout_theme) - self.tile_layout = layout.Tile(**layout_theme) - self.tree_tab_layout = layout.TreeTab( - panel_width=200, - margin_y=10, - active_bg=layout_theme["border_focus"], - inactive_bg=layout_theme["border_normal"], - **layout_theme - ), - self.vertical_tile_layout = layout.VerticalTile(**layout_theme) - self.zoomy_layout = layout.Zoomy(**layout_theme) - self.spiral_layout = layout.Spiral( - ratio=0.6, - new_client_position='after_current', - **layout_theme) +COLUMN = layout.Columns( + border_on_single=True, + border_normal_stack=__layout_theme["border_normal"], + border_focus_stack=__layout_theme["border_focus"], + **__layout_theme +) +MAX = layout.Max(margin=0) +STACK = layout.Stack(num_stacks=2) +BSPWM = layout.Bsp(**__layout_theme) +MATRIX = layout.Matrix() +MONAD_TALL = layout.MonadTall( + change_ratio=0.2, + **__layout_theme +) +MONAD_WIDE = layout.MonadWide(**__layout_theme) +RATIO_TILE = layout.RatioTile(**__layout_theme) +TILE = layout.Tile(**__layout_theme) +TREE_TAB = layout.TreeTab( + panel_width=200, + margin_y=10, + active_bg=__layout_theme["border_focus"], + inactive_bg=__layout_theme["border_normal"], + **__layout_theme +), +VERTICAL_TILE = layout.VerticalTile(**__layout_theme) +ZOMMY = layout.Zoomy(**__layout_theme) +SPIRAL = layout.Spiral( + ratio=0.6, + new_client_position='after_current', + **__layout_theme) diff --git a/dotfiles/qtile/scripts/monitors.py b/dotfiles/qtile/scripts/monitors.py index d032df70..71b1d2c0 100644 --- a/dotfiles/qtile/scripts/monitors.py +++ b/dotfiles/qtile/scripts/monitors.py @@ -2,14 +2,14 @@ import subprocess from typing import List, Optional -import libqtile.log_utils -from libqtile.command import lazy +from libqtile.log_utils import logger +from libqtile.lazy import lazy from libqtile.core.manager import Qtile WACOM_SCRIPT_PATH: str = f"{os.environ['HOME']}/projects/config/system/scripts/wacom-multi-monitor.sh" -def _map_to_output(selected_monitor: str) -> bytes: +def _map_to_output(selected_monitor: Optional[str]) -> bytes: return subprocess.Popen([ "bash", WACOM_SCRIPT_PATH, @@ -19,7 +19,7 @@ def _map_to_output(selected_monitor: str) -> bytes: def map_wacom_to_one_monitor(screen_index: int): monitors = _get_monitors_name() - error = _map_to_output(monitors[screen_index]) + error = _map_to_output(monitors[screen_index] if monitors is not None else None) if error: new_monitors = [f"HEAD-{i}" for i in range(len(monitors))] @@ -27,7 +27,7 @@ def map_wacom_to_one_monitor(screen_index: int): error = _map_to_output(new_monitors[screen_index]) if error: - libqtile.log_utils.logger.warning( + logger.warning( f"Script {WACOM_SCRIPT_PATH} was ended failure by cause: {bytes.decode(error)}") @@ -39,7 +39,7 @@ def get_monitor(x: str) -> str: monitors_list = bytes.decode(monitors_output).split("\n")[1:] if error: - libqtile.log_utils.logger.warning(f"Getting monitor failed: {error}") + logger.warning(f"Getting monitor failed: {error}") return None return [monitor for monitor in map(get_monitor, monitors_list) if monitor] @@ -60,7 +60,7 @@ def get_monitors_count() -> int: return len(list(filter(lambda x: x.strip() != '', monitors))) except Exception as error: - libqtile.log_utils.logger.warning(error) + logger.warning(error) return 1