From 2a5e75de77a19b0be53fd4d58a0bd1f3453cdaf4 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 25 Jan 2025 00:35:21 -0600 Subject: [PATCH 01/33] add license --- COPYING | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. From 6f35544dcddbbc5372ac10e2c2c62b592af10334 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 26 Jan 2025 14:34:37 -0600 Subject: [PATCH 02/33] gitignore: initial commit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..21f979d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +!**/.keep +result +flake.lock From 4b8609385a8d835f95b5295b785e070bb29017e4 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 26 Jan 2025 15:07:06 -0600 Subject: [PATCH 03/33] flake: initial commit --- flake.nix | 174 +++++++++++++++++++++++++++++++++++++++++ hm/default.nix | 1 + nixos/default.nix | 1 + pkgs/default.nix | 8 ++ pkgs/lib/default.nix | 3 + pkgs/lib/importAll.nix | 20 +++++ 6 files changed, 207 insertions(+) create mode 100644 flake.nix create mode 100644 hm/default.nix create mode 100644 nixos/default.nix create mode 100644 pkgs/default.nix create mode 100644 pkgs/lib/default.nix create mode 100644 pkgs/lib/importAll.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..05ffad2 --- /dev/null +++ b/flake.nix @@ -0,0 +1,174 @@ +{ + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { + self, + nixpkgs, + flake-utils, + }: let + mapOverlayOverride = namespace: overlay: final: prev: let + overlayPkgs = overlay final prev; + in + { + "${namespace}" = builtins.removeAttrs overlayPkgs ["override"]; + } + // (overlayPkgs.override or {}); + in + flake-utils.lib.eachDefaultSystem (system: { + formatter = (import nixpkgs {inherit system;}).alejandra; + }) + // { + overlays = let + overlay = mapOverlayOverride "trivium" (import ./pkgs); + in { + default = overlay; + trivium = overlay; + }; + + lib = { + mkSystemFlake = { + flakes, + system, + formatter ? "alejandra", + localOverlayPath ? null, + nixpkgsConfigPath ? null, + nixosSourcePath ? null, + nixosPlatformsPath ? + if nixosSourcePath != null + then nixosSourcePath + /platform + else null, + hmSourcePath ? null, + hmPlatformsPath ? + if hmSourcePath != null + then hmSourcePath + /platform + else null, + }: let + optionalFlake = name: + if flakes ? "${name}" + then flakes.${name} + else null; + + requireFlake = name: + if flakes ? "${name}" + then flakes.${name} + else throw "Required flake input '${name}' is required but was not provided"; + + nur = optionalFlake "nur"; + nixpkgs = requireFlake "nixpkgs"; + unstable = optionalFlake "unstable"; + + home-manager = + if hmSourcePath != null + then requireFlake "home-manager" + else null; + + pkgs = importPkgs nixpkgs; + + importPkgs = flake: + import flake ({ + inherit system; + + config = import ./pkgs/config nixpkgs.lib; + overlays = let + conditions = [ + { + overlay = nur.overlays.default; + condition = nur != null; + } + # NB: Preserve the relative order + { + overlay = self.overlays.trivium; + condition = true; + } + { + overlay = flakes.self.overlays.default; + condition = true; + } + ]; + in + builtins.map (cond: cond.overlay) (builtins.filter (cond: cond.condition) conditions); + } + // ( + if nixpkgsConfigPath != null + then { + config = import nixpkgsConfigPath {inherit (nixpkgs) lib;}; + } + else {} + )); + + inherit (pkgs.trivium.lib) importAll; + in + with pkgs.lib; + { + formatter.${system} = + if formatter == "alejandra" + then pkgs.alejandra + else if formatter == "nixpkgs-fmt" + then pkgs.nixpkgs-fmt + else throw "Unknown formatter: '${formatter}'"; + + packages.${system} = pkgs.local; + + overlays.default = final: prev: let + overlay = + if localOverlayPath != null + then import localOverlayPath + else (final: prev: {}); + in + mapOverlayOverride "local" overlay final prev + // optionalAttrs (unstable != null) { + unstable = importPkgs unstable; + }; + } + // optionalAttrs (nixosSourcePath != null) { + nixosConfigurations = let + nixosSystem = {modules}: + makeOverridable nixpkgs.lib.nixosSystem { + inherit modules pkgs system; + + specialArgs = { + inherit flakes; + }; + }; + + hostConfig = platform: + nixosSystem { + modules = [ + ./nixos + nixosSourcePath + platform + ]; + }; + in + mapAttrs (_: hostConfig) (importAll {root = nixosPlatformsPath;}); + } + // optionalAttrs (hmSourcePath != null) { + homeConfigurations = let + registry = {...}: { + config.nix.registry = + mapAttrs + (_: value: {flake = value;}) + flakes; + }; + + home = name: platform: + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + + extraSpecialArgs = { + inherit flakes; + }; + + modules = [ + ./hm + hmSourcePath + platform + registry + ]; + }; + in + mapAttrs home (importAll {root = hmPlatformsPath;}); + }; + }; + }; +} diff --git a/hm/default.nix b/hm/default.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/hm/default.nix @@ -0,0 +1 @@ +{} diff --git a/nixos/default.nix b/nixos/default.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/nixos/default.nix @@ -0,0 +1 @@ +{} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..2ee6bfd --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,8 @@ +final: prev: +with prev.lib; let + inherit (final) callPackage; +in { + lib = callPackage ./lib {}; + + override = {}; +} diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix new file mode 100644 index 0000000..e3ab56e --- /dev/null +++ b/pkgs/lib/default.nix @@ -0,0 +1,3 @@ +{callPackage}: { + importAll = callPackage ./importAll.nix {}; +} diff --git a/pkgs/lib/importAll.nix b/pkgs/lib/importAll.nix new file mode 100644 index 0000000..6acabe9 --- /dev/null +++ b/pkgs/lib/importAll.nix @@ -0,0 +1,20 @@ +{lib}: { + root, + exclude ? [], +}: +with builtins; +with lib; +# http://chriswarbo.net/projects/nixos/useful_hacks.html + let + basename = removeSuffix ".nix"; + + isMatch = name: type: + (hasSuffix ".nix" name || type == "directory") + && ! elem name (map basename exclude); + + entry = name: _: { + name = basename name; + value = import (root + "/${name}"); + }; + in + mapAttrs' entry (filterAttrs isMatch (readDir root)) From 3a3d73d5b6b58d9119f284352cc6f52dcc971939 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 26 Jan 2025 15:38:38 -0600 Subject: [PATCH 04/33] templates: add 'system-flake' template --- flake.nix | 11 +++ templates/system-flake/.gitignore | 3 + templates/system-flake/flake.nix | 34 +++++++++ templates/system-flake/home/default.nix | 73 +++++++++++++++++++ .../home/platform/me@foo/default.nix | 10 +++ .../system-flake/pkgs/config/default.nix | 5 ++ templates/system-flake/pkgs/config/unfree.nix | 7 ++ templates/system-flake/pkgs/default.nix | 12 +++ .../system-flake/pkgs/hello-world/Makefile | 6 ++ .../system-flake/pkgs/hello-world/default.nix | 14 ++++ .../pkgs/hello-world/hello-world.c | 7 ++ templates/system-flake/pkgs/lib/default.nix | 3 + templates/system-flake/pkgs/lib/fibonacci.nix | 7 ++ templates/system-flake/sys/default.nix | 14 ++++ .../system-flake/sys/platform/foo/default.nix | 6 ++ 15 files changed, 212 insertions(+) create mode 100644 templates/system-flake/.gitignore create mode 100644 templates/system-flake/flake.nix create mode 100644 templates/system-flake/home/default.nix create mode 100644 templates/system-flake/home/platform/me@foo/default.nix create mode 100644 templates/system-flake/pkgs/config/default.nix create mode 100644 templates/system-flake/pkgs/config/unfree.nix create mode 100644 templates/system-flake/pkgs/default.nix create mode 100644 templates/system-flake/pkgs/hello-world/Makefile create mode 100644 templates/system-flake/pkgs/hello-world/default.nix create mode 100644 templates/system-flake/pkgs/hello-world/hello-world.c create mode 100644 templates/system-flake/pkgs/lib/default.nix create mode 100644 templates/system-flake/pkgs/lib/fibonacci.nix create mode 100644 templates/system-flake/sys/default.nix create mode 100644 templates/system-flake/sys/platform/foo/default.nix diff --git a/flake.nix b/flake.nix index 05ffad2..2318aa0 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,17 @@ formatter = (import nixpkgs {inherit system;}).alejandra; }) // { + templates = let + system-flake = { + path = ./templates/system-flake; + description = "Opinionated flake for a NixOS system with Home Manager"; + }; + in { + inherit system-flake; + + default = system-flake; + }; + overlays = let overlay = mapOverlayOverride "trivium" (import ./pkgs); in { diff --git a/templates/system-flake/.gitignore b/templates/system-flake/.gitignore new file mode 100644 index 0000000..21f979d --- /dev/null +++ b/templates/system-flake/.gitignore @@ -0,0 +1,3 @@ +!**/.keep +result +flake.lock diff --git a/templates/system-flake/flake.nix b/templates/system-flake/flake.nix new file mode 100644 index 0000000..7b4ec56 --- /dev/null +++ b/templates/system-flake/flake.nix @@ -0,0 +1,34 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + trivium = { + url = "git+https://git.posixlycorrect.com/deepState/trivionomicon.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = flakes @ { + self, + nixpkgs, + unstable, + home-manager, + trivium, + }: + trivium.lib.mkSystemFlake { + system = "x86_64-linux"; + inherit flakes; + + localOverlayPath = ./pkgs; + nixpkgsConfigPath = ./pkgs/config; + + hmSourcePath = ./home; + nixosSourcePath = ./sys; + }; +} diff --git a/templates/system-flake/home/default.nix b/templates/system-flake/home/default.nix new file mode 100644 index 0000000..49439c7 --- /dev/null +++ b/templates/system-flake/home/default.nix @@ -0,0 +1,73 @@ +{ + config, + pkgs, + ... +}: { + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "24.11"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + # pkgs.hello + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. These will be explicitly sourced when using a + # shell provided by Home Manager. If you don't want to manage your shell + # through Home Manager then you have to manually source 'hm-session-vars.sh' + # located at either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user//etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + # EDITOR = "emacs"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/templates/system-flake/home/platform/me@foo/default.nix b/templates/system-flake/home/platform/me@foo/default.nix new file mode 100644 index 0000000..6481e85 --- /dev/null +++ b/templates/system-flake/home/platform/me@foo/default.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "ale"; + home.homeDirectory = "/home/ale"; +} diff --git a/templates/system-flake/pkgs/config/default.nix b/templates/system-flake/pkgs/config/default.nix new file mode 100644 index 0000000..395d35d --- /dev/null +++ b/templates/system-flake/pkgs/config/default.nix @@ -0,0 +1,5 @@ +lib: +with lib; { + android_sdk.accept_license = true; + allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); +} diff --git a/templates/system-flake/pkgs/config/unfree.nix b/templates/system-flake/pkgs/config/unfree.nix new file mode 100644 index 0000000..deda971 --- /dev/null +++ b/templates/system-flake/pkgs/config/unfree.nix @@ -0,0 +1,7 @@ +lib: name: +with lib; + elem name [ + "libproprietary-v3" + "closed-source-pkg" + "favorite-abandonware" + ] diff --git a/templates/system-flake/pkgs/default.nix b/templates/system-flake/pkgs/default.nix new file mode 100644 index 0000000..78a86d4 --- /dev/null +++ b/templates/system-flake/pkgs/default.nix @@ -0,0 +1,12 @@ +final: prev: +with prev.lib; let + inherit (final) callPackage fetchpatch; +in { + lib = callPackage ./lib {}; + + hello-world = callPackage ./hello-world {}; + + override = { + sl = prev.sl.overrideAttrs {pname = "my-sl";}; + }; +} diff --git a/templates/system-flake/pkgs/hello-world/Makefile b/templates/system-flake/pkgs/hello-world/Makefile new file mode 100644 index 0000000..4eef056 --- /dev/null +++ b/templates/system-flake/pkgs/hello-world/Makefile @@ -0,0 +1,6 @@ +CFLAGS += -O3 -s + +all: hello-world + +%: %.c + $(CC) $(CFLAGS) -o $@ $< diff --git a/templates/system-flake/pkgs/hello-world/default.nix b/templates/system-flake/pkgs/hello-world/default.nix new file mode 100644 index 0000000..19047a1 --- /dev/null +++ b/templates/system-flake/pkgs/hello-world/default.nix @@ -0,0 +1,14 @@ +{stdenv, ...}: +stdenv.mkDerivation { + name = "hello-world"; + version = "1.0.0"; + + src = ./.; + + installPhase = '' + mkdir -p $out/bin + cp hello-world $out/bin + ''; + + meta.mainProgram = "hello-world"; +} diff --git a/templates/system-flake/pkgs/hello-world/hello-world.c b/templates/system-flake/pkgs/hello-world/hello-world.c new file mode 100644 index 0000000..d6cfa6b --- /dev/null +++ b/templates/system-flake/pkgs/hello-world/hello-world.c @@ -0,0 +1,7 @@ +#include + +int main() +{ + printf("Hello, world!\n"); + return 0; +} diff --git a/templates/system-flake/pkgs/lib/default.nix b/templates/system-flake/pkgs/lib/default.nix new file mode 100644 index 0000000..ab54163 --- /dev/null +++ b/templates/system-flake/pkgs/lib/default.nix @@ -0,0 +1,3 @@ +{callPackage}: { + fibonacci = callPackage ./fibonacci.nix {}; +} diff --git a/templates/system-flake/pkgs/lib/fibonacci.nix b/templates/system-flake/pkgs/lib/fibonacci.nix new file mode 100644 index 0000000..a12576b --- /dev/null +++ b/templates/system-flake/pkgs/lib/fibonacci.nix @@ -0,0 +1,7 @@ +let + fib = n: + if n > 1 + then fib (n - 1) + fib (n - 2) + else 1; +in + fib diff --git a/templates/system-flake/sys/default.nix b/templates/system-flake/sys/default.nix new file mode 100644 index 0000000..fa0f994 --- /dev/null +++ b/templates/system-flake/sys/default.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + # Let 'nixos-version --json' know about the Git revision + # of this flake. + system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + + # Network configuration. + networking.firewall.allowedTCPPorts = [80]; + + # Enable a web server. + services.httpd = { + enable = true; + adminAddr = "morty@example.org"; + }; +} diff --git a/templates/system-flake/sys/platform/foo/default.nix b/templates/system-flake/sys/platform/foo/default.nix new file mode 100644 index 0000000..ef84269 --- /dev/null +++ b/templates/system-flake/sys/platform/foo/default.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + boot.isContainer = true; + + # Network configuration. + networking.useDHCP = false; +} From ae5315326a7d2c3239bbe478961724d171aea200 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 26 Jan 2025 19:27:20 -0600 Subject: [PATCH 05/33] flake: add default values for mkSystemFlake paths --- flake.nix | 8 ++++---- templates/system-flake/flake.nix | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 2318aa0..d8e51c6 100644 --- a/flake.nix +++ b/flake.nix @@ -41,14 +41,14 @@ flakes, system, formatter ? "alejandra", - localOverlayPath ? null, - nixpkgsConfigPath ? null, - nixosSourcePath ? null, + localOverlayPath ? /. + "${flakes.self}" + /pkgs, + nixpkgsConfigPath ? localOverlayPath + /config, + nixosSourcePath ? /. + "${flakes.self}" + /sys, nixosPlatformsPath ? if nixosSourcePath != null then nixosSourcePath + /platform else null, - hmSourcePath ? null, + hmSourcePath ? /. + "${flakes.self}" + /home, hmPlatformsPath ? if hmSourcePath != null then hmSourcePath + /platform diff --git a/templates/system-flake/flake.nix b/templates/system-flake/flake.nix index 7b4ec56..6afe06f 100644 --- a/templates/system-flake/flake.nix +++ b/templates/system-flake/flake.nix @@ -24,11 +24,5 @@ trivium.lib.mkSystemFlake { system = "x86_64-linux"; inherit flakes; - - localOverlayPath = ./pkgs; - nixpkgsConfigPath = ./pkgs/config; - - hmSourcePath = ./home; - nixosSourcePath = ./sys; }; } From 6d0c611eaefe9084d7d2d57c2647934e3de4f1d5 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 26 Jan 2025 19:28:40 -0600 Subject: [PATCH 06/33] templates/system-flake: fix pkgs/config parameters --- templates/system-flake/pkgs/config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/system-flake/pkgs/config/default.nix b/templates/system-flake/pkgs/config/default.nix index 395d35d..47abe76 100644 --- a/templates/system-flake/pkgs/config/default.nix +++ b/templates/system-flake/pkgs/config/default.nix @@ -1,4 +1,4 @@ -lib: +{lib}: with lib; { android_sdk.accept_license = true; allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); From 0473f830f62cd87876ec1f040f57170d017b92a1 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Mon, 27 Jan 2025 19:57:02 -0600 Subject: [PATCH 07/33] add steam module sadly this has to be a system package until we find a non shitty way of installing in through hm --- nixos/default.nix | 11 ++++++- nixos/trash/default.nix | 10 +++++++ nixos/trash/steam/default.nix | 55 +++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 nixos/trash/default.nix create mode 100644 nixos/trash/steam/default.nix diff --git a/nixos/default.nix b/nixos/default.nix index 0967ef4..2440c30 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1 +1,10 @@ -{} +{ + config, + lib, + pkgs, + ... +}: { + imports = [ + ./trash + ]; +} diff --git a/nixos/trash/default.nix b/nixos/trash/default.nix new file mode 100644 index 0000000..a8c8785 --- /dev/null +++ b/nixos/trash/default.nix @@ -0,0 +1,10 @@ +{ + config, + lib, + pkgs, + ... +}: { + imports = [ + ./steam + ]; +} diff --git a/nixos/trash/steam/default.nix b/nixos/trash/steam/default.nix new file mode 100644 index 0000000..80a45e8 --- /dev/null +++ b/nixos/trash/steam/default.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.options.trivium.trash.steam; +in { + options.trivium.trash.steam = { + enable = mkEnableOption "steam settings"; + + compatibilityPackages = mkOption { + type = types.bool; + default = true; + description = "Enable additional compatibility packages (protontricks, protonup, etc.)"; + }; + + remotePlayOpenFirewall = mkOption { + type = types.bool; + default = false; + description = "Open firewall for Steam Remote Play"; + }; + + dedicatedServerOpenFirewall = mkOption { + type = types.bool; + default = false; + description = "Open firewall for Steam Dedicated Server"; + }; + + localNetworkGameTransfersOpenFirewall = mkOption { + type = types.bool; + default = false; + description = "Open firewall for Steam Local Network Game Transfers"; + }; + }; + + config = mkIf cfg.enable { + programs.steam = { + enable = true; + remotePlay.openFirewall = cfg.remotePlayOpenFirewall; + dedicatedServer.openFirewall = cfg.dedicatedServerOpenFirewall; + localNetworkGameTransfers.openFirewall = cfg.localNetworkGameTransfersOpenFirewall; + }; + + environment = mkIf cfg.compatibilityPackages { + systemPackages = with pkgs; [ + protontricks + protonup + protonup-ng + winetricks + ]; + }; + }; +} From 1c2b67ba0c2e6a37e3124644c0b02563526df02b Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 28 Jan 2025 15:49:35 -0600 Subject: [PATCH 08/33] add forgejo module --- nixos/default.nix | 1 + nixos/services/default.nix | 10 +++++ nixos/services/forgejo/default.nix | 66 ++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 nixos/services/default.nix create mode 100644 nixos/services/forgejo/default.nix diff --git a/nixos/default.nix b/nixos/default.nix index 2440c30..e2637ac 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -6,5 +6,6 @@ }: { imports = [ ./trash + ./services ]; } diff --git a/nixos/services/default.nix b/nixos/services/default.nix new file mode 100644 index 0000000..36b456a --- /dev/null +++ b/nixos/services/default.nix @@ -0,0 +1,10 @@ +{ + config, + lib, + pkgs, + ... +}: { + imports = [ + ./forgejo + ]; +} diff --git a/nixos/services/forgejo/default.nix b/nixos/services/forgejo/default.nix new file mode 100644 index 0000000..b15d2d9 --- /dev/null +++ b/nixos/services/forgejo/default.nix @@ -0,0 +1,66 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.options.trivium.services.forgejo; +in { + options.trivium.services.forgejo = { + enable = mkEnableOption "forgejo settings"; + + virtualHost = mkOption { + type = types.string; + description = "Virtualhost to use for nginx's reverse proxy. Usually something like git..com"; + }; + + appName = mkOption { + type = types.string; + description = "You guess what this does"; + }; + + disableRegistration = mkOption { + type = types.bool; + default = true; + description = "Turn this off just to create the first admin account"; + }; + }; + + config = mkIf cfg.enable { + services = { + nginx = { + virtualHosts."${cfg.virtualHost}" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://localhost:9170"; + }; + }; + + forgejo = { + enable = true; + lfs.enable = true; + useWizard = false; + settings = { + general.APP_NAME = "${cfg.appName}"; + ui.DEFAULT_THEME = "forgejo-dark"; + server = { + DOMAIN = "${cfg.virtualHost}"; + ROOT_URL = "https://${cfg.virtualHost}"; + HTTP_PORT = 9170; + LANDING_PAGE = "explore"; + }; + + service.DISABLE_REGISTRATION = ${cfg.disableRegistration}; + + actions = { + ENABLED = true; + }; + mailer = { + ENABLED = false; + }; + }; + }; + }; + }; +} From 12cd6972097b3d321875351292fb05d5c72f5444 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Thu, 5 Jun 2025 19:46:06 -0600 Subject: [PATCH 09/33] pkgs: add spliit --- pkgs/default.nix | 2 ++ pkgs/spliit/default.nix | 64 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 pkgs/spliit/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 2ee6bfd..454b81d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,4 +5,6 @@ in { lib = callPackage ./lib {}; override = {}; + + spliit = callPackage ./spliit {}; } diff --git a/pkgs/spliit/default.nix b/pkgs/spliit/default.nix new file mode 100644 index 0000000..5ac56b1 --- /dev/null +++ b/pkgs/spliit/default.nix @@ -0,0 +1,64 @@ +{ + buildNpmPackage, + fetchFromGitHub, + nodePackages, + lib, + writeShellScriptBin, +}: +buildNpmPackage { + pname = "spliit2"; + version = "master-20250420"; + + src = fetchFromGitHub { + repo = "spliit"; + owner = "spliit-app"; + + rev = "a11efc79c13298c0d282e47496d132538752405f"; + hash = "sha256-v4gaPzLzBbbqw/LDYxe1fiyficcrqcGOop23YPiTrdc="; + }; + + npmDepsHash = "sha256-sd0/7ruNUFxUKTeTwx/v8Vc/G3llkXP6RSDE78h3qVU="; + npmRebuildFlags = ["--ignore-scripts"]; + + doCheck = false; + + postPatch = '' + cp -v .env.example .env + ''; + + # nixpkgs/pkgs/applications/office/documenso/default.nix (git)-[master] 05:36:05 + preBuild = '' + # somehow for linux, npm is not finding the prisma package with the + # packages installed with the lockfile. + # This generates a prisma version incompatibility warning and is a kludge + # until the upstream package-lock is modified. + ${lib.getExe nodePackages.prisma} generate + ''; + + postInstall = '' + install -Dvm755 -t $out/bin ${lib.getExe (writeShellScriptBin "spliit2" '' + set -euxo pipefail + + cd @out@/lib/node_modules/spliit2 + + export PATH="$PWD/node_modules/.bin:$PATH" + export NEXT_TELEMETRY_DISABLED=1 + + prisma migrate deploy + exec next start + '')} + + #kk? + #${lib.getExe nodePackages.prisma} migrate deploy + + substituteInPlace $out/bin/spliit2 \ + --replace @out@ $out + ''; + + meta = { + description = "Free and Open Source Alternative to Splitwise. Share expenses with your friends and family."; + homepage = "https://spliit.app"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; []; + }; +} From 517c240c195525593c33aa8a57ffb42d50a6a330 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Thu, 5 Jun 2025 21:30:04 -0600 Subject: [PATCH 10/33] flake: add attribute 'packages' --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index d8e51c6..29664c3 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,12 @@ in flake-utils.lib.eachDefaultSystem (system: { formatter = (import nixpkgs {inherit system;}).alejandra; + + packages = + (import nixpkgs { + inherit system; + overlays = [(mapOverlayOverride "local" (import ./pkgs))]; + }).local; }) // { templates = let From a78a4f764ec8d5c4d005f554b37d25069efcff7b Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sun, 22 Jun 2025 01:17:27 -0600 Subject: [PATCH 11/33] spliit: added functional package --- pkgs/spliit/default.nix | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/spliit/default.nix b/pkgs/spliit/default.nix index 5ac56b1..60e12dd 100644 --- a/pkgs/spliit/default.nix +++ b/pkgs/spliit/default.nix @@ -4,7 +4,14 @@ nodePackages, lib, writeShellScriptBin, + pkgs }: +let + schemaEngine = "${pkgs.prisma-engines}/bin/schema-engine"; + queryEngineBin = "${pkgs.prisma-engines}/bin/query-engine"; + queryEngineLib = "${pkgs.prisma-engines}/lib/libquery_engine.node"; + buildFlags = [ "--ignore-scripts" ]; +in buildNpmPackage { pname = "spliit2"; version = "master-20250420"; @@ -18,24 +25,26 @@ buildNpmPackage { }; npmDepsHash = "sha256-sd0/7ruNUFxUKTeTwx/v8Vc/G3llkXP6RSDE78h3qVU="; - npmRebuildFlags = ["--ignore-scripts"]; - doCheck = false; + nativeBuildInputs = [ pkgs.openssl ]; - postPatch = '' - cp -v .env.example .env - ''; + npmRebuildFlags = buildFlags; + + PRISMA_SCHEMA_ENGINE_BINARY = schemaEngine; + PRISMA_QUERY_ENGINE_BINARY = queryEngineBin; + PRISMA_QUERY_ENGINE_LIBRARY = queryEngineLib; - # nixpkgs/pkgs/applications/office/documenso/default.nix (git)-[master] 05:36:05 preBuild = '' - # somehow for linux, npm is not finding the prisma package with the - # packages installed with the lockfile. - # This generates a prisma version incompatibility warning and is a kludge - # until the upstream package-lock is modified. - ${lib.getExe nodePackages.prisma} generate + cp -v scripts/build.env .env + + npx prisma generate ''; + npmBuildFlags = buildFlags; + postInstall = '' + cp -r .next public package.json next.config.mjs $out/lib/node_modules/spliit2 + install -Dvm755 -t $out/bin ${lib.getExe (writeShellScriptBin "spliit2" '' set -euxo pipefail @@ -44,15 +53,19 @@ buildNpmPackage { export PATH="$PWD/node_modules/.bin:$PATH" export NEXT_TELEMETRY_DISABLED=1 + export PRISMA_SCHEMA_ENGINE_BINARY="${schemaEngine}" + export PRISMA_QUERY_ENGINE_BINARY="${queryEngineBin}" + export PRISMA_QUERY_ENGINE_LIBRARY="${queryEngineLib}" + prisma migrate deploy exec next start '')} - #kk? - #${lib.getExe nodePackages.prisma} migrate deploy - substituteInPlace $out/bin/spliit2 \ --replace @out@ $out + + wrapProgram $out/bin/spliit2 \ + --prefix PATH : ${lib.makeBinPath [ pkgs.openssl ]} ''; meta = { From 12b7c09c0b25a7bb95f1d9e80fddd9210ddfbfa9 Mon Sep 17 00:00:00 2001 From: Alejandro Diaz Date: Sun, 22 Jun 2025 13:06:40 -0600 Subject: [PATCH 12/33] spliit: removes exec at start --- pkgs/spliit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/spliit/default.nix b/pkgs/spliit/default.nix index 60e12dd..5a917ce 100644 --- a/pkgs/spliit/default.nix +++ b/pkgs/spliit/default.nix @@ -58,7 +58,7 @@ buildNpmPackage { export PRISMA_QUERY_ENGINE_LIBRARY="${queryEngineLib}" prisma migrate deploy - exec next start + next start '')} substituteInPlace $out/bin/spliit2 \ From cfdf227b9cf1f02512d2e9fe6f28e27e48e0804c Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 5 Aug 2025 21:29:34 -0600 Subject: [PATCH 13/33] flake: export nixosModules and homeManagerModules --- flake.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 29664c3..a18f2c7 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,9 @@ trivium = overlay; }; + homeManagerModules.default = ./hm; + nixosModules.default = ./nixos; + lib = { mkSystemFlake = { flakes, @@ -151,7 +154,7 @@ hostConfig = platform: nixosSystem { modules = [ - ./nixos + self.nixosModules.default nixosSourcePath platform ]; @@ -177,7 +180,7 @@ }; modules = [ - ./hm + self.homeManagerModules.default hmSourcePath platform registry From 263b27cbb2532ed6457cdcad6477a39bdf367c7d Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 5 Aug 2025 21:35:18 -0600 Subject: [PATCH 14/33] flake: add nixpkgs input url --- .gitignore | 1 - flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 5 ++++- 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 flake.lock diff --git a/.gitignore b/.gitignore index 21f979d..f094862 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ !**/.keep result -flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8730827 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index a18f2c7..173766d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,8 @@ { - inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + }; outputs = { self, From adc44af3a0a83889491417c1ed77340f04befdcd Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 5 Aug 2025 21:43:37 -0600 Subject: [PATCH 15/33] nixos/services: remove forgejo --- nixos/services/default.nix | 4 +- nixos/services/forgejo/default.nix | 66 ------------------------------ 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 nixos/services/forgejo/default.nix diff --git a/nixos/services/default.nix b/nixos/services/default.nix index 36b456a..5ce655e 100644 --- a/nixos/services/default.nix +++ b/nixos/services/default.nix @@ -4,7 +4,5 @@ pkgs, ... }: { - imports = [ - ./forgejo - ]; + imports = []; } diff --git a/nixos/services/forgejo/default.nix b/nixos/services/forgejo/default.nix deleted file mode 100644 index b15d2d9..0000000 --- a/nixos/services/forgejo/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.options.trivium.services.forgejo; -in { - options.trivium.services.forgejo = { - enable = mkEnableOption "forgejo settings"; - - virtualHost = mkOption { - type = types.string; - description = "Virtualhost to use for nginx's reverse proxy. Usually something like git..com"; - }; - - appName = mkOption { - type = types.string; - description = "You guess what this does"; - }; - - disableRegistration = mkOption { - type = types.bool; - default = true; - description = "Turn this off just to create the first admin account"; - }; - }; - - config = mkIf cfg.enable { - services = { - nginx = { - virtualHosts."${cfg.virtualHost}" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:9170"; - }; - }; - - forgejo = { - enable = true; - lfs.enable = true; - useWizard = false; - settings = { - general.APP_NAME = "${cfg.appName}"; - ui.DEFAULT_THEME = "forgejo-dark"; - server = { - DOMAIN = "${cfg.virtualHost}"; - ROOT_URL = "https://${cfg.virtualHost}"; - HTTP_PORT = 9170; - LANDING_PAGE = "explore"; - }; - - service.DISABLE_REGISTRATION = ${cfg.disableRegistration}; - - actions = { - ENABLED = true; - }; - mailer = { - ENABLED = false; - }; - }; - }; - }; - }; -} From 1c7810a49eb270019eb3cd4f928a3d4aa4569ac6 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 5 Aug 2025 21:45:03 -0600 Subject: [PATCH 16/33] nixos: remove services, trash --- nixos/default.nix | 5 +--- nixos/services/default.nix | 8 ----- nixos/trash/default.nix | 10 ------- nixos/trash/steam/default.nix | 55 ----------------------------------- 4 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 nixos/services/default.nix delete mode 100644 nixos/trash/default.nix delete mode 100644 nixos/trash/steam/default.nix diff --git a/nixos/default.nix b/nixos/default.nix index e2637ac..5ce655e 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -4,8 +4,5 @@ pkgs, ... }: { - imports = [ - ./trash - ./services - ]; + imports = []; } diff --git a/nixos/services/default.nix b/nixos/services/default.nix deleted file mode 100644 index 5ce655e..0000000 --- a/nixos/services/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = []; -} diff --git a/nixos/trash/default.nix b/nixos/trash/default.nix deleted file mode 100644 index a8c8785..0000000 --- a/nixos/trash/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = [ - ./steam - ]; -} diff --git a/nixos/trash/steam/default.nix b/nixos/trash/steam/default.nix deleted file mode 100644 index 80a45e8..0000000 --- a/nixos/trash/steam/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.options.trivium.trash.steam; -in { - options.trivium.trash.steam = { - enable = mkEnableOption "steam settings"; - - compatibilityPackages = mkOption { - type = types.bool; - default = true; - description = "Enable additional compatibility packages (protontricks, protonup, etc.)"; - }; - - remotePlayOpenFirewall = mkOption { - type = types.bool; - default = false; - description = "Open firewall for Steam Remote Play"; - }; - - dedicatedServerOpenFirewall = mkOption { - type = types.bool; - default = false; - description = "Open firewall for Steam Dedicated Server"; - }; - - localNetworkGameTransfersOpenFirewall = mkOption { - type = types.bool; - default = false; - description = "Open firewall for Steam Local Network Game Transfers"; - }; - }; - - config = mkIf cfg.enable { - programs.steam = { - enable = true; - remotePlay.openFirewall = cfg.remotePlayOpenFirewall; - dedicatedServer.openFirewall = cfg.dedicatedServerOpenFirewall; - localNetworkGameTransfers.openFirewall = cfg.localNetworkGameTransfersOpenFirewall; - }; - - environment = mkIf cfg.compatibilityPackages { - systemPackages = with pkgs; [ - protontricks - protonup - protonup-ng - winetricks - ]; - }; - }; -} From 26619394f44e5763e2094002e4d78e6b2a27b3a5 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 5 Aug 2025 23:22:16 -0600 Subject: [PATCH 17/33] add doctrine --- doctrine/default.nix | 12 ++++ doctrine/lib/default.nix | 10 +++ {pkgs => doctrine}/lib/importAll.nix | 0 doctrine/lib/mk-module.nix | 38 +++++++++++ flake.nix | 4 +- hm/default.nix | 1 - modules/default.nix | 3 + nixos/default.nix | 8 --- pkgs/lib/default.nix | 3 - pkgs/spliit/default.nix | 97 ++++++++++++++-------------- 10 files changed, 113 insertions(+), 63 deletions(-) create mode 100644 doctrine/default.nix create mode 100644 doctrine/lib/default.nix rename {pkgs => doctrine}/lib/importAll.nix (100%) create mode 100644 doctrine/lib/mk-module.nix delete mode 100644 hm/default.nix create mode 100644 modules/default.nix delete mode 100644 nixos/default.nix delete mode 100644 pkgs/lib/default.nix diff --git a/doctrine/default.nix b/doctrine/default.nix new file mode 100644 index 0000000..b4c72b8 --- /dev/null +++ b/doctrine/default.nix @@ -0,0 +1,12 @@ +{ + pkgs, + namespace, +}: let + doctrine = { + lib = import ./lib {inherit lib pkgs doctrine;}; + prefix = "trivium"; + inherit namespace; + }; + inherit (pkgs) lib; +in + doctrine diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix new file mode 100644 index 0000000..1b03fe1 --- /dev/null +++ b/doctrine/lib/default.nix @@ -0,0 +1,10 @@ +{ + lib, + doctrine, + pkgs, +}: let + close = f: args: f (args // {inherit lib pkgs doctrine;}); +in { + importAll = pkgs.callPackage ./importAll.nix {}; + mkModule = close (import ./mk-module.nix); +} diff --git a/pkgs/lib/importAll.nix b/doctrine/lib/importAll.nix similarity index 100% rename from pkgs/lib/importAll.nix rename to doctrine/lib/importAll.nix diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix new file mode 100644 index 0000000..79c24c5 --- /dev/null +++ b/doctrine/lib/mk-module.nix @@ -0,0 +1,38 @@ +{ + name, + hm ? null, + sys ? null, + options ? null, + lib, + config, + pkgs, + doctrine, +}: let + optionsSet = import options { + inherit config lib pkgs cfg name doctrine; + }; + + configSet = import configFiles.${doctrine.namespace} { + inherit config lib pkgs doctrine cfg; + }; + + configFiles = lib.filterAttrs (k: v: v != null) { + inherit sys hm; + }; + + cfg = config.${doctrine.prefix}.${name}; +in { + config = + lib.optionalAttrs (configFiles ? ${doctrine.namespace}) + (lib.mkIf cfg.enable configSet); + + options = lib.optionalAttrs (options + != null + && optionsSet ? ${doctrine.namespace}) { + ${doctrine.prefix}.${name} = + optionsSet.${doctrine.namespace} + // { + enable = lib.mkEnableOption name; + }; + }; +} diff --git a/flake.nix b/flake.nix index 173766d..1a20e9e 100644 --- a/flake.nix +++ b/flake.nix @@ -45,8 +45,8 @@ trivium = overlay; }; - homeManagerModules.default = ./hm; - nixosModules.default = ./nixos; + homeManagerModules.default = ./modules; + nixosModules.default = ./modules; lib = { mkSystemFlake = { diff --git a/hm/default.nix b/hm/default.nix deleted file mode 100644 index 0967ef4..0000000 --- a/hm/default.nix +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..70dec76 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,3 @@ +{ + imports = []; +} diff --git a/nixos/default.nix b/nixos/default.nix deleted file mode 100644 index 5ce655e..0000000 --- a/nixos/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = []; -} diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix deleted file mode 100644 index e3ab56e..0000000 --- a/pkgs/lib/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{callPackage}: { - importAll = callPackage ./importAll.nix {}; -} diff --git a/pkgs/spliit/default.nix b/pkgs/spliit/default.nix index 5a917ce..280e820 100644 --- a/pkgs/spliit/default.nix +++ b/pkgs/spliit/default.nix @@ -4,74 +4,73 @@ nodePackages, lib, writeShellScriptBin, - pkgs -}: -let + pkgs, +}: let schemaEngine = "${pkgs.prisma-engines}/bin/schema-engine"; queryEngineBin = "${pkgs.prisma-engines}/bin/query-engine"; queryEngineLib = "${pkgs.prisma-engines}/lib/libquery_engine.node"; - buildFlags = [ "--ignore-scripts" ]; + buildFlags = ["--ignore-scripts"]; in -buildNpmPackage { - pname = "spliit2"; - version = "master-20250420"; + buildNpmPackage { + pname = "spliit2"; + version = "master-20250420"; - src = fetchFromGitHub { - repo = "spliit"; - owner = "spliit-app"; + src = fetchFromGitHub { + repo = "spliit"; + owner = "spliit-app"; - rev = "a11efc79c13298c0d282e47496d132538752405f"; - hash = "sha256-v4gaPzLzBbbqw/LDYxe1fiyficcrqcGOop23YPiTrdc="; - }; + rev = "a11efc79c13298c0d282e47496d132538752405f"; + hash = "sha256-v4gaPzLzBbbqw/LDYxe1fiyficcrqcGOop23YPiTrdc="; + }; - npmDepsHash = "sha256-sd0/7ruNUFxUKTeTwx/v8Vc/G3llkXP6RSDE78h3qVU="; + npmDepsHash = "sha256-sd0/7ruNUFxUKTeTwx/v8Vc/G3llkXP6RSDE78h3qVU="; - nativeBuildInputs = [ pkgs.openssl ]; + nativeBuildInputs = [pkgs.openssl]; - npmRebuildFlags = buildFlags; + npmRebuildFlags = buildFlags; - PRISMA_SCHEMA_ENGINE_BINARY = schemaEngine; - PRISMA_QUERY_ENGINE_BINARY = queryEngineBin; - PRISMA_QUERY_ENGINE_LIBRARY = queryEngineLib; + PRISMA_SCHEMA_ENGINE_BINARY = schemaEngine; + PRISMA_QUERY_ENGINE_BINARY = queryEngineBin; + PRISMA_QUERY_ENGINE_LIBRARY = queryEngineLib; - preBuild = '' - cp -v scripts/build.env .env + preBuild = '' + cp -v scripts/build.env .env - npx prisma generate - ''; + npx prisma generate + ''; - npmBuildFlags = buildFlags; + npmBuildFlags = buildFlags; - postInstall = '' - cp -r .next public package.json next.config.mjs $out/lib/node_modules/spliit2 + postInstall = '' + cp -r .next public package.json next.config.mjs $out/lib/node_modules/spliit2 - install -Dvm755 -t $out/bin ${lib.getExe (writeShellScriptBin "spliit2" '' - set -euxo pipefail + install -Dvm755 -t $out/bin ${lib.getExe (writeShellScriptBin "spliit2" '' + set -euxo pipefail - cd @out@/lib/node_modules/spliit2 + cd @out@/lib/node_modules/spliit2 - export PATH="$PWD/node_modules/.bin:$PATH" - export NEXT_TELEMETRY_DISABLED=1 + export PATH="$PWD/node_modules/.bin:$PATH" + export NEXT_TELEMETRY_DISABLED=1 - export PRISMA_SCHEMA_ENGINE_BINARY="${schemaEngine}" - export PRISMA_QUERY_ENGINE_BINARY="${queryEngineBin}" - export PRISMA_QUERY_ENGINE_LIBRARY="${queryEngineLib}" + export PRISMA_SCHEMA_ENGINE_BINARY="${schemaEngine}" + export PRISMA_QUERY_ENGINE_BINARY="${queryEngineBin}" + export PRISMA_QUERY_ENGINE_LIBRARY="${queryEngineLib}" - prisma migrate deploy - next start - '')} + prisma migrate deploy + next start + '')} - substituteInPlace $out/bin/spliit2 \ - --replace @out@ $out + substituteInPlace $out/bin/spliit2 \ + --replace @out@ $out - wrapProgram $out/bin/spliit2 \ - --prefix PATH : ${lib.makeBinPath [ pkgs.openssl ]} - ''; + wrapProgram $out/bin/spliit2 \ + --prefix PATH : ${lib.makeBinPath [pkgs.openssl]} + ''; - meta = { - description = "Free and Open Source Alternative to Splitwise. Share expenses with your friends and family."; - homepage = "https://spliit.app"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; []; - }; -} + meta = { + description = "Free and Open Source Alternative to Splitwise. Share expenses with your friends and family."; + homepage = "https://spliit.app"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; []; + }; + } From 8741b320219185af2bc7b5cf89e59d297e0bb074 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Tue, 5 Aug 2025 23:22:16 -0600 Subject: [PATCH 18/33] add sway module --- modules/default.nix | 4 +++- modules/sway/default.nix | 13 ++++++++++++ modules/sway/options.nix | 3 +++ modules/sway/sys.nix | 45 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 modules/sway/default.nix create mode 100644 modules/sway/options.nix create mode 100644 modules/sway/sys.nix diff --git a/modules/default.nix b/modules/default.nix index 70dec76..bd5d292 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,3 +1,5 @@ { - imports = []; + imports = [ + ./sway + ]; } diff --git a/modules/sway/default.nix b/modules/sway/default.nix new file mode 100644 index 0000000..9f49e7c --- /dev/null +++ b/modules/sway/default.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + pkgs, + doctrine, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "sway"; + sys = ./sys.nix; + options = ./options.nix; +} diff --git a/modules/sway/options.nix b/modules/sway/options.nix new file mode 100644 index 0000000..e433039 --- /dev/null +++ b/modules/sway/options.nix @@ -0,0 +1,3 @@ +{...}: { + sys = {}; +} diff --git a/modules/sway/sys.nix b/modules/sway/sys.nix new file mode 100644 index 0000000..9c8b664 --- /dev/null +++ b/modules/sway/sys.nix @@ -0,0 +1,45 @@ +{ + pkgs, + lib, + ... +}: { + services.libinput.enable = true; + hardware.graphics.enable = true; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + xdgOpenUsePortal = true; + + # warning: xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you + # should either set `xdg.portal.config` or `xdg.portal.configPackages` + # to specify which portal backend to use for the requested interface. + # + # https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in + # + # If you simply want to keep the behaviour in < 1.17, which uses the first + # portal implementation found in lexicographical order, use the following: + # + # xdg.portal.config.common.default = "*"; + config.common.default = "*"; + }; + + environment = { + sessionVariables.NIXOS_OZONE_WL = "1"; + + systemPackages = with pkgs; [ + qt5.qtwayland + qt6.qtwayland + ]; + }; + + programs = { + gtklock = { + enable = lib.mkDefault true; + + config = {}; + modules = []; + }; + }; +} From 5d375d1d930631b960393b8de12eae16abbe01e0 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 13:56:34 -0600 Subject: [PATCH 19/33] modules: automatically import all modules --- doctrine/lib/importAll.nix | 4 ++-- modules/default.nix | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doctrine/lib/importAll.nix b/doctrine/lib/importAll.nix index 6acabe9..03c5330 100644 --- a/doctrine/lib/importAll.nix +++ b/doctrine/lib/importAll.nix @@ -1,6 +1,6 @@ {lib}: { root, - exclude ? [], + exclude ? ["default"], }: with builtins; with lib; @@ -10,7 +10,7 @@ with lib; isMatch = name: type: (hasSuffix ".nix" name || type == "directory") - && ! elem name (map basename exclude); + && ! elem (basename name) exclude; entry = name: _: { name = basename name; diff --git a/modules/default.nix b/modules/default.nix index bd5d292..0c0fd4c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,3 @@ -{ - imports = [ - ./sway - ]; +{doctrine, ...}: { + imports = builtins.attrValues (doctrine.lib.importAll {root = ./.;}); } From a8ef8e43b913adea7131ee678a4467e62b70d9b1 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 13:57:25 -0600 Subject: [PATCH 20/33] modules/yubico: initialcommit --- modules/yubico/default.nix | 13 +++++++++++++ modules/yubico/hm.nix | 9 +++++++++ modules/yubico/sys.nix | 14 ++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 modules/yubico/default.nix create mode 100644 modules/yubico/hm.nix create mode 100644 modules/yubico/sys.nix diff --git a/modules/yubico/default.nix b/modules/yubico/default.nix new file mode 100644 index 0000000..71bed70 --- /dev/null +++ b/modules/yubico/default.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + pkgs, + doctrine, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "yubico"; + hm = ./hm.nix; + sys = ./sys.nix; +} diff --git a/modules/yubico/hm.nix b/modules/yubico/hm.nix new file mode 100644 index 0000000..8d06368 --- /dev/null +++ b/modules/yubico/hm.nix @@ -0,0 +1,9 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = [ + pkgs.yubikey-manager + ]; +} diff --git a/modules/yubico/sys.nix b/modules/yubico/sys.nix new file mode 100644 index 0000000..3cd009f --- /dev/null +++ b/modules/yubico/sys.nix @@ -0,0 +1,14 @@ +{ + pkgs, + lib, + ... +}: { + environment.etc."pkcs11/modules/ykcs11".text = '' + module: ${pkgs.yubico-piv-tool}/lib/libykcs11.so + ''; + + services = { + pcscd.enable = true; + udev.packages = [pkgs.yubikey-personalization]; + }; +} From 2fe1f36eb96e6b6623d3dd4804cf1b0e3874708a Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 13:58:07 -0600 Subject: [PATCH 21/33] doctrine/lib: refactor 'close' helper --- doctrine/lib/default.nix | 16 +++++++++++++--- doctrine/lib/importAll.nix | 3 ++- doctrine/lib/mk-module.nix | 14 +++++--------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix index 1b03fe1..5e2eb44 100644 --- a/doctrine/lib/default.nix +++ b/doctrine/lib/default.nix @@ -3,8 +3,18 @@ doctrine, pkgs, }: let - close = f: args: f (args // {inherit lib pkgs doctrine;}); + close = vars: f: args: + ( + if builtins.isPath f + then import f + else f + ) + (args // vars); + + closeLib = close {inherit lib;}; + closeFull = close {inherit lib pkgs doctrine;}; in { - importAll = pkgs.callPackage ./importAll.nix {}; - mkModule = close (import ./mk-module.nix); + inherit close; + importAll = closeLib ./importAll.nix; + mkModule = closeFull ./mk-module.nix; } diff --git a/doctrine/lib/importAll.nix b/doctrine/lib/importAll.nix index 03c5330..423dd9c 100644 --- a/doctrine/lib/importAll.nix +++ b/doctrine/lib/importAll.nix @@ -1,4 +1,5 @@ -{lib}: { +{ + lib, root, exclude ? ["default"], }: diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix index 79c24c5..c8b810d 100644 --- a/doctrine/lib/mk-module.nix +++ b/doctrine/lib/mk-module.nix @@ -26,13 +26,9 @@ in { lib.optionalAttrs (configFiles ? ${doctrine.namespace}) (lib.mkIf cfg.enable configSet); - options = lib.optionalAttrs (options - != null - && optionsSet ? ${doctrine.namespace}) { - ${doctrine.prefix}.${name} = - optionsSet.${doctrine.namespace} - // { - enable = lib.mkEnableOption name; - }; - }; + options.${doctrine.prefix}.${name} = + lib.optionalAttrs (options != null && optionsSet ? ${doctrine.namespace}) optionsSet.${doctrine.namespace} + // { + enable = lib.mkEnableOption name; + }; } From 8cc6c13cf5ca0a8943e42a952eb852926669574c Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:05:49 -0600 Subject: [PATCH 22/33] doctrine/lib: rename importAll.nix -> import-all.nix --- doctrine/lib/default.nix | 2 +- doctrine/lib/{importAll.nix => import-all.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename doctrine/lib/{importAll.nix => import-all.nix} (100%) diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix index 5e2eb44..f189e21 100644 --- a/doctrine/lib/default.nix +++ b/doctrine/lib/default.nix @@ -15,6 +15,6 @@ closeFull = close {inherit lib pkgs doctrine;}; in { inherit close; - importAll = closeLib ./importAll.nix; + importAll = closeLib ./import-all.nix; mkModule = closeFull ./mk-module.nix; } diff --git a/doctrine/lib/importAll.nix b/doctrine/lib/import-all.nix similarity index 100% rename from doctrine/lib/importAll.nix rename to doctrine/lib/import-all.nix From 3152a0f626e18e3306f72c3af752a317dbd01867 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:15:41 -0600 Subject: [PATCH 23/33] modules/laptop: initial commit --- modules/laptop/default.nix | 10 ++++++++++ modules/laptop/sys.nix | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 modules/laptop/default.nix create mode 100644 modules/laptop/sys.nix diff --git a/modules/laptop/default.nix b/modules/laptop/default.nix new file mode 100644 index 0000000..b908d47 --- /dev/null +++ b/modules/laptop/default.nix @@ -0,0 +1,10 @@ +{ + config, + doctrine, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "laptop"; + sys = ./sys.nix; +} diff --git a/modules/laptop/sys.nix b/modules/laptop/sys.nix new file mode 100644 index 0000000..252f49c --- /dev/null +++ b/modules/laptop/sys.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + pkgs, + ... +}: { + services = { + tlp.enable = lib.mkDefault true; + upower.enable = lib.mkDefault true; + }; +} From 312101337646c68c837fc9222ac273386cd4108c Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:23:00 -0600 Subject: [PATCH 24/33] doctrine/lib: support module dependencies --- doctrine/lib/mk-module.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix index c8b810d..fa1cd37 100644 --- a/doctrine/lib/mk-module.nix +++ b/doctrine/lib/mk-module.nix @@ -1,12 +1,14 @@ { + # The first few arguments are implicitly passed by the 'close' helper + lib, + pkgs, + doctrine, name, + config, hm ? null, sys ? null, options ? null, - lib, - config, - pkgs, - doctrine, + requires ? [], }: let optionsSet = import options { inherit config lib pkgs cfg name doctrine; @@ -24,7 +26,17 @@ in { config = lib.optionalAttrs (configFiles ? ${doctrine.namespace}) - (lib.mkIf cfg.enable configSet); + (lib.mkIf cfg.enable (lib.mkMerge [ + configSet + { + assertions = + map (dependency: { + assertion = cfg.enable -> config.${doctrine.prefix}.${dependency}.enable; + message = "${doctrine.prefix}.${name}.enable requires ${doctrine.prefix}.${dependency}.enable"; + }) + requires; + } + ])); options.${doctrine.prefix}.${name} = lib.optionalAttrs (options != null && optionsSet ? ${doctrine.namespace}) optionsSet.${doctrine.namespace} From 4a7e6f545c569c59a92ba1f5f2c7afd29caf00b2 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:25:27 -0600 Subject: [PATCH 25/33] doctrine/lib: add optional prefix/namespace args to mkModule --- doctrine/lib/mk-module.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix index fa1cd37..f76ccfe 100644 --- a/doctrine/lib/mk-module.nix +++ b/doctrine/lib/mk-module.nix @@ -9,12 +9,14 @@ sys ? null, options ? null, requires ? [], + prefix ? doctrine.prefix, + namespace ? doctrine.namespace, }: let optionsSet = import options { inherit config lib pkgs cfg name doctrine; }; - configSet = import configFiles.${doctrine.namespace} { + configSet = import configFiles.${namespace} { inherit config lib pkgs doctrine cfg; }; @@ -22,24 +24,24 @@ inherit sys hm; }; - cfg = config.${doctrine.prefix}.${name}; + cfg = config.${prefix}.${name}; in { config = - lib.optionalAttrs (configFiles ? ${doctrine.namespace}) + lib.optionalAttrs (configFiles ? ${namespace}) (lib.mkIf cfg.enable (lib.mkMerge [ configSet { assertions = map (dependency: { - assertion = cfg.enable -> config.${doctrine.prefix}.${dependency}.enable; - message = "${doctrine.prefix}.${name}.enable requires ${doctrine.prefix}.${dependency}.enable"; + assertion = cfg.enable -> config.${prefix}.${dependency}.enable; + message = "${prefix}.${name}.enable requires ${prefix}.${dependency}.enable"; }) requires; } ])); - options.${doctrine.prefix}.${name} = - lib.optionalAttrs (options != null && optionsSet ? ${doctrine.namespace}) optionsSet.${doctrine.namespace} + options.${prefix}.${name} = + lib.optionalAttrs (options != null && optionsSet ? ${namespace}) optionsSet.${namespace} // { enable = lib.mkEnableOption name; }; From a69723cf87c4678d5e89aa6ce7090b9ad0605690 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:25:43 -0600 Subject: [PATCH 26/33] modules/thinkpad: initial commit --- modules/thinkpad/default.nix | 11 +++++++++++ modules/thinkpad/sys.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/thinkpad/default.nix create mode 100644 modules/thinkpad/sys.nix diff --git a/modules/thinkpad/default.nix b/modules/thinkpad/default.nix new file mode 100644 index 0000000..e210947 --- /dev/null +++ b/modules/thinkpad/default.nix @@ -0,0 +1,11 @@ +{ + config, + doctrine, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "thinkpad"; + sys = ./sys.nix; + requires = ["laptop"]; +} diff --git a/modules/thinkpad/sys.nix b/modules/thinkpad/sys.nix new file mode 100644 index 0000000..bc96146 --- /dev/null +++ b/modules/thinkpad/sys.nix @@ -0,0 +1,30 @@ +{ + config, + pkgs, + lib, + ... +}: { + # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI. + # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues + # Fingerprint sensor requires a firmware-update to work. + + boot = { + extraModulePackages = with config.boot.kernelPackages; [acpi_call]; + extraModprobeConfig = "options iwlwifi 11n_disable=1 wd_disable=1"; + + # acpi_call makes tlp work for newer thinkpads + kernelModules = ["acpi_call"]; + + # Force use of the thinkpad_acpi driver for backlight control. + # This allows the backlight save/load systemd service to work. + kernelParams = ["acpi_backlight=native"]; + }; + + hardware.firmware = [pkgs.sof-firmware]; + + services = { + fprintd.enable = lib.mkDefault true; + thinkfan.enable = lib.mkDefault true; + tp-auto-kbbl.enable = lib.mkDefault true; + }; +} From e72efe6b594d86b8b16a111e5fbe5e5aae3f3013 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:46:59 -0600 Subject: [PATCH 27/33] pkgs/athena-bccr: initial commit --- ...-CheckUpdatePlugin-from-default-list.patch | 25 ++ pkgs/athena-bccr/LaunchGaudi.java | 12 + pkgs/athena-bccr/default.nix | 30 +++ pkgs/athena-bccr/firmador.nix | 57 +++++ pkgs/athena-bccr/gaudi-env.nix | 62 +++++ pkgs/athena-bccr/releases.nix | 12 + pkgs/athena-bccr/unwrapped.nix | 226 ++++++++++++++++++ pkgs/default.nix | 3 +- 8 files changed, 425 insertions(+), 2 deletions(-) create mode 100644 pkgs/athena-bccr/0001-Remove-CheckUpdatePlugin-from-default-list.patch create mode 100644 pkgs/athena-bccr/LaunchGaudi.java create mode 100644 pkgs/athena-bccr/default.nix create mode 100644 pkgs/athena-bccr/firmador.nix create mode 100644 pkgs/athena-bccr/gaudi-env.nix create mode 100644 pkgs/athena-bccr/releases.nix create mode 100644 pkgs/athena-bccr/unwrapped.nix diff --git a/pkgs/athena-bccr/0001-Remove-CheckUpdatePlugin-from-default-list.patch b/pkgs/athena-bccr/0001-Remove-CheckUpdatePlugin-from-default-list.patch new file mode 100644 index 0000000..e7fc5d5 --- /dev/null +++ b/pkgs/athena-bccr/0001-Remove-CheckUpdatePlugin-from-default-list.patch @@ -0,0 +1,25 @@ +From 5e7eb46f46af6a29a2aea19db722ebc28baede25 Mon Sep 17 00:00:00 2001 +From: Alejandro Soto +Date: Sat, 21 Jun 2025 22:37:19 -0600 +Subject: [PATCH] Remove CheckUpdatePlugin from default list + +--- + src/main/java/cr/libre/firmador/Settings.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/cr/libre/firmador/Settings.java b/src/main/java/cr/libre/firmador/Settings.java +index e5ddf01..a028d6e 100644 +--- a/src/main/java/cr/libre/firmador/Settings.java ++++ b/src/main/java/cr/libre/firmador/Settings.java +@@ -81,7 +81,7 @@ public class Settings { + + public Settings() { + activePlugins.add("cr.libre.firmador.plugins.DummyPlugin"); +- activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin"); ++ // activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin"); + availablePlugins.add("cr.libre.firmador.plugins.DummyPlugin"); + availablePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin"); + } +-- +2.49.0 + diff --git a/pkgs/athena-bccr/LaunchGaudi.java b/pkgs/athena-bccr/LaunchGaudi.java new file mode 100644 index 0000000..e4bcdbf --- /dev/null +++ b/pkgs/athena-bccr/LaunchGaudi.java @@ -0,0 +1,12 @@ +// Los del BCCR no se molestaron en ponerle un main al Agente Gaudi porque el +// actualizador (que a su vez sí tiene main) carga el jar en memoria y crea una +// instancia de Inicializador usando reflexión. El actualizador no es relevante +// en Nix. En todo caso, dicho actualizador es sumamente frágil y me daría +// demasiada pereza arreglarlo, así que en su lugar usamos este stub para +// launchear Gaudi. + +public class LaunchGaudi { + public static void main(String[] args) { + new InicializadorCliente.Inicializador(""); + } +} diff --git a/pkgs/athena-bccr/default.nix b/pkgs/athena-bccr/default.nix new file mode 100644 index 0000000..a5f79ca --- /dev/null +++ b/pkgs/athena-bccr/default.nix @@ -0,0 +1,30 @@ +{ + callPackage, + lib, +}: let + latest = "deb64-rev26"; + + releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix); + + overrideUnwrapped = default: new: let + args = default // new; + unwrappedPkgs = lib.filterAttrs (name: _: ! lib.elem name ["override" "overrideDerivation"]) (callPackage ./unwrapped.nix args); + in + lib.fix (unwrapped: lib.mapAttrs (_: pkg: callPackage pkg unwrapped) unwrappedPkgs) + // { + override = overrideUnwrapped args; + }; + + pkgsForRelease = release: let + ase-pkcs11 = unwrapped.ase-idprotect.lib; + libasep11 = "${ase-pkcs11}/lib/x64-athena/libASEP11.so"; + unwrapped = overrideUnwrapped {inherit release;} {}; + in { + inherit ase-pkcs11 libasep11; + inherit (unwrapped) ase-idprotect bccr-cacerts; + + gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;}; + firmador = callPackage ./firmador.nix {inherit libasep11;}; + }; +in + lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};}) diff --git a/pkgs/athena-bccr/firmador.nix b/pkgs/athena-bccr/firmador.nix new file mode 100644 index 0000000..d280b56 --- /dev/null +++ b/pkgs/athena-bccr/firmador.nix @@ -0,0 +1,57 @@ +{ + fetchgit, + lib, + makeWrapper, + maven, + openjdk, + wrapGAppsHook, + libasep11 ? null, +}: let + jdk = openjdk.override { + enableJavaFX = true; + }; + + version = "1.9.8"; +in + maven.buildMavenPackage { + pname = "firmador"; + inherit version; + + src = fetchgit { + url = "https://codeberg.org/firmador/firmador"; + rev = version; + hash = "sha256-xdiVPjihRADPK4nG+WQHWsDzVYLCeN6ouQ6SDtjf1qQ="; + }; + + patches = [ + ./0001-Remove-CheckUpdatePlugin-from-default-list.patch + ]; + + mvnHash = "sha256-h1zoStTgaE7toWWKq0Y0ahOORyltChwjmaMYjLgs1VE="; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; + + postPatch = lib.optionalString (libasep11 != null) '' + sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/CRSigner.java + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/java + install -Dm644 target/firmador.jar $out/share/java + + makeWrapper ${jdk}/bin/java $out/bin/firmador \ + --add-flags "-jar $out/share/java/firmador.jar" + + runHook postInstall + ''; + + meta = { + homepage = "https://firmador.libre.cr"; + license = lib.licenses.gpl3Plus; + }; + } diff --git a/pkgs/athena-bccr/gaudi-env.nix b/pkgs/athena-bccr/gaudi-env.nix new file mode 100644 index 0000000..0ca1b82 --- /dev/null +++ b/pkgs/athena-bccr/gaudi-env.nix @@ -0,0 +1,62 @@ +{ + buildFHSEnv, + curl, + lib, + writeShellScriptBin, + gaudiHash ? null, + unwrapped, +}: let + unwrappedWithGaudi = unwrapped.override {inherit gaudiHash;}; +in + buildFHSEnv { + name = "gaudi"; + + targetPkgs = pkgs: [ + unwrappedWithGaudi.ase-idprotect.lib + unwrappedWithGaudi.gaudi + + (writeShellScriptBin "launch-gaudi" '' + set -o errexit + set -o pipefail + set -o nounset + + PATH="${lib.makeBinPath [curl]}:$PATH" + + echo "$0: testing for incompatible releases..." >&2 + + jar_name=bccr-firma-fva-clienteMultiplataforma.jar + url="https://www.firmadigital.go.cr/Bccr.Firma.Fva.Actualizador.ClienteFirmadorJava//recursosLiberica17/actualizador/$jar_name" + ca_file="${unwrappedWithGaudi.bccr-cacerts}/root-ca.pem" + url_hash=$(curl -sS --cacert "$ca_file" "$url" | sha256sum | cut -d' ' -f1) + jar_path="${unwrappedWithGaudi.gaudi}/share/java/$jar_name" + jar_hash=$(sha256sum "$jar_path" | cut -d' ' -f1) + + if [ "$url_hash" != "$jar_hash" ]; then + last_modified=$(curl -sS --head --cacert "$ca_file" "$url" | grep -i '^last-modified:' | head -1) + + echo "$0: sha256 mismatch for $jar_path due to server-side update" >&2 + echo "$0: expected: $url_hash" >&2 + echo "$0: actual: $jar_hash" >&2 + echo "$0: $last_modified" >&2 + echo "$0: run the following to download the new client JAR, then update your derivation:" >&2 + echo "$0: \$ ${unwrappedWithGaudi.update-gaudi}" >&2 + + exit 1 + fi + + cache_path_1="''${XDG_CACHE_HOME:-$HOME/.cache}/Agente-GAUDI" + cache_path_2="''${XDG_CACHE_HOME:-$HOME/.cache}/Firmador-BCCR" + + for cache_path in "$cache_path_1" "$cache_path_2"; do + mkdir -p "$cache_path" + ln -sf -- ${unwrappedWithGaudi.gaudi}/share/java/bccr-firma-fva-clienteMultiplataforma.jar "$cache_path" + done + + cp -f --no-preserve=mode -t "$cache_path_1" -- "${unwrappedWithGaudi.gaudi}/share/java/config.properties" + + exec gaudi + '') + ]; + + runScript = "launch-gaudi"; + } diff --git a/pkgs/athena-bccr/releases.nix b/pkgs/athena-bccr/releases.nix new file mode 100644 index 0000000..e965172 --- /dev/null +++ b/pkgs/athena-bccr/releases.nix @@ -0,0 +1,12 @@ +{ + "deb64-rev26" = { + # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Rev26.zip | cut -d' ' -f1) + hash = "sha256-ZPWP9TqJQ5coJAPzUSiaXKVItBWlqFM4smCjOf+gqQM="; + basename = "sfd_ClientesLinux_DEB64_Rev26"; + + srcPaths = { + gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_20.0_amd64.deb"; + idprotect = "Firma Digital/PinTool/IDProtect PINTool 7.24.02/DEB/idprotectclient_7.24.02-0_amd64.deb"; + }; + }; +} diff --git a/pkgs/athena-bccr/unwrapped.nix b/pkgs/athena-bccr/unwrapped.nix new file mode 100644 index 0000000..d6f3f38 --- /dev/null +++ b/pkgs/athena-bccr/unwrapped.nix @@ -0,0 +1,226 @@ +{ + lib, + requireFile, + release, + gaudiHash ? null, + ... +}: let + inherit (release) srcPaths; + + src = requireFile { + url = "https://soportefirmadigital.com"; + name = "${release.basename}.zip"; + + inherit (release) hash; + }; + + gaudiUpdateSrc = {update-gaudi}: + requireFile { + url = "${update-gaudi}"; + name = "gaudi-update-${release.name}.zip"; + + hash = gaudiHash; + }; + + moduleFromDeb = name: args @ { + stdenv, + dpkg, + unzip, + srcPath, + ... + }: + stdenv.mkDerivation ({ + pname = "${name}-unwrapped"; + version = release.name; + + inherit src; + + nativeBuildInputs = [dpkg unzip] ++ (args.nativeBuildInputs or []); + + postUnpack = '' + dpkg -x ${lib.escapeShellArg "${release.basename}/${srcPath}"} ${lib.escapeShellArg release.basename} + ''; + } + // lib.removeAttrs args ["stdenv" "dpkg" "unzip" "srcPath" "nativeBuildInputs"]); +in { + ase-idprotect = { + autoPatchelfHook, + dpkg, + fontconfig, + freetype, + pcsclite, + stdenv, + unzip, + xorg, + zlib, + ... + }: + moduleFromDeb "ase-idprotect" { + inherit dpkg stdenv unzip; + srcPath = srcPaths.idprotect; + + buildInputs = [ + fontconfig + freetype + pcsclite + stdenv.cc.cc.lib + xorg.libX11 + xorg.libXext + zlib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + outputs = ["out" "lib"]; + + installPhase = '' + runHook preInstall + + install -m755 -d $out/bin $lib/{etc,lib/x64-athena} + install -m755 usr/bin/IDProtect{_Manager,PINTool} $out/bin/ + install -m755 usr/lib/x64-athena/* $lib/lib/x64-athena + cp -r etc/Athena $lib/etc/Athena + + runHook postInstall + ''; + + preFixup = '' + patchelf --set-rpath $lib/lib/x64-athena $out/bin/* + ''; + }; + + gaudi = { + autoPatchelfHook, + dpkg, + makeWrapper, + openjdk, + pkgs, + stdenv, + unzip, + writeShellScriptBin, + update-gaudi, + ... + }: let + jdk = openjdk.override { + enableJavaFX = true; + openjfx_jdk = pkgs."openjfx${lib.head (lib.splitString "." openjdk.version)}".override {withWebKit = true;}; + }; + + fakeSudo = writeShellScriptBin "sudo" ""; + gaudiUpdate = gaudiUpdateSrc {inherit update-gaudi;}; + in + moduleFromDeb "gaudi" { + inherit dpkg stdenv unzip; + srcPath = srcPaths.gaudi; + + nativeBuildInputs = [ + autoPatchelfHook + jdk + makeWrapper + ]; + + preBuild = lib.optionalString (gaudiHash != null) '' + unzip -o ${gaudiUpdate} -d opt/Agente-GAUDI/lib/app + ''; + + buildPhase = '' + runHook preBuild + + install -m755 -d $out/{bin,opt/Firmador-BCCR/lib} + cp -r opt/Agente-GAUDI/lib/app $out/opt/Firmador-BCCR/lib/app + + # Preserves the original filename and avoids -LaunchGaudi.java + ln -s ${./LaunchGaudi.java} LaunchGaudi.java + + javac \ + -cp opt/Agente-GAUDI/lib/app/bccr-firma-fva-clienteMultiplataforma.jar \ + -d $out/opt/Firmador-BCCR/lib/app \ + LaunchGaudi.java + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -m755 -d $out/{share,opt/Firmador-BCCR/lib/runtime/lib} + install -m755 -D opt/Agente-GAUDI/bin/Agente-GAUDI $out/opt/Firmador-BCCR/bin/Agente-GAUDI + install -m755 -D opt/Agente-GAUDI/lib/libapplauncher.so $out/opt/Firmador-BCCR/lib/libapplauncher.so + + ln -s ../opt/Firmador-BCCR/lib/app $out/share/java + ln -s Firmador-BCCR $out/opt/Agente-GAUDI + ln -s ${jdk}/lib/openjdk/lib/libjli.so $out/opt/Firmador-BCCR/lib/runtime/lib/libjli.so + + makeWrapper ${jdk}/bin/java $out/bin/gaudi \ + --prefix PATH : ${fakeSudo}/bin \ + --add-flags "-cp $out/share/java:$out/share/java/bccr-firma-fva-clienteMultiplataforma.jar" \ + --add-flags "-Djavax.net.ssl.trustStore=$out/opt/Firmador-BCCR/lib/app/bccr.cacerts" \ + --add-flags "LaunchGaudi" + + runHook postInstall + ''; + }; + + bccr-cacerts = { + openssl, + stdenv, + unzip, + ... + }: + stdenv.mkDerivation { + pname = "bccr-cacerts"; + version = release.name; + + inherit src; + + nativeBuildInputs = [ + openssl + unzip + ]; + + installPhase = '' + cp -r Firma\ Digital/Certificados $out + openssl x509 -in $out/CA\ RAIZ\ NACIONAL\ -\ COSTA\ RICA\ v2.crt -out $out/root-ca.pem -text + ''; + }; + + update-gaudi = { + wget, + writeShellScript, + zip, + bccr-cacerts, + ... + }: + writeShellScript "update-gaudi" '' + set -o errexit + set -o pipefail + set -o nounset + + temp_dir="$(mktemp -d)" + trap 'cd / && rm -rf -- "$temp_dir"' EXIT + cd "$temp_dir" + + PATH="${lib.makeBinPath [wget zip]}:$PATH" + ca_cert="${bccr-cacerts}/root-ca.pem" + base_url="https://www.firmadigital.go.cr/Bccr.Firma.Fva.Actualizador.ClienteFirmadorJava//recursosLiberica17/actualizador" + + wget --ca-certificate="$ca_cert" "$base_url/bccr.cacerts" + wget --ca-certificate="$ca_cert" "$base_url/config.properties" + wget --ca-certificate="$ca_cert" "$base_url/bccr-firma-fva-clienteMultiplataforma.jar" + wget --ca-certificate="$ca_cert" "$base_url/ServicioActualizadorClienteBCCR.jar" + + # https://gist.github.com/stokito/c588b8d6a6a0aee211393d68eea678f2 + TZ=UTC find . -exec touch --no-dereference -a -m -t 198002010000.00 {} + + zip_path="$PWD/gaudi-update-${release.name}.zip" + TZ=UTC zip -q --move --recurse-paths --symlinks -X "$zip_path" . + TZ=UTC touch -a -m -t 198002010000.00 "$zip_path" + + set -x + nix-store --add-fixed sha256 "$zip_path" + set +x + + echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))" + ''; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 454b81d..484ca77 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,9 +2,8 @@ final: prev: with prev.lib; let inherit (final) callPackage; in { - lib = callPackage ./lib {}; - override = {}; + athena-bccr = callPackage ./athena-bccr {}; spliit = callPackage ./spliit {}; } From c651b8c4706cfc750303db12ae19e58164a6bebb Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Wed, 6 Aug 2025 14:59:33 -0600 Subject: [PATCH 28/33] modules/athena-bccr: initial commit --- modules/athena-bccr/default.nix | 14 +++++++++++++ modules/athena-bccr/hm.nix | 14 +++++++++++++ modules/athena-bccr/options.nix | 30 ++++++++++++++++++++++++++++ modules/athena-bccr/sys.nix | 35 +++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 modules/athena-bccr/default.nix create mode 100644 modules/athena-bccr/hm.nix create mode 100644 modules/athena-bccr/options.nix create mode 100644 modules/athena-bccr/sys.nix diff --git a/modules/athena-bccr/default.nix b/modules/athena-bccr/default.nix new file mode 100644 index 0000000..93c5660 --- /dev/null +++ b/modules/athena-bccr/default.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + pkgs, + doctrine, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "athena-bccr"; + hm = ./hm.nix; + sys = ./sys.nix; + options = ./options.nix; +} diff --git a/modules/athena-bccr/hm.nix b/modules/athena-bccr/hm.nix new file mode 100644 index 0000000..0678e3c --- /dev/null +++ b/modules/athena-bccr/hm.nix @@ -0,0 +1,14 @@ +{ + pkgs, + lib, + cfg, + doctrine, + ... +}: let + athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release}; +in { + home.packages = [ + athena.firmador + (athena.gaudi.override {inherit (cfg) gaudiHash;}) + ]; +} diff --git a/modules/athena-bccr/options.nix b/modules/athena-bccr/options.nix new file mode 100644 index 0000000..eb61cf5 --- /dev/null +++ b/modules/athena-bccr/options.nix @@ -0,0 +1,30 @@ +{lib, ...}: +with lib.types; { + hm = { + gaudiHash = lib.mkOption { + type = nullOr str; + default = null; + description = "hash of the Gaudi client"; + }; + + release = lib.mkOption { + type = str; + default = "latest"; + description = "pinned athena-bccr release tag"; + }; + }; + + sys = { + group = lib.mkOption { + type = str; + default = "users"; + description = "user group with full access to the smartcard reader"; + }; + + release = lib.mkOption { + type = str; + default = "latest"; + description = "pinned athena-bccr release tag"; + }; + }; +} diff --git a/modules/athena-bccr/sys.nix b/modules/athena-bccr/sys.nix new file mode 100644 index 0000000..631185d --- /dev/null +++ b/modules/athena-bccr/sys.nix @@ -0,0 +1,35 @@ +{ + pkgs, + lib, + cfg, + doctrine, + ... +}: let + athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release}; +in { + environment = { + etc = { + "Athena".source = "${athena.ase-pkcs11}/etc/Athena"; + + "pkcs11/modules/asep11".text = '' + module: ${athena.libasep11} + ''; + }; + + systemPackages = [athena.ase-pkcs11]; + }; + + #FIXME: Extremadamente peligroso si BCCR o MICITT caen, investigar política nacional de root CA + security.pki.certificateFiles = ["${athena.bccr-cacerts}/root-ca.pem"]; + + services = { + pcscd.enable = true; + + udev.extraRules = '' + # Athena Smartcard Solutions, Inc. ASEDrive V3CR + ATTRS{idVendor}=="0dc3", ATTRS{idProduct}=="1004", MODE="660", GROUP="${cfg.group}", TAG+="uaccess" + ''; + }; + + users.groups.${cfg.group} = {}; +} From 7daa3d91b377bbe38265ddb941ef0a1321193714 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 24 Aug 2025 18:49:13 -0600 Subject: [PATCH 29/33] trivionomicon/doctrine: add support for overriding the prefix --- doctrine/default.nix | 18 +++++++++++------- doctrine/lib/default.nix | 13 ++++++++----- doctrine/lib/mk-module.nix | 15 +++++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/doctrine/default.nix b/doctrine/default.nix index b4c72b8..0d50d49 100644 --- a/doctrine/default.nix +++ b/doctrine/default.nix @@ -1,12 +1,16 @@ { + lib ? pkgs.lib, pkgs, - namespace, + prefix ? "trivium", + namespace ? null, }: let - doctrine = { - lib = import ./lib {inherit lib pkgs doctrine;}; - prefix = "trivium"; - inherit namespace; - }; - inherit (pkgs) lib; + doctrine = + { + lib = import ./lib {inherit lib pkgs doctrine;}; + inherit namespace prefix; + } + // lib.optionalAttrs (pkgs != null) { + inherit pkgs; + }; in doctrine diff --git a/doctrine/lib/default.nix b/doctrine/lib/default.nix index f189e21..e2d84b8 100644 --- a/doctrine/lib/default.nix +++ b/doctrine/lib/default.nix @@ -13,8 +13,11 @@ closeLib = close {inherit lib;}; closeFull = close {inherit lib pkgs doctrine;}; -in { - inherit close; - importAll = closeLib ./import-all.nix; - mkModule = closeFull ./mk-module.nix; -} +in + { + inherit close; + importAll = closeLib ./import-all.nix; + } + // lib.optionalAttrs (doctrine.namespace != null) { + mkModule = closeFull ./mk-module.nix; + } diff --git a/doctrine/lib/mk-module.nix b/doctrine/lib/mk-module.nix index f76ccfe..ffbe6bc 100644 --- a/doctrine/lib/mk-module.nix +++ b/doctrine/lib/mk-module.nix @@ -11,14 +11,17 @@ requires ? [], prefix ? doctrine.prefix, namespace ? doctrine.namespace, + passthru ? {}, }: let - optionsSet = import options { - inherit config lib pkgs cfg name doctrine; - }; + optionsSet = import options (passthru + // { + inherit config lib pkgs cfg name doctrine; + }); - configSet = import configFiles.${namespace} { - inherit config lib pkgs doctrine cfg; - }; + configSet = import configFiles.${namespace} (passthru + // { + inherit config lib pkgs doctrine cfg; + }); configFiles = lib.filterAttrs (k: v: v != null) { inherit sys hm; From 111d3dabf21e6b413e4cf91136a8fec720a58f28 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 24 Aug 2025 18:49:47 -0600 Subject: [PATCH 30/33] trivionomicon/modules/nix-registry: initial commit --- modules/nix-registry/default.nix | 16 ++++++++++++++++ modules/nix-registry/hm.nix | 23 +++++++++++++++++++++++ modules/nix-registry/options.nix | 19 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 modules/nix-registry/default.nix create mode 100644 modules/nix-registry/hm.nix create mode 100644 modules/nix-registry/options.nix diff --git a/modules/nix-registry/default.nix b/modules/nix-registry/default.nix new file mode 100644 index 0000000..8406d88 --- /dev/null +++ b/modules/nix-registry/default.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + pkgs, + doctrine, + flakes, + ... +}: +doctrine.lib.mkModule { + inherit config; + name = "nix-registry"; + hm = ./hm.nix; + options = ./options.nix; + + passthru = {inherit flakes;}; +} diff --git a/modules/nix-registry/hm.nix b/modules/nix-registry/hm.nix new file mode 100644 index 0000000..1c57e95 --- /dev/null +++ b/modules/nix-registry/hm.nix @@ -0,0 +1,23 @@ +{ + pkgs, + lib, + cfg, + flakes, + ... +}: let + registryName = name: + if name == "self" + then cfg.renameSelf + else name; + + registryFilter = { + nixpkgs = true; + unstable = true; + self = cfg.renameSelf != null; + }; +in { + nix.registry = + lib.mapAttrs' + (name: value: lib.nameValuePair (registryName name) {flake = value;}) + (lib.filterAttrs (name: _: registryFilter.${name} or cfg.allInputs) flakes); +} diff --git a/modules/nix-registry/options.nix b/modules/nix-registry/options.nix new file mode 100644 index 0000000..e8898ec --- /dev/null +++ b/modules/nix-registry/options.nix @@ -0,0 +1,19 @@ +{lib, ...}: +with lib.types; { + hm = { + allInputs = mkOption { + type = bool; + default = default; + description = '' + Include all flake inputs. If false, only 'nixpkgs' and 'unstable' + (if available) will be added to the flake registry by default. + ''; + }; + + renameSelf = mkOption { + type = nullOr str; + default = "self"; + description = "Registry name to use for the 'self' input"; + }; + }; +} From bf39923f9ce5cd14c7fcbc40474d01f2f87fb10f Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 24 Aug 2025 18:51:05 -0600 Subject: [PATCH 31/33] trivionomicon/flake: rewrite broken implementation of mkSystemFlake --- flake.nix | 205 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 92 deletions(-) diff --git a/flake.nix b/flake.nix index 1a20e9e..7ab10c5 100644 --- a/flake.nix +++ b/flake.nix @@ -16,15 +16,24 @@ "${namespace}" = builtins.removeAttrs overlayPkgs ["override"]; } // (overlayPkgs.override or {}); + + doctrineNoPkgs = self.lib.mkDoctrine { + lib = nixpkgs.lib; + pkgs = null; + }; in - flake-utils.lib.eachDefaultSystem (system: { - formatter = (import nixpkgs {inherit system;}).alejandra; + flake-utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs {inherit system;}; + in { + formatter = pkgs.alejandra; packages = (import nixpkgs { inherit system; - overlays = [(mapOverlayOverride "local" (import ./pkgs))]; - }).local; + overlays = [(mapOverlayOverride doctrineNoPkgs.prefix (import ./pkgs))]; + }).${ + doctrineNoPkgs.prefix + }; }) // { templates = let @@ -39,33 +48,37 @@ }; overlays = let - overlay = mapOverlayOverride "trivium" (import ./pkgs); + overlay = mapOverlayOverride doctrineNoPkgs.prefix (import ./pkgs); in { default = overlay; - trivium = overlay; + ${doctrineNoPkgs.prefix} = overlay; }; homeManagerModules.default = ./modules; nixosModules.default = ./modules; lib = { + mkDoctrine = import ./doctrine; + mkSystemFlake = { flakes, system, + doctrinePrefix ? null, formatter ? "alejandra", - localOverlayPath ? /. + "${flakes.self}" + /pkgs, - nixpkgsConfigPath ? localOverlayPath + /config, - nixosSourcePath ? /. + "${flakes.self}" + /sys, - nixosPlatformsPath ? - if nixosSourcePath != null - then nixosSourcePath + /platform - else null, - hmSourcePath ? /. + "${flakes.self}" + /home, - hmPlatformsPath ? - if hmSourcePath != null - then hmSourcePath + /platform - else null, + paths ? {}, }: let + mkDoctrine = args: + self.lib.mkDoctrine + (args + // optionalAttrs (doctrinePrefix != null) { + prefix = doctrinePrefix; + }); + + doctrineNoPkgs = mkDoctrine { + lib = nixpkgs.lib; + pkgs = null; + }; + optionalFlake = name: if flakes ? "${name}" then flakes.${name} @@ -74,7 +87,7 @@ requireFlake = name: if flakes ? "${name}" then flakes.${name} - else throw "Required flake input '${name}' is required but was not provided"; + else throw "Required flake input '${name}' is missing"; nur = optionalFlake "nur"; nixpkgs = requireFlake "nixpkgs"; @@ -85,13 +98,21 @@ then requireFlake "home-manager" else null; + pathFromSelf = path: builtins.toPath "${flakes.self}" + "/${path}"; + + localOverlayPath = pathFromSelf paths.localOverlay; + nixpkgsConfigPath = pathFromSelf paths.nixpkgsConfig; + nixosSourcePath = pathFromSelf paths.nixosSource; + nixosPlatformsPath = pathFromSelf paths.nixosPlatforms; + hmSourcePath = pathFromSelf paths.hmSource; + hmPlatformsPath = pathFromSelf paths.hmPlatforms; + pkgs = importPkgs nixpkgs; importPkgs = flake: import flake ({ inherit system; - config = import ./pkgs/config nixpkgs.lib; overlays = let conditions = [ { @@ -100,7 +121,7 @@ } # NB: Preserve the relative order { - overlay = self.overlays.trivium; + overlay = self.overlays.default; condition = true; } { @@ -111,87 +132,87 @@ in builtins.map (cond: cond.overlay) (builtins.filter (cond: cond.condition) conditions); } - // ( - if nixpkgsConfigPath != null - then { - config = import nixpkgsConfigPath {inherit (nixpkgs) lib;}; - } - else {} - )); + // optionalAttrs (paths ? nixpkgsConfig) { + config = import nixpkgsConfigPath {inherit (nixpkgs) lib;}; + }); - inherit (pkgs.trivium.lib) importAll; + inherit (pkgs) lib; + inherit (nixpkgs.lib) optionalAttrs; # Prevents infinite recursion + inherit (doctrineNoPkgs) prefix; + inherit (doctrineNoPkgs.lib) importAll; in - with pkgs.lib; - { - formatter.${system} = - if formatter == "alejandra" - then pkgs.alejandra - else if formatter == "nixpkgs-fmt" - then pkgs.nixpkgs-fmt - else throw "Unknown formatter: '${formatter}'"; + { + formatter.${system} = + if formatter == "alejandra" + then pkgs.alejandra + else if formatter == "nixpkgs-fmt" + then pkgs.nixpkgs-fmt + else throw "Unknown formatter: '${formatter}'"; - packages.${system} = pkgs.local; + packages.${system} = pkgs.${prefix}; - overlays.default = final: prev: let - overlay = - if localOverlayPath != null - then import localOverlayPath - else (final: prev: {}); - in - mapOverlayOverride "local" overlay final prev - // optionalAttrs (unstable != null) { - unstable = importPkgs unstable; + overlays.default = final: prev: let + overlay = + if paths ? localOverlay + then import localOverlayPath + else (final: prev: {}); + in + mapOverlayOverride prefix overlay final prev + // optionalAttrs (unstable != null) { + unstable = importPkgs unstable; + }; + } + // optionalAttrs (paths ? nixosSource) { + nixosConfigurations = let + nixosSystem = {modules}: + lib.makeOverridable nixpkgs.lib.nixosSystem { + inherit modules pkgs system; + + specialArgs = { + inherit flakes; + + doctrine = mkDoctrine { + inherit pkgs; + namespace = "sys"; + }; + }; }; - } - // optionalAttrs (nixosSourcePath != null) { - nixosConfigurations = let - nixosSystem = {modules}: - makeOverridable nixpkgs.lib.nixosSystem { - inherit modules pkgs system; - specialArgs = { - inherit flakes; + hostConfig = platform: + nixosSystem { + modules = [ + self.nixosModules.default + nixosSourcePath + platform + ]; + }; + in + lib.mapAttrs (_: hostConfig) (importAll {root = nixosPlatformsPath;}); + } + // optionalAttrs (paths ? hmSource) { + homeConfigurations = let + home = name: platform: + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + + extraSpecialArgs = { + inherit flakes; + + doctrine = mkDoctrine { + inherit pkgs; + namespace = "hm"; }; }; - hostConfig = platform: - nixosSystem { - modules = [ - self.nixosModules.default - nixosSourcePath - platform - ]; - }; - in - mapAttrs (_: hostConfig) (importAll {root = nixosPlatformsPath;}); - } - // optionalAttrs (hmSourcePath != null) { - homeConfigurations = let - registry = {...}: { - config.nix.registry = - mapAttrs - (_: value: {flake = value;}) - flakes; + modules = [ + self.homeManagerModules.default + hmSourcePath + platform + ]; }; - - home = name: platform: - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - extraSpecialArgs = { - inherit flakes; - }; - - modules = [ - self.homeManagerModules.default - hmSourcePath - platform - registry - ]; - }; - in - mapAttrs home (importAll {root = hmPlatformsPath;}); - }; + in + lib.mapAttrs home (importAll {root = hmPlatformsPath;}); + }; }; }; } From b36942fafbdd9e7191ea9fc0d28a5d0d07ac3532 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Mon, 25 Aug 2025 16:04:19 -0600 Subject: [PATCH 32/33] trivionomicon/flake: fix 'localOverlay' function interface to accept flakes --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 7ab10c5..f2ee049 100644 --- a/flake.nix +++ b/flake.nix @@ -152,10 +152,10 @@ packages.${system} = pkgs.${prefix}; overlays.default = final: prev: let - overlay = + overlay = final: prev: if paths ? localOverlay - then import localOverlayPath - else (final: prev: {}); + then import localOverlayPath {inherit final prev flakes;} + else {}; in mapOverlayOverride prefix overlay final prev // optionalAttrs (unstable != null) { From 0ae8676d5028467db1cf8139210d22c2fbb5041d Mon Sep 17 00:00:00 2001 From: fabian Date: Tue, 26 Aug 2025 00:11:07 +0200 Subject: [PATCH 33/33] add README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..aced5a2 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +### Push: + + git subtree push --prefix=trivionomicon forgejo@git.posixlycorrect.com:deepState/trivionomicon.git master + + +### Pull: + + git subtree pull --prefix=trivionomicon forgejo@git.posixlycorrect.com:deepState/trivionomicon.git master