From 9745c8159f11c419cd293c6c81f90a89a0015899 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Fri, 22 Nov 2024 02:18:15 -0500 Subject: [PATCH] AutoYADM commit: 2024-11-22 02:18:15 --- .../.github/ISSUE_TEMPLATE/bug_report.md | 28 - .../nvim-min/.github/pull_request_template.md | 8 - .config/nvim-min/.github/workflows/stylua.yml | 21 - .config/nvim-min/.gitignore | 7 - .config/nvim-min/.stylua.toml | 6 - .config/nvim-min/LICENSE | 201 ++++ .config/nvim-min/LICENSE.md | 19 - .config/nvim-min/README.md | 234 +---- .config/nvim-min/doc/kickstart.txt | 24 - .config/nvim-min/init.lua | 972 +----------------- .config/nvim-min/lazy-lock.json | 69 ++ .config/nvim-min/lazyvim.json | 29 + .config/nvim-min/lua/command-key.lua | 8 + .config/nvim-min/lua/config/autocmds.lua | 73 ++ .../lua/config/keymaps-pre-colemak.bak | 117 +++ .config/nvim-min/lua/config/keymaps.lua | 114 ++ .config/nvim-min/lua/config/lazy.lua | 53 + .config/nvim-min/lua/config/options.lua | 8 + .config/nvim-min/lua/custom/plugins/init.lua | 5 - .config/nvim-min/lua/kickstart/health.lua | 52 - .../lua/kickstart/plugins/autopairs.lua | 16 - .../nvim-min/lua/kickstart/plugins/debug.lua | 148 --- .../lua/kickstart/plugins/gitsigns.lua | 61 -- .../lua/kickstart/plugins/indent_line.lua | 9 - .../nvim-min/lua/kickstart/plugins/lint.lua | 60 -- .../lua/kickstart/plugins/neo-tree.lua | 25 - .config/nvim-min/lua/link-hl.lua | 59 ++ .config/nvim-min/lua/md-utils.lua | 11 + .config/nvim-min/lua/plugins/dashboard.lua | 103 ++ .config/nvim-min/lua/plugins/disabled.lua | 10 + .../lua/plugins/extend-mini-files.lua | 54 + .config/nvim-min/lua/plugins/lazy.lua | 8 + .config/nvim-min/lua/plugins/lualine.lua | 20 + .config/nvim-min/lua/plugins/markdown.lua | 35 + .config/nvim-min/lua/plugins/noirbuddy.lua | 106 ++ .config/nvim-min/lua/plugins/snacks.lua | 24 + .../nvim-min/lua/plugins/vim-dirtytalk.lua | 9 + .config/nvim-min/stylua.toml | 3 + 38 files changed, 1122 insertions(+), 1687 deletions(-) delete mode 100644 .config/nvim-min/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .config/nvim-min/.github/pull_request_template.md delete mode 100644 .config/nvim-min/.github/workflows/stylua.yml delete mode 100644 .config/nvim-min/.stylua.toml create mode 100644 .config/nvim-min/LICENSE delete mode 100644 .config/nvim-min/LICENSE.md delete mode 100644 .config/nvim-min/doc/kickstart.txt create mode 100644 .config/nvim-min/lazy-lock.json create mode 100644 .config/nvim-min/lazyvim.json create mode 100644 .config/nvim-min/lua/command-key.lua create mode 100644 .config/nvim-min/lua/config/autocmds.lua create mode 100644 .config/nvim-min/lua/config/keymaps-pre-colemak.bak create mode 100644 .config/nvim-min/lua/config/keymaps.lua create mode 100644 .config/nvim-min/lua/config/lazy.lua create mode 100644 .config/nvim-min/lua/config/options.lua delete mode 100644 .config/nvim-min/lua/custom/plugins/init.lua delete mode 100644 .config/nvim-min/lua/kickstart/health.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/autopairs.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/debug.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/gitsigns.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/indent_line.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/lint.lua delete mode 100644 .config/nvim-min/lua/kickstart/plugins/neo-tree.lua create mode 100644 .config/nvim-min/lua/link-hl.lua create mode 100644 .config/nvim-min/lua/md-utils.lua create mode 100644 .config/nvim-min/lua/plugins/dashboard.lua create mode 100644 .config/nvim-min/lua/plugins/disabled.lua create mode 100644 .config/nvim-min/lua/plugins/extend-mini-files.lua create mode 100644 .config/nvim-min/lua/plugins/lazy.lua create mode 100644 .config/nvim-min/lua/plugins/lualine.lua create mode 100644 .config/nvim-min/lua/plugins/markdown.lua create mode 100644 .config/nvim-min/lua/plugins/noirbuddy.lua create mode 100644 .config/nvim-min/lua/plugins/snacks.lua create mode 100644 .config/nvim-min/lua/plugins/vim-dirtytalk.lua create mode 100644 .config/nvim-min/stylua.toml diff --git a/.config/nvim-min/.github/ISSUE_TEMPLATE/bug_report.md b/.config/nvim-min/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 2ad4d31d..00000000 --- a/.config/nvim-min/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - - - -## Describe the bug - - -## To Reproduce - -1. ... - -## Desktop - -- OS: -- Terminal: - -## Neovim Version - - -``` -``` diff --git a/.config/nvim-min/.github/pull_request_template.md b/.config/nvim-min/.github/pull_request_template.md deleted file mode 100644 index f401c9ff..00000000 --- a/.config/nvim-min/.github/pull_request_template.md +++ /dev/null @@ -1,8 +0,0 @@ -*************************************************************************** -**NOTE** -Please verify that the `base repository` above has the intended destination! -Github by default opens Pull Requests against the parent of a forked repository. -If this is your personal fork and you didn't intend to open a PR for contribution -to the original project then adjust the `base repository` accordingly. -************************************************************************** - diff --git a/.config/nvim-min/.github/workflows/stylua.yml b/.config/nvim-min/.github/workflows/stylua.yml deleted file mode 100644 index 75db6c33..00000000 --- a/.config/nvim-min/.github/workflows/stylua.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Check Lua Formatting -name: Check Lua Formatting -on: pull_request_target - -jobs: - stylua-check: - if: github.repository == 'nvim-lua/kickstart.nvim' - name: Stylua Check - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Stylua Check - uses: JohnnyMorganz/stylua-action@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: latest - args: --check . - diff --git a/.config/nvim-min/.gitignore b/.config/nvim-min/.gitignore index 005b535b..e69de29b 100644 --- a/.config/nvim-min/.gitignore +++ b/.config/nvim-min/.gitignore @@ -1,7 +0,0 @@ -tags -test.sh -.luarc.json -nvim - -spell/ -lazy-lock.json diff --git a/.config/nvim-min/.stylua.toml b/.config/nvim-min/.stylua.toml deleted file mode 100644 index 139e9397..00000000 --- a/.config/nvim-min/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 160 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferSingle" -call_parentheses = "None" diff --git a/.config/nvim-min/LICENSE b/.config/nvim-min/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/.config/nvim-min/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-min/LICENSE.md b/.config/nvim-min/LICENSE.md deleted file mode 100644 index 9cf10627..00000000 --- a/.config/nvim-min/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -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 OR COPYRIGHT HOLDERS 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. diff --git a/.config/nvim-min/README.md b/.config/nvim-min/README.md index 800ca990..ae6c4a9b 100644 --- a/.config/nvim-min/README.md +++ b/.config/nvim-min/README.md @@ -1,233 +1,11 @@ -# kickstart.nvim +# ๐Ÿ’ค FicVim -## Introduction +My personal Neovim configuration based on [LazyVim](https://github.com/LazyVim/LazyVim). -A starting point for Neovim that is: +Currently I'm using `obsidian.nvim` for note-taking. -* Small -* Single-file -* Completely Documented +The colorscheme is a heavily modified version of `noirbuddy.nvim`. -**NOT** a Neovim distribution, but instead a starting point for your configuration. - -## Installation - -### Install Neovim - -Kickstart.nvim targets *only* the latest -['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest -['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim. -If you are experiencing issues, please make sure you have the latest versions. - -### Install External Dependencies - -External Requirements: -- Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`) -- [ripgrep](https://github.com/BurntSushi/ripgrep#installation) -- Clipboard tool (xclip/xsel/win32yank or other depending on platform) -- A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons - - if you have it set `vim.g.have_nerd_font` in `init.lua` to true -- Language Setup: - - If you want to write Typescript, you need `npm` - - If you want to write Golang, you will need `go` - - etc. - -> **NOTE** -> See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes -> and quick install snippets - -### Install Kickstart - -> **NOTE** -> [Backup](#FAQ) your previous configuration (if any exists) - -Neovim's configurations are located under the following paths, depending on your OS: - -| OS | PATH | -| :- | :--- | -| Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` | -| Windows (cmd)| `%localappdata%\nvim\` | -| Windows (powershell)| `$env:LOCALAPPDATA\nvim\` | - -#### Recommended Step - -[Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo -so that you have your own copy that you can modify, then install by cloning the -fork to your machine using one of the commands below, depending on your OS. - -> **NOTE** -> Your fork's url will be something like this: -> `https://github.com//kickstart.nvim.git` - -You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file -too - it's ignored in the kickstart repo to make maintenance easier, but it's -[recommmended to track it in version control](https://lazy.folke.io/usage/lockfile). - -#### Clone kickstart.nvim -> **NOTE** -> If following the recommended step above (i.e., forking the repo), replace -> `nvim-lua` with `` in the commands below - -
Linux and Mac - -```sh -git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim -``` - -
- -
Windows - -If you're using `cmd.exe`: - -``` -git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim" -``` - -If you're using `powershell.exe` - -``` -git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim" -``` - -
- -### Post Installation - -Start Neovim - -```sh -nvim -``` - -That's it! Lazy will install all the plugins you have. Use `:Lazy` to view -current plugin status. Hit `q` to close the window. - -Read through the `init.lua` file in your configuration folder for more -information about extending and exploring Neovim. That also includes -examples of adding popularly requested plugins. - - -### Getting Started - -[The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o) - -### FAQ - -* What should I do if I already have a pre-existing neovim configuration? - * You should back it up and then delete all associated files. - * This includes your existing init.lua and the neovim files in `~/.local` - which can be deleted with `rm -rf ~/.local/share/nvim/` -* Can I keep my existing configuration in parallel to kickstart? - * Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME` - to maintain multiple configurations. For example, you can install the kickstart - configuration in `~/.config/nvim-kickstart` and create an alias: - ``` - alias nvim-kickstart='NVIM_APPNAME="nvim-kickstart" nvim' - ``` - When you run Neovim using `nvim-kickstart` alias it will use the alternative - config directory and the matching local directory - `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim - distribution that you would like to try out. -* What if I want to "uninstall" this configuration: - * See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information -* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files? - * The main purpose of kickstart is to serve as a teaching tool and a reference - configuration that someone can easily use to `git clone` as a basis for their own. - As you progress in learning Neovim and Lua, you might consider splitting `init.lua` - into smaller parts. A fork of kickstart that does this while maintaining the - same functionality is available here: - * [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim) - * Discussions on this topic can be found here: - * [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218) - * [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473) - -### Install Recipes - -Below you can find OS specific install instructions for Neovim and dependencies. - -After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step. - -#### Windows Installation - -
Windows with Microsoft C++ Build Tools and CMake -Installation may require installing build tools and updating the run command for `telescope-fzf-native` - -See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation) - -This requires: - -- Install CMake and the Microsoft C++ Build Tools on Windows - -```lua -{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } -``` -
-
Windows with gcc/make using chocolatey -Alternatively, one can install gcc and make which don't require changing the config, -the easiest way is to use choco: - -1. install [chocolatey](https://chocolatey.org/install) -either follow the instructions on the page or use winget, -run in cmd as **admin**: -``` -winget install --accept-source-agreements chocolatey.chocolatey -``` - -2. install all requirements using choco, exit previous cmd and -open a new one so that choco path is set, and run in cmd as **admin**: -``` -choco install -y neovim git ripgrep wget fd unzip gzip mingw make -``` -
-
WSL (Windows Subsystem for Linux) - -``` -wsl --install -wsl -sudo add-apt-repository ppa:neovim-ppa/unstable -y -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip neovim -``` -
- -#### Linux Install -
Ubuntu Install Steps - -``` -sudo add-apt-repository ppa:neovim-ppa/unstable -y -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip neovim -``` -
-
Debian Install Steps - -``` -sudo apt update -sudo apt install make gcc ripgrep unzip git xclip curl - -# Now we install nvim -curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz -sudo rm -rf /opt/nvim-linux64 -sudo mkdir -p /opt/nvim-linux64 -sudo chmod a+rX /opt/nvim-linux64 -sudo tar -C /opt -xzf nvim-linux64.tar.gz - -# make it available in /usr/local/bin, distro installs to /usr/bin -sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/ -``` -
-
Fedora Install Steps - -``` -sudo dnf install -y gcc make git ripgrep fd-find unzip neovim -``` -
- -
Arch Install Steps - -``` -sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim -``` -
+A note on keybindings: I use Colemak-DH, which is a non-qwerty keyboard layout. I use either `MNEI` or the arrow keys (which is a mod key + `MNEI` on my keyboard) for navigation, depending on a few different factors. +Therefore, some of these bindings may seem weird. diff --git a/.config/nvim-min/doc/kickstart.txt b/.config/nvim-min/doc/kickstart.txt deleted file mode 100644 index cb87ac3f..00000000 --- a/.config/nvim-min/doc/kickstart.txt +++ /dev/null @@ -1,24 +0,0 @@ -================================================================================ -INTRODUCTION *kickstart.nvim* - -Kickstart.nvim is a project to help you get started on your neovim journey. - - *kickstart-is-not* -It is not: -- Complete framework for every plugin under the sun -- Place to add every plugin that could ever be useful - - *kickstart-is* -It is: -- Somewhere that has a good start for the most common "IDE" type features: - - autocompletion - - goto-definition - - find references - - fuzzy finding - - and hinting at what more can be done :) -- A place to _kickstart_ your journey. - - You should fork this project and use/modify it so that it matches your - style and preferences. If you don't want to do that, there are probably - other projects that would fit much better for you (and that's great!)! - - vim:tw=78:ts=8:ft=help:norl: diff --git a/.config/nvim-min/init.lua b/.config/nvim-min/init.lua index 08717d53..2514f9ed 100644 --- a/.config/nvim-min/init.lua +++ b/.config/nvim-min/init.lua @@ -1,970 +1,2 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - Kickstart.nvim is a starting point for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you can start exploring, configuring and tinkering to - make Neovim your own! That might mean leaving Kickstart just the way it is for a while - or immediately breaking it into modular pieces. It's up to you! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example which will only take 10-15 minutes: - - https://learnxinyminutes.com/docs/lua/ - - After understanding a bit more about Lua, you can use `:help lua-guide` as a - reference for how Neovim integrates Lua. - - :help lua-guide - - (or HTML version): https://neovim.io/doc/user/lua-guide.html - -Kickstart Guide: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - - - : - - Tutor - - - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - Next, run AND READ `:help`. - This will open up a help window with some basic information - about reading, navigating and searching the builtin help documentation. - - This should be the first place you go to look when you're stuck or confused - with something. It's one of my favorite Neovim features. - - MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, - which is very useful when you're not exactly sure of what you're looking for. - - I have left several `:help X` comments throughout the init.lua - These are hints about where to find more information about the relevant settings, - plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) ---]] - --- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false - --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` - --- Make line numbers default -vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' - --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' -end) - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = 'yes' - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time --- Displays which-key popup sooner -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = 'ยป ', trail = 'ยท', nbsp = 'โฃ' } - --- Preview substitutions live, as you type! -vim.opt.inccommand = 'split' - --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` - --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') - --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) - --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = 'https://github.com/folke/lazy.nvim.git' - local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } - if vim.v.shell_error ~= 0 then - error('Error cloning lazy.nvim:\n' .. out) - end -end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) - --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. -require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to force a plugin to be loaded. - -- - - -- Here is a more advanced example where we pass configuration - -- options to `gitsigns.nvim`. This is equivalent to the following Lua: - -- require('gitsigns').setup({ ... }) - -- - -- See `:help gitsigns` to understand what the configuration keys do - { -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = 'โ€พ' }, - changedelete = { text = '~' }, - }, - }, - }, - - -- NOTE: Plugins can also be configured to run Lua code when they are loaded. - -- - -- This is often very useful to both group configuration, as well as handle - -- lazy loading plugins that don't need to be loaded immediately at startup. - -- - -- For example, in the following configuration, we use: - -- event = 'VimEnter' - -- - -- which loads which-key before all the UI elements are loaded. Events can be - -- normal autocommands events (`:help autocmd-events`). - -- - -- Then, because we use the `config` key, the configuration only runs - -- after the plugin has been loaded: - -- config = function() ... end - - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - opts = { - icons = { - -- set icon mappings to true if you have a Nerd Font - mappings = vim.g.have_nerd_font, - -- If you are using a Nerd Font: set icons.keys to an empty table which will use the - -- default which-key.nvim defined Nerd Font icons, otherwise define a string table - keys = vim.g.have_nerd_font and {} or { - Up = ' ', - Down = ' ', - Left = ' ', - Right = ' ', - C = ' ', - M = ' ', - D = ' ', - S = ' ', - CR = ' ', - Esc = ' ', - ScrollWheelDown = ' ', - ScrollWheelUp = ' ', - NL = ' ', - BS = ' ', - Space = ' ', - Tab = ' ', - F1 = '', - F2 = '', - F3 = '', - F4 = '', - F5 = '', - F6 = '', - F7 = '', - F8 = '', - F9 = '', - F10 = '', - F11 = '', - F12 = '', - }, - }, - - -- Document existing key chains - spec = { - { 'c', group = '[C]ode', mode = { 'n', 'x' } }, - { 'd', group = '[D]ocument' }, - { 'r', group = '[R]ename' }, - { 's', group = '[S]earch' }, - { 'w', group = '[W]orkspace' }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, - }, - }, - }, - - -- NOTE: Plugins can specify dependencies. - -- - -- The dependencies are proper plugin specifications as well - anything - -- you do for a plugin at the top level, you can do for a dependency. - -- - -- Use the `dependencies` key to specify the dependencies of a particular plugin - - { -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { 'nvim-telescope/telescope-ui-select.nvim' }, - - -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, - }, - config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` - require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ['ui-select'] = { - require('telescope.themes').get_dropdown(), - }, - }, - } - - -- Enable Telescope extensions if they are installed - pcall(require('telescope').load_extension, 'fzf') - pcall(require('telescope').load_extension, 'ui-select') - - -- See `:help telescope.builtin` - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { - winblend = 10, - previewer = false, - }) - end, { desc = '[/] Fuzzily search in current buffer' }) - - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys - vim.keymap.set('n', 's/', function() - builtin.live_grep { - grep_open_files = true, - prompt_title = 'Live Grep in Open Files', - } - end, { desc = '[S]earch [/] in Open Files' }) - - -- Shortcut for searching your Neovim configuration files - vim.keymap.set('n', 'sn', function() - builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) - end, - }, - - -- LSP Plugins - { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = 'luvit-meta/library', words = { 'vim%.uv' } }, - }, - }, - }, - { 'Bilal2453/luvit-meta', lazy = true }, - { - -- Main LSP Configuration - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by nvim-cmp - 'hrsh7th/cmp-nvim-lsp', - }, - config = function() - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') - - -- Execute a code action, usually your cursor needs to be on top of an error - -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end - - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') - end - end, - }) - - -- Change diagnostic symbols in the sign column (gutter) - -- if vim.g.have_nerd_font then - -- local signs = { ERROR = '๎ช‡', WARN = '๎ฉฌ', INFO = '๎ฉด', HINT = '๎ฉก' } - -- local diagnostic_signs = {} - -- for type, icon in pairs(signs) do - -- diagnostic_signs[vim.diagnostic.severity[type]] = icon - -- end - -- vim.diagnostic.config { signs = { text = diagnostic_signs } } - -- end - - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ - local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, - -- - - lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', - }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, - }, - }, - }, - } - - -- Ensure the servers and tools above are installed - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - require('mason').setup() - - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - require('mason-lspconfig').setup { - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, - }, - - { -- Autoformat - 'stevearc/conform.nvim', - event = { 'BufWritePre' }, - cmd = { 'ConformInfo' }, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - local lsp_format_opt - if disable_filetypes[vim.bo[bufnr].filetype] then - lsp_format_opt = 'never' - else - lsp_format_opt = 'fallback' - end - return { - timeout_ms = 500, - lsp_format = lsp_format_opt, - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, - }, - }, - }, - - { -- Autocompletion - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - 'L3MON4D3/LuaSnip', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', - }, - config = function() - -- See `:help cmp` - local cmp = require 'cmp' - local luasnip = require 'luasnip' - luasnip.config.setup {} - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item - [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - sources = { - { - name = 'lazydev', - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it - group_index = 0, - }, - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - }, - } - end, - }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' - end, - }, - - -- Highlight todo, notes, etc in comments - { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - - { -- Collection of various small independent plugins/modules - 'echasnovski/mini.nvim', - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() - - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin - local statusline = require 'mini.statusline' - -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } - - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() - return '%2l:%-2v' - end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim - end, - }, - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - main = 'nvim-treesitter.configs', -- Sets main module to use for opts - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - }, - - -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, - -- - -- For additional information with loading, sourcing and examples see `:help lazy.nvim-๐Ÿ”Œ-plugin-spec` - -- Or use telescope! - -- In normal mode type `sh` then write `lazy.nvim-plugin` - -- you can continue same window with `sr` which resumes last telescope search -}, { - ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or { - cmd = 'โŒ˜', - config = '๐Ÿ› ', - event = '๐Ÿ“…', - ft = '๐Ÿ“‚', - init = 'โš™', - keys = '๐Ÿ—', - plugin = '๐Ÿ”Œ', - runtime = '๐Ÿ’ป', - require = '๐ŸŒ™', - source = '๐Ÿ“„', - start = '๐Ÿš€', - task = '๐Ÿ“Œ', - lazy = '๐Ÿ’ค ', - }, - }, -}) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/.config/nvim-min/lazy-lock.json b/.config/nvim-min/lazy-lock.json new file mode 100644 index 00000000..b74e6043 --- /dev/null +++ b/.config/nvim-min/lazy-lock.json @@ -0,0 +1,69 @@ +{ + "LazyVim": { "branch": "main", "commit": "4d596cf4b4dcb369b2aef7e4d09635416b6c5a3f" }, + "SchemaStore.nvim": { "branch": "main", "commit": "291b15c6a03d8f859da8d83f46ed41ae6bb0ea8d" }, + "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, + "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" }, + "cmake-tools.nvim": { "branch": "master", "commit": "53bc5261e1e0b0d28be465d2b2b07a6f0646e1eb" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "colorbuddy.nvim": { "branch": "master", "commit": "8b968581e5c19d22a861d5f3fe5dbd83394fa681" }, + "conform.nvim": { "branch": "master", "commit": "62d5accad8b29d6ba9b58d3dff90c43a55621c60" }, + "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, + "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" }, + "inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" }, + "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, + "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" }, + "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" }, + "mini.diff": { "branch": "main", "commit": "65c59f9967fec965d8759a88c1baa43147699035" }, + "mini.files": { "branch": "main", "commit": "6abe854f1410fc6aec69897a78b1db994c32d9c6" }, + "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" }, + "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, + "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" }, + "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" }, + "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, + "noice.nvim": { "branch": "main", "commit": "481059e08198298a52067ac48a334262f117e355" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, + "nvim-dap": { "branch": "master", "commit": "cc92b054720a96170eca6bd9bdedd43d2b0a7a8a" }, + "nvim-dap-python": { "branch": "master", "commit": "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb" }, + "nvim-lint": { "branch": "master", "commit": "8e9562de7261e5b862c631958df616e1a65552cd" }, + "nvim-lspconfig": { "branch": "master", "commit": "291a8f1a319dc712db85bcc174b0cf406f0a5b69" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-noirbuddy": { "branch": "master", "commit": "7fa6c8963585f97c9e37a62a00751f4d9d480f95" }, + "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, + "nvim-treesitter": { "branch": "master", "commit": "eff88f4e8b71d92bdcaeca6e4f7e1e146b263614" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, + "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" }, + "snacks.nvim": { "branch": "main", "commit": "922602dc1a00984de0361d4187063abbae2e11c3" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" }, + "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" }, + "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, + "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, + "vim-dirtytalk": { "branch": "master", "commit": "aa57ba902b04341a04ff97214360f56856493583" }, + "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }, + "yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" } +} diff --git a/.config/nvim-min/lazyvim.json b/.config/nvim-min/lazyvim.json new file mode 100644 index 00000000..0bbe222f --- /dev/null +++ b/.config/nvim-min/lazyvim.json @@ -0,0 +1,29 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.mini-comment", + "lazyvim.plugins.extras.coding.mini-surround", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.editor.inc-rename", + "lazyvim.plugins.extras.editor.leap", + "lazyvim.plugins.extras.editor.mini-diff", + "lazyvim.plugins.extras.editor.mini-files", + "lazyvim.plugins.extras.editor.mini-move", + "lazyvim.plugins.extras.editor.refactoring", + "lazyvim.plugins.extras.lang.clangd", + "lazyvim.plugins.extras.lang.cmake", + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.php", + "lazyvim.plugins.extras.lang.python", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.test.core", + "lazyvim.plugins.extras.ui.dashboard-nvim", + "lazyvim.plugins.extras.util.dot" + ], + "news": { + "NEWS.md": "7429" + }, + "version": 7 +} \ No newline at end of file diff --git a/.config/nvim-min/lua/command-key.lua b/.config/nvim-min/lua/command-key.lua new file mode 100644 index 00000000..bd0c9086 --- /dev/null +++ b/.config/nvim-min/lua/command-key.lua @@ -0,0 +1,8 @@ +-- TODO: turn this into a plugin? lol +local M = {} + +function M.command(command_name) + vim.cmd('call feedkeys(":' .. command_name .. ' ", "n")') +end + +return M diff --git a/.config/nvim-min/lua/config/autocmds.lua b/.config/nvim-min/lua/config/autocmds.lua new file mode 100644 index 00000000..27351898 --- /dev/null +++ b/.config/nvim-min/lua/config/autocmds.lua @@ -0,0 +1,73 @@ +-- 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 +vim.opt_local.breakindent = true +vim.opt_local.wrap = true +vim.api.nvim_create_autocmd("FileType", { + pattern = "python", + callback = function() + local cl = require("colorbuddy") + cl.Group.new("@variable", cl.colors.primary) + cl.Group.new("@string", cl.colors.secondary) + cl.Group.new("@keyword", cl.colors.complement) + cl.Group.new("@keyword.operator", cl.colors.complement) + cl.Group.new("@constant.builtin", cl.colors.complement) + end, +}) +-- vim.api.nvim_create_autocmd("FileType", { +-- pattern = "tex", +-- callback = function() +-- vim.cmd([[ +-- syntax match texMathSymbol "\\oplus" conceal cchar=โŠ• +-- ]]) +-- end, +-- }) +-- This autocommand fixes syntax highlighting for inline math in markdown files +-- Together with vimtex, it will apply very sexy good stuff here! +-- vim.api.nvim_create_autocmd("FileType", { +-- patterm = "tex", +-- callback = function() +-- vim.api.nvim_create_autocmd("BufWrite", { +-- buffer = 0, +-- callback = function() +-- vim.api.nvim_command("VimtexCompile") +-- end, +-- }) +-- end, +-- }) +vim.api.nvim_create_autocmd("FileType", { + pattern = "markdown", + callback = function() + vim.cmd([[ + syn region mathBlock start=/\$\$/ end=/\$\$/ contains=@tex + " inline math + syn match mathInline '\$[^$].\{-}\$' contains=@tex + " actually highlight the region we defined as "math" + syn include @tex syntax/tex.vim + hi def link mathBlock Statement + hi def link mathInline Statement + ]]) + end, +}) +vim.api.nvim_create_autocmd({ "FileType" }, { + pattern = { "markdown" }, + callback = function() + vim.opt_local.breakindent = true + -- We want markdown files to autosave + vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, { + buffer = 0, + command = "silent! write", + }) + vim.keymap.set("i", "", function() + local md_utils = require("md-utils") + local isList = md_utils.isCursorInList() + if isList then + vim.api.nvim_command("MDListItemBelow") + else + vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("", true, true, true), "n", true) + end + end, { desc = "Continue List", silent = true, remap = true }) + vim.opt_local.wrap = true + vim.opt_local.spell = false + end, +}) diff --git a/.config/nvim-min/lua/config/keymaps-pre-colemak.bak b/.config/nvim-min/lua/config/keymaps-pre-colemak.bak new file mode 100644 index 00000000..859c7adc --- /dev/null +++ b/.config/nvim-min/lua/config/keymaps-pre-colemak.bak @@ -0,0 +1,117 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here +local map = vim.keymap.set +local wk = require("which-key") + +vim.keymap.set({ "i", "n" }, "", "") + +local dirmap = { + up = "w0", + down = "w$", +} + +-- Bind arrows to hjkl to my colemak-dh motions work as expected +map({ "n", "x" }, "", "k", { desc = "Up", remap = true }) +map({ "n", "x" }, "", "j", { desc = "Down", remap = true }) +map({ "n", "x" }, "", "h", { desc = "Left", remap = true }) +map({ "n", "x" }, "", "l", { desc = "Right", remap = true }) + +map({ "n", "t", "i" }, "", " TmuxNavigateLeft", { desc = "Switch Window Left", remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateRight", { desc = "Switch Window Right", remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateUp", { remap = true }) +map({ "n", "t", "i" }, "", " TmuxNavigateDown", { desc = "Switch Window Down", remap = true }) + +map({ "x" }, "", "", { remap = true }) +map({ "x" }, "", "", { remap = true }) +map({ "n", "x", "v" }, "", "", { remap = true }) +map({ "n", "x", "v" }, "", "", { remap = true }) +map({ "n" }, "", "[b", { desc = "Previous Buffer", remap = true }) +map({ "n" }, "", "]b", { desc = "Next Buffer", remap = true }) +map({ "n" }, "", "5j", { remap = true }) +map({ "n" }, "", "5k", { remap = true }) +map({ "i" }, "", "", { desc = "Escape insert mode", remap = true }) + +-- better navigation +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "n", "nzz", { remap = false }) +map({ "n" }, "N", "Nzz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n", "x" }, "", "$", { remap = false }) +map({ "n", "x" }, "", "0", { remap = false }) + +-- easily access null register +map({ "n", "x" }, "n", '"_', { remap = false, silent = true, desc = "Null Register" }) + +-- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak +vim.keymap.del({ "n" }, "") +vim.keymap.del({ "n" }, "") +map({ "n" }, "", "L", { remap = false }) +map({ "n" }, "", "H", { remap = false }) +-- better delete and put + +-- better quit +map("n", "", "qa", { desc = "Quit All" }) + +map("n", "", function() + Snacks.bufdelete() +end, { remap = true, desc = "Delete Buffer" }) + +-- yank history +map({ "n", "x" }, "fp", function() + if LazyVim.pick.picker.name == "telescope" then + require("telescope").extensions.yank_history.yank_history({}) + else + vim.cmd([[YankyRingHistory]]) + end +end, { desc = "Open Yank History", remap = false }) + +-- TODO: add leader + y for save current buf, leader + Y to write all +map({ "n", "x" }, "y", ":w", { desc = "Save" }) +map({ "n", "x" }, "Y", ":wa", { desc = "Save All" }) + +-- Zen Mode +map("n", "uz", "ZenMode", { desc = "Toggle Zen Mode" }) + +-- Source Current File +map("n", "x", "source %", { desc = "Source current file" }) + +-- Obsidian +-- o is the prefix for all Obsidian bindings + +wk.add({ + { "o", group = "Obsidian" }, + { "od", group = "Daily Note" }, + { "ol", group = "Follow Link" }, +}) + +map("n", "oo", "ObsidianQuickSwitch", { desc = "Obsidian Quick Switch" }) +map("n", "o/", "ObsidianSearch", { desc = "Obsidian Grep" }) +-- This one will open the command line and let the user type the arg +map("n", "on", function() + require("command-key").command("ObsidianNew") +end, { desc = "Obsidian New Note" }) +map("n", "ob", "ObsidianBacklinks", { desc = "Obsidian Backlinks" }) +map("n", "ot", "ObsidianTags", { desc = "Obsidian Tags" }) +map("n", "olv", "ObsidianFollowLink vsplit", { desc = "Obsidian Follow Link Vsplit" }) +map("n", "olh", "ObsidianFollowLink hsplit", { desc = "Obsidian Follow Link Hsplit" }) +map("n", "odt", "ObsidianToday", { desc = "Obsidian Open Today's Daily" }) +map("n", "ods", "ObsidianDailies", { desc = "Obsidian Search Dailies" }) +map("n", "ols", "ObsidianLinks", { desc = "Obsidian Search Links" }) +map("x", "oll", function() + require("command-key").command("ObsidianLink") +end, { desc = "Obsidian Link Visual To Existing Note" }) +map("x", "oln", function() + require("command-key").command("ObsidianLinkNew") +end, { desc = "Obsidian Link Visual To New Note" }) +map("x", "ole", function() + require("command-key").command("ObsidianExtractNote") +end, { desc = "Obsidian Copy Selection To New Note & Link" }) + +map("n", "or", function() + require("command-key").command("ObsidianRename") +end, { desc = "Obsidian Rename" }) +map("n", "oc", "ObsidianTOC", { desc = "Obsidian Table Of Contents" }) +-- TODO: Add binds for templates diff --git a/.config/nvim-min/lua/config/keymaps.lua b/.config/nvim-min/lua/config/keymaps.lua new file mode 100644 index 00000000..686402b4 --- /dev/null +++ b/.config/nvim-min/lua/config/keymaps.lua @@ -0,0 +1,114 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here +local map = vim.keymap.set +local wk = require("which-key") + +vim.keymap.set({ "i", "n" }, "", "") + +-- Bind arrows to hjkl to my colemak-dh motions work as expected +map({ "n", "x" }, "", "k", { desc = "Up", remap = true }) +map({ "n", "x" }, "", "j", { desc = "Down", remap = true }) +map({ "n", "x" }, "", "h", { desc = "Left", remap = true }) +map({ "n", "x" }, "", "l", { desc = "Right", remap = true }) + +map({ "n", "t", "i" }, "", "h", { desc = "Switch Window Left", remap = true }) +map({ "n", "t", "i" }, "", "j", { desc = "Switch Window Right", remap = true }) +map({ "n", "t", "i" }, "", "k", { remap = true }) +map({ "n", "t", "i" }, "", "l", { desc = "Switch Window Down", remap = true }) + +map({ "x" }, "", "", { remap = true }) +map({ "x" }, "", "", { remap = true }) +map({ "n", "x", "v" }, "", "", { remap = true }) +map({ "n", "x", "v" }, "", "", { remap = true }) +map({ "n" }, "", "[b", { desc = "Previous Buffer", remap = true }) +map({ "n" }, "", "]b", { desc = "Next Buffer", remap = true }) +map({ "n" }, "", "5j", { remap = true }) +map({ "n" }, "", "5k", { remap = true }) +map({ "i" }, "", "", { desc = "Escape insert mode", remap = true }) + +-- better navigation +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "n", "nzz", { remap = false }) +map({ "n" }, "N", "Nzz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n" }, "", "zz", { remap = false }) +map({ "n", "x" }, "", "$", { remap = false }) +map({ "n", "x" }, "", "0", { remap = false }) + +-- easily access null register +map({ "n", "x" }, "n", '"_', { remap = false, silent = true, desc = "Null Register" }) + +-- remove the default lazyvim, and also swap H and L (for move cursor) to make more sense on colemak +vim.keymap.del({ "n" }, "") +vim.keymap.del({ "n" }, "") +map({ "n" }, "", "L", { remap = false }) +map({ "n" }, "", "H", { remap = false }) +-- better delete and put + +-- better quit +map("n", "", "qa", { desc = "Quit All" }) + +map("n", "", function() + Snacks.bufdelete() +end, { remap = true, desc = "Delete Buffer" }) + +-- yank history +map({ "n", "x" }, "fp", function() + if LazyVim.pick.picker.name == "telescope" then + require("telescope").extensions.yank_history.yank_history({}) + else + vim.cmd([[YankyRingHistory]]) + end +end, { desc = "Open Yank History", remap = false }) + +-- TODO: add leader + y for save current buf, leader + Y to write all +map({ "n", "x" }, "y", ":w", { desc = "Save" }) +map({ "n", "x" }, "Y", ":wa", { desc = "Save All" }) + +-- Zen Mode +-- map("n", "uz", "ZenMode", { desc = "Toggle Zen Mode" }) + +-- Source Current File +map("n", "x", "source %", { desc = "Source current file" }) + +-- Obsidian +-- o is the prefix for all Obsidian bindings + +wk.add({ + { "o", group = "Obsidian" }, + { "od", group = "Daily Note" }, + { "ol", group = "Follow Link" }, +}) + +map("n", "oo", "ObsidianQuickSwitch", { desc = "Obsidian Quick Switch" }) +map("n", "o/", "ObsidianSearch", { desc = "Obsidian Grep" }) +-- This one will open the command line and let the user type the arg +map("n", "on", function() + require("command-key").command("ObsidianNew") +end, { desc = "Obsidian New Note" }) +map("n", "ob", "ObsidianBacklinks", { desc = "Obsidian Backlinks" }) +map("n", "ot", "ObsidianTags", { desc = "Obsidian Tags" }) +map("n", "olv", "ObsidianFollowLink vsplit", { desc = "Obsidian Follow Link Vsplit" }) +map("n", "olh", "ObsidianFollowLink hsplit", { desc = "Obsidian Follow Link Hsplit" }) +map("n", "odt", "ObsidianToday", { desc = "Obsidian Open Today's Daily" }) +map("n", "ods", "ObsidianDailies", { desc = "Obsidian Search Dailies" }) +map("n", "ols", "ObsidianLinks", { desc = "Obsidian Search Links" }) +map("x", "oll", function() + require("command-key").command("ObsidianLink") +end, { desc = "Obsidian Link Visual To Existing Note" }) +map("x", "oln", function() + require("command-key").command("ObsidianLinkNew") +end, { desc = "Obsidian Link Visual To New Note" }) +map("x", "ole", function() + require("command-key").command("ObsidianExtractNote") +end, { desc = "Obsidian Copy Selection To New Note & Link" }) + +map("n", "or", function() + require("command-key").command("ObsidianRename") +end, { desc = "Obsidian Rename" }) +map("n", "oc", "ObsidianTOC", { desc = "Obsidian Table Of Contents" }) +-- TODO: Add binds for templates +-- cmdh.fix_hjkl() +-- cmdh.fix_all() diff --git a/.config/nvim-min/lua/config/lazy.lua b/.config/nvim-min/lua/config/lazy.lua new file mode 100644 index 00000000..0a0b5014 --- /dev/null +++ b/.config/nvim-min/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = {} }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/.config/nvim-min/lua/config/options.lua b/.config/nvim-min/lua/config/options.lua new file mode 100644 index 00000000..54b38985 --- /dev/null +++ b/.config/nvim-min/lua/config/options.lua @@ -0,0 +1,8 @@ +-- 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 +local opt = vim.opt +opt.scrolloff = 2 + +opt.spell = false +-- opt.spelloptions = "camel" diff --git a/.config/nvim-min/lua/custom/plugins/init.lua b/.config/nvim-min/lua/custom/plugins/init.lua deleted file mode 100644 index be0eb9d8..00000000 --- a/.config/nvim-min/lua/custom/plugins/init.lua +++ /dev/null @@ -1,5 +0,0 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information -return {} diff --git a/.config/nvim-min/lua/kickstart/health.lua b/.config/nvim-min/lua/kickstart/health.lua deleted file mode 100644 index b59d0864..00000000 --- a/.config/nvim-min/lua/kickstart/health.lua +++ /dev/null @@ -1,52 +0,0 @@ ---[[ --- --- This file is not required for your own configuration, --- but helps people determine if their system is setup correctly. --- ---]] - -local check_version = function() - local verstr = tostring(vim.version()) - if not vim.version.ge then - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - return - end - - if vim.version.ge(vim.version(), '0.10-dev') then - vim.health.ok(string.format("Neovim version is: '%s'", verstr)) - else - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - end -end - -local check_external_reqs = function() - -- Basic utils: `git`, `make`, `unzip` - for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do - local is_executable = vim.fn.executable(exe) == 1 - if is_executable then - vim.health.ok(string.format("Found executable: '%s'", exe)) - else - vim.health.warn(string.format("Could not find executable: '%s'", exe)) - end - end - - return true -end - -return { - check = function() - vim.health.start 'kickstart.nvim' - - vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` - - Fix only warnings for plugins and languages you intend to use. - Mason will give warnings for languages that are not installed. - You do not need to install, unless you want to use those languages!]] - - local uv = vim.uv or vim.loop - vim.health.info('System Information: ' .. vim.inspect(uv.os_uname())) - - check_version() - check_external_reqs() - end, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/autopairs.lua b/.config/nvim-min/lua/kickstart/plugins/autopairs.lua deleted file mode 100644 index 87a7e5ff..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/autopairs.lua +++ /dev/null @@ -1,16 +0,0 @@ --- autopairs --- https://github.com/windwp/nvim-autopairs - -return { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - -- Optional dependency - dependencies = { 'hrsh7th/nvim-cmp' }, - config = function() - require('nvim-autopairs').setup {} - -- If you want to automatically add `(` after selecting a function or method - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - local cmp = require 'cmp' - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - end, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/debug.lua b/.config/nvim-min/lua/kickstart/plugins/debug.lua deleted file mode 100644 index 753cb0ce..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/debug.lua +++ /dev/null @@ -1,148 +0,0 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - -return { - -- NOTE: Yes, you can install new plugins here! - 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well - dependencies = { - -- Creates a beautiful debugger UI - 'rcarriga/nvim-dap-ui', - - -- Required dependency for nvim-dap-ui - 'nvim-neotest/nvim-nio', - - -- Installs the debug adapters for you - 'williamboman/mason.nvim', - 'jay-babu/mason-nvim-dap.nvim', - - -- Add your own debuggers here - 'leoluz/nvim-dap-go', - }, - keys = { - -- Basic debugging keymaps, feel free to change to your liking! - { - '', - function() - require('dap').continue() - end, - desc = 'Debug: Start/Continue', - }, - { - '', - function() - require('dap').step_into() - end, - desc = 'Debug: Step Into', - }, - { - '', - function() - require('dap').step_over() - end, - desc = 'Debug: Step Over', - }, - { - '', - function() - require('dap').step_out() - end, - desc = 'Debug: Step Out', - }, - { - 'b', - function() - require('dap').toggle_breakpoint() - end, - desc = 'Debug: Toggle Breakpoint', - }, - { - 'B', - function() - require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') - end, - desc = 'Debug: Set Breakpoint', - }, - -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. - { - '', - function() - require('dapui').toggle() - end, - desc = 'Debug: See last session result.', - }, - }, - config = function() - local dap = require 'dap' - local dapui = require 'dapui' - - require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - }, - } - - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = 'โ–พ', collapsed = 'โ–ธ', current_frame = '*' }, - controls = { - icons = { - pause = 'โธ', - play = 'โ–ถ', - step_into = 'โŽ', - step_over = 'โญ', - step_out = 'โฎ', - step_back = 'b', - run_last = 'โ–ถโ–ถ', - terminate = 'โน', - disconnect = 'โ', - }, - }, - } - - -- Change breakpoint icons - -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' }) - -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' }) - -- local breakpoint_icons = vim.g.have_nerd_font - -- and { Breakpoint = '๎ฉฑ', BreakpointCondition = '๎ชง', BreakpointRejected = '๎ฎŒ', LogPoint = '๎ชซ', Stopped = '๎ฎ‹' } - -- or { Breakpoint = 'โ—', BreakpointCondition = 'โŠœ', BreakpointRejected = 'โŠ˜', LogPoint = 'โ—†', Stopped = 'โญ”' } - -- for type, icon in pairs(breakpoint_icons) do - -- local tp = 'Dap' .. type - -- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak' - -- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl }) - -- end - - dap.listeners.after.event_initialized['dapui_config'] = dapui.open - dap.listeners.before.event_terminated['dapui_config'] = dapui.close - dap.listeners.before.event_exited['dapui_config'] = dapui.close - - -- Install golang specific config - require('dap-go').setup { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, - }, - } - end, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/gitsigns.lua b/.config/nvim-min/lua/kickstart/plugins/gitsigns.lua deleted file mode 100644 index 4bcc70f4..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/gitsigns.lua +++ /dev/null @@ -1,61 +0,0 @@ --- Adds git related signs to the gutter, as well as utilities for managing changes --- NOTE: gitsigns is already included in init.lua but contains only the base --- config. This will add also the recommended keymaps. - -return { - { - 'lewis6991/gitsigns.nvim', - opts = { - on_attach = function(bufnr) - local gitsigns = require 'gitsigns' - - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end - - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal { ']c', bang = true } - else - gitsigns.nav_hunk 'next' - end - end, { desc = 'Jump to next git [c]hange' }) - - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal { '[c', bang = true } - else - gitsigns.nav_hunk 'prev' - end - end, { desc = 'Jump to previous git [c]hange' }) - - -- Actions - -- visual mode - map('v', 'hs', function() - gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'stage git hunk' }) - map('v', 'hr', function() - gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'reset git hunk' }) - -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() - gitsigns.diffthis '@' - end, { desc = 'git [D]iff against last commit' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) - end, - }, - }, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/indent_line.lua b/.config/nvim-min/lua/kickstart/plugins/indent_line.lua deleted file mode 100644 index ed7f2693..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/indent_line.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {}, - }, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/lint.lua b/.config/nvim-min/lua/kickstart/plugins/lint.lua deleted file mode 100644 index 907c6bf3..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/lint.lua +++ /dev/null @@ -1,60 +0,0 @@ -return { - - { -- Linting - 'mfussenegger/nvim-lint', - event = { 'BufReadPre', 'BufNewFile' }, - config = function() - local lint = require 'lint' - lint.linters_by_ft = { - markdown = { 'markdownlint' }, - } - - -- To allow other plugins to add linters to require('lint').linters_by_ft, - -- instead set linters_by_ft like this: - -- lint.linters_by_ft = lint.linters_by_ft or {} - -- lint.linters_by_ft['markdown'] = { 'markdownlint' } - -- - -- However, note that this will enable a set of default linters, - -- which will cause errors unless these tools are available: - -- { - -- clojure = { "clj-kondo" }, - -- dockerfile = { "hadolint" }, - -- inko = { "inko" }, - -- janet = { "janet" }, - -- json = { "jsonlint" }, - -- markdown = { "vale" }, - -- rst = { "vale" }, - -- ruby = { "ruby" }, - -- terraform = { "tflint" }, - -- text = { "vale" } - -- } - -- - -- You can disable the default linters by setting their filetypes to nil: - -- lint.linters_by_ft['clojure'] = nil - -- lint.linters_by_ft['dockerfile'] = nil - -- lint.linters_by_ft['inko'] = nil - -- lint.linters_by_ft['janet'] = nil - -- lint.linters_by_ft['json'] = nil - -- lint.linters_by_ft['markdown'] = nil - -- lint.linters_by_ft['rst'] = nil - -- lint.linters_by_ft['ruby'] = nil - -- lint.linters_by_ft['terraform'] = nil - -- lint.linters_by_ft['text'] = nil - - -- Create autocommand which carries out the actual linting - -- on the specified events. - local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) - vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { - group = lint_augroup, - callback = function() - -- Only run the linter in buffers that you can modify in order to - -- avoid superfluous noise, notably within the handy LSP pop-ups that - -- describe the hovered symbol using Markdown. - if vim.opt_local.modifiable:get() then - lint.try_lint() - end - end, - }) - end, - }, -} diff --git a/.config/nvim-min/lua/kickstart/plugins/neo-tree.lua b/.config/nvim-min/lua/kickstart/plugins/neo-tree.lua deleted file mode 100644 index bd442269..00000000 --- a/.config/nvim-min/lua/kickstart/plugins/neo-tree.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim - -return { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - }, - cmd = 'Neotree', - keys = { - { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, - }, - opts = { - filesystem = { - window = { - mappings = { - ['\\'] = 'close_window', - }, - }, - }, - }, -} diff --git a/.config/nvim-min/lua/link-hl.lua b/.config/nvim-min/lua/link-hl.lua new file mode 100644 index 00000000..562d8d17 --- /dev/null +++ b/.config/nvim-min/lua/link-hl.lua @@ -0,0 +1,59 @@ +local M = {} + +-- test comment + +M.go_map = { + -- ["@lsp.type.class"] = { link = "Structure" }, + -- ["@lsp.type.decorator"] = { link = "Function" }, + -- ["@lsp.type.enum"] = { link = "Structure" }, + -- ["@lsp.type.enumMember"] = { link = "Constant" }, + -- ["@lsp.type.function"] = { link = "Function" }, + -- ["@lsp.type.interface"] = { link = "Structure" }, + ["@lsp.type.macro"] = "Macro", + ["@lsp.type.method"] = "@function.method", -- Function + ["@lsp.type.namespace"] = "@module", -- Structure + ["@lsp.type.parameter"] = "@variable.parameter", -- Identifier + -- ["@lsp.type.property"] = { link = "Identifier" }, + -- ["@lsp.type.struct"] = { link = "Structure" }, + -- ["@lsp.type.type"] = { link = "Type" }, + -- ["@lsp.type.typeParameter"] = { link = "TypeDef" }, + ["@lsp.type.variable"] = "@variable", -- Identifier + ["@lsp.type.comment"] = "@comment", -- Comment + ["@lsp.type.type"] = "gotype", + + ["@lsp.type.selfParameter"] = "@variable.builtin", + -- ["@lsp.type.builtinConstant"] = { link = "@constant.builtin" }, + ["@lsp.type.builtinConstant"] = "@constant.builtin", + ["@lsp.type.magicFunction"] = "@function.builtin", + + ["@lsp.mod.readonly"] = "Constant", + ["@lsp.mod.typeHint"] = "Type", + -- ["@lsp.mod.defaultLibrary"] = { link = "Special" }, + -- ["@lsp.mod.builtin"] = { link = "Special" }, + + ["@lsp.typemod.operator.controlFlow"] = "@keyword.exception", + ["@lsp.typemod.keyword.documentation"] = "Special", + + ["@lsp.typemod.variable.global"] = "Constant", + ["@lsp.typemod.variable.static"] = "Constant", + ["@lsp.typemod.variable.defaultLibrary"] = "Special", + + ["@lsp.typemod.function.builtin"] = "@function.builtin", + ["@lsp.typemod.function.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.method.defaultLibrary"] = "@function.builtin", + + ["@lsp.typemod.operator.injected"] = "Operator", + ["@lsp.typemod.string.injected"] = "String", + ["@lsp.typemod.variable.injected"] = "@variable", + + -- ["@lsp.typemod.function.readonly"] = { fg = theme.syn.fun, bold = true }, +} + +function M.link(table, lang) + for hl, input in pairs(table) do + local l = input .. "." .. lang + vim.api.nvim_set_hl(0, hl, { link = l }) + end +end + +return M diff --git a/.config/nvim-min/lua/md-utils.lua b/.config/nvim-min/lua/md-utils.lua new file mode 100644 index 00000000..5de8eddd --- /dev/null +++ b/.config/nvim-min/lua/md-utils.lua @@ -0,0 +1,11 @@ +local M = {} + +M.isCursorInList = function() + local line = vim.api.nvim_get_current_line() + if line:match("^%s*[%-%*%+]%s+") or line:match("^%s*%d+%.%s+") then + return true + end + return false +end + +return M diff --git a/.config/nvim-min/lua/plugins/dashboard.lua b/.config/nvim-min/lua/plugins/dashboard.lua new file mode 100644 index 00000000..51355823 --- /dev/null +++ b/.config/nvim-min/lua/plugins/dashboard.lua @@ -0,0 +1,103 @@ +return { + "nvimdev/dashboard-nvim", + lazy = false, -- As https://github.com/nvimdev/dashboard-nvim/pull/450, dashboard-nvim shouldn't be lazy-loaded to properly handle stdin. + opts = function() + -- local logo = [[ + -- โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ•— Z + -- โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•”โ•โ•โ–ˆโ–ˆโ•—โ•šโ•โ•โ–ˆโ–ˆโ–ˆโ•”โ•โ•šโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ•‘ Z + -- โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ–ˆโ•”โ• โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•‘ z + -- โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•”โ•โ•โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ–ˆโ•”โ• โ•šโ–ˆโ–ˆโ•”โ• โ•šโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘ z + -- โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘ โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ•šโ•โ• โ–ˆโ–ˆโ•‘ + -- โ•šโ•โ•โ•โ•โ•โ•โ•โ•šโ•โ• โ•šโ•โ•โ•šโ•โ•โ•โ•โ•โ•โ• โ•šโ•โ• โ•šโ•โ•โ•โ• โ•šโ•โ•โ•šโ•โ• โ•šโ•โ• + -- ]] + + local saturn = [[ + _.oo. + _.u[[/;:,. .odMMMMMM' + .o888UU[[[/;:-. .o@P^ MMM^ + oN88888UU[[[/;::-. dP^ + dNMMNN888UU[[[/;:--. .o@P^ + ,MMMMMMN888UU[[/;::-. o@^ + NNMMMNN888UU[[[/~.o@P^ + 888888888UU[[[/o@^-.. + oI8888UU[[[/o@P^:--.. + .@^ YUU[[[/o@^;::---.. + oMP ^/o@P^;:::---.. + .dMMM .o@^ ^;::---... + dMMMMMMM@^` `^^^^ +YMMMUP^ + ^^ +]] + + -- logo = string.rep("\n", 8) .. logo .. "\n\n" + saturn = string.rep("\n", 8) .. saturn .. "\n\n" + + local function loadObsidian() + -- require("lazy").setup(require("plugins.obsidian")) + require("obsidian") + -- vim.api.nvim_input("ObsidianWorkspace") + vim.api.nvim_input("ObsidianTags") + end + local function openConfig() + local dir = "~/.config/nvim/" + vim.api.nvim_set_current_dir(dir) + vim.cmd("edit" .. dir) + end + + local opts = { + theme = "doom", + hide = { + -- this is taken care of by lualine + -- enabling this messes up the actual laststatus setting after loading a file + statusline = false, + }, + config = { + -- header = vim.split(logo, "\n"), + header = vim.split(saturn, "\n"), + -- stylua: ignore + center = { + -- { action = function() vim.cmd("edit " .. "~/second-brain/00-index/00-index.md") end, desc = " Open Obsidian Vault", icon = "๎ŠŒ ", key = "o" }, + -- { action = 'lua LazyVim.pick()()', desc = " Find File", icon = "๏€‚ ", key = "f" }, + -- { action = loadObsidian, desc = " Obsidian Tags", icon = "๓ฑค‡ ", key = "o" }, + { action = "ene | startinsert", desc = " New File", icon = "๏…› ", key = "n" }, + -- { action = function () vim.api.nvim_input("ObsidianQuickSwitch") end, desc = " Obsidian", icon = "๏€‚ ", key = "o"}, + { action = 'lua LazyVim.pick("oldfiles")()', desc = " Recent Files", icon = "๏ƒ… ", key = "r" }, + -- { action = 'lua LazyVim.pick("live_grep")()', desc = " Grep", icon = "๏€ข ", key = "/" }, + -- { action = function() LazyVim.lazygit( { cwd = LazyVim.root.git() }) end, desc = " Git", icon = "๎œ‚ ", key = "g" }, + { action = 'lua LazyVim.pick.config_files()()', desc = " Search Config", icon = "๏ฃ ", key = "c" }, + -- { action = openConfig, desc = " Open Config", icon = "๏‚… ", key = "c" }, + { action = 'lua require("persistence").load()', desc = " Restore Session", icon = "๎ˆ ", key = "s" }, + -- { action = 'lua require("persistence").select()', desc = " Select Session", icon = "๓ฑฆž ", key = "S" }, + -- { action = "LazyExtras", desc = " Lazy Extras", icon = "๎ชŒ ", key = "x" }, + -- { action = "Lazy", desc = " Lazy", icon = "๓ฐ’ฒ ", key = "l" }, + { action = function() vim.api.nvim_input("qa") end, desc = " Quit", icon = "๏ฆ ", key = "q" }, + }, + footer = function() + local stats = require("lazy").stats() + local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100) + return { "โšก Neovim loaded " .. stats.loaded .. "/" .. stats.count .. " plugins in " .. ms .. "ms" } + end, + }, + } + + for _, button in ipairs(opts.config.center) do + button.desc = button.desc .. string.rep(" ", 43 - #button.desc) + button.key_format = " %s" + end + + -- open dashboard after closing lazy + if vim.o.filetype == "lazy" then + vim.api.nvim_create_autocmd("WinClosed", { + pattern = tostring(vim.api.nvim_get_current_win()), + once = true, + callback = function() + vim.schedule(function() + vim.api.nvim_exec_autocmds("UIEnter", { group = "dashboard" }) + end) + end, + }) + end + + return opts + end, +} diff --git a/.config/nvim-min/lua/plugins/disabled.lua b/.config/nvim-min/lua/plugins/disabled.lua new file mode 100644 index 00000000..26efacc3 --- /dev/null +++ b/.config/nvim-min/lua/plugins/disabled.lua @@ -0,0 +1,10 @@ +return { + { "nvim-neo-tree/neo-tree.nvim", enabled = false }, + { "folke/tokyonight.nvim", enabled = false }, + { "catpuccin/nvim", enabled = false }, + -- { "folke/noice.nvim", enabled = false }, +} +-- TODO: +-- figure out how to make markdown extra work together with Obsidian, disable it for now +-- either I can use the extra in markdown files but disable it and use obsidian in vault md files +-- OR find some way for them to coexist? diff --git a/.config/nvim-min/lua/plugins/extend-mini-files.lua b/.config/nvim-min/lua/plugins/extend-mini-files.lua new file mode 100644 index 00000000..0765d9fe --- /dev/null +++ b/.config/nvim-min/lua/plugins/extend-mini-files.lua @@ -0,0 +1,54 @@ +return { + "echasnovski/mini.files", + lazy = false, + keys = { + { + "e", + function() + require("mini.files").open(vim.api.nvim_buf_get_name(0), true) + end, + desc = "Open mini.files (current file directory)", + }, + { + "fm", + function() + require("mini.files").open(vim.uv.cwd(), true) + end, + desc = "Open mini.files (cwd)", + }, + { + "E", + function() + require("mini.files").open(LazyVim.root(), true) + end, + desc = "Open mini.files (root)", + }, + }, + opts = { + content = { + -- hide hidden files by default + filter = function(fs_entry) + return not vim.startswith(fs_entry.name, ".") + end, + }, + mappings = { + go_in_plus = "", + synchronize = ":w", + -- close = "q", + -- go_in = "i", + -- go_out = "m", + -- go_out_plus = "M", + -- mark_goto = "'", + -- mark_set = "k", + -- reset = "", + -- reveal_cwd = "@", + -- show_help = "g?", + -- trim_left = "<", + -- trim_right = ">", + }, + options = { + permanent_delete = false, + use_as_default_explorer = true, + }, + }, +} diff --git a/.config/nvim-min/lua/plugins/lazy.lua b/.config/nvim-min/lua/plugins/lazy.lua new file mode 100644 index 00000000..00a24a93 --- /dev/null +++ b/.config/nvim-min/lua/plugins/lazy.lua @@ -0,0 +1,8 @@ +return { + "folke/lazy.nvim", + opts = { + install = { + colorscheme = { "noirbuddy" }, + }, + }, +} diff --git a/.config/nvim-min/lua/plugins/lualine.lua b/.config/nvim-min/lua/plugins/lualine.lua new file mode 100644 index 00000000..0618251d --- /dev/null +++ b/.config/nvim-min/lua/plugins/lualine.lua @@ -0,0 +1,20 @@ +-- local noirbuddy_lualine = require("noirbuddy.plugins.lualine") +return { + "nvim-lualine/lualine.nvim", + dependencies = { + "jesseleite/nvim-noirbuddy", + }, + config = function() + local noirbuddy_lualine = require("noirbuddy.plugins.lualine") + local theme = noirbuddy_lualine.theme + local sections = noirbuddy_lualine.sections + local inactive_sections = noirbuddy_lualine.inactive_sections + require("lualine").setup({ + options = { + theme = theme, + }, + sections = sections, + inactive_sections = inactive_sections, + }) + end, +} diff --git a/.config/nvim-min/lua/plugins/markdown.lua b/.config/nvim-min/lua/plugins/markdown.lua new file mode 100644 index 00000000..d54bbaa1 --- /dev/null +++ b/.config/nvim-min/lua/plugins/markdown.lua @@ -0,0 +1,35 @@ +local function retmap() + local m = { + inline_surround_toggle = "mm", -- (string|boolean) toggle inline style + inline_surround_toggle_line = "mmm", -- (string|boolean) line-wise toggle inline style + inline_surround_delete = "md", -- (string|boolean) delete emphasis surrounding cursor + inline_surround_change = "mc", -- (string|boolean) change emphasis surrounding cursor + -- link_add = "ml", -- (string|boolean) add link + -- link_follow = "mx", -- (string|boolean) follow link + go_curr_heading = "mh", + go_parent_heading = "mH", + go_next_heading = "", + go_prev_heading = "", + } + require("which-key").add({ + { "m", group = "Markdown" }, + }) + vim.keymap.set("n", "mu", "MDListItemAbove", { desc = "Insert List Item Above", silent = true }) + vim.keymap.set( + { "n", "x" }, + "ml", + "MDResetListNumbering", + { desc = "Reset List Numbering", silent = true } + ) + return m +end +local opts = { + mappings = retmap(), +} +local spec = { + "tadmccorkle/markdown.nvim", + ft = "markdown", + opts = opts, +} + +return spec diff --git a/.config/nvim-min/lua/plugins/noirbuddy.lua b/.config/nvim-min/lua/plugins/noirbuddy.lua new file mode 100644 index 00000000..ee51683c --- /dev/null +++ b/.config/nvim-min/lua/plugins/noirbuddy.lua @@ -0,0 +1,106 @@ +-- #0f0f0f +-- #933737 +-- #A23D3D +-- #994848 +-- #7B7F80 +-- #7C8080 +-- #8D8D8D +-- #d4d4d4 +-- #949494 +-- #933737 +-- #A23D3D +-- #994848 +-- #7B7F80 +-- #7C8080 +-- #8D8D8D +-- #d4d4d4 +return { + { + "jesseleite/nvim-noirbuddy", + lazy = false, + dependencies = { + { "tjdevries/colorbuddy.nvim" }, + }, + }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = function() + local noiropts = { + -- preset = "miami-nights", + styles = { + italic = true, + bold = true, + underline = true, + undercurl = false, + }, + colors = { + secondary = "#BD4C4C", + primary = "#933737", + diagnostic_error = "#AC2020", + diagnostic_warning = "#ff7700", + diagnostic_info = "#d5d5d5", + diagnostic_hint = "#d5d5d5", + diff_add = "#f5f5f5", + diff_change = "#737373", + diff_delete = "#AC2020", + }, + } + require("noirbuddy").setup(noiropts) + local colorbuddy = require("colorbuddy") + + local Color = colorbuddy.Color + local colors = colorbuddy.colors + local Group = colorbuddy.Group + local groups = colorbuddy.groups + local styles = colorbuddy.styles + Color.new("error", "#AC2020") + Color.new("warn", "#f79000") + Color.new("warnborder", "#79491d") + Color.new("infoborder", "#215858") + Color.new("complement", "#379393") + -- Override specific highlight groups + -- Group.new("Type", colors.complement) + Group.new("DiagnosticOk", colors.diagnostic_info) + Group.new("Added", colors.diff_change) + Group.new("Removed", colors.primary) + Group.new("Changed", colors.complement) + Group.new("@markup.link", colors.secondary) + Group.new("@markup.list", colors.complement) + Group.new("@variable", colors.complement) + Group.new("@type.builtin", colors.primary) + Group.new("@number", colors.secondary) + Group.new("NonText", colors.noir_7) + Group.new("Comment", colors.noir_6) + Group.new("@comment", colors.noir_6) + Group.new("@boolean.go", colors.complement) + Group.new("@boolean", colors.complement) + Group.new("@keyword.return", colors.complement) + -- Group.new("gotype", colors.primary) + Group.new("Boolean", colors.complement) + Group.new("Constant", colors.complement) + -- TODO: change these groups to match Snacks instead... + -- Is that even needed actually? + Group.new("DashboardHeader", colors.primary) + Group.new("DashboardIcon", colors.primary) + Group.new("DashboardKey", colors.complement) + Group.new("NotifyINFOBorder", colors.infoborder) + Group.new("NotifyINFOTitle", colors.complement) + Group.new("NotifyINFOIcon", colors.complement) + Group.new("NotifyWARNBorder", colors.warnborder) + Group.new("NotifyWARNTitle", colors.warn) + Group.new("NotifyWARNIcon", colors.warn) + Group.new("NotifyERRORBorder", colors.error) + Group.new("NotifyERRORTitle", colors.error) + Group.new("NotifyERRORIcon", colors.error) + Group.new("ErrorMsg", colors.noir_1, colors.error) + Group.new("SpellBad", nil, nil, styles.undercurl) + Group.new("SpellCap", nil, nil, styles.undercurl) + Group.new("String", colors.primary, nil, nil) + Group.new("Title", colors.primary, nil, styles.bold) + local linkhl = require("link-hl") + linkhl.link(linkhl.go_map, "go") + end, + }, + }, +} diff --git a/.config/nvim-min/lua/plugins/snacks.lua b/.config/nvim-min/lua/plugins/snacks.lua new file mode 100644 index 00000000..917a9882 --- /dev/null +++ b/.config/nvim-min/lua/plugins/snacks.lua @@ -0,0 +1,24 @@ +return { + "folke/snacks.nvim", + priority = 1000, + opts = { + bigfile = { + notify = true, + size = 1.5 * 1024 * 1024, -- 1.5MB + ---@param ctx {buf: number, ft:string} + setup = function(ctx) + vim.b.minianimate_disable = true + vim.cmd("set conceallevel=0") + vim.cmd("TSBufDisable highlight") + vim.opt_local.foldenable = false + vim.cmd("NoMatchParen") + vim.opt_local.cursorline = false + vim.opt_local.signcolumn = "no" + vim.opt_local.spell = false + vim.schedule(function() + vim.bo[ctx.buf].syntax = ctx.ft + end) + end, + }, + }, +} diff --git a/.config/nvim-min/lua/plugins/vim-dirtytalk.lua b/.config/nvim-min/lua/plugins/vim-dirtytalk.lua new file mode 100644 index 00000000..517e938c --- /dev/null +++ b/.config/nvim-min/lua/plugins/vim-dirtytalk.lua @@ -0,0 +1,9 @@ +return { + "psliwka/vim-dirtytalk", + build = ":DirtytalkUpdate", + config = function() + vim.opt.spelllang = { "en", "programming" } + end, + -- Note: let g:dirtytalk_blacklist=['lorem-ipsum'] to disable a wordlist + -- Mus run :DirtytalkUpdate after making this change +} diff --git a/.config/nvim-min/stylua.toml b/.config/nvim-min/stylua.toml new file mode 100644 index 00000000..5d6c50dc --- /dev/null +++ b/.config/nvim-min/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file