diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs deleted file mode 100644 index fb5a3ba..0000000 --- a/.git-blame-ignore-revs +++ /dev/null @@ -1 +0,0 @@ -ce54be9aac846c7798307d6d6fcee3346c01f601 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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 -. diff --git a/common/default.nix b/common/default.nix index 73d5200..a600ff3 100644 --- a/common/default.nix +++ b/common/default.nix @@ -28,6 +28,7 @@ in # configure console console = { + font = "Lat2-Terminus16"; keyMap = "de"; }; @@ -67,6 +68,19 @@ in # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; + networking.firewall.allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + networking.firewall.allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; # for KDE connect + # FIXME: kdeconnect module # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -109,9 +123,6 @@ in }; }; }; - plugins = with pkgs; [ - networkmanager-openvpn - ]; }; services.avahi.enable = true; @@ -160,13 +171,6 @@ in kontact = true; merkuro = true; }; - # additional standalone versions of kontact components - environment.systemPackages = with pkgs.kdePackages; [ - korganizer - kaddressbook - pkgs.ktimetracker - ]; - programs.kdeconnect.enable = true; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; @@ -177,7 +181,7 @@ in # Flatpak support services.flatpak.enable = true; - xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; # Define a user account. Don't forget to set a password with `passwd`. users.users.spiollinux = { @@ -265,5 +269,4 @@ in networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; services.dbus.implementation = "broker"; - system.rebuild.enableNg = true; } diff --git a/common/nitrokey.nix b/common/nitrokey.nix index a8328fa..40457d1 100644 --- a/common/nitrokey.nix +++ b/common/nitrokey.nix @@ -1,10 +1,7 @@ { pkgs, lib, ... }: { hardware.nitrokey.enable = true; - environment.systemPackages = [ - pkgs.pynitrokey - pkgs.nitrokey-app2 - ]; + environment.systemPackages = [ pkgs.pynitrokey ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/common/nix-settings.nix b/common/nix-settings.nix index 6199694..caa16f9 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -29,9 +29,7 @@ in ]; # use all cores for building cores = 0; - #auto-optimise-store = true; }; - nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) nix.extraOptions = '' diff --git a/common/packages.nix b/common/packages.nix index 06e5d73..9634e2a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,8 +11,6 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" - # dependency of pynitrokey - "python3.12-ecdsa-0.19.1" ]; # List packages installed in system profile. @@ -42,7 +40,7 @@ exfat iotop cifs-utils - dool + dstat lsof macchanger borgbackup diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index 7323b57..ed94170 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Enable sound. - services.pulseaudio = { + hardware.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; # decouple pulseaudio application and sink volumes diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 0e0a10a..fc577ec 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../common/nix-settings.nix ]; nix = { enable = true; + package = pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "os" @@ -17,10 +18,12 @@ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" ]; - sandbox = "relaxed"; }; }; + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -35,7 +38,6 @@ # system-wide SSH configuration, used by nix-daemon for remote builders # show hidden files - system.primaryUser = "os"; system.defaults.NSGlobalDomain.AppleShowAllFiles = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/flake.lock b/flake.lock index b9b485a..8ee8ebd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -18,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1765384171, - "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -126,16 +126,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.3", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1765066094, - "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-25.11", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -225,29 +225,45 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -260,14 +276,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765105806, - "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", + "lastModified": 1747261242, + "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=", "owner": "nix-community", "repo": "NUR", - "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", + "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda", "type": "github" }, "original": { @@ -286,14 +303,15 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -312,7 +330,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", - "treefmt-nix": "treefmt-nix", + "treefmt-nix": "treefmt-nix_2", "utils": "utils" } }, @@ -324,11 +342,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -355,15 +373,36 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0241e2d..470ae9b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.3"; + url = "github:nix-community/lanzaboote/v0.4.2"; # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.11"; + url = "github:LnL7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ]; + patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ]; }; # necessary to make the top-level inputs available to system configuration @@ -166,7 +166,6 @@ # inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix # run like: `nix run .#hm -- ` apps.hm = { - meta.description = "Wrapper around home-manager with automatic profile selection"; type = "app"; program = "${pkgs.writeShellScriptBin "hm" '' set -x diff --git a/home/common.nix b/home/common.nix index afeadbf..9cb8df9 100644 --- a/home/common.nix +++ b/home/common.nix @@ -11,7 +11,6 @@ ./modules/packages.nix ./modules/vscodium.nix ./modules/fonts.nix - ./modules/captive-browser.nix ]; home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; @@ -43,7 +42,7 @@ programs.git = { enable = true; - settings = { + extraConfig = { credential.helper = "cache"; push.default = "simple"; push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background @@ -52,7 +51,9 @@ merge.tool = "vimdiff"; # provide `git mergetool -t nixfmt` mergetool.nixfmt = { - cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; + cmd = "${ + lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style + } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; trustExitCode = true; }; core.excludesfile = toString ( @@ -75,14 +76,13 @@ rerere.enabled = true; }; lfs.enable = true; - }; - programs.delta = { - enable = true; - enableGitIntegration = true; - options = { - line-numbers = true; - side-by-side = true; - #dark = true; + delta = { + enable = true; + options = { + line-numbers = true; + side-by-side = true; + #dark = true; + }; }; }; programs.lazygit = { @@ -105,7 +105,7 @@ enable = true; syntaxHighlighting.enable = true; history.ignoreSpace = true; - initContent = '' + initExtra = '' # Uncomment following line if you want red dots to be displayed while waiting for completion COMPLETION_WAITING_DOTS="true" ### Fix slowness of pastes with zsh-syntax-highlighting.zsh @@ -123,6 +123,8 @@ # automatic rehash of path completion zstyle ':completion:*' rehash true + eval "$(${pkgs.thefuck}/bin/thefuck --alias)" + ## helper functions nixify() { if [ ! -e ./.envrc ]; then @@ -169,15 +171,6 @@ EDITOR = "nvim"; }; - programs.yt-dlp = { - enable = true; - settings = { - embed-thumbnail = true; - embed-subs = true; - sub-langs = "all"; - }; - }; - home.activation.reportChanges = config.lib.dag.entryAnywhere '' if [[ -v oldGenPath ]]; then run nix store diff-closures $oldGenPath $newGenPath diff --git a/home/desktop.nix b/home/desktop.nix index 7fa7840..212debf 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -33,45 +33,46 @@ contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { - includes = [ - { - condition = "gitdir:~/Seafile/Studium/"; - contents = { - user.name = contacts.personal.name; - user.email = contacts.uni.email; - }; - } - { - condition = "gitdir:~/src/nixpkgs/"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.nixOs.email; - }; - } - ] - # set default name for several other common locations - ++ - map - (dir: { - condition = "gitdir:${dir}"; + includes = + [ + { + condition = "gitdir:~/Seafile/Studium/"; contents = { - user = { - inherit (contacts.schmittlauch) email name; - }; + user.name = contacts.personal.name; + user.email = contacts.uni.email; }; - }) - [ - "~/src/" - "~/bin/" - "~/tmp/" - "~/nixconfigs/" - ]; + } + { + condition = "gitdir:~/src/nixpkgs/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixOs.email; + }; + } + ] + # set default name for several other common locations + ++ + map + (dir: { + condition = "gitdir:${dir}"; + contents = { + user = { + inherit (contacts.schmittlauch) email name; + }; + }; + }) + [ + "~/src/" + "~/bin/" + "~/tmp/" + "~/nixconfigs/" + ]; }; services.gpg-agent = { enable = true; #enableSshSupport = true; - pinentry.package = pkgs.pinentry-qt; + pinentryPackage = pkgs.pinentry-qt; }; programs.ssh = { diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix deleted file mode 100644 index 501cdfb..0000000 --- a/home/modules/captive-browser.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - pkgs, - lib, - inputs, - config, - system, - ... -}: - -let - tomlFormat = pkgs.formats.toml { }; - cfg = config.programs.captive-browser; - inherit (pkgs.stdenv.hostPlatform) isDarwin; -in -{ - options.programs.captive-browser = { - enable = lib.mkEnableOption "Enable custom captive-browser in user PATH"; - package = lib.mkPackageOption pkgs "captive-browser" { nullable = true; }; - settings = lib.mkOption { - type = lib.types.submodule { - freeformType = tomlFormat.type; - - options = { - browser = lib.mkOption { - type = lib.types.str; - description = "command to invoke the browser with"; - - # browser is the shell (/bin/sh) command executed once the proxy starts. - # When browser exits, the proxy exits. An extra env var PROXY is available. - # - # Here, we use a separate Chrome instance in Incognito mode, so that - # it can run (and be waited for) alongside the default one, and that - # it maintains no state across runs. To configure this browser open a - # normal window in it, settings will be preserved. - default = '' - ${cfg.browserCommand} \ - --user-data-dir="$HOME/Library/Application Support/Google/Captive" \ - --proxy-server="socks5://$PROXY" \ - --proxy-bypass-list="<-loopback>" \ - --no-first-run \ - --new-window \ - --incognito \ - --no-default-browser-check \ - --no-crash-upload \ - --disable-extensions \ - --disable-sync \ - --disable-background-networking \ - --disable-client-side-phishing-detection \ - --disable-component-update \ - --disable-translate \ - --disable-web-resources \ - --safebrowsing-disable-auto-update \ - http://example.com - ''; - }; - }; - }; - }; - interface = lib.mkOption { - type = lib.types.str; - description = "WLAN interface to use"; - }; - browserCommand = lib.mkOption { - type = lib.types.str; - default = if isDarwin then "open -n -W -a \"Google Chrome\" --args" else (lib.getExe pkgs.chromium); - }; - }; - config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; - - programs.captive-browser.settings = builtins.mapAttrs (_: lib.mkOptionDefault) { - # dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP - # DNS server address. The first match of an IPv4 regex is used. - # IPv4 only, because let's be real, it's a captive portal. - dhcp-dns = - if isDarwin then - "ipconfig getoption ${cfg.interface} domain_name_server" - else - "${lib.getExe pkgs.dhcpcd} -U ${cfg.interface} | grep domain_name_servers"; - - # socks5-addr is the listen address for the SOCKS5 proxy server. - socks5-addr = "localhost:1666"; - }; - home.file.".config/captive-browser.toml" = lib.mkIf (isDarwin && !config.xdg.enable) { - source = tomlFormat.generate "captive-browser-config" cfg.settings; - }; - - xdg.configFile."captive-browser.toml" = lib.mkIf (!(isDarwin && !config.xdg.enable)) { - source = tomlFormat.generate "captive-browser-config" cfg.settings; - }; - - }; -} diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 5bcdf53..6ce1185 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -11,7 +11,7 @@ source-sans-pro source-code-pro source-serif-pro - ubuntu-classic + ubuntu_font_family twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) diff --git a/home/modules/latex.nix b/home/modules/latex.nix index a9b853c..3f79930 100644 --- a/home/modules/latex.nix +++ b/home/modules/latex.nix @@ -43,6 +43,5 @@ in koma-script ; }) - ] - ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools; + ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools; } diff --git a/home/modules/llm.nix b/home/modules/llm.nix deleted file mode 100644 index 80466d4..0000000 --- a/home/modules/llm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - lib, - inputs, - config, - system, - ... -}: -let - myAider = pkgs.aider-chat; - # FIXME: darwin build failure due to cfn-lint-1.32.1 - # myAider = pkgs.aider-chat.withOptional { - # withPlaywright = true; - # withBrowser = true; - # withHelp = true; - # withBedrock = false; - # }; -in -{ - home.packages = [ - myAider - pkgs.claude-code - ]; - #nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "claude-code" ]; # nixpkgs.config merging is unfortunately broken - # TODO: API token e.g. via sops - # TODO: proper codium and llm enable options - home.sessionVariables = { - AIDER_EDITOR = "codium --wait"; - DISABLE_TELEMETRY = 1; # for claude-code - }; -} diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c267b3a..79052c5 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -12,82 +12,83 @@ let unstable = inputs.nixos-unstable.legacyPackages.${system}; nur = inputs.nur.legacyPackages.${system}; - graphicsApps = [ - inkscape - exiftool - ] - ++ (with gimp3Plugins; [ - #fourier # broken - #lqrPlugin # broken - ]) - ++ lib.optionals pkgs.stdenv.isLinux [ - darktable - gimp3 - hugin - #luminanceHDR # FIXME, build failure - xournalpp - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp2 - ]; + graphicsApps = + [ + inkscape + darktable + exiftool + gimp + ] + ++ (with gimpPlugins; [ + fourier + lqrPlugin + ]) + ++ lib.optionals pkgs.stdenv.isLinux [ + hugin + luminanceHDR + xournal + ]; - multimediaApps = [ - mpv - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] - ++ lib.optionals pkgs.stdenv.isLinux [ - vlc - amarok - clementine - kdePackages.elisa - musescore - tenacity - #nur.repos.fooker.studio-link - ]; + multimediaApps = + [ + mpv + yt-dlp + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + vlc + amarok + clementine + elisa + musescore + tenacity + soundkonverter + #nur.repos.fooker.studio-link + ]; - cliApps = [ - coreutils - myVim - htop - tmux - httpie - rsync - ponysay - gti - tree - lsof - mosh - openssh - sshfs-fuse - sshuttle - cryfs - gnupg - unar - lzop - p7zip - pwgen - pandoc - pdfgrep - # zig dependency breaks occasionally, stay on C version for now - ncdu_1 - dos2unix - unzip - fswatch - jq - age - lnav - spacer + cliApps = + [ + coreutils + myVim + htop + tmux + httpie + ponysay + gti + tree + lsof + mosh + openssh + sshfs-fuse + sshuttle + cryfs + thefuck + gnupg + unar + lzop + p7zip + pwgen + pandoc + pdfgrep + # zig dependency breaks occasionally, stay on C version for now + ncdu_1 + dos2unix + unzip + fswatch + jq + age + lnav + spacer - nix-output-monitor # putting this here as a plain `nix` alternative - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - xclip - smbnetfs # for FUSE smb mounting - psmisc # for killall - torsocks - agrep - reptyr # re-bind running program to other tty - ]; + nix-output-monitor # putting this here as a plain `nix` alternative + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + xclip + smbnetfs # for FUSE smb mounting + psmisc # for killall + torsocks + agrep + reptyr # re-bind running program to other tty + ]; nixHelpers = [ nixpkgs-review @@ -95,31 +96,33 @@ let nix-top statix ]; - devTools = [ - curl - httpie - gcc - shellcheck - mtr - ripgrep - fd - pre-commit - scriv + devTools = + [ + curl + httpie + gcc + shellcheck + mtr + ripgrep + fd + gitui + pre-commit + scriv - # Haskell - ghc - cabal2nix - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - gdb - strace - ltrace - valgrind - zeal - ]; + # Haskell + ghc + cabal2nix + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + gdb + strace + ltrace + valgrind + zeal + ]; pythonTools = with python3Packages; [ - python # to shadow old macOS python + python3 # to shadow old macOS python ipython uv pip @@ -139,12 +142,13 @@ let desktopCommon = [ keepassxc + tigervnc ]; desktopLinux = [ firefox chromium - kdePackages.falkon + falkon thunderbird calibre dino @@ -160,15 +164,15 @@ let seafile-client alacritty libreoffice-qt6 # still with KDE integration + backintime-common anki signal-desktop - (tor-browser.override { + (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) - tigervnc - rustdesk-flutter pdfpc + quaternion nheko gpxsee subsurface @@ -179,7 +183,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - logseq + unstable.logseq # for Hibiscus banking software jameica @@ -188,31 +192,33 @@ let chromedriver ]; - kdeTools = [ - okteta - ] - ++ (with kdePackages; [ - okular - gwenview - yakuake - dolphin - spectacle - kate - kleopatra - qdirstat - ark - kwalletmanager - #ktouch # TODO: unbreak - kcharselect - konversation - krdc - skanlite - akonadiconsole - tokodon # mastodon client - networkmanager-qt - kcrash - breeze-gtk - ]); + kdeTools = + [ + okteta + plasma5Packages.kdeconnect-kde + ] + ++ (with kdePackages; [ + okular + gwenview + yakuake + dolphin + spectacle + kate + kleopatra + qdirstat + ark + kwalletmanager + #ktouch # TODO: unbreak + kcharselect + konversation + krdc + skanlite + akonadiconsole + tokodon # mastodon client + networkmanager-qt + kcrash + breeze-gtk + ]); in { options.schmittlauch.packages = { diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 8926b3e..76b4c8d 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -11,113 +11,112 @@ enable = true; package = pkgs.vscodium; mutableExtensionsDir = true; - profiles.default = { - extensions = - with pkgs.vscode-extensions; - [ - ms-python.python - charliermarsh.ruff - vscodevim.vim - yzhang.markdown-all-in-one - tamasfe.even-better-toml - eamodio.gitlens - jnoortheen.nix-ide - mkhl.direnv - editorconfig.editorconfig - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "sync-rsync-extended"; - publisher = "SanderVerschoor"; - version = "1.0.1"; - sha256 = "sha256-Jsfa1SrK1H0QwlJPEBdrb0gfGiIYoXdtIP32/4g+ceM="; - } - # TODO: probably available in nixpkgs soonish? - { - name = "mypy-type-checker"; - publisher = "ms-python"; - version = "2023.3.12681020"; - sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; - } - { - name = "vscode-pets"; - publisher = "tonybaloney"; - version = "1.25.1"; - sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ="; - } - ]; - userSettings = - let - defaultPython = pkgs.python3.withPackages (ps: [ - ps.jedi - ps.jedi-language-server - ps.pip - ps.setuptools # for pkg_resources - ps.black - ps.mypy - ]); - in + extensions = + with pkgs.vscode-extensions; + [ + ms-python.python + vscodevim.vim + yzhang.markdown-all-in-one + bungcip.better-toml + eamodio.gitlens + jnoortheen.nix-ide + mkhl.direnv + editorconfig.editorconfig + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { - "telemetry.enableTelemetry" = false; # might not be needed for Codium - "editor.fontLigatures" = true; - "editor.accessibilitySupport" = false; # prevent asking - "editor.cursorBlinking" = "phase"; - "editor.stickyScroll.enabled" = true; - "workbench.editor.highlightModifiedTabs" = true; - "window.autoDetectColorScheme" = true; - "workbench.preferredDarkColorTheme" = "Default Dark Modern"; - "workbench.preferredLightColorTheme" = "Default Light Modern"; - "[nix]" = { - "editor.insertSpaces" = true; - "editor.tabSize" = 2; - # for now, disable automatic formatting to prevent disruption of existing code bases - "editor.formatOnPaste" = false; - "editor.formatOnSave" = false; - "editor.formatOnType" = false; - }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; - "nix.enableLanguageServer" = true; - "nix.serverPath" = lib.getExe pkgs.nixd; - "nix.serverSettings" = { }; - "editor.fontSize" = 13; - "editor.fontWeight" = "normal"; - "git.detectSubmodulesLimit" = 30; - "[python]" = { - "breadcrumbs.showClasses" = true; - "breadcrumbs.showFunctions" = true; - "gitlens.codeLens.symbolScopes" = [ "!Module" ]; - "editor.defaultFormatter" = "charliermarsh.ruff"; - "editor.formatOnSave" = true; - # workaround for jedi-language-server < 0.45.1, semantic tokens are still broken - "editor.semanticHighlighting.enabled" = false; - }; - "python.experiments.enabled" = false; - "python.languageServer" = "Jedi"; # don't use proprietary pylance server - "python.defaultInterpreterPath" = lib.getExe defaultPython; - "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/dmypy" ]; - "mypy-type-checker.preferDaemon" = true; - "mypy-type-checker.importStrategy" = "fromEnvironment"; - "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; - "ruff.path" = [ (lib.getExe pkgs.ruff) ]; - "gitlens.telemetry.enabled" = false; - "vim.highlightedyank.enable" = true; - "vim.history" = 500; - "vim.neovimUseConfigFile" = true; - "vim.enableNeovim" = true; - "git.suggestSmartCommit" = false; - "editor.rulers" = [ 79 ]; - "vim.useSystemClipboard" = true; - "vim.smartRelativeLine" = true; - "diffEditor.ignoreTrimWhitespace" = false; - "files.associations" = { - "*.py" = "python"; - }; - "editor.renderWhitespace" = "all"; - "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; - "vim.neovimPath" = lib.getExe pkgs.myVim; - "sync-rsync.options" = [ ]; - "direnv.path.executable" = lib.getExe pkgs.direnv; + name = "Sync-Rsync"; + publisher = "vscode-ext"; + version = "0.36.0"; + sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; + } + # TODO: probably available in nixpkgs soonish? + { + name = "mypy-type-checker"; + publisher = "ms-python"; + version = "2023.3.12681020"; + sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; + } + { + name = "black-formatter"; + publisher = "ms-python"; + version = "2023.5.12771008"; + sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o="; + } + { + name = "vscode-pets"; + publisher = "tonybaloney"; + version = "1.25.1"; + sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ="; + } + ]; + userSettings = + let + defaultPython = pkgs.python3.withPackages (ps: [ + ps.jedi + ps.jedi-language-server + ps.pip + ps.setuptools # for pkg_resources + ps.black + ps.mypy + ]); + in + { + "editor.fontLigatures" = true; + "editor.accessibilitySupport" = false; # prevent asking + "editor.cursorBlinking" = "phase"; + "editor.stickyScroll.enabled" = true; + "workbench.editor.highlightModifiedTabs" = true; + "window.autoDetectColorScheme" = true; + "workbench.preferredDarkColorTheme" = "Default Dark Modern"; + "workbench.preferredLightColorTheme" = "Default Light Modern"; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 2; + # for now, disable automatic formatting to prevent disruption of existing code bases + "editor.formatOnPaste" = false; + "editor.formatOnSave" = false; + "editor.formatOnType" = false; }; - }; + "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; + "nix.enableLanguageServer" = true; + "nix.serverPath" = lib.getExe pkgs.nixd; + "nix.serverSettings" = { }; + "editor.fontSize" = 13; + "editor.fontWeight" = "normal"; + "git.detectSubmodulesLimit" = 30; + "[python]" = { + "breadcrumbs.showClasses" = true; + "breadcrumbs.showFunctions" = true; + "gitlens.codeLens.symbolScopes" = [ "!Module" ]; + "editor.defaultFormatter" = "ms-python.black-formatter"; + "editor.formatOnSave" = true; + }; + "python.languageServer" = "Jedi"; # don't use proprietary pylance server + "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; + "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; + "black-formatter.importStrategy" = "fromEnvironment"; + "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; + "mypy-type-checker.importStrategy" = "fromEnvironment"; + "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; + "gitlens.telemetry.enabled" = false; + "vim.highlightedyank.enable" = true; + "vim.history" = 500; + "vim.neovimUseConfigFile" = true; + "vim.enableNeovim" = true; + "git.suggestSmartCommit" = false; + "editor.rulers" = [ 79 ]; + "vim.useSystemClipboard" = true; + "vim.smartRelativeLine" = true; + "diffEditor.ignoreTrimWhitespace" = false; + "files.associations" = { + "*.py" = "python"; + }; + "editor.renderWhitespace" = "all"; + "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; + "vim.neovimPath" = lib.getExe pkgs.myVim; + "sync-rsync.options" = [ ]; + "direnv.path.executable" = lib.getExe pkgs.direnv; + }; }; } diff --git a/home/overlays.nix b/home/overlays.nix index 6d1cbf1..5a9b213 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -18,12 +18,10 @@ nerdtree nerdtree-git-plugin supertab - vim-dirdiff vim-pandoc vim-pandoc-syntax vim-nix vim-jinja - which-key-nvim ]; }; customRC = builtins.readFile ./vimrc; diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index ed2e9f0..8412c8c 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -10,7 +10,7 @@ # reset pre-defined variables that are read and manipulated throughout this function unset JUMPHOST # arrays are bash or zsh specific - RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git/" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") + RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git" "--exclude=.vscode" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache") while getopts ':Jj:' OPT; do case $OPT in diff --git a/home/scripts/ssh-loop-fc.nix b/home/scripts/ssh-loop-fc.nix index 2508de6..a632477 100644 --- a/home/scripts/ssh-loop-fc.nix +++ b/home/scripts/ssh-loop-fc.nix @@ -8,15 +8,6 @@ for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done } - ssh-root-loop () { - setopt shwordsplit - local hosts=$1 - local cmd=$2 - - for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh root@$x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done - } - - ssh-loop-parallel () { setopt shwordsplit local hosts=$1 diff --git a/home/workmac.nix b/home/workmac.nix index e378da3..f2b7969 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -12,7 +12,6 @@ let unstable = inputs.nixos-unstable.legacyPackages.${system}; in { - imports = [ ./modules/llm.nix ]; schmittlauch.packages = { graphics = true; @@ -21,15 +20,10 @@ in devTools = true; pythonTools = true; }; - targets.darwin = { - linkApps.enable = false; # spotlight ignores symlinks - copyApps.enable = true; - }; home.packages = [ wireshark # on NixOS systems enabled via system config _1password-cli - rectangle # also TODO: color schemes nix-darwin ]; @@ -40,8 +34,10 @@ in enable = true; # defaults in bottom match block "*" # TODO: common config for desktop as well - serverAliveInterval = 10; - serverAliveCountMax = 2; # 2 strikes and you're out + # multiplexer, e.g. to avoid rate limiting on jumphost usage + serverAliveInterval = 60; + controlMaster = "auto"; + controlPersist = "4h"; # ssh host config matchBlocks = { @@ -49,6 +45,7 @@ in "*" = { extraOptions = { IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; + #ControlPath = "/tmp/ssh_mux_%h_%p_%r"; }; }; @@ -58,27 +55,9 @@ in }; "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-whq.services.fcio.net"; - extraOptions = { - LogLevel = "Verbose"; - AddressFamily = "inet"; - ControlMaster = "auto"; - # not too long, due to the frequent keepalives - ControlPersist = "1h"; - }; - - }; - "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { - # multiplexer, e.g. to avoid rate limiting on jumphost usage - hostname = "vpn-rzob.services.fcio.net"; - extraOptions = { - LogLevel = "Verbose"; - AddressFamily = "inet"; - ControlMaster = "auto"; - # not too long, due to the frequent keepalives - ControlPersist = "1h"; - }; - + extraOptions.LogLevel = "Verbose"; }; + "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; }; }; }; @@ -87,38 +66,34 @@ in contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { - includes = [ - { - condition = "gitdir:~/src/schmittlauch/"; + includes = + [ + { + condition = "gitdir:~/src/schmittlauch/"; + contents = { + user = { + inherit (contacts.schmittlauch) name email; + }; + }; + } + ] + # set default name for several other common locations + ++ map (dir: { + condition = "gitdir:${dir}"; contents = { user = { - inherit (contacts.schmittlauch) name email; + inherit (contacts.work) name email; }; }; - } - ] - # set default name for several other common locations - ++ map (dir: { - condition = "gitdir:${dir}"; - contents = { - user = { - inherit (contacts.work) name email; - }; - }; - }) [ "~/" ]; + }) [ "~/" ]; }; # some extra shell scripts - programs.zsh.initContent = lib.mkAfter ( + programs.zsh.initExtra = lib.mkAfter ( import ./scripts/reporsync.nix { inherit pkgs lib; } + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); - # separate proxied browser using the DHCP-supplied DNS for accessing captive portals - programs.captive-browser = { - enable = true; - interface = "en0"; - }; launchd.agents.hydra_proxy = { enable = true; config = { @@ -128,7 +103,7 @@ in "0" "-D" "1080" - "-oServerAliveInterval=30" + "-oServerAliveInterval=60" "-oControlMaster=no" "-N" "vpn-whq.services.fcio.net" @@ -138,12 +113,7 @@ in ThrottleInterval = 60; }; }; - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "1password-cli" - "claude-code" - ]; # nixpkgs.config merging is unfortunately broken + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; home.stateVersion = "22.05"; } diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 3a31a19..166f4ee 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -32,9 +32,6 @@ in "amdgpu.abmlevel=1" # adaptive backlight management ]; - # disable WLAN powersave - networking.networkmanager.settings.connection."wifi.powersave" = 2; - boot.initrd.systemd.enable = true; # at boot by default, limit charging capacity to protect battery. diff --git a/hosts/framenix/hardware-configuration.nix b/hosts/framenix/hardware-configuration.nix index 7c8d896..b9295b2 100644 --- a/hosts/framenix/hardware-configuration.nix +++ b/hosts/framenix/hardware-configuration.nix @@ -19,7 +19,7 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -32,5 +32,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.framework.enableKmod = false; # should work with upstream kernel >= 6.12 } diff --git a/hosts/framenix/storage.nix b/hosts/framenix/storage.nix index 8acb7fd..7fb2801 100644 --- a/hosts/framenix/storage.nix +++ b/hosts/framenix/storage.nix @@ -39,17 +39,6 @@ in fsType = "vfat"; options = [ "discard" ]; }; - # nix/ lix build directory - # lix: - # > If you plan to use a tmpfs, we **strongly recommend** to set `mode=0755` as a mount option for that `tmpfs`, otherwise you are effectively reverting this mitigation. - "/nix/var/nix/builds" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = [ - "mode=0755" - "size=75%" - ]; - }; }; services.fstrim.enable = true; diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index 5ad4ef8..e60ac46 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -17,10 +17,11 @@ "sd_mod" "rtsx_pci_sdmmc" ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ]; diff --git a/nixremotebuildermachines b/nixremotebuildermachines deleted file mode 100644 index 82800d1..0000000 --- a/nixremotebuildermachines +++ /dev/null @@ -1 +0,0 @@ -ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test - diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch new file mode 100644 index 0000000..dbaf9ee --- /dev/null +++ b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch @@ -0,0 +1,26 @@ +From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Mon, 7 Apr 2025 21:03:09 -0400 +Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4 + +Signed-off-by: Ihar Hrachyshka +(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1) +--- + pkgs/development/web/nodejs/v20.nix | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix +index b9c9345c441afa..20cceb5b5d1cda 100644 +--- a/pkgs/development/web/nodejs/v20.nix ++++ b/pkgs/development/web/nodejs/v20.nix +@@ -50,5 +50,10 @@ buildNodejs { + stripLen = 1; + hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; + }) ++ # fix test failure on macos 15.4 ++ (fetchpatch2 { ++ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; ++ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; ++ }) + ] ++ gypPatches; + }