refractored neovim config

10 files changed, 697 insertions, 1473 deletions

diff --git a/nvim/LICENSE b/nvim/LICENSE
deleted file mode 100644
index 3877ae0..0000000
--- a/nvim/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE

-                       Version 3, 29 June 2007

-

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>

- 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.

-

-    <one line to give the program's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    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 <https://www.gnu.org/licenses/>.

-

-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:

-

-    <program>  Copyright (C) <year>  <name of author>

-    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

-<https://www.gnu.org/licenses/>.

-

-  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

-<https://www.gnu.org/licenses/why-not-lgpl.html>.

diff --git a/nvim/init.lua b/nvim/init.lua
index 343fd4b..7c8b9e2 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,382 +1,10 @@
-require("options")

-require("codev")

-require("plugins")

-require("keybindings")

-require('lspconfig').marksman.setup{}

+-- Load core settings

+require('core.options')

+require('core.keymaps')

+require('core.autocmds')

 

-local harpoon = require("harpoon")

-local actions = require "telescope.actions"

+-- Load plugins

+require('plugins')

 

-

-

-if vim.g.neovide then

-    vim.g.neovide_confirm_quit = true

-    vim.cmd [[

-        autocmd VimEnter * cd D:\Optics\CODEV\Designs

-        " autocmd VimEnter * Oil

-        ]]

-end

-

-

-

-local function open_in_external_program(prompt_bufnr)

-    local entry = require('telescope.actions.state').get_selected_entry()

-    local file_path = entry.path or entry.filename

-    if file_path then

-        os.execute(string.format('start "" "%s"', file_path))

-    else

-        print("No file selected")

-    end

-    actions.close(prompt_bufnr)

-end

-

-

-require('telescope').setup({

-    defaults = {

-        layout_config = {

-            vertical = { width = 0.5 }

-            -- other layout configuration here

-        },

-        mappings = {

-            n = {

-                ["q"] = actions.close,

-                ["o"] = open_in_external_program,

-            },

-            i = {

-                ["<C-c>"] = actions.close,

-                ["<C-n>"] = actions.cycle_history_next,

-                ["<C-p>"] = actions.cycle_history_prev,

-                ["<C-j>"] = actions.move_selection_next,

-                ["<C-k>"] = actions.move_selection_previous,

-                ["<C-o>"] = open_in_external_program,

-            }

-        },

-        -- other defaults configuration here

-    },

-    pickers = {

-        live_grep = {

-            file_ignore_patterns = { 'node_modules', '.git', '.venv' },

-            additional_args = function(_)

-                return { "--hidden" }

-            end

-        },

-        find_files = {

-            file_ignore_patterns = { 'node_modules', '.git', '.venv' },

-            hidden = true

-        }

-    }

-})

-require("Comment").setup()

-

--- REQUIRED

-harpoon:setup()

--- REQUIRED

-

-vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)

-vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)

-

-vim.keymap.set("n", "<leader>h", function() harpoon:list():select(1) end)

-vim.keymap.set("n", "<leader>j", function() harpoon:list():select(2) end)

-vim.keymap.set("n", "<leader>k", function() harpoon:list():select(3) end)

-vim.keymap.set("n", "<leader>l", function() harpoon:list():select(4) end)

-

--- Toggle previous & next buffers stored within Harpoon list

-vim.keymap.set("n", "<leader>N", function() harpoon:list():prev() end)

-vim.keymap.set("n", "<leader>P", function() harpoon:list():next() end)

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-require("oil").setup({

-    -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`)

-    -- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories.

-    default_file_explorer = true,

-    -- Id is automatically added at the beginning, and name at the end

-    -- See :help oil-columns

-    columns = {

-        "icon",

-        -- "permissions",

-        -- "size",

-        -- "mtime",

-    },

-    -- Buffer-local options to use for oil buffers

-    buf_options = {

-        buflisted = false,

-        bufhidden = "hide",

-    },

-    -- Window-local options to use for oil buffers

-    win_options = {

-        wrap = false,

-        signcolumn = "no",

-        cursorcolumn = false,

-        foldcolumn = "0",

-        spell = false,

-        list = false,

-        conceallevel = 3,

-        concealcursor = "nvic",

-    },

-    -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash)

-    delete_to_trash = true,

-    -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits)

-    skip_confirm_for_simple_edits = false,

-    -- Selecting a new/moved/renamed file or directory will prompt you to save changes first

-    -- (:help prompt_save_on_select_new_entry)

-    prompt_save_on_select_new_entry = true,

-    -- Oil will automatically delete hidden buffers after this delay

-    -- You can set the delay to false to disable cleanup entirely

-    -- Note that the cleanup process only starts when none of the oil buffers are currently displayed

-    cleanup_delay_ms = 2000,

-    lsp_file_methods = {

-        -- Time to wait for LSP file operations to complete before skipping

-        timeout_ms = 1000,

-        -- Set to true to autosave buffers that are updated with LSP willRenameFiles

-        -- Set to "unmodified" to only save unmodified buffers

-        autosave_changes = false,

-    },

-    -- Constrain the cursor to the editable parts of the oil buffer

-    -- Set to `false` to disable, or "name" to keep it on the file names

-    constrain_cursor = "editable",

-    -- Set to true to watch the filesystem for changes and reload oil

-    watch_for_changes = false,

-    -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap

-    -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" })

-    -- Additionally, if it is a string that matches "actions.<name>",

-    -- it will use the mapping at require("oil.actions").<name>

-    -- Set to `false` to remove a keymap

-    -- See :help oil-actions for a list of all available actions

-    keymaps = {

-        ["g?"] = "actions.show_help",

-        ["<CR>"] = "actions.select",

-        ["<C-S>"] = { "actions.select", opts = { vertical = true }, desc = "Open the entry in a vertical split" },

-        ["<C-H>"] = { "actions.select", opts = { horizontal = true }, desc = "Open the entry in a horizontal split" },

-        -- ["<C-t>"] = { "actions.select", opts = { tab = true }, desc = "Open the entry in new tab" },

-        ["<C-p>"] = "actions.preview",

-        ["<C-c>"] = "actions.close",

-        ["<C-l>"] = "actions.refresh",

-        ["-"] = "actions.parent",

-        ["_"] = "actions.open_cwd",

-        ["`"] = "actions.cd",

-        ["~"] = { "actions.cd", opts = { scope = "tab" }, desc = ":tcd to the current oil directory" },

-        ["gs"] = "actions.change_sort",

-        ["<C-o>"] = "actions.open_external",

-        ["g."] = "actions.toggle_hidden",

-        ["g\\"] = "actions.toggle_trash",

-        ['yp'] = {

-            desc = 'Copy filepath to system clipboard',

-            callback = function ()

-                require('oil.actions').copy_entry_path.callback()

-                vim.fn.setreg("+", vim.fn.getreg(vim.v.register))

-            end,

-        },

-    },

-    -- Set to false to disable all of the above keymaps

-    use_default_keymaps =false,

-    view_options = {

-        -- Show files and directories that start with "."

-        show_hidden = false,

-        -- This function defines what is considered a "hidden" file

-        is_hidden_file = function(name, bufnr)

-            return vim.startswith(name, ".")

-        end,

-        -- This function defines what will never be shown, even when `show_hidden` is set

-        is_always_hidden = function(name, bufnr)

-            return false

-        end,

-        -- Sort file names in a more intuitive order for humans. Is less performant,

-        -- so you may want to set to false if you work with large directories.

-        natural_order = true,

-        -- Sort file and directory names case insensitive

-        case_insensitive = false,

-        sort = {

-            -- sort order can be "asc" or "desc"

-            -- see :help oil-columns to see which columns are sortable

-            { "type", "asc" },

-            { "name", "asc" },

-        },

-    },

-    -- Extra arguments to pass to SCP when moving/copying files over SSH

-    extra_scp_args = {},

-    -- EXPERIMENTAL support for performing file operations with git

-    git = {

-        -- Return true to automatically git add/mv/rm files

-        add = function(path)

-            return false

-        end,

-        mv = function(src_path, dest_path)

-            return false

-        end,

-        rm = function(path)

-            return false

-        end,

-    },

-    -- Configuration for the floating window in oil.open_float

-    float = {

-        -- Padding around the floating window

-        padding = 2,

-        max_width = 0,

-        max_height = 0,

-        border = "rounded",

-        win_options = {

-            winblend = 0,

-        },

-        -- preview_split: Split direction: "auto", "left", "right", "above", "below".

-        preview_split = "auto",

-        -- This is the config that will be passed to nvim_open_win.

-        -- Change values here to customize the layout

-        override = function(conf)

-            return conf

-        end,

-    },

-    -- Configuration for the actions floating preview window

-    preview = {

-        -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)

-        -- min_width and max_width can be a single value or a list of mixed integer/float types.

-        -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total"

-        max_width = 0.9,

-        -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total"

-        min_width = { 40, 0.4 },

-        -- optionally define an integer/float for the exact width of the preview window

-        width = nil,

-        -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)

-        -- min_height and max_height can be a single value or a list of mixed integer/float types.

-        -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total"

-        max_height = 0.9,

-        -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total"

-        min_height = { 5, 0.1 },

-        -- optionally define an integer/float for the exact height of the preview window

-        height = nil,

-        border = "rounded",

-        win_options = {

-            winblend = 0,

-        },

-        -- Whether the preview window is automatically updated when the cursor is moved

-        update_on_cursor_moved = true,

-    },

-    -- Configuration for the floating progress window

-    progress = {

-        max_width = 0.9,

-        min_width = { 40, 0.4 },

-        width = nil,

-        max_height = { 10, 0.9 },

-        min_height = { 5, 0.1 },

-        height = nil,

-        border = "rounded",

-        minimized_border = "none",

-        win_options = {

-            winblend = 0,

-        },

-    },

-    -- Configuration for the floating SSH window

-    ssh = {

-        border = "rounded",

-    },

-    -- Configuration for the floating keymaps help window

-    keymaps_help = {

-        border = "rounded",

-    },

-})

-

-

--- Load toggleterm if not loaded

--- require('toggleterm').setup{}

-

--- Close the terminal with Ctrl+q and Ctrl+d in terminal mode

-function _G.set_terminal_keymaps()

-    local opts = { noremap = true, silent = true }

-    vim.api.nvim_buf_set_keymap(0, 't', '<C-d>', [[<C-\><C-n><cmd>ToggleTerm<CR>]], opts)

-    vim.api.nvim_buf_set_keymap(0, 't', '<C-q>', [[<C-\><C-n><cmd>ToggleTerm<CR>]], opts)

-    -- vim.api.nvim_buf_set_keymap(0, 'n', '<C-d>', [[<C-\><C-n><cmd>ToggleTerm<CR>]], opts)

-    -- vim.api.nvim_buf_set_keymap(0, 't', 'jk','<Nop>',opts)

-    -- vim.api.nvim_buf_del_keymap(0, 'i', "jk")

-    -- vim.api.nvim_buf_set_keymap(0, 'i', 'k', '<Nop>', opts)

-end

-require("toggleterm").setup({

-    -- open_mapping = [[<C-\>]], -- Example keybinding, adjust as needed

-    direction = "float",      -- or "horizontal" / "vertical" / "tab"

-    -- set_terminal_keymaps(),

-    -- on_open = function(term)

-    --   vim.cmd("startinsert") -- Always enter insert mode when terminal opens

-    -- end,

-    -- on_focus = function(term)

-    --   vim.cmd("startinsert") -- Enter insert mode when terminal gains focus

-    -- end,

-    --     on_close = function(term)

-    --   vim.cmd("stopinsert") -- Stop insert mode when terminal closes

-    -- end,

-    start_in_insert=true,

-    -- persist_mode = true,

-})

-

--- Set the keymaps when a terminal is opened

--- vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')

--- Automatically enter insert mode when ToggleTerm is opened

--- vim.api.nvim_create_autocmd("TermOpen", {

---   pattern = "term://*",

---   callback = function()

---     vim.cmd(":startinsert")

---         -- set_terminal_keymaps()

---   end,

--- })

-

-vim.api.nvim_create_autocmd({ "TermOpen", "BufEnter" }, {

-    -- pattern = { "*" },

-    callback = function()

-        if vim.opt.buftype:get() == "terminal" then

-            vim.cmd("startinsert")

-            -- vim.cmd("shfdstartinsert")

-            set_terminal_keymaps()

-        end

-    end

-})

-

-

--- Add this after your lsp-zero configuration

-vim.diagnostic.config({

-    virtual_text = {

-        prefix = '●', -- Could be '■', '▎', 'x'

-        source = "if_many"

-    },

-    float = {

-        -- source = "always",

-        border = "rounded",

-        header = "",

-        prefix = "",

-    },

-    signs = true,

-    underline = true,

-    update_in_insert = false,

-    severity_sort = true,

-})

-

--- Add keyboard shortcuts to see full error messages

-vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, { noremap=true, silent=true })

+-- Load plugin configurations

+require('configs')

diff --git a/nvim/lua/codev.lua b/nvim/lua/codev.lua
deleted file mode 100644
index ed6c330..0000000
--- a/nvim/lua/codev.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-vim.api.nvim_exec2([[

-  augroup SeqFileType

-    autocmd!

-    autocmd BufRead,BufNewFile *.seq set filetype=seq

-    autocmd BufRead,BufNewFile *.seq set syntax=codev

-    autocmd BufRead,BufNewFile *.lis set filetype=lis

-    autocmd BufRead,BufNewFile *.lis set syntax=codelis

-  augroup END

-]], {})

-

-vim.api.nvim_exec2([[autocmd FileType seq set commentstring=!%s]], {})

diff --git a/nvim/lua/configs.lua b/nvim/lua/configs.lua
new file mode 100644
index 0000000..92d26f7
--- /dev/null
+++ b/nvim/lua/configs.lua
@@ -0,0 +1,285 @@
+-- Plugin configurations

+-- All plugin-specific settings are configured here

+

+--------------------------------

+-- TELESCOPE

+--------------------------------

+local function setup_telescope()

+    local actions = require("telescope.actions")

+

+    -- Function to open selected file in external program

+    local function open_in_external_program(prompt_bufnr)

+        local entry = require('telescope.actions.state').get_selected_entry()

+        local file_path = entry.path or entry.filename

+        if file_path then

+            os.execute(string.format('start "" "%s"', file_path))

+        else

+            print("No file selected")

+        end

+        actions.close(prompt_bufnr)

+    end

+

+    require('telescope').setup({

+        defaults = {

+            layout_config = {

+                vertical = { width = 0.5 }

+            },

+            mappings = {

+                n = {

+                    ["q"] = actions.close,

+                    ["o"] = open_in_external_program,

+                },

+                i = {

+                    ["<C-c>"] = actions.close,

+                    ["<C-n>"] = actions.cycle_history_next,

+                    ["<C-p>"] = actions.cycle_history_prev,

+                    ["<C-j>"] = actions.move_selection_next,

+                    ["<C-k>"] = actions.move_selection_previous,

+                    ["<C-o>"] = open_in_external_program,

+                }

+            },

+        },

+        pickers = {

+            live_grep = {

+                file_ignore_patterns = { 'node_modules', '.git', '.venv' },

+                additional_args = function(_)

+                    return { "--hidden" }

+                end

+            },

+            find_files = {

+                file_ignore_patterns = { 'node_modules', '.git', '.venv' },

+                hidden = true

+            }

+        }

+    })

+end

+

+--------------------------------

+-- HARPOON

+--------------------------------

+local function setup_harpoon()

+    local harpoon = require("harpoon")

+    

+    -- Initialize harpoon

+    harpoon:setup({

+        settings = {

+            save_on_toggle = true,

+            sync_on_ui_close = true,

+        }

+    })

+end

+

+--------------------------------

+-- OIL

+--------------------------------

+local function setup_oil()

+    require("oil").setup({

+        -- Default file explorer settings

+        default_file_explorer = true,

+        

+        -- Columns to display

+        columns = { "icon" },

+        

+        -- Buffer options

+        buf_options = {

+            buflisted = false,

+            bufhidden = "hide",

+        },

+        

+        -- Window options

+        win_options = {

+            wrap = false,

+            signcolumn = "no",

+            cursorcolumn = false,

+            foldcolumn = "0",

+            spell = false,

+            list = false,

+            conceallevel = 3,

+            concealcursor = "nvic",

+        },

+        

+        -- File operations

+        delete_to_trash = true,

+        skip_confirm_for_simple_edits = false,

+        prompt_save_on_select_new_entry = true,

+        cleanup_delay_ms = 2000,

+        

+        -- UI behavior

+        constrain_cursor = "editable",

+        watch_for_changes = false,

+        

+        -- Custom keymaps

+        keymaps = {

+            ["g?"] = "actions.show_help",

+            ["<CR>"] = "actions.select",

+            ["<C-S>"] = { "actions.select", opts = { vertical = true } },

+            ["<C-H>"] = { "actions.select", opts = { horizontal = true } },

+            ["<C-p>"] = "actions.preview",

+            ["<C-c>"] = "actions.close",

+            ["<C-l>"] = "actions.refresh",

+            ["-"] = "actions.parent",

+            ["_"] = "actions.open_cwd",

+            ["`"] = "actions.cd",

+            ["~"] = { "actions.cd", opts = { scope = "tab" } },

+            ["gs"] = "actions.change_sort",

+            ["<C-o>"] = "actions.open_external",

+            ["g."] = "actions.toggle_hidden",

+            ["g\\"] = "actions.toggle_trash",

+            ['yp'] = {

+                desc = 'Copy filepath to system clipboard',

+                callback = function ()

+                    require('oil.actions').copy_entry_path.callback()

+                    vim.fn.setreg("+", vim.fn.getreg(vim.v.register))

+                end,

+            },

+        },

+        

+        -- Disable default keymaps

+        use_default_keymaps = false,

+        

+        -- View options

+        view_options = {

+            show_hidden = false,

+            natural_order = true,

+            case_insensitive = false,

+            sort = {

+                { "type", "asc" },

+                { "name", "asc" },

+            },

+        },

+        

+        -- Preview window settings

+        preview = {

+            max_width = 0.9,

+            min_width = { 40, 0.4 },

+            max_height = 0.9,

+            min_height = { 5, 0.1 },

+            border = "rounded",

+            win_options = { winblend = 0 },

+        },

+        

+        -- Floating window settings

+        float = {

+            padding = 2,

+            max_width = 0,

+            max_height = 0,

+            border = "rounded",

+            win_options = { winblend = 0 },

+        },

+    })

+end

+

+--------------------------------

+-- TOGGLETERM

+--------------------------------

+local function setup_toggleterm()

+    require("toggleterm").setup({

+        -- Shell to use in the terminal

+        shell = "pwsh.exe -NoLogo",

+        

+        -- Display options

+        direction = "float",

+        float_opts = {

+            border = "rounded",

+        },

+        

+        -- Window appearance

+        winbar = {

+            enabled = false

+        },

+        

+        -- Behavior

+        start_in_insert = true,

+        close_on_exit = true,

+        

+        -- Integration with tmux

+        persist_size = true,

+        persist_mode = true,

+    })

+end

+

+--------------------------------

+-- TREESITTER

+--------------------------------

+local function setup_treesitter()

+    require('nvim-treesitter.configs').setup({

+        ensure_installed = { "c", "lua", "vim", "vimdoc", "cpp", "python" },

+        sync_install = false,

+        auto_install = false,

+        highlight = { enable = true },

+        indent = { enable = true },

+    })

+end

+

+--------------------------------

+-- COMMENTS

+--------------------------------

+local function setup_comments()

+    require('Comment').setup({

+        padding = true,

+        sticky = true,

+        ignore = nil,

+        toggler = {

+            line = '<leader>/',

+            block = 'gbc',

+        },

+        opleader = {

+            line = '<leader>/',

+            block = 'gb',

+        }

+    })

+end

+

+--------------------------------

+-- LSP Configuration

+--------------------------------

+local function setup_lsp()

+    -- Configure Mason LSP installer/manager

+    require('mason').setup({

+        ensure_installed = {

+            'lua_ls',       -- Lua

+            'clangd',       -- C/C++

+            'pyright',      -- Python

+            'marksman',     -- Markdown

+        },

+        handlers = {

+            -- Lua LSP settings

+            lua_ls = function()

+                require('lspconfig').lua_ls.setup({})

+            end,

+            

+            -- C/C++ LSP settings (clangd)

+            clangd = function()

+                require('lspconfig').clangd.setup({})

+            end,

+            

+            -- Markdown LSP settings

+            marksman = function()

+                require('lspconfig').marksman.setup({})

+            end,

+        }

+    })

+    require("mason-lspconfig").setup {}

+

+    -- Configure diagnostics appearance

+    vim.diagnostic.config({

+        virtual_lines=true,

+        signs = true,

+        underline = true,

+        update_in_insert = false,

+        severity_sort = true,

+    })

+end

+

+--------------------------------

+-- INITIALIZE ALL CONFIGS

+--------------------------------

+

+-- Set up all plugin configurations

+setup_telescope()

+setup_harpoon()

+setup_oil()

+setup_toggleterm()

+setup_treesitter()

+setup_comments()

+setup_lsp()

diff --git a/nvim/lua/core/autocmds.lua b/nvim/lua/core/autocmds.lua
new file mode 100644
index 0000000..898aeb7
--- /dev/null
+++ b/nvim/lua/core/autocmds.lua
@@ -0,0 +1,98 @@
+-- Core autocommands

+-- Centralized place for all autocommands

+

+--------------------------------

+-- FILE DETECTION & RELOADING

+--------------------------------

+

+-- Auto-reload files when changed externally

+local file_change_detect = vim.api.nvim_create_augroup("FileChangeDetect", { clear = true })

+vim.api.nvim_create_autocmd({"FocusGained", "BufEnter", "BufWinEnter", "WinEnter", "CursorHold", "CursorHoldI"}, {

+    group = file_change_detect,

+    callback = function()

+        vim.cmd("checktime")

+    end,

+})

+

+vim.api.nvim_create_autocmd("FileChangedShellPost", {

+    group = file_change_detect,

+    callback = function()

+        vim.notify("File changed on disk. Buffer reloaded.", vim.log.levels.WARN)

+        vim.cmd("checktime")

+    end,

+})

+

+--------------------------------

+-- TERMINAL BEHAVIOR

+--------------------------------

+

+-- Terminal settings and keymaps

+local terminal_settings = vim.api.nvim_create_augroup("TerminalSettings", { clear = true })

+vim.api.nvim_create_autocmd({"TermOpen", "BufEnter"}, {

+    group = terminal_settings,

+    callback = function()

+        if vim.opt.buftype:get() == "terminal" then

+            vim.cmd("startinsert")

+            

+            -- Terminal keymaps

+            local opts = { noremap = true, silent = true, buffer = true }

+            vim.keymap.set("t", "<C-d>", [[<C-\><C-n><cmd>ToggleTerm<CR>]], opts)

+            vim.keymap.set("t", "<C-q>", [[<C-\><C-n><cmd>ToggleTerm<CR>]], opts)

+            vim.keymap.set("t", "jk", [[<C-\><C-n>]], opts)

+            vim.keymap.set("t", "<C-h>", [[<C-\><C-n><C-W>h]], opts)

+            vim.keymap.set("t", "<C-j>", [[<C-\><C-n><C-W>j]], opts)

+            vim.keymap.set("t", "<C-k>", [[<C-\><C-n><C-W>k]], opts)

+            vim.keymap.set("t", "<C-l>", [[<C-\><C-n><C-W>l]], opts)

+        end

+    end,

+})

+

+--------------------------------

+-- CUSTOM FILETYPES

+--------------------------------

+

+-- Custom filetype detection

+local filetype_group = vim.api.nvim_create_augroup("CustomFileTypes", { clear = true })

+

+-- Set up .seq files to use codev syntax

+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {

+    group = filetype_group,

+    pattern = "*.seq",

+    callback = function()

+        vim.bo.filetype = "seq"

+        vim.bo.syntax = "codev"

+        vim.bo.commentstring = "!%s"

+    end,

+})

+

+-- Set up .lis files to use codelis syntax

+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {

+    group = filetype_group,

+    pattern = "*.lis",

+    callback = function()

+        vim.bo.filetype = "lis"

+        vim.bo.syntax = "codelis"

+    end,

+})

+

+--------------------------------

+-- CUSTOM COMMANDS

+--------------------------------

+

+-- Python docstring helper

+vim.api.nvim_create_user_command("PythonDocstring", function()

+    local docstring = [["""

+

+# Information:

+

+# Arguments:

+

+# Returns:

+

+"""]]

+    -- Insert the docstring at the cursor position

+    local line = vim.api.nvim_win_get_cursor(0)[1]

+    vim.api.nvim_buf_set_lines(0, line-1, line-1, false, vim.split(docstring, "\n"))

+    -- Position cursor at the right spot

+    vim.api.nvim_win_set_cursor(0, {line+1, 0})

+end, {})

diff --git a/nvim/lua/core/keymaps.lua b/nvim/lua/core/keymaps.lua
new file mode 100644
index 0000000..0ab02ff
--- /dev/null
+++ b/nvim/lua/core/keymaps.lua
@@ -0,0 +1,113 @@
+-- Core keymaps

+-- General key mappings not tied to specific plugins

+

+-- Leader key

+vim.g.mapleader = " "

+

+----------------

+-- NORMAL MODE

+----------------

+

+-- File operations

+vim.keymap.set("n", "<leader>w", "<cmd>w<cr>", { desc = "Save file" })

+vim.keymap.set("n", "<leader>q", "<cmd>q<cr>", { desc = "Quit" })

+vim.keymap.set("n", "<leader>Q", "<cmd>q!<cr>", { desc = "Force quit" })

+vim.keymap.set("n", "<C-c>", "<cmd>bd<cr>", { desc = "Close buffer" })

+

+-- Quick buffer navigation

+vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Move to left window" })

+vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Move to bottom window" })

+vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Move to top window" })

+vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Move to right window" })

+

+-- Quick formatting

+vim.keymap.set("n", "<leader>S", "ggVG=", { desc = "Format entire file" })

+

+-- Quick line operations

+vim.keymap.set("n", "<leader>o", "o<Esc>", { desc = "New line below" })

+vim.keymap.set("n", "<leader>O", "O<Esc>", { desc = "New line above" })

+vim.keymap.set("n", "J", "mzJ`z", { desc = "Join lines and maintain cursor" })

+

+-- Better vertical navigation

+vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Half page down and center" })

+vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Half page up and center" })

+vim.keymap.set("n", "n", "nzzzv", { desc = "Next search result and center" })

+vim.keymap.set("n", "N", "Nzzzv", { desc = "Prev search result and center" })

+

+-- Clipboard operations

+vim.keymap.set({"n", "v"}, "<leader>y", [["+y]], { desc = "Copy to system clipboard" })

+vim.keymap.set("n", "<leader>Y", [["+Y]], { desc = "Copy line to system clipboard" })

+vim.keymap.set({"n", "v"}, "<leader>d", [["_d]], { desc = "Delete to void register" })

+vim.keymap.set("x", "<leader>p", [["_dP]], { desc = "Paste over selection" })

+

+-- Quickfix navigation

+vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz", { desc = "Next quickfix item" })

+vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz", { desc = "Previous quickfix item" })

+

+-- Undo remap

+vim.keymap.set("n", "U", "<C-r>", { desc = "Redo" })

+

+-- Search and replace current word

+vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], 

+    { desc = "Replace current word" })

+

+-- Terminal keymaps

+vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<cr>", { desc = "Toggle terminal" })

+vim.keymap.set({"n", "i"},"<C-r><C-k>", "<cmd>ToggleTermSendCurrentLine<cr>j", { desc = "Send line to terminal" })

+vim.keymap.set("n","<C-r><C-j>", "ggVG:'<,'>ToggleTermSendVisualLines<cr>", { desc = "Send file to terminal" })

+vim.keymap.set("i","<C-r><C-j>", "<Esc>ggVG:'<,'>ToggleTermSendVisualLines<cr><Esc>i", { desc = "Send file to terminal" })

+vim.keymap.set("v","<C-r><C-k>", ":ToggleTermSendVisualLines<cr><Esc>", { desc = "Send selection to terminal" })

+

+-- File browser

+vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory with Oil" })

+

+-- LSP quick diagnostics

+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, { noremap=true, silent=true, desc = "Show diagnostics" })

+

+-- Python docstring helper

+vim.keymap.set("n", "<leader>dc", ":PythonDocstring<CR>", { 

+    silent = true, 

+    desc = "Insert Python docstring template" 

+})

+

+----------------

+-- INSERT MODE

+----------------

+

+vim.keymap.set("i", "jk", "<Esc>", { desc = "Exit insert mode" })

+vim.keymap.set("i", "<leader>e", "<Space>e", { desc = "Insert e after leader" })

+vim.keymap.set("i", "<C-c>", "<cmd>bd<cr>", { desc = "Close buffer" })

+

+----------------

+-- VISUAL MODE

+----------------

+

+-- Move selected lines

+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selection down" })

+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selection up" })

+

+-- Telescope keymaps (grouped for related functionality)

+vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files theme=dropdown<cr>", { desc = "Find files" })

+vim.keymap.set("n", "<leader>fm", "<cmd>Telescope find_files cwd=D:/Optics/CODEV/Macros theme=dropdown<cr>", { desc = "Find macro files" })

+vim.keymap.set("n", "<leader>fc", "<cmd>Telescope find_files cwd=C:/CODEV202403/macro theme=dropdown<cr>", { desc = "Find CODEV macro files" })

+vim.keymap.set("n", "<leader>fl", "<cmd>Telescope find_files cwd=C:/CODEV202403/lens theme=dropdown<cr>", { desc = "Find lens files" })

+vim.keymap.set("n", "<leader>gg", "<cmd>Telescope live_grep theme=dropdown<cr>", { desc = "Live grep" })

+vim.keymap.set("n", "<leader>gm", "<cmd>Telescope live_grep cwd=D:/Optics/CODEV/Macros theme=dropdown<cr>", { desc = "Grep in macro files" })

+vim.keymap.set("n", "<leader>gc", "<cmd>Telescope live_grep cwd=C:/CODEV202403/macro theme=dropdown<cr>", { desc = "Grep in CODEV macro files" })

+vim.keymap.set("n", "<leader>gl", "<cmd>Telescope live_grep cwd=C:/CODEV202403/lens theme=dropdown<cr>", { desc = "Grep in lens files" })

+vim.keymap.set("n", "<leader>b", "<cmd>Telescope buffers theme=dropdown<cr>", { desc = "List buffers" })

+

+-- Harpoon keymaps

+vim.keymap.set("n", "<leader>a", function() require("harpoon"):list():add() end, { desc = "Add file to harpoon" })

+vim.keymap.set("n", "<C-e>", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, { desc = "Toggle harpoon menu" })

+vim.keymap.set("n", "<leader>h", function() require("harpoon"):list():select(1) end, { desc = "Harpoon file 1" })

+vim.keymap.set("n", "<leader>j", function() require("harpoon"):list():select(2) end, { desc = "Harpoon file 2" })

+vim.keymap.set("n", "<leader>k", function() require("harpoon"):list():select(3) end, { desc = "Harpoon file 3" })

+vim.keymap.set("n", "<leader>l", function() require("harpoon"):list():select(4) end, { desc = "Harpoon file 4" })

+vim.keymap.set("n", "<leader>N", function() require("harpoon"):list():prev() end, { desc = "Previous harpoon file" })

+vim.keymap.set("n", "<leader>P", function() require("harpoon"):list():next() end, { desc = "Next harpoon file" })

+

+-- Other tool keymaps

+vim.keymap.set("n", "<leader>G", vim.cmd.Git, { desc = "Open Git status" })

+vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle, { desc = "Toggle undo tree" })

+vim.keymap.set("n", "[c", function() require("treesitter-context").go_to_context() end, { desc = "Go to context", silent = true })

diff --git a/nvim/lua/core/options.lua b/nvim/lua/core/options.lua
new file mode 100644
index 0000000..b05ad08
--- /dev/null
+++ b/nvim/lua/core/options.lua
@@ -0,0 +1,37 @@
+-- Core Neovim settings

+-- General options and settings

+

+-- UI settings

+vim.opt.termguicolors = true          -- True color support

+vim.opt.number = true                 -- Show line numbers

+vim.opt.relativenumber = true         -- Show relative line numbers

+vim.opt.scrolloff = 999               -- Keep cursor centered

+vim.opt.splitbelow = true             -- Horizontal splits below

+vim.opt.splitright = true             -- Vertical splits to the right

+vim.opt.wrap = true                   -- Line wrapping

+vim.opt.virtualedit = "block"         -- Allow cursor beyond text in block mode

+

+-- Search settings

+vim.opt.hlsearch = false              -- Don't highlight search results

+vim.opt.incsearch = true              -- Incremental search

+vim.opt.ignorecase = true             -- Case insensitive search

+

+-- Tab settings

+vim.opt.tabstop = 4                   -- Tab width

+vim.opt.softtabstop = 4               -- Soft tab width

+vim.opt.shiftwidth = 4                -- Indentation width

+vim.opt.expandtab = true              -- Use spaces instead of tabs

+

+-- File management

+vim.opt.swapfile = false              -- No swap files

+vim.opt.backup = false                -- No backup files

+vim.opt.undodir = os.getenv("USERPROFILE").."/.vim/undodir"  -- Undo directory

+vim.opt.undofile = true               -- Persistent undo history

+

+-- Performance and usability

+vim.opt.updatetime = 50               -- Faster update time

+vim.opt.inccommand = "split"          -- Live substitution preview

+

+-- Status line

+vim.cmd([[set laststatus=2]])     -- Always show statusline

+vim.cmd([[set shortmess=I]])      -- Don't show intro message

diff --git a/nvim/lua/keybindings.lua b/nvim/lua/keybindings.lua
deleted file mode 100644
index 9a9d0f0..0000000
--- a/nvim/lua/keybindings.lua
+++ /dev/null
@@ -1,162 +0,0 @@
-vim.g.mapleader = " "
---Telescope keys
--- local builtin = require('telescope.builtin')
--- vim.keymap.set('n', '<leader>ps', function()
--- 	builtin.grep_string({ search = vim.fn.input("Grep > ") })
--- end)
-
--- vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
--- vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
--- vim.keymap.set('n', "<leader>ps", builtin.live_grep,{})
--- vim.keymap.set('n', "<leader>pb", builtin.buffers,{})
-
--- vim.keymap.set('n', '<leader>ff', '<cmd>Telescope find_files search_dirs=[".","D:/Optics/CODEV/Macros","C:/CODEV202403/macro","C:/CODEV202403/lens"] theme=dropdown<cr>')
-vim.keymap.set('n', '<leader>ff', "<cmd>Telescope find_files theme=dropdown<cr>")
-vim.keymap.set('n', '<leader>fm', "<cmd>Telescope find_files cwd=D:/Optics/CODEV/Macros theme=dropdown<cr>")
-vim.keymap.set('n', '<leader>fc', "<cmd>Telescope find_files cwd=C:/CODEV202403/macro theme=dropdown<cr>")
-vim.keymap.set('n', '<leader>fl', "<cmd>Telescope find_files cwd=C:/CODEV202403/lens theme=dropdown<cr>")
-
-vim.keymap.set("n", "<leader>pp", "<cmd>Telescope file_browser theme=dropdown<cr>")
-vim.keymap.set("n", "<leader>pm", "<cmd>Telescope file_browser cwd=D:/Optics/CODEV/Macros theme=dropdown<cr>")
-vim.keymap.set("n", "<leader>pc", "<cmd>Telescope file_browser cwd=C:/CODEV202403/macro theme=dropdown<cr>")
-vim.keymap.set("n", "<leader>pl", "<cmd>Telescope file_browser cwd=C:/CODEV202403/lens theme=dropdown<cr>")
-
-vim.keymap.set('n', "<leader>gg", "<cmd>Telescope live_grep theme=dropdown<cr>")
-vim.keymap.set('n', "<leader>gm", "<cmd>Telescope live_grep cwd=D:/Optics/CODEV/Macros theme=dropdown<cr>")
-vim.keymap.set('n', "<leader>gc", "<cmd>Telescope live_grep cwd=C:/CODEV202403/macro theme=dropdown<cr>")
-vim.keymap.set('n', "<leader>gl", "<cmd>Telescope live_grep cwd=C:/CODEV202403/lens theme=dropdown<cr>")
-
-
-vim.keymap.set('n', "<leader>b", "<cmd>Telescope buffers theme=dropdown<cr>")
-
-vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
-vim.keymap.set('n', '<leader>G', vim.cmd.Git)
--- Language Server Keybindings
-local lsp_zero = require('lsp-zero')
-
-lsp_zero.on_attach(function(client, bufnr)
-    local opts = {buffer = bufnr, remap = false}
-
-    vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-    vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-    vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-    vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-    vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-    vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-    vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-    vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-    vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-    vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-end)
-
-require('mason').setup({})
-require('mason-lspconfig').setup({
-    ensure_installed = {'tsserver', 'rust_analyzer'},
-    handlers = {
-        lsp_zero.default_setup,
-        lua_ls = function()
-            local lua_opts = lsp_zero.nvim_lua_ls()
-            require('lspconfig').lua_ls.setup(lua_opts)
-        end,
-    }
-})
-
-local cmp = require('cmp')
-local cmp_select = {behavior = cmp.SelectBehavior.Select}
-
-cmp.setup({
-    sources = {
-        {name = 'path'},
-        {name = 'nvim_lsp'},
-        {name = 'nvim_lua'},
-    },
-    formatting = lsp_zero.cmp_format(),
-    mapping = cmp.mapping.preset.insert({
-        ['<C-p>'] = cmp.mapping.scroll_docs(-4),
-        ['<C-n>'] = cmp.mapping.scroll_docs(4),
-        ['<C-k>'] = cmp.mapping.select_prev_item(cmp_select),
-        ['<C-j>'] = cmp.mapping.select_next_item(cmp_select),
-        ['<C-i>'] = cmp.mapping.confirm({ select = true }),
-        ['<C-Space>'] = cmp.mapping.complete(),
-    }),
-})
--- General Keybindings
-vim.keymap.set("i", "jk", "<Esc>")
-vim.keymap.set("n","<leader>w", "<cmd>w<cr>")
-vim.keymap.set("n","<leader>q", "<cmd>q<cr>")
-vim.keymap.set("n","<C-c>", "<cmd>bd<cr>")
-vim.keymap.set("i","<C-c>", "<cmd>bd<cr>")
-vim.keymap.set("n","<leader>Q", "<cmd>q!<cr>")
-vim.keymap.set("n","<leader>o", "o<Esc>")
-vim.keymap.set("n","<leader>O", "O<Esc>")
-vim.keymap.set("i", "<leader>e", "<Space>e")
---File Formatting
-vim.keymap.set("n","<leader>S", "ggVG=")
--- Moving Lines around
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-vim.keymap.set("n", "J", "mzJ`z")
---Fast Vertical Navigation
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
--- Search terms stay in the middle
-vim.keymap.set("n", "n", "nzzzv")
-vim.keymap.set("n", "N", "Nzzzv")
--- pasting something instead of current text
-vim.keymap.set("x", "<leader>p", [["_dP]])
--- copying into system clipboard
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
-vim.keymap.set("n", "<leader>Y", [["+Y]])
--- Put into Void Register
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
--- Quick Fix List Navingation
---vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
---vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
--- Terminal Navigation
--- vim.keymap.set("n", "<leader>tt", "<cmd>ToggleTerm size=60 direction=horizontal shell=powershell<cr>")
-vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<cr>")
--- vim.keymap.set("n", "<C-t>", "<cmd>ToggleTerm<cr>")
--- vim.keymap.set("i", "<C-t>", "<cmd>ToggleTerm<cr>")
--- vim.keymap.set("n", "<leader>tt", "<cmd>vertical 60 vsplit | terminal pwsh.exe<cr>")
--- vim.keymap.set("n", "<leader>tj", "<cmd>term pwsh.exe<cr>")
-vim.keymap.set("t", "jk", [[<C-\><C-n>]])
-vim.keymap.set("t", "<C-h>", [[<C-\><C-n><C-W>h]])
-vim.keymap.set("t", "<C-j>", [[<C-\><C-n><C-W>j]])
-vim.keymap.set("t", "<C-k>", [[<C-\><C-n><C-W>k]])
-vim.keymap.set("t", "<C-l>", [[<C-\><C-n><C-W>l]])
---Sending lines and file to the internal terminal I had before <C-O> to make the cursor move to the previous position but this doesnt seem to be a good option
-vim.keymap.set({"n", "i"},"<C-r><C-k>", "<cmd>ToggleTermSendCurrentLine<cr>j")
-vim.keymap.set("n","<C-r><C-j>", "ggVG:'<,'>ToggleTermSendVisualLines<cr>")
-vim.keymap.set("i","<C-r><C-j>", "<Esc>ggVG:'<,'>ToggleTermSendVisualLines<cr><Esc>i")
-vim.keymap.set("v","<C-r><C-k>", ":ToggleTermSendVisualLines<cr><Esc>")
--- Buffer Navigation
-vim.keymap.set("n", "<C-h>", [[<C-W>h]])
-vim.keymap.set("n", "<C-j>", [[<C-W>j]])
-vim.keymap.set("n", "<C-k>", [[<C-W>k]])
-vim.keymap.set("n", "<C-l>", [[<C-W>l]])
--- Undo Remapping
-vim.keymap.set("n", "U", "<C-r>")
--- Replace the Current Word everywhere
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
--- Nvim-Tree
--- vim.keymap.set("n", "<leader>e", "<cmd>NvimTreeToggle<cr>")
--- BufferLine Navigation
--- vim.keymap.set("n", "<Tab>", "<cmd>BufferLineCycleNext<cr>")
--- vim.keymap.set("n", "<S-Tab>", "<cmd>BufferLineCyclePrev<cr>")
--- vim.keymap.set("n", "<C-w>", "<cmd>BufferLineCloseOthers<cr>")
--- Treesitter Context
-vim.keymap.set("n", "[c", function()
-  require("treesitter-context").go_to_context()
-end, { silent = true })
--- Docstring commands
-vim.keymap.set("n","<leader>dc",[[i"""<Esc>o<Esc>o#<Space>Information:<Esc>o<Backspace><Backspace><Esc>o#<Space>Arguments:<Esc>o<Backspace><Backspace><Esc>o#<Space>Returns:<Esc>o<Backspace><Backspace><Esc>o"""<Esc>7k]])
-
-
-
---vim.keymap.set('n', '<C-p>', bultin.git_files,{})
---Oil.nvim keybinds
-vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
-
-vim.keymap.set("n","<leader>m","<CMD>silent make<CR>")
diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua
deleted file mode 100644
index 944ea6d..0000000
--- a/nvim/lua/options.lua
+++ /dev/null
@@ -1,43 +0,0 @@
---Sets automatic update of the file internals

-vim.api.nvim_exec2([[

-  autocmd FocusGained,BufEnter,BufWinEnter,WinEnter,CursorHold,CursorHoldI * checktime

-  autocmd FileChangedShellPost * echohl WarningMsg | echo "File changed on disk. Buffer reloaded." | echohl None | checktime

-]],{})

-vim.api.nvim_exec2([[set shortmess=I]],{})

-

--- vim.api.nvim_exec2([[autocmd TermOpen * startinsert]],{})

-

-vim.opt.termguicolors = true

--- vim.o.statusline = [[%<%f\ %h%m%r%=%-13.(%l,%c%V%)\ %P]]

--- vim.o.laststatus = 2

-

-vim.opt.splitbelow = true

-vim.opt.splitright = true

-

-vim.opt.relativenumber = true

-vim.opt.number = true

-vim.opt.tabstop = 4

-vim.opt.softtabstop = 4

-vim.opt.shiftwidth = 4

-vim.opt.expandtab = true

-

-vim.opt.swapfile = false

-vim.opt.backup = false

-vim.opt.undodir = os.getenv("USERPROFILE").."/.vim/undodir"

-vim.opt.undofile = true

-

-vim.opt.hlsearch = false

-vim.opt.incsearch = true

-

-vim.opt.scrolloff = 999

-vim.opt.updatetime = 50

-

-vim.opt.wrap = true

-

-vim.opt.virtualedit = "block"

-vim.opt.inccommand = "split"

-vim.opt.ignorecase = true

-

-vim.cmd[[set laststatus=2]]

--- vim.opt.clipboard = "unnamedplus"

---vim.opt.colorcolumn = "180"

diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 79b4c5f..a04187c 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -1,8 +1,10 @@
--- lazy plugin manager

+-- Plugin declarations

+-- All plugins used in Neovim are defined here

+

+

+-- Bootstrap lazy.nvim

 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

 if not vim.loop.fs_stat(lazypath) then

-    -- bootstrap lazy.nvim

-    -- stylua: ignore

     vim.fn.system({

         "git",

         "clone",

@@ -12,245 +14,196 @@ if not vim.loop.fs_stat(lazypath) then
         lazypath,

     })

 end

-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)

-

-require("lazy").setup({ 

+vim.opt.rtp:prepend(lazypath)

+

+-- Initialize lazy.nvim with plugins

+require("lazy").setup({

+    ------------------------------------------------------------

+    -- UI 

+    ------------------------------------------------------------

+    

     -- Colorscheme

     {

         "folke/tokyonight.nvim",

-        init = function()

+        lazy = false,

+        priority = 1000,

+        config = function()

             vim.cmd.colorscheme("tokyonight-night")

-        end

+        end,

     },

 

+    -- File browser

     {

-        'tpope/vim-fugitive', 

+        'stevearc/oil.nvim',

+        dependencies = { "nvim-tree/nvim-web-devicons" },

+        cmd = "Oil",

     },

 

+    -- Terminal

     {

-        {

-            'VonHeikemen/lsp-zero.nvim',

-            branch = 'v3.x',

-            lazy = true,

-            config = false,

-            init = function()

-                -- Disable automatic setup, we are doing it manually

-                vim.g.lsp_zero_extend_cmp = 0

-                vim.g.lsp_zero_extend_lspconfig = 0

-            end,

-        },

-

-        {

-            'williamboman/mason.nvim',

-            lazy = false,

-            config = true,

-        },

-

-        {

-            'neovim/nvim-lspconfig',

-            dependencies = {

-                {'hrsh7th/cmp-nvim-lsp'},

-            }

-        },

-

-        -- Autocompletion

-        {

-            'hrsh7th/nvim-cmp',

-            event = 'InsertEnter',

-            dependencies = {

-                {'L3MON4D3/LuaSnip',

-                    'hrsh7th/cmp-path',

-                },

-            },

-            config = function()

-                -- Here is where you configure the autocompletion settings.

-                local lsp_zero = require('lsp-zero')

-                lsp_zero.extend_cmp()

-

-                -- And you can configure cmp even more, if you want to.

-                local cmp = require('cmp')

-                local cmp_action = lsp_zero.cmp_action()

-

-                cmp.setup({

-                    formatting = lsp_zero.cmp_format(),

-                    sources = {

-                        { name = 'nvim_lsp' }, -- Enable LSP-based completion

-                        { name = 'path' },         -- Enables path completion

-                        { name = 'buffer' },   -- Buffer source for plain text completion

-                    },

-                    mapping = cmp.mapping.preset.insert({

-                        ['<C-Space>'] = cmp.mapping.complete(),

-                        ['<C-u>'] = cmp.mapping.scroll_docs(-4),

-                        ['<C-d>'] = cmp.mapping.scroll_docs(4),

-                        ['<C-f>'] = cmp_action.luasnip_jump_forward(),

-                        ['<C-b>'] = cmp_action.luasnip_jump_backward(),

-                    }),

-

-                    -- },

-                })

-            end

-        },

-        -- LSP

-        {

-            'neovim/nvim-lspconfig',

-            cmd = {'LspInfo', 'LspInstall', 'LspStart'},

-            event = {'BufReadPre', 'BufNewFile'},

-            dependencies = {

-                {'hrsh7th/cmp-nvim-lsp'},

-                {'williamboman/mason-lspconfig.nvim'},

-            },

-            config = function()

-                -- This is where all the LSP shenanigans will live

-                local lsp_zero = require('lsp-zero')

-                lsp_zero.extend_lspconfig()

-

-                lsp_zero.on_attach(function(client, bufnr)

-                    -- see :help lsp-zero-keybindings

-                    -- to learn the available actions

-                    lsp_zero.default_keymaps({buffer = bufnr})

-                end)

-

-

-                require('mason-lspconfig').setup({

-                    ensure_installed = {},

-                    handlers = {

-                        lsp_zero.default_setup,

-                        lua_ls = function()

-                            -- (Optional) Configure lua language server for neovim

-                            local lua_opts = lsp_zero.nvim_lua_ls()

-                            require('lspconfig').lua_ls.setup(lua_opts)

-                        end,

-                        -- ADD THIS SECTION for clangd:

-                        clangd = function()

-                            require('lspconfig').clangd.setup({

-                                cmd = { "clangd", "--header-insertion=never" },

-                                -- No root_dir specification that requires compile_commands.json

-                            })

-                        end,

-                    }

-                })

-            end

-        }

-

+        'akinsho/toggleterm.nvim',

+        version = "*",

+        cmd = {"ToggleTerm", "ToggleTermSendCurrentLine", "ToggleTermSendVisualLines"},

     },

 

+    ------------------------------------------------------------

+    -- EDITOR ENHANCEMENTS

+    ------------------------------------------------------------

+    

+    -- Telescope (fuzzy finder)

     {

         'nvim-telescope/telescope.nvim',

-        -- or                              , branch = '0.1.x',

-        dependencies = { 'nvim-lua/plenary.nvim' }

+        dependencies = { 'nvim-lua/plenary.nvim' },

+        cmd = "Telescope",

     },

 

+    -- Harpoon (quick file navigation)

     {

-        'nvim-treesitter/nvim-treesitter',

-        build = ':TSUpdate',

-        config = function ()

-            local configs = require("nvim-treesitter.configs")

-

-            configs.setup({

-                ensure_installed = { "c", "lua", "vim", "vimdoc", "cpp", "python"}, --add "neorg here"

-                sync_install = false,

-                highlight = {

-                    enable = true

-                },

-                indent = {

-                    enable = true

-                },

-            })

-        end

+        "ThePrimeagen/harpoon",

+        branch = "harpoon2",

+        dependencies = { "nvim-lua/plenary.nvim" },

     },

 

+    -- Git integration

     {

-        'mbbill/undotree'

+        'tpope/vim-fugitive',

+        cmd = {"Git", "Gstatus", "Gblame", "Gdiffsplit", "Gread", "Gwrite", "Ggrep", "GMove", "GDelete"},

     },

 

-    {'akinsho/toggleterm.nvim',

-        version = "*",

-        opts = {

-            shell = "pwsh.exe -NoLogo",

-            winbar = {

-                enabled =false

-            },

-            direction = 'float',

-            border = 'none',  -- No border around the terminal

-            -- width = function()

-            --     return vim.o.columns  -- Full width of the screen

-            -- end,

-            -- height = function()

-            --     return vim.o.lines  -- Full height minus command line

-            -- end,

-            -- width = 800,

-            -- height = 700,

-        }

+    -- Undo history visualization

+    {

+        'mbbill/undotree',

+        cmd = "UndotreeToggle",

     },

+

+    ------------------------------------------------------------

+    -- CODE EDITING

+    ------------------------------------------------------------

+    

+    -- Syntax highlighting

     {

-    'windwp/nvim-autopairs',

-    event = "InsertEnter",

-    config = true

-    -- use opts = {} for passing setup options

-    -- this is equivalent to setup({}) function

-},

+        'nvim-treesitter/nvim-treesitter',

+        build = ':TSUpdate',

+        event = { "BufReadPost", "BufNewFile" },

+        cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" },

+        dependencies = {

+            'nvim-treesitter/nvim-treesitter-context',

+        },

+    },

 

+    -- Comments

     {

         'numToStr/Comment.nvim',

-        lazy = false,

-        opts= {

-            -- filetype = {

-            --     seq ={

-            --         commentstring ="! %s"

-            --     }

-            -- },

-            ---Add a space b/w comment and the line

-            padding = true,

-            ---Whether the cursor should stay at its position

-            sticky = true,

-            ---Lines to be ignored while (un)comment

-            ignore = nil,

-            ---LHS of toggle mappings in NORMAL mode

-            toggler = {

-                ---Line-comment toggle keymap

-                line = '<leader>/',

-                ---Block-comment toggle keymap

-                block = 'gbc',

-            },

-            ---LHS of operator-pending mappings in NORMAL and VISUAL mode

-            opleader = {

-                ---Line-comment keymap

-                line = '<leader>/',

-                ---Block-comment keymap

-                block = 'gb',

-            }}

+        event = { "BufReadPost", "BufNewFile" },

     },

 

-

+    -- Auto brackets

     {

-        'nvim-treesitter/nvim-treesitter-context'

+        'windwp/nvim-autopairs',

+        event = "InsertEnter",

+        config = true,

     },

+

+    -- LaTeX support

     {

         "lervag/vimtex",

-        lazy = false,     -- we don't want to lazy load VimTeX

-        -- tag = "v2.15", -- uncomment to pin to a specific release

+        ft = {"tex", "latex"},

         init = function()

-            -- VimTeX configuration goes here, e.g.

             vim.g.vimtex_view_method = "mupdf"

         end

     },

 

-    -- {

-    --     "nvim-telescope/telescope-file-browser.nvim",

-    --     dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },

-    --

-    -- },

-

+    ------------------------------------------------------------

+    -- LSP & COMPLETION

+    ------------------------------------------------------------

+    

+    -- LSP Base

     {

-        "ThePrimeagen/harpoon",

-        branch = "harpoon2",

-        dependencies = { "nvim-lua/plenary.nvim" }

+    "mason-org/mason.nvim",

+    "mason-org/mason-lspconfig.nvim",

+    "neovim/nvim-lspconfig",

+},

+      {

+    "folke/lazydev.nvim",

+    ft = "lua", -- only load on lua files

+    opts = {

+      library = {

+        -- See the configuration section for more details

+        -- Load luvit types when the `vim.uv` word is found

+        { path = "${3rd}/luv/library", words = { "vim%.uv" } },

+      },

     },

+  },

+

+    -- Autocompletion

     {

-        'stevearc/oil.nvim',

-        opts = {},

-        -- Optional dependencies

-        -- dependencies = { "echasnovski/mini.icons" },

-        dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons

-    }

+  'saghen/blink.cmp',

+  -- optional: provides snippets for the snippet source

+  dependencies = { 'rafamadriz/friendly-snippets' },

+

+  version = '1.*',

+  opts = {

+    -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)

+    -- 'super-tab' for mappings similar to vscode (tab to accept)

+    -- 'enter' for enter to accept

+    -- 'none' for no mappings

+    --

+    -- All presets have the following mappings:

+    -- C-space: Open menu or open docs if already open

+    -- C-n/C-p or Up/Down: Select next/previous item

+    -- C-e: Hide menu

+    -- C-k: Toggle signature help (if signature.enabled = true)

+    --

+    -- See :h blink-cmp-config-keymap for defining your own keymap

+    keymap = { preset = 'default' },

+

+    appearance = {

+      -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'

+      -- Adjusts spacing to ensure icons are aligned

+      nerd_font_variant = 'mono'

+    },

+

+    -- (Default) Only show the documentation popup when manually triggered

+    completion = { documentation = { auto_show = true} },

+

+    -- Default list of enabled providers defined so that you can extend it

+    -- elsewhere in your config, without redefining it, due to `opts_extend`

+sources = {

+        -- add lazydev to your completion providers

+        default = { "lazydev", "lsp", "path", "snippets", "buffer" },

+        providers = {

+          lazydev = {

+            name = "LazyDev",

+            module = "lazydev.integrations.blink",

+            -- make lazydev completions top priority (see `:h blink.cmp`)

+            score_offset = 100,

+          },

+        },

+      },

+    -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance

+    -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,

+    -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`

+    --

+    -- See the fuzzy documentation for more information

+    fuzzy = { implementation = "prefer_rust_with_warning" }

+  },

+  opts_extend = { "sources.default" }

+},

+

+}, {

+    -- Lazy.nvim options

+    install = { colorscheme = { "tokyonight-night" } },

+    checker = { enabled = true, frequency = 86400 }, -- Check for updates once per day

+    change_detection = { notify = false },

+    performance = {

+        rtp = {

+            disabled_plugins = {

+                "gzip",

+                "tarPlugin",

+                "tohtml",

+                "tutor",

+                "zipPlugin",

+            },

+        },

+    },

 })