From ba87d2cd75cd7e1d9bcdc44a5e45930cd7d69d56 Mon Sep 17 00:00:00 2001 From: Anthony Oteri Date: Fri, 26 Jan 2024 16:53:00 -0500 Subject: [PATCH] Change to use lazyvim --- .config/nvim/.gitignore | 8 + .config/nvim/.neoconf.json | 15 + .config/nvim/LICENSE | 201 +++++++++++++ .config/nvim/README.md | 4 + .config/nvim/init.lua | 2 + .config/nvim/init.vim | 157 ----------- .config/nvim/lazy-lock.json | 53 ++++ .config/nvim/lazyvim.json | 9 + .config/nvim/lua/config/autocmds.lua | 3 + .config/nvim/lua/config/keymaps.lua | 3 + .config/nvim/lua/config/lazy.lua | 46 +++ .config/nvim/lua/config/options.lua | 3 + .config/nvim/lua/plugins/example.lua | 265 ++++++++++++++++++ .config/nvim/plugins/airline.vim | 15 - .config/nvim/plugins/arduino.vim | 5 - .config/nvim/plugins/catppuccin.vim | 2 - .config/nvim/plugins/coc-settings.json | 33 --- .config/nvim/plugins/coc.vim | 135 --------- .config/nvim/plugins/commentary.vim | 1 - .../nvim/plugins/context-commentstring.vim | 1 - .config/nvim/plugins/dispatch.vim | 1 - .config/nvim/plugins/dracula.vim | 9 - .config/nvim/plugins/editorconfig.vim | 3 - .config/nvim/plugins/eunuch.vim | 1 - .config/nvim/plugins/exchange.vim | 1 - .config/nvim/plugins/firenvim.vim | 24 -- .config/nvim/plugins/floaterm.vim | 18 -- .config/nvim/plugins/fugitive.vim | 1 - .config/nvim/plugins/fzf.vim | 22 -- .config/nvim/plugins/gruvbox.vim | 19 -- .config/nvim/plugins/heritage.vim | 1 - .config/nvim/plugins/lastplace.vim | 1 - .config/nvim/plugins/lion.vim | 3 - .config/nvim/plugins/markdown-preview.vim | 1 - .config/nvim/plugins/nerdtree.vim | 23 -- .config/nvim/plugins/pasta.vim | 3 - .config/nvim/plugins/peekaboo.vim | 1 - .config/nvim/plugins/phpactor.vim | 6 - .config/nvim/plugins/polyglot.vim | 6 - .config/nvim/plugins/projectionist.vim | 42 --- .config/nvim/plugins/quickscope.vim | 4 - .config/nvim/plugins/repeat.vim | 1 - .config/nvim/plugins/rooter.vim | 1 - .config/nvim/plugins/sayonara.vim | 3 - .config/nvim/plugins/sensible.vim | 4 - .config/nvim/plugins/smooth-scroll.vim | 6 - .config/nvim/plugins/splitjoin.vim | 3 - .config/nvim/plugins/surround.vim | 1 - .config/nvim/plugins/targets.vim | 1 - .config/nvim/plugins/textobj-xmlattr.vim | 1 - .config/nvim/plugins/tmux-navigator.vim | 1 - .config/nvim/plugins/unimpaired.vim | 1 - .config/nvim/plugins/vim-test.vim | 15 - .config/nvim/plugins/visual-multi.vim | 1 - .config/nvim/plugins/visual-star-search.vim | 1 - .config/nvim/plugins/which-key.vim | 12 - .config/nvim/stylua.toml | 3 + .config/tmux/tmux.conf | 2 +- 58 files changed, 616 insertions(+), 592 deletions(-) create mode 100644 .config/nvim/.gitignore create mode 100644 .config/nvim/.neoconf.json create mode 100644 .config/nvim/LICENSE create mode 100644 .config/nvim/README.md create mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/init.vim create mode 100644 .config/nvim/lazy-lock.json create mode 100644 .config/nvim/lazyvim.json create mode 100644 .config/nvim/lua/config/autocmds.lua create mode 100644 .config/nvim/lua/config/keymaps.lua create mode 100644 .config/nvim/lua/config/lazy.lua create mode 100644 .config/nvim/lua/config/options.lua create mode 100644 .config/nvim/lua/plugins/example.lua delete mode 100644 .config/nvim/plugins/airline.vim delete mode 100644 .config/nvim/plugins/arduino.vim delete mode 100644 .config/nvim/plugins/catppuccin.vim delete mode 100644 .config/nvim/plugins/coc-settings.json delete mode 100644 .config/nvim/plugins/coc.vim delete mode 100644 .config/nvim/plugins/commentary.vim delete mode 100644 .config/nvim/plugins/context-commentstring.vim delete mode 100644 .config/nvim/plugins/dispatch.vim delete mode 100644 .config/nvim/plugins/dracula.vim delete mode 100644 .config/nvim/plugins/editorconfig.vim delete mode 100644 .config/nvim/plugins/eunuch.vim delete mode 100644 .config/nvim/plugins/exchange.vim delete mode 100644 .config/nvim/plugins/firenvim.vim delete mode 100644 .config/nvim/plugins/floaterm.vim delete mode 100644 .config/nvim/plugins/fugitive.vim delete mode 100644 .config/nvim/plugins/fzf.vim delete mode 100644 .config/nvim/plugins/gruvbox.vim delete mode 100644 .config/nvim/plugins/heritage.vim delete mode 100644 .config/nvim/plugins/lastplace.vim delete mode 100644 .config/nvim/plugins/lion.vim delete mode 100644 .config/nvim/plugins/markdown-preview.vim delete mode 100644 .config/nvim/plugins/nerdtree.vim delete mode 100644 .config/nvim/plugins/pasta.vim delete mode 100644 .config/nvim/plugins/peekaboo.vim delete mode 100644 .config/nvim/plugins/phpactor.vim delete mode 100644 .config/nvim/plugins/polyglot.vim delete mode 100644 .config/nvim/plugins/projectionist.vim delete mode 100644 .config/nvim/plugins/quickscope.vim delete mode 100644 .config/nvim/plugins/repeat.vim delete mode 100644 .config/nvim/plugins/rooter.vim delete mode 100644 .config/nvim/plugins/sayonara.vim delete mode 100644 .config/nvim/plugins/sensible.vim delete mode 100644 .config/nvim/plugins/smooth-scroll.vim delete mode 100644 .config/nvim/plugins/splitjoin.vim delete mode 100644 .config/nvim/plugins/surround.vim delete mode 100644 .config/nvim/plugins/targets.vim delete mode 100644 .config/nvim/plugins/textobj-xmlattr.vim delete mode 100644 .config/nvim/plugins/tmux-navigator.vim delete mode 100644 .config/nvim/plugins/unimpaired.vim delete mode 100644 .config/nvim/plugins/vim-test.vim delete mode 100644 .config/nvim/plugins/visual-multi.vim delete mode 100644 .config/nvim/plugins/visual-star-search.vim delete mode 100644 .config/nvim/plugins/which-key.vim create mode 100644 .config/nvim/stylua.toml diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/.config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/.config/nvim/.neoconf.json b/.config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/.config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/.config/nvim/LICENSE b/.config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/.config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/.config/nvim/README.md b/.config/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/.config/nvim/README.md @@ -0,0 +1,4 @@ +# ๐Ÿ’ค LazyVim + +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/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index 7bf6ac5..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,157 +0,0 @@ -"-------------------------------------------------------------------------- -" General settings -"-------------------------------------------------------------------------- - -set expandtab -set shiftwidth=4 -set tabstop=4 -set hidden -set signcolumn=yes:2 -set relativenumber -set number -set termguicolors -set undofile -set spell -set title -set ignorecase -set smartcase -set wildmode=longest:full,full -set nowrap -set list -set mouse=a -set scrolloff=8 -set sidescrolloff=8 -set nojoinspaces -set splitright -set clipboard=unnamedplus -set confirm -set exrc -set backup -set backupdir=~/.local/share/nvim/backup// -set updatetime=300 " Reduce time for highlighting other references -set redrawtime=10000 " Allow more time for loading syntax on large files -set cc=80 -set cursorline - -"-------------------------------------------------------------------------- -" Key maps -"-------------------------------------------------------------------------- - -let mapleader = "\" - -nmap ve :edit ~/.config/nvim/init.vim -nmap vc :edit ~/.config/nvim/coc-settings.json -nmap vr :source ~/.config/nvim/init.vim - -nmap k :nohlsearch -nmap Q :bufdo bdelete - -" Allow gf to open non-existent files -map gf :edit - -" Reselect visual selection after indenting -vnoremap < >gv - -" Maintain the cursor position when yanking a visual selection -" http://ddrscott.github.io/blog/2016/yank-without-jank/ -vnoremap y myy`y -vnoremap Y myY`y - -" When text is wrapped, move by terminal rows, not lines, unless a count is provided -noremap j (v:count == 0 ? 'gj' : 'j') -noremap k (v:count == 0 ? 'gk' : 'k') - -" Paste replace visual selection without copying it -vnoremap p "_dP - -" Make Y behave like the other capitals -nnoremap Y y$ - -" Keep it centered -nnoremap n nzzzv -nnoremap N Nzzzv -nnoremap J mzJ`z - -" Open the current file in the default program -nmap x :!xdg-open % - -" Quicky escape to normal mode -imap jj - -" Easy insertion of a trailing ; or , from insert mode -imap ;; A; -imap ,, A, - -cmap w!! %!sudo tee > /dev/null % - -"-------------------------------------------------------------------------- -" Plugins -"-------------------------------------------------------------------------- - -" Automatically install vim-plug -let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim' -if empty(glob(data_dir . '/autoload/plug.vim')) - silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' - autocmd VimEnter * PlugInstall --sync | source $MYVIMRC -endif - -call plug#begin(data_dir . '/plugins') - -source ~/.config/nvim/plugins/airline.vim -" source ~/.config/nvim/plugins/arduino.vim -" source ~/.config/nvim/plugins/coc.vim -source ~/.config/nvim/plugins/catppuccin.vim -source ~/.config/nvim/plugins/commentary.vim -source ~/.config/nvim/plugins/context-commentstring.vim -source ~/.config/nvim/plugins/dispatch.vim -" source ~/.config/nvim/plugins/gruvbox.vim -source ~/.config/nvim/plugins/editorconfig.vim -source ~/.config/nvim/plugins/eunuch.vim -source ~/.config/nvim/plugins/exchange.vim -source ~/.config/nvim/plugins/firenvim.vim -source ~/.config/nvim/plugins/floaterm.vim -source ~/.config/nvim/plugins/fugitive.vim -source ~/.config/nvim/plugins/fzf.vim -source ~/.config/nvim/plugins/heritage.vim -source ~/.config/nvim/plugins/lastplace.vim -source ~/.config/nvim/plugins/lion.vim -source ~/.config/nvim/plugins/markdown-preview.vim -source ~/.config/nvim/plugins/nerdtree.vim -source ~/.config/nvim/plugins/pasta.vim -source ~/.config/nvim/plugins/peekaboo.vim -source ~/.config/nvim/plugins/phpactor.vim -source ~/.config/nvim/plugins/polyglot.vim -source ~/.config/nvim/plugins/projectionist.vim -source ~/.config/nvim/plugins/quickscope.vim -source ~/.config/nvim/plugins/repeat.vim -source ~/.config/nvim/plugins/rooter.vim -source ~/.config/nvim/plugins/sayonara.vim -source ~/.config/nvim/plugins/sensible.vim -source ~/.config/nvim/plugins/smooth-scroll.vim -source ~/.config/nvim/plugins/splitjoin.vim -source ~/.config/nvim/plugins/surround.vim -source ~/.config/nvim/plugins/targets.vim -source ~/.config/nvim/plugins/textobj-xmlattr.vim -source ~/.config/nvim/plugins/tmux-navigator.vim -source ~/.config/nvim/plugins/unimpaired.vim -source ~/.config/nvim/plugins/vim-test.vim -source ~/.config/nvim/plugins/visual-multi.vim -source ~/.config/nvim/plugins/visual-star-search.vim -source ~/.config/nvim/plugins/which-key.vim - -call plug#end() -doautocmd User PlugLoaded - -colorscheme catppuccin - -"-------------------------------------------------------------------------- -" Miscellaneous -"-------------------------------------------------------------------------- - -augroup FileTypeOverrides - autocmd! - " Use '//' instead of '/* */' comments - autocmd FileType php setlocal commentstring=//%s - autocmd TermOpen * setlocal nospell -augroup END diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..73f9460 --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,53 @@ +{ + "LazyVim": { "branch": "main", "commit": "a50f92f7550fb6e9f21c0852e6cb190e6fcd50f5" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "catppuccin": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" }, + "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": "d99b75b4aedf0e912f41c5740a7267de739cddac" }, + "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, + "dressing.nvim": { "branch": "master", "commit": "0e88293ce3459f4bb310125f3366304af6dc7990" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, + "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "fb9fd5312476b51a42a98122616e1c448d823d5c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, + "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, + "mini.ai": { "branch": "main", "commit": "13a9074677e725e9ed230f860126db624b690dfc" }, + "mini.bufremove": { "branch": "main", "commit": "020243bfed8c8b941f2c20626faf3ea39c0c0e1b" }, + "mini.comment": { "branch": "main", "commit": "67f00d3ebbeae15e84584d971d0c32aad4f4f3a4" }, + "mini.indentscope": { "branch": "main", "commit": "5a8369475cd7cd6f207a4d288406d03b0fc48bdb" }, + "mini.pairs": { "branch": "main", "commit": "552062017ff207e1f35f7028bfb3f27c7421d22d" }, + "mini.surround": { "branch": "main", "commit": "3c98c6be8028139a114081e06d2a9f1ac3f4b7fc" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" }, + "neoconf.nvim": { "branch": "main", "commit": "bf04719b3b25ba5f6a059c0a10ee67e5996bdc4c" }, + "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" }, + "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lint": { "branch": "master", "commit": "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744" }, + "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-spectre": { "branch": "master", "commit": "d958cc3ea8b3fb2f0922dff6177630a40751a3a9" }, + "nvim-treesitter": { "branch": "master", "commit": "ed82d82b77e4fa3bd4593eda8fc4c4ff95a5eb25" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, + "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, + "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, + "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope.nvim": { "branch": "master", "commit": "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "tokyonight.nvim": { "branch": "main", "commit": "e3301873c1e96903daebb98cc9b5926810bf73dd" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, + "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } +} \ No newline at end of file diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json new file mode 100644 index 0000000..ff6a139 --- /dev/null +++ b/.config/nvim/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "2123" + }, + "version": 2 +} \ No newline at end of file diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..27e9e06 --- /dev/null +++ b/.config/nvim/lua/config/autocmds.lua @@ -0,0 +1,3 @@ +-- 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 diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/.config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..891b190 --- /dev/null +++ b/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,46 @@ +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" }, + -- import any extras modules here + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { 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", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ea1454 --- /dev/null +++ b/.config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/.config/nvim/lua/plugins/example.lua b/.config/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..6859c0e --- /dev/null +++ b/.config/nvim/lua/plugins/example.lua @@ -0,0 +1,265 @@ +-- 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").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, "๐Ÿ˜„") + 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" }), + }) + end, + }, +} diff --git a/.config/nvim/plugins/airline.vim b/.config/nvim/plugins/airline.vim deleted file mode 100644 index 5f137fc..0000000 --- a/.config/nvim/plugins/airline.vim +++ /dev/null @@ -1,15 +0,0 @@ -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' - -let g:airline_theme = 'catppuccin' -let g:airline_powerline_fonts = 1 -let g:airline_skip_empty_sections = 1 - -let g:airline_left_sep = '๎‚ฐ' -let g:airline_right_sep = '๎‚ฒ' - -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#left_sep = '๎‚ฐ ' -let g:airline#extensions#tabline#left_alt_sep = ' ' - -set noshowmode diff --git a/.config/nvim/plugins/arduino.vim b/.config/nvim/plugins/arduino.vim deleted file mode 100644 index cab60df..0000000 --- a/.config/nvim/plugins/arduino.vim +++ /dev/null @@ -1,5 +0,0 @@ -Plug 'stevearc/vim-arduino' - -" let g:arduino_dir = '/usr/share/arduino/hardware/arduino/avr' -" let g:arduino_home_dir = $HOME . '.arduino15' -let g:arduino_serial_cmd = 'picocom {port} -b {baud} -l' diff --git a/.config/nvim/plugins/catppuccin.vim b/.config/nvim/plugins/catppuccin.vim deleted file mode 100644 index fc18778..0000000 --- a/.config/nvim/plugins/catppuccin.vim +++ /dev/null @@ -1,2 +0,0 @@ -Plug 'catppuccin/nvim', { 'as': 'catppuccin' } - diff --git a/.config/nvim/plugins/coc-settings.json b/.config/nvim/plugins/coc-settings.json deleted file mode 100644 index c50c7af..0000000 --- a/.config/nvim/plugins/coc-settings.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "coc.preferences.extensionUpdateCheck": "daily", - "coc.preferences.formatOnType": true, - "diagnostic.checkCurrentLine": true, - "diagnostic.virtualText": true, - "diagnostic.enableMessage": "jump", - "diagnostic.errorSign": "โœ–", - "diagnostic.warningSign": "โš ", - "diagnostic.infoSign": "โ€ข", - "diagnostic.hintSign": "โ€ข", - "diagnostic-languageserver.filetypes": { - "php": ["phpstan", "phpcs"] - }, - "diagnostic-languageserver.mergeConfig": true, - "diagnostic-languageserver.linters": { - "phpcs": { - "args": [ "--standard=PSR12", "--exclude=Generic.Files.LineLength.TooLong", "--report=emacs", "-s", "-" ] - } - }, - "git.enableGutters": true, - "git.addedSign.text": "โ”ƒ", - "git.changedSign.text": "โ”ƒ", - "git.removedSign.text": "โ–", - "git.topRemovedSign.text": "โ–”", - "git.changeRemovedSign.text": "โ–”", - "phpls.path": "/usr/local/bin/intelephense", - "php-cs-fixer.config": ".php-cs-fixer.dist.php", - "php-cs-fixer.enableFormatProvider": true, - "intelephense.environment.phpVersion": "8", - "tailwindCSS.validate": true, - "tailwindCSS.emmetCompletions": true, - "prettier.requireConfig": true -} diff --git a/.config/nvim/plugins/coc.vim b/.config/nvim/plugins/coc.vim deleted file mode 100644 index 1668df2..0000000 --- a/.config/nvim/plugins/coc.vim +++ /dev/null @@ -1,135 +0,0 @@ -Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'antoinemadec/coc-fzf' - -let g:coc_global_extensions = [ - \ 'coc-cmake', - \ 'coc-clangd', - \ 'coc-css', - \ 'coc-cssmodules', - \ 'coc-diagnostic', - \ 'coc-emmet', - \ 'coc-eslint', - \ 'coc-git', - \ 'coc-go', - \ 'coc-html', - \ 'coc-htmldjango', - \ 'coc-json', - \ 'coc-ltex', - \ 'coc-markdownlint', - \ 'coc-pairs', - \ 'coc-prettier', - \ 'coc-pydocstring', - \ 'coc-python', - \ 'coc-sh', - \ 'coc-snippets', - \ 'coc-sql', - \ 'coc-svg', - \ 'coc-swagger', - \ 'coc-texlab', - \ 'coc-thrift-syntax-support', - \ 'coc-toml', - \ 'coc-tsserver', - \ 'coc-yaml', - \ '@yaegassy/coc-ansible', -\ ] - -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -" " Use to trigger completion. -" if has('nvim') -" inoremap coc#refresh() -" else -" inoremap coc#refresh() -" endif - -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) -nmap d (coc-diagnostic-info) - -" GoTo code navigation. -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -nmap ]h (coc-git-nextchunk) -nmap [h (coc-git-prevchunk) - -" apply autofix to problem on the current line. -nmap af (coc-fix-current) -nmap am (coc-format-selected) -xmap am (coc-format-selected) -nmap ac (coc-codeaction) -" Applying codeAction to the selected region. -" Example: `aap` for current paragraph -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) -nmap ga (coc-codeaction-line) - -" Map function and class text objects -" NOTE: Requires 'textDocument.documentSymbol' support from the language server. -xmap if (coc-funcobj-i) -omap if (coc-funcobj-i) -xmap af (coc-funcobj-a) -omap af (coc-funcobj-a) -xmap ic (coc-classobj-i) -omap ic (coc-classobj-i) -xmap ac (coc-classobj-a) -omap ac (coc-classobj-a) - -" Use K to show documentation in preview window. -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) - call CocActionAsync('doHover') - else - execute '!' . &keywordprg . " " . expand('') - endif -endfunction - -" Highlight the symbol and its references when holding the cursor. -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Symbol renaming. -nmap rn (coc-rename) - -" Remap and for scroll float windows/popups. -nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" -nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" -inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" -vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" -vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" - -" Add `:Format` command to format current buffer. -command! -nargs=0 Format :call CocAction('format') - -" Add `:Fold` command to fold current buffer. -command! -nargs=? Fold :call CocAction('fold', ) - -" Add `:OR` command for organize imports of the current buffer. -command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') - -nmap l :CocFzfList diff --git a/.config/nvim/plugins/commentary.vim b/.config/nvim/plugins/commentary.vim deleted file mode 100644 index 8c9a7a1..0000000 --- a/.config/nvim/plugins/commentary.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-commentary' diff --git a/.config/nvim/plugins/context-commentstring.vim b/.config/nvim/plugins/context-commentstring.vim deleted file mode 100644 index f9a67ed..0000000 --- a/.config/nvim/plugins/context-commentstring.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'jessarcher/vim-context-commentstring' diff --git a/.config/nvim/plugins/dispatch.vim b/.config/nvim/plugins/dispatch.vim deleted file mode 100644 index ce4a797..0000000 --- a/.config/nvim/plugins/dispatch.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-dispatch' diff --git a/.config/nvim/plugins/dracula.vim b/.config/nvim/plugins/dracula.vim deleted file mode 100644 index 32d3f8e..0000000 --- a/.config/nvim/plugins/dracula.vim +++ /dev/null @@ -1,9 +0,0 @@ -Plug 'dracula/vim', { 'as': 'dracula' } - -augroup DraculaOverrides - autocmd! - autocmd ColorScheme dracula highlight DraculaBoundary guibg=none - autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none - autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic - autocmd User PlugLoaded ++nested colorscheme dracula -augroup end diff --git a/.config/nvim/plugins/editorconfig.vim b/.config/nvim/plugins/editorconfig.vim deleted file mode 100644 index 29e216b..0000000 --- a/.config/nvim/plugins/editorconfig.vim +++ /dev/null @@ -1,3 +0,0 @@ -Plug 'editorconfig/editorconfig-vim' - -let g:EditorConfig_exclude_patterns = ['fugitive://.*'] diff --git a/.config/nvim/plugins/eunuch.vim b/.config/nvim/plugins/eunuch.vim deleted file mode 100644 index d0f9912..0000000 --- a/.config/nvim/plugins/eunuch.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-eunuch' diff --git a/.config/nvim/plugins/exchange.vim b/.config/nvim/plugins/exchange.vim deleted file mode 100644 index 1b760b2..0000000 --- a/.config/nvim/plugins/exchange.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tommcdo/vim-exchange' diff --git a/.config/nvim/plugins/firenvim.vim b/.config/nvim/plugins/firenvim.vim deleted file mode 100644 index 615be4b..0000000 --- a/.config/nvim/plugins/firenvim.vim +++ /dev/null @@ -1,24 +0,0 @@ -Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } } - -let g:firenvim_config = { - \ 'globalSettings': { - \ 'alt': 'all', - \ }, - \ 'localSettings': { - \ '.*': { - \ 'cmdline': 'neovim', - \ 'content': 'text', - \ 'priority': 0, - \ 'selector': 'textarea', - \ 'takeover': 'never', - \ }, - \ } -\ } - -let fc = g:firenvim_config['localSettings'] -let fc['https?://github\.com'] = { 'takeover': 'always', 'priority': 1 } - -augroup FirenvimOverrides - autocmd! - autocmd BufEnter github.com_*.txt set filetype=markdown -augroup END diff --git a/.config/nvim/plugins/floaterm.vim b/.config/nvim/plugins/floaterm.vim deleted file mode 100644 index b1c56e5..0000000 --- a/.config/nvim/plugins/floaterm.vim +++ /dev/null @@ -1,18 +0,0 @@ -Plug 'voldikss/vim-floaterm' - -let g:floaterm_keymap_toggle = '' -let g:floaterm_keymap_next = '' -let g:floaterm_keymap_prev = '' -let g:floaterm_keymap_new = '' - -let g:floaterm_gitcommit='floaterm' -let g:floaterm_autoinsert=1 -let g:floaterm_width=0.8 -let g:floaterm_height=0.8 -let g:floaterm_wintitle=0 -let g:floaterm_autoclose=1 - -augroup FloatermCustomisations - autocmd! - autocmd ColorScheme * highlight FloatermBorder guibg=none -augroup END diff --git a/.config/nvim/plugins/fugitive.vim b/.config/nvim/plugins/fugitive.vim deleted file mode 100644 index 58e784a..0000000 --- a/.config/nvim/plugins/fugitive.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-fugitive' | Plug 'tpope/vim-rhubarb' diff --git a/.config/nvim/plugins/fzf.vim b/.config/nvim/plugins/fzf.vim deleted file mode 100644 index 1839a2d..0000000 --- a/.config/nvim/plugins/fzf.vim +++ /dev/null @@ -1,22 +0,0 @@ -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' -Plug 'stsewd/fzf-checkout.vim' - -let g:fzf_layout = { 'up': '~90%', 'window': { 'width': 0.8, 'height': 0.8, 'yoffset':0.5, 'xoffset': 0.5 } } -let $FZF_DEFAULT_OPTS = '--layout=reverse --info=inline' - -" Customise the Files command to use rg which respects .gitignore files -command! -bang -nargs=? -complete=dir Files - \ call fzf#run(fzf#wrap('files', fzf#vim#with_preview({ 'dir': , 'sink': 'e', 'source': 'rg --files --hidden' }), 0)) - -" Add an AllFiles variation that ignores .gitignore files -command! -bang -nargs=? -complete=dir AllFiles - \ call fzf#run(fzf#wrap('allfiles', fzf#vim#with_preview({ 'dir': , 'sink': 'e', 'source': 'rg --files --hidden --no-ignore' }), 0)) - -nmap f :Files -nmap F :AllFiles -nmap b :Buffers -nmap h :History -nmap r :Rg -nmap R :Rg -nmap gb :GBranches diff --git a/.config/nvim/plugins/gruvbox.vim b/.config/nvim/plugins/gruvbox.vim deleted file mode 100644 index d87ebc3..0000000 --- a/.config/nvim/plugins/gruvbox.vim +++ /dev/null @@ -1,19 +0,0 @@ -Plug 'morhetz/gruvbox' - -"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. -"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support -"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) -if (empty($TMUX)) - if (has("nvim")) - "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > - let $NVIM_TUI_ENABLE_TRUE_COLOR=1 - endif - "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > - "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > - " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > - if (has("termguicolors")) - set termguicolors - endif -endif - -autocmd vimenter * ++nested colorscheme gruvbox diff --git a/.config/nvim/plugins/heritage.vim b/.config/nvim/plugins/heritage.vim deleted file mode 100644 index 90387cf..0000000 --- a/.config/nvim/plugins/heritage.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'jessarcher/vim-heritage' diff --git a/.config/nvim/plugins/lastplace.vim b/.config/nvim/plugins/lastplace.vim deleted file mode 100644 index 2e55029..0000000 --- a/.config/nvim/plugins/lastplace.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'farmergreg/vim-lastplace' diff --git a/.config/nvim/plugins/lion.vim b/.config/nvim/plugins/lion.vim deleted file mode 100644 index 7af2471..0000000 --- a/.config/nvim/plugins/lion.vim +++ /dev/null @@ -1,3 +0,0 @@ -Plug 'tommcdo/vim-lion' - -let g:lion_squeeze_spaces = 1 " Remove as many spaces as possible when aligning diff --git a/.config/nvim/plugins/markdown-preview.vim b/.config/nvim/plugins/markdown-preview.vim deleted file mode 100644 index e14c485..0000000 --- a/.config/nvim/plugins/markdown-preview.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} diff --git a/.config/nvim/plugins/nerdtree.vim b/.config/nvim/plugins/nerdtree.vim deleted file mode 100644 index 08fe8af..0000000 --- a/.config/nvim/plugins/nerdtree.vim +++ /dev/null @@ -1,23 +0,0 @@ -Plug 'preservim/nerdtree' -Plug 'Xuyuanp/nerdtree-git-plugin' -Plug 'ryanoasis/vim-devicons' -Plug 'tiagofumo/vim-nerdtree-syntax-highlight' - -let NERDTreeShowHidden=1 -let NERDTreeMinimalUI=1 - -let g:NERDTreeDirArrowExpandable = 'โ–น' -let g:NERDTreeDirArrowCollapsible = 'โ–ฟ' - -nnoremap n g:NERDTree.IsOpen() ? ':NERDTreeClose' : @% == '' ? ':NERDTree' : ':NERDTreeFind' -nmap N :NERDTreeFind - -" If more than one window and previous buffer was NERDTree, go back to it. -autocmd BufEnter * if bufname('#') =~# "^NERD_tree_" && winnr('$') > 1 | b# | endif - -" avoid crashes when calling vim-plug functions while the cursor is on the NERDTree window -let g:plug_window = 'noautocmd vertical topleft new' - -let g:WebDevIconsUnicodeDecorateFolderNodes = 1 -let g:DevIconsEnableFoldersOpenClose = 1 -let g:DevIconsEnableFolderExtensionPatternMatching = 1 diff --git a/.config/nvim/plugins/pasta.vim b/.config/nvim/plugins/pasta.vim deleted file mode 100644 index f495405..0000000 --- a/.config/nvim/plugins/pasta.vim +++ /dev/null @@ -1,3 +0,0 @@ -Plug 'sickill/vim-pasta' - -let g:pasta_disabled_filetypes = ['fugitive'] diff --git a/.config/nvim/plugins/peekaboo.vim b/.config/nvim/plugins/peekaboo.vim deleted file mode 100644 index 28d4306..0000000 --- a/.config/nvim/plugins/peekaboo.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'junegunn/vim-peekaboo' diff --git a/.config/nvim/plugins/phpactor.vim b/.config/nvim/plugins/phpactor.vim deleted file mode 100644 index bed1aaa..0000000 --- a/.config/nvim/plugins/phpactor.vim +++ /dev/null @@ -1,6 +0,0 @@ -Plug 'phpactor/phpactor', {'for': 'php', 'branch': 'master', 'do': 'composer install --no-dev -o'} - -augroup PhpactorMappings - au! - au FileType php nmap mm :PhpactorContextMenu -augroup END diff --git a/.config/nvim/plugins/polyglot.vim b/.config/nvim/plugins/polyglot.vim deleted file mode 100644 index 4864b4d..0000000 --- a/.config/nvim/plugins/polyglot.vim +++ /dev/null @@ -1,6 +0,0 @@ -let g:polyglot_disabled = ['arduino'] - -Plug 'sheerun/vim-polyglot' - -let g:PHP_noArrowMatching = 1 -let g:vim_markdown_new_list_item_indent = 0 diff --git a/.config/nvim/plugins/projectionist.vim b/.config/nvim/plugins/projectionist.vim deleted file mode 100644 index 8ac978a..0000000 --- a/.config/nvim/plugins/projectionist.vim +++ /dev/null @@ -1,42 +0,0 @@ -Plug 'tpope/vim-projectionist' - -let g:projectionist_heuristics = { - \ "artisan": { - \ "*": { - \ "start": "sail up", - \ "console": "sail tinker", - \ }, - \ "app/*Controller.php": { - \ "type": "source", - \ "alternate": "tests/Feature/{}ControllerTest.php", - \ }, - \ "app/**/Models/*.php": { - \ "type": "source", - \ "alternate": [ - \ "tests/Unit/{dirname}/Models/{basename}Test.php", - \ "tests/Unit/{dirname}/{basename}Test.php", - \ ], - \ }, - \ "app/**/Listeners/*.php": { - \ "type": "source", - \ "alternate": "tests/Unit/{dirname}/Listeners/{basename}Test.php", - \ }, - \ "app/*.php": { - \ "type": "source", - \ "alternate": [ - \ "tests/Unit/{}Test.php", - \ "tests/Feature/{}Test.php", - \ ] - \ }, - \ "tests/Feature/*Test.php": { - \ "type": "test", - \ "alternate": "app/{}.php", - \ }, - \ "tests/Unit/*Test.php": { - \ "type": "test", - \ "alternate": [ - \ "app/{}.php", - \ "app/Models/{}.php", - \ ], - \ }, - \ }} diff --git a/.config/nvim/plugins/quickscope.vim b/.config/nvim/plugins/quickscope.vim deleted file mode 100644 index 96a2766..0000000 --- a/.config/nvim/plugins/quickscope.vim +++ /dev/null @@ -1,4 +0,0 @@ -Plug 'unblevable/quick-scope' - -let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] -let g:qs_max_chars=150 diff --git a/.config/nvim/plugins/repeat.vim b/.config/nvim/plugins/repeat.vim deleted file mode 100644 index 7407b74..0000000 --- a/.config/nvim/plugins/repeat.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-repeat' diff --git a/.config/nvim/plugins/rooter.vim b/.config/nvim/plugins/rooter.vim deleted file mode 100644 index 7aa1279..0000000 --- a/.config/nvim/plugins/rooter.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'airblade/vim-rooter' diff --git a/.config/nvim/plugins/sayonara.vim b/.config/nvim/plugins/sayonara.vim deleted file mode 100644 index 8d1324e..0000000 --- a/.config/nvim/plugins/sayonara.vim +++ /dev/null @@ -1,3 +0,0 @@ -Plug 'jessarcher/vim-sayonara', { 'on': 'Sayonara' } - -nmap q :Sayonara! diff --git a/.config/nvim/plugins/sensible.vim b/.config/nvim/plugins/sensible.vim deleted file mode 100644 index 80b28d8..0000000 --- a/.config/nvim/plugins/sensible.vim +++ /dev/null @@ -1,4 +0,0 @@ -Plug 'tpope/vim-sensible' - -set listchars=tab:โ–ธ\ ,trail:ยท - diff --git a/.config/nvim/plugins/smooth-scroll.vim b/.config/nvim/plugins/smooth-scroll.vim deleted file mode 100644 index 0250a4e..0000000 --- a/.config/nvim/plugins/smooth-scroll.vim +++ /dev/null @@ -1,6 +0,0 @@ -Plug 'terryma/vim-smooth-scroll' - -noremap :call smooth_scroll#up(&scroll, 0, 4) -noremap :call smooth_scroll#down(&scroll, 0, 4) -noremap :call smooth_scroll#up(&scroll*2, 0, 8) -noremap :call smooth_scroll#down(&scroll*2, 0, 8) diff --git a/.config/nvim/plugins/splitjoin.vim b/.config/nvim/plugins/splitjoin.vim deleted file mode 100644 index 0b22ff4..0000000 --- a/.config/nvim/plugins/splitjoin.vim +++ /dev/null @@ -1,3 +0,0 @@ -Plug 'AndrewRadev/splitjoin.vim' - -let g:splitjoin_html_attributes_bracket_on_new_line = 1 diff --git a/.config/nvim/plugins/surround.vim b/.config/nvim/plugins/surround.vim deleted file mode 100644 index f64cebe..0000000 --- a/.config/nvim/plugins/surround.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-surround' diff --git a/.config/nvim/plugins/targets.vim b/.config/nvim/plugins/targets.vim deleted file mode 100644 index 8620d7a..0000000 --- a/.config/nvim/plugins/targets.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'wellle/targets.vim' diff --git a/.config/nvim/plugins/textobj-xmlattr.vim b/.config/nvim/plugins/textobj-xmlattr.vim deleted file mode 100644 index 674726f..0000000 --- a/.config/nvim/plugins/textobj-xmlattr.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'kana/vim-textobj-user' | Plug 'whatyouhide/vim-textobj-xmlattr' diff --git a/.config/nvim/plugins/tmux-navigator.vim b/.config/nvim/plugins/tmux-navigator.vim deleted file mode 100644 index cea33cf..0000000 --- a/.config/nvim/plugins/tmux-navigator.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'christoomey/vim-tmux-navigator' diff --git a/.config/nvim/plugins/unimpaired.vim b/.config/nvim/plugins/unimpaired.vim deleted file mode 100644 index f3fd08f..0000000 --- a/.config/nvim/plugins/unimpaired.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'tpope/vim-unimpaired' diff --git a/.config/nvim/plugins/vim-test.vim b/.config/nvim/plugins/vim-test.vim deleted file mode 100644 index 2e1b96c..0000000 --- a/.config/nvim/plugins/vim-test.vim +++ /dev/null @@ -1,15 +0,0 @@ -Plug 'vim-test/vim-test' - -let test#php#phpunit#executable = 'deliver vendor/bin/phpunit' - -nmap tn :TestNearest -nmap tf :TestFile -nmap ts :TestSuite -nmap tl :TestLast -nmap tv :TestVisit - -augroup AutoDeleteTestTermBuffers - autocmd! - autocmd BufLeave term://*artisan\stest* bdelete! - autocmd BufLeave term://*phpunit* bdelete! -augroup END diff --git a/.config/nvim/plugins/visual-multi.vim b/.config/nvim/plugins/visual-multi.vim deleted file mode 100644 index 961304e..0000000 --- a/.config/nvim/plugins/visual-multi.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'mg979/vim-visual-multi', {'branch': 'master'} diff --git a/.config/nvim/plugins/visual-star-search.vim b/.config/nvim/plugins/visual-star-search.vim deleted file mode 100644 index 16a461f..0000000 --- a/.config/nvim/plugins/visual-star-search.vim +++ /dev/null @@ -1 +0,0 @@ -Plug 'nelstrom/vim-visual-star-search' diff --git a/.config/nvim/plugins/which-key.vim b/.config/nvim/plugins/which-key.vim deleted file mode 100644 index 796d53a..0000000 --- a/.config/nvim/plugins/which-key.vim +++ /dev/null @@ -1,12 +0,0 @@ -Plug 'folke/which-key.nvim' - -function WhichKeySetup() -lua << EOF -require("which-key").setup {} -EOF -endfunction - -augroup WhichKeySetup - autocmd! - autocmd User PlugLoaded call WhichKeySetup() -augroup END diff --git a/.config/nvim/stylua.toml b/.config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/.config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 51a1d3d..a19b263 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -3,7 +3,7 @@ set-option -sa terminal-overrides ",xterm*:Tc" set -g mouse on -set -g default-terminal "xterm-256color" +set -g default-terminal "tmux-256color" setw -g xterm-keys on set -sg repeat-time 600