From e13e2b9bc23f769f4111aa584764dec83b7da46b Mon Sep 17 00:00:00 2001 From: krolxon Date: Tue, 4 Nov 2025 23:13:49 +0530 Subject: [PATCH] lazyvim configuration --- .gitignore | 8 ++ .neoconf.json | 15 +++ .stylua.toml | 6 - LICENSE | 201 ++++++++++++++++++++++++++++++++++ README.md | 8 +- init.lua | 49 +-------- lazy-lock.json | 71 ++++++------ lazyvim.json | 12 ++ lua/chadrc.lua | 10 -- lua/{ => config}/autocmds.lua | 61 +++-------- lua/config/keymaps.lua | 14 +++ lua/config/lazy.lua | 53 +++++++++ lua/config/options.lua | 14 +++ lua/configs/conform.lua | 15 --- lua/configs/lazy.lua | 47 -------- lua/configs/lspconfig.lua | 39 ------- lua/mappings.lua | 51 --------- lua/options.lua | 9 -- lua/plugins/colorscheme.lua | 12 ++ lua/plugins/init.lua | 95 ---------------- lua/plugins/lsp.lua | 26 +++++ lua/plugins/nvim-tree.lua | 38 +++++++ lua/plugins/obsidian.lua | 54 --------- lua/plugins/platformio.lua | 6 + lua/plugins/rustaceanvim.lua | 31 ------ lua/plugins/vimwiki.lua | 22 ++++ stylua.toml | 3 + 27 files changed, 485 insertions(+), 485 deletions(-) create mode 100644 .gitignore create mode 100644 .neoconf.json delete mode 100644 .stylua.toml create mode 100644 LICENSE create mode 100644 lazyvim.json delete mode 100644 lua/chadrc.lua rename lua/{ => config}/autocmds.lua (67%) create mode 100644 lua/config/keymaps.lua create mode 100644 lua/config/lazy.lua create mode 100644 lua/config/options.lua delete mode 100644 lua/configs/conform.lua delete mode 100644 lua/configs/lazy.lua delete mode 100644 lua/configs/lspconfig.lua delete mode 100644 lua/mappings.lua delete mode 100644 lua/options.lua create mode 100644 lua/plugins/colorscheme.lua delete mode 100644 lua/plugins/init.lua create mode 100644 lua/plugins/lsp.lua create mode 100644 lua/plugins/nvim-tree.lua delete mode 100644 lua/plugins/obsidian.lua create mode 100644 lua/plugins/platformio.lua delete mode 100644 lua/plugins/rustaceanvim.lua create mode 100644 lua/plugins/vimwiki.lua create mode 100644 stylua.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/.neoconf.json b/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/.stylua.toml b/.stylua.toml deleted file mode 100644 index ca1541c..0000000 --- a/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 4 -quote_style = "AutoPreferDouble" -call_parentheses = "None" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 70820da..185280b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -### My nvchad config +# đŸ’€ LazyVim -#### extra plugins added -1. rustaceanvim: for rust development. -2. crates.nvim: for rust dependencies lookup. -3. nvim-tetris: tetris game. +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/init.lua b/init.lua index ab217cc..2514f9e 100644 --- a/init.lua +++ b/init.lua @@ -1,47 +1,2 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -vim.g.mapleader = " " - --- bootstrap lazy and all plugins -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" - -if not vim.uv.fs_stat(lazypath) then - local repo = "https://github.com/folke/lazy.nvim.git" - vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } -end - -vim.opt.rtp:prepend(lazypath) - -local lazy_config = require "configs.lazy" - --- load plugins -require("lazy").setup({ - { - "NvChad/NvChad", - lazy = false, - branch = "v2.5", - import = "nvchad.plugins", - }, - - { import = "plugins" }, -}, lazy_config) - --- load theme -dofile(vim.g.base46_cache .. "defaults") -dofile(vim.g.base46_cache .. "statusline") - -require "options" -require "nvchad.autocmds" -require("autocmds") - -vim.schedule(function() - require "mappings" -end) - - - - - - - - - +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/lazy-lock.json b/lazy-lock.json index e3428fb..b1ce855 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,43 @@ { - "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, - "NvChad": { "branch": "v2.5", "commit": "29ebe31ea6a4edf351968c76a93285e6e108ea08" }, - "base46": { "branch": "v3.0", "commit": "0094095ed60aa55f7148bc1e783b0156f3e7f4f8" }, - "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "compiler.nvim": { "branch": "main", "commit": "c09ab4e795b92378727d7377c03b0d5c2453957c" }, - "conform.nvim": { "branch": "master", "commit": "a0ab60ed666c56b37fd7ed1847d2ac52f2482ce0" }, - "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, + "FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" }, + "LazyVim": { "branch": "main", "commit": "cd745b14f84621caa5e9145509e9dd49c5d66f66" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "8c4125e3c746976ba025dc5d908fa22c6aa09486" }, + "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" }, + "flash.nvim": { "branch": "main", "commit": "3be9bf7e85550045ec576379a0c45aac144d0438" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, - "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, - "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "e844850b3143a1627437f811549fc7d70cfedf05" }, - "nvim-tetris": { "branch": "master", "commit": "d17c99fb527ada98ffb0212ffc87ccda6fd4f7d9" }, - "nvim-tree.lua": { "branch": "master", "commit": "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, + "lazydev.nvim": { "branch": "main", "commit": "12532f81ef8aa35dd4a44713ea32e760d643675c" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "35ec9e1425c2f9a36f556893336af4f302c63214" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, + "mini.comment": { "branch": "main", "commit": "c40bc46e72f41d3db265f6d86deb3dc259c0985d" }, + "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, + "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" }, + "neo-tree.nvim": { "branch": "main", "commit": "fa61e064895d6eff509f5fcb7b2b77b195c4291f" }, + "noice.nvim": { "branch": "main", "commit": "d14d02cb709e3bb2da88363c32f8b4250bced52d" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, + "nvim-lspconfig": { "branch": "master", "commit": "2b52bc2190c8efde2e4de02d829a138666774c7c" }, + "nvim-treesitter": { "branch": "main", "commit": "645f42e85d8665c91a9911c3896afb57d6b8a923" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, + "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" }, + "platformio.nvim": { "branch": "main", "commit": "546e1e0b5afdd970f140d0ccaf322d41c0f23941" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "ui": { "branch": "v3.0", "commit": "4852e04faefbba3a18cb197b76ac00f4bc2e615f" }, - "undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" }, + "render-markdown.nvim": { "branch": "main", "commit": "bfd67f1402b97ac619cb538f4bbaed12a7fa89aa" }, + "snacks.nvim": { "branch": "main", "commit": "e2c1c527e40aecd6d1ac011aef6d3c28a208a9ec" }, + "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" }, + "tokyonight.nvim": { "branch": "main", "commit": "4fe1b0c44f5d6ee769cdfbdffc7ccb703f53feda" }, + "trouble.nvim": { "branch": "main", "commit": "76030c5542c5d132aeeb467ca0ab370f3f79a697" }, + "ts-comments.nvim": { "branch": "main", "commit": "217ab9cc137fceb6659b53790bd25e608219abe1" }, "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }, - "volt": { "branch": "main", "commit": "7b8c5e790120d9f08c8487dcb80692db6d2087a1" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" } } diff --git a/lazyvim.json b/lazyvim.json new file mode 100644 index 0000000..3bb3f8e --- /dev/null +++ b/lazyvim.json @@ -0,0 +1,12 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.mini-comment", + "lazyvim.plugins.extras.editor.harpoon2", + "lazyvim.plugins.extras.lang.markdown" + ], + "install_version": 8, + "news": { + "NEWS.md": "11866" + }, + "version": 8 +} \ No newline at end of file diff --git a/lua/chadrc.lua b/lua/chadrc.lua deleted file mode 100644 index 9340bdf..0000000 --- a/lua/chadrc.lua +++ /dev/null @@ -1,10 +0,0 @@ ----@type ChadrcConfig -local M = {} - -M.base46 = { - theme = "catppuccin", - theme_toggle = { "tokyodark", "tokyonight" }, - transparency = true -} - -return M diff --git a/lua/autocmds.lua b/lua/config/autocmds.lua similarity index 67% rename from lua/autocmds.lua rename to lua/config/autocmds.lua index adef16b..cdd5ac6 100644 --- a/lua/autocmds.lua +++ b/lua/config/autocmds.lua @@ -1,45 +1,22 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") + local autocmd = vim.api.nvim_create_autocmd --- Highlight on yank -autocmd("TextYankPost", { - callback = function() - vim.highlight.on_yank { - higroup = "IncSearch", - timeout = 40, - } - end, -}) - --- Restore Cursor on file open -autocmd("BufReadPost", { - pattern = "*", - callback = function() - local line = vim.fn.line "'\"" - if - line > 1 - and line <= vim.fn.line "$" - and vim.bo.filetype ~= "commit" - and vim.fn.index({ "xxd", "gitrebase" }, vim.bo.filetype) == -1 - then - vim.cmd 'normal! g`"' - end - end, -}) - --- Remove trailing whitespaces on :w -autocmd({ "BufWritePre" }, { +-- remove trailing whitespaces on :w +autocmd({ "bufwritepre" }, { pattern = "*", command = [[%s/\s\+$//e]], }) --- Don"t auto commenting new lines -autocmd("BufEnter", { - pattern = "", - command = "set fo-=c fo-=r fo-=o", -}) - -- spell check markdown and tex files -vim.cmd [[ +vim.cmd([[ augroup spellCheck autocmd! autocmd Filetype plaintext setlocal spell @@ -49,7 +26,7 @@ vim.cmd [[ autocmd BufRead,BufNewFile *.Rmd setlocal spell autocmd BufRead,BufNewFile *.tex setlocal spell augroup END -]] +]]) local build_commands = { c = "!g++ -std=c++17 -o %:p:r.o %", @@ -106,10 +83,10 @@ vim.api.nvim_create_user_command("Run", function() for file, command in pairs(run_commands) do if filetype == file then - vim.cmd "sp" -- Vertical split + vim.cmd("sp") -- Vertical split -- vim.cmd("vs") -- Horizontal split vim.cmd("term " .. command) - vim.cmd "resize 20N" -- Comment this if horizontal + vim.cmd("resize 20N") -- Comment this if horizontal local keys = vim.api.nvim_replace_termcodes("i", true, false, true) vim.api.nvim_feedkeys(keys, "n", false) break @@ -118,12 +95,10 @@ vim.api.nvim_create_user_command("Run", function() end, {}) vim.api.nvim_create_user_command("Ha", function() - vim.cmd [[Build]] - vim.cmd [[Run]] + vim.cmd([[Build]]) + vim.cmd([[Run]]) end, {}) vim.api.nvim_create_user_command("Config", function() - vim.cmd [[cd ~/.config/nvim]] + vim.cmd([[cd ~/.config/nvim]]) end, {}) - -vim.cmd [[ autocmd BufRead,BufNewFile *.slint set filetype=slint ]] diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua new file mode 100644 index 0000000..ff7b0da --- /dev/null +++ b/lua/config/keymaps.lua @@ -0,0 +1,14 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here +local map = vim.keymap.set +map("n", "", "NvimTreeToggle", { desc = "NvimTree", remap = true }) + +-- Disable Ctrl+J in insert mode (make it do nothing) +vim.keymap.set("i", "", "", { noremap = true, silent = true }) + + +vim.keymap.set("n", "", "k") +vim.keymap.set("n", "", "j") +vim.keymap.set("n", "", "h") +vim.keymap.set("n", "", "l") diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua new file mode 100644 index 0000000..85dc8a3 --- /dev/null +++ b/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/lua/config/options.lua b/lua/config/options.lua new file mode 100644 index 0000000..deb3431 --- /dev/null +++ b/lua/config/options.lua @@ -0,0 +1,14 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here + +vim.g.snacks_animate = false +vim.g.autoformat = false + +local opt = vim.opt +opt.relativenumber = true +opt.swapfile = false +opt.shiftwidth = 4 +opt.smartindent = true +opt.shiftround = false +opt.tabstop = 4 diff --git a/lua/configs/conform.lua b/lua/configs/conform.lua deleted file mode 100644 index 5d3d089..0000000 --- a/lua/configs/conform.lua +++ /dev/null @@ -1,15 +0,0 @@ -local options = { - formatters_by_ft = { - lua = { "stylua" }, - -- css = { "prettier" }, - -- html = { "prettier" }, - }, - - -- format_on_save = { - -- -- These options will be passed to conform.format() - -- timeout_ms = 500, - -- lsp_fallback = true, - -- }, -} - -return options diff --git a/lua/configs/lazy.lua b/lua/configs/lazy.lua deleted file mode 100644 index fbb19a9..0000000 --- a/lua/configs/lazy.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/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua deleted file mode 100644 index c51c3d7..0000000 --- a/lua/configs/lspconfig.lua +++ /dev/null @@ -1,39 +0,0 @@ --- load defaults i.e lua_lsp -require("nvchad.configs.lspconfig").defaults() - -local lspconfig = require "lspconfig" - --- EXAMPLE -local servers = { "cssls", "jdtls", "slint_lsp", "pyright", "marksman", "eslint", "tailwindcss", "phpactor", "gopls", "clangd", "arduino_language_server" } -local nvlsp = require "nvchad.configs.lspconfig" - --- lsps with default config -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = nvlsp.on_attach, - on_init = nvlsp.on_init, - capabilities = nvlsp.capabilities, - } -end - --- Html lsp -lspconfig.html.setup { - on_attach = nvlsp.on_attach, - capabilities = nvlsp.capabilities, - init_option = { provideFormatter = true }, - filetypes = { "htmldjango", "html", "javascriptreact", "typescriptreact" }, -} - -lspconfig.emmet_ls.setup { - on_attach = nvlsp.on_attach, - capabilities = nvlsp.capabilities, - init_option = { provideFormatter = true }, - filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" }, -} - --- configuring single server, example: typescript --- lspconfig.tsserver.setup { --- on_attach = nvlsp.on_attach, --- on_init = nvlsp.on_init, --- capabilities = nvlsp.capabilities, --- } diff --git a/lua/mappings.lua b/lua/mappings.lua deleted file mode 100644 index 081b736..0000000 --- a/lua/mappings.lua +++ /dev/null @@ -1,51 +0,0 @@ -require "nvchad.mappings" - --- add yours here - -local map = vim.keymap.set - -map("n", ";", ":", { desc = "CMD enter command mode" }) -map("i", "jk", "") - --- map({ "n", "i", "v" }, "", " w ") - --- Flaoting Terminal -map({ "n", "t" }, "", function() - require("nvchad.term").toggle { pos = "float", id = "floatTerm" } -end, { desc = "terminal toggle floating term" }) - --- cycleling through buffers -map("n", "tk", " bnext ", { desc = "Next Buffer" }) -map("n", "tj", " bprev ", { desc = "Previous Buffer" }) - --- Substitute highlighted word -map("n", "s", [[:%s/\<\>//gI]]) - --- Harpoon keymaps -map("n", "", function() - require("harpoon.ui").nav_file(1) -end, { desc = "Harpoon File 1" }) -map("n", "", function() - require("harpoon.ui").nav_file(2) -end, { desc = "Harpoon File 2" }) -map("n", "", function() - require("harpoon.ui").nav_file(3) -end, { desc = "Harpoon File 3" }) -map("n", "", function() - require("harpoon.ui").nav_file(4) -end, { desc = "Harpoon File 4" }) -map("n", "", function() - require("harpoon.ui").toggle_quick_menu() -end, { desc = "Harpoon Toggle Quick Menu" }) -map("n", "a", function() - require("harpoon.mark").add_file() -end, { desc = "Harpoon Add File" }) -require("harpoon").setup() - --- Compiler.nvim -map("n", "", "CompilerOpen") -map("n", "", "CompilerStop" .. "CompilerRedo") -map("n", "", "CompilerToggleResults") - --- UndotreeToggle -map("n", "u", "UndotreeToggle") diff --git a/lua/options.lua b/lua/options.lua deleted file mode 100644 index 43fa417..0000000 --- a/lua/options.lua +++ /dev/null @@ -1,9 +0,0 @@ -require "nvchad.options" - -local o = vim.o -o.cursorlineopt = "both" -- to enable cursorline! -o.shiftwidth = 4 -o.relativenumber = true -o.colorcolumn = "100" -o.swapfile = false -vim.opt.conceallevel = 1 diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..ebdab3a --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,12 @@ +return { + { + "folke/tokyonight.nvim", + opts = { + transparent = true, + styles = { + sidebars = "transparent", + floats = "transparent", + }, + }, + }, +} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua deleted file mode 100644 index eace73b..0000000 --- a/lua/plugins/init.lua +++ /dev/null @@ -1,95 +0,0 @@ -return { - { - "stevearc/conform.nvim", - -- event = "BufWritePre", -- uncomment for format on save - opts = require "configs.conform", - }, - - { - "neovim/nvim-lspconfig", - config = function() - require "configs.lspconfig" - end, - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "vim", - "lua", - "vimdoc", - "rust", - "python", - "c", - "regex", - "html", - "css", - "javascript", - "markdown", - "markdown_inline", - "tsx", - }, - }, - }, - - { - "vimwiki/vimwiki", - lazy = false, - event = "BufEnter *.md", - ft = "markdown", - keys = { "ww", "wt" }, - init = function() - vim.g.vimwiki_list = { - { - -- Here will be the path for your wiki - path = "~/dox/brain/", - -- The syntax for the wiki - syntax = "markdown", - ext = "md", - }, - } - vim.g.vimwiki_ext2syntax = { - [".md"] = "markdown", -- Correct initialization of the dictionary - } - vim.g.vimwiki_global_ext = 0 - end, - }, - - { - "mbbill/undotree", - cmd = "UndotreeToggle", - }, - - -- Misc - { - "alec-gibson/nvim-tetris", - cmd = { "Tetris" }, - }, - - { - "ThePrimeagen/harpoon", - }, - - { - "Zeioth/compiler.nvim", - cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, - dependencies = { "stevearc/overseer.nvim", "nvim-telescope/telescope.nvim" }, - opts = {}, - }, - - -- Task runner for compiler.nvim - { - "stevearc/overseer.nvim", - commit = "6271cab7ccc4ca840faa93f54440ffae3a3918bd", - cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, - opts = { - task_list = { - direction = "bottom", - min_height = 25, - max_height = 25, - default_detail = 1, - }, - }, - }, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..145182e --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,26 @@ +return { + { + "neovim/nvim-lspconfig", + opts = function(_, opts) + -- Add your desired LSP server here + opts.servers.arduino_language_server = { + cmd = { + "arduino-language-server", + "-clangd", + "/usr/bin/clangd", + "-cli", + "/usr/bin/arduino-cli", + "-cli-config", + "/home/krolyxon/.arduino15/arduino-cli.yaml", + "-fqbn", + "arduino:avr:uno", + }, + } -- Example: Python + + opts.servers.pyright = {} + opts.servers.clangd = {} + + -- local servers = { "cssls", "jdtls", "slint_lsp", "pyright", "marksman", "eslint", "tailwindcss", "phpactor", "gopls", "clangd", "arduino_language_server" } + end, + }, +} diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua new file mode 100644 index 0000000..aa422bf --- /dev/null +++ b/lua/plugins/nvim-tree.lua @@ -0,0 +1,38 @@ +return { + "nvim-tree/nvim-tree.lua", + cmd = { "NvimTreeToggle", "NvimTreeFocus" }, + opts = { + filters = { dotfiles = false }, + disable_netrw = true, + hijack_cursor = true, + sync_root_with_cwd = true, + update_focused_file = { + enable = true, + update_root = false, + }, + view = { + width = 30, + preserve_window_proportions = true, + }, + renderer = { + root_folder_label = false, + highlight_git = true, + indent_markers = { enable = true }, + icons = { + glyphs = { + default = "󰈚", + folder = { + default = "", + empty = "îȘƒ", + empty_open = "", + open = "", + symlink = "î«­", + }, + git = { unmerged = "î«Ÿ" }, + }, + }, + }, + + } +} + diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua deleted file mode 100644 index bef0428..0000000 --- a/lua/plugins/obsidian.lua +++ /dev/null @@ -1,54 +0,0 @@ -return { - "epwalsh/obsidian.nvim", - version = "*", -- recommended, use latest release instead of latest commit - lazy = false, - -- ft = "markdown", - -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: - -- event = { - -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. - -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" - -- -- refer to `:h file-pattern` for more examples - -- "BufReadPre path/to/my-vault/*.md", - -- "BufNewFile path/to/my-vault/*.md", - -- }, - dependencies = { - -- Required. - "nvim-lua/plenary.nvim", - - -- see below for full list of optional dependencies 👇 - }, - opts = { - workspaces = { - { - name = "Brain", - path = "~/dox/brain", - overrides = { - disable_frontmatter = true, - } - }, - { - name = "no-vault", - path = function() - -- alternatively use the CWD: - -- return assert(vim.fn.getcwd()) - return assert(vim.fs.dirname(vim.api.nvim_buf_get_name(0))) - end, - overrides = { - notes_subdir = vim.NIL, -- have to use 'vim.NIL' instead of 'nil' - new_notes_location = "current_dir", - templates = { - folder = vim.NIL, - }, - disable_frontmatter = true, - }, - }, - }, - - templates = { - folder = "99 - Meta/Templates", - date_format = "%Y-%m-%d-%a", - time_format = "%H:%M", - }, - -- see below for full list of options 👇 - }, -} diff --git a/lua/plugins/platformio.lua b/lua/plugins/platformio.lua new file mode 100644 index 0000000..760de07 --- /dev/null +++ b/lua/plugins/platformio.lua @@ -0,0 +1,6 @@ +return { + -- cmd = { "PIO" }, + lazy = false, + "sbatin/platformio.nvim", + dependencies = { "numToStr/FTerm.nvim" }, +} diff --git a/lua/plugins/rustaceanvim.lua b/lua/plugins/rustaceanvim.lua deleted file mode 100644 index 9ce1333..0000000 --- a/lua/plugins/rustaceanvim.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - "mrcjkb/rustaceanvim", - version = "^5", -- Recommended - lazy = false, -- This plugin is already lazy - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - }, - }, - config = function() - vim.g.rustaceanvim = { - tools = { - float_win_config = { - border = "rounded", - }, - }, - } - end, - - - -- Crates version completion for rust - { - "Saecki/crates.nvim", - event = { "BufRead Cargo.toml" }, - config = function() - require("crates").setup() - -- Add crates.nvim to the cmp sources as soon as we load the plugin - require("cmp").setup.buffer { sources = { { name = "crates" } } } - end, - }, -} diff --git a/lua/plugins/vimwiki.lua b/lua/plugins/vimwiki.lua new file mode 100644 index 0000000..a97174b --- /dev/null +++ b/lua/plugins/vimwiki.lua @@ -0,0 +1,22 @@ +return { + "vimwiki/vimwiki", + lazy = false, + event = "BufEnter *.md", + ft = "markdown", + keys = { "ww", "wt" }, + init = function() + vim.g.vimwiki_list = { + { + -- Here will be the path for your wiki + path = "~/dox/brain/", + -- The syntax for the wiki + syntax = "markdown", + ext = "md", + }, + } + vim.g.vimwiki_ext2syntax = { + [".md"] = "markdown", -- Correct initialization of the dictionary + } + vim.g.vimwiki_global_ext = 0 + end, +} diff --git a/stylua.toml b/stylua.toml new file mode 100644 index 0000000..e55efd5 --- /dev/null +++ b/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 4 +column_width = 120