From a35e355d3e8c274e6d0011b973ab789a45e490ac Mon Sep 17 00:00:00 2001 From: prunebutt Date: Wed, 8 May 2024 16:13:00 +0200 Subject: [PATCH 001/177] Initial commit --- LICENSE | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + 2 files changed, 235 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9f48581 --- /dev/null +++ b/LICENSE @@ -0,0 +1,232 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright © 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. + + nixConfig + Copyright (C) 2024 prunebutt + + 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: + + nixConfig Copyright (C) 2024 prunebutt + 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/README.md b/README.md new file mode 100644 index 0000000..80b5ed0 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# nixConfig + +My nix config \ No newline at end of file From 1e86b2dca4a793c1498a74b13f8296e3e6dbd88f Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Mon, 25 Mar 2024 12:37:10 +0100 Subject: [PATCH 002/177] initial config --- flake.lock | 65 +++++++++++ flake.nix | 46 ++++++++ hosts/default/configuration.nix | 142 +++++++++++++++++++++++ hosts/default/hardware-configuration.nix | 10 ++ hosts/default/home.nix | 82 +++++++++++++ hosts/remus/configuration.nix | 142 +++++++++++++++++++++++ hosts/remus/hardware-configuration.nix | 40 +++++++ hosts/remus/home.nix | 82 +++++++++++++ 8 files changed, 609 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 hosts/default/configuration.nix create mode 100644 hosts/default/hardware-configuration.nix create mode 100644 hosts/default/home.nix create mode 100644 hosts/remus/configuration.nix create mode 100644 hosts/remus/hardware-configuration.nix create mode 100644 hosts/remus/home.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..b104869 --- /dev/null +++ b/flake.lock @@ -0,0 +1,65 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..6bdd7fa --- /dev/null +++ b/flake.nix @@ -0,0 +1,46 @@ +{ + description = "Nixos config flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { + self, nixpkgs, ... + } @ inputs: let + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + systemModules = import ./modules/system; + homeModules = import ./modules/home; + in { + nixosConfigurations = { + default = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs systemModules homeModules;}; + modules = [ + ./hosts/default/configuration.nix + ]; + }; + + remus = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs systemModules homeModules;}; + modules = [ + ./hosts/remus/configuration.nix + ]; + }; + }; + }; +} diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix new file mode 100644 index 0000000..cb86d6d --- /dev/null +++ b/hosts/default/configuration.nix @@ -0,0 +1,142 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, inputs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "remus"; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "de"; + variant = "neo"; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + users.users.prunebutt = { + isNormalUser = true; + description = "prunebutt"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + # thunderbird + ]; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs; }; + users = { + "prunebutt" = import ./home.nix; + }; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + git + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.11"; # Did you read the comment? + +} diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix new file mode 100644 index 0000000..dd00939 --- /dev/null +++ b/hosts/default/hardware-configuration.nix @@ -0,0 +1,10 @@ +# This is just an example, you should generate yours with nixos-generate-config and put it in here. +{ + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; + + # Set your system kind (needed for flakes) + nixpkgs.hostPlatform = "x86_64-linux"; +} diff --git a/hosts/default/home.nix b/hosts/default/home.nix new file mode 100644 index 0000000..88b1d45 --- /dev/null +++ b/hosts/default/home.nix @@ -0,0 +1,82 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "prunebutt"; + home.homeDirectory = "/home/prunebutt"; + + # 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 = "23.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 + + pkgs.nerdfonts + # # 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}!" + # '') + ]; + + programs.zsh.enable = true; + + programs.neovim.enable = true; + programs.neovim.defaultEditor = true; + + + # 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'. 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/prunebutt/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + EDITOR = "nvim"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix new file mode 100644 index 0000000..cb86d6d --- /dev/null +++ b/hosts/remus/configuration.nix @@ -0,0 +1,142 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, inputs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "remus"; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "de"; + variant = "neo"; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + users.users.prunebutt = { + isNormalUser = true; + description = "prunebutt"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + # thunderbird + ]; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs; }; + users = { + "prunebutt" = import ./home.nix; + }; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + git + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.11"; # Did you read the comment? + +} diff --git a/hosts/remus/hardware-configuration.nix b/hosts/remus/hardware-configuration.nix new file mode 100644 index 0000000..b66036d --- /dev/null +++ b/hosts/remus/hardware-configuration.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c849b1d0-f6b0-414b-a2f8-15add0b2b637"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + boot.initrd.luks.devices."luks-2875a668-8d20-46b1-9c37-843c250be560".device = "/dev/disk/by-uuid/2875a668-8d20-46b1-9c37-843c250be560"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4D76-7705"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix new file mode 100644 index 0000000..88b1d45 --- /dev/null +++ b/hosts/remus/home.nix @@ -0,0 +1,82 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "prunebutt"; + home.homeDirectory = "/home/prunebutt"; + + # 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 = "23.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 + + pkgs.nerdfonts + # # 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}!" + # '') + ]; + + programs.zsh.enable = true; + + programs.neovim.enable = true; + programs.neovim.defaultEditor = true; + + + # 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'. 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/prunebutt/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + EDITOR = "nvim"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} From b4c2ba8174c5145551f40ec34ab8c3c449628fee Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Tue, 26 Mar 2024 18:28:27 +0100 Subject: [PATCH 003/177] add some userdata --- hosts/remus/configuration.nix | 5 ++++- hosts/remus/home.nix | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix index cb86d6d..d6ea594 100644 --- a/hosts/remus/configuration.nix +++ b/hosts/remus/configuration.nix @@ -90,7 +90,10 @@ extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ firefox - # thunderbird + thunderbird + signal-desktop + keepassxc + syncthing ]; }; diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index 88b1d45..3770fb6 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -17,12 +17,12 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = [ + home.packages = with pkgs; [ # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello - pkgs.nerdfonts + nerdfonts # # 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 @@ -35,6 +35,18 @@ # (pkgs.writeShellScriptBin "my-hello" '' # echo "Hello, ${config.home.username}!" # '') + + # Core + ranger + ## GNOME + gnomeExtensions.gsconnect + gnomeExtensions.syncthing-icon + + # Maker + freecad + + # Development + lazygit ]; programs.zsh.enable = true; From 25d5980e6cb1ca63f2e655f421008991177347da Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Wed, 27 Mar 2024 23:45:23 +0100 Subject: [PATCH 004/177] feasible config for the beginning --- flake.lock | 21 ++++ flake.nix | 51 ++++------ helperLib/default.nix | 103 +++++++++++++++++++ hosts/remus/configuration.nix | 114 ++++------------------ hosts/remus/home.nix | 111 +++++++-------------- modules/home/bundles/core.nix | 54 ++++++++++ modules/home/bundles/desktop.nix | 24 +++++ modules/home/bundles/maker.nix | 15 +++ modules/home/default.nix | 47 +++++++++ modules/nixOS/bundles/general-desktop.nix | 58 +++++++++++ modules/nixOS/bundles/users.nix | 60 ++++++++++++ modules/nixOS/default.nix | 89 +++++++++++++++++ modules/nixOS/features/defaultLocale.nix | 19 ++++ 13 files changed, 563 insertions(+), 203 deletions(-) create mode 100644 helperLib/default.nix create mode 100644 modules/home/bundles/core.nix create mode 100644 modules/home/bundles/desktop.nix create mode 100644 modules/home/bundles/maker.nix create mode 100644 modules/home/default.nix create mode 100644 modules/nixOS/bundles/general-desktop.nix create mode 100644 modules/nixOS/bundles/users.nix create mode 100644 modules/nixOS/default.nix create mode 100644 modules/nixOS/features/defaultLocale.nix diff --git a/flake.lock b/flake.lock index b104869..83f468b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714405407, + "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "owner": "nix-community", + "repo": "disko", + "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,6 +74,7 @@ }, "root": { "inputs": { + "disko": "disko", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" diff --git a/flake.nix b/flake.nix index 6bdd7fa..8e2547f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,38 +9,27 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; - outputs = { - self, nixpkgs, ... - } @ inputs: let - systems = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; - systemModules = import ./modules/system; - homeModules = import ./modules/home; - in { - nixosConfigurations = { - default = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs systemModules homeModules;}; - modules = [ - ./hosts/default/configuration.nix - ]; - }; - - remus = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs systemModules homeModules;}; - modules = [ - ./hosts/remus/configuration.nix - ]; - }; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; + + outputs = {...} @ inputs: let + # basic boilerplate-reducing lib with a bunch of functions + helperLib = import ./helperLib/default.nix {inherit inputs;}; + in + with helperLib; { + nixosConfigurations = { + remus = mkSystem ./hosts/remus/configuration.nix; + }; + + homeConfigurations = { + "prunebutt@remus" = mkHome "x86_64-linux" ./hosts/remus/home.nix; + }; + + homeManagerModules.default = ./modules/home; + nixosModules.default = ./modules/nixOS; + }; } diff --git a/helperLib/default.nix b/helperLib/default.nix new file mode 100644 index 0000000..c7002f4 --- /dev/null +++ b/helperLib/default.nix @@ -0,0 +1,103 @@ +{inputs}: let + helperLib = (import ./default.nix) {inherit inputs;}; + outputs = inputs.self.outputs; +in rec { + # ================================================================ # + # = My Lib = # + # ================================================================ # + + # ======================= Package Helpers ======================== # + + pkgsFor = sys: inputs.nixpkgs.legacyPackages.${sys}; + + # ========================== Buildables ========================== # + + mkSystem = config: + inputs.nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs helperLib; + }; + modules = [ + config + outputs.nixosModules.default + ]; + }; + + mkHome = sys: config: + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = pkgsFor sys; + extraSpecialArgs = { + inherit inputs helperLib outputs; + }; + modules = [ + config + outputs.homeManagerModules.default + ]; + }; + + # =========================== Helpers ============================ # + + filesIn = dir: (map (fname: dir + "/${fname}") + (builtins.attrNames (builtins.readDir dir))); + + dirsIn = dir: + inputs.nixpkgs.lib.filterAttrs (name: value: value == "directory") + (builtins.readDir dir); + + fileNameOf = path: (builtins.head (builtins.split "\\." (baseNameOf path))); + + # ========================== Extenders =========================== # + + # Evaluates nixos/home-manager module and extends it's options / config + extendModule = {path, ...} @ args: {pkgs, ...} @ margs: let + eval = + if (builtins.isString path) || (builtins.isPath path) + then import path margs + else path margs; + evalNoImports = builtins.removeAttrs eval ["imports" "options"]; + + extra = + if (builtins.hasAttr "extraOptions" args) || (builtins.hasAttr "extraConfig" args) + then [ + ({...}: { + options = args.extraOptions or {}; + config = args.extraConfig or {}; + }) + ] + else []; + in { + imports = + (eval.imports or []) + ++ extra; + + options = + if builtins.hasAttr "optionsExtension" args + then (args.optionsExtension (eval.options or {})) + else (eval.options or {}); + + config = + if builtins.hasAttr "configExtension" args + then (args.configExtension (eval.config or evalNoImports)) + else (eval.config or evalNoImports); + }; + + # Applies extendModules to all modules + # modules can be defined in the same way + # as regular imports, or taken from "filesIn" + extendModules = extension: modules: + map + (f: let + name = fileNameOf f; + in (extendModule ((extension name) // {path = f;}))) + modules; + + # ============================ Shell ============================= # + forAllSystems = pkgs: + inputs.nixpkgs.lib.genAttrs [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ] + (system: pkgs inputs.nixpkgs.legacyPackages.${system}); +} diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix index d6ea594..d0e26ed 100644 --- a/hosts/remus/configuration.nix +++ b/hosts/remus/configuration.nix @@ -1,118 +1,44 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, inputs, ... }: - -{ +{ config, pkgs, lib, inputs, outputs, system, helperLib, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - inputs.home-manager.nixosModules.default + outputs.nixosModules.default ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - networking.hostName = "remus"; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "de_DE.UTF-8"; - LC_IDENTIFICATION = "de_DE.UTF-8"; - LC_MEASUREMENT = "de_DE.UTF-8"; - LC_MONETARY = "de_DE.UTF-8"; - LC_NAME = "de_DE.UTF-8"; - LC_NUMERIC = "de_DE.UTF-8"; - LC_PAPER = "de_DE.UTF-8"; - LC_TELEPHONE = "de_DE.UTF-8"; - LC_TIME = "de_DE.UTF-8"; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; }; - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "de"; - variant = "neo"; + networking = { + hostName = "remus"; + networkmanager.enable = true; + # wireless.enable = true; # Enables wireless support via wpa_supplicant. }; - # Configure console keymap - console.keyMap = "de"; + myNixOS = { + bundles.general-desktop.enable = true; - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - users.users.prunebutt = { - isNormalUser = true; - description = "prunebutt"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - firefox - thunderbird - signal-desktop - keepassxc - syncthing - ]; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { - "prunebutt" = import ./home.nix; + home-users = { + "prunebutt" = { + userConfig = ./home.nix; + userSettings = { + extraGroups = ["networkmanager" "wheel" "libvirtd" "docker"]; + }; + }; }; }; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget git + libgcc ]; # Some programs need SUID wrappers, can be configured further or are @@ -126,7 +52,7 @@ # List services that you want to enable: # Enable the OpenSSH daemon. - # services.openssh.enable = true; + services.openssh.enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index 3770fb6..f93407d 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -1,94 +1,49 @@ { config, pkgs, ... }: { - # Home Manager needs a bit of information about you and the paths it should - # manage. - home.username = "prunebutt"; - home.homeDirectory = "/home/prunebutt"; + # home.username = "prunebutt"; + # home.homeDirectory = "/home/prunebutt"; + home = let + user = "prunebutt"; + in { + username = "${user}"; + homeDirectory = "/home/${user}"; + # 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. + stateVersion = "23.11"; # Please read the comment before changing. - # 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 = "23.11"; # Please read the comment before changing. + # The home.packages option allows you to install Nix packages into your + # environment. + packages = with pkgs; [ + # # 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" ]; }) - # The home.packages option allows you to install Nix packages into your - # environment. - home.packages = with pkgs; [ - # # Adds the 'hello' command to your environment. It prints a friendly - # # "Hello, world!" when run. - # pkgs.hello + # # 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}!" + # '') - nerdfonts - # # 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" ]; }) + ## GNOME + gnomeExtensions.gsconnect + gnomeExtensions.syncthing-icon + ]; + }; - # # 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}!" - # '') + myHomeManager.bundles.desktop.enable = true; - # Core - ranger - ## GNOME - gnomeExtensions.gsconnect - gnomeExtensions.syncthing-icon - - # Maker - freecad - - # Development - lazygit - ]; + myHomeManager.bundles.maker.enable = true; programs.zsh.enable = true; - programs.neovim.enable = true; - programs.neovim.defaultEditor = true; - # 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'. 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/prunebutt/etc/profile.d/hm-session-vars.sh - # - home.sessionVariables = { - EDITOR = "nvim"; - }; # Let Home Manager install and manage itself. - programs.home-manager.enable = true; + # programs.home-manager.enable = true; } diff --git a/modules/home/bundles/core.nix b/modules/home/bundles/core.nix new file mode 100644 index 0000000..2a03d1b --- /dev/null +++ b/modules/home/bundles/core.nix @@ -0,0 +1,54 @@ +{ + pkgs, + config, + lib, + inputs, + ... +}: { + imports = []; + + nixpkgs.config = { + allowUnfree = true; + experimental-features = "nix-command flakes"; + }; + + programs.home-manager.enable = true; + + home.packages = with pkgs; [ + # nix + nil + nh + + git + lazygit + + tree-sitter + + # file-management + ranger + pistol + file + p7zip + unzip + zip + + # tools + killall + fzf + eza # ls-replacement + fd + zoxide + bat + dust + ripgrep + fastfetch + wget + ]; + + home.sessionVariables = { + EDITOR = "nvim"; + }; + + programs.neovim.enable = true; + programs.neovim.defaultEditor = true; +} diff --git a/modules/home/bundles/desktop.nix b/modules/home/bundles/desktop.nix new file mode 100644 index 0000000..12e6e4a --- /dev/null +++ b/modules/home/bundles/desktop.nix @@ -0,0 +1,24 @@ +{ + pkgs, + config, + lib, + inputs, + ... +}: { + imports = []; + + home.packages = with pkgs; [ + thunderbird + signal-desktop + keepassxc + ]; + + programs.firefox = { + enable = true; + }; + + # TODO: fill this out (and move it in a service, probably) + # services.syncthing = { + # enable = true + # }; +} diff --git a/modules/home/bundles/maker.nix b/modules/home/bundles/maker.nix new file mode 100644 index 0000000..63051f0 --- /dev/null +++ b/modules/home/bundles/maker.nix @@ -0,0 +1,15 @@ +{ + pkgs, + config, + lib, + inputs, + ... +}: { + imports = []; + + home.packages = with pkgs; [ + freecad + prusa-slicer + printrun + ]; +} diff --git a/modules/home/default.nix b/modules/home/default.nix new file mode 100644 index 0000000..4c7acd4 --- /dev/null +++ b/modules/home/default.nix @@ -0,0 +1,47 @@ +{ + pkgs, + system, + inputs, + config, + lib, + helperLib, + ... +}: let + cfg = config.myHomeManager; + # # Taking all modules in ./features and adding enables to them + # features = + # helperLib.extendModules + # (name: { + # extraOptions = { + # myHomeManager.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; + # }; + # + # configExtension = config: (lib.mkIf cfg.${name}.enable config); + # }) + # (helperLib.filesIn ./features); + # + # Taking all module bundles in ./bundles and adding bundle.enables to them + bundles = + helperLib.extendModules + (name: { + extraOptions = { + myHomeManager.bundles.${name}.enable = lib.mkEnableOption "enable ${name} module bundle"; + }; + + configExtension = config: (lib.mkIf cfg.bundles.${name}.enable config); + }) + (helperLib.filesIn ./bundles); + +in { + imports = [ + ] + # ++ features + ++ bundles + ; + + config = { + myHomeManager = { + bundles.core.enable = lib.mkDefault true; + }; + }; +} diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix new file mode 100644 index 0000000..75f123b --- /dev/null +++ b/modules/nixOS/bundles/general-desktop.nix @@ -0,0 +1,58 @@ +{ + pkgs, + lib, + ... +}: { + boot.kernel.sysctl = { + "kernel.sysrq" = 502; # enables "REISUB" + }; + + services.xserver.xkb = lib.mkDefault { + layout = "de"; + variant = "neo"; + }; + + console.keyMap = lib.mkDefault "neo"; + + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = lib.mkDefault true; + services.desktopManager.plasma6.enable = lib.mkDefault true; + + services.printing.enable = true; + + # For touchscreen/pad support (supposedly) + services.xserver.libinput.enable = true; + + # sound + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + + jack.enable = lib.mkDefault true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + fonts.packages = with pkgs; [ + nerdfonts + (pkgs.nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "FiraCode"];}) + cm_unicode + corefonts + ]; + + fonts.enableDefaultPackages = true; + fonts.fontconfig = { + defaultFonts = { + monospace = ["JetBrainsMono Nerd Font Mono"]; + sansSerif = ["JetBrainsMono Nerd Font"]; + serif = ["JetBrainsMono Nerd Font"]; + }; + }; +} diff --git a/modules/nixOS/bundles/users.nix b/modules/nixOS/bundles/users.nix new file mode 100644 index 0000000..a9f63e7 --- /dev/null +++ b/modules/nixOS/bundles/users.nix @@ -0,0 +1,60 @@ +{ + lib, + config, + inputs, + outputs, + helperLib, + pkgs, + ... +}: let + cfg = config.myNixOS; +in { + options.myNixOS.home-users = lib.mkOption { + type = lib.types.attrsOf ( lib.types.submodule { + options = { + userConfig = lib.mkOption { + example = "home.nix"; + }; + userSettings = lib.mkOption { + default = {}; + example = "{}"; + }; + }; + }); + default = {}; + }; + + config = { + programs.zsh.enable = true; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + extraSpecialArgs = { + inherit inputs; + inherit helperLib; + outputs = inputs.self.outputs; + }; + + users = + builtins.mapAttrs (name: user: {...}: { + imports = [ + (import user.userConfig) + outputs.homeManagerModules.default + ]; + }) + (config.myNixOS.home-users); + }; + + users.users = builtins.mapAttrs ( + name: user: + { + isNormalUser = true; + shell = pkgs.zsh; + extraGroups = ["libvirtd" "networkmanager"]; + } + // user.userSettings + ) (config.myNixOS.home-users); + }; +} diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix new file mode 100644 index 0000000..f60319a --- /dev/null +++ b/modules/nixOS/default.nix @@ -0,0 +1,89 @@ +{ + pkgs, + config, + lib, + inputs, + outputs, + helperLib, + ... +}: let + cfg = config.myNixOS; + + # Taking all modules in ./features and adding enables to them + features = + helperLib.extendModules + (name: { + extraOptions = { + myNixOS.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; + }; + + configExtension = config: (lib.mkIf cfg.${name}.enable config); + }) + (helperLib.filesIn ./features); + + # taking all module bundles in ./bundles and adding bundle.enables to them + bundles = + helperLib.extendModules + (name: { + extraOptions = { + myNixOS.bundles.${name}.enable = lib.mkEnableOption "enable ${name} module bundle"; + }; + + configExtension = config: (lib.mkIf cfg.bundles.${name}.enable config); + }) + (helperLib.filesIn ./bundles); + + # taking all module services in ./services and adding service.enables to them + # services = + # helperLib.extendModules + # (name: { + # extraOptions = { + # myNixOS.services.${name}.enable = lib.mkEnableOption "enable ${name} module service"; + # }; + # + # configExtension = config: (lib.mkIf cfg.services.${name}.enable config); + # }) + # (helperLib.filesIn ./services); +in { + imports = + [ + inputs.home-manager.nixosModules.home-manager + ] + ++ features + ++ bundles + # ++ services + ; + + options.myNixOS = { + sharedSettings = { + # put settings here that are shared between homemanager and nixos, e.g. + # hyprland.enable = lib.mkEnableOption "enable hyprland"; + }; + }; + + + config = { + nix.settings.experimental-features = ["nix-command" "flakes"]; + programs.nix-ld.enable = true; + nixpkgs.config.allowUnfree = lib.mkDefault true; + + myNixOS = { + defaultLocale.enable = lib.mkDefault true; + + bundles.users.enable = lib.mkDefault true; + }; + }; + +} +# imports = [ +# ./neo.nix +# ./locale.nix +# ./pipewire.nix +# ]; +# +# locale.enable = lib.mkDefault true; +# neo.enable = lib.mkDefault true; +# +# pipewire.enable = lib.mkDefault true; +# pipewire.useJack = lib.mkDefault false; +# } diff --git a/modules/nixOS/features/defaultLocale.nix b/modules/nixOS/features/defaultLocale.nix new file mode 100644 index 0000000..a0ac99e --- /dev/null +++ b/modules/nixOS/features/defaultLocale.nix @@ -0,0 +1,19 @@ +{ pkgs, lib, config, ...}: { + config = { + time.timeZone = lib.mkDefault "Europe/Berlin"; + + i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; + + i18n.extraLocaleSettings = lib.mkDefault { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + }; +} From 0a1dcf0a6a6eb79ed2b9b5e200b3052e67324507 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Thu, 9 May 2024 19:41:05 +0200 Subject: [PATCH 005/177] add the syncthing service --- hosts/remus/home.nix | 13 +++---- modules/home/default.nix | 26 +++++++------- modules/home/features/syncthing.nix | 53 +++++++++++++++++++++++++++++ modules/nixOS/default.nix | 7 ++++ 4 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 modules/home/features/syncthing.nix diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index f93407d..91f4009 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -35,15 +35,16 @@ ]; }; - myHomeManager.bundles.desktop.enable = true; - - myHomeManager.bundles.maker.enable = true; + myHomeManager = { + bundles = { + desktop.enable = true; + maker.enable = true; + }; + syncthing.enable = true; + }; programs.zsh.enable = true; - - - # Let Home Manager install and manage itself. # programs.home-manager.enable = true; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 4c7acd4..9ad5828 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -8,18 +8,18 @@ ... }: let cfg = config.myHomeManager; - # # Taking all modules in ./features and adding enables to them - # features = - # helperLib.extendModules - # (name: { - # extraOptions = { - # myHomeManager.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; - # }; - # - # configExtension = config: (lib.mkIf cfg.${name}.enable config); - # }) - # (helperLib.filesIn ./features); - # + # Taking all modules in ./features and adding enables to them + features = + helperLib.extendModules + (name: { + extraOptions = { + myHomeManager.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; + }; + + configExtension = config: (lib.mkIf cfg.${name}.enable config); + }) + (helperLib.filesIn ./features); + # Taking all module bundles in ./bundles and adding bundle.enables to them bundles = helperLib.extendModules @@ -35,7 +35,7 @@ in { imports = [ ] - # ++ features + ++ features ++ bundles ; diff --git a/modules/home/features/syncthing.nix b/modules/home/features/syncthing.nix new file mode 100644 index 0000000..9544e12 --- /dev/null +++ b/modules/home/features/syncthing.nix @@ -0,0 +1,53 @@ +{ + pkgs, + config, + lib, + inputs, + ... + }: let + saintAlphonsoID = "LHASNUO-CXALARH-XI3TU4U-OCULV72-HS3HQ35-P4FECIT-UZ5VMSZ-PMCEPQH"; + + webGuiPort = [ 8384 ]; + cfg = config; + in { + imports = []; + + options = { + rootDir = lib.mkOption { + type = lib.types.path; + default = "/home/${cfg.myNixOS.sharedSettings.mainUser}/sync"; + }; + + remoteGui = lib.mkEnableOption "Enable port for remote WebGUI"; + }; + + services.syncthing = { + enable = true; + user = cfg.myNixOS.sharedSettings.mainUser; + dataDir = config.rootDir; + configDir = "/home/${cfg.myNixOS.sharedSettings.mainUser}/.config/syncthing"; + overrideDevices = true; + overrideFolders = true; + settings = { + devices = { + "saintAlphonso" = { id = saintAlphonsoID; }; + }; + folders = { + "KeepassXC" = { + path = "/home/${cfg.myNixOS.sharedSettings.mainUser}/KeepassXC"; + devices = [ "saintAlphonso" ]; + }; + }; + }; + }; + + # # Syncthing ports: 8384 for remote access to GUI + # # 22000 TCP and/or UDP for sync traffic + # # 21027/UDP for discovery + # # source: https://docs.syncthing.net/users/firewall.html + # networking.firewall.allowedTCPPorts = + # [ 22000 ] + # ++ webGuiPort; + # + # networking.firewall.allowedUDPPorts = [ 22000 21027 ]; +} diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix index f60319a..184ed4d 100644 --- a/modules/nixOS/default.nix +++ b/modules/nixOS/default.nix @@ -58,6 +58,13 @@ in { sharedSettings = { # put settings here that are shared between homemanager and nixos, e.g. # hyprland.enable = lib.mkEnableOption "enable hyprland"; + + mainUser = lib.mkOption { + type = lib.types.str; + default = "prunebutt"; + example = "mainUser"; + description = "The main user that runs the system"; + }; }; }; From 97511f3a44dd0eef546a1fbc068462fb2585b011 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 12:29:07 +0200 Subject: [PATCH 006/177] first try with sops --- .sops.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .sops.yaml diff --git a/.sops.yaml b/.sops.yaml new file mode 100644 index 0000000..a002d72 --- /dev/null +++ b/.sops.yaml @@ -0,0 +1,7 @@ +keys: + - &primary age1r26dvz9zd2ds87clnqd9kxln6hyp9dtyvcfsmp9k894lkws9c49qy3yyrv +creation_rules: + - path_regex: secrets/secrets.yaml$ + key_groups: + - age: + - *primary From c2b8875fe09507e42f0301829b8cf38859ee61e3 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 12:30:05 +0200 Subject: [PATCH 007/177] add graphic design packages --- hosts/remus/home.nix | 1 + modules/home/bundles/desktop.nix | 2 + modules/home/bundles/graphicDesign.nix | 15 +++++++ modules/home/features/syncthing.nix | 56 +++++++++++++------------- 4 files changed, 46 insertions(+), 28 deletions(-) create mode 100644 modules/home/bundles/graphicDesign.nix diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index 91f4009..9825ed4 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -39,6 +39,7 @@ bundles = { desktop.enable = true; maker.enable = true; + graphicDesign.enable = true; }; syncthing.enable = true; }; diff --git a/modules/home/bundles/desktop.nix b/modules/home/bundles/desktop.nix index 12e6e4a..f37f370 100644 --- a/modules/home/bundles/desktop.nix +++ b/modules/home/bundles/desktop.nix @@ -17,6 +17,8 @@ enable = true; }; + xserver.wacom.enable = true; + # TODO: fill this out (and move it in a service, probably) # services.syncthing = { # enable = true diff --git a/modules/home/bundles/graphicDesign.nix b/modules/home/bundles/graphicDesign.nix new file mode 100644 index 0000000..b6dc583 --- /dev/null +++ b/modules/home/bundles/graphicDesign.nix @@ -0,0 +1,15 @@ +{ + pkgs, + config, + lib, + inputs, + ... +}: { + imports = []; + + home.packages = with pkgs; [ + inkscape + gimp + krita + ]; +} diff --git a/modules/home/features/syncthing.nix b/modules/home/features/syncthing.nix index 9544e12..531cbd3 100644 --- a/modules/home/features/syncthing.nix +++ b/modules/home/features/syncthing.nix @@ -12,34 +12,34 @@ in { imports = []; - options = { - rootDir = lib.mkOption { - type = lib.types.path; - default = "/home/${cfg.myNixOS.sharedSettings.mainUser}/sync"; - }; - - remoteGui = lib.mkEnableOption "Enable port for remote WebGUI"; - }; - - services.syncthing = { - enable = true; - user = cfg.myNixOS.sharedSettings.mainUser; - dataDir = config.rootDir; - configDir = "/home/${cfg.myNixOS.sharedSettings.mainUser}/.config/syncthing"; - overrideDevices = true; - overrideFolders = true; - settings = { - devices = { - "saintAlphonso" = { id = saintAlphonsoID; }; - }; - folders = { - "KeepassXC" = { - path = "/home/${cfg.myNixOS.sharedSettings.mainUser}/KeepassXC"; - devices = [ "saintAlphonso" ]; - }; - }; - }; - }; + # options = { + # rootDir = lib.mkOption { + # type = lib.types.path; + # default = "/home/${cfg.myNixOS.sharedSettings.mainUser}/sync"; + # }; + # + # remoteGui = lib.mkEnableOption "Enable port for remote WebGUI"; + # }; + # + # services.syncthing = { + # enable = true; + # user = cfg.myNixOS.sharedSettings.mainUser; + # dataDir = config.rootDir; + # configDir = "/home/${cfg.myNixOS.sharedSettings.mainUser}/.config/syncthing"; + # overrideDevices = true; + # overrideFolders = true; + # settings = { + # devices = { + # "saintAlphonso" = { id = saintAlphonsoID; }; + # }; + # folders = { + # "KeepassXC" = { + # path = "/home/${cfg.myNixOS.sharedSettings.mainUser}/KeepassXC"; + # devices = [ "saintAlphonso" ]; + # }; + # }; + # }; + # }; # # Syncthing ports: 8384 for remote access to GUI # # 22000 TCP and/or UDP for sync traffic From 94f08a38477504ce006e0a2f69d69540baf4d1ad Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 12:39:05 +0200 Subject: [PATCH 008/177] add wacom support --- flake.nix | 1 + modules/home/bundles/desktop.nix | 2 -- modules/home/bundles/graphicDesign.nix | 3 ++- modules/nixOS/bundles/general-desktop.nix | 23 +++++++++++++---------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 8e2547f..8a017c6 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ outputs = {...} @ inputs: let # basic boilerplate-reducing lib with a bunch of functions helperLib = import ./helperLib/default.nix {inherit inputs;}; + stablepkgs = inputs.nixpkgs-stable; in with helperLib; { nixosConfigurations = { diff --git a/modules/home/bundles/desktop.nix b/modules/home/bundles/desktop.nix index f37f370..12e6e4a 100644 --- a/modules/home/bundles/desktop.nix +++ b/modules/home/bundles/desktop.nix @@ -17,8 +17,6 @@ enable = true; }; - xserver.wacom.enable = true; - # TODO: fill this out (and move it in a service, probably) # services.syncthing = { # enable = true diff --git a/modules/home/bundles/graphicDesign.nix b/modules/home/bundles/graphicDesign.nix index b6dc583..5ea542b 100644 --- a/modules/home/bundles/graphicDesign.nix +++ b/modules/home/bundles/graphicDesign.nix @@ -3,12 +3,13 @@ config, lib, inputs, + stablepkgs, ... }: { imports = []; home.packages = with pkgs; [ - inkscape + stablepkgs.inkscape gimp krita ]; diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix index 75f123b..08bf60e 100644 --- a/modules/nixOS/bundles/general-desktop.nix +++ b/modules/nixOS/bundles/general-desktop.nix @@ -7,22 +7,25 @@ "kernel.sysrq" = 502; # enables "REISUB" }; - services.xserver.xkb = lib.mkDefault { - layout = "de"; - variant = "neo"; - }; - console.keyMap = lib.mkDefault "neo"; - services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = lib.mkDefault true; + services.xserver = { + xkb = lib.mkDefault { + layout = "de"; + variant = "neo"; + }; + + enable = true; + displayManager.sddm.enable = lib.mkDefault true; + + # For touchscreen/pad support (supposedly) + libinput.enable = true; + wacom.enable = true; + }; services.desktopManager.plasma6.enable = lib.mkDefault true; services.printing.enable = true; - # For touchscreen/pad support (supposedly) - services.xserver.libinput.enable = true; - # sound sound.enable = true; hardware.pulseaudio.enable = false; From 12236a3e49686f62b37f94151554fe9b5e434173 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 13:07:32 +0200 Subject: [PATCH 009/177] try to add a stable nixpkgs overlay --- flake.nix | 1 - helperLib/default.nix | 5 +++++ modules/home/bundles/graphicDesign.nix | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8a017c6..8e2547f 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ outputs = {...} @ inputs: let # basic boilerplate-reducing lib with a bunch of functions helperLib = import ./helperLib/default.nix {inherit inputs;}; - stablepkgs = inputs.nixpkgs-stable; in with helperLib; { nixosConfigurations = { diff --git a/helperLib/default.nix b/helperLib/default.nix index c7002f4..1bd1e8f 100644 --- a/helperLib/default.nix +++ b/helperLib/default.nix @@ -1,6 +1,9 @@ {inputs}: let helperLib = (import ./default.nix) {inherit inputs;}; outputs = inputs.self.outputs; + overlay-stable = final: prev: { + stable = inputs.nixpkgs-stable.legacyPackages.${prev.system}; + }; in rec { # ================================================================ # # = My Lib = # @@ -18,6 +21,7 @@ in rec { inherit inputs outputs helperLib; }; modules = [ + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; }) config outputs.nixosModules.default ]; @@ -30,6 +34,7 @@ in rec { inherit inputs helperLib outputs; }; modules = [ + ({ config, pkgs, ...}: { nixpkgs.overlays = [ overlay-stable ]; }) config outputs.homeManagerModules.default ]; diff --git a/modules/home/bundles/graphicDesign.nix b/modules/home/bundles/graphicDesign.nix index 5ea542b..b6dc583 100644 --- a/modules/home/bundles/graphicDesign.nix +++ b/modules/home/bundles/graphicDesign.nix @@ -3,13 +3,12 @@ config, lib, inputs, - stablepkgs, ... }: { imports = []; home.packages = with pkgs; [ - stablepkgs.inkscape + inkscape gimp krita ]; From 2006d899dd2f3ff513d8c7bacf9a39f2b5486e08 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 13:22:37 +0200 Subject: [PATCH 010/177] update commit --- flake.lock | 24 ++++++++++++------------ hosts/remus/home.nix | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 83f468b..b494a65 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "lastModified": 1715217706, + "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", "owner": "nix-community", "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1710974515, - "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1715218190, + "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", "type": "github" }, "original": { diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index 9825ed4..60fc768 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -31,7 +31,6 @@ ## GNOME gnomeExtensions.gsconnect - gnomeExtensions.syncthing-icon ]; }; From c936c167efc4bdc57d9f6d01e14bda92afbf0eeb Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 13:28:26 +0200 Subject: [PATCH 011/177] make inkscape stable --- modules/home/bundles/graphicDesign.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/bundles/graphicDesign.nix b/modules/home/bundles/graphicDesign.nix index b6dc583..837515f 100644 --- a/modules/home/bundles/graphicDesign.nix +++ b/modules/home/bundles/graphicDesign.nix @@ -8,7 +8,7 @@ imports = []; home.packages = with pkgs; [ - inkscape + inkscape-with-extensions gimp krita ]; From 7279316ef82248f40c2e9c370c193c4d4713f5a6 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 13:43:53 +0200 Subject: [PATCH 012/177] add nvidia drivers --- hosts/remus/configuration.nix | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix index d0e26ed..0853606 100644 --- a/hosts/remus/configuration.nix +++ b/hosts/remus/configuration.nix @@ -54,6 +54,48 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; + # Enable OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = ["nvidia"]; + + hardware.nvidia = { + + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = false; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; From 4f378caab9913f263522ce8bd6566102f2db9491 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sat, 11 May 2024 14:38:53 +0200 Subject: [PATCH 013/177] switch default on remus to GNOME --- hosts/remus/configuration.nix | 13 +++++++------ modules/nixOS/bundles/general-desktop.nix | 8 ++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix index 0853606..29ddbf7 100644 --- a/hosts/remus/configuration.nix +++ b/hosts/remus/configuration.nix @@ -19,6 +19,13 @@ # wireless.enable = true; # Enables wireless support via wpa_supplicant. }; + services.desktopManager.plasma6.enable = true; + services.xserver.desktopManager.gnome.enable = true; + services.displayManager.defaultSession = "gnome"; + + programs.ssh.askPassword = lib.mkForce "${pkgs.kdePackages.ksshaskpass.out}/bin/ksshaskpass"; + + myNixOS = { bundles.general-desktop.enable = true; @@ -34,12 +41,6 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - wget - git - libgcc - ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix index 08bf60e..da47220 100644 --- a/modules/nixOS/bundles/general-desktop.nix +++ b/modules/nixOS/bundles/general-desktop.nix @@ -50,6 +50,14 @@ corefonts ]; + environment.systemPackages = with pkgs; [ + vim + wget + git + libgcc + gtk3 + ]; + fonts.enableDefaultPackages = true; fonts.fontconfig = { defaultFonts = { From c4c9a174a2d2239408be72661edd1fb2fce1c897 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sun, 12 May 2024 14:39:15 +0200 Subject: [PATCH 014/177] update the flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b494a65..5eefc6c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715217706, - "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", + "lastModified": 1715445235, + "narHash": "sha256-SUu+oIWn+xqQIOlwfwNfS9Sek4i1HKsrLJchsDReXwA=", "owner": "nix-community", "repo": "disko", - "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", + "rev": "159d87ea5b95bbdea46f0288a33c5e1570272725", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1715380449, - "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7682620185f213df384c363288093b486b2883f", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1715395895, + "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", "type": "github" }, "original": { From 710c9abfcaa760940eae8ba09383e7acbe4a1820 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Sun, 12 May 2024 15:05:51 +0200 Subject: [PATCH 015/177] add the opentabletdriver --- modules/nixOS/bundles/general-desktop.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix index da47220..4259d56 100644 --- a/modules/nixOS/bundles/general-desktop.nix +++ b/modules/nixOS/bundles/general-desktop.nix @@ -20,12 +20,13 @@ # For touchscreen/pad support (supposedly) libinput.enable = true; - wacom.enable = true; }; services.desktopManager.plasma6.enable = lib.mkDefault true; services.printing.enable = true; + hardware.opentabletdriver.enable = true; + # sound sound.enable = true; hardware.pulseaudio.enable = false; From bb9494227fc0b1005d3b8482e4ee175ced628730 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Tue, 14 May 2024 08:19:08 +0200 Subject: [PATCH 016/177] add screenlocker --- modules/nixOS/bundles/core.nix | 12 ++++++++++++ modules/nixOS/bundles/general-desktop.nix | 19 ++++++++++--------- modules/nixOS/default.nix | 5 +++-- 3 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 modules/nixOS/bundles/core.nix diff --git a/modules/nixOS/bundles/core.nix b/modules/nixOS/bundles/core.nix new file mode 100644 index 0000000..766b874 --- /dev/null +++ b/modules/nixOS/bundles/core.nix @@ -0,0 +1,12 @@ +{ + pkgs, + lib, + ... +}: { + environment.systemPackages = with pkgs; [ + vim + wget + git + libgcc + ]; +} diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix index 4259d56..989ed7b 100644 --- a/modules/nixOS/bundles/general-desktop.nix +++ b/modules/nixOS/bundles/general-desktop.nix @@ -16,11 +16,14 @@ }; enable = true; - displayManager.sddm.enable = lib.mkDefault true; - - # For touchscreen/pad support (supposedly) - libinput.enable = true; }; + + # TODO: sort better + # For touchscreen/pad support (supposedly) + services.libinput.enable = true; + + # TODO: sort better + services.displayManager.sddm.enable = lib.mkDefault true; services.desktopManager.plasma6.enable = lib.mkDefault true; services.printing.enable = true; @@ -52,11 +55,9 @@ ]; environment.systemPackages = with pkgs; [ - vim - wget - git - libgcc - gtk3 + # TODO: move to displaymanagers + kdePackages.kscreenlocker + gtklock ]; fonts.enableDefaultPackages = true; diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix index 184ed4d..2ba9ade 100644 --- a/modules/nixOS/default.nix +++ b/modules/nixOS/default.nix @@ -75,9 +75,10 @@ in { nixpkgs.config.allowUnfree = lib.mkDefault true; myNixOS = { - defaultLocale.enable = lib.mkDefault true; - + bundles.core.enable = lib.mkDefault true; bundles.users.enable = lib.mkDefault true; + + defaultLocale.enable = lib.mkDefault true; }; }; From 4a800d9290e35b2b9a5790fc70f3e6ec01dc69a2 Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Thu, 16 May 2024 15:09:24 +0200 Subject: [PATCH 017/177] add syncthing and keepass --- .sops.yaml | 11 ++-- flake.nix | 5 ++ helperLib/default.nix | 4 ++ helperLib/syncthing.nix | 3 ++ hosts/remus/configuration.nix | 2 + hosts/remus/home.nix | 1 - modules/home/default.nix | 24 ++++----- modules/home/features/syncthing.nix | 53 ------------------ modules/nixOS/bundles/core/default.nix | 9 ++++ modules/nixOS/bundles/core/sops.nix | 37 +++++++++++++ modules/nixOS/bundles/general-desktop.nix | 4 ++ modules/nixOS/default.nix | 22 ++++---- modules/nixOS/services/syncthing/default.nix | 56 ++++++++++++++++++++ secrets/secrets.json | 32 +++++++++++ 14 files changed, 183 insertions(+), 80 deletions(-) create mode 100644 helperLib/syncthing.nix delete mode 100644 modules/home/features/syncthing.nix create mode 100644 modules/nixOS/bundles/core/default.nix create mode 100644 modules/nixOS/bundles/core/sops.nix create mode 100644 modules/nixOS/services/syncthing/default.nix create mode 100644 secrets/secrets.json diff --git a/.sops.yaml b/.sops.yaml index a002d72..2fba00d 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,12 @@ keys: - - &primary age1r26dvz9zd2ds87clnqd9kxln6hyp9dtyvcfsmp9k894lkws9c49qy3yyrv + - &users: + - &prunebutt age1r26dvz9zd2ds87clnqd9kxln6hyp9dtyvcfsmp9k894lkws9c49qy3yyrv + - &hosts: + - &remus age12p2494hhhjcw28w4kg5q3rv3xtv7gmpyxags9s9ta8c3rc0g4qrst20cvw + creation_rules: - - path_regex: secrets/secrets.yaml$ + - path_regex: secrets/secrets.json$ key_groups: - age: - - *primary + - *prunebutt + - *remus diff --git a/flake.nix b/flake.nix index 8e2547f..11eb19b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,11 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + + sops-nix = { + url = "github:mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {...} @ inputs: let diff --git a/helperLib/default.nix b/helperLib/default.nix index 1bd1e8f..0c90406 100644 --- a/helperLib/default.nix +++ b/helperLib/default.nix @@ -5,6 +5,10 @@ stable = inputs.nixpkgs-stable.legacyPackages.${prev.system}; }; in rec { + # imports = [ + # ./syncthing.nix + # ]; + # ================================================================ # # = My Lib = # # ================================================================ # diff --git a/helperLib/syncthing.nix b/helperLib/syncthing.nix new file mode 100644 index 0000000..d032dd2 --- /dev/null +++ b/helperLib/syncthing.nix @@ -0,0 +1,3 @@ +{}: { + getSyncthingDevices = x: trace "foobar" x; +} diff --git a/hosts/remus/configuration.nix b/hosts/remus/configuration.nix index 29ddbf7..c54199e 100644 --- a/hosts/remus/configuration.nix +++ b/hosts/remus/configuration.nix @@ -29,6 +29,8 @@ myNixOS = { bundles.general-desktop.enable = true; + services.syncthing.enable = true; + home-users = { "prunebutt" = { userConfig = ./home.nix; diff --git a/hosts/remus/home.nix b/hosts/remus/home.nix index 60fc768..e68fd99 100644 --- a/hosts/remus/home.nix +++ b/hosts/remus/home.nix @@ -40,7 +40,6 @@ maker.enable = true; graphicDesign.enable = true; }; - syncthing.enable = true; }; programs.zsh.enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index 9ad5828..52aac48 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -8,17 +8,17 @@ ... }: let cfg = config.myHomeManager; - # Taking all modules in ./features and adding enables to them - features = - helperLib.extendModules - (name: { - extraOptions = { - myHomeManager.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; - }; - - configExtension = config: (lib.mkIf cfg.${name}.enable config); - }) - (helperLib.filesIn ./features); + # # Taking all modules in ./features and adding enables to them + # features = + # helperLib.extendModules + # (name: { + # extraOptions = { + # myHomeManager.${name}.enable = lib.mkEnableOption "enable my ${name} configuration"; + # }; + # + # configExtension = config: (lib.mkIf cfg.${name}.enable config); + # }) + # (helperLib.filesIn ./features); # Taking all module bundles in ./bundles and adding bundle.enables to them bundles = @@ -35,7 +35,7 @@ in { imports = [ ] - ++ features + # ++ features ++ bundles ; diff --git a/modules/home/features/syncthing.nix b/modules/home/features/syncthing.nix deleted file mode 100644 index 531cbd3..0000000 --- a/modules/home/features/syncthing.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - pkgs, - config, - lib, - inputs, - ... - }: let - saintAlphonsoID = "LHASNUO-CXALARH-XI3TU4U-OCULV72-HS3HQ35-P4FECIT-UZ5VMSZ-PMCEPQH"; - - webGuiPort = [ 8384 ]; - cfg = config; - in { - imports = []; - - # options = { - # rootDir = lib.mkOption { - # type = lib.types.path; - # default = "/home/${cfg.myNixOS.sharedSettings.mainUser}/sync"; - # }; - # - # remoteGui = lib.mkEnableOption "Enable port for remote WebGUI"; - # }; - # - # services.syncthing = { - # enable = true; - # user = cfg.myNixOS.sharedSettings.mainUser; - # dataDir = config.rootDir; - # configDir = "/home/${cfg.myNixOS.sharedSettings.mainUser}/.config/syncthing"; - # overrideDevices = true; - # overrideFolders = true; - # settings = { - # devices = { - # "saintAlphonso" = { id = saintAlphonsoID; }; - # }; - # folders = { - # "KeepassXC" = { - # path = "/home/${cfg.myNixOS.sharedSettings.mainUser}/KeepassXC"; - # devices = [ "saintAlphonso" ]; - # }; - # }; - # }; - # }; - - # # Syncthing ports: 8384 for remote access to GUI - # # 22000 TCP and/or UDP for sync traffic - # # 21027/UDP for discovery - # # source: https://docs.syncthing.net/users/firewall.html - # networking.firewall.allowedTCPPorts = - # [ 22000 ] - # ++ webGuiPort; - # - # networking.firewall.allowedUDPPorts = [ 22000 21027 ]; -} diff --git a/modules/nixOS/bundles/core/default.nix b/modules/nixOS/bundles/core/default.nix new file mode 100644 index 0000000..3814fba --- /dev/null +++ b/modules/nixOS/bundles/core/default.nix @@ -0,0 +1,9 @@ +{ + pkgs, + lib, + ... +}: { + imports = [ + # ./sops.nix + ]; +} diff --git a/modules/nixOS/bundles/core/sops.nix b/modules/nixOS/bundles/core/sops.nix new file mode 100644 index 0000000..cce8696 --- /dev/null +++ b/modules/nixOS/bundles/core/sops.nix @@ -0,0 +1,37 @@ +{ + pkgs, + config, + inputs, + ... +}: let + secretsFile = "../../../../secrets/secrets.json"; + secretsSet = builtins.fromJSON (builtins.readFile ./${secretsFile}); + devices = builtins.attrNames secretsSet.syncthing.devices; +in { + imports = [ + inputs.sops-nix.nixosModules.sops + ]; + + sops = { + defaultSopsFile = ./${secretsFile}; + validateSopsFiles = false; + + age = { + # automatically import host SSH keys as age keys + sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + # this will use an age key that is expected to already be in the filesystem + keyFile = "/var/lib/sops-nix/key.txt"; + # generate a new key if the key specified above does not exist + generateKey = true; + }; + + # secrets will be output to /run/secrets + secrets = { + }; + }; + + environment.systemPackages = with pkgs; [ + sops + ]; +} + diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix index 989ed7b..018a383 100644 --- a/modules/nixOS/bundles/general-desktop.nix +++ b/modules/nixOS/bundles/general-desktop.nix @@ -68,4 +68,8 @@ serif = ["JetBrainsMono Nerd Font"]; }; }; + + environment.systemPackages = with pkgs; [ + keepassxc + ]; } diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix index 2ba9ade..1deccfc 100644 --- a/modules/nixOS/default.nix +++ b/modules/nixOS/default.nix @@ -34,16 +34,16 @@ (helperLib.filesIn ./bundles); # taking all module services in ./services and adding service.enables to them - # services = - # helperLib.extendModules - # (name: { - # extraOptions = { - # myNixOS.services.${name}.enable = lib.mkEnableOption "enable ${name} module service"; - # }; - # - # configExtension = config: (lib.mkIf cfg.services.${name}.enable config); - # }) - # (helperLib.filesIn ./services); + services = + helperLib.extendModules + (name: { + extraOptions = { + myNixOS.services.${name}.enable = lib.mkEnableOption "enable ${name} module service"; + }; + + configExtension = config: (lib.mkIf cfg.services.${name}.enable config); + }) + (helperLib.filesIn ./services); in { imports = [ @@ -51,7 +51,7 @@ in { ] ++ features ++ bundles - # ++ services + ++ services ; options.myNixOS = { diff --git a/modules/nixOS/services/syncthing/default.nix b/modules/nixOS/services/syncthing/default.nix new file mode 100644 index 0000000..bbaeaca --- /dev/null +++ b/modules/nixOS/services/syncthing/default.nix @@ -0,0 +1,56 @@ +{ + pkgs, + config, + lib, + inputs, + ... + }: let + webGuiPort = [ 8384 ]; + cfg = config; + secretsFile = "../../../secrets/secrets.json"; + secretsSet = builtins.fromJSON (builtins.readFile ./${secretsFile}); + devices = builtins.attrNames secretsSet.syncthing.devices; + in { + options = { + rootDir = lib.mkOption { + type = lib.types.path; + default = "/home/${cfg.myNixOS.sharedSettings.mainUser}/sync"; + }; + + remoteGui = lib.mkEnableOption "Enable port for remote WebGUI"; + }; + + services.syncthing = { + enable = true; + user = cfg.myNixOS.sharedSettings.mainUser; + dataDir = config.rootDir; + configDir = "/home/${cfg.myNixOS.sharedSettings.mainUser}/.config/syncthing"; + overrideDevices = true; + overrideFolders = true; + settings = { + devices = { + "saintAlphonso" = { id ="LHASNUO-CXALARH-XI3TU4U-OCULV72-HS3HQ35-P4FECIT-UZ5VMSZ-PMCEPQH"; }; + "littleUmbrella" = { id ="BH3OHYP-TGGOSZO-EM6MXRY-YHSBOUO-CQHE7DL-N2LOUFY-TF3LEJ7-FHTGTQI"; }; + "pixelRoot" = { id ="PO7U5SE-DYKTOM2-TFDS3BM-A25VK7V-MQ3VPFM-EFX3J4D-B3UDCX4-3XQAIAC"; }; + "pixelDefault" = { id ="HC3CKC7-OUZBLU3-JIKTRYG-DPJE6EC-7POCWNS-6VNOPDU-L7OWYWO-PL332AY"; }; + "pixelGooglor" = { id ="OWDM4I2-O6STMIS-H3EXF65-FSM26K3-5FLQXRN-VOK7JGC-T6H76IR-QAVO3QK"; }; + }; + + folders = { + "/home/${cfg.myNixOS.sharedSettings.mainUser}/KeepassXC" = { + label = "KeepassXC"; + id = "xd4de-mjfcq"; + devices = ["littleUmbrella" "pixelRoot" "pixelDefault" "pixelGooglor" "saintAlphonso"]; + versioning = { type = "simple"; params.keep = "5"; }; + }; + }; + }; + }; + + # Syncthing ports: 8384 for remote access to GUI + # 22000 TCP and/or UDP for sync traffic + # 21027/UDP for discovery + # source: https://docs.syncthing.net/users/firewall.html + networking.firewall.allowedTCPPorts = [ 8384 22000 ]; + networking.firewall.allowedUDPPorts = [ 22000 21027 ]; +} diff --git a/secrets/secrets.json b/secrets/secrets.json new file mode 100644 index 0000000..4650e84 --- /dev/null +++ b/secrets/secrets.json @@ -0,0 +1,32 @@ +{ + "syncthing": { + "devices": { + "saintAlphonso": "ENC[AES256_GCM,data:F0NPMyENcmv1FancYIZ1NBnKoZk6XyZYNeOPHfh5+9s90nvs7bZY2vpHwbzPC9lDH/ID3U9VmFhzizzXKdTT,iv:lYgeYqykmeV6OHzpnZlpCI68Pz4T+qmJXZEcmAmmryY=,tag:yQOp6oEA5TyEpBWjQWLa0Q==,type:str]", + "littleUmbrella": "ENC[AES256_GCM,data:oLzZwulGO0KDpDVCT8kPL/ZVd98M0lnzt29EXEJNcPcdV7xuyEOQGzpz3BKk3As48SEGcuHb8hXCKWM8XgTp,iv:bVgGcsZl5l1OeO2UZIeBdJ2av34jfiKZWzpdsTgifso=,tag:dxArZNoqz8gq+fb6QvQCHg==,type:str]", + "pixelRoot": "ENC[AES256_GCM,data:/DOQjxWeh0IUYOH1YdNFapnXesc6pA3iFLZrl44at597294r9ky98/Olekn/e8hUPrLzSO5XnhYSJAUQYRXj,iv:ry4//bHdSwXObF3TlFXd7rigeSKXf3N+cVrZ2nSM4cY=,tag:KreCzUIKWhaz/VuODEYr6A==,type:str]", + "pixelDefault": "ENC[AES256_GCM,data:/5UP+VDHE5iOF5NztSL/WLqjrXlHLP/SLtjbIzjAEUtMAXC5TQEtsYASPE6xM6RACFyqHoF2HoVZmBrlv//A,iv:2iVbIQ9IJnyGMpGdlQEYGcFZZe0mofL5Jq6f/UjfwVQ=,tag:WMeWFFi0YB0LOHtmOWMf4Q==,type:str]", + "pixelGooglor": "ENC[AES256_GCM,data:9R9xyss0KEbR7hfxCs8oDJX9vG4Idnk/fwOr/k3swvzJ8y3qNRRzqMm6Joxv4BUEgwNH7xzV/wXSn3By+aIe,iv:WN5Ob/Gq+R8GoHivc4vlisRTPT6Wb9lSfb9XBNMNrx0=,tag:fr7sZBOr+6iPlNO9IQU2DQ==,type:str]" + } + }, + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age1r26dvz9zd2ds87clnqd9kxln6hyp9dtyvcfsmp9k894lkws9c49qy3yyrv", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0eldLbkg3ODlkU0NNSG4v\nOGt6ZldNR09CRDhMK2daeklpZlZmSTh1cVNrCkhBZkU4azV3aDZ5THhwdUpicng1\nSHBDS0c2cG9Qamx2UE94a3RJbHhqZVkKLS0tIFU4Sm4wWE9qNmYvc1A3UzF2Y2NP\ncTRFUEU0YmZQUmxVc09LMklwU0p5bFUK0mkyYcfRBR+Nto9/hKjW8ibFu1sXJOOi\ncCVNtXoZMvpsdBvUnNdjdaOtntg9hjhhZhWx6q4jzIGE88fkMAL+IA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age12p2494hhhjcw28w4kg5q3rv3xtv7gmpyxags9s9ta8c3rc0g4qrst20cvw", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBreEovNWlSUUwrMS9ZcmIz\nZDdhU0t1TGJTcjBCbUV0VnRET09pNzdmckJjClZjMmdubVJTQ285dDFEOE9sUmVN\nQVozQmU3a0h2bldIL1Z6QTJhdHRoa00KLS0tIFhNeUMxU091c2w4MnZqeU9JQ2Ur\nR0tPZ3FnZFVObll1SS9TZVBTV2FjQW8Kd2tgtXWznbtbq2CU6Niiaw+ekkI3hfrp\n9SDTVzv30pDVmldXaxAZ9nrJQaqRHdF7hgtg+/gSL7yjCBUL4ECVXQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2024-05-16T15:14:00Z", + "mac": "ENC[AES256_GCM,data:ubh98AdyVK5aRV+vJuJL2++t0oV4RRck1TEpykkTuZ6t6W7F5SOPeDTurtn5ZEs2enFg4oPxREzAB6UoKZDbJdr+uNVGUPfQvJNDWcmj6JDDvdktRxEQ3QPktdKBHoBxEtRAGmirOUkmwc3uGnSHeZFVgJuweCQiHKSUQ60oqjo=,iv:fwIo+JB8lfhPAp6OfS7ci2rRVmHdU+99LM5stBBQhho=,tag:DYAAYUXTPVxAsmXQMUNK3g==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.8.1" + } +} \ No newline at end of file From 1c12503ebf8fc60e620a2d7990aa6fefa7a6f21c Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Mon, 27 May 2024 00:58:58 +0200 Subject: [PATCH 018/177] chore: initial commit Moved from https://github.com/nicolas-goudry/nix-config/tree/a94642d3e8eb2a82b5efff253823239ce28fc876 --- .gitignore | 1 + LICENSE | 20 +++ README.md | 5 + config/colorscheme.nix | 13 ++ config/keymaps.nix | 33 ++++ config/options.nix | 103 ++++++++++++ default.nix | 30 ++++ flake.lock | 344 +++++++++++++++++++++++++++++++++++++++++ flake.nix | 70 +++++++++ plugins/alpha.nix | 192 +++++++++++++++++++++++ plugins/default.nix | 62 ++++++++ plugins/neo-tree.nix | 266 +++++++++++++++++++++++++++++++ plugins/telescope.nix | 132 ++++++++++++++++ plugins/treesitter.nix | 142 +++++++++++++++++ plugins/which-key.nix | 21 +++ 15 files changed, 1434 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 config/colorscheme.nix create mode 100644 config/keymaps.nix create mode 100644 config/options.nix create mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 plugins/alpha.nix create mode 100644 plugins/default.nix create mode 100644 plugins/neo-tree.nix create mode 100644 plugins/telescope.nix create mode 100644 plugins/treesitter.nix create mode 100644 plugins/which-key.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..26aefe3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2024 Nicolas Goudry + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..29c6a3a --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# NixVim config + +**PERSONAL** configuration for [Neovim](https://neovim.io/) using [Nixvim](https://nix-community.github.io/nixvim/). Heavily inspired by [AstroNvim](https://astronvim.com/). + +🚧 **This is a work in progress** 🚧 diff --git a/config/colorscheme.nix b/config/colorscheme.nix new file mode 100644 index 0000000..c675a62 --- /dev/null +++ b/config/colorscheme.nix @@ -0,0 +1,13 @@ +# Use catppuccin mocha variant +{ + catppuccin = { + enable = true; + + settings = { + flavour = "mocha"; + + # Needed to keep terminal transparency, if any + transparent_background = true; + }; + }; +} diff --git a/config/keymaps.nix b/config/keymaps.nix new file mode 100644 index 0000000..e29e040 --- /dev/null +++ b/config/keymaps.nix @@ -0,0 +1,33 @@ +let + forceWrite = { + action = "silent! update! | redraw"; + options.desc = "Force write"; + }; +in +[ + { + key = "n"; + action = "enew"; + options.desc = "New file"; + } + { + inherit (forceWrite) action options; + key = ""; + } + { + inherit (forceWrite) options; + mode = [ "i" "x" ]; + key = ""; + action = "${forceWrite.action}"; + } + { + key = "|"; + action = "vsplit"; + options.desc = "Split vertically"; + } + { + key = "\\"; + action = "split"; + options.desc = "Split horizontally"; + } +] diff --git a/config/options.nix b/config/options.nix new file mode 100644 index 0000000..8e3e4bc --- /dev/null +++ b/config/options.nix @@ -0,0 +1,103 @@ +# Neovim options +# Use :options to get the list of all options +# Use :h