diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | LICENSE | 704 | ||||
| -rw-r--r-- | Setup.hs | 12 | ||||
| -rw-r--r-- | cabal.project | 7 | ||||
| -rw-r--r-- | cabal.project.freeze | 35 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 15 | ||||
| -rw-r--r-- | hie.yaml | 7 | ||||
| -rw-r--r-- | package.yaml | 46 | ||||
| -rw-r--r-- | readme.org | 28 | ||||
| -rw-r--r-- | src/XMonad/Actions/FloatSnapSpaced.hs | 154 | ||||
| -rw-r--r-- | src/XMonad/Actions/PerConditionKeys.hs | 34 | ||||
| -rw-r--r-- | src/XMonad/Custom/Workspaces.hs | 34 | ||||
| -rw-r--r-- | src/exe/Main.hs (renamed from src/Main.hs) | 17 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Bindings.hs (renamed from src/XMonad/Custom/Bindings.hs) | 34 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Event.hs (renamed from src/XMonad/Custom/Event.hs) | 13 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Layout.hs (renamed from src/XMonad/Custom/Layout.hs) | 17 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Log.hs (renamed from src/XMonad/Custom/Log.hs) | 14 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Manage.hs (renamed from src/XMonad/Custom/Manage.hs) | 14 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Misc.hs (renamed from src/XMonad/Custom/Misc.hs) | 15 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Navigation.hs (renamed from src/XMonad/Custom/Navigation.hs) | 13 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Projects.hs (renamed from src/XMonad/Custom/Projects.hs) | 13 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Prompt.hs (renamed from src/XMonad/Custom/Prompt.hs) | 15 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Scratchpads.hs (renamed from src/XMonad/Custom/Scratchpads.hs) | 13 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Startup.hs (renamed from src/XMonad/Custom/Startup.hs) | 14 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Theme.hs (renamed from src/XMonad/Custom/Theme.hs) | 15 | ||||
| -rw-r--r-- | src/lib/XMonad/Custom/Workspaces.hs | 18 | ||||
| -rw-r--r-- | stack.yaml | 10 | ||||
| -rw-r--r-- | stack.yaml.lock | 12 | ||||
| -rw-r--r-- | xmobarrc/bot.hs | 65 | ||||
| -rw-r--r-- | xmobarrc/top.hs | 41 | ||||
| -rw-r--r-- | xmonad-ng.cabal | 113 |
32 files changed, 976 insertions, 580 deletions
diff --git a/.gitignore b/.gitignore index aaa160f..b384021 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,5 @@ -*.hi -*.o -.cabal-sandbox/ .direnv/ -.ghc.environment.* +.stack-work/ cabal.project.local -cabal.project.local~ -cabal.sandbox.config dist-newstyle/ -dist/ result diff --git a/LICENSE b/LICENSE index 18718e8..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,674 @@ -Copyright (c) 2018-2020, Azat Bahawi <azahi@teknik.io> - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of azahi nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 index 947ae65..0000000 --- a/Setup.hs +++ /dev/null @@ -1,12 +0,0 @@ --- | --- Module : Setup --- Copyright : (c) 2018-2020 Azat Bahawi --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable --- - -import Distribution.Simple - -main = defaultMain diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 6866765..0000000 --- a/cabal.project +++ /dev/null @@ -1,7 +0,0 @@ -packages: ./. - -package xmonad-contrib - flags: +with_xft - -package xmobar - flags: +with_xft diff --git a/cabal.project.freeze b/cabal.project.freeze new file mode 100644 index 0000000..83b5cb0 --- /dev/null +++ b/cabal.project.freeze @@ -0,0 +1,35 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.X11 ==1.10.2, + any.X11-xft ==0.3.1, + any.array ==0.5.4.0, + any.base ==4.14.3.0, + any.bytestring ==0.10.12.0, + any.containers ==0.6.5.1, + any.data-default ==0.7.1.1, + any.data-default-class ==0.1.2.0, + any.data-default-instances-containers ==0.0.1, + any.data-default-instances-dlist ==0.0.1, + any.data-default-instances-old-locale ==0.0.1, + any.deepseq ==1.4.4.0, + any.directory ==1.3.6.0, + any.dlist ==1.0, + any.extensible-exceptions ==0.1.1.4, + any.filepath ==1.4.2.1, + any.ghc-prim ==0.6.1, + any.integer-gmp ==1.0.3.0, + any.mtl ==2.2.2, + any.old-locale ==1.0.0.7, + any.old-time ==1.1.0.3, + any.process ==1.6.13.2, + any.random ==1.2.0, + any.rts ==1.0.1, + any.semigroups ==0.19.2, + any.setlocale ==1.0.0.10, + any.splitmix ==0.1.0.4, + any.time ==1.9.3, + any.transformers ==0.5.6.2, + any.unix ==2.7.2.2, + any.utf8-string ==1.0.2, + any.xmonad ==0.15, + any.xmonad-contrib ==0.16 +index-state: hackage.haskell.org 2021-11-22T20:41:46Z diff --git a/flake.lock b/flake.lock index f9f38e6..ae20847 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1637453606, - "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=", + "lastModified": 1637593665, + "narHash": "sha256-R7jKS7A+0tZS8qD5pBr1UFcMiTdsw5bfoxgXbYsoWhM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8afc4e543663ca0a6a4f496262cd05233737e732", + "rev": "98747f27ecfee70c8c97b195cbb94df80a074dda", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1fb71dc..7234537 100644 --- a/flake.nix +++ b/flake.nix @@ -19,12 +19,15 @@ inherit returnShellEnv; name = "xmonad-ng"; root = ./.; - withHoogle = false; - overrides = self: super: - with pkgs.haskell.lib; - { - # TODO Override xmobar. - }; + modifier = drv: + pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages; [ + brittany + cabal-install + haskell-language-server + hlint + hpack + stack + ]); }; in { defaultPackage.${system} = project false; diff --git a/hie.yaml b/hie.yaml new file mode 100644 index 0000000..361506d --- /dev/null +++ b/hie.yaml @@ -0,0 +1,7 @@ +cradle: + cabal: + - path: "src" + component: "lib:xmonad-ng" + + - path: "./Main.hs" + component: "xmonad-ng:exe:xmonad-ng" diff --git a/package.yaml b/package.yaml new file mode 100644 index 0000000..4bd1a71 --- /dev/null +++ b/package.yaml @@ -0,0 +1,46 @@ +--- +name: xmonad-ng +version: 2.0.1.0 +synopsis: Personal XMonad configuration +description: I hope no one will read this description. It's awful. +category: System +author: Azat Bahawi <azahi@teknik.io> +copyright: (c) Azat Bahawi 2018-2021 +license: GPL-3.0-or-later + +github: azahi/xmonad-ng + +ghc-options: + - -Wall + - -Wcompat + - -Wincomplete-record-updates + - -Wincomplete-uni-patterns + - -Wredundant-constraints + +dependencies: + - base >= 4.14 && < 5 + - xmonad >= 0.15 && < 0.16 + - xmonad-contrib >= 0.16 && < 0.17 + +library: + source-dirs: src/lib + dependencies: + - containers >= 0.6.5 && < 0.7 + - X11 >= 1.10.2 && < 1.11 + when: + - condition: false + other-modules: Paths_xmonad_ng + +executable: + source-dirs: src/exe + main: Main.hs + ghc-options: + - -rtsopts + - -threaded + - -v0 + - -with-rtsopts=-N + dependencies: + xmonad-ng + when: + - condition: false + other-modules: Paths_xmonad_ng diff --git a/readme.org b/readme.org index a21c018..ae5ee26 100644 --- a/readme.org +++ b/readme.org @@ -1,29 +1 @@ * xmonad-ng -** Example Installation -Clone this repository with submodules in the root of your home directory: -#+BEGIN_SRC -git clone --recursive https://github.com/azahi/xmonad-config ~/.xmonad -#+END_SRC - -Enter the cloned directory: -#+BEGIN_SRC -cd ~/.xmonad -#+END_SRC - -If you don't have a /xmonad/ executable in your PATH, depending on the build -system that you want to use, execute: -#+BEGIN_SRC -stack update -stack build -#+END_SRC -or -#+BEGIN_SRC -cabal new-update -cabal new-configure -cabal new-build -#+END_SRC - -If you have the /xmonad/ executable you can just simply run: -#+BEGIN_SRC -xmonad --recompile -#+END_SRC diff --git a/src/XMonad/Actions/FloatSnapSpaced.hs b/src/XMonad/Actions/FloatSnapSpaced.hs deleted file mode 100644 index ad14016..0000000 --- a/src/XMonad/Actions/FloatSnapSpaced.hs +++ /dev/null @@ -1,154 +0,0 @@ --- | --- Module : XMonad.Actions.FloatSnapSpaced --- Copyright : (c) 2009 Anders Engstrom <ankaan@gmail.com> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable --- - -module XMonad.Actions.FloatSnapSpaced - ( snapSpacedMagicMove - ) where - -import Data.List -import Data.Maybe -import Data.Set ( fromList ) -import XMonad -import XMonad.Hooks.ManageDocks -import qualified XMonad.StackSet as S - -snapSpacedMagicMove :: Int -> Maybe Int -> Maybe Int -> Window -> X () -snapSpacedMagicMove spacing collidedist snapdist w = - whenX (isClient w) $ withDisplay $ \d -> do - io $ raiseWindow d w - wa <- io $ getWindowAttributes d w - - nx <- handleAxis True d wa - ny <- handleAxis False d wa - - io $ moveWindow d w (fromIntegral nx) (fromIntegral ny) - float w - where - handleAxis horiz d wa = do - ((mbl, mbr, bs), (mfl, mfr, fs)) <- getSnap horiz collidedist d w - return $ if bs || fs - then wpos wa - else - let - b = case (mbl, mbr) of - (Just bl, Just br) -> - if wpos wa - bl < br - wpos wa then bl + spacing else br + spacing - (Just bl, Nothing) -> bl + spacing - (Nothing, Just br) -> br + spacing - (Nothing, Nothing) -> wpos wa + spacing - - f = case (mfl, mfr) of - (Just fl, Just fr) -> - if wpos wa + wdim wa - fl < fr - wpos wa - wdim wa - then fl - spacing - else fr - spacing - (Just fl, Nothing) -> fl - spacing - (Nothing, Just fr) -> fr - spacing - (Nothing, Nothing) -> wpos wa - spacing - - newpos = if abs (b - wpos wa) <= abs (f - wpos wa - wdim wa) - then b - else f - wdim wa - in - if isNothing snapdist || abs (newpos - wpos wa) <= fromJust snapdist - then newpos - else wpos wa - where (wpos, wdim, _, _) = constructors horiz - -getSnap - :: Bool - -> Maybe Int - -> Display - -> Window - -> X ((Maybe Int, Maybe Int, Bool), (Maybe Int, Maybe Int, Bool)) -getSnap horiz collidedist d w = do - wa <- io $ getWindowAttributes d w - screen <- S.current <$> gets windowset - let sr = screenRect $ S.screenDetail screen - wl = S.integrate' . S.stack $ S.workspace screen - gr <- fmap ($ sr) $ calcGap $ fromList [minBound .. maxBound] - wla <- filter (collides wa) - <$> io (mapM (getWindowAttributes d) $ filter (/= w) wl) - - return - ( neighbours (back wa sr gr wla) (wpos wa) - , neighbours (front wa sr gr wla) (wpos wa + wdim wa) - ) - where - wborder = fromIntegral . wa_border_width - - (wpos , wdim , rpos, rdim) = constructors horiz - (refwpos, refwdim, _ , _ ) = constructors $ not horiz - - back wa sr gr wla = - dropWhile (< rpos sr) - $ takeWhile (< rpos sr + rdim sr) - $ sort - $ rpos sr - : rpos gr - : (rpos gr + rdim gr) - : foldr - (\a as -> wpos a : (wpos a + wdim a + wborder a + wborder wa) : as) - [] - wla - - front wa sr gr wla = - dropWhile (<= rpos sr) - $ takeWhile (<= rpos sr + rdim sr) - $ sort - $ (rpos gr - 2 * wborder wa) - : (rpos gr + rdim gr - 2 * wborder wa) - : (rpos sr + rdim sr - 2 * wborder wa) - : foldr - (\a as -> (wpos a - wborder a - wborder wa) : (wpos a + wdim a) : as) - [] - wla - - neighbours l v = - ( listToMaybe $ reverse $ takeWhile (< v) l - , listToMaybe $ dropWhile (<= v) l - , v `elem` l - ) - - collides wa oa = case collidedist of - Nothing -> True - Just dist -> - refwpos oa - - wborder oa - < refwpos wa - + refwdim wa - + wborder wa - + dist - && refwpos wa - - wborder wa - - dist - < refwpos oa - + refwdim oa - + wborder oa - - -constructors - :: Bool - -> ( WindowAttributes -> Int - , WindowAttributes -> Int - , Rectangle -> Int - , Rectangle -> Int - ) -constructors True = - ( fromIntegral . wa_x - , fromIntegral . wa_width - , fromIntegral . rect_x - , fromIntegral . rect_width - ) -constructors False = - ( fromIntegral . wa_y - , fromIntegral . wa_height - , fromIntegral . rect_y - , fromIntegral . rect_height - ) diff --git a/src/XMonad/Actions/PerConditionKeys.hs b/src/XMonad/Actions/PerConditionKeys.hs deleted file mode 100644 index 09372cd..0000000 --- a/src/XMonad/Actions/PerConditionKeys.hs +++ /dev/null @@ -1,34 +0,0 @@ --- | --- Module : XMonad.Actions.PerConditionKeys --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable --- - -module XMonad.Actions.PerConditionKeys - ( XCond(..) - , chooseAction - , bindOn - ) where - -import Data.List -import XMonad -import qualified XMonad.StackSet as S - -data XCond = WS | LD - -chooseAction :: XCond -> (String -> X ()) -> X () -chooseAction WS f = withWindowSet (f . S.currentTag) -chooseAction LD f = - withWindowSet (f . description . S.layout . S.workspace . S.current) - -bindOn :: XCond -> [(String, X ())] -> X () -bindOn xc bindings = chooseAction xc chooser - where - chooser x = case find ((x ==) . fst) bindings of - Just (_, action) -> action - Nothing -> case find (("" ==) . fst) bindings of - Just (_, action) -> action - Nothing -> return () diff --git a/src/XMonad/Custom/Workspaces.hs b/src/XMonad/Custom/Workspaces.hs deleted file mode 100644 index 65d1b14..0000000 --- a/src/XMonad/Custom/Workspaces.hs +++ /dev/null @@ -1,34 +0,0 @@ --- | --- Module : XMonad.Custom.Workspaces --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable --- - -module XMonad.Custom.Workspaces - ( workspaces - ) where - -import XMonad.Actions.DynamicProjects -import XMonad.Core hiding ( workspaces ) - -workspaces :: [WorkspaceId] -workspaces = map show [1 .. 9 :: Int] - -projects :: [Project] -projects = - [ Project { projectName = "scratch" - , projectDirectory = "~/" - , projectStartHook = Nothing - } - , Project { projectName = "www" - , projectDirectory = "~/" - , projectStartHook = Nothing - } - , Project { projectName = "mail" - , projectDirectory = "~/" - , projectStartHook = Nothing - } - ] diff --git a/src/Main.hs b/src/exe/Main.hs index 74b63a1..3a57650 100644 --- a/src/Main.hs +++ b/src/exe/Main.hs @@ -1,10 +1,12 @@ -- | --- Module : Main --- Copyright : (c) 2018-2020 Azat Bahawi --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : Main +-- Description : Entrypoint +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable +-- module Main where @@ -17,7 +19,6 @@ import XMonad ( Default(def) , handleEventHook , keys , layoutHook - , logHook , manageHook , modMask , mouseBindings @@ -33,7 +34,6 @@ import XMonad.Actions.Navigation2D ( withNavigation2DConfig ) import qualified XMonad.Custom.Bindings as C import qualified XMonad.Custom.Event as C import qualified XMonad.Custom.Layout as C -import qualified XMonad.Custom.Log as C import qualified XMonad.Custom.Manage as C import qualified XMonad.Custom.Misc as C import qualified XMonad.Custom.Navigation as C @@ -61,7 +61,6 @@ main = , focusedBorderColor = C.colorF , modMask = C.modMask , keys = C.keys - , logHook = C.logHook , startupHook = C.startupHook , mouseBindings = C.mouseBindings , manageHook = C.manageHook diff --git a/src/XMonad/Custom/Bindings.hs b/src/lib/XMonad/Custom/Bindings.hs index de0fd26..208ccdf 100644 --- a/src/XMonad/Custom/Bindings.hs +++ b/src/lib/XMonad/Custom/Bindings.hs @@ -1,12 +1,13 @@ {-# LANGUAGE LambdaCase #-} -- | --- Module : XMonad.Custom.Bindings --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Bindings +-- Description : Key bindings and keys configuration +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Bindings @@ -29,10 +30,8 @@ import XMonad.Actions.DynamicWorkspaces import qualified XMonad.Actions.FlexibleManipulate as F import XMonad.Actions.FloatSnap -import XMonad.Actions.FloatSnapSpaced import XMonad.Actions.MessageFeedback import XMonad.Actions.Navigation2D -import XMonad.Actions.PerConditionKeys import XMonad.Actions.Promote import XMonad.Actions.UpdatePointer import XMonad.Actions.WithAll @@ -70,6 +69,7 @@ wsKeys = map show [1 .. 9 :: Int] zipKeys :: [a] -> [[a]] -> [t1] -> (t1 -> b) -> [([a], b)] zipKeys m ks as f = zipWith (\k d -> (m ++ k, f d)) ks as + zipKeys' :: [a] -> [[a]] -> [t1] -> (t1 -> t2 -> b) -> t2 -> [([a], b)] zipKeys' m ks as f b = zipWith (\k d -> (m ++ k, f d b)) ks as @@ -126,8 +126,9 @@ rawKeys c = withUpdatePointer $ concatMap ($ c) keymaps keysBase :: XConfig Layout -> [(String, X ())] keysBase _ = [ ("M-S-q", confirmPrompt hotPromptTheme "Quit XMonad?" $ io exitSuccess) - , ("M-q" , spawn "xmonad --restart") -- TODO Replace with interal calls - , ("M-C-q", spawn "xmonad --recompile && xmonad --restart") + , ("M-q" , spawn "xmonad --restart") + , -- TODO Replace with interal calls + ("M-C-q", spawn "xmonad --recompile && xmonad --restart") , ("M-x" , shellPrompt promptTheme) , ("M-w" , windowPrompt promptTheme Goto allWindows) , ("M-S-w", windowPrompt promptTheme Bring allWindows) @@ -135,8 +136,9 @@ keysBase _ = keysSystem :: XConfig Layout -> [(String, X ())] keysSystem _ = - [ ("M-C-g" , return ()) -- TODO Replace scripts with internal functions - , ("<XF86ScreenSaver>", spawn "~/.xmonad/scripts/screenlock.sh") + [ ("M-C-g" , return ()) + , -- TODO Replace scripts with internal functions + ("<XF86ScreenSaver>", spawn "~/.xmonad/scripts/screenlock.sh") , ("M-<Print>", spawn "~/.xmonad/scripts/xshot-upload.sh") , ("M-S-<Print>", spawn "~/.xmonad/scripts/xshot-select-upload.sh") , ("M-C-c", spawn "~/.xmonad/scripts/toggle-compton.sh") @@ -189,17 +191,13 @@ keysWindows _ = [ ("M-d" , kill) , ("M-S-d", confirmPrompt hotPromptTheme "Kill all" killAll) , ("M-a" , toggleCopyToAll) - , ("M-e" , withFocused hideWindow) -- FIXME This is so broken + , ("M-e" , withFocused hideWindow) , ("M-S-e", popOldestHiddenWindow) , ("M-p" , promote) , ("M-g", withFocused $ sendMessage . MergeAll) , ("M-S-g", withFocused $ sendMessage . UnMerge) , ("M-u" , focusUrgent) , ("M-s" , windows S.focusMaster) - , ( "M-'" - , bindOn LD [("Tabs", windows S.focusDown), ("", onGroup S.focusDown')] - ) - , ("M-;", bindOn LD [("Tabs", windows S.focusUp), ("", onGroup S.focusUp')]) , ("M-S-'", windows S.swapDown) , ("M-S-;", windows S.swapUp) ] @@ -245,7 +243,7 @@ mouseBindings XConfig{} = M.fromList , \w -> focus w >> F.mouseWindow F.position w - >> ifClick (snapSpacedMagicMove gapFull (Just 50) (Just 50) w) + >> ifClick (snapMagicMove (Just 50) (Just 50) w) >> windows S.shiftMaster ) , ( (modMask, button3) diff --git a/src/XMonad/Custom/Event.hs b/src/lib/XMonad/Custom/Event.hs index f55511d..9ff2552 100644 --- a/src/XMonad/Custom/Event.hs +++ b/src/lib/XMonad/Custom/Event.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Event --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Event +-- Description : Event hooks and stuff +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Event diff --git a/src/XMonad/Custom/Layout.hs b/src/lib/XMonad/Custom/Layout.hs index fe9224a..8ed7d08 100644 --- a/src/XMonad/Custom/Layout.hs +++ b/src/lib/XMonad/Custom/Layout.hs @@ -1,15 +1,16 @@ -{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeSynonymInstances #-} +{-# LANGUAGE TypeSynonymInstances #-} {-# OPTIONS_GHC -Wno-missing-signatures #-} -- | --- Module : XMonad.Custom.Layout --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Layout +-- Description : Layouts and such +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Layout diff --git a/src/XMonad/Custom/Log.hs b/src/lib/XMonad/Custom/Log.hs index 6b7af37..e9d3c1a 100644 --- a/src/XMonad/Custom/Log.hs +++ b/src/lib/XMonad/Custom/Log.hs @@ -1,10 +1,12 @@ -- | --- Module : XMonad.Custom.Log --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Log +-- Description : Loggers and statusbar configuration +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable +-- module XMonad.Custom.Log ( logHook diff --git a/src/XMonad/Custom/Manage.hs b/src/lib/XMonad/Custom/Manage.hs index ac4201b..dbc560e 100644 --- a/src/XMonad/Custom/Manage.hs +++ b/src/lib/XMonad/Custom/Manage.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Manage --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Manage +-- Description : Window management hooks and scratchpads +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Manage @@ -44,7 +45,6 @@ composeActions = tileBelow = insertPosition Below Newer tileBelowNoFocus = insertPosition Below Older - manageHook :: ManageHook manageHook = mconcat [ manageDocks diff --git a/src/XMonad/Custom/Misc.hs b/src/lib/XMonad/Custom/Misc.hs index aa48ee2..b9901b4 100644 --- a/src/XMonad/Custom/Misc.hs +++ b/src/lib/XMonad/Custom/Misc.hs @@ -1,12 +1,14 @@ {-# OPTIONS_GHC -funbox-strict-fields #-} -- | --- Module : XMonad.Custom.Misc --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Misc +-- Description : Miscellaneous functions and constants +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable +-- module XMonad.Custom.Misc ( Applications(..) @@ -23,6 +25,7 @@ data Applications = Applications } deriving (Eq, Show) + applications :: Applications applications = Applications { browser = "qutebrowser" , mixer = "pulsemixer" diff --git a/src/XMonad/Custom/Navigation.hs b/src/lib/XMonad/Custom/Navigation.hs index 812dd30..2646db4 100644 --- a/src/XMonad/Custom/Navigation.hs +++ b/src/lib/XMonad/Custom/Navigation.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Navigation --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Navigation +-- Description : Window navigation and layouts +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Navigation diff --git a/src/XMonad/Custom/Projects.hs b/src/lib/XMonad/Custom/Projects.hs index 4726fc7..9fa7a37 100644 --- a/src/XMonad/Custom/Projects.hs +++ b/src/lib/XMonad/Custom/Projects.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Projects --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Projects +-- Description : Per-project workspaces +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Projects diff --git a/src/XMonad/Custom/Prompt.hs b/src/lib/XMonad/Custom/Prompt.hs index e8762d1..c54a00f 100644 --- a/src/XMonad/Custom/Prompt.hs +++ b/src/lib/XMonad/Custom/Prompt.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Prompt --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Prompt +-- Description : Prompt configuration +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Prompt @@ -14,7 +15,7 @@ module XMonad.Custom.Prompt ) where import Data.Char -import Data.List +import Data.List ( isInfixOf ) import XMonad.Prompt listCompFunc :: XPConfig -> [String] -> String -> IO [String] diff --git a/src/XMonad/Custom/Scratchpads.hs b/src/lib/XMonad/Custom/Scratchpads.hs index 157a1fb..5570435 100644 --- a/src/XMonad/Custom/Scratchpads.hs +++ b/src/lib/XMonad/Custom/Scratchpads.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Scratchpads --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Scratchpads +-- Description : Scratchpads configuration +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Scratchpads diff --git a/src/XMonad/Custom/Startup.hs b/src/lib/XMonad/Custom/Startup.hs index cdd63ac..f2415ea 100644 --- a/src/XMonad/Custom/Startup.hs +++ b/src/lib/XMonad/Custom/Startup.hs @@ -1,10 +1,12 @@ -- | --- Module : XMonad.Custom.Startup --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Startup +-- Description : Startup hooks +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable +-- module XMonad.Custom.Startup ( startupHook diff --git a/src/XMonad/Custom/Theme.hs b/src/lib/XMonad/Custom/Theme.hs index 64b52a8..cfcd176 100644 --- a/src/XMonad/Custom/Theme.hs +++ b/src/lib/XMonad/Custom/Theme.hs @@ -1,10 +1,11 @@ -- | --- Module : XMonad.Custom.Theme --- Copyright : (c) 2018-2020 Azat Bahawi <azahi@teknik.io> --- License : BSD3-style (see LICENSE) --- Maintainer : Azat Bahawi <azahi@teknik.io> --- Stability : unstable --- Portability : unportable +-- Module : XMonad.Custom.Theme +-- Description : Theming and styles +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable -- module XMonad.Custom.Theme @@ -37,7 +38,7 @@ module XMonad.Custom.Theme import Data.Char import Data.Function -import Data.List +import Data.List ( isInfixOf ) import Data.Ratio import Graphics.X11.Xlib.Types import XMonad.Layout.Decoration diff --git a/src/lib/XMonad/Custom/Workspaces.hs b/src/lib/XMonad/Custom/Workspaces.hs new file mode 100644 index 0000000..ba2a1e7 --- /dev/null +++ b/src/lib/XMonad/Custom/Workspaces.hs @@ -0,0 +1,18 @@ +-- | +-- Module : XMonad.Custom.Workspaces +-- Description : General workspace configuration +-- Copyright : (c) Azat Bahawi 2018-2021 +-- SPDX-License-Identifier : GPL-3.0-or-later +-- Maintainer : azahi@teknik.io +-- Stability : experimental +-- Portability : non-portable +-- + +module XMonad.Custom.Workspaces + ( workspaces + ) where + +import XMonad.Core hiding ( workspaces ) + +workspaces :: [WorkspaceId] +workspaces = map show [1 .. 9 :: Int] diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..6658c36 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,10 @@ +--- +resolver: lts-18.18 +nix: + enable: true + packages: + - pkg-config + - xorg.libXScrnSaver + - xorg.libXext + - xorg.libXft + - xorg.libXrandr diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..a9834e3 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 586296 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/18.yaml + sha256: 63539429076b7ebbab6daa7656cfb079393bf644971156dc349d7c0453694ac2 + original: lts-18.18 diff --git a/xmobarrc/bot.hs b/xmobarrc/bot.hs deleted file mode 100644 index 1235545..0000000 --- a/xmobarrc/bot.hs +++ /dev/null @@ -1,65 +0,0 @@ -Config { font = "xft:tewi:style=Regular:pixelsize=11,Biwidth:pixelsize=12" - , additionalFonts = [ "xft:Siji:style=Regular" - , "xft:tewi:style=Bold:pixelsize=11" - ] - , bgColor = "#0b0806" - , fgColor = "#a19782" - , alpha = 255 - , position = Static { xpos = 12 - , ypos = 864 - , width = 1576 - , height = 24 - } - , textOffset = 15 - , textOffsets = [ 15, 15 ] - , iconOffset = -1 - , lowerOnStart = True - , hideOnStart = False - , allDesktops = True - , overrideRedirect = False - , pickBroadest = False - , persistent = False - , border = FullBM 0 - , borderColor = "#2f2b2a" - , borderWidth = 1 - , iconRoot = "." - , commands = [ Run StdinReader - , Run Battery [ "-t", "<fn=1><acstatus></fn> <left>%" - , "--" - , "-i", "\57914" - , "-O", "\57913" - , "-o", "\57911" - ] 10 - , Run Wireless "wlp3s0" [ "-t", "<fn=1>\57775</fn> <essid> @ <quality>%" ] 10 - , Run DynNetwork [ "-t", "<fn=1>\57660</fn> <rx> / <fn=1>\57659</fn> <tx> kbps" ] 10 - , Run Kbd [ ("us", "English") - , ("ru", "Русский") - ] - , Run Com "/home/free/.xmonad/scripts/xmobar/fcitx.sh" [] "fcitx" 3 - , Run Locks - , Run MPD [ "-t", "<fn=1><statei></fn> <artist> - <title>" - , "--" - , "-P", "\57498" - , "-Z", "\57499" - , "-S", "\57497" - ] 10 - , Run Volume "default" "Master" [ "-t", "<fn=1><status></fn> <volume>%" - , "--" - , "--on" , "\57427" - , "--off" , "\57426" - , "--onc" , "#a19782" - , "--offc" , "#a19782" - ] 10 - ] - , sepChar = "%" - , alignSep = "}{" - , template = " \ - \%battery% %wlp3s0wi% %dynnetwork% %StdinReader%\ - \}\ - \%kbd% / %fcitx%\ - \{\ - \%mpd% %default:Master%\ - \ " - } - --- vim:filetype=haskell diff --git a/xmobarrc/top.hs b/xmobarrc/top.hs deleted file mode 100644 index 1cdab9c..0000000 --- a/xmobarrc/top.hs +++ /dev/null @@ -1,41 +0,0 @@ -Config { font = "xft:tewi:style=Regular:pixelsize=11,Biwidth:pixelsize=12" - , additionalFonts = [ "xft:Siji:style=Regular" - , "xft:tewi:style=Bold:pixelsize=11" - ] - , bgColor = "#0b0806" - , fgColor = "#a19782" - , alpha = 255 - , position = Static { xpos = 12 - , ypos = 12 - , width = 1576 - , height = 24 - } - , textOffset = 15 - , textOffsets = [ 15, 15 ] - , iconOffset = -1 - , lowerOnStart = True - , hideOnStart = False - , allDesktops = True - , overrideRedirect = False - , pickBroadest = False - , persistent = False - , border = FullBM 0 - , borderColor = "#2f2b2a" - , borderWidth = 1 - , iconRoot = "." - , commands = [ Run StdinReader - , Run Date "<fn=1>\57893</fn> %d.%m.%y / %A / %H:%M" "date" 10 - , Run Weather "UUWW" [ "-t", "<fn=1>\57550</fn> <tempC>°C / <rh>% / <pressure> Pa" ] 10000 - ] - , sepChar = "%" - , alignSep = "}{" - , template = " \ - \%StdinReader%\ - \}\ - \\ - \{\ - \%UUWW% %date%\ - \ " - } - --- vim: filetype=haskell diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal index d8804b2..ae1b31f 100644 --- a/xmonad-ng.cabal +++ b/xmonad-ng.cabal @@ -1,70 +1,61 @@ -cabal-version: 3.0 +cabal-version: 2.2 -name: xmonad-ng -version: 2.0.0 -synopsis: Personal XMonad configuration -description: - This package is a window manager built on top of xmonad and xmonad-contrib - libraries targeted for a single-display GNU\/Linux machine running Xorg. - . - Made with efficiency in mind this window manager enables controlling windows - using only keyboard and allows using multiple workspaces, scratchpads, - window layouts and etc. +-- This file has been generated from package.yaml by hpack version 0.34.5. +-- +-- see: https://github.com/sol/hpack -license: BSD-3-Clause -license-file: LICENSE -copyright: (c) 2018-2021 Azat Bahawi -author: Azat Bahawi <azahi@teknik.io> -maintainer: Azat Bahawi <azahi@teknik.io> -stability: experimental -tested-with: GHC ==8.10.7 -category: System -homepage: https://github.com/azahi/xmonad-ng -bug-reports: https://github.com/azahi/xmonad-ng/issues -build-type: Simple +name: xmonad-ng +version: 2.0.1.0 +synopsis: Personal XMonad configuration +description: I hope no one will read this description. It's awful. +category: System +homepage: https://github.com/azahi/xmonad-ng#readme +bug-reports: https://github.com/azahi/xmonad-ng/issues +author: Azat Bahawi <azahi@teknik.io> +maintainer: Azat Bahawi <azahi@teknik.io> +copyright: (c) Azat Bahawi 2018-2021 +license: GPL-3.0-or-later +license-file: LICENSE +build-type: Simple source-repository head - type: git + type: git location: https://github.com/azahi/xmonad-ng -executable xmonad-ng - main-is: Main.hs - other-modules: - XMonad.Actions.FloatSnapSpaced - XMonad.Actions.PerConditionKeys - XMonad.Custom.Bindings - XMonad.Custom.Event - XMonad.Custom.Layout - XMonad.Custom.Log - XMonad.Custom.Manage - XMonad.Custom.Misc - XMonad.Custom.Navigation - XMonad.Custom.Projects - XMonad.Custom.Scratchpads - XMonad.Custom.Startup - XMonad.Custom.Theme - XMonad.Custom.Workspaces - - hs-source-dirs: src +library + exposed-modules: + XMonad.Custom.Bindings + XMonad.Custom.Event + XMonad.Custom.Layout + XMonad.Custom.Log + XMonad.Custom.Manage + XMonad.Custom.Misc + XMonad.Custom.Navigation + XMonad.Custom.Projects + XMonad.Custom.Prompt + XMonad.Custom.Scratchpads + XMonad.Custom.Startup + XMonad.Custom.Theme + XMonad.Custom.Workspaces + hs-source-dirs: + src/lib + ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints build-depends: - base ^>=4.14 - , containers ^>=0.6 - , directory ^>=1.3 - , filepath ^>=1.4 - , mtl ^>=2.2 - , text ^>=1.2 - , time ^>=1.9 - , X11 ^>=1.10 - , xmobar ^>=0.40 - , xmonad ^>=0.15 - , xmonad-contrib ^>=0.16 - + X11 >=1.10.2 && <1.11 + , base >=4.14 && <5 + , containers >=0.6.5 && <0.7 + , xmonad ==0.15.* + , xmonad-contrib ==0.16.* default-language: Haskell2010 - other-extensions: - CPP - DeriveDataTypeable - LambdaCase - MultiParamTypeClasses - TypeSynonymInstances - ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -v0 -O2 -threaded -rtsopts -with-rtsopts=-N +executable xmonad-ng + main-is: Main.hs + hs-source-dirs: + src/exe + ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -rtsopts -threaded -v0 -with-rtsopts=-N + build-depends: + base >=4.14 && <5 + , xmonad ==0.15.* + , xmonad-contrib ==0.16.* + , xmonad-ng + default-language: Haskell2010 |