commit 06cf1c182566828487d1ac9ae11f64f635c40dc8 Author: Dotfiles <> Date: Mon Jul 6 02:13:07 2026 +0000 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3cb44c3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +# ---> Nix +# Ignore build outputs from performing a nix-build or `nix build` command +result +result-* + +# Ignore automatically generated direnv output +.direnv + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0cb38e4 --- /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. + + dotfiles-template + Copyright (C) 2026 Dotfiles + + 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: + + dotfiles-template Copyright (C) 2026 Dotfiles + 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..b05ef20 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# dotfiles-template + +A basic nix template, contains most important modules, home.nix, and a configuration for additional uses (river and aariz). \ No newline at end of file diff --git a/desktops/hyprland/default.nix b/desktops/hyprland/default.nix new file mode 100644 index 0000000..848e6c0 --- /dev/null +++ b/desktops/hyprland/default.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: + +{ + programs.hyprland.enable = true; + + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + }; + + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + + environment.systemPackages = with pkgs; [ + hyprpolkitagent + hyprlock + hyprshot + rofi + networkmanagerapplet + kdePackages.dolphin + wayvnc + awww + mpvpaper + waybar + quickshell + qt6.qtdeclarative + ]; +} diff --git a/desktops/plasma/default.nix b/desktops/plasma/default.nix new file mode 100644 index 0000000..e86476e --- /dev/null +++ b/desktops/plasma/default.nix @@ -0,0 +1,27 @@ +{ pkgs, ... }: + +{ + + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; # Recommended to fix xdg-open issues + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk # For file choosers in GTK apps + xdg-desktop-portal-hyprland # For Hyprland (or wlr for other wlroots) + ]; + config = { + common.default = [ "gtk" ]; # Default fallback + hyprland = { + default = [ + "hyprland" + "gtk" + ]; + "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ]; + "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ]; + }; + }; + }; + + services.desktopManager.plasma6.enable = true; + services.displayManager.sddm.wayland.enable = true; +} diff --git a/desktops/xfce/default.nix b/desktops/xfce/default.nix new file mode 100644 index 0000000..6253f0a --- /dev/null +++ b/desktops/xfce/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + services.xserver.enable = true; + + services.xserver.desktopManager.xfce.enable = true; + services.xserver.displayManager.lightdm.enable = true; +} diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..3f1ef71 --- /dev/null +++ b/flake.lock @@ -0,0 +1,89 @@ +{ + "nodes": { + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", + "owner": "nix-community", + "repo": "disko", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782358560, + "narHash": "sha256-vCcLh9pw3XO/+Lxk8r6xv6QnoCrTfGqiACcI7O637Wg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3a70e333f2950c302e875c44cfcfaff3f80f36bc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781847791, + "narHash": "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8=", + "ref": "refs/heads/master", + "rev": "68c2c85c33845385f7ab8147b32f1450b1e468e0", + "revCount": 824, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, + "root": { + "inputs": { + "disko": "disko", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "quickshell": "quickshell" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..e39b643 --- /dev/null +++ b/flake.nix @@ -0,0 +1,49 @@ +{ + inputs = { + nixpkgs.url = "nixpkgs/nixos-unstable"; + + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + { + nixpkgs, + home-manager, + ... + }@inputs: + let + system = "x86_64-linux"; + in + { + # nixosConfigurations.pc = nixpkgs.lib.nixosSystem { + # inherit system; + # specialArgs = { inherit inputs; }; + # modules = [ + # ./hosts/pc/configuration.nix + # home-manager.nixosModules.default + + # { + # home-manager = { + # useGlobalPkgs = true; + # useUserPackages = true; + + # backupFileExtension = "backup"; + + # users = { + # river = import ./home/river; + # aariz = import ./home/aariz; + # }; + # }; + # } + # ]; + # }; + }; +} diff --git a/home/aariz/default.nix b/home/aariz/default.nix new file mode 100644 index 0000000..2f8ea22 --- /dev/null +++ b/home/aariz/default.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + home.username = "aariz"; + home.homeDirectory = "/home/aariz"; + home.stateVersion = "26.05"; + + programs.home-manager.enable = true; +} diff --git a/home/river/config/fish/completions/bun.fish b/home/river/config/fish/completions/bun.fish new file mode 100644 index 0000000..6b2dc5b --- /dev/null +++ b/home/river/config/fish/completions/bun.fish @@ -0,0 +1,196 @@ +# This is terribly complicated +# It's because: +# 1. bun run has to have dynamic completions +# 2. there are global options +# 3. bun {install add remove} gets special options +# 4. I don't know how to write fish completions well +# Contributions very welcome!! + +function __fish__get_bun_bins + string split ' ' (bun getcompletes b) +end + +function __fish__get_bun_scripts + set -lx SHELL bash + set -lx MAX_DESCRIPTION_LEN 40 + string trim (string split '\n' (string split '\t' (bun getcompletes z))) +end + +function __fish__get_bun_packages + if test (commandline -ct) != "" + set -lx SHELL fish + string split ' ' (bun getcompletes a (commandline -ct)) + end +end + +function __history_completions + set -l tokens (commandline --current-process --tokenize) + history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | string replace -r \^$tokens[2]\\s\* "" | string split ' ' +end + +function __fish__get_bun_bun_js_files + string split ' ' (bun getcompletes j) +end + +set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global +set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't update package.json or save a lockfile" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependencies" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder" + +set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add update init pm x repl +set -l bun_builtin_cmds_accepting_flags create help bun upgrade discord run init link unlink pm x update + +function __bun_complete_bins_scripts --inherit-variable bun_builtin_cmds_without_run -d "Emit bun completions for bins and scripts" + # Do nothing if we already have a builtin subcommand, + # or any subcommand other than "run". + if __fish_seen_subcommand_from $bun_builtin_cmds_without_run + or not __fish_use_subcommand && not __fish_seen_subcommand_from run + return + end + # Do we already have a bin or script subcommand? + set -l bins (__fish__get_bun_bins) + if __fish_seen_subcommand_from $bins + return + end + # Scripts have descriptions appended with a tab separator. + # Strip off descriptions for the purposes of subcommand testing. + set -l scripts (__fish__get_bun_scripts) + if __fish_seen_subcommand_from (string split \t -f 1 -- $scripts) + return + end + # Emit scripts. + for script in $scripts + echo $script + end + # Emit binaries and JS files (but only if we're doing `bun run`). + if __fish_seen_subcommand_from run + for bin in $bins + echo "$bin"\t"package bin" + end + for file in (__fish__get_bun_bun_js_files) + echo "$file"\t"Bun.js" + end + end +end + + +# Clear existing completions +complete -e -c bun + +# Dynamically emit scripts and binaries +complete -c bun -f -a "(__bun_complete_bins_scripts)" + +# Complete flags if we have no subcommand or a flag-friendly one. +set -l flag_applies "__fish_use_subcommand; or __fish_seen_subcommand_from $bun_builtin_cmds_accepting_flags" +complete -c bun \ + -n $flag_applies --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths' +complete -c bun \ + -n $flag_applies --no-files -s 'p' -l 'port' -r -d 'Port number to start server from' +complete -c bun \ + -n $flag_applies --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"' +complete -c bun \ + -n $flag_applies --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react' +complete -c bun \ + -n $flag_applies --no-files -l 'use' -r -d 'Use a framework (ex: next)' +complete -c bun \ + -n $flag_applies --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime' + +# Complete dev and create as first subcommand. +complete -c bun \ + -n "__fish_use_subcommand" -a 'dev' -d 'Start dev server' +complete -c bun \ + -n "__fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template' + +# Complete "next" and "react" if we've seen "create". +complete -c bun \ + -n "__fish_seen_subcommand_from create" -a 'next' -d 'new Next.js project' + +complete -c bun \ + -n "__fish_seen_subcommand_from create" -a 'react' -d 'new React project' + +# Complete "upgrade" as first subcommand. +complete -c bun \ + -n "__fish_use_subcommand" -a 'upgrade' -d 'Upgrade bun to the latest version' -x +# Complete "-h/--help" unconditionally. +complete -c bun \ + -s "h" -l "help" -d 'See all commands and flags' -x + +# Complete "-v/--version" if we have no subcommand. +complete -c bun \ + -n "not __fish_use_subcommand" -l "version" -s "v" -d 'Bun\'s version' -x + +# Complete additional subcommands. +complete -c bun \ + -n "__fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x + + +complete -c bun \ + -n "__fish_use_subcommand" -a 'bun' -d 'Generate a new bundle' + + +complete -c bun \ + -n "__fish_seen_subcommand_from bun" -F -d 'Bundle this' + +complete -c bun \ + -n "__fish_seen_subcommand_from create; and __fish_seen_subcommand_from react next" -F -d "Create in directory" + + +complete -c bun \ + -n "__fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project' + +complete -c bun \ + -n "__fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json' + +complete -c bun \ + -n "__fish_use_subcommand" -a 'add' -F -d 'Add a package to package.json' + +complete -c bun \ + -n "__fish_use_subcommand" -a 'remove' -F -d 'Remove a package from package.json' + + +for i in (seq (count $bun_install_boolean_flags)) + complete -c bun \ + -n "__fish_seen_subcommand_from install add remove update" -l "$bun_install_boolean_flags[$i]" -d "$bun_install_boolean_flags_descriptions[$i]" +end + +complete -c bun \ + -n "__fish_seen_subcommand_from install add remove update" -l 'cwd' -d 'Change working directory' + +complete -c bun \ + -n "__fish_seen_subcommand_from install add remove update" -l 'cache-dir' -d 'Choose a cache directory (default: $HOME/.bun/install/cache)' + +complete -c bun \ + -n "__fish_seen_subcommand_from add" -d 'Popular' -a '(__fish__get_bun_packages)' + +complete -c bun \ + -n "__fish_seen_subcommand_from add" -d 'History' -a '(__history_completions)' + +complete -c bun \ + -n "__fish_seen_subcommand_from pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) cache;" -a 'bin ls cache hash hash-print hash-string' -f + +complete -c bun \ + -n "__fish_seen_subcommand_from pm; and __fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts);" -a 'rm' -f + +# Add built-in subcommands with descriptions. +complete -c bun -n "__fish_use_subcommand" -a "create" -f -d "Create a new project from a template" +complete -c bun -n "__fish_use_subcommand" -a "build bun" --require-parameter -F -d "Transpile and bundle one or more files" +complete -c bun -n "__fish_use_subcommand" -a "upgrade" -d "Upgrade Bun" +complete -c bun -n "__fish_use_subcommand" -a "run" -d "Run a script or package binary" +complete -c bun -n "__fish_use_subcommand" -a "install" -d "Install dependencies from package.json" -f +complete -c bun -n "__fish_use_subcommand" -a "remove" -d "Remove a dependency from package.json" -f +complete -c bun -n "__fish_use_subcommand" -a "add" -d "Add a dependency to package.json" -f +complete -c bun -n "__fish_use_subcommand" -a "init" -d "Initialize a Bun project in this directory" -f +complete -c bun -n "__fish_use_subcommand" -a "link" -d "Register or link a local npm package" -f +complete -c bun -n "__fish_use_subcommand" -a "unlink" -d "Unregister a local npm package" -f +complete -c bun -n "__fish_use_subcommand" -a "pm" -d "Additional package management utilities" -f +complete -c bun -n "__fish_use_subcommand" -a "x" -d "Execute a package binary, installing if needed" -f +complete -c bun -n "__fish_use_subcommand" -a "outdated" -d "Display the latest versions of outdated dependencies" -f +complete -c bun -n "__fish_use_subcommand" -a "update" -d "Update dependencies to their latest versions" -f +complete -c bun -n "__fish_use_subcommand" -a "publish" -d "Publish your package from local to npm" -f +complete -c bun -n "__fish_use_subcommand" -a "repl" -d "Start a REPL session with Bun" -f +complete -c bun -n "__fish_seen_subcommand_from repl" -s "e" -l "eval" -r -d "Evaluate argument as a script, then exit" -f +complete -c bun -n "__fish_seen_subcommand_from repl" -s "p" -l "print" -r -d "Evaluate argument as a script, print the result, then exit" -f +complete -c bun -n "__fish_seen_subcommand_from repl" -s "r" -l "preload" -r -d "Import a module before other modules are loaded" +complete -c bun -n "__fish_seen_subcommand_from repl" -l "smol" -d "Use less memory, but run garbage collection more often" -f +complete -c bun -n "__fish_seen_subcommand_from repl" -s "c" -l "config" -r -d "Specify path to Bun config file" +complete -c bun -n "__fish_seen_subcommand_from repl" -l "cwd" -r -d "Absolute path to resolve files & entry points from" +complete -c bun -n "__fish_seen_subcommand_from repl" -l "env-file" -r -d "Load environment variables from the specified file(s)" +complete -c bun -n "__fish_seen_subcommand_from repl" -l "no-env-file" -d "Disable automatic loading of .env files" -f diff --git a/home/river/config/fish/completions/copilot.fish b/home/river/config/fish/completions/copilot.fish new file mode 100644 index 0000000..37575d3 --- /dev/null +++ b/home/river/config/fish/completions/copilot.fish @@ -0,0 +1,98 @@ +# fish completion for copilot +# Generated by `copilot completion fish`. Do not edit by hand. + +complete -c copilot -n '__fish_use_subcommand' -f -a 'login' -d 'Authenticate with Copilot' +complete -c copilot -n '__fish_use_subcommand' -f -a 'help' -d 'Display help information' +complete -c copilot -n '__fish_use_subcommand' -f -a 'init' -d 'Initialize Copilot instructions' +complete -c copilot -n '__fish_use_subcommand' -f -a 'update' -d 'Download the latest version' +complete -c copilot -n '__fish_use_subcommand' -f -a 'version' -d 'Display version information' +complete -c copilot -n '__fish_use_subcommand' -f -a 'plugin' -d 'Manage plugins' +complete -c copilot -n '__fish_use_subcommand' -f -a 'mcp' -d 'Manage MCP servers' +complete -c copilot -n '__fish_use_subcommand' -f -a 'completion' -d 'Generate a shell completion script' +complete -c copilot -l version -s v -f -d 'show version information' +complete -c copilot -l interactive -s i -r -d 'Start interactive mode and automatically execute this prompt' +complete -c copilot -l prompt -s p -r -d 'Execute a prompt in non-interactive mode (exits after completion)' +complete -c copilot -l silent -s s -f -d 'Output only the agent response (no stats), useful for scripting with -p' +complete -c copilot -l model -r -d 'Set the AI model to use' +complete -c copilot -l effort -l reasoning-effort -r -d 'Set the reasoning effort level' -a 'low medium high xhigh' +complete -c copilot -l enable-reasoning-summaries -f -d 'Request reasoning summaries for OpenAI models' +complete -c copilot -l agent -r -d 'Specify a custom agent to use' +complete -c copilot -l resume -r -d 'Resume from a previous session (optionally specify session ID, task ID, or name; name matching is exact, case-insensitive)' +complete -c copilot -l continue -f -d 'Resume the most recent session' +complete -c copilot -l name -s n -r -d 'Set a name for the new session' +complete -c copilot -l connect -r -d 'Connect directly to a remote session (optionally specify session ID or task ID)' +complete -c copilot -l allow-all-tools -f -d 'Allow all tools to run automatically without confirmation; required for non-interactive mode' +complete -c copilot -l allow-all-paths -f -d 'Disable file path verification and allow access to any path' +complete -c copilot -l disallow-temp-dir -f -d 'Prevent automatic access to the system temporary directory' +complete -c copilot -l no-custom-instructions -f -d 'Disable loading of custom instructions from AGENTS.md and related files' +complete -c copilot -l no-auto-update -f -d 'Disable downloading CLI update automatically (disabled by default in CI environments)' +complete -c copilot -l no-ask-user -f -d 'Disable the ask_user tool (agent works autonomously without asking questions)' +complete -c copilot -l banner -f -d 'Show the startup banner' +complete -c copilot -l no-color -f -d 'Disable all color output' +complete -c copilot -l screen-reader -f -d 'Enable screen reader optimizations' +complete -c copilot -l plain-diff -f -d 'Disable rich diff rendering (syntax highlighting via diff tool specified by git config)' +complete -c copilot -s C -r -d 'Change working directory before doing anything else' +complete -c copilot -l log-dir -r -d 'Set log file directory (default: ~/.copilot/logs/)' +complete -c copilot -l log-level -r -d 'Set the log level' -a 'none error warning info debug all default' +complete -c copilot -l stream -r -d 'Enable or disable streaming mode' -a 'on off' +complete -c copilot -l output-format -r -d 'Output format: \'text\' (default) or \'json\' (JSONL, one JSON object per line)' -a 'text json' +complete -c copilot -l share -r -d 'Share session to markdown file after completion in non-interactive mode (default: ./copilot-session-.md)' +complete -c copilot -l share-gist -f -d 'Share session to a secret GitHub gist after completion in non-interactive mode' +complete -c copilot -l add-dir -r -d 'Add a directory to the allowed list for file access (can be used multiple times)' +complete -c copilot -l attachment -r -d 'Attach a file (image or native document) to the initial prompt; only valid in non-interactive mode (can be used multiple times)' +complete -c copilot -l disable-mcp-server -r -d 'Disable a specific MCP server (can be used multiple times)' +complete -c copilot -l disable-builtin-mcps -f -d 'Disable all built-in MCP servers (currently: github-mcp-server)' +complete -c copilot -l enable-all-github-mcp-tools -f -d 'Enable all GitHub MCP server tools instead of the default CLI subset. Overrides --add-github-mcp-toolset and --add-github-mcp-tool options.' +complete -c copilot -l add-github-mcp-toolset -r -d 'Add a toolset to enable for the GitHub MCP server instead of the default CLI subset (can be used multiple times). Use "all" for all toolsets.' +complete -c copilot -l add-github-mcp-tool -r -d 'Add a tool to enable for the GitHub MCP server instead of the default CLI subset (can be used multiple times). Use "*" for all tools.' +complete -c copilot -l plugin-dir -r -d 'Load a plugin from a local directory (can be used multiple times)' +complete -c copilot -l additional-mcp-config -r -d 'Additional MCP servers configuration as JSON string or file path (prefix with @) (can be used multiple times; augments config from ~/.copilot/mcp-config.json for this session)' +complete -c copilot -l allow-tool -r -d 'Tools the CLI has permission to use; will not prompt for permission' +complete -c copilot -l deny-tool -r -d 'Tools the CLI does not have permission to use; will not prompt for permission' +complete -c copilot -l available-tools -r -d 'Only these tools will be available to the model' +complete -c copilot -l excluded-tools -r -d 'These tools will not be available to the model' +complete -c copilot -l secret-env-vars -r -d 'Environment variable names whose values are stripped from shell and MCP server environments and redacted from output (e.g., --secret-env-vars=MY_KEY,OTHER_KEY)' +complete -c copilot -l allow-url -r -d 'Allow access to specific URLs or domains' +complete -c copilot -l deny-url -r -d 'Deny access to specific URLs or domains, takes precedence over --allow-url' +complete -c copilot -l allow-all-urls -f -d 'Allow access to all URLs without confirmation' +complete -c copilot -l allow-all -f -d 'Enable all permissions (equivalent to --allow-all-tools --allow-all-paths --allow-all-urls)' +complete -c copilot -l yolo -f -d 'Enable all permissions (equivalent to --allow-all-tools --allow-all-paths --allow-all-urls)' +complete -c copilot -l max-autopilot-continues -r -d 'Maximum number of continuation messages in autopilot mode' +complete -c copilot -l mode -r -d 'Set the initial agent mode' -a 'interactive plan autopilot' +complete -c copilot -l autopilot -f -d 'Start in autopilot mode' +complete -c copilot -l plan -f -d 'Start in plan mode' +complete -c copilot -l experimental -f -d 'Enable experimental features' +complete -c copilot -l no-experimental -f -d 'Disable experimental features' +complete -c copilot -l bash-env -r -d 'Enable BASH_ENV support for bash shells (on|off)' +complete -c copilot -l no-bash-env -f -d 'Disable BASH_ENV support for bash shells' +complete -c copilot -l mouse -r -d 'Enable mouse support in alt screen mode (on|off)' +complete -c copilot -l no-mouse -f -d 'Disable mouse support in alt screen mode' +complete -c copilot -l acp -f -d 'Start as Agent Client Protocol server' +complete -c copilot -l remote -f -d 'Enable remote control of your session from GitHub web and mobile' +complete -c copilot -l no-remote -f -d 'Disable remote control of your session from GitHub web and mobile' +complete -c copilot -n '__fish_seen_subcommand_from login' -l host -r -d 'GitHub host URL (default: https://github.com)' +complete -c copilot -n '__fish_seen_subcommand_from plugin' -f -a 'install' -d 'Install a plugin' +complete -c copilot -n '__fish_seen_subcommand_from plugin' -f -a 'uninstall' -d 'Uninstall a plugin' +complete -c copilot -n '__fish_seen_subcommand_from plugin' -f -a 'update' -d 'Update a plugin' +complete -c copilot -n '__fish_seen_subcommand_from plugin' -f -a 'list' -d 'List installed plugins' +complete -c copilot -n '__fish_seen_subcommand_from plugin' -f -a 'marketplace' -d 'Manage plugin marketplaces' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace' -f -a 'add' -d 'Add a marketplace' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace' -f -a 'remove' -d 'Remove a marketplace' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace' -f -a 'list' -d 'List registered marketplaces' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace' -f -a 'browse' -d 'Browse plugins in a marketplace' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace' -f -a 'update' -d 'Update marketplace plugin catalogs' +complete -c copilot -n '__fish_seen_subcommand_from plugin; and __fish_seen_subcommand_from marketplace; and __fish_seen_subcommand_from remove' -l force -s f -f -d 'Force removal even if plugins are installed' +complete -c copilot -n '__fish_seen_subcommand_from mcp' -f -a 'list' -d 'List configured MCP servers' +complete -c copilot -n '__fish_seen_subcommand_from mcp' -f -a 'get' -d 'Show server details' +complete -c copilot -n '__fish_seen_subcommand_from mcp' -f -a 'add' -d 'Add an MCP server' +complete -c copilot -n '__fish_seen_subcommand_from mcp' -f -a 'remove' -d 'Remove an MCP server' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from list' -l json -f -d 'Output as JSON' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from get' -l json -f -d 'Output as JSON' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from get' -l show-secrets -f -d 'Show full environment variable and header values (masked by default)' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l transport -r -d 'Server transport' -a 'stdio http sse' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l env -r -d 'Environment variable (KEY=VALUE, can be repeated)' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l header -r -d 'HTTP header for remote servers, can be repeated' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l tools -r -d 'Tool filter: "*" for all, comma-separated list, or "" for none' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l timeout -r -d 'Timeout in milliseconds' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l json -f -d 'Output added config as JSON' +complete -c copilot -n '__fish_seen_subcommand_from mcp; and __fish_seen_subcommand_from add' -l show-secrets -f -d 'Show full environment variable and header values in output, masked by default' diff --git a/home/river/config/fish/conf.d/fish_frozen_key_bindings.fish b/home/river/config/fish/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..495aee9 --- /dev/null +++ b/home/river/config/fish/conf.d/fish_frozen_key_bindings.fish @@ -0,0 +1,14 @@ +# This file was created by fish when upgrading to version 4.3, to migrate +# the 'fish_key_bindings' variable from its old default scope (universal) +# to its new default scope (global). We recommend you delete this file +# and configure key bindings in ~/.config/fish/config.fish if needed. + +# set --global fish_key_bindings fish_default_key_bindings + +# Prior to version 4.3, fish shipped an event handler that runs +# `set --universal fish_key_bindings fish_default_key_bindings` +# whenever the fish_key_bindings variable is erased. +# This means that as long as any fish < 4.3 is still running on this system, +# we cannot complete the migration. +# As a workaround, erase the universal variable at every shell startup. +set --erase --universal fish_key_bindings diff --git a/home/river/config/fish/config.fish b/home/river/config/fish/config.fish new file mode 100644 index 0000000..67de645 --- /dev/null +++ b/home/river/config/fish/config.fish @@ -0,0 +1,38 @@ +if status is-interactive + starship init fish | source + zoxide init fish | source + alias cd=z + alias docker=podman + alias ls='/etc/profiles/per-user/river/bin/eza --icons' + alias cat="/etc/profiles/per-user/river/bin/bat" + alias grep="/etc/profiles/per-user/river/bin/rg" + alias idea="v ~/.idea/idea.md" + + export PATH="$HOME/.npm-global/bin:$PATH" + + alias kubectx='kubectl config use-context' + alias nrs="sudo nixos-rebuild switch --flake /home/river/nixos-dotfiles#pc" + alias config="nvim /home/river/nixos-dotfiles/hosts/pc/configuration.nix" + alias v=nvim + alias y=yazi +end + +function fish_greeting + +end + +# bun +set --export BUN_INSTALL "$HOME/.bun" +set --export PATH $BUN_INSTALL/bin $PATH + +alias cea="bunx create-expo-app --no-install" + +export PATH="$HOME/.local/bin:$PATH" + +set -gx GPG_TTY (tty) +gpg-connect-agent updatestartuptty /bye >/dev/null + +# OpenClaw Completion +test -f "/home/river/.openclaw/completions/openclaw.fish"; and source "/home/river/.openclaw/completions/openclaw.fish" + +set -gx CLAUDE_CODE_MAX_OUTPUT_TOKENS 64000 diff --git a/home/river/config/fish/fish_variables b/home/river/config/fish/fish_variables new file mode 100644 index 0000000..ed8ec5b --- /dev/null +++ b/home/river/config/fish/fish_variables @@ -0,0 +1,4 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:4300 +SETUVAR fish_user_paths:/opt/homebrew/opt/llvm/bin diff --git a/home/river/config/fish/functions/clone-starter.fish b/home/river/config/fish/functions/clone-starter.fish new file mode 100644 index 0000000..b623bdc --- /dev/null +++ b/home/river/config/fish/functions/clone-starter.fish @@ -0,0 +1,19 @@ +function clone-starter + if test (count $argv) -eq 0 + echo "Usage: clone-starter " + return 1 + end + + set project_name $argv[1] + + git clone https://github.com/pure-sagacity/turborepo-starter-project.git $project_name + + if test $status -ne 0 + echo "Error: git clone failed" + return 1 + end + + rm -rf $project_name/.git + + echo "✓ Created $project_name (git history removed)" +end diff --git a/home/river/config/fish/functions/copy.fish b/home/river/config/fish/functions/copy.fish new file mode 100644 index 0000000..0a99d71 --- /dev/null +++ b/home/river/config/fish/functions/copy.fish @@ -0,0 +1,20 @@ +function copy + if test (count $argv) -eq 0 + echo "Usage: copy " + return 1 + end + + if not test -f $argv[1] + echo "Error: File '$argv[1]' not found" + return 1 + end + + cat $argv[1] | wl-copy + + if test $status -eq 0 + echo "Copied contents of '$argv[1]' to clipboard" + else + echo "Error: Failed to copy to clipboard" + return 1 + end +end diff --git a/home/river/config/fish/functions/copy_secret.fish b/home/river/config/fish/functions/copy_secret.fish new file mode 100644 index 0000000..b413885 --- /dev/null +++ b/home/river/config/fish/functions/copy_secret.fish @@ -0,0 +1,5 @@ +function generateSecret + openssl rand -base64 32 | pbcopy + + echo "Copied secret to clipboard!" +end diff --git a/home/river/config/fish/functions/wipedns.fish b/home/river/config/fish/functions/wipedns.fish new file mode 100644 index 0000000..ee449fd --- /dev/null +++ b/home/river/config/fish/functions/wipedns.fish @@ -0,0 +1,4 @@ +function wipedns + sudo dscacheutil -flushcache + sudo killall -HUP mDNSResponder +end diff --git a/home/river/config/ghostty/Ghostty.icns b/home/river/config/ghostty/Ghostty.icns new file mode 100644 index 0000000..b23ef44 Binary files /dev/null and b/home/river/config/ghostty/Ghostty.icns differ diff --git a/home/river/config/ghostty/config b/home/river/config/ghostty/config new file mode 100644 index 0000000..0805a52 --- /dev/null +++ b/home/river/config/ghostty/config @@ -0,0 +1,8 @@ +window-padding-x = 2 + +font-family = "JetBrains Mono NL" + +#theme = Catppuccin Mocha +theme = Argonaut + +font-size = 16 diff --git a/home/river/config/ghostty/themes/catppuccin-frappe.conf b/home/river/config/ghostty/themes/catppuccin-frappe.conf new file mode 100644 index 0000000..f2ddad5 --- /dev/null +++ b/home/river/config/ghostty/themes/catppuccin-frappe.conf @@ -0,0 +1,23 @@ +palette = 0=#51576d +palette = 1=#e78284 +palette = 2=#a6d189 +palette = 3=#e5c890 +palette = 4=#8caaee +palette = 5=#f4b8e4 +palette = 6=#81c8be +palette = 7=#a5adce +palette = 8=#626880 +palette = 9=#e78284 +palette = 10=#a6d189 +palette = 11=#e5c890 +palette = 12=#8caaee +palette = 13=#f4b8e4 +palette = 14=#81c8be +palette = 15=#b5bfe2 +background = 303446 +foreground = c6d0f5 +cursor-color = f2d5cf +cursor-text = 232634 +selection-background = 44495d +selection-foreground = c6d0f5 +split-divider-color = 414559 diff --git a/home/river/config/ghostty/themes/catppuccin-latte.conf b/home/river/config/ghostty/themes/catppuccin-latte.conf new file mode 100644 index 0000000..a559642 --- /dev/null +++ b/home/river/config/ghostty/themes/catppuccin-latte.conf @@ -0,0 +1,23 @@ +palette = 0=#5c5f77 +palette = 1=#d20f39 +palette = 2=#40a02b +palette = 3=#df8e1d +palette = 4=#1e66f5 +palette = 5=#ea76cb +palette = 6=#179299 +palette = 7=#acb0be +palette = 8=#6c6f85 +palette = 9=#d20f39 +palette = 10=#40a02b +palette = 11=#df8e1d +palette = 12=#1e66f5 +palette = 13=#ea76cb +palette = 14=#179299 +palette = 15=#bcc0cc +background = eff1f5 +foreground = 4c4f69 +cursor-color = dc8a78 +cursor-text = eff1f5 +selection-background = d8dae1 +selection-foreground = 4c4f69 +split-divider-color = ccd0da diff --git a/home/river/config/ghostty/themes/catppuccin-macchiato.conf b/home/river/config/ghostty/themes/catppuccin-macchiato.conf new file mode 100644 index 0000000..d685700 --- /dev/null +++ b/home/river/config/ghostty/themes/catppuccin-macchiato.conf @@ -0,0 +1,23 @@ +palette = 0=#494d64 +palette = 1=#ed8796 +palette = 2=#a6da95 +palette = 3=#eed49f +palette = 4=#8aadf4 +palette = 5=#f5bde6 +palette = 6=#8bd5ca +palette = 7=#a5adcb +palette = 8=#5b6078 +palette = 9=#ed8796 +palette = 10=#a6da95 +palette = 11=#eed49f +palette = 12=#8aadf4 +palette = 13=#f5bde6 +palette = 14=#8bd5ca +palette = 15=#b8c0e0 +background = 24273a +foreground = cad3f5 +cursor-color = f4dbd6 +cursor-text = 181926 +selection-background = 3a3e53 +selection-foreground = cad3f5 +split-divider-color = 363a4f diff --git a/home/river/config/ghostty/themes/catppuccin-mocha.conf b/home/river/config/ghostty/themes/catppuccin-mocha.conf new file mode 100644 index 0000000..e03e26d --- /dev/null +++ b/home/river/config/ghostty/themes/catppuccin-mocha.conf @@ -0,0 +1,23 @@ +palette = 0=#45475a +palette = 1=#f38ba8 +palette = 2=#a6e3a1 +palette = 3=#f9e2af +palette = 4=#89b4fa +palette = 5=#f5c2e7 +palette = 6=#94e2d5 +palette = 7=#a6adc8 +palette = 8=#585b70 +palette = 9=#f38ba8 +palette = 10=#a6e3a1 +palette = 11=#f9e2af +palette = 12=#89b4fa +palette = 13=#f5c2e7 +palette = 14=#94e2d5 +palette = 15=#bac2de +background = 1e1e2e +foreground = cdd6f4 +cursor-color = f5e0dc +cursor-text = 11111b +selection-background = 353749 +selection-foreground = cdd6f4 +split-divider-color = 313244 diff --git a/home/river/config/hypr/autostart.lua b/home/river/config/hypr/autostart.lua new file mode 100644 index 0000000..f5a09cd --- /dev/null +++ b/home/river/config/hypr/autostart.lua @@ -0,0 +1,9 @@ +local config = require("variables") + +hl.on("hyprland.start", function () + hl.exec_cmd("wayvnc 0.0.0.0 5900") + hl.exec_cmd("nm-applet") + hl.exec_cmd(config.terminal) + hl.exec_cmd(config.wallpaper_cmd) + hl.exec_cmd(config.bar_cmd) +end) \ No newline at end of file diff --git a/home/river/config/hypr/decoration.lua b/home/river/config/hypr/decoration.lua new file mode 100644 index 0000000..f89d4b7 --- /dev/null +++ b/home/river/config/hypr/decoration.lua @@ -0,0 +1,21 @@ +hl.config({ + decoration = { + rounding = 0, + rounding_power = 0, + + -- Change transparency of focused and unfocused windows + active_opacity = 0.9, + inactive_opacity = 0.8, + + shadow = { + enabled = false, + }, + + blur = { + enabled = true, + size = 3, + passes = 1, + vibrancy = 0.1696, + }, + }, +}) diff --git a/home/river/config/hypr/general.lua b/home/river/config/hypr/general.lua new file mode 100644 index 0000000..9d456bf --- /dev/null +++ b/home/river/config/hypr/general.lua @@ -0,0 +1,29 @@ +local theme = require("themes") + +hl.config({ + general = { + gaps_in = 2, + gaps_out = 10, + + border_size = 2, + + col = { + active_border = theme.primary, + inactive_border = theme.secondary, + }, + + resize_on_border = false, + + allow_tearing = false, + + layout = "dwindle", + }, + + animations = { + enabled = true, + }, + + dwindle = { + preserve_split = true, + } +}) \ No newline at end of file diff --git a/home/river/config/hypr/hyprland.lua b/home/river/config/hypr/hyprland.lua new file mode 100644 index 0000000..c6d2b3b --- /dev/null +++ b/home/river/config/hypr/hyprland.lua @@ -0,0 +1,8 @@ +require("autostart") +require("keybinds") +require("monitor") +require("decoration") +require("general") +--require("smart-gaps") +require("inputs") + diff --git a/home/river/config/hypr/inputs.lua b/home/river/config/hypr/inputs.lua new file mode 100644 index 0000000..b6e8e80 --- /dev/null +++ b/home/river/config/hypr/inputs.lua @@ -0,0 +1,23 @@ +hl.config({ + input = { + kb_layout = "us", + kb_variant = "", + kb_model = "", + kb_options = "", + kb_rules = "", + + follow_mouse = 1, + + sensitivity = 0, + + touchpad = { + natural_scroll = true, + }, + }, +}) + +hl.gesture({ + fingers = 3, + direction = "horizontal", + action = "workspace" +}) \ No newline at end of file diff --git a/home/river/config/hypr/keybinds.lua b/home/river/config/hypr/keybinds.lua new file mode 100644 index 0000000..86d1cd3 --- /dev/null +++ b/home/river/config/hypr/keybinds.lua @@ -0,0 +1,69 @@ +local config = require("variables") + +local mainMod = "SUPER" + +-- Application Binds +hl.bind(mainMod .. " + Return", hl.dsp.exec_cmd(config.terminal)) +hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(config.file_manager)) +hl.bind("ALT + SPACE", hl.dsp.exec_cmd(config.menu)) +hl.bind(mainMod .. " + B", hl.dsp.exec_cmd(config.browser)) + +hl.bind(mainMod .. " + Q", hl.dsp.window.close()) +hl.bind( + mainMod .. " + Escape", + hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'") +) +hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" })) +hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit")) +hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" })) +hl.bind(mainMod .. " + I", hl.dsp.exec_cmd('ghostty -e bash -c "ollama"')) +hl.bind(mainMod .. " + N", hl.dsp.exec_cmd('ghostty -e bash -c "nmtui"')) + +-- Window Binds +hl.bind(mainMod .. " + left", hl.dsp.focus({ direction = "left" })) +hl.bind(mainMod .. " + right", hl.dsp.focus({ direction = "right" })) +hl.bind(mainMod .. " + up", hl.dsp.focus({ direction = "up" })) +hl.bind(mainMod .. " + down", hl.dsp.focus({ direction = "down" })) +hl.bind(mainMod .. " + SHIFT + LEFT", hl.dsp.window.move({ direction = "left" })) +hl.bind(mainMod .. " + SHIFT + RIGHT", hl.dsp.window.move({ direction = "right" })) +hl.bind(mainMod .. " + SHIFT + UP", hl.dsp.window.move({ direction = "up" })) +hl.bind(mainMod .. " + SHIFT + DOWN", hl.dsp.window.move({ direction = "down" })) + +-- Workspace Binds +for i = 1, 10 do + local key = i % 10 + hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i })) + hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) +end + +-- Resize Windows +hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true }) +hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) + +-- Screenshot +hl.bind(mainMod .. " + SHIFT + S", hl.dsp.exec_cmd(config.screen_shot_cmd)) + +-- Laptop Multimedia Keys +hl.bind( + "XF86AudioRaiseVolume", + hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioLowerVolume", + hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioMute", + hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioMicMute", + hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), + { locked = true, repeating = true } +) +hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true }) +hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true }) + diff --git a/home/river/config/hypr/monitor.lua b/home/river/config/hypr/monitor.lua new file mode 100644 index 0000000..5261ab1 --- /dev/null +++ b/home/river/config/hypr/monitor.lua @@ -0,0 +1,6 @@ +hl.monitor({ + output = "DP-2", + mode = "2560x1440@165", + position = "0x0", + scale = 1, +}) \ No newline at end of file diff --git a/home/river/config/hypr/smart-gaps.lua b/home/river/config/hypr/smart-gaps.lua new file mode 100644 index 0000000..9f958a9 --- /dev/null +++ b/home/river/config/hypr/smart-gaps.lua @@ -0,0 +1,14 @@ +hl.workspace_rule({ workspace = "w[tv1]", gaps_out = 0, gaps_in = 0 }) +hl.workspace_rule({ workspace = "f[1]", gaps_out = 0, gaps_in = 0 }) +hl.window_rule({ + name = "no-gaps-wtv1", + match = { float = false, workspace = "w[tv1]" }, + border_size = 0, + rounding = 0, +}) +hl.window_rule({ + name = "no-gaps-f1", + match = { float = false, workspace = "f[1]" }, + border_size = 0, + rounding = 0, +}) \ No newline at end of file diff --git a/home/river/config/hypr/themes.lua b/home/river/config/hypr/themes.lua new file mode 100644 index 0000000..7348945 --- /dev/null +++ b/home/river/config/hypr/themes.lua @@ -0,0 +1,17 @@ +local normal = { + primary = "rgba(33ccffee)", + secondary = "rgba(595959aa)", +}; + +local gray_blue = { + primary = "rgba(D9F7FAaa)", + secondary = "rgba(D8DDDEaa)", +} + +local purple = { + primary = "rgba(9fa1ffff)", + secondary = "rgba(b5baffff)" +} + +-- Change the option: +return purple \ No newline at end of file diff --git a/home/river/config/hypr/variables.lua b/home/river/config/hypr/variables.lua new file mode 100644 index 0000000..927f47b --- /dev/null +++ b/home/river/config/hypr/variables.lua @@ -0,0 +1,19 @@ +local function wallpaper_util(wallpaper_path) + local ext = wallpaper_path:lower():match("^.+%.([a-z0-9]+)$") + + if ext == "mp4" or ext == "mkv" or ext == "webm" or ext == "mov" then + return string.format('mpvpaper ALL "%s" --mpv-options="loop-file=inf no-audio"', wallpaper_path) + end + + return string.format('awww-daemon & awww img "%s"', wallpaper_path) +end + +return { + terminal = "ghostty", + file_manager = "dolphin", + screen_shot_cmd = "hyprshot -m region -o ~/Pictures/Screenshots", + menu = "rofi -show drun", + wallpaper_cmd = wallpaper_util("/home/river/Pictures/Wallpapers/bg.png"), + browser = "brave", + bar_cmd = "waybar", +} diff --git a/home/river/config/nvim/.gitignore b/home/river/config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/home/river/config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/home/river/config/nvim/.neoconf.json b/home/river/config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/home/river/config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/home/river/config/nvim/LICENSE b/home/river/config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/home/river/config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/home/river/config/nvim/init.lua b/home/river/config/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/home/river/config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/home/river/config/nvim/lazy-lock.json b/home/river/config/nvim/lazy-lock.json new file mode 100644 index 0000000..c98779b --- /dev/null +++ b/home/river/config/nvim/lazy-lock.json @@ -0,0 +1,45 @@ +{ + "LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" }, + "SchemaStore.nvim": { "branch": "main", "commit": "1c28767e3a7f3c9b7c5cc66e7f16b268c964e2c9" }, + "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" }, + "conform.nvim": { "branch": "master", "commit": "0451b96660e8ca7dd8897718bad63932cf59255a" }, + "copilot.lua": { "branch": "master", "commit": "7e9c269bf40dea86b44e64bd746f1808e991e419" }, + "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" }, + "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" }, + "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, + "grug-far.nvim": { "branch": "main", "commit": "a5875fde04e2940a5060f8df9c453bcfcfe0a5c0" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, + "litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" }, + "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "eaa34887d444cb002e1b165fac399ae4bbc771f7" }, + "mason.nvim": { "branch": "main", "commit": "8e921c2b68571e978db5d4d3fef9c9a7f8755473" }, + "mini.ai": { "branch": "main", "commit": "a783ce6e1a5b3bc90519f20b51f4a5f6702734af" }, + "mini.hipatterns": { "branch": "main", "commit": "35b632f6c138d720f29de87476361af44bed2198" }, + "mini.icons": { "branch": "main", "commit": "9c7b1b90b15bdd69c52f6e31889dbc9987c30ec4" }, + "mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "665525810630701b84181e4d9eefd24b49845b29" }, + "nvim-lspconfig": { "branch": "master", "commit": "8f7e64066e2641d5e7d494962a9c7051e3d38dd5" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "rustaceanvim": { "branch": "main", "commit": "f5c1bf138571442bfda96a2bf45239e009264a6e" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, + "venv-selector.nvim": { "branch": "main", "commit": "bcb2f58533c59b01565285eba49693f00bc460f5" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, + "yanky.nvim": { "branch": "main", "commit": "784188e0a7363e762e53140f39124d786aec0832" } +} diff --git a/home/river/config/nvim/lazyvim.json b/home/river/config/nvim/lazyvim.json new file mode 100644 index 0000000..11ae117 --- /dev/null +++ b/home/river/config/nvim/lazyvim.json @@ -0,0 +1,25 @@ +{ + "extras": [ + "lazyvim.plugins.extras.ai.copilot", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.editor.dial", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.python", + "lazyvim.plugins.extras.lang.rust", + "lazyvim.plugins.extras.lang.tailwind", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.typescript", + "lazyvim.plugins.extras.linting.eslint", + "lazyvim.plugins.extras.util.dot", + "lazyvim.plugins.extras.util.gh", + "lazyvim.plugins.extras.util.mini-hipatterns" + ], + "install_version": 8, + "news": { + "NEWS.md": "11866" + }, + "version": 8 +} \ No newline at end of file diff --git a/home/river/config/nvim/lua/config/autocmds.lua b/home/river/config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/home/river/config/nvim/lua/config/autocmds.lua @@ -0,0 +1,8 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/home/river/config/nvim/lua/config/keymaps.lua b/home/river/config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/home/river/config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/home/river/config/nvim/lua/config/lazy.lua b/home/river/config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..d73bfa1 --- /dev/null +++ b/home/river/config/nvim/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/home/river/config/nvim/lua/config/options.lua b/home/river/config/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ea1454 --- /dev/null +++ b/home/river/config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/home/river/config/nvim/lua/plugins/catppuccin.lua b/home/river/config/nvim/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..186b56b --- /dev/null +++ b/home/river/config/nvim/lua/plugins/catppuccin.lua @@ -0,0 +1,20 @@ +return { + -- Catppuccin theme with transparency + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + flavour = "frappe", -- Choose "latte", "frappe", "macchiato", or "mocha" + transparent_background = true, + custom_highlights = function(colors) + return { + VertSplit = { fg = colors.overlay0 }, + } + end, + }, + }, + + -- Override LazyVim's default colorscheme + { "LazyVim/LazyVim", opts = { colorscheme = "catppuccin" } }, +} diff --git a/home/river/config/nvim/lua/plugins/example.lua b/home/river/config/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..17f53d6 --- /dev/null +++ b/home/river/config/nvim/lua/plugins/example.lua @@ -0,0 +1,197 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, +} diff --git a/home/river/config/nvim/lua/plugins/lsp.lua b/home/river/config/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..ae5894f --- /dev/null +++ b/home/river/config/nvim/lua/plugins/lsp.lua @@ -0,0 +1,31 @@ +return { + { + "neovim/nvim-lspconfig", + opts = { + servers = { + yamlls = { + settings = { + yaml = { + schemas = {}, -- This clears the auto-detected schemas (like K8s) + completion = false, -- This turns off the completion for YAML + }, + }, + }, + nixd = {}, + }, + }, + setup = { + cmd = { "nixd" }, + settings = { + nixd = { + nixpkgs = { + expr = "import { }", + }, + formatting = { + command = { "nixfmt" }, + }, + }, + }, + }, + }, +} diff --git a/home/river/config/nvim/stylua.toml b/home/river/config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/home/river/config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.editorconfig b/home/river/config/tmux/plugins/catppuccin/tmux/.editorconfig new file mode 100644 index 0000000..d86ac02 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.editorconfig @@ -0,0 +1,34 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# EditorConfig is awesome: https://EditorConfig.org + +root = true + +[*] +charset = utf-8 +indent_size = 2 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# go +[*.go] +indent_style = tab +indent_size = 4 + +# python +[*.{ini,py,py.tpl,rst}] +indent_size = 4 + +# rust +[*.rs] +indent_size = 4 + +# documentation, utils +[*.{md,mdx,diff}] +trim_trailing_whitespace = false + +# windows shell scripts +[*.{cmd,bat,ps1}] +end_of_line = crlf diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/bug.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 0000000..75d80a8 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,53 @@ +name: Bug Report +description: Report your bugs with the theme here! +labels: [bug] +body: + - type: checkboxes + attributes: + label: I am not requesting help with my configuration and believe something is genuinely broken. + description: Please open a [discussion](https://github.com/catppuccin/tmux/discussions/new?category=help) if you need support. + options: + - label: Something is really actually broken. + required: true + - type: checkboxes + attributes: + label: Is there an existing issue outlining your problem? + description: Please search to see if an issue already exists for your problem. + options: + - label: I have searched the existing issues and [troubleshooting guide](https://github.com/catppuccin/tmux/blob/main/docs/guides/troubleshooting.md), and they do not solve my problem. + required: true + - type: textarea + attributes: + label: Describe your problem. + description: Also tell us, what do you expect to see? + placeholder: The status bar is bright green, I expect it to be mantle. + validations: + required: true + - type: textarea + attributes: + label: Paste your configuration. + description: Provide us with the contents of your `~/.tmux.conf` file. + validations: + required: true + - type: textarea + attributes: + label: Attach screenshots. + description: If applicable, attach screenshots which clearly highlight the issue. + - type: input + attributes: + label: What tmux version are you seeing the issue on? + description: "You can find your version by running `tmux -V`" + placeholder: tmux 3.5a + validations: + required: true + - type: input + attributes: + label: What shell are you using? + description: "You can find your shell by running `echo $SHELL`" + placeholder: bash + validations: + required: true + - type: textarea + attributes: + label: Any additional comments? + description: Add any information that hasn't been covered in the previous sections! diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/config.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..8da1a2e --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,11 @@ +blank_issues_enabled: false +contact_links: + - name: Get Support + url: https://github.com/catppuccin/tmux/discussions/new?category=help + about: Need help tweaking your Catppuccin tmux configuration? Ask questions in GitHub Discussions! + - name: Show & Tell + url: https://github.com/catppuccin/tmux/discussions/new?category=show-tell + about: Want to showcase your customised Catppuccin tmux configuration? Show it off in GitHub Discussions! + - name: Community Discord + url: https://discord.com/servers/catppuccin-907385605422448742 + about: Chat to other community members! diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/enhancement.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/enhancement.yml new file mode 100644 index 0000000..1e2b053 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/enhancement.yml @@ -0,0 +1,18 @@ +name: Enhancement Issue +description: Request improvements to the theme here! +labels: [enhancement] +body: + - type: checkboxes + attributes: + label: Is there an existing issue outlining your improvement? + description: Please search to see if your improvement has already been raised as an issue. + options: + - label: I have searched the existing issues and my improvement has not been raised yet. + required: true + - type: textarea + attributes: + label: What would you like to see added and/or changed? + description: Make sure to mention why you think this is an improvement! + placeholder: I'd like to have an extra configuration option for... + validations: + required: true diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/meta.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/meta.yml new file mode 100644 index 0000000..f471d4a --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/ISSUE_TEMPLATE/meta.yml @@ -0,0 +1,18 @@ +name: Meta Issue +description: Raise any issue regarding the repository here! +labels: [meta] +body: + - type: checkboxes + attributes: + label: Is there an existing issue outlining your problem? + description: Please search to see if an issue already exists for your problem. + options: + - label: I have searched the existing issues and they do not solve my problem. + required: true + - type: textarea + attributes: + label: Describe your issue. + description: Bugs should be raised under a [Bug Report](https://github.com/catppuccin/tmux/issues/new?assignees=&labels=bug&template=bug.yml). + placeholder: The README is missing crucial information such as... + validations: + required: true diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-config.json b/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-config.json new file mode 100644 index 0000000..0a2c059 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-config.json @@ -0,0 +1,27 @@ +{ + "last-release-sha": "408c02ccf44d0a59a7a63ce2b65c5c29982c5c0e", + "packages": { + ".": { + "release-type": "simple", + "changelog-path": "CHANGELOG.md", + "bump-minor-pre-major": true, + "bump-patch-for-minor-pre-major": false, + "draft": false, + "extra-files": [ + "README.md", + "docs/tutorials/01-getting-started.md" + ] + } + }, + "changelog-sections": [ + { "type": "feat", "section": "Added" }, + { "type": "change", "section": "Changed" }, + { "type": "fix", "section": "Fixed" }, + { "type": "deprecate", "section": "Deprecated" }, + { "type": "remove", "section": "Removed" }, + { "type": "perf", "section": "Performance Improvements" }, + { "type": "revert", "section": "Reverts" }, + { "type": "docs", "section": "Documentation" } + ], + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" +} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-manifest.json b/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-manifest.json new file mode 100644 index 0000000..9965a34 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "2.3.0" +} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/release.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/release.yml new file mode 100644 index 0000000..911cf48 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/release.yml @@ -0,0 +1,45 @@ +on: + push: + branches: + - main + +permissions: + contents: write + pull-requests: write + +name: release-please + +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - uses: googleapis/release-please-action@v4 + id: release + with: + token: ${{ secrets.GITHUB_TOKEN }} + config-file: .github/release-please-config.json + manifest-file: .github/release-please-manifest.json + - uses: actions/checkout@v6 + - name: tag major and minor versions + if: ${{ steps.release.outputs.release_created }} + run: | + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + + git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/googleapis/release-please-action.git" + + git tag -d latest || true + git tag -d v${{ steps.release.outputs.major }} || true + git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true + + git push origin :latest || true + git push origin :v${{ steps.release.outputs.major }} || true + git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true + + git tag -a latest -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}" + git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}" + git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}" + + git push origin latest + git push origin v${{ steps.release.outputs.major }} + git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/shellcheck.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/shellcheck.yml new file mode 100644 index 0000000..9d7289d --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/shellcheck.yml @@ -0,0 +1,32 @@ +--- +name: Shellcheck +permissions: + contents: read +on: + pull_request: + paths-ignore: + - "*.md" + - "assets/**" + push: + paths-ignore: + - "*.md" + - "assets/**" + branches: + - main + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + shellcheck: + name: Shellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - name: Run ShellCheck + uses: ludeeus/action-shellcheck@master + with: + additional_files: "catppuccin.tmux" + env: + SHELLCHECK_OPTS: "-a" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/test.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/test.yml new file mode 100644 index 0000000..b4c8e51 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/test.yml @@ -0,0 +1,35 @@ +--- +name: Tests +permissions: + contents: read +on: + pull_request: + paths-ignore: + - "*.md" + - "assets/**" + push: + paths-ignore: + - "*.md" + - "assets/**" + branches: + - main + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + ubuntu: + name: Test + runs-on: ubuntu-24.04 + + steps: + - name: Install tmux + run: sudo apt update && sudo apt install -y --allow-downgrades tmux=3.4-1build1 + - uses: actions/checkout@v6 + - name: Run Tests + shell: bash + run: | + bash --version + tmux -V + ./run_tests.sh diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/whiskers-check.yml b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/whiskers-check.yml new file mode 100644 index 0000000..1fc7be9 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.github/workflows/whiskers-check.yml @@ -0,0 +1,15 @@ +name: whiskers + +on: + workflow_dispatch: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + run: + uses: catppuccin/actions/.github/workflows/whiskers-check.yml@v1 + with: + args: tmux.tera + secrets: inherit diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.gitignore b/home/river/config/tmux/plugins/catppuccin/tmux/.gitignore new file mode 100644 index 0000000..beab4f1 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.gitignore @@ -0,0 +1,3 @@ +custom +!custom/README.md +!custom/example.sh diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc b/home/river/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc new file mode 100644 index 0000000..6fb7438 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc @@ -0,0 +1,15 @@ +{ + "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/v0.35.0/schema/markdownlint-config-schema.json", + "line-length": { + "code_block_line_length": 120, + "tables": false + }, + "no-inline-html": { + "allowed_elements": ["details", "summary", "img", "p", "a", "h3"] + }, + "first-line-heading": false, + "no-alt-text": false, + "code-block-style": { + "style": "consistent" + } +} \ No newline at end of file diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/.shellcheckrc b/home/river/config/tmux/plugins/catppuccin/tmux/.shellcheckrc new file mode 100644 index 0000000..3f7e5f5 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/.shellcheckrc @@ -0,0 +1,6 @@ +shell=bash + +# TODO: Find a way to declare color variables +disable=SC2154 + +external-sources=true diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md b/home/river/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md new file mode 100644 index 0000000..766f0b6 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md @@ -0,0 +1,222 @@ +# Changelog + +## [2.3.0](https://github.com/catppuccin/tmux/compare/v2.2.2...v2.3.0) (2026-04-08) + + +### Added + +* add RAM status module ([#570](https://github.com/catppuccin/tmux/issues/570)) ([4a9165b](https://github.com/catppuccin/tmux/commit/4a9165b2b029b57bbccc3bab488c3c8474a3056e)) + +## [2.2.2](https://github.com/catppuccin/tmux/compare/v2.2.1...v2.2.2) (2026-04-08) + + +### Fixed + +* Update status-line.md ([#528](https://github.com/catppuccin/tmux/issues/528)) ([4fb9e8d](https://github.com/catppuccin/tmux/commit/4fb9e8d10ed381981920054df8a449165efd23a6)) + +## [2.2.1](https://github.com/catppuccin/tmux/compare/v2.2.0...v2.2.1) (2026-04-07) + + +### Documentation + +* **03-resetting-theme:** remove tip ([#584](https://github.com/catppuccin/tmux/issues/584)) ([f451db9](https://github.com/catppuccin/tmux/commit/f451db96c8e4e7d9cdea7bbb0b57c149bfb40e28)) + +## [2.2.0](https://github.com/catppuccin/tmux/compare/v2.1.3...v2.2.0) (2026-04-07) + + +### Added + +* add a "reset" option to clear options on plugin load ([#500](https://github.com/catppuccin/tmux/issues/500)) ([556fea5](https://github.com/catppuccin/tmux/commit/556fea52bb5d827a42740bc605de4f1d8a0440de)) + + +### Fixed + +* change tmux plugin kube module uses ([#531](https://github.com/catppuccin/tmux/issues/531)) ([ef94979](https://github.com/catppuccin/tmux/commit/ef9497982032a9494f4bf3ad276fba58b61bd7e6)) +* **theme:** Cleanup duplicate palette theme color ([#562](https://github.com/catppuccin/tmux/issues/562)) ([efeb958](https://github.com/catppuccin/tmux/commit/efeb9583cec0bc7486caedbc309df0ea9505d332)) + + +### Documentation + +* clarify custom-status should be added before plugin is loaded ([#551](https://github.com/catppuccin/tmux/issues/551)) ([8b0b915](https://github.com/catppuccin/tmux/commit/8b0b9150f9d7dee2a4b70cdb50876ba7fd6d674a)) +* status-line left/right mixup ([#542](https://github.com/catppuccin/tmux/issues/542)) ([9d21d7c](https://github.com/catppuccin/tmux/commit/9d21d7ccd50df82bd732be2850ce2798e78b6391)) +* stop recommending `-o` ([#524](https://github.com/catppuccin/tmux/issues/524)) ([14a546f](https://github.com/catppuccin/tmux/commit/14a546fb64dc1141e5d02bac2185d8c1fd530d6a)) + +## [2.1.3](https://github.com/catppuccin/tmux/compare/v2.1.2...v2.1.3) (2025-03-23) + + +### Fixed + +* make the space in [@catppuccin](https://github.com/catppuccin)_window_flags_icon_format user-configurable ([#465](https://github.com/catppuccin/tmux/issues/465)) ([320e184](https://github.com/catppuccin/tmux/commit/320e184a31d0825cb4f4af550492cbdff2fc3ffc)) +* pomodoro plugin icon color - use a defined color (peach) rather than orange ([#466](https://github.com/catppuccin/tmux/issues/466)) ([da2143d](https://github.com/catppuccin/tmux/commit/da2143d2a6baf7951eda302678a57a171a78d78a)) +* use plain awk for the load status line module, removing a dep ([#508](https://github.com/catppuccin/tmux/issues/508)) ([c21246e](https://github.com/catppuccin/tmux/commit/c21246ed58e867c9594dc687c5e92b229bc1760d)) +* use the correct option for the left separator for the current window ([#450](https://github.com/catppuccin/tmux/issues/450)) ([ba9bd88](https://github.com/catppuccin/tmux/commit/ba9bd88c98c81f25060f051ed983e40f82fdd3ba)) + + +### Documentation + +* add a troubleshooting guide ([#473](https://github.com/catppuccin/tmux/issues/473)) ([ab647cf](https://github.com/catppuccin/tmux/commit/ab647cf91501cebbd3f967da2b488a5f87614e6b)) +* Correct the plugin path for TPM in the readme ([#492](https://github.com/catppuccin/tmux/issues/492)) ([ee8970d](https://github.com/catppuccin/tmux/commit/ee8970ddb5dd60fd93e254de9a30ed8277c7ccc7)) +* **README:** fix codeblock indentation ([#489](https://github.com/catppuccin/tmux/issues/489)) ([cce60ab](https://github.com/catppuccin/tmux/commit/cce60abc8efd7a641a5fcc8001e6b3ae61e8d5fe)) +* **README:** update migration guide issue link ([#493](https://github.com/catppuccin/tmux/issues/493)) ([073ee54](https://github.com/catppuccin/tmux/commit/073ee54992c59fedcc29c1525a26f95691f0ae1f)) + +## [2.1.2](https://github.com/catppuccin/tmux/compare/v2.1.1...v2.1.2) (2024-12-08) + + +### Fixed + +* improve uptime status sed script to report correct units for few uptime scenarios ([#437](https://github.com/catppuccin/tmux/issues/437)) ([31fc2bf](https://github.com/catppuccin/tmux/commit/31fc2bfb1123681dc06da613b944b85f81e4babd)) +* use current window separators for the current window format ([#443](https://github.com/catppuccin/tmux/issues/443)) ([2a6c45b](https://github.com/catppuccin/tmux/commit/2a6c45b7c0da1594de1105d6cef15e3e68981113)) + +## [2.1.1](https://github.com/catppuccin/tmux/compare/v2.1.0...v2.1.1) (2024-11-17) + + +### Fixed + +* escape the TPM environment variable in the kube status line module ([#434](https://github.com/catppuccin/tmux/issues/434)) ([eb78ade](https://github.com/catppuccin/tmux/commit/eb78ade9dc1f6cd8ba654572f51ddcae3c6e7fd7)) +* specify the color for right separator of the status modules to be the same as text bg color ([#429](https://github.com/catppuccin/tmux/issues/429)) ([0e66dee](https://github.com/catppuccin/tmux/commit/0e66dee11ee396824668d4db863f1873e9e9243f)) + + +### Documentation + +* add possible values for window_flags ([#417](https://github.com/catppuccin/tmux/issues/417)) ([c8a2d1a](https://github.com/catppuccin/tmux/commit/c8a2d1ae9649aa904960bef1516ea2ff9a3e6ad0)) +* **custom-status:** fix typo `catpuccin` -> `catppuccin` ([#424](https://github.com/catppuccin/tmux/issues/424)) ([aaf9120](https://github.com/catppuccin/tmux/commit/aaf9120f769a34e5491b3ee7f885c8c347f2f663)) + +## [2.1.0](https://github.com/catppuccin/tmux/compare/v2.0.0...v2.1.0) (2024-10-25) + + +### Added + +* add an option to format the window number with `[@catppuccin](https://github.com/catppuccin)_window_number` and `[@catppuccin](https://github.com/catppuccin)_window_current_number` ([c749885](https://github.com/catppuccin/tmux/commit/c74988511a462bdf07c5fc9ce88157b93a4ed185)) + + +### Fixed + +* allow for dynamic colors in status modules ([#411](https://github.com/catppuccin/tmux/issues/411)), fixes issue [#407](https://github.com/catppuccin/tmux/issues/407) ([5e273e4](https://github.com/catppuccin/tmux/commit/5e273e41dd3188a1a0e795b120623c95de491445)) +* session status icon bg color change by client_prefix ([#394](https://github.com/catppuccin/tmux/issues/394)) ([8855667](https://github.com/catppuccin/tmux/commit/885566714315915547516de5c2f1b660f8e524c2)) + + +### Documentation + +* **README:** add [@kjnsn](https://github.com/kjnsn) to "Thanks to" section ([#398](https://github.com/catppuccin/tmux/issues/398)) ([c3fab98](https://github.com/catppuccin/tmux/commit/c3fab98ab4248a2a78c8193ad48f0991b7bfa1e3)) + +## [2.0.0](https://github.com/catppuccin/tmux/compare/v1.0.3...v2.0.0) (2024-10-21) + + +### ⚠ BREAKING CHANGES + +* rebalance the colors used, and follow the styleguide +* change how windows are styled +* change how status modules are styled +* rebalance colors, adhere to style guide & overhaul docs ([#372](https://github.com/catppuccin/tmux/issues/372)) + +### Features + +* change how status modules are styled ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance colors, adhere to style guide & overhaul docs ([#372](https://github.com/catppuccin/tmux/issues/372)) ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance the colors used, and follow the styleguide ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance the status module colors for cpu and battery ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* replace `_ctp_status_bg` with unified `_ctp_module_bg_color` in module configuration ([a4d4ad0](https://github.com/catppuccin/tmux/commit/a4d4ad09cc8b5c9338cbd4510450d0ae997a7710)) + + +### Bug Fixes + +* **tests:** add tests for window styling ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* use ubuntu-24.04 in ci ([#388](https://github.com/catppuccin/tmux/issues/388)) ([3b0e0a6](https://github.com/catppuccin/tmux/commit/3b0e0a6f0741bf09149f23620516decd7b5f5ba5)) + + +### Code Refactoring + +* change how windows are styled ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) + +## [1.0.3](https://github.com/catppuccin/tmux/compare/v1.0.2...v1.0.3) (2024-10-16) + + +### Bug Fixes + +* change the default status line background to mantle ([#377](https://github.com/catppuccin/tmux/issues/377)) ([47dbe81](https://github.com/catppuccin/tmux/commit/47dbe818e3ad7a008ccbd3e5d69a29a4509f7d07)) + +## [1.0.2](https://github.com/catppuccin/tmux/compare/v1.0.1...v1.0.2) (2024-10-12) + + +### Bug Fixes + +* **ci:** update tmux in test workflow ([#370](https://github.com/catppuccin/tmux/issues/370)) ([02debd3](https://github.com/catppuccin/tmux/commit/02debd396802af9fe4b41601739e48ef38217533)) +* **status:** use a literal string for battery_icon so it can be replaced by the battery plugin ([#365](https://github.com/catppuccin/tmux/issues/365)) ([06fff2f](https://github.com/catppuccin/tmux/commit/06fff2f40ec4a5cd2c9e064bc7fde22130ecd4bb)), closes [#342](https://github.com/catppuccin/tmux/issues/342) +* typo in readme config example ([#362](https://github.com/catppuccin/tmux/issues/362)) ([41ee0b8](https://github.com/catppuccin/tmux/commit/41ee0b89acb3f4afe531209558d6b8e4d7d4ae1a)) +* **window:** middle separator colors ([#369](https://github.com/catppuccin/tmux/issues/369)) ([c59df83](https://github.com/catppuccin/tmux/commit/c59df83d68e64feb8d015c2eb3f8b90febc95a53)) + +## [1.0.1](https://github.com/catppuccin/tmux/compare/v1.0.0...v1.0.1) (2024-10-05) + + +### Bug Fixes + +* **readme:** fix the example configurations ([#343](https://github.com/catppuccin/tmux/issues/343)) ([06183b3](https://github.com/catppuccin/tmux/commit/06183b31216b4ed917760b3d59565e242eee6a64)) +* **readme:** fix the version number, and fix escaping in the custom status line module docs ([#357](https://github.com/catppuccin/tmux/issues/357)) ([db466f8](https://github.com/catppuccin/tmux/commit/db466f8c2dbcfdd84e501ee8274bdfdcf049d65d)) + +## [1.0.0](https://github.com/catppuccin/tmux/compare/v0.4.0...v1.0.0) (2024-10-02) + + +### Bug Fixes + +* **readme:** remove -F when setting the status line ([#333](https://github.com/catppuccin/tmux/issues/333)) ([b38421f](https://github.com/catppuccin/tmux/commit/b38421fa15d8dfafecaf6f438115cfe3c1259bf0)) + +## [0.4.0](https://github.com/catppuccin/tmux/compare/v0.3.0...v0.4.0) (2024-10-01) + + +### ⚠ BREAKING CHANGES + +* rewrite to use tmux native rather than bash ([#328](https://github.com/catppuccin/tmux/issues/328)) + +### Bug Fixes + +* **readme:** update the readme to include upgrade instructions ([1bcad05](https://github.com/catppuccin/tmux/commit/1bcad05f206fb4bb9706403da24b97d2cdb64bad)) +* **window:** ensure the window formats are set correctly ([#331](https://github.com/catppuccin/tmux/issues/331)) ([1bcad05](https://github.com/catppuccin/tmux/commit/1bcad05f206fb4bb9706403da24b97d2cdb64bad)) + + +### Code Refactoring + +* rewrite to use tmux native rather than bash ([#328](https://github.com/catppuccin/tmux/issues/328)) ([87fa4a0](https://github.com/catppuccin/tmux/commit/87fa4a08c5a7fdbef3130f05a8b12f0ca26d4a46)) + +## [0.3.0](https://github.com/catppuccin/tmux/compare/v0.2.0...v0.3.0) (2024-09-17) + + +### Features + +* **status:** Add support for status module middle separators ([#310](https://github.com/catppuccin/tmux/issues/310)) ([1612a23](https://github.com/catppuccin/tmux/commit/1612a23174a6771ac466312eb156f83b8b89d907)) +* **status:** window specific separator config ([#198](https://github.com/catppuccin/tmux/issues/198)) ([8276c5a](https://github.com/catppuccin/tmux/commit/8276c5a5e33dbbbae3d370db2f6129e20b402f8a)) + + +### Bug Fixes + +* **kube:** escape env var ([c31b9b2](https://github.com/catppuccin/tmux/commit/c31b9b2c6c7c50abbebd02b80c4fd32b2782a011)) + +## [0.2.0](https://github.com/catppuccin/tmux/compare/v0.1.0...v0.2.0) (2024-08-23) + + +### Features + +* error/warning messages on first load ([#278](https://github.com/catppuccin/tmux/issues/278)) ([a2dda02](https://github.com/catppuccin/tmux/commit/a2dda02b43194aec5deddf2890c28c76b4c11ed4)) +* warn users of whitespace in module lists ([#266](https://github.com/catppuccin/tmux/issues/266)) ([362a306](https://github.com/catppuccin/tmux/commit/362a306db71794f04d0995fc058bcaa094d1af70)) + + +### Bug Fixes + +* add missing batch options `catppuccin_pane{,_active}_border_style` ([3ffbc37](https://github.com/catppuccin/tmux/commit/3ffbc3700b4c1c3e2c4d015c5a51ccef555dabaf)) +* add missing batch options catppuccin_pane{,_active}_border_style ([3ffbc37](https://github.com/catppuccin/tmux/commit/3ffbc3700b4c1c3e2c4d015c5a51ccef555dabaf)) +* escaping in options ([#298](https://github.com/catppuccin/tmux/issues/298)) ([9b57c20](https://github.com/catppuccin/tmux/commit/9b57c2002081fff8af16b878f1369d46788c0409)) +* **pomodoro_plus:** option names ([#273](https://github.com/catppuccin/tmux/issues/273)) ([51dde6e](https://github.com/catppuccin/tmux/commit/51dde6e8d4d3d8da97d915b01594a08aa4ac0cca)) +* warning `[@catppuccin](https://github.com/catppuccin)_flavour` ([#296](https://github.com/catppuccin/tmux/issues/296)) ([a71f3c0](https://github.com/catppuccin/tmux/commit/a71f3c039bed8a7c49fc390a50befec5db2c4af9)) +* warning `[@catppuccin](https://github.com/catppuccin)_window_status` ([9ee1695](https://github.com/catppuccin/tmux/commit/9ee1695d757c16e2f236858b8d3f88be9fb666fa)) + + +### Performance Improvements + +* batch tmux show ([#288](https://github.com/catppuccin/tmux/issues/288)) ([99013fa](https://github.com/catppuccin/tmux/commit/99013fafe6a98416079b3b84751f2eb540e17c79)), closes [#281](https://github.com/catppuccin/tmux/issues/281) +* batch tmux show-options ([3c6f6f2](https://github.com/catppuccin/tmux/commit/3c6f6f282b3bb17554dc2b4b80760b6507acfd65)) + +## [0.1.0](https://github.com/catppuccin/tmux/compare/v0.0.1...v0.1.0) (2024-08-04) + + +### Features + +* releases ([#260](https://github.com/catppuccin/tmux/issues/260)) ([5fbacdf](https://github.com/catppuccin/tmux/commit/5fbacdf3559cf4496eef02aead087b3bb715e570)) diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md b/home/river/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md new file mode 100644 index 0000000..c86496f --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md @@ -0,0 +1,40 @@ +# Contributing + +## Design + +To understand our mindset in developing this plugin and how to ensure your +changes align with that mindset, check out the "[Design Philosophy](./docs/explanation/design.md)." + +## Commit messages + +This repository uses [Conventional Commits](https://conventionalcommits.org). +Commit headers should be lowercase. Most commits should include a body that briefly +describes the motivation and content of the commit. + +### Commit types + +- `fix`: A bug fix that doesn't modify the public API +- `feat`: A code change that adds functionality +- `change`: A modification to the public API +- `deprecate`: Something in the public API has been deprecated +- `remove`: A part of the public API has been removed +- `refactor`: A code change that doesn't change behavior +- `style`: A style fix or change +- `docs`: Any change to documentation +- `revert`: A revert commit. The message should describe the reasoning and the + commit should include the `Refs:` footer with the short hashes of the commits + being reverted. +- `chore`: catch-all type + +### Breaking changes + +All breaking changes should be documented in the commit footer in the format +described by Conventional Commits. Use the `!` syntax in order to distinguish +breaking commits in the log, but include the footer to provide a better description +for the changelog generator. + +```text +feat(bar)!: foo the bars + +BREAKING CHANGE: bars are now foo'ed +``` diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/LICENSE b/home/river/config/tmux/plugins/catppuccin/tmux/LICENSE new file mode 100644 index 0000000..006383b --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Catppuccin + +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/home/river/config/tmux/plugins/catppuccin/tmux/README.md b/home/river/config/tmux/plugins/catppuccin/tmux/README.md new file mode 100644 index 0000000..74572cb --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/README.md @@ -0,0 +1,242 @@ + +

+ Logo
+ + Catppuccin for Tmux + +

+ +

+ + + +

+ +

+ +

+ + +## Themes + +
+🌻 Latte + +![Latte Flavor Preview](./assets/latte.webp) + +
+
+🪴 Frappé + +![Frappe Flavor Preview](./assets/frappe.webp) + +
+
+🌺 Macchiato + +![Macchiato Flavor Preview](./assets/macchiato.webp) + +
+
+🌿 Mocha + +![Mocha Flavor Preview](./assets/mocha.webp) + +
+ +## Installation + +In order to have the icons displayed correctly please use/update your favorite +[nerd font](https://www.nerdfonts.com/font-downloads). +If you do not have a patched font installed, you can override or remove any +icon. Check the [documentation](./docs/reference/configuration.md) on the +options available. + +### Manual (Recommended) + +This method is recommended as TPM has some issues with name conflicts. + + + +1. Clone this repository to your desired location (e.g. + `~/.config/tmux/plugins/catppuccin`). + + ```bash + mkdir -p ~/.config/tmux/plugins/catppuccin + git clone -b v2.3.0 https://github.com/catppuccin/tmux.git ~/.config/tmux/plugins/catppuccin/tmux + ``` + +1. Add the following line to your `tmux.conf` file: + `run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux`. +1. Reload Tmux by either restarting or reloading with `tmux source ~/.tmux.conf`. + + +Check out what to do next in the "[Getting Started Guide](./docs/tutorials/01-getting-started.md)". + +### TPM + + + +1. Install [TPM](https://github.com/tmux-plugins/tpm) +1. Add the Catppuccin plugin: + + ```bash + set -g @plugin 'catppuccin/tmux#v2.3.0' # See https://github.com/catppuccin/tmux/tags for additional tags + # ...alongside + set -g @plugin 'tmux-plugins/tpm' + ``` + +1. (Optional) Set your preferred flavor, it defaults to `"mocha"`: + + ```bash + set -g @catppuccin_flavor 'mocha' # latte, frappe, macchiato or mocha + ``` + + + +> [!IMPORTANT] +> You may have to run `~/.config/tmux/plugins/tpm/bin/clean_plugins` +> if upgrading from an earlier version +> (especially from `v0.3.0`). + +### For TMUX versions prior to 3.2 + +This plugin uses features that were only introduced into tmux in version 3.2. +If you are using a version earlier than this, you can still have lovely +catppuccin colors, the installation method just looks a little different. + +```sh +# In your ~/.tmux.conf + +# Add the colors from the pallete. Check the themes/ directory for all options. + +# Some basic mocha colors. +set -g @ctp_bg "#24273a" +set -g @ctp_surface_1 "#494d64" +set -g @ctp_fg "#cad3f5" +set -g @ctp_mauve "#c6a0f6" +set -g @ctp_crust "#181926" + +# status line +set -gF status-style "bg=#{@ctp_bg},fg=#{@ctp_fg}" + +# windows +set -gF window-status-format "#[bg=#{@ctp_surface_1},fg=#{@ctp_fg}] ##I ##T " +set -gF window-status-current-format "#[bg=#{@ctp_mauve},fg=#{@ctp_crust}] ##I ##T " +``` + +### For TMUX versions prior to 3.6 + +This plugin can be used in conjunction with the support for tmux to +automatically report dark or light themes using hooks. You can leverage these +hooks in your tmux configuration file like so: + +```conf +set-hook -g client-dark-theme { + set -g @catppuccin_flavor "frappe" + set -g @catppuccin_reset "true" + + # NOTE: you may need to set more `@catppuccin_*` variables to fully reset + # everything. + + run ~/code/github.com/catppuccin/tmux/catppuccin.tmux +} +set-hook -g client-light-theme { + set -g @catppuccin_flavor "latte" + set -g @catppuccin_reset "true" + + # NOTE: you may need to set more `@catppuccin_*` variables to fully reset + # everything. + + run ~/code/github.com/catppuccin/tmux/catppuccin.tmux +} +``` + +The above is only possible with versions of tmux 3.6+. To replicate this +functionality with versions prior to 3.6, you can will need to set variables and +run the `cappuccin.tmux` file and trigger it yourself. If you'd like some +inspiration for how to do this, read through [the Bash code found in this Nix +function here][reload-example] which reloads Catppuccin on-demand without +relying on tmux hooks. + +[reload-example]: https://git.sr.ht/~rogeruiz/.files.nix/tree/1dedf4da47f995ec41e07d37b65008ad0f464717/item/module/tools/terminal/tmux/catppuccin/bin/default.nix "An example from a catppuccin/tmux maintainer on how to manually reload the Catppuccin configuration on macOS." + +> [!IMPORTANT] +> As mentioned in the comments in the `conf` snippet above, you may find that +> you'll need to add to the list of `@catppuccin_*` variables. Test your +> configuration by switching themes and noting what of the Tmux session isn't +> getting reset to an expected color. + +### Upgrading from v0.3 + +Breaking changes have been introduced since 0.3, to understand how to migrate +your configuration, see pinned issue [#487](https://github.com/catppuccin/tmux/issues/487). + +## Recommended Default Configuration + +This configuration shows some customisation options, that can be further +extended as desired. +This is what is used for the previews above. + +![Example configuration](./assets/mocha.webp) + +```bash +# ~/.tmux.conf + +# Options to make tmux more pleasant +set -g mouse on +set -g default-terminal "tmux-256color" + +# Configure the catppuccin plugin +set -g @catppuccin_flavor "mocha" +set -g @catppuccin_window_status_style "rounded" + +# Load catppuccin +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux +# For TPM, instead use `run ~/.tmux/plugins/tmux/catppuccin.tmux` + +# Make the status line pretty and add some modules +set -g status-right-length 100 +set -g status-left-length 100 +set -g status-left "" +set -g status-right "#{E:@catppuccin_status_application}" +set -agF status-right "#{E:@catppuccin_status_cpu}" +set -agF status-right "#{E:@catppuccin_status_ram}" +set -ag status-right "#{E:@catppuccin_status_session}" +set -ag status-right "#{E:@catppuccin_status_uptime}" +set -agF status-right "#{E:@catppuccin_status_battery}" + +run ~/.config/tmux/plugins/tmux-plugins/tmux-cpu/cpu.tmux +run ~/.config/tmux/plugins/tmux-plugins/tmux-battery/battery.tmux +# Or, if using TPM, just run TPM +``` + +## Documentation + +### Guides + +- [Getting Started](./docs/tutorials/01-getting-started.md) +- [Custom Status Line Segments](./docs/tutorials/02-custom-status.md) +- [Troubleshooting](./docs/guides/troubleshooting.md) + +### Reference + +- [Status Line](./docs/reference/status-line.md) +- [Configuration Options Reference](./docs/reference/configuration.md) +- [Tmux Configuration Showcase](https://github.com/catppuccin/tmux/discussions/317) + +## 💝 Thanks to + +- [Pocco81](https://github.com/Pocco81) +- [vinnyA3](https://github.com/vinnyA3) +- [rogeruiz](https://github.com/rogeruiz) +- [kales](https://github.com/kjnsn) + +  + + +

+

+

Copyright © 2021-present Catppuccin Org +

+ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/config1.png b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config1.png new file mode 100644 index 0000000..6eede6d Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config1.png differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/config2.png b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config2.png new file mode 100644 index 0000000..5695890 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config2.png differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/config3.png b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config3.png new file mode 100644 index 0000000..e7a5af4 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/config3.png differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf new file mode 100644 index 0000000..47d811c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf @@ -0,0 +1,13 @@ +set -g @catppuccin_flavor 'frappe' + +run "#{d:current_file}/../../catppuccin.tmux" + +# Make the status line more pleasant. +set -g status-left "" +set -g status-right '#[fg=#{@thm_crust},bg=#{@thm_teal}] session: #S ' + +# Ensure that everything on the right side of the status line +# is included. +set -g status-right-length 100 + +set -g default-shell '/opt/homebrew/bin/fish' diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif new file mode 100644 index 0000000..5252409 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape new file mode 100644 index 0000000..cdf2002 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape @@ -0,0 +1,19 @@ +Output assets/demos/basic.gif + +Require echo +Require tmux + +Set Shell "bash" +Set FontSize 30 +Set FontFamily "SFMono Nerd Font" +Set Width 1200 +Set Height 600 + +Type "tmux -f assets/demos/basic.conf" Sleep 500ms Enter + +Sleep 3s + +Ctrl+b +Type "c" + +Sleep 5s diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp new file mode 100644 index 0000000..73d997c Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp new file mode 100644 index 0000000..dd7f339 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish b/home/river/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish new file mode 100644 index 0000000..b659dee --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish @@ -0,0 +1,11 @@ +set -l flavors latte frappe macchiato mocha + +for flavor in $flavors + magick $flavor.webp -crop '1320x50+0+464' +repage $flavor-crop.webp +end + +catwalk {latte,frappe,macchiato,mocha}-crop.webp --output preview.webp --layout column + +for flavor in $flavors + rm $flavor-crop.webp +end diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/latte.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/latte.webp new file mode 100644 index 0000000..3a5fe13 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/latte.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp new file mode 100644 index 0000000..f752424 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp new file mode 100644 index 0000000..49f447a Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/preview.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/preview.webp new file mode 100644 index 0000000..97d75de Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/preview.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp new file mode 100644 index 0000000..9bbf4e7 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/structure.svg b/home/river/config/tmux/plugins/catppuccin/tmux/assets/structure.svg new file mode 100644 index 0000000..fa0878b --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/assets/structure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp new file mode 100644 index 0000000..19b5f43 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp new file mode 100644 index 0000000..cedbdec Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp new file mode 100644 index 0000000..9c746b1 Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp new file mode 100644 index 0000000..ecb751f Binary files /dev/null and b/home/river/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp differ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux new file mode 100755 index 0000000..40050ba --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Set path of script +PLUGIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +tmux source "${PLUGIN_DIR}/catppuccin_options_tmux.conf" +tmux source "${PLUGIN_DIR}/catppuccin_tmux.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf new file mode 100644 index 0000000..2f6a484 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf @@ -0,0 +1,145 @@ +# All options and their defaults. +# +# This is executed separately to the main configuration +# so that options are set before parsing the rest of the config. + +# Reset everything if requested. +# +# Useful for auto switching between themes: +# +# set-hook -g client-dark-theme { +# set -g @catppuccin_flavor "frappe" +# set -g @catppuccin_reset "true" +# run ~/code/github.com/catppuccin/tmux/catppuccin.tmux +# } +# set-hook -g client-light-theme { +# set -g @catppuccin_flavor "latte" +# set -g @catppuccin_reset "true" +# run ~/code/github.com/catppuccin/tmux/catppuccin.tmux +# } +%if "#{==:#{@catppuccin_reset},true}" +set -Ugq @thm_bg +set -Ugq @thm_fg +set -Ugq @thm_rosewater +set -Ugq @thm_flamingo +set -Ugq @thm_rosewater +set -Ugq @thm_pink +set -Ugq @thm_mauve +set -Ugq @thm_red +set -Ugq @thm_maroon +set -Ugq @thm_peach +set -Ugq @thm_yellow +set -Ugq @thm_green +set -Ugq @thm_teal +set -Ugq @thm_sky +set -Ugq @thm_sapphire +set -Ugq @thm_blue +set -Ugq @thm_lavender +set -Ugq @thm_subtext_1 +set -Ugq @thm_subtext_0 +set -Ugq @thm_overlay_2 +set -Ugq @thm_overlay_1 +set -Ugq @thm_overlay_0 +set -Ugq @thm_surface_2 +set -Ugq @thm_surface_1 +set -Ugq @thm_surface_0 +set -Ugq @thm_mantle +set -Ugq @thm_crust +set -Ugq @catppuccin_window_status_style +set -Ugq @catppuccin_window_text_color +set -Ugq @catppuccin_window_number_color +set -Ugq @catppuccin_window_text +set -Ugq @catppuccin_window_number +set -Ugq @catppuccin_window_current_text_color +set -Ugq @catppuccin_window_current_number_color +set -Ugq @catppuccin_window_current_text +set -Ugq @catppuccin_window_current_number +set -Ugq @catppuccin_window_number_position +set -Ugq @catppuccin_window_flags +set -Ugq @catppuccin_window_flags_icon_last +set -Ugq @catppuccin_window_flags_icon_current +set -Ugq @catppuccin_window_flags_icon_zoom +set -Ugq @catppuccin_window_flags_icon_mark +set -Ugq @catppuccin_window_flags_icon_silent +set -Ugq @catppuccin_window_flags_icon_activity +set -Ugq @catppuccin_window_flags_icon_bell +set -Ugq @catppuccin_window_flags_icon_format +set -Ugq @catppuccin_status_left_separator +set -Ugq @catppuccin_status_middle_separator +set -Ugq @catppuccin_status_right_separator +set -Ugq @catppuccin_status_connect_separator +set -Ugq @catppuccin_status_module_text_bg +set -Ugq @catppuccin_window_current_left_separator +set -Ugq @catppuccin_window_current_middle_separator +set -Ugq @catppuccin_window_current_right_separator + +# Finally reset the reset option. +set -Ug @catppuccin_reset +%endif + +# DO NOT USE -o IN YOUR OWN CONFIGURATION +set -ogq @catppuccin_flavor "mocha" + +set -ogq @catppuccin_status_background "default" + +# Menu styling options +set -ogq @catppuccin_menu_selected_style "fg=#{@thm_fg},bold,bg=#{@thm_overlay_0}" + +# Pane styling options (DO NOT USE -o IN YOUR OWN CONFIGURATION) +set -ogq @catppuccin_pane_status_enabled "no" # set to "yes" to enable +set -ogq @catppuccin_pane_border_status "off" # set to "yes" to enable +set -ogq @catppuccin_pane_border_style "fg=#{@thm_overlay_0}" +set -ogq @catppuccin_pane_active_border_style "##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}}" +set -ogq @catppuccin_pane_left_separator "█" +set -ogq @catppuccin_pane_middle_separator "█" +set -ogq @catppuccin_pane_right_separator "█" +set -ogq @catppuccin_pane_color "#{@thm_green}" +set -ogq @catppuccin_pane_background_color "#{@thm_surface_0}" +set -ogq @catppuccin_pane_default_text "##{b:pane_current_path}" +set -ogq @catppuccin_pane_default_fill "number" +set -ogq @catppuccin_pane_number_position "left" # right, left + +# NOTE: Changes to make the option names more intuitive and more closely follow +# the tmux naming conventions. +# @catppuccin_window_current_background -> @catppuccin_window_current_number_color +# @catppuccin_window_current_color -> @catppuccin_window_current_text_color +# @catppuccin_window_default_background -> @catppuccin_window_number_color +# @catppuccin_window_default_color -> @catppuccin_window_text_color +# @catppuccin_window_status -> @catppuccin_window_flags +# +# Removed: +# @catppuccin_window_default_fill, @catppuccin_window_current_fill +# Just set the number and text colors. + +# Window options (DO NOT USE -o IN YOUR OWN CONFIGURATION) +set -ogq @catppuccin_window_status_style "basic" # basic, rounded, slanted, custom, or none +set -ogq @catppuccin_window_text_color "#{@thm_surface_0}" +set -ogq @catppuccin_window_number_color "#{@thm_overlay_2}" +set -ogq @catppuccin_window_text " #T" +set -ogq @catppuccin_window_number "#I" +set -ogq @catppuccin_window_current_text_color "#{@thm_surface_1}" +set -ogq @catppuccin_window_current_number_color "#{@thm_mauve}" +set -ogq @catppuccin_window_current_text " #T" +set -ogq @catppuccin_window_current_number "#I" +set -ogq @catppuccin_window_number_position "left" + +# Window flags +set -ogq @catppuccin_window_flags "none" +set -ogq @catppuccin_window_flags_icon_last " 󰖰" # - +set -ogq @catppuccin_window_flags_icon_current " 󰖯" # * +set -ogq @catppuccin_window_flags_icon_zoom " 󰁌" # Z +set -ogq @catppuccin_window_flags_icon_mark " 󰃀" # M +set -ogq @catppuccin_window_flags_icon_silent " 󰂛" # ~ +set -ogq @catppuccin_window_flags_icon_activity " 󱅫" # # +set -ogq @catppuccin_window_flags_icon_bell " 󰂞" # ! +# Matches icon order when using `#F` (`#!~[*-]MZ`) +set -ogq @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@catppuccin_window_flags_icon_activity},}##{?window_bell_flag,#{E:@catppuccin_window_flags_icon_bell},}##{?window_silence_flag,#{E:@catppuccin_window_flags_icon_silent},}##{?window_active,#{E:@catppuccin_window_flags_icon_current},}##{?window_last_flag,#{E:@catppuccin_window_flags_icon_last},}##{?window_marked_flag,#{E:@catppuccin_window_flags_icon_mark},}##{?window_zoomed_flag,#{E:@catppuccin_window_flags_icon_zoom},} " + +# Status line options (DO NOT USE -o IN YOUR OWN CONFIGURATION) +set -ogq @catppuccin_status_left_separator "" +set -ogq @catppuccin_status_middle_separator "" +set -ogq @catppuccin_status_right_separator " " +set -ogq @catppuccin_status_connect_separator "yes" # yes, no + +# Maintain backwards compatibility. Use @catppuccin_status_module_bg_color if it is set. +set -ogq @catppuccin_status_module_text_bg "#{?@catppuccin_status_module_bg_color,#{E:@catppuccin_status_module_bg_color},#{@thm_surface_0}}" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf new file mode 100644 index 0000000..67a5ba2 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf @@ -0,0 +1,225 @@ +source -F "#{d:current_file}/themes/catppuccin_#{@catppuccin_flavor}_tmux.conf" + +%if "#{==:#{@catppuccin_status_background},default}" + set -gF @_ctp_status_bg "#{@thm_mantle}" + set -gF status-style "bg=#{@_ctp_status_bg},fg=#{@thm_fg}" + + %hidden CTP_MESSAGE_BACKGROUND="#{@thm_overlay_0}" +%elif "#{==:#{@catppuccin_status_background},none}" + set -g status-style "default" + set -g @_ctp_status_bg "none" + + %hidden CTP_MESSAGE_BACKGROUND="default" +%else + # Treat @catppuccin_status_background as a format string. + set -gF status-style "bg=#{E:@catppuccin_status_background},fg=#{@thm_fg}" + set -gF @_ctp_status_bg "#{E:@catppuccin_status_background}" + + %hidden CTP_MESSAGE_BACKGROUND="#{E:@catppuccin_status_background}" +%endif + +source -F "#{d:current_file}/status/application.conf" +source -F "#{d:current_file}/status/battery.conf" +source -F "#{d:current_file}/status/clima.conf" +source -F "#{d:current_file}/status/cpu.conf" +source -F "#{d:current_file}/status/date_time.conf" +source -F "#{d:current_file}/status/directory.conf" +source -F "#{d:current_file}/status/gitmux.conf" +source -F "#{d:current_file}/status/host.conf" +source -F "#{d:current_file}/status/kube.conf" +source -F "#{d:current_file}/status/load.conf" +source -F "#{d:current_file}/status/pomodoro_plus.conf" +source -F "#{d:current_file}/status/ram.conf" +source -F "#{d:current_file}/status/session.conf" +source -F "#{d:current_file}/status/uptime.conf" +source -F "#{d:current_file}/status/user.conf" +source -F "#{d:current_file}/status/weather.conf" + +# messages +set -gF message-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre" +set -gF message-command-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre" + +# menu +%if "#{>=:#{version},3.4}" + set -gF menu-selected-style "#{E:@catppuccin_menu_selected_style}" +%endif + +# panes +set -wgF pane-active-border-style "#{E:@catppuccin_pane_active_border_style}" +set -wgF pane-border-style "#{E:@catppuccin_pane_border_style}" + +%if "#{==:#{@catppuccin_pane_status_enabled},yes}" + # "internal" variables are kept as @_ctp_p_.* + # and then unset at the end. + set -gq @_ctp_p_left "" # the content on the left, usually a separator + set -gq @_ctp_p_middle "" + set -gq @_ctp_p_right "" + set -gq @_ctp_p_number "" + set -gq @_ctp_p_text "" + + %if "#{==:#{@catppuccin_pane_default_fill},none}" + set -g @_ctp_p_left \ + "#[fg=#{@thm_surface_0},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_middle \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]#{@catppuccin_pane_middle_separator}" + set -g @_ctp_p_right \ + "#[fg=#{@thm_surface_0},bg=default]#{@catppuccin_pane_right_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]#{E:@catppuccin_pane_default_text}" + + %elif "#{==:#{@catppuccin_pane_default_fill},all}" + + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_middle \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{@catppuccin_pane_middle_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_right_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]#{E:@catppuccin_pane_default_text}" + + %elif "#{==:#{@catppuccin_pane_default_fill},number}" + + %if "#{==:#{@catppuccin_pane_number_position},left}" + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=default]#{@catppuccin_pane_right_separator}" + %else + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_right_separator}" + %endif + + set -g @_ctp_p_middle \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{@catppuccin_pane_middle_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{E:@catppuccin_pane_default_text}" + + %endif + + %if "#{==:#{@catppuccin_pane_number_position},left}" + set -wgF pane-border-format \ + "#{E:@_ctp_p_left}#{E:@_ctp_p_number}#{E:@_ctp_p_middle} #{E:@_ctp_p_text}#{E:@_ctp_p_right}" + %else + set -wgF pane-border-format \ + "#{E:@_ctp_p_left}#{E:@_ctp_p_text} #{E:@_ctp_p_middle}#{E:@_ctp_p_number}#{E:@_ctp_p_right}" + %endif + + set -ug @_ctp_p_left + set -ug @_ctp_p_middle + set -ug @_ctp_p_right + set -ug @_ctp_p_number + set -ug @_ctp_p_text +%endif + +# popups +%if "#{>=:#{version},3.4}" + set -gF popup-style "bg=#{@thm_bg},fg=#{@thm_fg}" + set -gF popup-border-style "fg=#{@thm_surface_1}" +%endif + +%if "#{==:#{@catppuccin_window_status_style},basic}" + + set -gq @catppuccin_window_left_separator " " + set -gq @catppuccin_window_middle_separator " " + set -gq @catppuccin_window_right_separator " " + +%elif "#{==:#{@catppuccin_window_status_style},rounded}" + + set -gq @catppuccin_window_left_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + set -gq @catppuccin_window_middle_separator " " + set -gq @catppuccin_window_right_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + +%elif "#{==:#{@catppuccin_window_status_style},slanted}" + + set -gq @catppuccin_window_left_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gq @catppuccin_window_middle_separator "#[fg=#{@catppuccin_window_number_color},bg=#{@catppuccin_window_text_color}]" + set -gq @catppuccin_window_current_middle_separator \ + "#[fg=#{@catppuccin_window_current_number_color},bg=#{@catppuccin_window_current_text_color}]" + %else + set -gq @catppuccin_window_middle_separator " #[fg=#{@catppuccin_window_number_color},bg=#{@catppuccin_window_text_color}]" + set -gq @catppuccin_window_current_middle_separator \ + " #[fg=#{@catppuccin_window_current_number_color},bg=#{@catppuccin_window_current_text_color}]" + %endif + + set -gq @catppuccin_window_right_separator "#[fg=#{@_ctp_status_bg},reverse]█#[none]" + +%endif + +# DO NOT USE -o IN YOUR OWN CONFIGURATION +set -ogqF @catppuccin_window_current_left_separator "#{@catppuccin_window_left_separator}" +set -ogqF @catppuccin_window_current_middle_separator "#{@catppuccin_window_middle_separator}" +set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right_separator}" + +# window status +%if "#{!=:#{@catppuccin_window_status_style},none}" + set -gF window-status-activity-style "bg=#{@thm_lavender},fg=#{@thm_crust}" + set -gF window-status-bell-style "bg=#{@thm_yellow},fg=#{@thm_crust}" + + %if "#{==:#{@catppuccin_window_flags},icon}" + set -gqF @_ctp_w_flags "#{E:@catppuccin_window_flags_icon_format}" + %elif "#{==:#{@catppuccin_window_flags},text}" + set -gq @_ctp_w_flags "#F" + %else + set -gq @_ctp_w_flags "" + %endif + + set -g @_ctp_w_number_style "#[fg=#{@thm_crust},bg=#{@catppuccin_window_number_color}]" + set -g @_ctp_w_text_style "#[fg=#{@thm_fg},bg=#{@catppuccin_window_text_color}]" + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gF window-status-format \ + "#{E:@_ctp_w_number_style}#{E:@catppuccin_window_left_separator}#{@catppuccin_window_number}" + set -agF window-status-format "#{E:@catppuccin_window_middle_separator}" + set -agF window-status-format \ + "#{E:@_ctp_w_text_style}#{@catppuccin_window_text}#{@_ctp_w_flags}#{E:@catppuccin_window_right_separator}" + %else + set -gF window-status-format \ + "#{E:@_ctp_w_text_style}#{E:@catppuccin_window_left_separator}#{E:@_ctp_w_text_style}#{@catppuccin_window_text}#{@_ctp_w_flags}" + set -agF window-status-format "#{E:@catppuccin_window_middle_separator}" + set -agF window-status-format \ + "#{E:@_ctp_w_number_style} #{@catppuccin_window_number}#{E:@catppuccin_window_right_separator}" + %endif + + # ======================================= + # And do the same for the current window. + # ======================================= + + set -g @_ctp_w_number_style "#[fg=#{@thm_crust},bg=#{@catppuccin_window_current_number_color}]" + set -g @_ctp_w_text_style "#[fg=#{@thm_fg},bg=#{@catppuccin_window_current_text_color}]" + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gF window-status-current-format \ + "#{E:@_ctp_w_number_style}#{E:@catppuccin_window_current_left_separator}#{@catppuccin_window_current_number}" + set -agF window-status-current-format "#{E:@catppuccin_window_current_middle_separator}" + set -agF window-status-current-format \ + "#{E:@_ctp_w_text_style}#{@catppuccin_window_current_text}#{@_ctp_w_flags}#{E:@catppuccin_window_current_right_separator}" + %else + set -gF window-status-current-format \ + "#{E:@_ctp_w_text_style}#{E:@catppuccin_window_current_left_separator}#{E:@_ctp_w_text_style}#{@catppuccin_window_current_text}#{@_ctp_w_flags}" + set -agF window-status-current-format "#{E:@catppuccin_window_current_middle_separator}" + set -agF window-status-current-format \ + "#{E:@_ctp_w_number_style} #{@catppuccin_window_current_number}#{E:@catppuccin_window_current_right_separator}" + %endif + + + # Cleanup (unset) all of the internal variables. + set -ug @_ctp_w_number_style + set -ug @_ctp_w_text_style + set -ug @_ctp_w_flags +%endif + +# Mode style. This is used for copy mode highlighting to style the current selection. +set -gF mode-style "bg=#{@thm_surface_0},bold" +set -gF clock-mode-colour "#{@thm_blue}" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/explanation/design.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/explanation/design.md new file mode 100644 index 0000000..60c4fd0 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/explanation/design.md @@ -0,0 +1,57 @@ +## Design Philosophy + +First and foremost, this is a color scheme. Making colors work +well takes precedence over other kinds of functionality. + +### History + +This plugin kept on growing essentially because no one was there to push back on +changes that went against, for example, parts of the UNIX philosophy. This lead to +a state where there were almost an infinite number of configuration options, +and combining them in unique ways would almost certainly break something. +Maintaining the options for everyone's setup was impossible, and fixing +one bug would cause several others to appear. Eventually the addition +of more and more things that didn't relate to colors, such as status line modules, +took time away from getting the basics right. + +Moving forward, we will be trying to align with the philosophies listed below. +This is in contrast to what the plugin has historically offered in terms of functionality. + +### UNIX Philosphy + +1. Write programs that do one thing and do it well. + - Do colors, and do colors well. Other things like displaying the weather + are not the responsibility of this plugin. +1. Write programs to work together. + - The full palette is exposed as user options, allowing + easy integration with any other kind of tmux configuration. +1. Write programs to handle text streams, because that is a universal interface. + - TMUX is a text based program. Each of the palette options are strings + in user options that can be piped into other programs and options. + +### Configurability is the root of all evil + +Adopted from "[Fish Shell's design philophy](https://fishshell.com/docs/current/design.html)". + +Every configuration option in a program is a place where the program is too +stupid to figure out for itself what the user really wants, and should be +considered a failure of both the program and the programmer who implemented it. + +Rationale: Different configuration options are a nightmare to maintain, since +the number of potential bugs caused by specific configuration combinations +quickly becomes an issue. Configuration options often imply assumptions about +the code which change when reimplementing the code, causing issues with +backwards compatibility. But mostly, configuration options should be avoided +since they simply should not exist, as the program should be smart enough to do +what is best, or at least a good enough approximation of it. + +### The law of orthogonality + +The set of options that do exist should have a small set of orthogonal features. +Any situation where two options are related but not identical, one of them +should be removed, and the other should be made powerful and general enough to +handle all common use cases of either feature. + +Rationale: Related features make the configuration options larger, which makes +it harder to use. It also increases the size of the source code, making the +program harder to maintain and update. diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/guides/troubleshooting.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/guides/troubleshooting.md new file mode 100644 index 0000000..4479062 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/guides/troubleshooting.md @@ -0,0 +1,37 @@ +# Frequently Asked Questions + +## Window Names + +By default, window names are the pane title, and the pane title is +set by the shell running in each pane. Oh My ZSH does this [automatically](https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#automatic-title), +as does [fish](https://fishshell.com/docs/current/cmds/fish_title.html). + +The format string used can be changed by setting the following options: + +```bash +set -g @catppuccin_window_text "#W" +set -g @catppuccin_window_current_text "#W" +``` + +The window title is `#W`, the current path is `#{b:pane_current_path}`. A huge +amount of customisation is possible, and is explained in depth +in the "[tmux man page](https://man7.org/linux/man-pages/man1/tmux.1.html#FORMATS)". + +## Symbols are not displaying + +Make sure you have installed a [Nerd Font](https://www.nerdfonts.com/), +and that your terminal is set to use that font. + +## My options are not being applied + +Go through these steps: + +1. Completely kill tmux and restart (`killall tmux`). +1. Ensure every `@catppuccin.*` option is being set _before_ + the plugin is loaded. Loading occurs where you have `run` in your config file. +1. Double check for typos. There are two "c"s and two "p"s in "catppuccin". +1. Do not use `-o` to set options that begin with `@`. The `-o` flag means that + the option will not be set if it has already been set. You do not need this + in your config file. +1. Double check that any option that does _not_ start with `@` is set after the + plugin is loaded. diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/configuration.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/configuration.md new file mode 100644 index 0000000..c382a0c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/configuration.md @@ -0,0 +1,116 @@ +## Configuration Reference + + + +This is a diagram of how the theme is split between its components. + +### Top Level Options + +| Option | Effect | +| -------------------- | ------------------------------------------------------------------------------ | +| `@catppuccin_flavor` | Sets the catppuccin flavor, one of "latte", "frappe", "macchiato", or "mocha". | + +### Status Line + +| Option | Effect | +| ----------------------------- | --------------------------------------------- | +| @catppuccin_status_background | Sets the background color of the status line. | + +- `default` will use the color from the selected theme +- `none` will make the status bar transparent +- use hex color codes for other colors or a theme color (`#{@thm_}`) + +### Window + +The plugin comes with three window styles built in, these can be customized by +setting the `@catppuccin_window_status_style` option. The default is `basic`. + +| Option | Effect | Preview | +| --------- | ------------------------------------------------------------------------ | ------------------------------------------------------ | +| `basic` | Simple styling with blocks. | ![window basic](../../assets/window-basic.webp) | +| `rounded` | Each window is separated with rounded separators. | ![window rounded style](../../assets/window-rounded.webp) | +| `slanted` | Each window is separated with slanted separators. | ![window slanted style](../../assets/window-slanted.webp) | +| `custom` | Custom separators are used. This is required to override the separators! | | +| `none` | Styling of the window status is completely disabled. | ![window no styling](../../assets/window-none.webp) | + +If you want to change the active color to something else (the default is mauve), +use the following. For example to use lavender: + +```bash +set -g @catppuccin_window_current_number_color "#{@thm_lavender}" +``` + +
+ +Customising the separators + +Add the following, +setting whatever values you'd like for the separators: + +```bash +set -g @catppuccin_window_status_style "custom" +set -g @catppuccin_window_left_separator "" +set -g @catppuccin_window_middle_separator "" +set -g @catppuccin_window_right_separator "" +``` + +
+ +### Menu + +**Set the menu selected style:** + +```sh +# Use a value compatible with the standard tmux `menu-selected-style` +set -g @catppuccin_menu_selected_style "fg=#{@thm_surface_0},bg=#{@thm_yellow}" +``` + +### All options and their defaults + +```bash +# Menu styling options +set -g @catppuccin_menu_selected_style "fg=#{@thm_fg},bold,bg=#{@thm_overlay_0}" + +# Pane styling options +set -g @catppuccin_pane_status_enabled "no" # set to "yes" to enable +set -g @catppuccin_pane_border_status "off" # set to "yes" to enable +set -g @catppuccin_pane_border_style "fg=#{@thm_overlay_0}" +set -g @catppuccin_pane_active_border_style "##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}}" +set -g @catppuccin_pane_left_separator "█" +set -g @catppuccin_pane_middle_separator "█" +set -g @catppuccin_pane_right_separator "█" +set -g @catppuccin_pane_color "#{@thm_green}" +set -g @catppuccin_pane_background_color "#{@thm_surface_0}" +set -g @catppuccin_pane_default_text "##{b:pane_current_path}" +set -g @catppuccin_pane_default_fill "number" +set -g @catppuccin_pane_number_position "left" # right, left + +set -g @catppuccin_window_status_style "basic" # basic, rounded, slanted, custom, or none +set -g @catppuccin_window_text_color "#{@thm_surface_0}" +set -g @catppuccin_window_number_color "#{@thm_overlay_2}" +set -g @catppuccin_window_text " #T" +set -g @catppuccin_window_number "#I" +set -g @catppuccin_window_current_text_color "#{@thm_surface_1}" +set -g @catppuccin_window_current_number_color "#{@thm_mauve}" +set -g @catppuccin_window_current_text " #T" +set -g @catppuccin_window_current_number "#I" +set -g @catppuccin_window_number_position "left" +set -g @catppuccin_window_flags "none" # none, icon, or text +set -g @catppuccin_window_flags_icon_last " 󰖰" # - +set -g @catppuccin_window_flags_icon_current " 󰖯" # * +set -g @catppuccin_window_flags_icon_zoom " 󰁌" # Z +set -g @catppuccin_window_flags_icon_mark " 󰃀" # M +set -g @catppuccin_window_flags_icon_silent " 󰂛" # ~ +set -g @catppuccin_window_flags_icon_activity " 󱅫" # # +set -g @catppuccin_window_flags_icon_bell " 󰂞" # ! +# Matches icon order when using `#F` (`#!~[*-]MZ`) +set -g @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@catppuccin_window_flags_icon_activity},}##{?window_bell_flag,#{E:@catppuccin_window_flags_icon_bell},}##{?window_silence_flag,#{E:@catppuccin_window_flags_icon_silent},}##{?window_active,#{E:@catppuccin_window_flags_icon_current},}##{?window_last_flag,#{E:@catppuccin_window_flags_icon_last},}##{?window_marked_flag,#{E:@catppuccin_window_flags_icon_mark},}##{?window_zoomed_flag,#{E:@catppuccin_window_flags_icon_zoom},} " + +# Status line options +set -g @catppuccin_status_left_separator "" +set -g @catppuccin_status_middle_separator "" +set -g @catppuccin_status_right_separator "█" +set -g @catppuccin_status_connect_separator "yes" # yes, no +set -g @catppuccin_status_fill "icon" +set -g @catppuccin_status_module_bg_color "#{@thm_surface_0}" +``` diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/status-line.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/status-line.md new file mode 100644 index 0000000..40c8be1 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/reference/status-line.md @@ -0,0 +1,260 @@ +## Using the theme's built-in status modules + +To use the theme's built in status modules, set the `status-left` and +`status-right` tmux options _after_ the plugin has been loaded with `run`. + +The tmux status line modules are set as variables and prefixed with `@catppuccin_status_`. + +To use the `application` and `session` modules on the right and have nothing on +the left: + +```sh +set -g status-right-length 100 + +set -g status-right "#{E:@catppuccin_status_application}#{E:@catppuccin_status_session}" +set -g status-left "" +``` +Some notes about expanding options when setting the status line: +* Options are expanded as format strings by placing `E:` before the option name. +* When a module status string contains a reference to another variable, you have to add the `-F` flag that treats the value passed as a format string that is immediately expanded, that is use `set -gF` (see tmux [`set-option`](https://man.openbsd.org/OpenBSD-current/man1/tmux.1#set-option) man page). +* Example for such a case is the [battery](#battery-module) module below, where the status contains the format string `#{battery_percentage}` that needs to be further expanded. + +## Customizing modules + +Every module supports the following overrides: + +### Override the specific module icon + +```sh +set -g @catppuccin_[module_name]_icon "icon" +``` + +### Override the specific module color + +```sh +set -g @catppuccin_[module_name]_color "color" +``` + +### Override the specific module text + +```sh +set -g @catppuccin_[module_name]_text "text" +``` + +### Override the specific module's background color + +```sh +set -g @catppuccin_status_[module_name]_bg_color "#{@thm_surface_0}" +``` + +### Removing a specific module option + +```sh +set -g @catppuccin_[module_name]_[option] "" +``` + +This is for the situation where you want to remove the icon from a module. +For example: + +```sh +set -g @catppuccin_date_time_icon "" +``` + +### Notes for TPM users + +Make sure you load the catppuccin theme prior to setting the status-left and/or +status-* options. This ensures the catppuccin options (such as colors and +status modules) are defined so they can then be used. + +After status-left and/or status-right have been set, make sure to run TPM to load +the modules. This runs any plugins that may replace text in the status line. + +```bash +# load catppuccin theme ... +run '~/.config/tmux/plugins/tmux/catppuccin.tmux' # or where this file is located on your machine + +# ... and then set status-left & status-right ... +set -g status-left "#{E:@catppuccin_status_session}" + +set -g status-right "#{E:@catppuccin_status_[module_name]}" +set -ag status-right "#{E:@catppuccin_status_[module_name]}" +set -agF status-right "#{E:@catppuccin_status_[module_name]}" + +# ... and finally start TPM +set -g @plugin 'tmux-plugins/tpm' +run '~/.tmux/plugins/tpm/tpm' +``` + +## Battery module + +**Requirements:** This module depends on [tmux-battery](https://github.com/tmux-plugins/tmux-battery/tree/master). + +**Install:** The preferred way to install tmux-battery is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_battery}" + +set -g @plugin 'tmux-plugins/tmux-battery' +run '~/.tmux/plugins/tpm/tpm' +``` + +## CPU module + +**Requirements:** This module depends on [tmux-cpu](https://github.com/tmux-plugins/tmux-cpu/tree/master). + +**Install:** The preferred way to install tmux-cpu is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_cpu}" + +set -g @plugin 'tmux-plugins/tmux-cpu' +run '~/.tmux/plugins/tpm/tpm' +``` + +## RAM module + +**Requirements:** This module depends on [tmux-cpu](https://github.com/tmux-plugins/tmux-cpu/tree/master). + +**Install:** The preferred way to install tmux-cpu is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_ram}" + +set -g @plugin 'tmux-plugins/tmux-cpu' +run '~/.tmux/plugins/tpm/tpm' +``` + +## Weather modules + +### tmux-weather + +**Requirements:** This module depends on [tmux-weather](https://github.com/xamut/tmux-weather). + +**Install:** The preferred way to install tmux-weather is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_weather}" + +set -g @plugin 'xamut/tmux-weather' +run '~/.tmux/plugins/tpm/tpm' +``` + +### tmux-clima + +**Requirements:** This module depends on [tmux-clima](https://github.com/vascomfnunes/tmux-clima). + +**Install:** The preferred way to install tmux-clima is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_clima}" + +set -g @plugin 'vascomfnunes/tmux-clima' +run '~/.tmux/plugins/tpm/tpm' +``` + +## Load module + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_load}" +``` + +## Gitmux module + +**Requirements:** This module depends on [gitmux](https://github.com/arl/gitmux). + +**Install:** To install gitmux, follow the instructions in the [gitmux documentation](https://github.com/arl/gitmux/blob/main/README.md#installing). + +**Configure:** + +Add the gitmux module to the status modules list. + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{@catppuccin_status_gitmux}" +``` + +Follow the instructions in the [gitmux documentation](https://github.com/arl/gitmux/blob/main/README.md#customizing) +to create a gitmux config file. The gitmux plugin expects a file to be present +at `~/.gitmux.conf`. + +Add the following to your `~/.gitmux.conf` so that it uses catppuccin colors: + +```yaml +tmux: + styles: + clear: "#[fg=#{@thm_fg}]" + state: "#[fg=#{@thm_red},bold]" + branch: "#[fg=#{@thm_fg},bold]" + remote: "#[fg=#{@thm_teal}]" + divergence: "#[fg=#{@thm_fg}]" + staged: "#[fg=#{@thm_green},bold]" + conflict: "#[fg=#{@thm_red},bold]" + modified: "#[fg=#{@thm_yellow},bold]" + untracked: "#[fg=#{@thm_mauve},bold]" + stashed: "#[fg=#{@thm_blue},bold]" + clean: "#[fg=#{@thm_rosewater},bold]" + insertions: "#[fg=#{@thm_green}]" + deletions: "#[fg=#{@thm_red}]" +``` + +## Pomodoro module + +**Requirements:**: This module depends on [tmux-pomodoro-plus](https://github.com/olimorris/tmux-pomodoro-plus/tree/main). + +**Install:**: The preferred way to install tmux-pomodoro-plus is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_pomodoro_plus}" + +set -g @plugin 'olimorris/tmux-pomodoro-plus' +run '~/.tmux/plugins/tpm/tpm' +``` + +## Kube module + +**Requirements:** This module depends on [tmux-kubectx](https://github.com/tony-sol/tmux-kubectx). + +**Install:** The preferred way to install tmux-kubectx is using [TPM](https://github.com/tmux-plugins/tpm). + +**Configure:** + +```sh +set -g @catppuccin_kube_context_color "#{@thm_red}" +set -g @catppuccin_kube_namespace_color "#{@thm_sky}" + +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +set -agF status-right "#{E:@catppuccin_status_kube}" + +set -g @plugin 'tony-sol/tmux-kubectx' +run '~/.tmux/plugins/tpm/tpm' +``` diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/01-getting-started.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/01-getting-started.md new file mode 100644 index 0000000..5694094 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/01-getting-started.md @@ -0,0 +1,72 @@ +Want to install the color scheme and make tmux pastel? Great! Here's how. + +## Step 1: Clone this repository + + +```bash +mkdir -p ~/.config/tmux/plugins/catppuccin +git clone -b v2.3.0 https://github.com/catppuccin/tmux.git ~/.config/tmux/plugins/catppuccin/tmux +``` + + +## Step 2: Edit your tmux configuration file + +Using your favourite editor, edit the file `~/.tmux.conf`. + +It should look like this: + +```bash +set -g @catppuccin_flavor 'mocha' + +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux +``` + +This will load the catppuccin plugin and apply the defaults. +To apply the changes to your configuration file, exit tmux completely +and start it again. You can also run `tmux source ~/.tmux.conf`, but this may +not work as well when changing options. + +## Step 3: Customize + +The default configuration looks a little bland. Let's change it to +be a bit more colorful. Edit your tmux config again so it looks like this. + +```bash +# Pick a softer palette. +set -g @catppuccin_flavor 'frappe' + +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux + +# Make the status line more pleasant. +set -g status-left "" +set -g status-right '#[fg=#{@thm_crust},bg=#{@thm_teal}] session: #S ' + +# Ensure that everything on the right side of the status line +# is included. +set -g status-right-length 100 +``` + +There is some new stuff here. Firstly, everything is documented in +the "[tmux man page](https://man7.org/linux/man-pages/man1/tmux.1.html)". +Go check it out if anything is unclear. The lines `set -g ...` are setting +"options". The `-g` means that the option is global, so it applies everywhere. +When an option name begins with `@`, then it is a "user" option and has no +effect on tmux itself. This is used to essentially set global variables. + +Three options are set that control how tmux looks, `status-left`, +`status-right`, and `status-right-length`. These options are documented +in the man page, but the tl;dr is that they control what appears on the left +and right of the status line. + +The `#[]` syntax is an embedded style, similar to inline css. +`fg=#{@thm_crust}` says "make the text the crust color". `@thm_crust` is a +user option set by the plugin. It is created by the line +`run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux`, so if you try +and use colors before that line, it won't work. The `#S` is a special sequence +that tmux replaces with the current session name. There are a long, long +"[list of special sequences](https://man7.org/linux/man-pages/man1/tmux.1.html#FORMATS)" +that tmux can replace. + +If everything is working right, your version should look like this: + +![Demonstration of basic configuration](../../assets/demos/basic.gif) diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/02-custom-status.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/02-custom-status.md new file mode 100644 index 0000000..7ecc4ef --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/02-custom-status.md @@ -0,0 +1,41 @@ +# User Defined Status Line Modules + +To create your own status line module that uses the catppuccin theme, +all you need to do is add it to the `status-left` or `status-right` options. + +You can add arbitrary things to the status line like so: + +```sh +# ~/.tmux.conf + +set -agF status-right "#[fg=#{@thm_crust},bg=#{@thm_teal}] ##H " +``` + +This will append the current hostname (`#H`) to the status line with a teal +background and dark black text. + +You can also use icons for styling, for example to show the used memory percentage +on MacOS: + +```sh +set -g status-right "#[bg=#{@thm_flamingo},fg=#{@thm_crust}]#[reverse]#[noreverse]󱀙 " +set -ag status-right "#[fg=#{@thm_fg},bg=#{@thm_mantle}] #(memory_pressure | awk '/percentage/{print $5}') " +``` + +![Example of the custom ram module](../../assets/ram-example.webp) + +To use the status module formatting that catppuccin uses, do the following: + +```sh +# In ~/.tmux.conf, before the catppuccin plugin has been loaded. + +%hidden MODULE_NAME="my_custom_module" + +set -g "@catppuccin_${MODULE_NAME}_icon" " " +set -gF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_pink}" +set -g "@catppuccin_${MODULE_NAME}_text" "#{pane_current_command}" + +source "/utils/status_module.conf" + +set -g status-right "#{E:@catppuccin_status_application}#{E:@catppuccin_status_my_custom_module}" +``` diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/03-resetting-theme.md b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/03-resetting-theme.md new file mode 100644 index 0000000..7e9ffa5 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/docs/tutorials/03-resetting-theme.md @@ -0,0 +1,216 @@ +# Changing the flavor of the theme by resetting + +To reset the colors colors in your status line, you can perform a reset of all +the options associated with the styling of the Tmux-line. This is done by +setting a global option called `@catppuccin_reset` to `true. + +
+ +A list of all the options that our @catppuccin_reset option resets + +```txt +@thm_bg +@thm_fg +@thm_rosewater +@thm_flamingo +@thm_rosewater +@thm_pink +@thm_mauve +@thm_red +@thm_maroon +@thm_peach +@thm_yellow +@thm_green +@thm_teal +@thm_sky +@thm_sapphire +@thm_blue +@thm_lavender +@thm_subtext_1 +@thm_subtext_0 +@thm_overlay_2 +@thm_overlay_1 +@thm_overlay_0 +@thm_surface_2 +@thm_surface_1 +@thm_surface_0 +@thm_mantle +@thm_crust +@catppuccin_window_status_style +@catppuccin_window_text_color +@catppuccin_window_number_color +@catppuccin_window_text +@catppuccin_window_number +@catppuccin_window_current_text_color +@catppuccin_window_current_number_color +@catppuccin_window_current_text +@catppuccin_window_current_number +@catppuccin_window_number_position +@catppuccin_window_flags +@catppuccin_window_flags_icon_last +@catppuccin_window_flags_icon_current +@catppuccin_window_flags_icon_zoom +@catppuccin_window_flags_icon_mark +@catppuccin_window_flags_icon_silent +@catppuccin_window_flags_icon_activity +@catppuccin_window_flags_icon_bell +@catppuccin_window_flags_icon_format +@catppuccin_status_left_separator +@catppuccin_status_middle_separator +@catppuccin_status_right_separator +@catppuccin_status_connect_separator +@catppuccin_status_module_text_bg +@catppuccin_window_current_left_separator +@catppuccin_window_current_middle_separator +@catppuccin_window_current_right_separator +``` + +
+ +All of these Tmux options above are unset, **with the `-U` flag**, when the +plugin is called with the option named `@catppuccin_reset` with a value of +`true`. Due to _the way options are set within the plugin_, **with the `-o` +flag**, all options set by the user will be reset to plugins original default +values. _This means that if you have set **any** custom options, you **may** +lose your updates and **will need to run the plugin again after setting your +custom options**_. + +> [!TIP] +> Trying running the reset yourself right now and note what breaks for your +> custom setup. That's one good way to experience what's being described above +> locally on your machine. + +This feature is the most useful for auto-switching between the theme's flavor. +It's also useful for contributing or developing the plugin locally as well. + +## Minimal example of resetting the flavor + +If you're using all the defaults of Catppuccin Tmux, you will only have to worry +about setting the flavor when setting the `@catppuccin_reset` option to `true`. + +```sh +# somewhere in a Tmux configuration file that will be sourced specifically for +# reloading `catppuccin/tmux`. +set -g @catppuccin_flavor "latte" +set -g @catppuccin_reset "true" +run /path/to/catppuccin/tmux/catppuccin.tmux +``` + +> [!NOTE] +> Your path above, the line starting with `run ...`, will need to be updated to +> where ever the `catpuccin.tmux` file is located on your system. + +## Custom example of resetting the flavor + +If you're customizing any of the settings that get reset in the list above, you +must set set options you're customizing along with any dependent options _that +aren't necessary_ when configuring the theme for only a single flavor. + +Like in the minimal example, you will set your flavor and also reset the plugin. + +```sh +# somewhere in a Tmux configuration file that will be sourced specifically for +# reloading `catppuccin/tmux`. +set -g @catppuccin_flavor "latte" +set -g @catppuccin_reset "true" +run /path/to/catppuccin/tmux/catppuccin.tmux +# we're not done yet! +``` + +But right afterwards, you'll have to set your customized options both before and +after you `run ...` the plugin. _This does mean running the plugin twice in +rapid succession_. This is due to a limitation of Tmux and how the plugin is +designed to be customizable and also ergonomic to ease with minimal +configuration. + +```sh +# somewhere in a Tmux configuration file that will be sourced specifically for +# reloading `catppuccin/tmux`. +set -g @catppuccin_flavor "mocha" +set -g @catppuccin_reset "true" +run /path/to/catppuccin/tmux/catppuccin.tmux + +# right after the initial reset call. +set -g @catppuccin_flavor "mocha" +set -g @catppuccin_window_status_style "basic" +set -g @catppuccin_window_text " #W" +set -g @catppuccin_window_number "#I" +set -g @catppuccin_window_current_text " #W" +set -g @catppuccin_window_current_number "#I" +set -g @catppuccin_pane_status_enabled "yes" +set -g @catppuccin_pane_border_status "yes" +set -g @catppuccin_window_number_position "right" +set -g @catppuccin_window_current_text "#{pane_current_path}" +set -g @catppuccin_pane_left_separator "▓" +set -g @catppuccin_pane_middle_separator "▓" +set -g @catppuccin_pane_right_separator "▓" +set -g @catppuccin_status_left_separator "▓" +set -g @catppuccin_status_middle_separator "▓" +set -g @catppuccin_status_right_separator "▓" +set -g @catppuccin_status_right_separator_inverse "no" +set -g @catppuccin_status_connect_separator "yes" +set -g @catppuccin_window_status_enable "yes" +set -g @catppuccin_status_fill "icon" +set -g @catppuccin_window_flags "icon" +set -g @catppuccin_application_icon " 󰣆 " +set -g @catppuccin_session_icon "  " +set -g @catppuccin_window_text_color "#{@thm_surface_0}" +set -g @catppuccin_window_number_color "#{@thm_overlay_2}" +set -g @catppuccin_window_current_text_color "#{@thm_surface_1}" +set -g @catppuccin_window_current_number_color "#{@thm_mauve}" +set -g @catppuccin_status_module_bg_color "#{@thm_surface_0}" +set -g @catppuccin_status_application_icon_fg "#{E:@thm_crust}" +set -g @catppuccin_status_application_text_fg "#{E:@thm_fg}" +set -g @catppuccin_application_color "#{E:@thm_maroon}" +set -g @catppuccin_status_session_icon_fg "#{E:@thm_crust}" +set -g @catppuccin_status_session_text_fg "#{E:@thm_fg}" +set -g @catppuccin_session_color "#{?client_prefix,#{E:@thm_red},#{E:@thm_green}}" +set -g @catppuccin_status_module_text_bg "#{?@catppuccin_status_module_bg_color,#{E:@catppuccin_status_module_bg_color},#{@thm_surface_0}}" +run /path/to/catppuccin/tmux/catppuccin.tmux +``` + +Notice that above there are certain lines that are _being set that aren't +usually set initially_. Some of these options are set within the file named +`utils/status_module.conf`, for example. While some are set in the other parts +of the plugin's configuration. This is due to the colors being unset and then +rest to the defaults **because you can't reset this plugin without also running +the default configuration options too**. _These options are highlighted below in +a smaller snippet_. These specific options aren't usually set when configuring +the plugin for a single flavor. Due to how options are reset and then again +immediately set in the `catppuccin_options_tmux.conf` file & all options will be +set to their defaults which aren't going to be what you've customized. + +```sh +# here's some options extracted from the example above which must be set again +# after the reset that you probably would not have to set if you're using the +# reset functionality. +set -g @catppuccin_window_text_color "#{@thm_surface_0}" +set -g @catppuccin_window_number_color "#{@thm_overlay_2}" +set -g @catppuccin_window_current_text_color "#{@thm_surface_1}" +set -g @catppuccin_window_current_number_color "#{@thm_mauve}" +set -g @catppuccin_status_module_bg_color "#{@thm_surface_0}" +set -g @catppuccin_status_application_icon_fg "#{E:@thm_crust}" +set -g @catppuccin_status_application_text_fg "#{E:@thm_fg}" +set -g @catppuccin_application_color "#{E:@thm_maroon}" +set -g @catppuccin_status_session_icon_fg "#{E:@thm_crust}" +set -g @catppuccin_status_session_text_fg "#{E:@thm_fg}" +set -g @catppuccin_session_color "#{?client_prefix,#{E:@thm_red},#{E:@thm_green}}" +set -g @catppuccin_status_module_text_bg "#{?@catppuccin_status_module_bg_color,#{E:@catppuccin_status_module_bg_color},#{@thm_surface_0}}" +``` + +> [!NOTE] +> See the `@catppuccin_status_module_bg_color` and other color options such as +> `@catppuccin_application_color` and others have to be set due to the how the +> plugin resets all the values listed at the top of this document. + +## You should now know how to reset the flavor using Tmux configuration files + +Thanks for reading this far. If there's any questions or concerns please reach +out to the community in our [Discord server][discord] or by creating an issue on [GitHub][github]. + +Hopefully after reading this you've got a much better understanding of both how +to reset the flavor for `catppuccin/tmux` and[the configuration][internal] for this plugin. + +[discord]: https://discord.com/servers/catppuccin-907385605422448742 "The official Catppuccin Discord server" +[github]: https://github.com/catppuccin/tmux/issues/new/choose "This project's GitHub issue type chooser page" +[internal]: ../reference/configuration.md "Our internal configuration document for this plugin" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/renovate.json b/home/river/config/tmux/plugins/catppuccin/tmux/renovate.json new file mode 100644 index 0000000..a222000 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "local>catppuccin/renovate-config" + ] +} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/run_tests.sh b/home/river/config/tmux/plugins/catppuccin/tmux/run_tests.sh new file mode 100755 index 0000000..2fb6a0b --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/run_tests.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) + +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/default_options.sh --expected "${script_dir}"/tests/default_options_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/window_status_styling.sh --expected "${script_dir}"/tests/window_status_styling_expected.txt "$@" + +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/application_module.sh --expected "${script_dir}"/tests/application_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/battery_module.sh --expected "${script_dir}"/tests/battery_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/cpu_module.sh --expected "${script_dir}"/tests/cpu_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/load_module.sh --expected "${script_dir}"/tests/load_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/pane_styling.sh --expected "${script_dir}"/tests/pane_styling_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/ram_module.sh --expected "${script_dir}"/tests/ram_module_expected.txt "$@" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/application.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/application.conf new file mode 100644 index 0000000..16753ed --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/application.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="application" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_maroon}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{pane_current_command}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/battery.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/battery.conf new file mode 100644 index 0000000..090bb73 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/battery.conf @@ -0,0 +1,22 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="battery" + +set -ogq @batt_icon_charge_tier8 "󰁹" +set -ogq @batt_icon_charge_tier7 "󰂁" +set -ogq @batt_icon_charge_tier6 "󰁿" +set -ogq @batt_icon_charge_tier5 "󰁾" +set -ogq @batt_icon_charge_tier4 "󰁽" +set -ogq @batt_icon_charge_tier3 "󰁼" +set -ogq @batt_icon_charge_tier2 "󰁻" +set -ogq @batt_icon_charge_tier1 "󰁺" +set -ogq @batt_icon_status_charged "󰚥" +set -ogq @batt_icon_status_charging "󰂄" +set -ogq @batt_icon_status_discharging "󰂃" +set -ogq @batt_icon_status_unknown "󰂑" +set -ogq @batt_icon_status_attached "󱈑" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "#{l:#{battery_icon}} " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_lavender}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{battery_percentage}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/clima.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/clima.conf new file mode 100644 index 0000000..36900d6 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/clima.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +# Requires https://github.com/vascomfnunes/tmux-clima +%hidden MODULE_NAME="clima" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_yellow}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{clima}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/cpu.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/cpu.conf new file mode 100644 index 0000000..ecae5c4 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/cpu.conf @@ -0,0 +1,18 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="cpu" + +set -ogq @cpu_low_fg_color "#{E:@thm_fg}" +set -ogq @cpu_medium_fg_color "#{E:@thm_fg}" +set -ogq @cpu_high_fg_color "#{E:@thm_crust}" + +set -ogq @cpu_low_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @cpu_medium_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @cpu_high_bg_color "#{E:@thm_red}" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_yellow}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_fg" "#{l:#{cpu_fg_color}}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_bg" "#{l:#{cpu_bg_color}}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{cpu_percentage}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/date_time.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/date_time.conf new file mode 100644 index 0000000..7d09495 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/date_time.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="date_time" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰃰 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_sapphire}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " %Y-%m-%d %H:%M" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/directory.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/directory.conf new file mode 100644 index 0000000..55dacd1 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/directory.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="directory" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_rosewater}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{b:pane_current_path}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf new file mode 100644 index 0000000..233ab0e --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="gitmux" + +# Requires https://github.com/arl/gitmux +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰊢 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_teal}" +set -gq "@catppuccin_${MODULE_NAME}_text" ' #(gitmux -cfg $HOME/.gitmux.conf "#{pane_current_path}")' + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/host.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/host.conf new file mode 100644 index 0000000..c78c1a9 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/host.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="host" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰒋 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_mauve}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #H" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/kube.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/kube.conf new file mode 100644 index 0000000..8ca1e9e --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/kube.conf @@ -0,0 +1,13 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="kube" + +# Requires https://github.com/jonmosco/kube-tmux + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󱃾 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_blue}" +set -ogqF "@catppuccin_kube_context_color" "#{E:@thm_red}" +set -ogqF "@catppuccin_kube_namespace_color" "#{E:@thm_sky}" +set -ogq "@catppuccin_${MODULE_NAME}_text" \ + " #{l:#[fg=#{@catppuccin_kube_context_color}]#{kubectx_context}#[fg=default]:#[fg=#{@catppuccin_kube_namespace_color}]#{kubectx_namespace}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/load.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/load.conf new file mode 100644 index 0000000..0cb6a96 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/load.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="load" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰊚 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_blue}" +set -ogq "@catppuccin_${MODULE_NAME}_text" "#{l:#(uptime | awk '{split(substr($0, index($0, \"load\")), a, \":\"); print a[2]\}}')" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf new file mode 100644 index 0000000..bc17e26 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +# Requires https://github.com/olimorris/tmux-pomodoro-plus +%hidden MODULE_NAME="pomodoro_plus" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_peach}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{pomodoro_status}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/ram.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/ram.conf new file mode 100644 index 0000000..a423bab --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/ram.conf @@ -0,0 +1,18 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="ram" + +set -ogq @ram_low_fg_color "#{E:@thm_fg}" +set -ogq @ram_medium_fg_color "#{E:@thm_fg}" +set -ogq @ram_high_fg_color "#{E:@thm_crust}" + +set -ogq @ram_low_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @ram_medium_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @ram_high_bg_color "#{E:@thm_red}" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_yellow}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_fg" "#{l:#{ram_fg_color}}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_bg" "#{l:#{ram_bg_color}}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{ram_percentage}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/session.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/session.conf new file mode 100644 index 0000000..50f878d --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/session.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="session" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogq "@catppuccin_${MODULE_NAME}_color" "#{?client_prefix,#{E:@thm_red},#{E:@thm_green}}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #S" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/uptime.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/uptime.conf new file mode 100644 index 0000000..c86787f --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/uptime.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="uptime" + +set -ogq @catppuccin_uptime_icon "󰔟 " +set -ogqF @catppuccin_uptime_color "#{E:@thm_sapphire}" +set -ogq @catppuccin_uptime_text " #(uptime | sed 's/^[^,]*up *//; s/, *[[:digit:]]* user.*//; s/ day.*, */d /; s/ hr\\(s*\\).*/h/; s/ min\\(s*\\).*/m/; s/ sec\\(s*\\).*/s/; s/\\([0-9]\\{1,2\\}\\):\\([0-9]\\{1,2\\}\\)/\\1h \\2m/;')" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/user.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/user.conf new file mode 100644 index 0000000..85e6130 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/user.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="user" + +set -ogq @catppuccin_user_icon " " +set -ogqF @catppuccin_user_color "#{E:@thm_sky}" +set -ogq @catppuccin_user_text " #(whoami)" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/status/weather.conf b/home/river/config/tmux/plugins/catppuccin/tmux/status/weather.conf new file mode 100644 index 0000000..b55146c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/status/weather.conf @@ -0,0 +1,10 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="weather" + +# Requires https://github.com/xamut/tmux-weather. + +set -ogq @catppuccin_weather_icon " " +set -ogqF @catppuccin_weather_color "#{E:@thm_yellow}" +set -ogq @catppuccin_weather_text " #{l:#{weather}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh new file mode 100644 index 0000000..8159220 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_status_application | grep -q "@thm_" && + echo "@catppuccin_status_application did not expand all colors" + +print_option @catppuccin_status_application | sed -E 's/(bash|fish|zsh)//' diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt new file mode 100644 index 0000000..75f4082 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt @@ -0,0 +1 @@ +@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[fg=#313244] diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh new file mode 100644 index 0000000..9243959 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_status_battery diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt new file mode 100644 index 0000000..c29e485 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt @@ -0,0 +1 @@ +@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[fg=#313244] diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh new file mode 100644 index 0000000..f6d30cc --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option E:@catppuccin_status_cpu diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt new file mode 100644 index 0000000..61695f5 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt @@ -0,0 +1 @@ +E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[fg=#{cpu_bg_color}] diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh new file mode 100755 index 0000000..9d94c0e --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_flavor +print_option @catppuccin_menu_selected_style +print_option @catppuccin_pane_active_border_style diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt new file mode 100644 index 0000000..4544de4 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt @@ -0,0 +1,3 @@ +@catppuccin_flavor mocha +@catppuccin_menu_selected_style fg=#{@thm_fg},bold,bg=#{@thm_overlay_0} +@catppuccin_pane_active_border_style ##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/harness.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/harness.sh new file mode 100755 index 0000000..ed76b96 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/harness.sh @@ -0,0 +1,153 @@ +#!/usr/bin/env bash + +set -Euo pipefail +trap cleanup SIGINT SIGTERM ERR EXIT + +usage() { + trap - EXIT + cat <&2 -e "${1-}" +} + +msg_verbose() { + if [ "$VERBOSE" = true ]; then + msg "$@" + fi +} + +SOCKET_NAME="${SOCKET_NAME:-test}" +SESSION_NAME="test-session" + +tmux() { + command tmux -L "$SOCKET_NAME" -f /dev/null "$@" +} + +start_tmux_server() { + msg_verbose "${CYAN}Starting tmux server on socket ${SOCKET_NAME}${NOFORMAT}" + tmux new -s "$SESSION_NAME" -d "$(which bash)" +} + +kill_tmux_server() { + msg_verbose "${CYAN}Stopping tmux server${NOFORMAT}" + tmux kill-session "$SESSION_NAME" 2>/dev/null + tmux kill-server 2>/dev/null +} + +cleanup() { + trap - SIGINT SIGTERM ERR EXIT + + # If the session is still running then stop it. + tmux has-session -t "$SESSION_NAME" 2>/dev/null + if test $? -eq 0; then + kill_tmux_server + fi +} + +die() { + local msg=$1 + local code=${2-1} # default exit status 1 + msg "$msg" + + cleanup + + exit "$code" +} + +parse_params() { + # default values of variables set from params + test_script='' + expected_output='' + + while :; do + case "${1-}" in + -h | --help) usage ;; + --no-color) NO_COLOR=1 ;; + -t | --test) + test_script="${2-}" + shift + ;; + -e | --expected) + expected_output="${2-}" + shift + ;; + -v | --verbose) + VERBOSE=true + shift + ;; + -?*) die "Unknown option: $1" ;; + *) break ;; + esac + shift + done + + # shellcheck disable=SC2034 + args=("$@") + + # check required params and arguments + [[ -z "${test_script-}" ]] && die "Missing required parameter: -t|--test" + [[ -z "${expected_output-}" ]] && die "Missing required parameter: -e|--expected" + + return 0 +} + +parse_params "$@" +setup_colors + +run_test() { + msg_verbose "Running test ${test_script} and checking the output against ${expected_output}" + + start_tmux_server + + local script_name + script_name=$(basename "${test_script}") + + local output + # shellcheck disable=SC1090 + output=$(source "${test_script}") + test_exit_code="$?" + + if test $test_exit_code -ne 0; then + die "\n${RED}Test ${script_name} exited with code $test_exit_code ${NOFORMAT}" + fi + + echo -e "${output}" | diff -abB --color=${DIFFCOLORS} "${expected_output}" - + + if test $? -eq 0; then + msg "${GREEN}Test ${script_name} passed${NOFORMAT}" + else + die "\n${RED}Test ${script_name} failed${NOFORMAT}" + fi + + cleanup +} + +run_test diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh new file mode 100644 index 0000000..38ae83c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Returns the value of given tmux option. +# First argument is the option name, e.g. @catppuccin_flavor. +# +# Usage: `get_option @catppuccin_flavor` +# Would return: `mocha` +# +# The option is given as a format string. +get_option() { + local option + option=$1 + + tmux display-message -p "#{${option}}" +} + +# Prints the given tmux option to stdout. +# First argument is the option name, e.g. @catppuccin_flavor. +# +# Usage: `print_option @catppuccin_flavor` +# Would print: `@catppuccin_flavor mocha` +# +# The option is given as a format string. +print_option() { + local option + option=$1 + + printf "\n%s " "${option}" + get_option "$option" +} diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh new file mode 100644 index 0000000..a1d876c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option E:@catppuccin_status_load diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt new file mode 100644 index 0000000..e984dc2 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt @@ -0,0 +1,3 @@ + +E:@catppuccin_status_load #[fg=#89b4fa]#[fg=#11111b,bg=#89b4fa]󰊚 #[fg=#cdd6f4,bg=#313244]#(uptime | awk '{split(substr($0, index($0, "load")), a, ":"); print a[2]}')#[fg=#313244] + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh new file mode 100644 index 0000000..4f5e015 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +tmux set -g @catppuccin_pane_status_enabled "yes" + +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option pane-border-format + +# Switch the number position to the right +tmux set -g @catppuccin_pane_number_position "right" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format + +tmux set -g @catppuccin_pane_number_position "left" # reset + +# Fill option "all" +tmux set -g @catppuccin_pane_default_fill "all" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format + +tmux set -g @catppuccin_pane_default_fill "number" # reset + +# Fill option "none" +tmux set -g @catppuccin_pane_default_fill "none" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt new file mode 100644 index 0000000..d57e36f --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt @@ -0,0 +1,4 @@ +pane-border-format #[fg=#a6e3a1,bg=default]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=#313244]█ #[fg=#a6e3a1,bg=#313244]#{b:pane_current_path}#[fg=#313244,bg=default]█ +pane-border-format #[fg=#313244,bg=default]█#[fg=#a6e3a1,bg=#313244]#{b:pane_current_path} #[fg=#a6e3a1,bg=#313244]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=default]█ +pane-border-format #[fg=#a6e3a1,bg=default]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=#313244]█ #[fg=#313244,bg=#a6e3a1]#{b:pane_current_path}#[fg=#a6e3a1,bg=default]█ +pane-border-format #[fg=#313244,bg=default]█#[fg=#cdd6f4,bg=#313244]#{pane_index}#[fg=#cdd6f4,bg=#313244]█ #[fg=#cdd6f4,bg=#313244]#{b:pane_current_path}#[fg=#313244,bg=default]█ diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module.sh new file mode 100644 index 0000000..de53128 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option E:@catppuccin_status_ram diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module_expected.txt new file mode 100644 index 0000000..e28b5aa --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/ram_module_expected.txt @@ -0,0 +1 @@ +E:@catppuccin_status_ram #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{ram_fg_color},bg=#{ram_bg_color}] #{ram_percentage}#[fg=#{ram_bg_color}] diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh b/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh new file mode 100644 index 0000000..069a012 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# Unsets (removes) any styling options that will contaminate +# subsequent test runs. +function reset() { + tmux set -gu @catppuccin_window_current_left_separator + tmux set -gu @catppuccin_window_current_middle_separator + tmux set -gu @catppuccin_window_current_right_separator + tmux set -gu @catppuccin_window_status_style +} + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format + +# Test the rounded style +reset +tmux set -g @catppuccin_window_status_style "rounded" +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format + +# Test the basic style with the number on the right +reset +tmux set -g @catppuccin_window_number_position "right" +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt b/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt new file mode 100644 index 0000000..2bc69b8 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt @@ -0,0 +1,6 @@ +window-status-format #[fg=#11111b,bg=#{@thm_overlay_2}] #I #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T +window-status-current-format #[fg=#11111b,bg=#{@thm_mauve}] #I #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T +window-status-format #[fg=#11111b,bg=#{@thm_overlay_2}]#[fg=#181825,reverse]#[none]#I #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T#[fg=#181825,reverse]#[none] +window-status-current-format #[fg=#11111b,bg=#{@thm_mauve}]#[fg=#181825,reverse]#[none]#I #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T#[fg=#181825,reverse]#[none] +window-status-format #[fg=#cdd6f4,bg=#{@thm_surface_0}] #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T #[fg=#11111b,bg=#{@thm_overlay_2}] #I +window-status-current-format #[fg=#cdd6f4,bg=#{@thm_surface_1}] #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T #[fg=#11111b,bg=#{@thm_mauve}] #I diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf new file mode 100644 index 0000000..9aeb159 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf @@ -0,0 +1,34 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Frappe) +set -ogq @thm_bg "#303446" +set -ogq @thm_fg "#c6d0f5" + +# Colors +set -ogq @thm_rosewater "#f2d5cf" +set -ogq @thm_flamingo "#eebebe" +set -ogq @thm_pink "#f4b8e4" +set -ogq @thm_mauve "#ca9ee6" +set -ogq @thm_red "#e78284" +set -ogq @thm_maroon "#ea999c" +set -ogq @thm_peach "#ef9f76" +set -ogq @thm_yellow "#e5c890" +set -ogq @thm_green "#a6d189" +set -ogq @thm_teal "#81c8be" +set -ogq @thm_sky "#99d1db" +set -ogq @thm_sapphire "#85c1dc" +set -ogq @thm_blue "#8caaee" +set -ogq @thm_lavender "#babbf1" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a5adce" +set -ogq @thm_subtext_0 "#b5bfe2" +set -ogq @thm_overlay_2 "#949cbb" +set -ogq @thm_overlay_1 "#838ba7" +set -ogq @thm_overlay_0 "#737994" +set -ogq @thm_surface_2 "#626880" +set -ogq @thm_surface_1 "#51576d" +set -ogq @thm_surface_0 "#414559" +set -ogq @thm_mantle "#292c3c" +set -ogq @thm_crust "#232634" + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf new file mode 100644 index 0000000..0ec65c3 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf @@ -0,0 +1,34 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Latte) +set -ogq @thm_bg "#eff1f5" +set -ogq @thm_fg "#4c4f69" + +# Colors +set -ogq @thm_rosewater "#dc8a78" +set -ogq @thm_flamingo "#dd7878" +set -ogq @thm_pink "#ea76cb" +set -ogq @thm_mauve "#8839ef" +set -ogq @thm_red "#d20f39" +set -ogq @thm_maroon "#e64553" +set -ogq @thm_peach "#fe640b" +set -ogq @thm_yellow "#df8e1d" +set -ogq @thm_green "#40a02b" +set -ogq @thm_teal "#179299" +set -ogq @thm_sky "#04a5e5" +set -ogq @thm_sapphire "#209fb5" +set -ogq @thm_blue "#1e66f5" +set -ogq @thm_lavender "#7287fd" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#6c6f85" +set -ogq @thm_subtext_0 "#5c5f77" +set -ogq @thm_overlay_2 "#7c7f93" +set -ogq @thm_overlay_1 "#8c8fa1" +set -ogq @thm_overlay_0 "#9ca0b0" +set -ogq @thm_surface_2 "#acb0be" +set -ogq @thm_surface_1 "#bcc0cc" +set -ogq @thm_surface_0 "#ccd0da" +set -ogq @thm_mantle "#e6e9ef" +set -ogq @thm_crust "#dce0e8" + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf new file mode 100644 index 0000000..b1a43c2 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf @@ -0,0 +1,34 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Macchiato) +set -ogq @thm_bg "#24273a" +set -ogq @thm_fg "#cad3f5" + +# Colors +set -ogq @thm_rosewater "#f4dbd6" +set -ogq @thm_flamingo "#f0c6c6" +set -ogq @thm_pink "#f5bde6" +set -ogq @thm_mauve "#c6a0f6" +set -ogq @thm_red "#ed8796" +set -ogq @thm_maroon "#ee99a0" +set -ogq @thm_peach "#f5a97f" +set -ogq @thm_yellow "#eed49f" +set -ogq @thm_green "#a6da95" +set -ogq @thm_teal "#8bd5ca" +set -ogq @thm_sky "#91d7e3" +set -ogq @thm_sapphire "#7dc4e4" +set -ogq @thm_blue "#8aadf4" +set -ogq @thm_lavender "#b7bdf8" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a5adcb" +set -ogq @thm_subtext_0 "#b8c0e0" +set -ogq @thm_overlay_2 "#939ab7" +set -ogq @thm_overlay_1 "#8087a2" +set -ogq @thm_overlay_0 "#6e738d" +set -ogq @thm_surface_2 "#5b6078" +set -ogq @thm_surface_1 "#494d64" +set -ogq @thm_surface_0 "#363a4f" +set -ogq @thm_mantle "#1e2030" +set -ogq @thm_crust "#181926" + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf new file mode 100644 index 0000000..994553c --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf @@ -0,0 +1,34 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Mocha) +set -ogq @thm_bg "#1e1e2e" +set -ogq @thm_fg "#cdd6f4" + +# Colors +set -ogq @thm_rosewater "#f5e0dc" +set -ogq @thm_flamingo "#f2cdcd" +set -ogq @thm_pink "#f5c2e7" +set -ogq @thm_mauve "#cba6f7" +set -ogq @thm_red "#f38ba8" +set -ogq @thm_maroon "#eba0ac" +set -ogq @thm_peach "#fab387" +set -ogq @thm_yellow "#f9e2af" +set -ogq @thm_green "#a6e3a1" +set -ogq @thm_teal "#94e2d5" +set -ogq @thm_sky "#89dceb" +set -ogq @thm_sapphire "#74c7ec" +set -ogq @thm_blue "#89b4fa" +set -ogq @thm_lavender "#b4befe" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a6adc8" +set -ogq @thm_subtext_0 "#bac2de" +set -ogq @thm_overlay_2 "#9399b2" +set -ogq @thm_overlay_1 "#7f849c" +set -ogq @thm_overlay_0 "#6c7086" +set -ogq @thm_surface_2 "#585b70" +set -ogq @thm_surface_1 "#45475a" +set -ogq @thm_surface_0 "#313244" +set -ogq @thm_mantle "#181825" +set -ogq @thm_crust "#11111b" + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/tmux.tera b/home/river/config/tmux/plugins/catppuccin/tmux/tmux.tera new file mode 100644 index 0000000..93330ac --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/tmux.tera @@ -0,0 +1,42 @@ +--- +whiskers: + version: "^2.5.1" + matrix: + - flavor + filename: "themes/catppuccin_{{flavor.identifier}}_tmux.conf" + hex_format: "#{{r}}{{g}}{{b}}{{z}}" +--- +# vim:set ft=tmux: + +# --> Catppuccin ({{ flavor.identifier | capitalize }}) +set -ogq @thm_bg "{{ base.hex }}" +set -ogq @thm_fg "{{ text.hex }}" + +# Colors +set -ogq @thm_rosewater "{{ rosewater.hex }}" +set -ogq @thm_flamingo "{{ flamingo.hex }}" +set -ogq @thm_pink "{{ pink.hex }}" +set -ogq @thm_mauve "{{ mauve.hex }}" +set -ogq @thm_red "{{ red.hex }}" +set -ogq @thm_maroon "{{ maroon.hex }}" +set -ogq @thm_peach "{{ peach.hex }}" +set -ogq @thm_yellow "{{ yellow.hex }}" +set -ogq @thm_green "{{ green.hex }}" +set -ogq @thm_teal "{{ teal.hex }}" +set -ogq @thm_sky "{{ sky.hex }}" +set -ogq @thm_sapphire "{{ sapphire.hex }}" +set -ogq @thm_blue "{{ blue.hex }}" +set -ogq @thm_lavender "{{ lavender.hex }}" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "{{ subtext0.hex }}" +set -ogq @thm_subtext_0 "{{ subtext1.hex }}" +set -ogq @thm_overlay_2 "{{ overlay2.hex }}" +set -ogq @thm_overlay_1 "{{ overlay1.hex }}" +set -ogq @thm_overlay_0 "{{ overlay0.hex }}" +set -ogq @thm_surface_2 "{{ surface2.hex }}" +set -ogq @thm_surface_1 "{{ surface1.hex }}" +set -ogq @thm_surface_0 "{{ surface0.hex }}" +set -ogq @thm_mantle "{{ mantle.hex }}" +set -ogq @thm_crust "{{ crust.hex }}" + diff --git a/home/river/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf b/home/river/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf new file mode 100644 index 0000000..fc72578 --- /dev/null +++ b/home/river/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf @@ -0,0 +1,47 @@ +# vim:set ft=tmux: + +# Embedded style that ensures that modules look "connected" +# when required. +set -gqF @_ctp_connect_style \ + "#{?#{==:#{@catppuccin_status_connect_separator},yes},,#[bg=default]}" + +# There are four colors involved: +# +# - Icon +# - fg: @catppuccin_status_[module]_icon_fg [default = crust] +# - bg: @catppuccin_status_[module]_icon_bg [required] +# - Text +# - fg: @catppuccin_status_[module]_text_fg [default = foreground] +# - bg: @catppuccin_status_[module]_text_bg [default = @catppuccin_status_module_text_bg] + +set -ogqF "@catppuccin_status_${MODULE_NAME}_icon_fg" "#{E:@thm_crust}" +set -ogqF "@catppuccin_status_${MODULE_NAME}_text_fg" "#{E:@thm_fg}" + +%if "#{==:#{@catppuccin_status_${MODULE_NAME}_icon_bg},}" + set -gqF "@catppuccin_status_${MODULE_NAME}_icon_bg" "#{@catppuccin_${MODULE_NAME}_color}" +%endif + +%if "#{==:#{@catppuccin_status_${MODULE_NAME}_text_bg},}" + set -gqF @_ctp_module_text_bg "#{E:@catppuccin_status_module_text_bg}" +%else + set -gqF @_ctp_module_text_bg "#{@catppuccin_status_${MODULE_NAME}_text_bg}" +%endif + +set -gF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_fg},bg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@catppuccin_${MODULE_NAME}_icon}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#{@catppuccin_status_middle_separator}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_text_fg},bg=#{@_ctp_module_text_bg}]" + +set -ag "@catppuccin_status_${MODULE_NAME}" "#{E:@catppuccin_${MODULE_NAME}_text}" + +set -agF "@catppuccin_status_${MODULE_NAME}" "#[fg=#{@_ctp_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}" + +set -ug @_ctp_connect_style +set -ug @_ctp_module_text_bg diff --git a/home/river/config/tmux/tmux.conf b/home/river/config/tmux/tmux.conf new file mode 100644 index 0000000..cf4bfca --- /dev/null +++ b/home/river/config/tmux/tmux.conf @@ -0,0 +1,28 @@ +set-option -sa terminal-overrides ",xterm*:Tc" + +bind '"' split-window -v -c "#{pane_current_path}" +bind % split-window -h -c "#{pane_current_path}" + +set -g mouse on +set -g base-index 1 +set -g pane-base-index 1 +set-window-option -g pane-base-index 1 +set-option -g renumber-windows on + +set -g @plugin 'tmux-plugins/tpm' + +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux +set -g @catppuccin_flavor 'mocha' # latte, frappe, macchiato or mocha + +set -g @plugin 'tmux-plugins/tmux-yank' + +set -g @plugin 'tmux-plugins/tmux-sensible' + +# Other examples: +# set -g @plugin 'github_username/plugin_name' +# set -g @plugin 'github_username/plugin_name#branch' +# set -g @plugin 'git@github.com:user/plugin' +# set -g @plugin 'git@bitbucket.com:user/plugin' + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm' diff --git a/home/river/default.nix b/home/river/default.nix new file mode 100644 index 0000000..af2d545 --- /dev/null +++ b/home/river/default.nix @@ -0,0 +1,42 @@ +{ pkgs, ... }: + +{ + + imports = [ + ./programs/bash.nix + ./programs/git.nix + ./programs/gpg.nix + ./programs/fish.nix + ./programs/vesktop.nix + ./programs/java.nix + ]; + + programs.home-manager.enable = true; + + home = { + packages = with pkgs; [ + bash + fish + vesktop + neovim + tmux + ]; + + file = { + ".config/hypr".source = ./config/hypr; + ".config/tmux".source = ./config/tmux; + ".config/ghostty".source = ./config/ghostty; + ".config/nvim".source = ./config/nvim; + ".config/fish".source = ./config/fish; + }; + + sessionVariables = { + EDITOR = "nvim"; + }; + + username = "river"; + homeDirectory = "/home/river"; + + stateVersion = "26.05"; + }; +} diff --git a/home/river/programs/bash.nix b/home/river/programs/bash.nix new file mode 100644 index 0000000..35b6e6f --- /dev/null +++ b/home/river/programs/bash.nix @@ -0,0 +1,44 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ./eza.nix + ./starship.nix + ./zoxide.nix + ]; + + home.packages = with pkgs; [ + bash + bat + fzf + fd + zoxide + ripgrep + neovim + ]; + + programs.bash = { + enable = true; + + shellAliases = { + ll = "eza -lah"; + ls = "eza"; + cat = "bat"; + grep = "grep --color=auto"; + }; + + historyControl = [ + "ignoredups" + "ignorespace" + ]; + + historySize = 10000; + + initExtra = '' + eval "$(zoxide init bash)" + source ${pkgs.carapace}/share/bash/carapace.bash + + export EDITOR=nvim + ''; + }; +} diff --git a/home/river/programs/eza.nix b/home/river/programs/eza.nix new file mode 100644 index 0000000..e4a98c8 --- /dev/null +++ b/home/river/programs/eza.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.eza = { + enable = true; + icons = "auto"; + }; +} diff --git a/home/river/programs/fish.nix b/home/river/programs/fish.nix new file mode 100644 index 0000000..e29f52b --- /dev/null +++ b/home/river/programs/fish.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: + +{ + imports = [ + ./eza.nix + ./starship.nix + ./zoxide.nix + ]; + + home.packages = with pkgs; [ + fish + bat + fzf + fd + zoxide + ripgrep + neovim + ]; + + home.file.".config/fish".source = ../config/fish; + + programs.fish.enable = true; +} diff --git a/home/river/programs/git.nix b/home/river/programs/git.nix new file mode 100644 index 0000000..975ce4b --- /dev/null +++ b/home/river/programs/git.nix @@ -0,0 +1,35 @@ +{ pkgs, ... }: + +{ + programs.git = { + enable = true; + package = pkgs.gitFull; + settings = { + user = { + name = "Maaz Khokhar"; + email = "khokharmaaz@gmail.com"; + }; + commit.gpgSign = true; + tag.gpgSign = true; + gpg.program = "${pkgs.gnupg}/bin/gpg"; + init.defaultBranch = "main"; + pull.rebase = true; + credential.helper = "libsecret"; + push.autoSetupRemote = true; + }; + + signing = { + key = "0xA8D1AEA9C92D6867"; + signByDefault = true; + }; + }; + + programs.delta = { + enable = true; + options = { + features = "decorations interactive"; + navigate = true; + hyperlinks = true; + }; + }; +} diff --git a/home/river/programs/gpg.nix b/home/river/programs/gpg.nix new file mode 100644 index 0000000..11f30b6 --- /dev/null +++ b/home/river/programs/gpg.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +{ + services.gpg-agent = { + enable = true; + defaultCacheTtl = 1800; + maxCacheTtl = 1800; + pinentry.package = pkgs.pinentry-qt; + }; + + services.gpg-agent.extraConfig = '' + pinentry-program ${pkgs.pinentry-qt}/bin/pinentry + ''; + + programs.gpg = { + enable = true; + settings = { + auto-key-locate = "local,wkd,keyserver"; + keyserver = "hkps://keys.openpgp.org"; + }; + }; +} diff --git a/home/river/programs/java.nix b/home/river/programs/java.nix new file mode 100644 index 0000000..8739eb4 --- /dev/null +++ b/home/river/programs/java.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: + +{ + home.file.".java/jdk-17".source = pkgs.jdk17; + home.file.".java/jdk-25".source = pkgs.jdk25; +} diff --git a/home/river/programs/starship.nix b/home/river/programs/starship.nix new file mode 100644 index 0000000..2a21f25 --- /dev/null +++ b/home/river/programs/starship.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + programs.starship = { + enable = true; + enableBashIntegration = true; + }; +} diff --git a/home/river/programs/vesktop.nix b/home/river/programs/vesktop.nix new file mode 100644 index 0000000..1e05fe4 --- /dev/null +++ b/home/river/programs/vesktop.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + vesktop + ]; +} diff --git a/home/river/programs/zoxide.nix b/home/river/programs/zoxide.nix new file mode 100644 index 0000000..07ba5ca --- /dev/null +++ b/home/river/programs/zoxide.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + programs.zoxide = { + enable = true; + enableBashIntegration = true; + enableFishIntegration = true; + }; +} diff --git a/modules/additionalUsers/aariz.nix b/modules/additionalUsers/aariz.nix new file mode 100644 index 0000000..ac4f60f --- /dev/null +++ b/modules/additionalUsers/aariz.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + users.users.aariz = { + isNormalUser = true; + description = "Aariz Khokhar"; + packages = with pkgs; [ google-chrome ]; + shell = pkgs.bash; + }; +} \ No newline at end of file diff --git a/modules/bluetooth/default.nix b/modules/bluetooth/default.nix new file mode 100644 index 0000000..266fb7e --- /dev/null +++ b/modules/bluetooth/default.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: + +{ + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + settings = { + General = { + Experimental = true; + }; + Policy = { + AutoEnable = true; + }; + }; + }; + + environment.systemPackages = with pkgs; [ + bluez + bluez-tools + blueman + ]; + + services.blueman.enable = true; +} diff --git a/modules/core/default.nix b/modules/core/default.nix new file mode 100644 index 0000000..27dbb39 --- /dev/null +++ b/modules/core/default.nix @@ -0,0 +1,100 @@ +{ pkgs, ... }: + +{ + boot.kernelPackages = pkgs.linuxPackages_latest; + + time.timeZone = "America/Chicago"; + + programs.fish.enable = true; + + users.users.river = { + isNormalUser = true; + description = "Maaz Khokhar"; + extraGroups = [ + "wheel" + "networkmanager" + "input" + ]; + + shell = pkgs.fish; + }; + + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + gitFull + neovim + btop + unzip + mpv + wl-clipboard + wireplumber + brightnessctl + pulseaudio + pavucontrol + ghostty + git-credential-manager + gnupg + yazi + ]; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + settings = { + trusted-users = [ + "root" + "river" + ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + auto-optimise-store = true; + }; + }; + + programs.nix-ld.enable = true; + + i18n = { + defaultLocale = "en_US.UTF-8"; + + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; + + security.rtkit.enable = true; + + services = { + xserver.xkb = { + layout = "us"; + variant = ""; + }; + + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + openssh = { + enable = true; + settings.PermitRootLogin = "no"; + }; + + printing.enable = true; + }; +} diff --git a/modules/development/clang.nix b/modules/development/clang.nix new file mode 100644 index 0000000..eb9c9e4 --- /dev/null +++ b/modules/development/clang.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + gcc + cmake + clang + ]; +} diff --git a/modules/development/claude.nix b/modules/development/claude.nix new file mode 100644 index 0000000..c1b1097 --- /dev/null +++ b/modules/development/claude.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + claude-code + ]; +} diff --git a/modules/development/default.nix b/modules/development/default.nix new file mode 100644 index 0000000..8917bb9 --- /dev/null +++ b/modules/development/default.nix @@ -0,0 +1,30 @@ +{ inputs, pkgs, ... }: + +{ + imports = [ + ./rust.nix + ]; + + environment.systemPackages = with pkgs; [ + # General + git + neovim + nixfmt + nixd + kubectl + jq + tmux + vscode + devenv + xh + nodejs + ]; + + # Nix LSP + nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; + + fonts.packages = with pkgs; [ + nerd-fonts.fira-code + nerd-fonts.jetbrains-mono + ]; +} diff --git a/modules/development/python.nix b/modules/development/python.nix new file mode 100644 index 0000000..e72d19f --- /dev/null +++ b/modules/development/python.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + python313 + + # package tooling + python313Packages.uv + python313Packages.virtualenv + + # dev tools + ruff + black + mypy + + # optional data science base tools + python313Packages.numpy + python313Packages.pandas + ]; +} diff --git a/modules/development/rust.nix b/modules/development/rust.nix new file mode 100644 index 0000000..b493370 --- /dev/null +++ b/modules/development/rust.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + cargo + rustc + rustfmt + clippy + ]; + + environment.variables = { + RUST_BACKTRACE = "1"; + }; +} diff --git a/modules/development/typescript.nix b/modules/development/typescript.nix new file mode 100644 index 0000000..b6f79a4 --- /dev/null +++ b/modules/development/typescript.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + bun + + # TS tooling (optional but common) + typescript + nodePackages.typescript-language-server + nodePackages.eslint + nodePackages.prettier + ]; + + environment.variables = { + NODE_OPTIONS = "--max-old-space-size=4096"; + }; +} diff --git a/modules/networking/core/default.nix b/modules/networking/core/default.nix new file mode 100644 index 0000000..e65f50d --- /dev/null +++ b/modules/networking/core/default.nix @@ -0,0 +1,38 @@ +{ ... }: + +{ + imports = [ + ./firewall.nix + ]; + + networking = { + networkmanager = { + enable = true; + dns = "systemd-resolved"; + }; + extraHosts = "192.168.1.60 laptop"; + nftables.enable = true; + + nameservers = [ + "192.168.1.193" # Pi-hole + "1.1.1.1" # Cloudflare + "1.0.0.1" # Cloudflare (Secondary) + ]; + }; + + services.resolved = { + enable = true; + + settings.Resolve = { + dnssec = "true"; + DNSOverTLS = "true"; + domains = [ "~." ]; + fallbackDns = [ + "192.168.1.193" # Pi-hole + "1.1.1.1" # Cloudflare + "1.0.0.1" # Cloudflare (Secondary) + ]; + }; + + }; +} diff --git a/modules/networking/core/firewall.nix b/modules/networking/core/firewall.nix new file mode 100644 index 0000000..88c1f69 --- /dev/null +++ b/modules/networking/core/firewall.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + networking.firewall = { + enable = true; + + allowPing = true; + + allowedTCPPorts = [ + 22 + 80 + ]; + allowedUDPPorts = [ + 53 + ]; + }; +} diff --git a/modules/networking/default.nix b/modules/networking/default.nix new file mode 100644 index 0000000..9326373 --- /dev/null +++ b/modules/networking/default.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + imports = [ + ./core + ./tailscale.nix + ]; +} diff --git a/modules/networking/tailscale.nix b/modules/networking/tailscale.nix new file mode 100644 index 0000000..57a3e57 --- /dev/null +++ b/modules/networking/tailscale.nix @@ -0,0 +1,25 @@ +{ config, ... }: + +{ + services.tailscale = { + enable = true; + openFirewall = true; + extraSetFlags = [ "--operator=river" ]; + }; + + networking.firewall = { + trustedInterfaces = [ config.services.tailscale.interfaceName ]; + allowedUDPPorts = [ config.services.tailscale.port ]; + }; + + systemd.services.tailscaled.serviceConfig.Environment = [ + "TS_DEBUG_FIREWALL_MODE=nftables" + ]; + + systemd.network.wait-online.enable = false; + boot.initrd.systemd.network.wait-online.enable = false; + + users.users.river.extraGroups = [ + "tailscale" + ]; +} diff --git a/modules/networking/wireguard.nix b/modules/networking/wireguard.nix new file mode 100644 index 0000000..70f233a --- /dev/null +++ b/modules/networking/wireguard.nix @@ -0,0 +1,22 @@ +{ ... }: + +{ + networking.wireguard.interfaces = { + wg0 = { + ips = [ "10.0.0.2/24" ]; + privateKeyFile = "/etc/wireguard/private.key"; # Keep secrets out of the nix store! + + peers = [ + { + publicKey = "vUUL4CD+1Sa2U2SZYa2P9IoFC2HxEr+PYNmYfRE8wwY="; + allowedIPs = [ "0.0.0.0/0" ]; + endpoint = "server.maariz.org:51820"; + persistentKeepalive = 25; + } + ]; + }; + }; + + # Ensure the Wireguard UDP port is open if you are hosting the server + networking.firewall.allowedUDPPorts = [ 51820 ]; +} diff --git a/modules/virtualization/default.nix b/modules/virtualization/default.nix new file mode 100644 index 0000000..a29a57b --- /dev/null +++ b/modules/virtualization/default.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + imports = [ + ./podman.nix + ./qemu.nix + ./lima.nix + ]; +} diff --git a/modules/virtualization/lima.nix b/modules/virtualization/lima.nix new file mode 100644 index 0000000..9676f94 --- /dev/null +++ b/modules/virtualization/lima.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + lima + ]; +} diff --git a/modules/virtualization/podman.nix b/modules/virtualization/podman.nix new file mode 100644 index 0000000..004bebe --- /dev/null +++ b/modules/virtualization/podman.nix @@ -0,0 +1,38 @@ +{ pkgs, ... }: + +{ + virtualisation.podman = { + enable = true; + + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + }; + + # For rootless containers + security.unprivilegedUsernsClone = true; + + users.users.river = { + subUidRanges = [ + { + startUid = 100000; + count = 65536; + } + ]; + subGidRanges = [ + { + startGid = 100000; + count = 65536; + } + ]; + + extraGroups = [ + "podman" + ]; + }; + + environment.systemPackages = with pkgs; [ + podman + podman-compose + podman-desktop + ]; +} diff --git a/modules/virtualization/qemu.nix b/modules/virtualization/qemu.nix new file mode 100644 index 0000000..6599409 --- /dev/null +++ b/modules/virtualization/qemu.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: + +{ + virtualisation.spiceUSBRedirection.enable = true; + + virtualisation = { + containers.enable = true; + libvirtd = { + enable = true; + qemu = { + package = pkgs.qemu_kvm; + swtpm.enable = true; + }; + }; + }; + + programs.virt-manager.enable = true; + + users.users.river.extraGroups = [ + "libvirtd" + "kvm" + ]; + + boot.kernelModules = [ + "kvm-intel" + "kvm-amd" + ]; +}