From 3027322470b3eede586bbd23bd09bedcee65049b Mon Sep 17 00:00:00 2001 From: Thiago Sposito Date: Mon, 25 Aug 2025 22:42:48 -0300 Subject: [PATCH] chore: reinit --- .build.yml | 15 + .gitignore | 3 +- LICENSE | 674 ++++++++++++++++++ README.md | 5 +- flake.lock | 193 +++++ flake.nix | 43 +- home-manager/gnome/default.nix | 40 ++ home-manager/home.nix | 66 +- .../hyprland/config/waybar_config.json | 58 ++ home-manager/hyprland/config/waybar_style.css | 48 ++ home-manager/hyprland/default.nix | 78 +- home-manager/vim.nix | 3 +- home-manager/zsh.nix | 39 +- hosts/Nixbook/default.nix | 1 - hosts/Nixbook/disko.nix | 68 -- hosts/Nixbook/hardware-configuration.nix | 7 +- hosts/Nixstation/default.nix | 58 +- hosts/Nixstation/hardware-configuration.nix | 32 +- hosts/Nixtest/default.nix | 29 - hosts/Nixtest/disko.nix | 58 -- hosts/Nixtest/scripts/install_test.sh | 93 --- hosts/Nixtest/scripts/install_test_shell.nix | 22 - hosts/common/default.nix | 4 +- hosts/common/keychron.nix | 2 - hosts/common/nvidia/default.nix | 44 +- hosts/common/rclone.nix | 12 - hosts/common/screen.nix | 8 - hosts/common/users/thiago/default.nix | 36 +- my-mailmap | 4 + 29 files changed, 1215 insertions(+), 528 deletions(-) create mode 100644 .build.yml create mode 100644 LICENSE create mode 100644 flake.lock create mode 100644 home-manager/gnome/default.nix delete mode 100644 hosts/Nixbook/disko.nix delete mode 100644 hosts/Nixtest/default.nix delete mode 100644 hosts/Nixtest/disko.nix delete mode 100644 hosts/Nixtest/scripts/install_test.sh delete mode 100644 hosts/Nixtest/scripts/install_test_shell.nix delete mode 100644 hosts/common/rclone.nix delete mode 100644 hosts/common/screen.nix create mode 100644 my-mailmap diff --git a/.build.yml b/.build.yml new file mode 100644 index 0000000..199b0e1 --- /dev/null +++ b/.build.yml @@ -0,0 +1,15 @@ +image: nixos/unstable +environment: + NIX_CONFIG: "experimental-features = nix-command flakes" +sources: + - https://git.sr.ht/~sposito/nix-conf +tasks: + - build: | + cd nix-conf + nix flake check + - check_fmt: | + cd nix-conf + nixpkgs-fmt --check . + - static: | + cd nix-conf + nix run nixpkgs#statix check . diff --git a/.gitignore b/.gitignore index f802428..061818a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.old *.orig *.log -*.lock .DS_Store Thumbs.db ehthumbs.db @@ -95,4 +94,4 @@ custom/*/result custom/*/result/* **/.zig-cache/ result/* -result/ \ No newline at end of file +result/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 4196e24..1482828 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![builds.sr.ht status](https://builds.sr.ht/~sposito.svg)](https://builds.sr.ht/~sposito?search) # My personal machines config files This repository contains declarative configurations for personal machines managed with NixOS flakes and Home Manager. @@ -6,10 +7,10 @@ The setup is split into host-specific configurations, common reusable modules, a ## Structure - **flake.nix** — entry point, defines inputs (nixpkgs, home-manager, nixvim, etc.) and system/home outputs. - **hosts/** — machine-specific system configurations. - - `Nixbook/` — laptop setup (Apple hardware, Hyprland, disk layout via disko). + - `Nixbook/` — laptop setup (Apple hardware, Hyprland) - `Nixstation/` — desktop workstation (NVIDIA, virtualization, btrfs scrub, firewall). - `Nixtest/` — minimal VM environment for testing with QEMU. - - `common/` — shared modules (users, keyboard, network, gpus, rclone, etc.). + - `common/` — shared modules (users, keyboard, network, gpus, etc.). - **home-manager/** — user environment configurations. - `home.nix` — main Home Manager entry for user packages and programs. - `vim.nix`, `zsh.nix`, `gnome.nix`, `hyprland/` — modular desktop and tool configurations. diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..97321d5 --- /dev/null +++ b/flake.lock @@ -0,0 +1,193 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.1.1", + "repo": "ixx", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1755924483, + "narHash": "sha256-wNqpEXZuAwPjW8hYKIYzmN+fgEZT/Qx+sUIWXg3EIWU=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "91f51aede7c9c769c19f74ba9042b8fdb4ed2989", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "owner": "NuschtOS", + "repo": "search", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index a8e2fb8..c5efb5c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,57 +2,44 @@ description = "my NixOS Config"; inputs = { - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/master"; }; nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - - vscode-extensions = { - url = "github:nix-community/nix-vscode-extensions"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - flake-utils.follows = "vscode-extensions/flake-utils"; - flake-utils.inputs.nixpkgs.follows = "nixpkgs"; - vs-extensions-pkgs.follows = "vscode-extensions/nixpkgs"; }; outputs = { self , nixpkgs , home-manager - , nixpkgs-unstable , ... }@inputs: let inherit (self) outputs; system = "x86_64-linux"; - unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; }; - pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; in { nixosConfigurations = { Nixbook = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; + allowUnfree = true; }; modules = [ ./hosts/Nixbook - ./hosts/Nixbook/disko.nix - inputs.disko.nixosModules.disko ]; }; Nixstation = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs unstable; }; + specialArgs = { + inherit inputs outputs; + allowUnfree = true; + }; modules = [ ./hosts/Nixstation ]; @@ -65,10 +52,8 @@ extraSpecialArgs = { inherit inputs outputs; }; - modules = [ ./home-manager/home.nix - { custom.sessionType = "wayland"; } ]; }; "thiago@Nixstation" = home-manager.lib.homeManagerConfiguration { @@ -79,16 +64,16 @@ modules = [ ./home-manager/home.nix - { custom.sessionType = "wayland"; } ]; }; }; + # nix build .#checks.x86_64-linux + packages.${system}.all = nixpkgs.legacyPackages.${system}.linkFarm "all-builds" [ + { name = "nixbook"; path = self.nixosConfigurations.Nixbook.config.system.build.toplevel; } + { name = "nixstation"; path = self.nixosConfigurations.Nixstation.config.system.build.toplevel; } + { name = "hm-nixbook"; path = self.homeConfigurations."thiago@Nixbook".activationPackage; } + { name = "hm-nixstation"; path = self.homeConfigurations."thiago@Nixstation".activationPackage; } + ]; - apps.x86_64-linux.disko-install = { - type = "app"; - program = "${inputs.disko.packages.x86_64-linux.disko}/bin/disko-install"; - }; - - devShells.x86_64-linux = { }; }; } diff --git a/home-manager/gnome/default.nix b/home-manager/gnome/default.nix new file mode 100644 index 0000000..e728184 --- /dev/null +++ b/home-manager/gnome/default.nix @@ -0,0 +1,40 @@ +{ pkgs, ... }: + +{ + + dconf.settings = { + + "org/gnome/shell" = { + disable-user-extensions = false; + favorite-apps = [ + "org.gnome.Settings.desktop" + "org.gnome.Nautilus.desktop" + "firefox.desktop" + "org.gnome.Calendar.desktop" + "code.desktop" + "kitty.desktop" + ]; + + enabled-extensions = [ + "" + "trayIconsReloaded@selfmade.pl" + "Vitals@CoreCoding.com" + "sound-output-device-chooser@kgshank.net" + "space-bar@luchrioh" + "Forge@forge-ext" + ]; + }; + }; + + home.packages = with pkgs; [ + gnome-tweaks + gnomeExtensions.appindicator + gnomeExtensions.pop-shell + gnomeExtensions.forge + gnomeExtensions.tray-icons-reloaded + gnomeExtensions.vitals + gnomeExtensions.sound-output-device-chooser + gnomeExtensions.space-bar + nordzy-icon-theme + ]; +} diff --git a/home-manager/home.nix b/home-manager/home.nix index 7a4bf3a..533cdeb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,12 +1,9 @@ -{ config -, inputs -, lib -, pkgs +{ pkgs , ... }: { imports = [ - ./hyprland + ./gnome ./vim.nix ./zsh.nix ]; @@ -14,9 +11,6 @@ nixpkgs = { config = { allowUnfree = true; - config.permittedInsecurePackages = [ - "libsoup-2.74.3" - ]; # Workaround for https://github.com/nix-community/home-manager/issues/2942 # nixpkgs.config.allowUnfreePredicate = # pkg: @@ -32,34 +26,27 @@ home = { homeDirectory = "/home/thiago"; packages = with pkgs; [ - bambu-studio direnv fira-code firefox heroic hwinfo - hydralauncher inkscape - keymapp lazygit libinput - librespot - luarocks + nerd-fonts.fira-code nil nixpkgs-fmt nordic obsidian + pinentry-curses python3 - python3Packages.pip - rclone ripgrep - shfmt statix - stylua - sysbench - transmission_4 uget unzip + waydroid + wl-clipboard ]; username = "thiago"; }; @@ -87,7 +74,7 @@ }; lfs.enable = true; signing = { - key = "3065EA73A976D430"; + key = "EC7C84664FF515B63AD510B63065EA73A976D430"; signByDefault = true; }; userEmail = "th.spo@pm.me"; @@ -99,21 +86,25 @@ kitty = { enable = true; keybindings = { + # splitting + "ctrl+shift+enter" = "new_window"; + "ctrl+shift+\\" = "new_window --location=hsplit"; + # resizing "ctrl+alt+left" = "resize_window narrower"; "ctrl+alt+right" = "resize_window wider"; "ctrl+alt+up" = "resize_window taller"; "ctrl+alt+down" = "resize_window shorter"; + }; settings = { hide_window_decorations = "titlebar-only"; - font_size = 16; - font = "ComicShannsMono Nerd Font Mono"; + font_size = 18; + font_family = "GohuFont 14 Nerd Font Mono"; inactive_text_alpha = "0.6"; - background_blur = 16; - background_opacity = 0.0; + # background_blur = 32; + background_opacity = 1.0; }; - themeFile = "Nord"; }; vscode = { @@ -121,29 +112,6 @@ }; }; - systemd.user.services.librespot-connect = { - Unit = { - Description = "Librespot (Spotify Connect) bound to LAN interface"; - After = [ "network.target" ]; - }; - Service = { - ExecStart = "${pkgs.librespot}/bin/librespot \ - --name LS-TEST \ - --backend pulseaudio \ - --device default \ - --bitrate 320 \ - --disable-audio-cache \ - --enable-volume-normalisation \ - --initial-volume 75 \ - --zeroconf-port 17005"; - Restart = "on-failure"; - BindToDevice = "wlp7s0"; # Force binding to LAN interface - }; - Install = { - WantedBy = [ "default.target" ]; - }; - }; - systemd.user.startServices = "sd-switch"; - home.stateVersion = "24.05"; + home.stateVersion = "25.11"; } diff --git a/home-manager/hyprland/config/waybar_config.json b/home-manager/hyprland/config/waybar_config.json index e69de29..b00447b 100644 --- a/home-manager/hyprland/config/waybar_config.json +++ b/home-manager/hyprland/config/waybar_config.json @@ -0,0 +1,58 @@ +{ + "layer": "top", + "position": "right", + "exclusive": true, + "modules-left": [ + "hyprland/workspaces", + "hyprland/window" + ], + "modules-center": [ + "clock", + "temperature" + ], + "modules-right": [ + "pulseaudio", + "battery", + "network", + "tray" + ], + "clock": { + "format": "{:%d/%m %H:%M}", + "interval": 1 + }, + "temperature": { + "hwmon-path-abs": "/sys/class/hwmon/hwmon1/temp1_input", + "format": " {temperatureC}°C", + "critical-threshold": 90, + "format-icons": [ + "", + "", + "" + ] + }, + "battery": { + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ⚡", + "format-icons": [ + "", + "", + "", + "", + "" + ] + }, + "network": { + "format-wifi": " {essid}", + "format-ethernet": " {ipaddr}", + "format-disconnected": " " + }, + "pulseaudio": { + "format": "{volume}% {icon}", + "format-muted": "", + "format-icons": [ + "", + "", + "" + ] + } +} \ No newline at end of file diff --git a/home-manager/hyprland/config/waybar_style.css b/home-manager/hyprland/config/waybar_style.css index e69de29..44e4d4a 100644 --- a/home-manager/hyprland/config/waybar_style.css +++ b/home-manager/hyprland/config/waybar_style.css @@ -0,0 +1,48 @@ +* { + color: #ffffff; +} + +window#waybar { + background: transparent; +} + +#workspaces { + flex-wrap: wrap; + max-width: 120px; +} + +#workspaces button { + background: #ff00ff; + border-radius: 0; + width: 40px; + height: 40px; + margin: 2px; + padding: 0; + flex: 0 0 40px; +} + +#workspaces button.active { + background: #ff00ff; + border: 2px solid #ffffff; +} + +#window { + background: transparent; +} + +#clock, +#battery, +#network, +#pulseaudio, +#tray, +#temperature { + background: transparent; +} + +#pulseaudio.muted { + background: transparent; +} + +#network.disconnected { + background: transparent; +} \ No newline at end of file diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix index e6bb1f7..87d28cc 100644 --- a/home-manager/hyprland/default.nix +++ b/home-manager/hyprland/default.nix @@ -1,4 +1,5 @@ -_: { +{ lib, ... }: +{ home.sessionVariables = { fileManager = "thunar"; menu = "fuzzel --show drun"; @@ -14,17 +15,33 @@ _: { }; home.file = { ".config/fuzzel/fuzzel.ini".text = builtins.readFile ./config/fuzzel.ini; - ".config/waybar/config".text = builtins.readFile ./config/waybar_config.json; - ".config/waybar/style.css".text = builtins.readFile ./config/waybar_style.css; + # ".config/waybar/config".text = builtins.readFile ./config/waybar_config.json; + # ".config/waybar/style.css".text = builtins.readFile ./config/waybar_style.css; + ".config/hyprland/wallpaper/e-villa.png" = { + source = builtins.fetchurl { + url = "https://ipfs.io/ipfs/bafybeibsjbhleghcc4zdgarmsftd6jt27rb73g3mlbuup3cmuedw54uyqa"; + sha256 = "0gxa45qigjcjb12v243jv37nji5dax6rn5y6l823f0a2s2hfkqm5"; + }; + force = true; + }; + }; + services.hyprpaper.enable = true; + services.hyprpaper.settings = { + preload = [ "/home/thiago/.config/hyprland/wallpaper/hydra.jpg" ]; + wallpaper = [ "HDMI-A-1,/home/thiago/.config/hyprland/wallpaper/hydra.jpg" ]; }; wayland.windowManager.hyprland = { enable = true; settings = { "$mod" = "SUPER"; - layerrule = "ignorezero, waybar"; + layerrule = [ + "ignorezero, waybar" + "blur, waybar" + ]; bind = [ "$mod, q, exec, kitty" + "$mod, f, exec, firefox" "$mod, c, killactive," "$mod, m, exit," "$mod, e, exec, $fileManager" @@ -65,8 +82,8 @@ _: { ]; bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" + "$mod, mouse:272, movewindow" # Hold $mod and left mouse button to move window + "$mod, mouse:273, resizewindow" # Hold $mod and right mouse button to resize window ]; bindel = [ @@ -91,14 +108,12 @@ _: { ]; monitor = [ ",preferred,auto,auto" - "HDMI-A-2,1920x1080@50,0x0,1" - "eDP-1,2560x1600@60,1920x0,2" ]; general = { - gaps_in = 2; - gaps_out = 3; - border_size = 1; + gaps_in = 3; + gaps_out = 6; + border_size = 0; resize_on_border = true; allow_tearing = false; layout = "dwindle"; @@ -106,8 +121,10 @@ _: { decoration = { rounding = 2; + fullscreen_opacity = 1.0; active_opacity = 1.0; - inactive_opacity = 0.9; + inactive_opacity = 0.95; + shadow = { enabled = true; range = 4; @@ -116,14 +133,16 @@ _: { }; blur = { enabled = true; - size = 17; - passes = 1; + size = 4; + passes = 4; vibrancy = 0.1696; + vibrancy_darkness = 0.08; + # noise = 0.002; }; }; animations = { - enabled = "yes, please :)"; + enabled = true; bezier = [ "easeOutQuint,0.23,1,0.32,1" "easeInOutCubic,0.65,0.05,0.36,1" @@ -131,29 +150,32 @@ _: { "almostLinear,0.5,0.5,0.75,1.0" "quick,0.15,0,0.1,1" ]; + animation = [ "global, 1, 10, default" - "border, 1, 5.39, easeOutQuint" - "windows, 1, 4.79, easeOutQuint" - "windowsIn, 1, 4.1, easeOutQuint, popin 87%" - "windowsOut, 1, 1.49, linear, popin 87%" - "fadeIn, 1, 1.73, almostLinear" - "fadeOut, 1, 1.46, almostLinear" - "fade, 1, 3.03, quick" - "layers, 1, 3.81, easeOutQuint" - "layersIn, 1, 4, easeOutQuint, fade" - "layersOut, 1, 1.5, linear, fade" - "fadeLayersIn, 1, 1.79, almostLinear" + "border, 1, 5.39, easeOutQuint" + "windows, 1, 4.79, easeOutQuint" + "windowsIn, 1, 4.1, easeOutQuint, popin 87%" + "windowsOut, 1, 1.49, linear, popin 87%" + "fadeIn, 1, 1.73, almostLinear" + "fadeOut, 1, 1.46, almostLinear" + "fade, 1, 3.03, quick" + "layers, 1, 3.81, easeOutQuint" + "layersIn, 1, 4, easeOutQuint, fade" + "layersOut, 1, 1.5, linear, fade" + "fadeLayersIn, 1, 1.79, almostLinear" "fadeLayersOut, 1, 1.39, almostLinear" - "workspaces, 1, 1.94, almostLinear, fade" - "workspacesIn, 1, 1.21, almostLinear, fade" + "workspaces, 1, 1.94, almostLinear, fade" + "workspacesIn, 1, 1.21, almostLinear, fade" "workspacesOut, 1, 1.94, almostLinear, fade" ]; }; dwindle = { pseudotile = true; + default_split_ratio = 0.618; preserve_split = true; + smart_split = true; }; master = { diff --git a/home-manager/vim.nix b/home-manager/vim.nix index 66d647e..a4cc953 100644 --- a/home-manager/vim.nix +++ b/home-manager/vim.nix @@ -2,7 +2,7 @@ { imports = [ - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeModules.nixvim ]; home.packages = with pkgs; [ ripgrep @@ -96,4 +96,3 @@ ''; }; } - diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 5289149..ac8d7c9 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -3,16 +3,7 @@ , pkgs , ... }: -let - isWayland = config.custom.sessionType == "wayland"; -in { - options.custom.sessionType = lib.mkOption { - type = lib.types.str; - default = "x11"; - description = "The X session type: 'wayland' or 'x11'"; - }; - config = { home.file."scripts/lsgpu.sh" = { source = ./scripts/lsgpu.sh; @@ -28,25 +19,15 @@ in export GPG_TTY=$(tty) ''; - shellAliases = lib.mkMerge [ - { - "vi" = "nvim"; - "vim" = "nvim"; - "ll" = "ls -l"; - "lsgpu" = "$HOME/scripts/lsgpu.sh"; - "gedit" = "gnome-text-editor"; - } - - (lib.mkIf isWayland { - "pbcopy" = "wl-copy"; - "pbpaste" = "wl-paste"; - }) - - (lib.mkIf (!isWayland) { - "pbcopy" = "xclip -selection clipboard -i"; - "pbpaste" = "xclip -selection clipboard -o"; - }) - ]; + shellAliases = { + "vi" = "nvim"; + "vim" = "nvim"; + "ll" = "ls -l"; + "lsgpu" = "$HOME/scripts/lsgpu.sh"; + "gedit" = "gnome-text-editor"; + "pbcopy" = "wl-copy"; + "pbpaste" = "wl-paste"; + }; oh-my-zsh = { enable = true; @@ -57,7 +38,5 @@ in ]; }; }; - - home.packages = with pkgs; [ xclip ]; }; } diff --git a/hosts/Nixbook/default.nix b/hosts/Nixbook/default.nix index de9ff46..6dcff84 100644 --- a/hosts/Nixbook/default.nix +++ b/hosts/Nixbook/default.nix @@ -48,7 +48,6 @@ neovim nil nixpkgs-fmt - rclone wget ]; diff --git a/hosts/Nixbook/disko.nix b/hosts/Nixbook/disko.nix deleted file mode 100644 index 0cefabd..0000000 --- a/hosts/Nixbook/disko.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, lib, ... }: - -{ - disko.devices = { - disk.main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - esp = { - size = "512M"; - start = "1M"; - type = "EF00"; - label = "EFI"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - swap = { - size = "16G"; - type = "8200"; - label = "Swap"; - content = { - type = "swap"; - randomEncryption = false; - }; - }; - - root = { - type = "8300"; - label = "NixOS"; - size = "870G"; - content = { - type = "btrfs"; - mountpoint = "/"; - subvolumes = { - "@root" = { - mountpoint = "/"; - }; - "@nix" = { - mountpoint = "/nix"; - }; - "@home" = { - mountpoint = "/home"; - }; - "@log" = { - mountpoint = "/var/log"; - }; - }; - extraArgs = [ - "-L" - "nixos-root" - ]; - mountOptions = [ - "compress=zstd" - "noatime" - ]; - }; - }; - - }; - }; - }; - }; -} diff --git a/hosts/Nixbook/hardware-configuration.nix b/hosts/Nixbook/hardware-configuration.nix index 01f2649..00082d9 100644 --- a/hosts/Nixbook/hardware-configuration.nix +++ b/hosts/Nixbook/hardware-configuration.nix @@ -1,8 +1,6 @@ { config , lib -, pkgs , modulesPath -, inputs , ... }: @@ -25,6 +23,11 @@ extraModulePackages = [ ]; }; + fileSystems."/" = { + device = "/dev/nvme0n1"; + fsType = "btrfs"; + }; + networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/Nixstation/default.nix b/hosts/Nixstation/default.nix index 50e20da..2d16dc2 100644 --- a/hosts/Nixstation/default.nix +++ b/hosts/Nixstation/default.nix @@ -2,41 +2,30 @@ , ... }: { - imports = [ ../common/default.nix - ../common/keychron.nix ../common/network.nix ../common/nvidia/default.nix - ../common/rclone.nix - ../common/screen.nix ./hardware-configuration.nix ]; boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; + # kernelPackages = pkgs.linuxPackages_6_16; }; + environment = { systemPackages = with pkgs; [ act btrfs-progs cudatoolkit networkmanagerapplet + libwacom + wacomtablet ]; - - variables = { - NIXOS_HOST = "nixstation"; - NIXOS_DE = "wayland"; - }; - - sessionVariables = { - NIXOS_OZONE_WL = "1"; - XDG_SESSION_TYPE = "wayland"; - QT_QPA_PLATFORM = "wayland"; - GDK_BACKEND = "wayland"; - }; }; + hardware = { sane.enable = true; graphics.enable = true; @@ -81,16 +70,25 @@ # }; dconf.enable = true; - hyprland = { - enable = true; - withUWSM = true; - xwayland.enable = true; - }; virt-manager.enable = true; }; - # security.pam.services.gdm.enableGnomeKeyring = true; + security.pam.services.gdm.enableGnomeKeyring = true; security.rtkit.enable = true; services = { + xserver = { + xkb = { + layout = "us"; + variant = "alt-intl"; + }; + }; + desktopManager.gnome.enable = true; + + displayManager = { + gdm.enable = true; + gdm.wayland = true; + defaultSession = "gnome"; + }; + udev.packages = [ pkgs.libwacom ]; avahi = { enable = true; nssmdns4 = true; @@ -109,14 +107,6 @@ flatpak.enable = true; - greetd = { - enable = true; - settings.default_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; - user = "thiago"; - }; - }; - pipewire = { enable = true; alsa.enable = true; @@ -124,6 +114,7 @@ pulse.enable = true; }; }; + systemd = { services."getty@tty1".enable = false; services."autovt@tty1".enable = false; @@ -149,7 +140,7 @@ }; }; }; - system.stateVersion = "24.05"; # keep it! + system.stateVersion = "25.11"; # keep it! time.timeZone = "America/Sao_Paulo"; virtualisation = { vmware.host.enable = false; @@ -157,14 +148,13 @@ libvirtd = { enable = true; qemu.ovmf.enable = true; - qemu.package = pkgs.qemu_full; + # qemu.package = pkgs.qemu_full; }; - }; zramSwap = { enable = true; - memoryPercent = 30; + memoryPercent = 25; algorithm = "zstd"; }; } diff --git a/hosts/Nixstation/hardware-configuration.nix b/hosts/Nixstation/hardware-configuration.nix index 3fbdd0c..4410d63 100644 --- a/hosts/Nixstation/hardware-configuration.nix +++ b/hosts/Nixstation/hardware-configuration.nix @@ -11,43 +11,42 @@ boot = { initrd.availableKernelModules = [ - "xhci_pci" + "ahci" "ehci_pci" "nvme" - "usbhid" - "usb_storage" "sd_mod" - "ahci" + "usb_storage" + "usbhid" + "sd_mod" + "xhci_pci" ]; kernelParams = [ "amd_pstate=active" ]; initrd.kernelModules = [ ]; kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; }; - fileSystems = { "/" = { - device = "/dev/disk/by-uuid/df74093a-637d-41a5-8c6a-2bf2dccc1506"; + device = "/dev/disk/by-uuid/07c4d31f-e1cd-4a02-8b3f-8c2bd2e0ce8d"; fsType = "btrfs"; options = [ "subvol=@" ]; }; + "/home" = { + device = "/dev/disk/by-uuid/07c4d31f-e1cd-4a02-8b3f-8c2bd2e0ce8d"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + "/boot" = { - device = "/dev/disk/by-uuid/E9BA-D1A3"; + device = "/dev/disk/by-uuid/D2EA-469F"; fsType = "vfat"; options = [ - "fmask=0022" - "dmask=0022" + "fmask=0077" + "dmask=0077" ]; }; - - "/mnt/hdd0" = { - device = "/dev/disk/by-uuid/940353dd-5774-4577-aba3-516d3f9c404d"; - fsType = "btrfs"; - options = [ "defaults" ]; - }; }; - swapDevices = [ ]; networking = { @@ -61,5 +60,4 @@ }; services.blueman.enable = true; - } diff --git a/hosts/Nixtest/default.nix b/hosts/Nixtest/default.nix deleted file mode 100644 index b9ccb35..0000000 --- a/hosts/Nixtest/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, ... }: -{ - - imports = [ - ./disko.nix - ]; - - networking.hostName = "Nixtest"; - services = { - xserver.enable = true; - displayManager.sddm = { - enable = true; - }; - openssh = { - enable = true; - settings = { - PermitRootLogin = "yes"; - PasswordAuthentication = true; - }; - }; - }; - - environment.systemPackages = with pkgs; [ - git - home-manager - ]; - - system.stateVersion = "23.11"; -} diff --git a/hosts/Nixtest/disko.nix b/hosts/Nixtest/disko.nix deleted file mode 100644 index 9f7cf0f..0000000 --- a/hosts/Nixtest/disko.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, ... }: - -{ - disko.devices = { - disk.main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - esp = { - size = "128M"; - start = "1M"; - type = "EF00"; - label = "EFI"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - - root = { - type = "8300"; - label = "NixOS"; - size = "32G"; - content = { - type = "btrfs"; - mountpoint = "/"; - subvolumes = { - "@root" = { - mountpoint = "/"; - }; - "@nix" = { - mountpoint = "/nix"; - }; - "@home" = { - mountpoint = "/home"; - }; - "@log" = { - mountpoint = "/var/log"; - }; - }; - extraArgs = [ - "-L" - "nixos-root" - ]; - mountOptions = [ - "compress=zstd" - "noatime" - ]; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/Nixtest/scripts/install_test.sh b/hosts/Nixtest/scripts/install_test.sh deleted file mode 100644 index 4667155..0000000 --- a/hosts/Nixtest/scripts/install_test.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -### Configuration ### - -# Find virtual images at: https://alpinelinux.org/downloads/ -> Virtual -ALPINE_VERSION="3.19.1" -ALPINE_ARCH="x86_64" -ALPINE_IMAGE_FILENAME="alpine-virt-${ALPINE_VERSION}-${ALPINE_ARCH}.iso" -ALPINE_IMAGE_URL="https://dl-cdn.alpinelinux.org/alpine/v$(echo $ALPINE_VERSION | cut -d. -f1-2)/releases/${ALPINE_ARCH}/${ALPINE_IMAGE_FILENAME}" - -QEMU_MEM="2048" -QEMU_CPUS="2" -QEMU_SSH_HOST_PORT="2222" -QEMU_PID_FILE="qemu_test.pid" - -TARGET_IP="127.0.0.1" -TARGET_PORT="${QEMU_SSH_HOST_PORT}" -TARGET_USER="root" -SSH_KEY_PUB="$HOME/.ssh/id_rsa.pub" -SSH_KEY_PRIV="$HOME/.ssh/id_rsa" - -FLAKE_PATH="./#Nixtest" - -### Helper Functions ### -cleanup_qemu() { - if [ -f "$QEMU_PID_FILE" ]; then - echo "🧹 Cleaning up previous QEMU instance..." - kill -- "-$(cat $QEMU_PID_FILE)" 2>/dev/null || kill "$(cat $QEMU_PID_FILE)" 2>/dev/null || true - rm -f "$QEMU_PID_FILE" - sleep 2 - echo "🧹 Cleanup complete." - fi -} - -launch_qemu_alpine() { - echo "🚀 Launching QEMU with Alpine Linux (${ALPINE_IMAGE_FILENAME})..." - qemu-system-x86_64 \ - -m "${QEMU_MEM}" \ - -smp "${QEMU_CPUS}" \ - -enable-kvm \ - -nic user,model=virtio-net-pci,hostfwd=tcp::${TARGET_PORT}-:22 \ - -drive file="${ALPINE_IMAGE_FILENAME}",media=cdrom,readonly=on \ - -boot d \ - -display none \ - -daemonize \ - -pidfile "$QEMU_PID_FILE" - - echo "⏳ Waiting for QEMU to boot and SSH to become available on port ${TARGET_PORT}..." - local max_wait=90 - local waited=0 - while ! ssh -p "${TARGET_PORT}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=2 -o ConnectionAttempts=3 "${TARGET_USER}@${TARGET_IP}" exit >/dev/null 2>&1; do - sleep 3 - waited=$((waited + 3)) - if [ "$waited" -ge "$max_wait" ]; then - echo "❌ Timed out waiting for SSH on port ${TARGET_PORT}." - cat "$QEMU_PID_FILE" - cleanup_qemu - exit 1 - fi - echo -n "." - done - echo - echo "✅ QEMU Alpine VM is up and SSH is ready on port ${TARGET_PORT}." -} - -### Main Script ### - -trap cleanup_qemu EXIT SIGINT SIGTERM - -if [ ! -f "$ALPINE_IMAGE_FILENAME" ]; then - echo "⏬ Downloading Alpine image: ${ALPINE_IMAGE_FILENAME}..." - wget --progress=bar:force -O "$ALPINE_IMAGE_FILENAME" "$ALPINE_IMAGE_URL" -else - echo "✅ Alpine image found locally: ${ALPINE_IMAGE_FILENAME}" -fi - -if [ ! -f "$SSH_KEY_PUB" ] || [ ! -f "$SSH_KEY_PRIV" ]; then - echo "❌ SSH key not found at $SSH_KEY_PRIV or $SSH_KEY_PUB" - echo " Please generate one using 'ssh-keygen' or specify the correct path." - exit 1 -fi -echo "✅ Using SSH key: ${SSH_KEY_PRIV}" - -cleanup_qemu -launch_qemu_alpine - -# --- Installation logic will go here --- - -echo "🏁 Test script placeholder finished. VM is running." -echo " PID: $(cat $QEMU_PID_FILE)" -echo " To connect: ssh -p ${TARGET_PORT} ${TARGET_USER}@${TARGET_IP}" diff --git a/hosts/Nixtest/scripts/install_test_shell.nix b/hosts/Nixtest/scripts/install_test_shell.nix deleted file mode 100644 index efd3e02..0000000 --- a/hosts/Nixtest/scripts/install_test_shell.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs ? import { } -, -}: - -pkgs.mkShell { - name = "nixos-anywhere-test-env"; - - packages = with pkgs; [ - nix - nixos-anywhere - openssh - sshpass - qemu_full - wget - ]; - - shellHook = '' - echo "Entered NixOS Anywhere Test Environment." - echo "Alpine image will be downloaded if needed." - echo "Run ./install_test.sh to start the QEMU VM and run the installation." - ''; -} diff --git a/hosts/common/default.nix b/hosts/common/default.nix index b3c6ff2..d07253d 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -19,6 +19,7 @@ systemPackages = with pkgs; [ exfat file + fuse3 gcsfuse git gnupg @@ -29,6 +30,7 @@ pcsc-safenet pcsctools pkcs11helper + rclone sops wget zsa-udev-rules @@ -53,7 +55,7 @@ programs.zsh.enable = true; services = { pcscd.enable = true; - # xserver.displayManager.sessionCommands = + # xserver.displayManager.sessionCommands = # "${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 64 = Alt_L'"; }; diff --git a/hosts/common/keychron.nix b/hosts/common/keychron.nix index b203ff0..f831fde 100644 --- a/hosts/common/keychron.nix +++ b/hosts/common/keychron.nix @@ -2,8 +2,6 @@ { services.xserver = { - enable = true; - xkb = { layout = "custom-br"; variant = ""; diff --git a/hosts/common/nvidia/default.nix b/hosts/common/nvidia/default.nix index 5689e61..29aa2ce 100644 --- a/hosts/common/nvidia/default.nix +++ b/hosts/common/nvidia/default.nix @@ -1,13 +1,15 @@ -{ config -, pkgs -, unstable +{ pkgs , ... }: { imports = [ # ./passthrough.nix ]; - + boot = { + kernelModules = [ "nvidia" ]; + kernelParams = [ "nvidia-drm.modset=1" ]; + blacklistedKernelModules = [ "nouveau" ]; + }; hardware = { graphics = { enable = true; @@ -19,36 +21,36 @@ }; nvidia = { modesetting.enable = true; + nvidiaSettings = true; + open = false; + package = pkgs.linuxPackages.nvidiaPackages.latest; powerManagement.enable = false; powerManagement.finegrained = false; - open = false; # keep it like that for now, unstable!! - nvidiaSettings = true; - package = unstable.linuxPackages.nvidiaPackages.latest; }; }; services = { - sunshine = { - enable = false; - # autoStart = true; - # openFirewall = true; - package = pkgs.sunshine.overrideAttrs (old: { - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DSUNSHINE_ENABLE_CUDA=OFF" - "-DCUDA_FAIL_ON_MISSING=OFF" - ]; - }); + desktopManager.gnome.enable = true; + displayManager = { + gdm.enable = true; + gdm.wayland = true; + defaultSession = "gnome"; + }; + + xserver = { + enable = true; + videoDrivers = [ "nvidia" ]; }; }; + nixpkgs.config.cudaSupport = true; environment.systemPackages = with pkgs; [ - mesa + cudaPackages.cuda_nvcc + cudaPackages.cudatoolkit glxinfo libepoxy libglvnd + mesa nvidia-container-toolkit - cudaPackages.cudatoolkit - cudaPackages.cuda_nvcc ]; - } diff --git a/hosts/common/rclone.nix b/hosts/common/rclone.nix deleted file mode 100644 index 71e33a3..0000000 --- a/hosts/common/rclone.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - rclone - fuse3 # Required for mounting - ]; - - users.users.thiago = { - extraGroups = [ "fuse" ]; - }; -} diff --git a/hosts/common/screen.nix b/hosts/common/screen.nix deleted file mode 100644 index e4d773a..0000000 --- a/hosts/common/screen.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - hardware.i2c.enable = true; - environment.systemPackages = with pkgs; [ - ddcutil - ddcui - ]; -} diff --git a/hosts/common/users/thiago/default.nix b/hosts/common/users/thiago/default.nix index b4ef1af..dd5dd93 100644 --- a/hosts/common/users/thiago/default.nix +++ b/hosts/common/users/thiago/default.nix @@ -7,24 +7,24 @@ in isNormalUser = true; initialPassword = "changeme"; - extraGroups = - [ - "networkmanager" - "wheel" - "scard" - ] - ++ ifTheyExist [ - "wireshark" - "i2c" - "docker" - "git" - "libvirtd" - "libvirt" - "video" - "kvm" - "scanner" - "photos" - ]; + extraGroups = [ + "fuse" + "networkmanager" + "scard" + "wheel" + ] + ++ ifTheyExist [ + "docker" + "git" + "i2c" + "kvm" + "libvirt" + "libvirtd" + "photos" + "scanner" + "video" + "wireshark" + ]; openssh.authorizedKeys.keyFiles = [ (builtins.fetchurl { url = "https://github.com/sposito.keys"; diff --git a/my-mailmap b/my-mailmap new file mode 100644 index 0000000..2f14013 --- /dev/null +++ b/my-mailmap @@ -0,0 +1,4 @@ +Thiago Sposito Thiago Sposito +Thiago Alexandria Sposito Thiago Sposito +Thiago Alexandria Sposito Thiago Sposito +