From 39f901a882b3cc158ce1263fa830a630f2773a3b Mon Sep 17 00:00:00 2001 From: Cipher Vance Date: Mon, 17 Nov 2025 08:12:11 -0600 Subject: [PATCH] refactor: redoing nvim config --- bashrc | 4 +- nvim/.neoconf.json | 15 -- nvim/.stylua.toml | 6 + nvim/LICENSE | 217 +++--------------------- nvim/README.md | 11 +- nvim/init.lua | 39 ++++- nvim/lazy-lock.json | 92 ++++------- nvim/lazyvim.json | 10 -- nvim/lua/autocmds.lua | 1 + nvim/lua/chadrc.lua | 24 +++ nvim/lua/config/autocmds.lua | 18 -- nvim/lua/config/keymaps.lua | 162 ------------------ nvim/lua/config/lazy.lua | 64 ------- nvim/lua/config/options.lua | 7 - nvim/lua/configs/conform.lua | 15 ++ nvim/lua/configs/lazy.lua | 47 ++++++ nvim/lua/configs/lspconfig.lua | 6 + nvim/lua/mappings.lua | 10 ++ nvim/lua/options.lua | 6 + nvim/lua/plugins/cmp.lua | 25 --- nvim/lua/plugins/coding.lua | 5 - nvim/lua/plugins/colorscheme.lua | 12 -- nvim/lua/plugins/disabled.lua | 4 - nvim/lua/plugins/editor.lua | 142 ---------------- nvim/lua/plugins/example.lua | 276 ------------------------------- nvim/lua/plugins/gitsigns.lua | 6 - nvim/lua/plugins/init.lua | 28 ++++ nvim/lua/plugins/lsp.lua | 19 --- nvim/lua/plugins/nvim-notify.lua | 8 - nvim/lua/plugins/presence.lua | 10 -- nvim/lua/plugins/refactoring.lua | 11 -- nvim/lua/plugins/treesitter.lua | 34 ---- nvim/lua/plugins/twilight.lua | 8 - nvim/lua/plugins/ui.lua | 85 ---------- nvim/lua/plugins/zen.lua | 8 - nvim/stylua.toml | 3 - vim/vim | 2 +- zsh/zsh | 2 +- 38 files changed, 241 insertions(+), 1201 deletions(-) delete mode 100644 nvim/.neoconf.json create mode 100644 nvim/.stylua.toml delete mode 100644 nvim/lazyvim.json create mode 100644 nvim/lua/autocmds.lua create mode 100644 nvim/lua/chadrc.lua delete mode 100644 nvim/lua/config/autocmds.lua delete mode 100644 nvim/lua/config/keymaps.lua delete mode 100644 nvim/lua/config/lazy.lua delete mode 100644 nvim/lua/config/options.lua create mode 100644 nvim/lua/configs/conform.lua create mode 100644 nvim/lua/configs/lazy.lua create mode 100644 nvim/lua/configs/lspconfig.lua create mode 100644 nvim/lua/mappings.lua create mode 100644 nvim/lua/options.lua delete mode 100644 nvim/lua/plugins/cmp.lua delete mode 100644 nvim/lua/plugins/coding.lua delete mode 100644 nvim/lua/plugins/colorscheme.lua delete mode 100644 nvim/lua/plugins/disabled.lua delete mode 100644 nvim/lua/plugins/editor.lua delete mode 100644 nvim/lua/plugins/example.lua delete mode 100644 nvim/lua/plugins/gitsigns.lua create mode 100644 nvim/lua/plugins/init.lua delete mode 100644 nvim/lua/plugins/lsp.lua delete mode 100644 nvim/lua/plugins/nvim-notify.lua delete mode 100644 nvim/lua/plugins/presence.lua delete mode 100644 nvim/lua/plugins/refactoring.lua delete mode 100644 nvim/lua/plugins/treesitter.lua delete mode 100644 nvim/lua/plugins/twilight.lua delete mode 100644 nvim/lua/plugins/ui.lua delete mode 100644 nvim/lua/plugins/zen.lua delete mode 100644 nvim/stylua.toml diff --git a/bashrc b/bashrc index df9332b..d86562a 100644 --- a/bashrc +++ b/bashrc @@ -70,7 +70,7 @@ esac work() { set +e - local proj="/home/blakeridgway/Drives/500GB/PycharmProjects/time_logix" + local proj="$HOME/Drives/500GB/PycharmProjects/time_logix" cd "$proj" || { echo "No such dir: $proj" >&2; return 1; } # Ensure venv exists @@ -93,3 +93,5 @@ work() { echo "main.py exited with code $code" fi } +# added by 02-dev-tools-setup.sh +export PATH=$PATH:/usr/local/go/bin diff --git a/nvim/.neoconf.json b/nvim/.neoconf.json deleted file mode 100644 index 7c48087..0000000 --- a/nvim/.neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "lua_ls": { - "enabled": true - } - } - } -} diff --git a/nvim/.stylua.toml b/nvim/.stylua.toml new file mode 100644 index 0000000..ecb6dca --- /dev/null +++ b/nvim/.stylua.toml @@ -0,0 +1,6 @@ +column_width = 120 +line_endings = "Unix" +indent_type = "Spaces" +indent_width = 2 +quote_style = "AutoPreferDouble" +call_parentheses = "None" diff --git a/nvim/LICENSE b/nvim/LICENSE index 261eeb9..fdddb29 100644 --- a/nvim/LICENSE +++ b/nvim/LICENSE @@ -1,201 +1,24 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +This is free and unencumbered software released into the public domain. - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. - 1. Definitions. +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. - "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. +For more information, please refer to diff --git a/nvim/README.md b/nvim/README.md index 185280b..769fbdf 100644 --- a/nvim/README.md +++ b/nvim/README.md @@ -1,4 +1,9 @@ -# 💤 LazyVim +**This repo is supposed to be used as config by NvChad users!** -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. +- The main nvchad repo (NvChad/NvChad) is used as a plugin by this repo. +- So you just import its modules , like `require "nvchad.options" , require "nvchad.mappings"` +- So you can delete the .git from this repo ( when you clone it locally ) or fork it :) + +# Credits + +1) Lazyvim starter https://github.com/LazyVim/starter as nvchad's starter was inspired by Lazyvim's . It made a lot of things easier! diff --git a/nvim/init.lua b/nvim/init.lua index 2514f9e..e861b68 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,2 +1,37 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") +vim.g.base46_cache = vim.fn.stdpath "data" .. "/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 "autocmds" + +vim.schedule(function() + require "mappings" +end) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index ccf6a13..0172b60 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,65 +1,29 @@ { - "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" }, - "LuaSnip": { "branch": "master", "commit": "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c" }, - "SchemaStore.nvim": { "branch": "main", "commit": "de7a5763edab2075e1925869af827ca38109ebfa" }, - "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" }, - "catppuccin": { "branch": "main", "commit": "079500a625f3ae5aa6efb758f1a17fe4c7a57e52" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "8b407bb6175846cdc4c499e2a8d28109615a2089" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, - "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "inc-rename.nvim": { "branch": "main", "commit": "a48c7cec5c4f00d7438dce5fadb55f4d715ef9f2" }, - "incline.nvim": { "branch": "main", "commit": "fdd7e08a6e3d0dd8d9aa02428861fa30c37ba306" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "mini.ai": { "branch": "main", "commit": "c28f7d7348f27425a180b1b7dcaa77651f8b71ee" }, - "mini.animate": { "branch": "main", "commit": "507c43c4402c7d7a2101bc72bece6e2202152afa" }, - "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" }, - "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, - "mini.hipatterns": { "branch": "main", "commit": "af0306665ee2d5c5fbf8e07e82237fc01ec3baa3" }, - "mini.indentscope": { "branch": "main", "commit": "dc26fa1a6c8976f42930c9f53da88d3d441bb13f" }, - "mini.pairs": { "branch": "main", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, - "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, - "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, - "neodev.nvim": { "branch": "main", "commit": "40b608b31f3da728e298051c4bf579d8e8a84294" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lint": { "branch": "master", "commit": "5b42e12f397e9fd2629e6f0ce1c780a12b9e6597" }, - "nvim-lspconfig": { "branch": "master", "commit": "84f2dd42efffa20d505ac44c78568d778ca7e0a1" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" }, - "nvim-treesitter": { "branch": "master", "commit": "000f71842bf08840df1e70004b17507fa92b2fb7" }, - "nvim-treesitter-context": { "branch": "master", "commit": "cfa8ee19ac9bae9b7fb2958eabe2b45b70c56ccb" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, - "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, - "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "83b7026ac7a4e185d4ecbe99926fd94b5735e2ea" }, - "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "8e0543365fe5781c9babea7db89ef06bcff3716d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, - "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, - "vscode.nvim": { "branch": "main", "commit": "cd081089f4a2ceddade73d0415e1809ded510191" }, - "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" } -} \ No newline at end of file + "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" }, + "NvChad": { "branch": "v2.5", "commit": "eb209a4a82aecabe609d8206b865e00a760fb644" }, + "base46": { "branch": "v3.0", "commit": "45b336ec52615dd1a3aa47848d894616dd6293a5" }, + "cmp-async-path": { "branch": "main", "commit": "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "178b8f0d70ee63db616a8b3bda637218eef121dd" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, + "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, + "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, + "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-lspconfig": { "branch": "master", "commit": "dc7e7c7699cc01b1b6fefa97f9b496d8f447d7a1" }, + "nvim-tree.lua": { "branch": "master", "commit": "1eda2569394f866360e61f590f1796877388cb8a" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" }, + "ui": { "branch": "v3.0", "commit": "bea2af0a76c1098fac0988ad296aa028cad2a333" }, + "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json deleted file mode 100644 index 4d7ba66..0000000 --- a/nvim/lazyvim.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extras": [ - - ], - "news": { - "NEWS.md": "2123", - "doc/news.txt": "17421" - }, - "version": 2 -} \ No newline at end of file diff --git a/nvim/lua/autocmds.lua b/nvim/lua/autocmds.lua new file mode 100644 index 0000000..d2db0bb --- /dev/null +++ b/nvim/lua/autocmds.lua @@ -0,0 +1 @@ +require "nvchad.autocmds" diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua new file mode 100644 index 0000000..9eca87c --- /dev/null +++ b/nvim/lua/chadrc.lua @@ -0,0 +1,24 @@ +-- This file needs to have same structure as nvconfig.lua +-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua +-- Please read that file to know all available options :( + +---@type ChadrcConfig +local M = {} + +M.base46 = { + theme = "onedark", + + -- hl_override = { + -- Comment = { italic = true }, + -- ["@comment"] = { italic = true }, + -- }, +} + +-- M.nvdash = { load_on_startup = true } +-- M.ui = { +-- tabufline = { +-- lazyload = false +-- } +-- } + +return M diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua deleted file mode 100644 index e088449..0000000 --- a/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,18 +0,0 @@ --- 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 - --- turn off paste mode when leaving insert -vim.api.nvim_create_autocmd("InsertLeave", { - pattern = "*", - command = "set nopaste", -}) - --- fix conceallevel for json files -vim.api.nvim_create_autocmd("FileType", { - pattern = { "json", "jsonc" }, - callback = function() - vim.wo.spell = false - vim.wo.conceallevel = 0 - end, -}) diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua deleted file mode 100644 index fd558a9..0000000 --- a/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,162 +0,0 @@ --- 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 discipline = require("jeremydwayne.discipline") --- discipline.cowboy() - -local keymap = vim.keymap -local opts = { noremap = true, silent = true } - --- Increment/Decrement -keymap.set("n", "+", "", "ggG") - --- jumplist -keymap.set("n", "", "", opts) - --- New Tab -keymap.set("n", "te", ":tabedit", opts) --- keymap.set("n", "", ":tabnext", opts) --- keymap.set("n", "", ":tabprev", opts) --- keymap.set("n", "bd", ":bd", opts) - --- Split window -keymap.set("n", "ss", ":split", opts) -keymap.set("n", "sv", ":vsplit", opts) - --- Move window -keymap.set("n", "sh", "h") -keymap.set("n", "sk", "k") -keymap.set("n", "sj", "j") -keymap.set("n", "sl", "l") - --- Resize window -keymap.set("n", "", "<") -keymap.set("n", "", ">") -keymap.set("n", "", "+") -keymap.set("n", "", "-") - --- Diagnostics -keymap.set("n", "", function() - vim.diagnostic.goto_next() -end, opts) -keymap.set("n", "", function() - vim.diagnostic.goto_prev() -end, opts) - -keymap.set("n", ":W", vim.cmd.w) -keymap.set("n", ":Wq", vim.cmd.wq) -keymap.set("n", ":Q", vim.cmd.q) -keymap.set("n", "so", vim.cmd.so) -keymap.set("n", "pv", vim.cmd.Ex) - -keymap.set("n", "bd", "bd!") - --- option key movement on macos -keymap.set("n", "∆", ":m .+1==") -keymap.set("n", "˚", ":m .-2==") -keymap.set("i", "∆", ":m .+1==gi") -keymap.set("i", "˚", ":m .-2==gi") -keymap.set("v", "∆", ":m '>+1gv=gv") -keymap.set("v", "˚", ":m '<-2gv=gv") --- alt key movement -keymap.set("n", "", ":m .+1==") -keymap.set("n", "", ":m .-2==") -keymap.set("i", "", ":m .+1==gi") -keymap.set("i", "", ":m .-2==gi") -keymap.set("v", "", ":m '>+1gv=gv") -keymap.set("v", "", ":m '<-2gv=gv") - -keymap.set("n", "J", "mzJ`z") -keymap.set("n", "", "zz") -keymap.set("n", "", "zz") -keymap.set("n", "n", "nzzzv") -keymap.set("n", "N", "Nzzzv") - --- system yank and paste -keymap.set("x", "p", '"_dP') -keymap.set("n", "y", '"+y') -keymap.set("v", "y", '"+y') -keymap.set("n", "Y", '"+Y') - -keymap.set("n", "d", '"_d') -keymap.set("v", "d", '"_d') - --- escape vertical edit mode gracefully -keymap.set("i", "", "") - -keymap.set("n", "Q", "") - --- search for word cursor is on -keymap.set("n", "s", ":%s/\\<\\>//gI") - --- make current file executable (shell scripts) -keymap.set("n", "x", "!chmod +x %", { silent = true }) - --- bufferline tabs -keymap.set("n", "", "BufferLineCycleNext") -keymap.set("n", "", "BufferLineCyclePrev") -keymap.set("n", "bn", "BufferLineMoveNext") -keymap.set("n", "bp", "BufferLineMovePrev") - -keymap.set("n", "u", vim.cmd.UndotreeToggle) - -keymap.set("n", "", "Neotree toggle reveal") - --- nvim dap -keymap.set("n", "db", " DapToggleBreakpoint ") -keymap.set("n", "dus", function() - local widgets = require("dap.ui.widgets") - local sidebar = widgets.sidebar(widgets.scopes) - sidebar.open() -end) --- dap-go -keymap.set("n", "dgt", function() - require("dap-go").debug_test() -end) -keymap.set("n", "dgl", function() - require("dap-go").debug_last() -end) - --- gopher -keymap.set("n", "gsj", " GoTagAdd json") -keymap.set("n", "ger", " GoIfErr") -keymap.set("n", "gtg", " GoTestsAll") - -keymap.set("n", "rn", ":IncRename ") - --- Refactoring -keymap.set("x", "re", function() - require("refactoring").refactor("Extract Function") -end) -keymap.set("x", "rf", function() - require("refactoring").refactor("Extract Function To File") -end) --- Extract function supports only visual mode -keymap.set("x", "rv", function() - require("refactoring").refactor("Extract Variable") -end) --- Extract variable supports only visual mode -keymap.set("n", "rI", function() - require("refactoring").refactor("Inline Function") -end) --- Inline func supports only normal -keymap.set({ "n", "x" }, "ri", function() - require("refactoring").refactor("Inline Variable") -end) --- Inline var supports both normal and visual mode - -keymap.set("n", "rb", function() - require("refactoring").refactor("Extract Block") -end) -keymap.set("n", "rbf", function() - require("refactoring").refactor("Extract Block To File") -end) --- Extract block supports only normal mode diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua deleted file mode 100644 index caba52d..0000000 --- a/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,64 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) -end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { - "LazyVim/LazyVim", - import = "lazyvim.plugins", - opts = { - colorscheme = "vscode", - news = { - lazyvim = true, - neovim = true, - }, - }, - }, - -- import any extras modules here - { import = "lazyvim.plugins.extras.linting.eslint" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.tailwind" }, - { import = "lazyvim.plugins.extras.lang.go" }, - { import = "lazyvim.plugins.extras.lang.ruby" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.coding.copilot" }, - { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- 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 }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - "netrwPlugin", - "rplugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua deleted file mode 100644 index 91d6739..0000000 --- a/nvim/lua/config/options.lua +++ /dev/null @@ -1,7 +0,0 @@ --- 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 - --- Undercurl -vim.cmd([[let &t_Cs = "\e[4:3m"]]) -vim.cmd([[let &t_Ce = "\e[4:0m"]]) diff --git a/nvim/lua/configs/conform.lua b/nvim/lua/configs/conform.lua new file mode 100644 index 0000000..35ba6cf --- /dev/null +++ b/nvim/lua/configs/conform.lua @@ -0,0 +1,15 @@ +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/nvim/lua/configs/lazy.lua b/nvim/lua/configs/lazy.lua new file mode 100644 index 0000000..cd170bd --- /dev/null +++ b/nvim/lua/configs/lazy.lua @@ -0,0 +1,47 @@ +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/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua new file mode 100644 index 0000000..20a0cce --- /dev/null +++ b/nvim/lua/configs/lspconfig.lua @@ -0,0 +1,6 @@ +require("nvchad.configs.lspconfig").defaults() + +local servers = { "html", "cssls" } +vim.lsp.enable(servers) + +-- read :h vim.lsp.config for changing options of lsp servers diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua new file mode 100644 index 0000000..783b78f --- /dev/null +++ b/nvim/lua/mappings.lua @@ -0,0 +1,10 @@ +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 ") diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua new file mode 100644 index 0000000..738f20b --- /dev/null +++ b/nvim/lua/options.lua @@ -0,0 +1,6 @@ +require "nvchad.options" + +-- add yours here! + +-- local o = vim.o +-- o.cursorlineopt ='both' -- to enable cursorline! diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua deleted file mode 100644 index f9a9763..0000000 --- a/nvim/lua/plugins/cmp.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - event = { "InsertEnter", "CmdlineEnter" }, - opts = function(_, opts) - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }), - [""] = cmp.mapping({ - i = function(fallback) - if cmp.visible() and cmp.get_active_entry() then - cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) - else - fallback() - end - end, - s = cmp.mapping.confirm({ select = true }), - c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }), - }) - end, -} diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua deleted file mode 100644 index cf13fc2..0000000 --- a/nvim/lua/plugins/coding.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "smjonas/inc-rename.nvim", - cmd = "IncRename", - config = true, -} diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index 4f84c51..0000000 --- a/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "Mofiqul/vscode.nvim", - lazy = true, - priority = 1000, - opts = function() - return { - transparent = true, - } - end, - }, -} diff --git a/nvim/lua/plugins/disabled.lua b/nvim/lua/plugins/disabled.lua deleted file mode 100644 index a370442..0000000 --- a/nvim/lua/plugins/disabled.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - { "folke/flash.nvim", enabled = false }, - { "folke/which-key.nvim", enabled = false }, -} diff --git a/nvim/lua/plugins/editor.lua b/nvim/lua/plugins/editor.lua deleted file mode 100644 index 3740213..0000000 --- a/nvim/lua/plugins/editor.lua +++ /dev/null @@ -1,142 +0,0 @@ -return { - "telescope.nvim", - dependencies = { "nvim-telescope/telescope-file-browser.nvim" }, - keys = { - { - "fP", - function() - require("telescope.builtin").find_files({ - cwd = require("lazy.core.config").options.root, - }) - end, - desc = "Find Plugin File", - }, - { - ";f", - function() - local builtin = require("telescope.builtin") - builtin.find_files({ - no_ignore = false, - hidden = true, - }) - end, - }, - { - ";r", - function() - local builtin = require("telescope.builtin") - builtin.live_grep() - end, - }, - { - "\\\\", - function() - local builtin = require("telescope.builtin") - builtin.buffers() - end, - }, - { - ";t", - function() - local builtin = require("telescope.builtin") - builtin.help_tags() - end, - }, - { - ";;", - function() - local builtin = require("telescope.builtin") - builtin.resume() - end, - }, - { - ";e", - function() - local builtin = require("telescope.builtin") - builtin.diagnostics() - end, - }, - { - ";s", - function() - local builtin = require("telescope.builtin") - builtin.treesitter() - end, - }, - { - "fb", - function() - local telescope = require("telescope") - local function telescope_buffer_dir() - return vim.fn.expand("%:p:h") - end - telescope.extensions.file_browser.file_browser({ - path = "%:p:h", - cwd = telescope_buffer_dir(), - respect_gitignore = false, - hidden = true, - grouped = true, - previewer = false, - initial_mode = "normal", - layout_config = { height = 40 }, - }) - end, - }, - }, - config = function(_, opts) - local telescope = require("telescope") - local actions = require("telescope.actions") - local fb_actions = require("telescope").extensions.file_browser.actions - - opts.defaults = vim.tbl_deep_extend("force", opts.defaults, { - wrap_results = true, - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - mappings = { - n = {}, - }, - }) - - opts.pickers = { - diagnostics = { - theme = "ivy", - initial_mode = "normal", - layout_config = { preview_cutoff = 9999 }, - }, - } - - opts.extensions = { - file_browser = { - theme = "dropdown", - hijack_netrw = true, - mappings = { - ["n"] = { - -- custom normal mode mappings - ["a"] = fb_actions.create, - ["h"] = fb_actions.goto_parent_dir, - ["/"] = function() - vim.cmd("startinsert") - end, - [""] = function(prompt_bufnr) - for i = 1, 10 do - actions.move_selection_previous(prompt_bufnr) - end - end, - [""] = function(prompt_bufnr) - for i = 1, 10 do - actions.move_selection_next(prompt_bufnr) - end - end, - [""] = actions.preview_scrolling_up, - [""] = actions.preview_scrolling_down, - }, - }, - }, - } - telescope.setup(opts) - require("telescope").load_extension("fzf") - require("telescope").load_extension("file_browser") - end, -} diff --git a/nvim/lua/plugins/example.lua b/nvim/lua/plugins/example.lua deleted file mode 100644 index fc59d72..0000000 --- a/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,276 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - config = true, - }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - table.insert(opts.sources, { name = "emoji" }) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, - - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping({ - i = function(fallback) - if cmp.visible() and cmp.get_active_entry() then - cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) - else - fallback() - end - end, - s = cmp.mapping.confirm({ select = true }), - c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }), - }) - end, - }, -} diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua deleted file mode 100644 index 5f6e316..0000000 --- a/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "lewis6991/gitsigns.nvim", - opts = { - _extmark_signs = false, - }, -} diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua new file mode 100644 index 0000000..d028655 --- /dev/null +++ b/nvim/lua/plugins/init.lua @@ -0,0 +1,28 @@ +return { + { + "stevearc/conform.nvim", + -- event = 'BufWritePre', -- uncomment for format on save + opts = require "configs.conform", + }, + + -- These are some examples, uncomment them if you want to see them work! + { + "neovim/nvim-lspconfig", + config = function() + require "configs.lspconfig" + end, + }, + + -- test new blink + -- { import = "nvchad.blink.lazyspec" }, + + -- { + -- "nvim-treesitter/nvim-treesitter", + -- opts = { + -- ensure_installed = { + -- "vim", "lua", "vimdoc", + -- "html", "css" + -- }, + -- }, + -- }, +} diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua deleted file mode 100644 index 790402e..0000000 --- a/nvim/lua/plugins/lsp.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "williamboman/mason.nvim", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "stylua", - "selene", - "luacheck", - "shellcheck", - "shfmt", - "tailwindcss-language-server", - "typescript-language-server", - "css-lsp", - "solargraph", - "gopls", - }) - end, - }, -} diff --git a/nvim/lua/plugins/nvim-notify.lua b/nvim/lua/plugins/nvim-notify.lua deleted file mode 100644 index 3acfb27..0000000 --- a/nvim/lua/plugins/nvim-notify.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "rcarriga/nvim-notify", - config = function(_, opts) - require("notify").setup(vim.tbl_extend("keep", { - background_colour = "#000000", - }, opts)) - end, -} diff --git a/nvim/lua/plugins/presence.lua b/nvim/lua/plugins/presence.lua deleted file mode 100644 index bbe0bcd..0000000 --- a/nvim/lua/plugins/presence.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "andweeb/presence.nvim", - lazy = false, - enabled = true, - opts = { - buttons = false, - blacklist = {}, - }, - config = true, -} diff --git a/nvim/lua/plugins/refactoring.lua b/nvim/lua/plugins/refactoring.lua deleted file mode 100644 index 307a944..0000000 --- a/nvim/lua/plugins/refactoring.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "ThePrimeagen/refactoring.nvim", - lazy_load = true, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - config = function() - require("refactoring").setup() - end, -} diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 2d16ff6..0000000 --- a/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,34 +0,0 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "astro", - "cmake", - "cpp", - "css", - "fish", - "gitignore", - "go", - "graphql", - "http", - "java", - "php", - "rust", - "scss", - "sql", - "svelte", - }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - - vim.filetype.add({ - extension = { - mdx = "markdown", - }, - }) - vim.treesitter.language.register("markdown", "mdx") - end, - }, -} diff --git a/nvim/lua/plugins/twilight.lua b/nvim/lua/plugins/twilight.lua deleted file mode 100644 index cceecb7..0000000 --- a/nvim/lua/plugins/twilight.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "folke/twilight.nvim", - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, -} diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua deleted file mode 100644 index 77b59e2..0000000 --- a/nvim/lua/plugins/ui.lua +++ /dev/null @@ -1,85 +0,0 @@ -return { - { - "folke/noice.nvim", - opts = function(_, opts) - table.insert(opts.routes, { - filter = { - event = "notify", - find = "No information available", - }, - skip = true, - }) - opts.presets.lsp_doc_border = true - end, - }, - -- animations - { - "echasnovski/mini.animate", - event = "VeryLazy", - opts = function(_, opts) - opts.scroll = { - enable = false, - } - end, - }, - - -- statusline - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = { - options = { - -- globalstatus = false, - theme = "vscode", - }, - }, - }, - - -- filename - { - "b0o/incline.nvim", - dependencies = { "craftzdog/solarized-osaka.nvim" }, - event = "BufReadPre", - priority = 1200, - config = function() - local colors = require("solarized-osaka.colors").setup() - require("incline").setup({ - highlight = { - groups = { - InclineNormal = { guibg = colors.violet700, guifg = colors.base04 }, - InclineNormalNC = { guifg = colors.violet500, guibg = colors.base03 }, - }, - }, - window = { margin = { vertical = 0, horizontal = 1 } }, - hide = { - cursorline = true, - }, - render = function(props) - local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t") - if vim.bo[props.buf].modified then - filename = "[+] " .. filename - end - - local icon, color = require("nvim-web-devicons").get_icon_color(filename) - return { { icon, guifg = color }, { " " }, { filename } } - end, - }) - end, - }, - { - "nvimdev/dashboard-nvim", - event = "VimEnter", - opts = function(_, opts) - local logo = [[ -██████╗ ██╗ █████╗ ██╗ ██╗███████╗ ██████╗ ██╗██████╗ ██████╗ ██╗ ██╗ █████╗ ██╗ ██╗ -██╔══██╗██║ ██╔══██╗██║ ██╔╝██╔════╝ ██╔══██╗██║██╔══██╗██╔════╝ ██║ ██║██╔══██╗╚██╗ ██╔╝ -██████╔╝██║ ███████║█████╔╝ █████╗ ██████╔╝██║██║ ██║██║ ███╗██║ █╗ ██║███████║ ╚████╔╝ -██╔══██╗██║ ██╔══██║██╔═██╗ ██╔══╝ ██╔══██╗██║██║ ██║██║ ██║██║███╗██║██╔══██║ ╚██╔╝ -██████╔╝███████╗██║ ██║██║ ██╗███████╗ ██║ ██║██║██████╔╝╚██████╔╝╚███╔███╔╝██║ ██║ ██║ -╚═════╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═╝╚═╝╚═════╝ ╚═════╝ ╚══╝╚══╝ ╚═╝ ╚═╝ ╚═╝ -]] - logo = string.rep("\n", 8) .. logo .. "\n\n" - opts.config.header = vim.split(logo, "\n") - end, - }, -} diff --git a/nvim/lua/plugins/zen.lua b/nvim/lua/plugins/zen.lua deleted file mode 100644 index 42c50b6..0000000 --- a/nvim/lua/plugins/zen.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "folke/zen-mode.nvim", - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, -} diff --git a/nvim/stylua.toml b/nvim/stylua.toml deleted file mode 100644 index 5d6c50d..0000000 --- a/nvim/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 -column_width = 120 \ No newline at end of file diff --git a/vim/vim b/vim/vim index 0f04079..fc60500 120000 --- a/vim/vim +++ b/vim/vim @@ -1 +1 @@ -/home/cipher/dotfiles/vim \ No newline at end of file +/home/bridgway/dotfiles/vim \ No newline at end of file diff --git a/zsh/zsh b/zsh/zsh index 1a0240f..d67b096 120000 --- a/zsh/zsh +++ b/zsh/zsh @@ -1 +1 @@ -/home/cipher/dotfiles/zsh \ No newline at end of file +/home/bridgway/dotfiles/zsh \ No newline at end of file