From fb78d986405001d6a6b47d98344f67f46c83adc1 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 21 Feb 2024 22:52:05 +0100 Subject: [PATCH] Cleanup --- hosts/yoga/user.nix | 6 + modules/default.nix | 8 +- modules/gammastep/default.nix | 21 + modules/git/default.nix | 51 ++ modules/kanshi/default.nix | 143 ++++ modules/nvim/config/.stylua.toml | 6 - modules/nvim/config/LICENSE | 674 ------------------ modules/nvim/config/init.lua | 21 - modules/nvim/config/lazy-lock.json | 45 -- modules/nvim/config/lua/core/bootstrap.lua | 62 -- .../nvim/config/lua/core/default_config.lua | 92 --- modules/nvim/config/lua/core/init.lua | 138 ---- modules/nvim/config/lua/core/mappings.lua | 468 ------------ modules/nvim/config/lua/core/utils.lua | 118 --- modules/nvim/config/lua/custom/.stylua.toml | 6 - modules/nvim/config/lua/custom/README.md | 99 --- modules/nvim/config/lua/custom/chadrc.lua | 67 -- .../nvim/config/lua/custom/configs/hop.lua | 237 ------ .../config/lua/custom/configs/lspconfig.lua | 341 --------- .../nvim/config/lua/custom/configs/neodev.lua | 19 - .../config/lua/custom/configs/null-ls.lua | 47 -- .../config/lua/custom/configs/nvim-cmp.lua | 123 ---- .../config/lua/custom/configs/overrides.lua | 170 ----- .../lua/custom/configs/symbols-outline.lua | 7 - .../lua/custom/configs/terminal_nvim.lua | 98 --- .../config/lua/custom/configs/trouble.lua | 8 - .../nvim/config/lua/custom/diagnostics.lua | 63 -- modules/nvim/config/lua/custom/headers.lua | 141 ---- modules/nvim/config/lua/custom/highlights.lua | 27 - modules/nvim/config/lua/custom/icons.lua | 102 --- modules/nvim/config/lua/custom/init.lua | 78 -- modules/nvim/config/lua/custom/mappings.lua | 97 --- modules/nvim/config/lua/custom/plugins.lua | 416 ----------- .../nvim/config/lua/plugins/configs/cmp.lua | 120 ---- .../config/lua/plugins/configs/lazy_nvim.lua | 47 -- .../config/lua/plugins/configs/lspconfig.lua | 64 -- .../nvim/config/lua/plugins/configs/mason.lua | 28 - .../config/lua/plugins/configs/nvimtree.lua | 77 -- .../config/lua/plugins/configs/others.lua | 66 -- .../config/lua/plugins/configs/telescope.lua | 55 -- .../config/lua/plugins/configs/treesitter.lua | 12 - modules/nvim/config/lua/plugins/init.lua | 253 ------- modules/nvim/default.nix | 16 - modules/nvim/npmrc | 1 - modules/packages/default.nix | 1 - modules/starship/default.nix | 31 + modules/system/configuration.nix | 16 +- modules/tmux/default.nix | 56 ++ modules/vscode/default.nix | 23 + 49 files changed, 343 insertions(+), 4522 deletions(-) create mode 100644 modules/gammastep/default.nix create mode 100644 modules/git/default.nix create mode 100644 modules/kanshi/default.nix delete mode 100644 modules/nvim/config/.stylua.toml delete mode 100644 modules/nvim/config/LICENSE delete mode 100644 modules/nvim/config/init.lua delete mode 100644 modules/nvim/config/lazy-lock.json delete mode 100644 modules/nvim/config/lua/core/bootstrap.lua delete mode 100644 modules/nvim/config/lua/core/default_config.lua delete mode 100644 modules/nvim/config/lua/core/init.lua delete mode 100644 modules/nvim/config/lua/core/mappings.lua delete mode 100644 modules/nvim/config/lua/core/utils.lua delete mode 100644 modules/nvim/config/lua/custom/.stylua.toml delete mode 100644 modules/nvim/config/lua/custom/README.md delete mode 100644 modules/nvim/config/lua/custom/chadrc.lua delete mode 100644 modules/nvim/config/lua/custom/configs/hop.lua delete mode 100644 modules/nvim/config/lua/custom/configs/lspconfig.lua delete mode 100644 modules/nvim/config/lua/custom/configs/neodev.lua delete mode 100644 modules/nvim/config/lua/custom/configs/null-ls.lua delete mode 100644 modules/nvim/config/lua/custom/configs/nvim-cmp.lua delete mode 100644 modules/nvim/config/lua/custom/configs/overrides.lua delete mode 100644 modules/nvim/config/lua/custom/configs/symbols-outline.lua delete mode 100644 modules/nvim/config/lua/custom/configs/terminal_nvim.lua delete mode 100644 modules/nvim/config/lua/custom/configs/trouble.lua delete mode 100644 modules/nvim/config/lua/custom/diagnostics.lua delete mode 100644 modules/nvim/config/lua/custom/headers.lua delete mode 100644 modules/nvim/config/lua/custom/highlights.lua delete mode 100644 modules/nvim/config/lua/custom/icons.lua delete mode 100644 modules/nvim/config/lua/custom/init.lua delete mode 100644 modules/nvim/config/lua/custom/mappings.lua delete mode 100644 modules/nvim/config/lua/custom/plugins.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/cmp.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/lazy_nvim.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/lspconfig.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/mason.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/nvimtree.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/others.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/telescope.lua delete mode 100644 modules/nvim/config/lua/plugins/configs/treesitter.lua delete mode 100644 modules/nvim/config/lua/plugins/init.lua delete mode 100644 modules/nvim/default.nix delete mode 100644 modules/nvim/npmrc create mode 100644 modules/starship/default.nix create mode 100644 modules/tmux/default.nix create mode 100644 modules/vscode/default.nix diff --git a/hosts/yoga/user.nix b/hosts/yoga/user.nix index b6099d2..7ed2130 100644 --- a/hosts/yoga/user.nix +++ b/hosts/yoga/user.nix @@ -14,6 +14,12 @@ fuzzel.enable = true; gtk.enable = true; direnv.enable = true; + kanshi.enable = true; nvim.enable = false; + git.enable = true; + gammastep.enable = true; + vscode.enable = true; + tmux.enable = true; + starship.enable = true; }; } diff --git a/modules/default.nix b/modules/default.nix index f143b39..2836e67 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,7 @@ imports = [ ./hyprland ./packages - ./dunst + ./dunst ./kitty ./waybar ./zsh @@ -13,5 +13,11 @@ ./gtk ./direnv ./nvim + ./kanshi + ./git + ./gammastep + ./vscode + ./tmux + ./starship ]; } diff --git a/modules/gammastep/default.nix b/modules/gammastep/default.nix new file mode 100644 index 0000000..6b3c740 --- /dev/null +++ b/modules/gammastep/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.gammastep; + +in { + options.modules.gammastep = { enable = mkEnableOption "gammastep"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ gammastep ]; + + services.gammastep = { + enable = false; + provider = "manual"; + latitude = 46.0569; + longitude = 14.5058; + tray = true; + temperature.night = 4500; + }; + + }; +} diff --git a/modules/git/default.nix b/modules/git/default.nix new file mode 100644 index 0000000..f612bea --- /dev/null +++ b/modules/git/default.nix @@ -0,0 +1,51 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.git; + +in { + options.modules.git = { enable = mkEnableOption "git"; }; + config = mkIf cfg.enable { + programs.git = { + enable = true; + userName = "Gašper Spagnolo"; + userEmail = "gasper.spagnolo@outlook.com"; + signing.key = "9EE5C796920C339839F4EFF646DCDBC936F8414C"; + signing.signByDefault = true; + + aliases = { + ci = "commit"; + co = "checkout"; + cp = "cherry-pick"; + s = "status -uall"; + br = "branch"; + aliases = "!git config -l | grep alias | cut -c 7-"; + hist = + "log --pretty=format:'%C(yellow)%h%Creset%C(auto)%d - %s %Cblue[%an]' --graph --date=short --decorate --branches --remotes --tags"; + blobs = + "!git rev-list --objects --all | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | sed -n 's/^blob //p' | sort --numeric-sort --key=2 | cut -c 1-12,41- | $(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest"; + fap = "fetch --all --prune --progress"; + l = + "log --graph --pretty='%Cred%h%Creset - %C(bold blue)<%an>%Creset %s%C(yellow)%d%Creset %Cgreen(%cr)' --abbrev-commit --date=relative"; + fixup = "commit --fixup"; + pr-diff = "diff upstream/HEAD.."; + pr-log = "l upstream/HEAD.."; + pr-edit = + "rebase --interactive --autosquash --rerere-autoupdate --rebase-merges --fork-point upstream/HEAD"; + pr-clean = + "-c sequence.editor=true rebase --interactive --autosquash --rerere-autoupdate --empty drop --no-keep-empty --fork-point upstream/HEAD"; + pr-update = "pull --rebase=merges upstream HEAD"; + }; + + extraConfig = { + merge.conflictstyle = "diff3"; + push.default = "current"; + pull.rebase = true; + init.defaultBranch = "master"; + url."git@github.com:".insteadOf = "https://github.com/"; + branch.sort = "-committerdate"; + tag.sort = "-v:refname"; + }; + }; + }; +} diff --git a/modules/kanshi/default.nix b/modules/kanshi/default.nix new file mode 100644 index 0000000..95ed3f3 --- /dev/null +++ b/modules/kanshi/default.nix @@ -0,0 +1,143 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.kanshi; + +in { + options.modules.kanshi = { enable = mkEnableOption "kanshi"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + kanshi + ]; + + services.kanshi = { + enable = true; + + systemdTarget = "hyprland-session.target"; + + profiles = { + profile1 = { + outputs = [ + { + criteria = "Dell Inc. DELL P2419HC H565L03"; + position = "0,0"; + } + { + criteria = "eDP-1"; + status = "disable"; + } + ]; + }; + + yoga = { + outputs = [{ + criteria = "California Institute of Technology 0x1410 Unknown"; + mode = "3072x1920@120Hz"; + scale = 1.0; + }]; + }; + + lj_setup = { + outputs = [ + { + criteria = "Samsung Electric Company C34H89x H4ZRB05512"; + mode = "3440x1440@100Hz"; + } + { + criteria = "California Institute of Technology 0x1410 Unknown"; + status = "disable"; + } + ]; + }; + + portable_monitor = { + outputs = [ + { + criteria = "California Institute of Technology 0x1410 Unknown"; + mode = "3072x1920@120Hz"; + scale = 1.0; + position = "1128,3130"; + } + { + criteria = "Avolites Ltd ARZOPA -S1 0000000000000"; + mode = "1920x1080@60Hz"; + position = "1690,2050"; + } + ]; + }; + + portable_monitor_2 = { + outputs = [ + { + criteria = "AU Optronics 0x313D Unknown"; + mode = "1920x1080@60Hz"; + scale = 1.0; + position = "1920,1080"; + } + { + criteria = "Avolites Ltd ARZOPA -S1 0000000000000"; + mode = "1920x1080@60Hz"; + position = "1920,0"; + } + ]; + }; + + lj_setup_2 = { + outputs = [ + { + criteria = "AU Optronics 0x313D Unknown"; + status = "disable"; + } + { + criteria = "Samsung Electric Company C34H89x H4ZRB05512"; + mode = "3440x1440@60Hz"; + } + ]; + }; + + hs_1 = { + outputs = [ + { + criteria = "AU Optronics 0x313D Unknown"; + #mode = "1920x1080@60Hz"; + #scale = 1.0; + #position = "0,1080"; + status = "disable"; + } + { + criteria = "Samsung Electric Company S24D330 0x00005B31"; + mode = "1920x1080@60Hz"; + position = "0,0"; + } + ]; + + }; + + hs_22 = { + outputs = [ + { + criteria = + "Philips Consumer Electronics Company PHL27M1N3200Z UK02329015881"; + mode = "1920x1080@144"; + } + { + criteria = "California Institute of Technology 0x1410 Unknown"; + status = "disable"; + } + ]; + }; + + profile7 = { + outputs = [{ + criteria = "AU Optronics 0x313D Unknown"; + mode = "1920x1080@60Hz"; + scale = 1.0; + }]; + }; + }; + }; + + + + }; +} diff --git a/modules/nvim/config/.stylua.toml b/modules/nvim/config/.stylua.toml deleted file mode 100644 index ecb6dca..0000000 --- a/modules/nvim/config/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferDouble" -call_parentheses = "None" diff --git a/modules/nvim/config/LICENSE b/modules/nvim/config/LICENSE deleted file mode 100644 index f288702..0000000 --- a/modules/nvim/config/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/modules/nvim/config/init.lua b/modules/nvim/config/init.lua deleted file mode 100644 index 21f0b6f..0000000 --- a/modules/nvim/config/init.lua +++ /dev/null @@ -1,21 +0,0 @@ -require "core" - -local custom_init_path = vim.api.nvim_get_runtime_file("lua/custom/init.lua", false)[1] - -if custom_init_path then - dofile(custom_init_path) -end - -require("core.utils").load_mappings() - -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" - --- bootstrap lazy.nvim! -if not vim.loop.fs_stat(lazypath) then - require("core.bootstrap").gen_chadrc_template() - require("core.bootstrap").lazy(lazypath) -end - -dofile(vim.g.base46_cache .. "defaults") -vim.opt.rtp:prepend(lazypath) -require "plugins" diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json deleted file mode 100644 index f1ba643..0000000 --- a/modules/nvim/config/lazy-lock.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "base46": { "branch": "v2.0", "commit": "3f2b658cbd6650ddaf2bae3233e143a41ca25b1a" }, - "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "gopher.nvim": { "branch": "main", "commit": "ac27f4b6794c872140fb205313d79ab166892fe9" }, - "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, - "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, - "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" }, - "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" }, - "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, - "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "schemastore.nvim": { "branch": "main", "commit": "898a19cb54f310dda7cdeedf3d75aeeffcf19136" }, - "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "syntax-tree-surfer": { "branch": "master", "commit": "732ea6d0f868bcccd2f526be73afa46997d5a2fb" }, - "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, - "terminal.nvim": { "branch": "master", "commit": "764b7c137512bcfba2e45cf3e25c08a9f4d3b733" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "ui": { "branch": "v2.0", "commit": "1737a2a98e18b635480756e817564b60ff31fc53" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } -} \ No newline at end of file diff --git a/modules/nvim/config/lua/core/bootstrap.lua b/modules/nvim/config/lua/core/bootstrap.lua deleted file mode 100644 index a5d5c68..0000000 --- a/modules/nvim/config/lua/core/bootstrap.lua +++ /dev/null @@ -1,62 +0,0 @@ -local M = {} -local fn = vim.fn - -M.echo = function(str) - vim.cmd "redraw" - vim.api.nvim_echo({ { str, "Bold" } }, true, {}) -end - -local function shell_call(args) - local output = fn.system(args) - assert(vim.v.shell_error == 0, "External call failed with error code: " .. vim.v.shell_error .. "\n" .. output) -end - -M.lazy = function(install_path) - ------------- base46 --------------- - local lazy_path = fn.stdpath "data" .. "/lazy/base46" - - M.echo " Compiling base46 theme to bytecode ..." - - local base46_repo = "https://github.com/NvChad/base46" - shell_call { "git", "clone", "--depth", "1", "-b", "v2.0", base46_repo, lazy_path } - vim.opt.rtp:prepend(lazy_path) - - require("base46").compile() - - --------- lazy.nvim --------------- - M.echo " Installing lazy.nvim & plugins ..." - local repo = "https://github.com/folke/lazy.nvim.git" - shell_call { "git", "clone", "--filter=blob:none", "--branch=stable", repo, install_path } - vim.opt.rtp:prepend(install_path) - - -- install plugins - require "plugins" - - -- mason packages & show post_bootstrap screen - require "nvchad.post_install"() -end - -M.gen_chadrc_template = function() - local path = fn.stdpath "config" .. "/lua/custom" - - if fn.isdirectory(path) ~= 1 then - local input = vim.env.NVCHAD_EXAMPLE_CONFIG or fn.input "Do you want to install example custom config? (y/N): " - - if input:lower() == "y" then - M.echo "Cloning example custom config repo..." - shell_call { "git", "clone", "--depth", "1", "https://github.com/NvChad/example_config", path } - fn.delete(path .. "/.git", "rf") - else - -- use very minimal chadrc - fn.mkdir(path, "p") - - local file = io.open(path .. "/chadrc.lua", "w") - if file then - file:write "---@type ChadrcConfig\nlocal M = {}\n\nM.ui = { theme = 'onedark' }\n\nreturn M" - file:close() - end - end - end -end - -return M diff --git a/modules/nvim/config/lua/core/default_config.lua b/modules/nvim/config/lua/core/default_config.lua deleted file mode 100644 index 639916a..0000000 --- a/modules/nvim/config/lua/core/default_config.lua +++ /dev/null @@ -1,92 +0,0 @@ -local M = {} - -M.options = { - nvchad_branch = "v2.0", -} - -M.ui = { - ------------------------------- base46 ------------------------------------- - -- hl = highlights - hl_add = {}, - hl_override = {}, - changed_themes = {}, - theme_toggle = { "onedark", "one_light" }, - theme = "onedark", -- default theme - transparency = false, - lsp_semantic_tokens = false, -- needs nvim v0.9, just adds highlight groups for lsp semantic tokens - - -- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations - extended_integrations = {}, -- these aren't compiled by default, ex: "alpha", "notify" - - -- cmp themeing - cmp = { - icons = true, - lspkind_text = true, - style = "default", -- default/flat_light/flat_dark/atom/atom_colored - border_color = "grey_fg", -- only applicable for "default" style, use color names from base30 variables - selected_item_bg = "colored", -- colored / simple - }, - - telescope = { style = "borderless" }, -- borderless / bordered - - ------------------------------- nvchad_ui modules ----------------------------- - statusline = { - theme = "default", -- default/vscode/vscode_colored/minimal - -- default/round/block/arrow separators work only for default statusline theme - -- round and block will work for minimal theme only - separator_style = "default", - overriden_modules = nil, - }, - - -- lazyload it when there are 1+ buffers - tabufline = { - show_numbers = false, - enabled = true, - lazyload = true, - overriden_modules = nil, - }, - - -- nvdash (dashboard) - nvdash = { - load_on_startup = false, - - header = { - " ▄ ▄ ", - " ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ", - " █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ", - " ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ", - " ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ", - " █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄", - "▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █", - "█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █", - " █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ", - }, - - buttons = { - { " Find File", "Spc f f", "Telescope find_files" }, - { "󰈚 Recent Files", "Spc f o", "Telescope oldfiles" }, - { "󰈭 Find Word", "Spc f w", "Telescope live_grep" }, - { " Bookmarks", "Spc m a", "Telescope marks" }, - { " Themes", "Spc t h", "Telescope themes" }, - { " Mappings", "Spc c h", "NvCheatsheet" }, - }, - }, - - cheatsheet = { theme = "grid" }, -- simple/grid - - lsp = { - -- show function signatures i.e args as you type - signature = { - disabled = false, - silent = true, -- silences 'no signature help available' message from appearing - }, - }, -} - -M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file - -M.lazy_nvim = require "plugins.configs.lazy_nvim" -- config for lazy.nvim startup options - -M.mappings = require "core.mappings" - -return M diff --git a/modules/nvim/config/lua/core/init.lua b/modules/nvim/config/lua/core/init.lua deleted file mode 100644 index 8d19174..0000000 --- a/modules/nvim/config/lua/core/init.lua +++ /dev/null @@ -1,138 +0,0 @@ -local opt = vim.opt -local g = vim.g -local config = require("core.utils").load_config() - --------------------------------------- globals ----------------------------------------- -g.nvchad_theme = config.ui.theme -g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -g.toggle_theme_icon = "  " -g.transparency = config.ui.transparency - --------------------------------------- options ------------------------------------------ -opt.laststatus = 3 -- global statusline -opt.showmode = false - -opt.clipboard = "unnamedplus" -opt.cursorline = true - --- Indenting -opt.expandtab = true -opt.shiftwidth = 2 -opt.smartindent = true -opt.tabstop = 2 -opt.softtabstop = 2 - -opt.fillchars = { eob = " " } -opt.ignorecase = true -opt.smartcase = true -opt.mouse = "a" - --- Numbers -opt.number = true -opt.numberwidth = 2 -opt.ruler = false - --- disable nvim intro -opt.shortmess:append "sI" - -opt.signcolumn = "yes" -opt.splitbelow = true -opt.splitright = true -opt.termguicolors = true -opt.timeoutlen = 400 -opt.undofile = true - --- interval for writing swap file to disk, also used by gitsigns -opt.updatetime = 250 - --- go to previous/next line with h,l,left arrow and right arrow --- when cursor reaches end/beginning of line -opt.whichwrap:append "<>[]hl" - -g.mapleader = " " - --- disable some default providers -for _, provider in ipairs { "node", "perl", "python3", "ruby" } do - vim.g["loaded_" .. provider .. "_provider"] = 0 -end - --- add binaries installed by mason.nvim to path -local is_windows = vim.loop.os_uname().sysname == "Windows_NT" -vim.env.PATH = vim.fn.stdpath "data" .. "/mason/bin" .. (is_windows and ";" or ":") .. vim.env.PATH - --------------------------------------- autocmds ------------------------------------------ -local autocmd = vim.api.nvim_create_autocmd - --- dont list quickfix buffers -autocmd("FileType", { - pattern = "qf", - callback = function() - vim.opt_local.buflisted = false - end, -}) - --- reload some chadrc options on-save -autocmd("BufWritePost", { - pattern = vim.tbl_map(function(path) - return vim.fs.normalize(vim.loop.fs_realpath(path)) - end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)), - group = vim.api.nvim_create_augroup("ReloadNvChad", {}), - - callback = function(opts) - local fp = vim.fn.fnamemodify(vim.fs.normalize(vim.api.nvim_buf_get_name(opts.buf)), ":r") --[[@as string]] - local app_name = vim.env.NVIM_APPNAME and vim.env.NVIM_APPNAME or "nvim" - local module = string.gsub(fp, "^.*/" .. app_name .. "/lua/", ""):gsub("/", ".") - - require("plenary.reload").reload_module "base46" - require("plenary.reload").reload_module(module) - require("plenary.reload").reload_module "custom.chadrc" - - config = require("core.utils").load_config() - - vim.g.nvchad_theme = config.ui.theme - vim.g.transparency = config.ui.transparency - - -- statusline - require("plenary.reload").reload_module("nvchad.statusline." .. config.ui.statusline.theme) - vim.opt.statusline = "%!v:lua.require('nvchad.statusline." .. config.ui.statusline.theme .. "').run()" - - -- tabufline - if config.ui.tabufline.enabled then - require("plenary.reload").reload_module "nvchad.tabufline.modules" - vim.opt.tabline = "%!v:lua.require('nvchad.tabufline.modules').run()" - end - - require("base46").load_all_highlights() - -- vim.cmd("redraw!") - end, -}) - --- user event that loads after UIEnter + only if file buf is there -vim.api.nvim_create_autocmd({ "UIEnter", "BufReadPost", "BufNewFile" }, { - group = vim.api.nvim_create_augroup("NvFilePost", { clear = true }), - callback = function(args) - local file = vim.api.nvim_buf_get_name(args.buf) - local buftype = vim.api.nvim_buf_get_option(args.buf, "buftype") - - if not vim.g.ui_entered and args.event == "UIEnter" then - vim.g.ui_entered = true - end - - if file ~= "" and buftype ~= "nofile" and vim.g.ui_entered then - vim.api.nvim_exec_autocmds("User", { pattern = "FilePost", modeline = false }) - vim.api.nvim_del_augroup_by_name "NvFilePost" - - vim.schedule(function() - vim.api.nvim_exec_autocmds("FileType", {}) - require("editorconfig").config(args.buf) - end, 0) - end - end, -}) - --------------------------------------- commands ------------------------------------------ -local new_cmd = vim.api.nvim_create_user_command - -new_cmd("NvChadUpdate", function() - require "nvchad.updater"() -end, {}) diff --git a/modules/nvim/config/lua/core/mappings.lua b/modules/nvim/config/lua/core/mappings.lua deleted file mode 100644 index 0a652a7..0000000 --- a/modules/nvim/config/lua/core/mappings.lua +++ /dev/null @@ -1,468 +0,0 @@ --- n, v, i, t = mode names - -local M = {} - -M.general = { - i = { - -- go to beginning and end - [""] = { "^i", "Beginning of line" }, - [""] = { "", "End of line" }, - - -- navigate within insert mode - [""] = { "", "Move left" }, - [""] = { "", "Move right" }, - [""] = { "", "Move down" }, - [""] = { "", "Move up" }, - }, - - n = { - [""] = { " noh ", "Clear highlights" }, - -- switch between windows - [""] = { "h", "Window left" }, - [""] = { "l", "Window right" }, - [""] = { "j", "Window down" }, - [""] = { "k", "Window up" }, - - -- save - [""] = { " w ", "Save file" }, - - -- Copy all - [""] = { " %y+ ", "Copy whole file" }, - - -- line numbers - ["n"] = { " set nu! ", "Toggle line number" }, - ["rn"] = { " set rnu! ", "Toggle relative number" }, - - -- Allow moving the cursor through wrapped lines with j, k, and - -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/ - -- empty mode is same as using :map - -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour - ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - - -- new buffer - ["b"] = { " enew ", "New buffer" }, - ["ch"] = { " NvCheatsheet ", "Mapping cheatsheet" }, - - ["fm"] = { - function() - vim.lsp.buf.format { async = true } - end, - "LSP formatting", - }, - }, - - t = { - [""] = { vim.api.nvim_replace_termcodes("", true, true, true), "Escape terminal mode" }, - }, - - v = { - [""] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - [""] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - ["<"] = { ""] = { ">gv", "Indent line" }, - }, - - x = { - ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } }, - ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } }, - -- Don't copy the replaced text after pasting in visual mode - -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste - ["p"] = { 'p:let @+=@0:let @"=@0', "Dont copy replaced text", opts = { silent = true } }, - }, -} - -M.tabufline = { - plugin = true, - - n = { - -- cycle through buffers - [""] = { - function() - require("nvchad.tabufline").tabuflineNext() - end, - "Goto next buffer", - }, - - [""] = { - function() - require("nvchad.tabufline").tabuflinePrev() - end, - "Goto prev buffer", - }, - - -- close buffer + hide terminal buffer - ["x"] = { - function() - require("nvchad.tabufline").close_buffer() - end, - "Close buffer", - }, - }, -} - -M.comment = { - plugin = true, - - -- toggle comment in both modes - n = { - ["/"] = { - function() - require("Comment.api").toggle.linewise.current() - end, - "Toggle comment", - }, - }, - - v = { - ["/"] = { - "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", - "Toggle comment", - }, - }, -} - -M.lspconfig = { - plugin = true, - - -- See ` :help vim.lsp.*` for documentation on any of the below functions - - n = { - ["gD"] = { - function() - vim.lsp.buf.declaration() - end, - "LSP declaration", - }, - - ["gd"] = { - function() - vim.lsp.buf.definition() - end, - "LSP definition", - }, - - ["K"] = { - function() - vim.lsp.buf.hover() - end, - "LSP hover", - }, - - ["gi"] = { - function() - vim.lsp.buf.implementation() - end, - "LSP implementation", - }, - - ["ls"] = { - function() - vim.lsp.buf.signature_help() - end, - "LSP signature help", - }, - - ["D"] = { - function() - vim.lsp.buf.type_definition() - end, - "LSP definition type", - }, - - ["ra"] = { - function() - require("nvchad.renamer").open() - end, - "LSP rename", - }, - - ["ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP code action", - }, - - ["gr"] = { - function() - vim.lsp.buf.references() - end, - "LSP references", - }, - - ["lf"] = { - function() - vim.diagnostic.open_float { border = "rounded" } - end, - "Floating diagnostic", - }, - - ["[d"] = { - function() - vim.diagnostic.goto_prev { float = { border = "rounded" } } - end, - "Goto prev", - }, - - ["]d"] = { - function() - vim.diagnostic.goto_next { float = { border = "rounded" } } - end, - "Goto next", - }, - - ["q"] = { - function() - vim.diagnostic.setloclist() - end, - "Diagnostic setloclist", - }, - - ["wa"] = { - function() - vim.lsp.buf.add_workspace_folder() - end, - "Add workspace folder", - }, - - ["wr"] = { - function() - vim.lsp.buf.remove_workspace_folder() - end, - "Remove workspace folder", - }, - - ["wl"] = { - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, - "List workspace folders", - }, - }, - - v = { - ["ca"] = { - function() - vim.lsp.buf.code_action() - end, - "LSP code action", - }, - }, -} - -M.nvimtree = { - plugin = true, - - n = { - -- toggle - [""] = { " NvimTreeToggle ", "Toggle nvimtree" }, - - -- focus - ["e"] = { " NvimTreeFocus ", "Focus nvimtree" }, - }, -} - -M.telescope = { - plugin = true, - - n = { - -- find - ["ff"] = { " Telescope find_files ", "Find files" }, - ["fa"] = { " Telescope find_files follow=true no_ignore=true hidden=true ", "Find all" }, - ["fw"] = { " Telescope live_grep ", "Live grep" }, - ["fb"] = { " Telescope buffers ", "Find buffers" }, - ["fh"] = { " Telescope help_tags ", "Help page" }, - ["fo"] = { " Telescope oldfiles ", "Find oldfiles" }, - ["fz"] = { " Telescope current_buffer_fuzzy_find ", "Find in current buffer" }, - - -- git - ["cm"] = { " Telescope git_commits ", "Git commits" }, - ["gt"] = { " Telescope git_status ", "Git status" }, - - -- pick a hidden term - ["pt"] = { " Telescope terms ", "Pick hidden term" }, - - -- theme switcher - ["th"] = { " Telescope themes ", "Nvchad themes" }, - - ["ma"] = { " Telescope marks ", "telescope bookmarks" }, - }, -} - -M.nvterm = { - plugin = true, - - t = { - -- toggle in terminal mode - [""] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle floating term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle horizontal term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle vertical term", - }, - }, - - n = { - -- toggle in normal mode - [""] = { - function() - require("nvterm.terminal").toggle "float" - end, - "Toggle floating term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "horizontal" - end, - "Toggle horizontal term", - }, - - [""] = { - function() - require("nvterm.terminal").toggle "vertical" - end, - "Toggle vertical term", - }, - - -- new - ["h"] = { - function() - require("nvterm.terminal").new "horizontal" - end, - "New horizontal term", - }, - - ["v"] = { - function() - require("nvterm.terminal").new "vertical" - end, - "New vertical term", - }, - }, -} - -M.whichkey = { - plugin = true, - - n = { - ["wK"] = { - function() - vim.cmd "WhichKey" - end, - "Which-key all keymaps", - }, - ["wk"] = { - function() - local input = vim.fn.input "WhichKey: " - vim.cmd("WhichKey " .. input) - end, - "Which-key query lookup", - }, - }, -} - -M.blankline = { - plugin = true, - - n = { - ["cc"] = { - function() - local ok, start = require("indent_blankline.utils").get_current_context( - vim.g.indent_blankline_context_patterns, - vim.g.indent_blankline_use_treesitter_scope - ) - - if ok then - vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start, 0 }) - vim.cmd [[normal! _]] - end - end, - - "Jump to current context", - }, - }, -} - -M.gitsigns = { - plugin = true, - - n = { - -- Navigation through hunks - ["]c"] = { - function() - if vim.wo.diff then - return "]c" - end - vim.schedule(function() - require("gitsigns").next_hunk() - end) - return "" - end, - "Jump to next hunk", - opts = { expr = true }, - }, - - ["[c"] = { - function() - if vim.wo.diff then - return "[c" - end - vim.schedule(function() - require("gitsigns").prev_hunk() - end) - return "" - end, - "Jump to prev hunk", - opts = { expr = true }, - }, - - -- Actions - ["rh"] = { - function() - require("gitsigns").reset_hunk() - end, - "Reset hunk", - }, - - ["ph"] = { - function() - require("gitsigns").preview_hunk() - end, - "Preview hunk", - }, - - ["gb"] = { - function() - package.loaded.gitsigns.blame_line() - end, - "Blame line", - }, - - ["td"] = { - function() - require("gitsigns").toggle_deleted() - end, - "Toggle deleted", - }, - }, -} - -return M diff --git a/modules/nvim/config/lua/core/utils.lua b/modules/nvim/config/lua/core/utils.lua deleted file mode 100644 index 8b2a03d..0000000 --- a/modules/nvim/config/lua/core/utils.lua +++ /dev/null @@ -1,118 +0,0 @@ -local M = {} -local merge_tb = vim.tbl_deep_extend - -M.load_config = function() - local config = require "core.default_config" - local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1] - - if chadrc_path then - local chadrc = dofile(chadrc_path) - - config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings) - config = merge_tb("force", config, chadrc) - config.mappings.disabled = nil - end - - return config -end - -M.remove_disabled_keys = function(chadrc_mappings, default_mappings) - if not chadrc_mappings then - return default_mappings - end - - -- store keys in a array with true value to compare - local keys_to_disable = {} - for _, mappings in pairs(chadrc_mappings) do - for mode, section_keys in pairs(mappings) do - if not keys_to_disable[mode] then - keys_to_disable[mode] = {} - end - section_keys = (type(section_keys) == "table" and section_keys) or {} - for k, _ in pairs(section_keys) do - keys_to_disable[mode][k] = true - end - end - end - - -- make a copy as we need to modify default_mappings - for section_name, section_mappings in pairs(default_mappings) do - for mode, mode_mappings in pairs(section_mappings) do - mode_mappings = (type(mode_mappings) == "table" and mode_mappings) or {} - for k, _ in pairs(mode_mappings) do - -- if key if found then remove from default_mappings - if keys_to_disable[mode] and keys_to_disable[mode][k] then - default_mappings[section_name][mode][k] = nil - end - end - end - end - - return default_mappings -end - -M.load_mappings = function(section, mapping_opt) - vim.schedule(function() - local function set_section_map(section_values) - if section_values.plugin then - return - end - - section_values.plugin = nil - - for mode, mode_values in pairs(section_values) do - local default_opts = merge_tb("force", { mode = mode }, mapping_opt or {}) - for keybind, mapping_info in pairs(mode_values) do - -- merge default + user opts - local opts = merge_tb("force", default_opts, mapping_info.opts or {}) - - mapping_info.opts, opts.mode = nil, nil - opts.desc = mapping_info[2] - - vim.keymap.set(mode, keybind, mapping_info[1], opts) - end - end - end - - local mappings = require("core.utils").load_config().mappings - - if type(section) == "string" then - mappings[section]["plugin"] = nil - mappings = { mappings[section] } - end - - for _, sect in pairs(mappings) do - set_section_map(sect) - end - end) -end - -M.lazy_load = function(plugin) - vim.api.nvim_create_autocmd({ "BufRead", "BufWinEnter", "BufNewFile" }, { - group = vim.api.nvim_create_augroup("BeLazyOnFileOpen" .. plugin, {}), - callback = function() - local file = vim.fn.expand "%" - local condition = file ~= "NvimTree_1" and file ~= "[lazy]" and file ~= "" - - if condition then - vim.api.nvim_del_augroup_by_name("BeLazyOnFileOpen" .. plugin) - - -- dont defer for treesitter as it will show slow highlighting - -- This deferring only happens only when we do "nvim filename" - if plugin ~= "nvim-treesitter" then - vim.schedule(function() - require("lazy").load { plugins = plugin } - - if plugin == "nvim-lspconfig" then - vim.cmd "silent! do FileType" - end - end, 0) - else - require("lazy").load { plugins = plugin } - end - end - end, - }) -end - -return M diff --git a/modules/nvim/config/lua/custom/.stylua.toml b/modules/nvim/config/lua/custom/.stylua.toml deleted file mode 100644 index 6342351..0000000 --- a/modules/nvim/config/lua/custom/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Tabs" -indent_width = 4 -quote_style = "AutoPreferDouble" -call_parentheses = "None" diff --git a/modules/nvim/config/lua/custom/README.md b/modules/nvim/config/lua/custom/README.md deleted file mode 100644 index f700256..0000000 --- a/modules/nvim/config/lua/custom/README.md +++ /dev/null @@ -1,99 +0,0 @@ -# NvChad custom configuration - -This NvChad custom configuration is used by -[Lazyman](https://github.com/doctorfree/nvim-lazyman) as the custom add-on for -[NvChad](https://github.com/NvChad/NvChad). - -Installation and initialization are performed by the `lazyman -c` command. - -## Features - -- Automated installation of language servers, formatters, linters, and parsers -- Advanced LSP configuration with diagnostics and convenience keymaps -- Automated installation and initialization with `lazyman -c` command -- NvChad dashboard ([nvdash](https://github.com/NvChad/ui)) enhancements - - Hide statusline and tabline when in dashboard - - Random dashboard header selection - - Customized menu -- Set mapleader and maplocalleader to `comma` rather than `space` -- Convenience keymap `semi-colon` enters command mode -- Jump anywhere in a document with a few keystrokes using [Hop](https://github.com/phaazon/hop.nvim) -- Replace [nvterm](https://github.com/NvChad/nvterm) with [terminal.nvim](https://github.com/rebelot/terminal.nvim) -- Preconfigured autocmds and keymaps for easy execution of terminal and editor commands - -## Command keymaps - -| **Command** | **Keymap** | **Description** | -| ----------- | ---------- | --------------------- | -| Lazy | `,P` | Lazy plugin manager | -| Mason | `,M` | Mason package manager | -| Htop | `,H` | Htop system monitor | -| Lazygit | `,G` | Lazygit command | -| Lazyman | `,L` | Lazyman main menu | -| Lazyconf | `,C` | Lazyman configuration | - -## Convenience keymaps - -| **Keymap** | **Description** | -| ---------- | ------------------------------ | -| `,tt` | Toggle theme | -| `,tT` | Toggle transparency | -| `,cs` | Symbols outline | -| `,de` | Open floating diagnostic | -| `,dt` | Toggle diagnostics | -| `,dq` | Set diagnostics location list | -| `,ts` | Terminal send | -| `,to` | Terminal toggle | -| `,tO` | New Terminal toggle | -| `,tr` | Terminal run | -| `,tR` | New Terminal run | -| `,tk` | Terminal kill | -| `,t]` | Terminal next | -| `,t[` | Terminal prev | -| `,tl` | Terminal move below right | -| `,tL` | Terminal move bottom right | -| `,th` | Terminal move below right new | -| `,tH` | Terminal move bottom right new | -| `,tf` | Terminal move float | -| `,q` | Quit | - - -## Hop keymaps - -| **Keymap** | **Description** | -| ---------- | -------------------------------------------------- | -| `f` | Character after cursor, current line only | -| `F` | Character before cursor, current line only | -| `t` | Character after cursor, current line only, before | -| `T` | Character before cursor, current line only, before | -| `,hw` | HopWord | -| `,hl` | HopLineStart | -| `,hW` | HopWordMW | -| `,hH` | Hop hint pattern `[[\\d\\+]]` | -| `,hf'` | Hop hint pattern \[[\"\\|']] | -| `,hf-` | Hop hint pattern \[[-\\|+]] | -| `,hf;` | Hop hint pattern \[[;\\|:]] | -| `,hf/` | Hop hint pattern \[[/\\|?]] | -| `,hqj` | Hop hint pattern `[[(]]` | -| `,hqk` | Hop hint pattern `[[)]]` | -| `,hq[` | Hop hint pattern `[[{]]` | -| `,hq]` | Hop hint pattern `[[}]]` | -| `,hd` | Jump to definition | -| `yx` | Hyper Yank with Treesitter Node Select | -| `yl` | Hyper Yank a line | -| `yc` | Hyper Yank Treesitter code block | -| `ym` | Using Treehopper to yank | -| `vp` | Using Hop to paste | -| `,vp` | New line below target and paste | -| `vP` | Using Hop to paste | -| `,vP` | New line above target and paste | -| `vo` | Using Hop to open a new line below target | -| `,vo` | Insert below target | -| `vO` | Using Hop to open a new line above target | -| `,vO` | Insert above target | -| `vy` | Normal insert Treehopper node | -| `vY` | Using Hop with macros, HopLineStart normal | -| `Ls` | Trigger LuaSnip snippet | -| `,hm` | Treehopper nodes | -| `,h[` | Move to start of Treehopper node | -| `,h]` | Move to end of Treehopper node | diff --git a/modules/nvim/config/lua/custom/chadrc.lua b/modules/nvim/config/lua/custom/chadrc.lua deleted file mode 100644 index 72ab1b0..0000000 --- a/modules/nvim/config/lua/custom/chadrc.lua +++ /dev/null @@ -1,67 +0,0 @@ ----@type ChadrcConfig -local M = {} - --- pick a random dashboard header -local header = require("custom.headers")["random"] - --- Path to overriding theme and highlights files -local highlights = require "custom.highlights" - -M.ui = { - theme_toggle = { "tokyonight", "catppuccin" }, - theme = "catppuccin", - transparency = false, - hl_override = highlights.override, - hl_add = highlights.add, - lsp_semantic_tokens = true, -- adds highlight groups for lsp semantic tokens - telescope = { style = "bordered" }, -- borderless / bordered - -- https://github.com/NvChad/base46/tree/v2.0/lua/base46/extended_integrations - extended_integrations = { "notify" }, -- these aren't compiled by default, ex: "alpha", "notify" - - ------------------------------- nvchad_ui modules ----------------------------- - statusline = { - separator_style = "round", - }, - - -- nvdash (dashboard) - nvdash = { - load_on_startup = true, - header = header, - buttons = { - { " Find File", ", f f", "Telescope find_files" }, - { " Recent Files", ", f o", "Telescope oldfiles" }, - { " Find Word", ", f w", "Telescope live_grep" }, - { " Bookmarks", ", b m", "Telescope marks" }, - { " Themes", ", t h", "Telescope themes" }, - { " Mappings", ", c h", "NvCheatsheet" }, - { " Quit", ", q ", "quit" }, - }, - }, - - cheatsheet = { theme = "grid" }, -- simple/grid -} - -M.plugins = "custom.plugins" - -M.lazy_nvim = { - install = { - colorscheme = { "nvchad" }, - -- install missing plugins on startup. This doesn't increase startup time. - missing = true, - }, - ui = { - icons = { - ft = "", - lazy = "󰂠 ", - loaded = "", - not_loaded = "", - }, - size = { width = 0.8, height = 0.8 }, - border = "rounded", - }, -} - --- check core.mappings for table structure -M.mappings = require "custom.mappings" - -return M diff --git a/modules/nvim/config/lua/custom/configs/hop.lua b/modules/nvim/config/lua/custom/configs/hop.lua deleted file mode 100644 index c947767..0000000 --- a/modules/nvim/config/lua/custom/configs/hop.lua +++ /dev/null @@ -1,237 +0,0 @@ -local hop = require("hop") - -hop.setup() - -local set = vim.keymap.set -local keymap = vim.api.nvim_set_keymap -local opts = { noremap = true, silent = true } -local nosilent_opts = { noremap = true, silent = false } - -keymap("n", "", "q", opts) -- Macro q remap -keymap("x", "", "q", opts) -keymap("n", "?", "/", nosilent_opts) - -keymap("x", "hw", "HopWord", opts) -keymap("n", "hw", "HopWord", opts) -keymap("n", "hl", "HopLineStart", opts) -keymap("x", "hl", "HopLineStart", opts) -keymap("n", "hW", "HopWordMW", opts) - -keymap( - "o", - "f", - "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true, inclusive_jump = true })", - opts -) -keymap( - "o", - "F", - "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true, inclusive_jump = false })", - opts -) -keymap("n", "hH", "lua require'hop'.hint_patterns({}, [[\\d\\+]])", opts) -keymap("n", "hf'", "lua require'hop'.hint_patterns({}, [[\"\\|']])", opts) -keymap("n", "hf-", "lua require'hop'.hint_patterns({}, [[-\\|+]])", opts) -keymap("n", "hf;", "lua require'hop'.hint_patterns({}, [[;\\|:]])", opts) - -keymap("n", "hf/", "lua require'hop'.hint_patterns({}, [[/\\|?]])", opts) - -keymap("n", "hqj", "lua require'hop'.hint_patterns({}, [[(]])", opts) -keymap("n", "hqk", "lua require'hop'.hint_patterns({}, [[)]])", opts) -keymap("n", "hq[", "lua require'hop'.hint_patterns({}, [[{]])", opts) -keymap("n", "hq]", "lua require'hop'.hint_patterns({}, [[}]])", opts) - -local directions = require('hop.hint').HintDirection -set('', 'f', function() - hop.hint_char1({ - direction = directions.AFTER_CURSOR, - current_line_only = true - }) -end, {remap=true}) -set('', 'F', function() - hop.hint_char1({ - direction = directions.BEFORE_CURSOR, - current_line_only = true - }) -end, {remap=true}) -set('', 't', function() - hop.hint_char1({ - direction = directions.AFTER_CURSOR, - current_line_only = true, - hint_offset = -1 - }) -end, {remap=true}) -set('', 'T', function() - hop.hint_char1({ - direction = directions.BEFORE_CURSOR, - current_line_only = true, - hint_offset = 1 - }) -end, {remap=true}) - -local jump_target = require("hop.jump_target") -local hint_char1_and_then = function(and_then_func) - return function() - local hopts = hop.opts - local c = hop.get_input_pattern("Hop 1 char: ", 1) - local generator = jump_target.jump_targets_by_scanning_lines - hop.hint_with_callback(generator(jump_target.regex_by_case_searching(c, true, hopts)), hopts, function(jt) - hop.move_cursor_to(jt.window, jt.line + 1, jt.column - 1, hopts.hint_offset) - and_then_func() - end) - end -end - -set("n", "hd", hint_char1_and_then(vim.lsp.buf.type_definition), - { desc = "Jump to definition", noremap = true, silent = true }) -local function jump_back_to_original_buffer(original_buffer) --{{{ - local current_buffer = vim.api.nvim_get_current_buf() - - if current_buffer ~= original_buffer then - -- jump back to the original buffer - vim.cmd([[normal! ]]) - else - -- jump back to the original line - vim.cmd([[normal! ]]) - end -end --}}} - --- Hyper Yank with Treesitter Node Select -set("n", "yx", function() - local original_buffer = vim.api.nvim_get_current_buf() - - vim.cmd([[:HopLineStartMW]]) --> jump to line - vim.schedule(function() - require("syntax-tree-surfer").select() - vim.cmd([[normal! V]]) --> go to visual selection mode -> optional - vim.cmd([[normal! y]]) --> yank - jump_back_to_original_buffer(original_buffer) - end) -end, { desc = "Yank user syntax-tree-surfer", noremap = true, silent = true }) - --- Hyper Yank a line -set("n", "yl", function() - local original_buffer = vim.api.nvim_get_current_buf() - - vim.cmd([[:HopLineStartMW]]) --> jump to line - vim.schedule(function() - vim.cmd([[normal! yy]]) --> yank the line - jump_back_to_original_buffer(original_buffer) - end) -end, { desc = "Yank a line with HopLineStart", noremap = true, silent = true }) - --- Hyper Yank Treesitter Code Block -set("n", "yc", function() - local original_buffer = vim.api.nvim_get_current_buf() - vim.cmd([[:HopLineStartMW]]) - vim.schedule(function() - require("tsht").nodes() - vim.schedule(function() - vim.cmd([[normal! V]]) --> go to visual selection mode -> optional - vim.cmd([[normal! y]]) --> yank - jump_back_to_original_buffer(original_buffer) - end) - end) -end, { desc = "Yank a Treesitter code block", noremap = true, silent = true }) - --- Using nvim-treehopper to yank -set("n", "ym", function() - require("tsht").nodes() - vim.schedule(function() - vim.cmd([[normal! V]]) --> go to visual selection mode - vim.cmd([[normal! y]]) --> yank - end) -end, { desc = "Yank using Treehopper", noremap = true, silent = true }) - ---SECTION: Hyper Paste - -set("n", "vp", function() - vim.cmd([[:HopLineStartMW]]) - vim.schedule(function() - vim.cmd([[normal! p]]) --> paste - end) -end, { desc = "Paste below target using HopLineStart", noremap = true, silent = true }) -set("n", "vp", function() - vim.cmd([[:HopLineStartMW]]) - vim.schedule(function() - vim.cmd([[normal! o]]) --> make new line below target - vim.cmd([[normal! o]]) --> make another new line below target - vim.cmd([[normal! p]]) --> paste - end) -end, { desc = "Paste below target using HopLineStart", noremap = true, silent = true }) - -set("n", "vP", function() - vim.cmd([[:HopLineStartMW]]) - vim.schedule(function() - vim.cmd([[normal! P]]) --> paste - end) -end, { desc = "Paste above target using HopLineStart", noremap = true, silent = true }) -set("n", "vP", function() - vim.cmd([[:HopLineStartMW]]) - vim.schedule(function() - vim.cmd([[normal! O]]) --> make another new line below target - vim.cmd([[normal! P]]) --> paste - end) -end, { desc = "Paste above target using HopLineStart", noremap = true, silent = true }) - -set("n", "vo", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[normal! o]]) - vim.cmd([[startinsert]]) - end) -end, { desc = "Open new line below HopLineStart target", noremap = true, silent = true }) -set("n", "vo", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[normal! o]]) - vim.cmd([[normal! o]]) - vim.cmd([[startinsert]]) - end) -end, { desc = "Open new line below HopLineStart target", noremap = true, silent = true }) - -set("n", "vO", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[normal! O]]) - vim.cmd([[normal! O]]) - vim.cmd([[startinsert]]) - end) -end, { desc = "Open new line above HopLineStart target", noremap = true, silent = true }) -set("n", "vO", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[normal! O]]) - vim.cmd([[normal! O]]) - vim.cmd([[startinsert]]) - end) -end, { desc = "Open new line above HopLineStart target", noremap = true, silent = true }) - --- Hop with Macros - -set("n", "vY", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[:normal @f]]) - end) -end, { desc = "HopLineStart target in normal mode", noremap = true, silent = true }) - --- Hop can even trigger LuaSnip Snippets (complicated) - -set("n", "Ls", function() - vim.cmd([[:HopLineStart]]) - vim.schedule(function() - vim.cmd([[:normal ojja ]]) - vim.cmd("startinsert") - end) -end, { desc = "Trigger LuaSnip snippet", noremap = true, silent = true }) - --- TSHT (Treesitter hint textobject) --> mfussenegger/nvim-treehopper - -set("n", "vy", function() - require("tsht").nodes() - vim.schedule(function() - vim.cmd([[normal! c]]) - vim.cmd([[startinsert]]) - end) -end, { desc = "Treehopper node target insert", noremap = true, silent = true }) diff --git a/modules/nvim/config/lua/custom/configs/lspconfig.lua b/modules/nvim/config/lua/custom/configs/lspconfig.lua deleted file mode 100644 index 4e1167b..0000000 --- a/modules/nvim/config/lua/custom/configs/lspconfig.lua +++ /dev/null @@ -1,341 +0,0 @@ -local showdiag = require("custom.diagnostics").show_diagnostics - -local open_float = "lua vim.diagnostic.open_float()" -if not showdiag == "popup" then - open_float = "" -end - --- Style floating windows -vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" }) -vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" }) - --- Borders for LspInfo winodw -require("lspconfig.ui.windows").default_options.border = "rounded" - -vim.api.nvim_create_autocmd("LspAttach", { - desc = "LSP actions", - callback = function() - local bufmap = function(mode, lhs, rhs) - vim.keymap.set(mode, lhs, rhs, { buffer = true }) - end - - -- Displays hover information about the symbol under the cursor - bufmap("n", "K", "lua vim.lsp.buf.hover()") - - -- Jump to the definition - bufmap("n", "gd", "lua vim.lsp.buf.definition()") - - -- Jump to declaration - bufmap("n", "gD", "lua vim.lsp.buf.declaration()") - - -- Lists all the implementations for the symbol under the cursor - bufmap("n", "gi", "lua vim.lsp.buf.implementation()") - - -- Jumps to the definition of the type symbol - bufmap("n", "go", "lua vim.lsp.buf.type_definition()") - - -- Lists all the references - bufmap("n", "gr", "lua vim.lsp.buf.references()") - - -- Displays a function's signature information - bufmap("n", "gs", "lua vim.lsp.buf.signature_help()") - - -- Renames all references to the symbol under the cursor - bufmap("n", "", "lua vim.lsp.buf.rename()") - - -- Selects a code action available at the current cursor position - bufmap("n", "", "lua vim.lsp.buf.code_action()") - bufmap("x", "", "lua vim.lsp.buf.range_code_action()") - - -- Show diagnostics in a floating window - bufmap("n", "gl", open_float) - - -- Move to the previous diagnostic - bufmap("n", "[d", "lua vim.diagnostic.goto_prev()") - - -- Move to the next diagnostic - bufmap("n", "]d", "lua vim.diagnostic.goto_next()") - end, -}) - --- diagnostics -for name, icon in pairs(require("custom.icons").diagnostics) do - name = "DiagnosticSign" .. name - vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) -end -if showdiag == "none" then - vim.diagnostic.config(require("custom.diagnostics")["off"]) -else - vim.diagnostic.config(require("custom.diagnostics")["on"]) -end - --- Show line diagnostics automatically in hover window -if showdiag == "popup" then - vim.cmd([[ - autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, { focus = false }) - ]]) -end - --- Mappings. --- See `:help vim.diagnostic.*` for documentation -local diagnostics_active = true -local toggle_diagnostics = function() - diagnostics_active = not diagnostics_active - if diagnostics_active then - vim.diagnostic.show() - else - vim.diagnostic.hide() - end -end - -vim.fn.sign_define("DiagnosticSignError", { text = "", texthl = "DiagnosticSignError" }) -vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" }) -vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" }) -vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" }) - -vim.diagnostic.config({ - update_in_insert = false, -}) - --- local capabilities = vim.lsp.protocol.make_client_capabilities() -local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) -capabilities.textDocument.completion.completionItem.snippetSupport = true -capabilities.textDocument.completion.completionItem.resolveSupport = { - properties = { - "documentation", - "detail", - "additionalTextEdits", - }, -} - -capabilities.textDocument.foldingRange = { - dynamicRegistration = false, - lineFoldingOnly = true, -} - -local null_ls = require("null-ls") -null_ls.setup({ - should_attach = function(bufnr) - local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") - if ft == "dbui" or ft == "dbout" or ft:match("sql") then - return false - end - return true - end, - sources = { - null_ls.builtins.formatting.prettier, -- prettier, eslint, eslint_d, or prettierd - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.trim_newlines, - null_ls.builtins.formatting.trim_whitespace, - null_ls.builtins.formatting.black, - null_ls.builtins.diagnostics.actionlint, - }, -}) - -local on_attach = require("plugins.configs.lspconfig").on_attach -local lspconfig = require("lspconfig") -local lsputil = require "lspconfig/util" -local navic = require("nvim-navic") - -lspconfig.gopls.setup { - on_attach = on_attach, - capabilities = capabilities, - cmd = { "gopls" }, - filetypes = { "go", "gomod", "gowork", "gotmpl" }, - root_dir = lsputil.root_pattern("go.work", "go.mod", ".git"), - settings = { - gopls = { - completeUnimported = true, - usePlaceholders = true, - analyses = { - unusedparams = true, - }, - }, - }, -} - -lspconfig.jsonls.setup({ - capabilities = capabilities, - settings = { - json = { - schemas = require("schemastore").json.schemas(), - }, - }, -}) - -lspconfig.pyright.setup({ - on_attach = on_attach, - capabilities = capabilities, - filetypes = { "python" }, -}) - --- make sure to only run this once! -local tsserver_on_attach = function(client, bufnr) - -- disable tsserver formatting if you plan on formatting via null-ls - client.server_capabilities.document_formatting = false - client.server_capabilities.document_range_formatting = false - - local ts_utils = require("nvim-lsp-ts-utils") - - -- defaults - ts_utils.setup({ - enable_import_on_completion = true, - -- eslint - eslint_enable_code_actions = true, - eslint_enable_disable_comments = true, - eslint_bin = "eslint_d", - eslint_enable_diagnostics = false, - eslint_opts = {}, - -- formatting - enable_formatting = true, - formatter = "prettier", - formatter_opts = {}, - -- update imports on file move - update_imports_on_move = true, - require_confirmation_on_move = false, - watch_dir = nil, - -- filter diagnostics - filter_out_diagnostics_by_severity = {}, - filter_out_diagnostics_by_code = {}, - }) - - -- required to fix code action ranges and filter diagnostics - ts_utils.setup_client(client) - - -- no default maps, so you may want to define some here - local opts = { silent = true } - vim.api.nvim_buf_set_keymap(bufnr, "n", ",go", ":TSLspOrganize", opts) - vim.api.nvim_buf_set_keymap(bufnr, "n", ",gR", ":TSLspRenameFile", opts) - vim.api.nvim_buf_set_keymap(bufnr, "n", ",gi", ":TSLspImportAll", opts) - - navic.attach(client, bufnr) -end - -lspconfig.tsserver.setup({ - capabilities = capabilities, - on_attach = tsserver_on_attach, -}) - -local other_servers_with_navic = { - "html", - "pylsp", - "terraformls", - "vimls", - "bashls", - "awk_ls", - "rust_analyzer", - "ansiblels", - "cmake", - "cssmodules_ls", - "dockerls", - "marksman", - "sqlls", - "taplo", - "texlab", -} -for _, server in ipairs(other_servers_with_navic) do - if lspconfig[server] then - lspconfig[server].setup({ - capabilities = capabilities, - on_attach = function(client, bufnr) - navic.attach(client, bufnr) - end, - }) - end -end - -vim.keymap.set("n", "de", vim.diagnostic.open_float, { noremap = true, silent = true, desc = "Open float" }) -vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { noremap = true, silent = true }) -vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { noremap = true, silent = true }) -vim.keymap.set( - "n", - "dq", - vim.diagnostic.setloclist, - { noremap = true, silent = true, desc = "Set diagnostics location list" } -) -vim.keymap.set("n", "dt", toggle_diagnostics, { desc = "Toggle diagnostics" }) - -lspconfig.yamlls.setup({ - capabilities = capabilities, - on_attach = function(client, bufnr) - navic.attach(client, bufnr) - end, - schemaStore = { - enable = true, - url = "https://www.schemastore.org/api/json/catalog.json", - }, - schemas = { - kubernetes = "*.yaml", - ["http://json.schemastore.org/github-workflow"] = ".github/workflows/*", - ["http://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", - ["http://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", - ["http://json.schemastore.org/prettierrc"] = ".prettierrc.{yml,yaml}", - ["http://json.schemastore.org/kustomization"] = "kustomization.{yml,yaml}", - ["http://json.schemastore.org/ansible-playbook"] = "*play*.{yml,yaml}", - ["http://json.schemastore.org/chart"] = "Chart.{yml,yaml}", - ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", - ["https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json"] = "*gitlab-ci*.{yml,yaml}", - ["https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"] = "*api*.{yml,yaml}", - ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "*docker-compose*.{yml,yaml}", - ["https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json"] = "*flow*.{yml,yaml}", - }, - format = { enabled = false }, - validate = false, - completion = true, - hover = true, -}) - -lspconfig.clangd.setup({}) - -lspconfig.lua_ls.setup({ - capabilities = capabilities, - on_attach = navic.attach, - require("neodev").setup({ - library = { plugins = { "nvim-dap-ui" }, types = true }, - setup_jsonls = true, - lspconfig = false, - pathStrict = true, - override = function(root_dir, library) - local neodevutil = require("neodev.util") - if neodevutil.has_file(root_dir, "/etc/nixos") or neodevutil.has_file(root_dir, "nvim-config") then - library.enabled = true - library.plugins = true - end - end, - }), - -- Note: These settings will meaningfully increase the time until lua_ls - -- can service initial requests (completion, location) upon starting as well - -- as time to first diagnostics. Completion results will include a workspace - -- indexing progress message until the server has finished indexing. - before_init = require("neodev.lsp").before_init, - settings = { - Lua = { - runtime = { - version = "LuaJIT", - }, - diagnostics = { - globals = { - "vim", - "describe", - "it", - "before_each", - "after_each", - "pending", - "nnoremap", - "vnoremap", - "inoremap", - "tnoremap", - }, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - checkThirdParty = false, - }, - telemetry = { - enable = false, - }, - }, - }, -}) - -vim.cmd([[ do User LspAttachBuffers ]]) diff --git a/modules/nvim/config/lua/custom/configs/neodev.lua b/modules/nvim/config/lua/custom/configs/neodev.lua deleted file mode 100644 index 37aac13..0000000 --- a/modules/nvim/config/lua/custom/configs/neodev.lua +++ /dev/null @@ -1,19 +0,0 @@ -require("neodev").setup({ - library = { - enabled = true, -- when not enabled, neodev will not change any settings to the LSP server - -- these settings will be used for your Neovim config directory - runtime = true, -- runtime path - types = true, -- full signature, docs and completion of vim.api, vim.treesitter, vim.lsp and others - plugins = true, -- installed opt or start plugins in packpath - -- you can also specify the list of plugins to make available as a workspace library - -- plugins = { "nvim-treesitter", "plenary.nvim", "telescope.nvim" }, - }, - setup_jsonls = true, -- configures jsonls to provide completion for project specific .luarc.json files - -- With lspconfig, Neodev will automatically setup your lua-language-server - -- If you disable this, then you have to set {before_init=require("neodev.lsp").before_init} - -- in your lsp start options - lspconfig = true, - -- much faster, but needs a recent built of lua-language-server - -- needs lua-language-server >= 3.6.0 - pathStrict = true, -}) diff --git a/modules/nvim/config/lua/custom/configs/null-ls.lua b/modules/nvim/config/lua/custom/configs/null-ls.lua deleted file mode 100644 index a1b53a1..0000000 --- a/modules/nvim/config/lua/custom/configs/null-ls.lua +++ /dev/null @@ -1,47 +0,0 @@ -local null_ls = require("null-ls") -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - -local b = null_ls.builtins - -local sources = { - - -- webdev stuff - b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! - b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes - - -- Lua - b.formatting.stylua, - - -- cpp - b.formatting.clang_format, - - -- Go - b.formatting.gofumpt, - b.formatting.goimports_reviser, - b.formatting.golines, - - -- Python - b.formatting.black, - b.diagnostics.mypy, - b.diagnostics.ruff, -} - -null_ls.setup { - debug = true, - sources = sources, - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ - group = augroup, - buffer = bufnr, - }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format({ bufnr = bufnr }) - end, - }) - end - end, -} diff --git a/modules/nvim/config/lua/custom/configs/nvim-cmp.lua b/modules/nvim/config/lua/custom/configs/nvim-cmp.lua deleted file mode 100644 index 7e20713..0000000 --- a/modules/nvim/config/lua/custom/configs/nvim-cmp.lua +++ /dev/null @@ -1,123 +0,0 @@ -local cmp = require("cmp") -local luasnip = require("luasnip") - -cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { { name = "buffer" } }, -}) -cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ { name = "path" } }, { { name = "cmdline" } }), -}) - -local select_opts = { behavior = cmp.SelectBehavior.Select } - -cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - -- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. - -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - -- require('snippy').expand_snippet(args.body) -- For `snippy` users. - -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. - end, - }, - window = { - documentation = { - border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" }, - }, - completion = { - border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" }, - }, - }, - formatting = { - fields = { "kind", "abbr", "menu" }, - format = function(entry, item) - local icons = require("custom.icons").kinds - item.kind = icons[item.kind] - item.menu = ({ - nvim_lsp = "[LSP]", - nvim_lua = "[Lua]", - luasnip = "[Snippet]", - buffer = "[Buffer]", - path = "[Path]", - })[entry.source.name] - return item - end, - }, - experimental = { - native_menu = false, - ghost_text = { - enabled = true, - hl_group = "Comment", - }, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(select_opts), - [""] = cmp.mapping.select_next_item(select_opts), - [""] = cmp.mapping.select_prev_item(select_opts), - [""] = cmp.mapping.select_next_item(select_opts), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.confirm({ select = false }), - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - local col = vim.fn.col(".") - 1 - - if cmp.visible() then - cmp.select_next_item(select_opts) - elseif col == 0 or vim.fn.getline("."):sub(col, col):match("%s") then - fallback() - else - cmp.complete() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item(select_opts) - else - fallback() - end - end, { "i", "s" }), - }, - performance = { - debounce = 300, - throttle = 60, - fetching_timeout = 200, - }, - sources = { - { name = "path" }, - { name = "nvim_lsp", keyword_length = 1 }, - { name = "nvim_lua", keyword_length = 2 }, - { name = "buffer", keyword_length = 3 }, - { name = "luasnip", keyword_length = 2 }, - -- { name = 'zsh' }, -- With tamago324/cmp-zsh - -- { name = 'vsnip' }, -- For vsnip users. - -- { name = 'ultisnips' }, -- For ultisnips users. - -- { name = 'snippy' }, -- For snippy users. - }, -}) - --- Set configuration for specific filetype. -cmp.setup.filetype("gitcommit", { - sources = cmp.config.sources({ - { name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it. - }, { - { name = "buffer" }, - }), -}) diff --git a/modules/nvim/config/lua/custom/configs/overrides.lua b/modules/nvim/config/lua/custom/configs/overrides.lua deleted file mode 100644 index 398c511..0000000 --- a/modules/nvim/config/lua/custom/configs/overrides.lua +++ /dev/null @@ -1,170 +0,0 @@ -local M = {} - --- lsp servers to install, see: --- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md -M.lsp_servers = { - "awk_ls", - "bashls", - "cssmodules_ls", - "denols", - "dockerls", - "eslint", - "gopls", - "html", - "jsonls", - "ltex", - "marksman", - "pylsp", - "pyright", - "sqlls", - "tailwindcss", - "terraformls", - "texlab", - "tsserver", - "vimls", - "yamlls", -} --- Some Mason lsp server packages are named differently than in lspconfig. Why? --- See: https://mason-registry.dev/registry/list -M.lsp_servers_mason = { - "awk-language-server", - "bash-language-server", - "cssmodules-language-server", - "deno", - "dockerfile-language-server", - "eslint-lsp", - "gopls", - "html-lsp", - "json-lsp", - "ltex-ls", - "marksman", - "python-lsp-server", - "pyright", - "sqlls", - "tailwindcss-language-server", - "terraform-ls", - "texlab", - "typescript-language-server", - "vim-language-server", - "yaml-language-server", -} - --- Formatters and linters installed by Mason -M.formatters_linters = { - "actionlint", - "goimports", - "gofumpt", - "golangci-lint", - "google-java-format", - "latexindent", - "markdownlint", - "prettier", - "sql-formatter", - "shellcheck", - "shfmt", - "stylua", - "tflint", - "yamllint", - "pylint", - "black", -} - -M.mason = { - ensure_installed = {}, - - PATH = "prepend", - - ui = { - check_outdated_packages_on_open = true, - border = "single", - width = 0.8, - height = 0.9, - icons = { - package_pending = " ", - package_installed = "󰄳 ", - package_uninstalled = " 󰚌", - }, - keymaps = { - toggle_package_expand = "", - install_package = "i", - update_package = "u", - check_package_version = "c", - update_all_packages = "U", - check_outdated_packages = "C", - uninstall_package = "X", - cancel_installation = "", - apply_language_filter = "", - }, - }, - log_level = vim.log.levels.INFO, - max_concurrent_installers = 4, -} - -M.treesitter = { - ensure_installed = { - "bash", - "c", - "cmake", - "cpp", - "css", - "dockerfile", - "dot", - "elvish", - "fish", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "go", - "godot_resource", - "gomod", - "gowork", - "html", - "http", - "java", - "javascript", - "jq", - "json", - "json5", - "jsonc", - "kotlin", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "mermaid", - "meson", - "ninja", - "nix", - "org", - "python", - "regex", - "rust", - "sql", - "svelte", - "sxhkdrc", - "todotxt", - "toml", - "typescript", - "vim", - "yaml", - "zig", - }, -} - -M.nvimtree = { - git = { - enable = true, - }, - renderer = { - highlight_git = true, - icons = { - show = { - git = true, - }, - }, - }, -} - -return M diff --git a/modules/nvim/config/lua/custom/configs/symbols-outline.lua b/modules/nvim/config/lua/custom/configs/symbols-outline.lua deleted file mode 100644 index c46efe9..0000000 --- a/modules/nvim/config/lua/custom/configs/symbols-outline.lua +++ /dev/null @@ -1,7 +0,0 @@ -local spec = { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - config = true, -} - -return spec diff --git a/modules/nvim/config/lua/custom/configs/terminal_nvim.lua b/modules/nvim/config/lua/custom/configs/terminal_nvim.lua deleted file mode 100644 index a7a476d..0000000 --- a/modules/nvim/config/lua/custom/configs/terminal_nvim.lua +++ /dev/null @@ -1,98 +0,0 @@ -local map = vim.keymap.set -local api = vim.api - -require("terminal").setup() - -local term_map = require("terminal.mappings") -map({ "n", "x" }, "ts", term_map.operator_send, { expr = true, desc = "Terminal Send" }) -map("n", "to", term_map.toggle, { desc = "Terminal Toggle" }) -map("n", "tO", term_map.toggle({ open_cmd = "enew" }), { desc = "New Terminal Toggle" }) -map("n", "tr", term_map.run, { desc = "Terminal Run" }) -map("n", "tR", term_map.run(nil, { layout = { open_cmd = "enew" } }), { desc = "New Terminal Run" }) -map("n", "tk", term_map.kill, { desc = "Terminal Kill" }) -map("n", "t]", term_map.cycle_next, { desc = "Terminal Next" }) -map("n", "t[", term_map.cycle_prev, { desc = "Terminal Prev" }) -map("n", "tl", term_map.move({ open_cmd = "belowright vnew" }), { desc = "Move Below Right" }) -map("n", "tL", term_map.move({ open_cmd = "botright vnew" }), { desc = "Move Bottom Right" }) -map("n", "th", term_map.move({ open_cmd = "belowright new" }), { desc = "Move Below Right New" }) -map("n", "tH", term_map.move({ open_cmd = "botright new" }), { desc = "Move Bottom Right New" }) -map("n", "tf", term_map.move({ open_cmd = "float" }), { desc = "Move Float" }) - -if vim.fn.executable("ipython") == 1 then - local ipython = require("terminal").terminal:new({ - layout = { open_cmd = "botright vertical new", border = "rounded" }, - cmd = { "ipython" }, - autoclose = true, - }) - api.nvim_create_user_command("IPython", function() - local bufnr = api.nvim_get_current_buf() - if vim.bo[bufnr].filetype == "python" then - map("x", "ts", function() - api.nvim_feedkeys('"+y', "n", false) - ipython:send("%paste") - end, { buffer = bufnr }) - map("n", "t?", function() - require("terminal").send(vim.v.count, vim.fn.expand("") .. "?") - end, { buffer = bufnr }) - end - ipython:toggle(nil, true) - end, {}) -end - -if vim.fn.executable("lazygit") == 1 then - local lazygit = require("terminal").terminal:new({ - layout = { open_cmd = "float", border = "rounded", height = 0.8, width = 0.8 }, - cmd = { "lazygit" }, - autoclose = true, - }) - api.nvim_create_user_command("Lazygit", function(args) - lazygit.cwd = args.args and vim.fn.expand(args.args) - lazygit:toggle(nil, true) - end, { nargs = "?" }) -end - -if vim.fn.executable("htop") == 1 then - local htop = require("terminal").terminal:new({ - layout = { open_cmd = "float", border = "rounded" }, - cmd = { "htop" }, - autoclose = true, - }) - api.nvim_create_user_command("Htop", function() - htop:toggle(nil, true) - end, { nargs = "?" }) -end - -if vim.fn.executable("lazyman") == 1 then - local lazyman = require("terminal").terminal:new({ - layout = { open_cmd = "float", border = "rounded", height = 0.85, width = 0.85 }, - cmd = { "lazyman" }, - autoclose = true, - }) - api.nvim_create_user_command("Lazyman", function() - lazyman:toggle(nil, true) - end, { nargs = "?" }) - - local lazyconf = require("terminal").terminal:new({ - layout = { open_cmd = "float", border = "rounded", height = 0.85, width = 0.85 }, - cmd = { "lazyman", "-F" }, - autoclose = true, - }) - api.nvim_create_user_command("Lazyconf", function() - lazyconf:toggle(nil, true) - end, { nargs = "?" }) -end - -if vim.fn.executable("asciiville") == 1 then - local asciiville = require("terminal").terminal:new({ - layout = { open_cmd = "float", border = "rounded", height = 0.9, width = 0.9 }, - cmd = { "asciiville", "-i", "-G" }, - autoclose = true, - }) - api.nvim_create_user_command("Asciiville", function() - asciiville:toggle(nil, true) - end, { nargs = "?" }) -end - -if vim.fn.executable("nvr") == 1 then - vim.env["GIT_EDITOR"] = "nvr --remote-tab-wait-silent +'set bufhidden=wipe'" -end diff --git a/modules/nvim/config/lua/custom/configs/trouble.lua b/modules/nvim/config/lua/custom/configs/trouble.lua deleted file mode 100644 index 15c7a7d..0000000 --- a/modules/nvim/config/lua/custom/configs/trouble.lua +++ /dev/null @@ -1,8 +0,0 @@ ----@type NvPluginSpec -local spec = { - "folke/trouble.nvim", - cmd = {"Trouble", "TroubleToggle"}, - config = true, -- Todo: change when base46 has colors? for this -} - -return spec diff --git a/modules/nvim/config/lua/custom/diagnostics.lua b/modules/nvim/config/lua/custom/diagnostics.lua deleted file mode 100644 index e290b67..0000000 --- a/modules/nvim/config/lua/custom/diagnostics.lua +++ /dev/null @@ -1,63 +0,0 @@ --- Show diagnostics, can be one of "none", "icons", "popup". Default is "popup" --- "none": diagnostics are disabled but still underlined --- "icons": only an icon will show, use ',de' to see the diagnostic --- "popup": an icon will show and a popup with the diagnostic will appear -local showdiag = "icons" - -if showdiag == "none" then - vim.g.diagnostics_enabled = false -else - vim.g.diagnostics_enabled = true -end - -local sign = function(opts) - vim.fn.sign_define(opts.name, { - texthl = opts.name, - text = opts.text, - numhl = "", - }) -end - -sign({ name = "DiagnosticSignError", text = "✘" }) -sign({ name = "DiagnosticSignWarn", text = "⚠" }) -sign({ name = "DiagnosticSignHint", text = "•" }) -sign({ name = "DiagnosticSignInfo", text = "ⓘ" }) - -local diagnostics = { - off = { - underline = true, - virtual_text = false, - signs = false, - update_in_insert = false, - }, - on = { - virtual_text = false, -- disable virtual text - virtual_lines = false, - update_in_insert = false, - underline = true, - severity_sort = true, - signs = true, - float = { - focusable = false, - style = "minimal", - header = "", - prefix = "", - border = "rounded", - format = function(diagnostic) - return string.format("%s (%s)", diagnostic.message, diagnostic.source) - end, - }, - }, -} - -vim.api.nvim_create_user_command("ToggleDiagnostic", function() - if vim.g.diagnostics_enabled then - vim.diagnostic.config(diagnostics["off"]) - vim.g.diagnostics_enabled = false - else - vim.diagnostic.config(diagnostics["on"]) - vim.g.diagnostics_enabled = true - end -end, { nargs = 0 }) - -return diagnostics diff --git a/modules/nvim/config/lua/custom/headers.lua b/modules/nvim/config/lua/custom/headers.lua deleted file mode 100644 index 6997b2b..0000000 --- a/modules/nvim/config/lua/custom/headers.lua +++ /dev/null @@ -1,141 +0,0 @@ -local headers = { - imgs = { - ["h1"] = { - [[ █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄]], - [[▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █]], - [[█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █]], - [[ █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ]], - }, - ["h2"] = { - [[ ▄ ▄ ]], - [[ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ]], - [[ █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ]], - [[ ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ]], - [[ ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ]], - [[ █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄]], - [[▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █]], - [[█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █]], - [[ █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ]], - }, - ["h3"] = { - [[ dMMMMb dMMMMMP .aMMMb dMP dMP dMP dMMMMMMMMb ]], - [[ dMP dMP dMP dMP"dMP dMP dMP amr dMP"dMP"dMP ]], - [[ dMP dMP dMMMP dMP dMP dMP dMP dMP dMP dMP dMP ]], - [[ dMP dMP dMP dMP.aMP YMvAP" dMP dMP dMP dMP ]], - [[ dMP dMP dMMMMMP VMMMP" VP" dMP dMP dMP dMP ]], - }, - ["h5"] = { - [[ _/ _/ _/_/_/ _/ _/ ]], - [[ _/_/ _/ _/ _/ _/ _/_/_/ _/_/_/ _/_/_/ ]], - [[ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ ]], - [[ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ _/ ]], - [[ _/ _/ _/ _/_/_/ _/ _/ _/_/_/ _/_/_/ ]], - }, - ["h6"] = { - [[ _ __ ______ __ __]], - [[ / | / /_ __ / ____// /_ ____ _ ____/ /]], - [[ / |/ /| | / // / / __ \ / __ `// __ / ]], - [[ / /| / | |/ // /___ / / / // /_/ // /_/ / ]], - [[/_/ |_/ |___/ \____//_/ /_/ \__,_/ \__,_/ ]], - }, - ["h7"] = { - [[ , _ ___ _ ]], - [[ /|/ \ / (_)| | | ]], - [[ | | | | | __, __| ]], - [[ | | | |_| |/ \ / | / | ]], - [[ | |_/ \/ \___/| |_/\_/|_/\_/|_/]], - }, - ["h8"] = { - [[ _ _ ____ _ _ ]], - [[| \ | |__ __ / ___|| |__ __ _ __| |]], - [[| \| |\ \ / /| | | '_ \ / _` | / _` |]], - [[| |\ | \ V / | |___ | | | || (_| || (_| |]], - [[|_| \_| \_/ \____||_| |_| \__,_| \__,_|]], - }, - }, - banners = { - ["graffiti"] = { - [[ _______ ____ ___.__ ]], - [[ \ \ ____ ___\ \ / |__| _____ ]], - [[ / | \_/ __ \/ _ \ Y /| |/ \ ]], - [[ / | \ ___( <_> \ / | | Y Y \ ]], - [[ \____|__ /\___ \____/ \___/ |__|__|_| / ]], - [[ \/ \/ \/ ]], - }, - ["ogre"] = { - [[ __ _ ]], - [[ /\ \ \___ ___/\ /(_)_ __ ___ ]], - [[ / \/ / _ \/ _ \ \ / | | '_ ` _ \ ]], - [[ / /\ | __| (_) \ V /| | | | | | | ]], - [[ \_\ \/ \___|\___/ \_/ |_|_| |_| |_| ]], - }, - ["banner3"] = { - [[ ## ## ######## ####### ## ## #### ## ## ]], - [[ ### ## ## ## ## ## ## ## ### ### ]], - [[ #### ## ## ## ## ## ## ## #### #### ]], - [[ ## ## ## ###### ## ## ## ## ## ## ### ## ]], - [[ ## #### ## ## ## ## ## ## ## ## ]], - [[ ## ### ## ## ## ## ## ## ## ## ]], - [[ ## ## ######## ####### ### #### ## ## ]], - }, - ["larry_3d"] = { - [[ __ __ __ __ ]], - [[ /\ \/\ \ /\ \/\ \ __ ]], - [[ \ \ `\\ \ __ ___\ \ \ \ \/\_\ ___ ___ ]], - [[ \ \ , ` \ /'__`\ / __`\ \ \ \ \/\ \ /' __` __`\ ]], - [[ \ \ \`\ \/\ __//\ \L\ \ \ \_/ \ \ \/\ \/\ \/\ \ ]], - [[ \ \_\ \_\ \____\ \____/\ `\___/\ \_\ \_\ \_\ \_\ ]], - [[ \/_/\/_/\/____/\/___/ `\/__/ \/_/\/_/\/_/\/_/ ]], - }, - ["lean"] = { - [[ _/ _/ _/ _/ _/ ]], - [[ _/_/ _/ _/_/ _/_/ _/ _/ _/_/_/ _/_/ ]], - [[ _/ _/ _/ _/_/_/_/ _/ _/ _/ _/ _/ _/ _/ _/ ]], - [[ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ _/ ]], - [[ _/ _/ _/_/_/ _/_/ _/ _/ _/ _/ _/ ]], - }, - ["sharp"] = { - [[ ████ ██████ █████ ██ ]], - [[ ███████████ █████  ]], - [[ █████████ ███████████████████ ███ ███████████ ]], - [[ █████████ ███ █████████████ █████ ██████████████ ]], - [[ █████████ ██████████ █████████ █████ █████ ████ █████ ]], - [[ ███████████ ███ ███ █████████ █████ █████ ████ █████ ]], - [[ ██████ █████████████████████ ████ █████ █████ ████ ██████ ]], - }, - ["h8"] = { - [[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ]], - [[ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ]], - [[ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ]], - [[ ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ]], - [[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ]], - [[ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ]], - }, - ["h9"] = { - [[ /$$ ]], - [[ /$$$$$$$ /$$$$$$ /$$$$$$ /$$ /$$ /$$ /$$$$$$/$$$$ ]], - [[ | $$__ $$ /$$__ $$ /$$__ $$| $$ /$$/| $$| $$_ $$_ $$ ]], - [[ | $$ \ $$| $$$$$$$$| $$ \ $$ \ $$/$$/ | $$| $$ \ $$ \ $$ ]], - [[ | $$ | $$| $$_____/| $$ | $$ \ $$$/ | $$| $$ | $$ | $$ ]], - [[ | $$ | $$| $$$$$$$| $$$$$$/ \ $/ | $$| $$ | $$ | $$ ]], - [[ |__/ |__/ \_______/ \______/ \_/ |__/|__/ |__/ |__/ ]], - }, - }, -} - -return setmetatable(headers, { - __index = function(tb, key) - if key == "random" then - -- Choose a random sub-table inside headers (imgs | banners) - local ks = vim.tbl_keys(tb) - local sub = tb[ks[math.random(#ks)]] - - -- Obtain keys and return a random banner - local keys = vim.tbl_keys(sub) - return sub[keys[math.random(1, #keys)]] - else - -- Return the desired banner - return tb[key] - end - end, -}) diff --git a/modules/nvim/config/lua/custom/highlights.lua b/modules/nvim/config/lua/custom/highlights.lua deleted file mode 100644 index c74a4e5..0000000 --- a/modules/nvim/config/lua/custom/highlights.lua +++ /dev/null @@ -1,27 +0,0 @@ --- To find any highlight groups: " Telescope highlights" --- Each highlight group can take a table with variables fg, bg, bold, italic, etc --- base30 variable names can also be used as colors - -local M = {} - ----@type Base46HLGroupsList -M.override = { - Comment = { - italic = true, - }, - NvDashAscii = { - bg = "black", - fg = "blue" - }, - NvDashButtons = { - bg = "black2", - fg = "blue" - } -} - ----@type HLTable -M.add = { - NvimTreeOpenedFolderName = { fg = "green", bold = true }, -} - -return M diff --git a/modules/nvim/config/lua/custom/icons.lua b/modules/nvim/config/lua/custom/icons.lua deleted file mode 100644 index c406210..0000000 --- a/modules/nvim/config/lua/custom/icons.lua +++ /dev/null @@ -1,102 +0,0 @@ -return { - arrows = { - ArrowRight = "❯", - ArrowLeft = "❮", - -- ChevronRight = "", - ChevronRight = ">", - CurvedArrowRight = " ", - DoubleArrowRight = "»", - SmallArrowRight = "➜", - Diamond = "<>", - }, - ui = { - BigCircle = " ", - BigUnfilledCircle = " ", - BookMark = " ", - Bug = " ", - Calendar = " ", - Check = " ", - Circle = " ", - Close = " ", - Code = " ", - Comment = " ", - Dashboard = " ", - Fire = " ", - Gear = " ", - History = " ", - Lightbulb = " ", - List = " ", - Lock = " ", - NewFile = " ", - Note = " ", - Package = " ", - Pencil = " ", - Plus = "+", - Project = " ", - RunningMan = "🏃", - Search = " ", - SignIn = " ", - Table = " ", - Telescope = " ", - Yoga = "🧘", - Xmark = "✗", - }, - diagnostics = { - Warn = "", - Info = "", - Error = " ", - Hint = " ", - Information = " ", - Question = " ", - Warning = " ", - }, - git = { - added = "", - modified = "", - removed = "", - Add = " ", - Diff = " ", - Ignore = " ", - Mod = " ", - Remove = " ", - Rename = " ", - Repo = " ", - }, - kinds = { - Array = " ", - Boolean = " ", - Class = " ", - Color = " ", - Constant = " ", - Constructor = " ", - Copilot = " ", - Enum = " ", - EnumMember = " ", - Event = " ", - Field = " ", - File = " ", - Folder = " ", - Function = " ", - Interface = " ", - Key = " ", - Keyword = " ", - Method = " ", - Module = " ", - Namespace = " ", - Null = "ﳠ ", - Number = " ", - Object = " ", - Operator = " ", - Package = " ", - Property = " ", - Reference = " ", - Snippet = " ", - String = " ", - Struct = " ", - Text = " ", - TypeParameter = " ", - Unit = " ", - Value = " ", - Variable = " ", - }, -} diff --git a/modules/nvim/config/lua/custom/init.lua b/modules/nvim/config/lua/custom/init.lua deleted file mode 100644 index ae578bd..0000000 --- a/modules/nvim/config/lua/custom/init.lua +++ /dev/null @@ -1,78 +0,0 @@ -local autocmd = vim.api.nvim_create_autocmd -local user_showtabline = 2 -local user_laststatus = 3 - --- Change mapleader and maplocalleader from space to comma -vim.g.mapleader = "," -vim.g.maplocalleader = "," - -local dash_group = vim.api.nvim_create_augroup("NvDash_au", { clear = true }) -autocmd("Filetype", { - pattern = "nvdash", - desc = "disable status and tabline entering nvdash", - group = dash_group, - callback = function() - if vim.opt.showtabline ~= nil then - user_showtabline = vim.opt.showtabline - else - user_showtabline = 2 - end - if vim.opt.laststatus ~= nil then - user_laststatus = vim.opt.laststatus - else - user_laststatus = 3 - end - vim.cmd([[ setlocal nonumber norelativenumber nocursorline noruler ]]) - vim.opt.showtabline = 0 - vim.opt.laststatus = 0 - end -}) -autocmd("BufUnload", { - desc = "enable status and tabline after nvdash", - group = dash_group, - callback = function() - if vim.bo.filetype == "nvdash" then - if user_showtabline ~= nil then - vim.opt.showtabline = user_showtabline - else - vim.opt.showtabline = 2 - end - if user_laststatus ~= nil then - vim.opt.laststatus = user_laststatus - else - vim.opt.laststatus = 3 - end - end - end, -}) - -local function augroup(name) - return vim.api.nvim_create_augroup("lazyman_" .. name, { clear = true }) -end - -local term_group = vim.api.nvim_create_augroup("Terminal_au", { clear = true }) - --- Check if we need to reload the file when it changed -vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, { - group = term_group, - command = "checktime", -}) - --- Auto insert mode for Terminal -vim.api.nvim_create_autocmd({ "WinEnter", "BufWinEnter", "TermOpen" }, { - desc = "Auto insert mode entering window, buffer, terminal", - group = term_group, - callback = function(args) - if vim.startswith(vim.api.nvim_buf_get_name(args.buf), "term://") then - vim.opt_local.wrap = true - vim.opt_local.spell = false - vim.cmd("startinsert") - end - end, -}) - --- Auto resize panes when resizing nvim window -autocmd("VimResized", { - pattern = "*", - command = "tabdo wincmd =", -}) diff --git a/modules/nvim/config/lua/custom/mappings.lua b/modules/nvim/config/lua/custom/mappings.lua deleted file mode 100644 index 3918716..0000000 --- a/modules/nvim/config/lua/custom/mappings.lua +++ /dev/null @@ -1,97 +0,0 @@ ----@type MappingsTable -local M = {} - -M.general = { - n = { - [";"] = { ":", "enter command mode", opts = { nowait = true } }, - ["P"] = { " Lazy ", "Lazy plugin mgr" }, - ["M"] = { " Mason ", "Mason package mgr" }, - ["H"] = { " Htop ", "Htop system monitor" }, - ["G"] = { " Lazygit ", "Lazygit command" }, - ["L"] = { " Lazyman ", "Lazyman menu" }, - ["C"] = { " Lazyconf ", "Lazyman configuration" }, - ["A"] = { " Asciiville ", "Asciiville" }, - ["q"] = { " quitall! ", "quit" }, - ["tT"] = { - function() - require("base46").toggle_transparency() - end, - "toggle transparency" - }, - ["tt"] = { - function() - require("base46").toggle_theme() - end, - "toggle theme" - }, - }, -} - -M.symbols_outline = { - n = { - ["cs"] = { "SymbolsOutline", "Symbols Outline" }, - }, -} - -M.dap = { - plugin = true, - n = { - ["db"] = { - " DapToggleBreakpoint ", - "Add breakpoint at line" - }, - ["dus"] = { - function() - local widgets = require('dap.ui.widgets'); - local sidebar = widgets.sidebar(widgets.scopes); - sidebar.open(); - end, - "Open debugging sidebar" - } - } -} - -M.dap_go = { - plugin = true, - n = { - ["dgt"] = { - function() - require('dap-go').debug_test() - end, - "Debug go test" - }, - ["dgl"] = { - function() - require('dap-go').debug_last() - end, - "Debug last go test" - } - } -} - -M.dap_python = { - plugin = true, - n = { - ["dpr"] = { - function() - require('dap-python').test_method() - end - } - } -} - -M.gopher = { - plugin = true, - n = { - ["gsj"] = { - " GoTagAdd json ", - "Add json struct tags" - }, - ["gsy"] = { - " GoTagAdd yaml ", - "Add yaml struct tags" - } - } -} - -return M diff --git a/modules/nvim/config/lua/custom/plugins.lua b/modules/nvim/config/lua/custom/plugins.lua deleted file mode 100644 index cce2fd5..0000000 --- a/modules/nvim/config/lua/custom/plugins.lua +++ /dev/null @@ -1,416 +0,0 @@ -local overrides = require("custom.configs.overrides") - ---- @param on_attach fun(client, buffer) -local navic_on_attach = function(on_attach) - vim.api.nvim_create_autocmd("LspAttach", { - callback = function(args) - local buffer = args.buf - local client = vim.lsp.get_client_by_id(args.data.client_id) - on_attach(client, buffer) - end, - }) -end - -local plugins = { - - -- Override plugin definition options - - { - "NvChad/nvterm", - enabled = false, - }, - - { - "hrsh7th/nvim-cmp", - version = false, -- last release is way too old - event = "VeryLazy", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "saadparwaiz1/cmp_luasnip", - }, - config = function() - require("plugins.configs.cmp") - require("custom.configs.nvim-cmp") - end, - }, - - { - "neovim/nvim-lspconfig", - dependencies = { - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "jose-elias-alvarez/nvim-lsp-ts-utils", - "jose-elias-alvarez/null-ls.nvim", - "nvim-lua/plenary.nvim", - "b0o/schemastore.nvim", - "folke/neodev.nvim", - }, - init = function() - require("core.utils").lazy_load "nvim-lspconfig" - end, - config = function() - local lsp_on_attach = require("plugins.configs.lspconfig").on_attach - local capabilities = require("plugins.configs.lspconfig").capabilities - local lspconfig = require("lspconfig") - local opts = { - ensure_installed = overrides.formatters_linters, - ui = { - border = "rounded", - icons = { - package_pending = " ", - package_installed = " ", - package_uninstalled = " ﮊ", - }, - }, - } - require("mason").setup(opts) - local mr = require("mason-registry") - local function install_ensured() - for _, tool in ipairs(opts.ensure_installed) do - local p = mr.get_package(tool) - if not p:is_installed() then - p:install() - end - end - end - if mr.refresh then - mr.refresh(install_ensured) - else - install_ensured() - end - require("mason-lspconfig").setup { - ensure_installed = overrides.lsp_servers, - automatic_installation = true, - } - require("mason-lspconfig").setup_handlers { - -- Default setup for all servers, unless a custom one is defined below - function(server_name) - lspconfig[server_name].setup { - on_attach = function(client, bufnr) - lsp_on_attach(client, bufnr) - end, - capabilities = capabilities, - } - end, - -- custom setup for a server goes after the function above - -- Example, override rust_analyzer - -- ["rust_analyzer"] = function () - -- require("rust-tools").setup {} - -- end, - ["clangd"] = function() - lspconfig.clangd.setup { - cmd = { - "clangd", - "--offset-encoding=utf-16", -- To match null-ls - -- With this, you can configure server with - -- - .clangd files - -- - global clangd/config.yaml files - -- Read the `--enable-config` option in `clangd --help` for more information - "--enable-config", - }, - on_attach = function(client, bufnr) - lsp_on_attach(client, bufnr) - end, - capabilities = capabilities, - } - end, - - -- Example: disable auto configuring an LSP - -- Here, we disable lua_ls so we can use NvChad's default config - ["lua_ls"] = function() end, - } - require("plugins.configs.lspconfig") - require("custom.configs.lspconfig") - end, - }, - - { - "folke/neodev.nvim", - version = false, -- last release is way too old - event = "VeryLazy", - dependencies = { - "hrsh7th/nvim-cmp", - }, - config = function() - require("custom.configs.neodev") - end, - }, - - { - "jose-elias-alvarez/null-ls.nvim", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "neovim/nvim-lspconfig", - "mason.nvim", - }, - config = function() - vim.filetype.add { - extension = { - zsh = "zsh", - }, - } - local null_ls = require("null-ls") - local formatting = null_ls.builtins.formatting - local diagnostics = null_ls.builtins.diagnostics - local actions = null_ls.builtins.code_actions - null_ls.setup { - debug = false, - sources = { - formatting.prettier.with { - -- milliseconds - timeout = 10000, - extra_args = { "--single-quote", "false" }, - }, - formatting.stylua.with { - timeout = 10000, - extra_args = { "--indent-type", "Spaces", "--indent-width", "2" }, - }, - formatting.terraform_fmt, - formatting.goimports, - formatting.gofumpt, - formatting.latexindent.with { - timeout = 10000, - extra_args = { "-g", "/dev/null" }, -- https://github.com/cmhughes/latexindent.pl/releases/tag/V3.9.3 - }, - actions.shellcheck, - actions.gitsigns, - formatting.shfmt.with { - extra_args = { "-i", "2", "-ci", "-bn" }, - filetypes = { "sh", "zsh", "bash" }, - }, - diagnostics.ruff, - formatting.google_java_format, - formatting.black.with { - timeout = 10000, - extra_args = { "--fast" }, - }, - formatting.sql_formatter.with { - timeout = 10000, - extra_args = { "--config" }, - }, - formatting.markdownlint, - formatting.beautysh.with { - timeout = 10000, - extra_args = { "--indent-size", "2" }, - }, - diagnostics.zsh.with { - filetypes = { "zsh" }, - }, - }, - on_attach = function(client, bufnr) - if client.supports_method "textDocument/formatting" then - local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr } - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format { bufnr = bufnr } - end, - }) - end - end, - } - end, - }, - - -- override plugin configs - { - "williamboman/mason.nvim", - build = ":MasonUpdate", - cmd = { - "Mason", - "MasonInstall", - "MasonInstallAll", - "MasonUninstall", - "MasonUninstallAll", - "MasonLog", - "MasonUpdate", - }, - lazy = false, - opts = overrides.mason, - -- opts = function() - -- return require "plugins.configs.mason" - -- end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "mason") - require("mason").setup(opts) - - -- custom nvchad cmd to install all mason binaries listed - local mason_packages = overrides.lsp_servers_mason - local mason_fml = overrides.formatters_linters - for i = 1, #mason_fml do - mason_packages[#mason_packages + 1] = mason_fml[i] - end - vim.api.nvim_create_user_command("MasonInstallAll", function() - vim.cmd("MasonInstall " .. table.concat(mason_packages, " ")) - end, {}) - - vim.g.mason_binaries_list = mason_packages - end, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - - { - "nvim-tree/nvim-tree.lua", - opts = overrides.nvimtree, - }, - - -- Install a plugin - - -- lsp symbol navigation - { - "SmiteshP/nvim-navic", - lazy = true, - init = function() - vim.g.navic_silence = true - navic_on_attach(function(client, buffer) - if client.server_capabilities.documentSymbolProvider then - require("nvim-navic").attach(client, buffer) - end - end) - end, - opts = function() - return { - separator = " ", - highlight = true, - depth_limit = 0, - depth_limit_indicator = "..", - icons = require("custom.icons").kinds, - } - end, - }, - { - "max397574/better-escape.nvim", - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, - - { "ziontee113/syntax-tree-surfer" }, - - { - "mfussenegger/nvim-treehopper", - lazy = false, - config = function() - local tree_hopper = require("tsht") - vim.keymap.set("n", "hm", function() - tree_hopper.nodes() - end, { desc = "Treehopper nodes" }) - vim.keymap.set("n", "h[", function() - tree_hopper.move { side = "start" } - end, { desc = "Move to start of Treehopper node" }) - vim.keymap.set("n", "h]", function() - tree_hopper.move { side = "end" } - end, { desc = "Move to end of Treehopper node" }) - end, - }, - - { - "phaazon/hop.nvim", - branch = "v2", - cmd = { - "HopAnywhere", - "HopChar1", - "HopChar2", - "HopLine", - "HopLineStart", - "HopVertical", - "HopPattern", - "HopWord", - }, - lazy = false, - config = function() - require("custom.configs.hop") - end, - }, - - { - "rebelot/terminal.nvim", - cmd = { - "Asciiville", - "TermOpen", - "TermToggle", - "TermRun", - "Lazygit", - "IPython", - "Lazyman", - "Lazyconf", - "Htop", - }, - event = "TermOpen", - config = function() - require("custom.configs.terminal_nvim") - end, - }, - - { import = "custom.configs.symbols-outline" }, - { import = "custom.configs.trouble" }, - - { - "mfussenegger/nvim-dap", - init = function() - require("core.utils").load_mappings("dap") - end - }, - { - "leoluz/nvim-dap-go", - ft = "go", - dependencies = "mfussenegger/nvim-dap", - config = function(_, opts) - require("dap-go").setup(opts) - require("core.utils").load_mappings("dap_go") - end - }, - { - "rcarriga/nvim-dap-ui", - dependencies = "mfussenegger/nvim-dap", - config = function() - local dap = require("dap") - local dapui = require("dapui") - dapui.setup() - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() - end - end - }, - { - "mfussenegger/nvim-dap-python", - ft = "python", - dependencies = { - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - }, - config = function() - local path = vim.fn.stdpath("data") .. "/mason/packages/debugpy/venv/bin/python" - require("dap-python").setup(path) - require("core.utils").load_mappings("dap_python") - end, - }, - { - "olexsmir/gopher.nvim", - ft = "go", - config = function(_, opts) - require("gopher").setup(opts) - require("core.utils").load_mappings("gopher") - end, - build = function() - vim.cmd [[silent! GoInstallDeps]] - end, - }, -} -return plugins diff --git a/modules/nvim/config/lua/plugins/configs/cmp.lua b/modules/nvim/config/lua/plugins/configs/cmp.lua deleted file mode 100644 index 444da73..0000000 --- a/modules/nvim/config/lua/plugins/configs/cmp.lua +++ /dev/null @@ -1,120 +0,0 @@ -local cmp = require "cmp" - -dofile(vim.g.base46_cache .. "cmp") - -local cmp_ui = require("core.utils").load_config().ui.cmp -local cmp_style = cmp_ui.style - -local field_arrangement = { - atom = { "kind", "abbr", "menu" }, - atom_colored = { "kind", "abbr", "menu" }, -} - -local formatting_style = { - -- default fields order i.e completion word + item.kind + item.kind icons - fields = field_arrangement[cmp_style] or { "abbr", "kind", "menu" }, - - format = function(_, item) - local icons = require "nvchad.icons.lspkind" - local icon = (cmp_ui.icons and icons[item.kind]) or "" - - if cmp_style == "atom" or cmp_style == "atom_colored" then - icon = " " .. icon .. " " - item.menu = cmp_ui.lspkind_text and " (" .. item.kind .. ")" or "" - item.kind = icon - else - icon = cmp_ui.lspkind_text and (" " .. icon .. " ") or icon - item.kind = string.format("%s %s", icon, cmp_ui.lspkind_text and item.kind or "") - end - - return item - end, -} - -local function border(hl_name) - return { - { "╭", hl_name }, - { "─", hl_name }, - { "╮", hl_name }, - { "│", hl_name }, - { "╯", hl_name }, - { "─", hl_name }, - { "╰", hl_name }, - { "│", hl_name }, - } -end - -local options = { - completion = { - completeopt = "menu,menuone", - }, - - window = { - completion = { - side_padding = (cmp_style ~= "atom" and cmp_style ~= "atom_colored") and 1 or 0, - winhighlight = "Normal:CmpPmenu,CursorLine:CmpSel,Search:None", - scrollbar = false, - }, - documentation = { - border = border "CmpDocBorder", - winhighlight = "Normal:CmpDoc", - }, - }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - - formatting = formatting_style, - - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }, - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif require("luasnip").expand_or_jumpable() then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-expand-or-jump", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif require("luasnip").jumpable(-1) then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-jump-prev", true, true, true), "") - else - fallback() - end - end, { - "i", - "s", - }), - }, - sources = { - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "nvim_lua" }, - { name = "path" }, - }, -} - -if cmp_style ~= "atom" and cmp_style ~= "atom_colored" then - options.window.completion.border = border "CmpBorder" -end - -return options diff --git a/modules/nvim/config/lua/plugins/configs/lazy_nvim.lua b/modules/nvim/config/lua/plugins/configs/lazy_nvim.lua deleted file mode 100644 index cd170bd..0000000 --- a/modules/nvim/config/lua/plugins/configs/lazy_nvim.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - defaults = { lazy = true }, - install = { colorscheme = { "nvchad" } }, - - ui = { - icons = { - ft = "", - lazy = "󰂠 ", - loaded = "", - not_loaded = "", - }, - }, - - performance = { - rtp = { - disabled_plugins = { - "2html_plugin", - "tohtml", - "getscript", - "getscriptPlugin", - "gzip", - "logipat", - "netrw", - "netrwPlugin", - "netrwSettings", - "netrwFileHandlers", - "matchit", - "tar", - "tarPlugin", - "rrhelper", - "spellfile_plugin", - "vimball", - "vimballPlugin", - "zip", - "zipPlugin", - "tutor", - "rplugin", - "syntax", - "synmenu", - "optwin", - "compiler", - "bugreport", - "ftplugin", - }, - }, - }, -} diff --git a/modules/nvim/config/lua/plugins/configs/lspconfig.lua b/modules/nvim/config/lua/plugins/configs/lspconfig.lua deleted file mode 100644 index f824aa0..0000000 --- a/modules/nvim/config/lua/plugins/configs/lspconfig.lua +++ /dev/null @@ -1,64 +0,0 @@ -dofile(vim.g.base46_cache .. "lsp") -require "nvchad.lsp" - -local M = {} -local utils = require "core.utils" - --- export on_attach & capabilities for custom lspconfigs - -M.on_attach = function(client, bufnr) - utils.load_mappings("lspconfig", { buffer = bufnr }) - - if client.server_capabilities.signatureHelpProvider then - require("nvchad.signature").setup(client) - end - - if not utils.load_config().ui.lsp_semantic_tokens and client.supports_method "textDocument/semanticTokens" then - client.server_capabilities.semanticTokensProvider = nil - end -end - -M.capabilities = vim.lsp.protocol.make_client_capabilities() - -M.capabilities.textDocument.completion.completionItem = { - documentationFormat = { "markdown", "plaintext" }, - snippetSupport = true, - preselectSupport = true, - insertReplaceSupport = true, - labelDetailsSupport = true, - deprecatedSupport = true, - commitCharactersSupport = true, - tagSupport = { valueSet = { 1 } }, - resolveSupport = { - properties = { - "documentation", - "detail", - "additionalTextEdits", - }, - }, -} - -require("lspconfig").lua_ls.setup { - on_attach = M.on_attach, - capabilities = M.capabilities, - - settings = { - Lua = { - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = { - [vim.fn.expand "$VIMRUNTIME/lua"] = true, - [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, - [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true, - [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true, - }, - maxPreload = 100000, - preloadFileSize = 10000, - }, - }, - }, -} - -return M diff --git a/modules/nvim/config/lua/plugins/configs/mason.lua b/modules/nvim/config/lua/plugins/configs/mason.lua deleted file mode 100644 index 3692a15..0000000 --- a/modules/nvim/config/lua/plugins/configs/mason.lua +++ /dev/null @@ -1,28 +0,0 @@ -local options = { - ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim - - PATH = "skip", - - ui = { - icons = { - package_pending = " ", - package_installed = "󰄳 ", - package_uninstalled = " 󰚌", - }, - - keymaps = { - toggle_server_expand = "", - install_server = "i", - update_server = "u", - check_server_version = "c", - update_all_servers = "U", - check_outdated_servers = "C", - uninstall_server = "X", - cancel_installation = "", - }, - }, - - max_concurrent_installers = 10, -} - -return options diff --git a/modules/nvim/config/lua/plugins/configs/nvimtree.lua b/modules/nvim/config/lua/plugins/configs/nvimtree.lua deleted file mode 100644 index b4a8aee..0000000 --- a/modules/nvim/config/lua/plugins/configs/nvimtree.lua +++ /dev/null @@ -1,77 +0,0 @@ -local options = { - filters = { - dotfiles = false, - exclude = { vim.fn.stdpath "config" .. "/lua/custom" }, - }, - disable_netrw = true, - hijack_netrw = true, - hijack_cursor = true, - hijack_unnamed_buffer_when_opening = false, - sync_root_with_cwd = true, - update_focused_file = { - enable = true, - update_root = false, - }, - view = { - adaptive_size = false, - side = "left", - width = 30, - preserve_window_proportions = true, - }, - git = { - enable = false, - ignore = true, - }, - filesystem_watchers = { - enable = true, - }, - actions = { - open_file = { - resize_window = true, - }, - }, - renderer = { - root_folder_label = false, - highlight_git = false, - highlight_opened_files = "none", - - indent_markers = { - enable = false, - }, - - icons = { - show = { - file = true, - folder = true, - folder_arrow = true, - git = false, - }, - - glyphs = { - default = "󰈚", - symlink = "", - folder = { - default = "", - empty = "", - empty_open = "", - open = "", - symlink = "", - symlink_open = "", - arrow_open = "", - arrow_closed = "", - }, - git = { - unstaged = "✗", - staged = "✓", - unmerged = "", - renamed = "➜", - untracked = "★", - deleted = "", - ignored = "◌", - }, - }, - }, - }, -} - -return options diff --git a/modules/nvim/config/lua/plugins/configs/others.lua b/modules/nvim/config/lua/plugins/configs/others.lua deleted file mode 100644 index dafd5a4..0000000 --- a/modules/nvim/config/lua/plugins/configs/others.lua +++ /dev/null @@ -1,66 +0,0 @@ -local M = {} -local utils = require "core.utils" - -M.blankline = { - indentLine_enabled = 1, - filetype_exclude = { - "help", - "terminal", - "lazy", - "lspinfo", - "TelescopePrompt", - "TelescopeResults", - "mason", - "nvdash", - "nvcheatsheet", - "", - }, - buftype_exclude = { "terminal" }, - show_trailing_blankline_indent = false, - show_first_indent_level = false, - show_current_context = true, - show_current_context_start = true, -} - -M.luasnip = function(opts) - require("luasnip").config.set_config(opts) - - -- vscode format - require("luasnip.loaders.from_vscode").lazy_load() - require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" } - - -- snipmate format - require("luasnip.loaders.from_snipmate").load() - require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" } - - -- lua format - require("luasnip.loaders.from_lua").load() - require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" } - - vim.api.nvim_create_autocmd("InsertLeave", { - callback = function() - if - require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()] - and not require("luasnip").session.jump_active - then - require("luasnip").unlink_current() - end - end, - }) -end - -M.gitsigns = { - signs = { - add = { text = "│" }, - change = { text = "│" }, - delete = { text = "󰍵" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "│" }, - }, - on_attach = function(bufnr) - utils.load_mappings("gitsigns", { buffer = bufnr }) - end, -} - -return M diff --git a/modules/nvim/config/lua/plugins/configs/telescope.lua b/modules/nvim/config/lua/plugins/configs/telescope.lua deleted file mode 100644 index 784fb19..0000000 --- a/modules/nvim/config/lua/plugins/configs/telescope.lua +++ /dev/null @@ -1,55 +0,0 @@ -local options = { - defaults = { - vimgrep_arguments = { - "rg", - "-L", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - }, - prompt_prefix = "  ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "ascending", - layout_strategy = "horizontal", - layout_config = { - horizontal = { - prompt_position = "top", - preview_width = 0.55, - results_width = 0.8, - }, - vertical = { - mirror = false, - }, - width = 0.87, - height = 0.80, - preview_cutoff = 120, - }, - file_sorter = require("telescope.sorters").get_fuzzy_file, - file_ignore_patterns = { "node_modules" }, - generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = { "truncate" }, - winblend = 0, - border = {}, - borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - color_devicons = true, - set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, - file_previewer = require("telescope.previewers").vim_buffer_cat.new, - grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, - qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, - mappings = { - n = { ["q"] = require("telescope.actions").close }, - }, - }, - - extensions_list = { "themes", "terms" }, -} - -return options diff --git a/modules/nvim/config/lua/plugins/configs/treesitter.lua b/modules/nvim/config/lua/plugins/configs/treesitter.lua deleted file mode 100644 index b21b55d..0000000 --- a/modules/nvim/config/lua/plugins/configs/treesitter.lua +++ /dev/null @@ -1,12 +0,0 @@ -local options = { - ensure_installed = { "lua" }, - - highlight = { - enable = true, - use_languagetree = true, - }, - - indent = { enable = true }, -} - -return options diff --git a/modules/nvim/config/lua/plugins/init.lua b/modules/nvim/config/lua/plugins/init.lua deleted file mode 100644 index bce7140..0000000 --- a/modules/nvim/config/lua/plugins/init.lua +++ /dev/null @@ -1,253 +0,0 @@ --- All plugins have lazy=true by default,to load a plugin on startup just lazy=false --- List of all default plugins & their definitions -local default_plugins = { - - "nvim-lua/plenary.nvim", - - { - "NvChad/base46", - branch = "v2.0", - build = function() - require("base46").load_all_highlights() - end, - }, - - { - "NvChad/ui", - branch = "v2.0", - lazy = false, - }, - - { - "NvChad/nvterm", - init = function() - require("core.utils").load_mappings "nvterm" - end, - config = function(_, opts) - require "base46.term" - require("nvterm").setup(opts) - end, - }, - - { - "NvChad/nvim-colorizer.lua", - event = "User FilePost", - config = function(_, opts) - require("colorizer").setup(opts) - - -- execute colorizer as soon as possible - vim.defer_fn(function() - require("colorizer").attach_to_buffer(0) - end, 0) - end, - }, - - { - "nvim-tree/nvim-web-devicons", - opts = function() - return { override = require "nvchad.icons.devicons" } - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "devicons") - require("nvim-web-devicons").setup(opts) - end, - }, - - { - "lukas-reineke/indent-blankline.nvim", - version = "2.20.7", - event = "User FilePost", - opts = function() - return require("plugins.configs.others").blankline - end, - config = function(_, opts) - require("core.utils").load_mappings "blankline" - dofile(vim.g.base46_cache .. "blankline") - require("indent_blankline").setup(opts) - end, - }, - - { - "nvim-treesitter/nvim-treesitter", - event = { "BufReadPost", "BufNewFile" }, - tag = "v0.9.2", - cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" }, - build = ":TSUpdate", - opts = function() - return require "plugins.configs.treesitter" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "syntax") - require("nvim-treesitter.configs").setup(opts) - end, - }, - - -- git stuff - { - "lewis6991/gitsigns.nvim", - event = "User FilePost", - opts = function() - return require("plugins.configs.others").gitsigns - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "git") - require("gitsigns").setup(opts) - end, - }, - - -- lsp stuff - { - "williamboman/mason.nvim", - cmd = { "Mason", "MasonInstall", "MasonInstallAll", "MasonUpdate" }, - opts = function() - return require "plugins.configs.mason" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "mason") - require("mason").setup(opts) - - -- custom nvchad cmd to install all mason binaries listed - vim.api.nvim_create_user_command("MasonInstallAll", function() - if opts.ensure_installed and #opts.ensure_installed > 0 then - vim.cmd("MasonInstall " .. table.concat(opts.ensure_installed, " ")) - end - end, {}) - - vim.g.mason_binaries_list = opts.ensure_installed - end, - }, - - { - "neovim/nvim-lspconfig", - event = "User FilePost", - config = function() - require "plugins.configs.lspconfig" - end, - }, - - -- load luasnips + cmp related in insert mode only - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - { - -- snippet plugin - "L3MON4D3/LuaSnip", - dependencies = "rafamadriz/friendly-snippets", - opts = { history = true, updateevents = "TextChanged,TextChangedI" }, - config = function(_, opts) - require("plugins.configs.others").luasnip(opts) - end, - }, - - -- autopairing of (){}[] etc - { - "windwp/nvim-autopairs", - opts = { - fast_wrap = {}, - disable_filetype = { "TelescopePrompt", "vim" }, - }, - config = function(_, opts) - require("nvim-autopairs").setup(opts) - - -- setup cmp for autopairs - local cmp_autopairs = require "nvim-autopairs.completion.cmp" - require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, - }, - - -- cmp sources plugins - { - "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - }, - }, - opts = function() - return require "plugins.configs.cmp" - end, - config = function(_, opts) - require("cmp").setup(opts) - end, - }, - - { - "numToStr/Comment.nvim", - keys = { - { "gcc", mode = "n", desc = "Comment toggle current line" }, - { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" }, - { "gc", mode = "x", desc = "Comment toggle linewise (visual)" }, - { "gbc", mode = "n", desc = "Comment toggle current block" }, - { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" }, - { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" }, - }, - init = function() - require("core.utils").load_mappings "comment" - end, - config = function(_, opts) - require("Comment").setup(opts) - end, - }, - - -- file managing , picker etc - { - "nvim-tree/nvim-tree.lua", - cmd = { "NvimTreeToggle", "NvimTreeFocus" }, - init = function() - require("core.utils").load_mappings "nvimtree" - end, - opts = function() - return require "plugins.configs.nvimtree" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "nvimtree") - require("nvim-tree").setup(opts) - end, - }, - - { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - cmd = "Telescope", - init = function() - require("core.utils").load_mappings "telescope" - end, - opts = function() - return require "plugins.configs.telescope" - end, - config = function(_, opts) - dofile(vim.g.base46_cache .. "telescope") - local telescope = require "telescope" - telescope.setup(opts) - - -- load extensions - for _, ext in ipairs(opts.extensions_list) do - telescope.load_extension(ext) - end - end, - }, - - -- Only load whichkey after all the gui - { - "folke/which-key.nvim", - keys = { "", "", "", '"', "'", "`", "c", "v", "g" }, - init = function() - require("core.utils").load_mappings "whichkey" - end, - cmd = "WhichKey", - config = function(_, opts) - dofile(vim.g.base46_cache .. "whichkey") - require("which-key").setup(opts) - end, - }, -} - -local config = require("core.utils").load_config() - -if #config.plugins > 0 then - table.insert(default_plugins, { import = config.plugins }) -end - -require("lazy").setup(default_plugins, config.lazy_nvim) diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix deleted file mode 100644 index a756204..0000000 --- a/modules/nvim/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, config, pkgs, ... }: - -with lib; -let cfg = config.modules.nvim; - -in { - options.modules.nvim = { enable = mkEnableOption "nvim"; }; - config = mkIf cfg.enable { - home.file.".config/nvim" = { - source = ./config; - recursive = true; - }; - home.file.".npmrc".source = ./npmrc; - }; -} - diff --git a/modules/nvim/npmrc b/modules/nvim/npmrc deleted file mode 100644 index 0c06bc9..0000000 --- a/modules/nvim/npmrc +++ /dev/null @@ -1 +0,0 @@ -prefix=${HOME}/.npm-global diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 586041b..3d9a668 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -53,7 +53,6 @@ in { zathura okular conda - vscode joplin-desktop # Tools / File managenemt sshpass diff --git a/modules/starship/default.nix b/modules/starship/default.nix new file mode 100644 index 0000000..56ed5ca --- /dev/null +++ b/modules/starship/default.nix @@ -0,0 +1,31 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.starship; + +in { + options.modules.starship = { enable = mkEnableOption "starship"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ starship ]; + + programs.starship = { + enable = true; + settings = { + aws.style = "bold #ffb86c"; + cmd_duration.style = "bold #f1fa8c"; + directory.style = "bold #50fa7b"; + hostname.style = "bold #ff5555"; + git_branch.style = "bold #ff79c6"; + git_status.style = "bold #ff5555"; + username = { + format = "[$user]($style) on "; + style_user = "bold #bd93f9"; + }; + character = { + success_symbol = "[λ](bold #f8f8f2)"; + error_symbol = "[λ](bold #ff5555)"; + }; + }; + }; + }; +} diff --git a/modules/system/configuration.nix b/modules/system/configuration.nix index 49f9926..0b7e446 100644 --- a/modules/system/configuration.nix +++ b/modules/system/configuration.nix @@ -32,7 +32,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting 'Welcome to PwNixOS!' --cmd Hyprland"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting 'Welcome to NixOS!' --cmd Hyprland"; user = "${user}"; }; }; @@ -45,15 +45,13 @@ services.hardware.bolt.enable = true; - hardware.logitech.wireless.enable = true; # For Logitech mices. TODO: Move to a module. + hardware.logitech.wireless.enable = true; hardware.logitech.wireless.enableGraphical = true; -# Adding XWayland support programs.hyprland.xwayland.enable = true; - virtualisation.libvirtd.enable = true; # For VMs using virt-manager. + virtualisation.libvirtd.enable = true; -# Install fonts fonts = { packages = with pkgs; [ jetbrains-mono @@ -72,7 +70,6 @@ }; -# Wayland stuff: enable XDG integration xdg = { icons.enable = true; portal = { @@ -86,7 +83,6 @@ xdg.portal.config.common.default = "*"; -# DBUS programs.dconf.enable = true; services.dbus.packages = with pkgs; [ dconf ]; @@ -107,7 +103,7 @@ gc = { automatic = true; dates = "weekly"; - options = "--delete-older-than 7d"; + options = "--delete-older-than 14d"; }; extraOptions = '' experimental-features = nix-command flakes @@ -190,7 +186,6 @@ pulse.enable = true; }; -# Disable bluetooth, enable pulseaudio, enable opengl (for Wayland) hardware = { bluetooth.enable = true; opengl = { @@ -203,7 +198,6 @@ programs.adb.enable = true; services.blueman.enable = true; - -# Do not touch + # Do not touch system.stateVersion = "23.11"; } diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix new file mode 100644 index 0000000..8af5eb1 --- /dev/null +++ b/modules/tmux/default.nix @@ -0,0 +1,56 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.tmux; + +in { + options.modules.tmux = { enable = mkEnableOption "tmux"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ tmux ]; + programs.tmux = { + enable = true; + clock24 = true; + + extraConfig = '' + # Alacritty term support + set -g default-terminal "tmux-256color" + set -sg terminal-overrides ",*:RGB" + + # Enable vim keys + set-window-option -g mode-keys vi + bind h select-pane -L + bind j select-pane -D + bind k select-pane -U + bind l select-pane -R + bind -r ^ last-window + + bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'wl-copy' + + # Remap prefix to Control + a + # unbind C-b + # set-option -g prefix C-a + # bind-key C-a send-prefix + + # Set mouse + set -g mouse on + + # Increase history size + set-option -g history-limit 10000 + + # Scripts + # bind-key -r S run-shell "tmux neww ~/.local/scripts/ssh-connect.sh" + # bind-key T run-shell "tmux neww tms" + + # Colors + set-option -g pane-active-border-style fg='#6272a4' + set-option -g pane-border-style fg='#ff79c6' + # set-option -g status-bg black + set-option -g status-fg black + set -g status-right '#[fg=black,bg=#e95678] #{cpu_percentage}  %H:%M ' + run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux + run-shell ${pkgs.tmuxPlugins.tmux-fzf}/share/tmux-plugins/tmux-fzf/main.tmux + ''; + }; + + }; +} diff --git a/modules/vscode/default.nix b/modules/vscode/default.nix new file mode 100644 index 0000000..46014cd --- /dev/null +++ b/modules/vscode/default.nix @@ -0,0 +1,23 @@ +{ pkgs, lib, config, ... }: + +with lib; +let cfg = config.modules.vscode; + +in { + options.modules.vscode = { enable = mkEnableOption "vscode"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ vscode ]; + + programs.vscode = { + enable = true; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + vscodevim.vim + yzhang.markdown-all-in-one + github.copilot + ]; + }; + + }; + +}