diff options
Diffstat (limited to 'dot-config/nvim-old')
22 files changed, 1059 insertions, 0 deletions
diff --git a/dot-config/nvim-old/.gitignore b/dot-config/nvim-old/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/dot-config/nvim-old/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/dot-config/nvim-old/.neoconf.json b/dot-config/nvim-old/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/dot-config/nvim-old/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/dot-config/nvim-old/LICENSE b/dot-config/nvim-old/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/dot-config/nvim-old/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/dot-config/nvim-old/README.md b/dot-config/nvim-old/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/dot-config/nvim-old/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/dot-config/nvim-old/init.lua b/dot-config/nvim-old/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/dot-config/nvim-old/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/dot-config/nvim-old/lazy-lock.json b/dot-config/nvim-old/lazy-lock.json new file mode 100644 index 0000000..eb7ba43 --- /dev/null +++ b/dot-config/nvim-old/lazy-lock.json @@ -0,0 +1,58 @@ +{ + "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "234fc048de931a0e42ebcad675bf6559d75e23df" }, + "conform.nvim": { "branch": "master", "commit": "02736cf359a3235c6d7d601a2f6bdc909e557513" }, + "cyberdream.nvim": { "branch": "main", "commit": "eba11f590026e74915e13d12a53cdbdc9b98d9f9" }, + "edge": { "branch": "master", "commit": "dfb013e84e8b8302d99ed75e664ccb2a05925ad3" }, + "everforest": { "branch": "master", "commit": "0909c23a2b8cbc337cffe91fda36381747e88506" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" }, + "gruvbox-material": { "branch": "master", "commit": "834dbf21836862300ced7444db4262b796330ab7" }, + "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, + "jellybeans.nvim": { "branch": "main", "commit": "28b80886b54396b13a2a85edf608926333e842b9" }, + "kanso.nvim": { "branch": "main", "commit": "c2525ebafa73c1860301716d9a17e3f07f5038b8" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.ai": { "branch": "main", "commit": "0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c" }, + "mini.comment": { "branch": "main", "commit": "a0c721115faff8d05505c0a12dab410084d9e536" }, + "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" }, + "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" }, + "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" }, + "modus-themes.nvim": { "branch": "master", "commit": "c57c2c56c9f0af04f3b609d11caa840880074784" }, + "moonfly": { "branch": "master", "commit": "ef85b89739bee184e204c89bc06280d62bd84039" }, + "multicursor.nvim": { "branch": "1.0", "commit": "0c6ceae228bf209e8b8717df9de500770c4e7022" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, + "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "8b349e822a36e9480aed96c6dd2f757f80524a35" }, + "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, + "nvim-treesitter": { "branch": "main", "commit": "55820833a32c61a423587e2826c5b59577aaddbb" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "2e5b8735a61d3cfaa65d9a8ff787a7b0a0a81b70" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, + "oxocarbon": { "branch": "main", "commit": "9f85f6090322f39b11ae04a343d4eb9d12a86897" }, + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "render-markdown.nvim": { "branch": "main", "commit": "10126effbafb74541b69219711dfb2c631e7ebf8" }, + "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, + "snacks.nvim": { "branch": "main", "commit": "c1e15001c0da18f740bc8bbe55fc0509f41bd9c6" }, + "sonokai": { "branch": "master", "commit": "48c809c887ce7b7828f7ea27408fc2ef2179efb5" }, + "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" }, + "tokyonight.nvim": { "branch": "main", "commit": "b13cfc1286d2aa8bda6ce137b79e857d5a3d5739" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, + "vague.nvim": { "branch": "main", "commit": "5689afda42d60c8db12ff93dd6e1322f59e46a93" }, + "venv-selector.nvim": { "branch": "main", "commit": "1ef6564d0bd0d9c4194711cfb696357a6119abd7" }, + "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/dot-config/nvim-old/lazyvim.json b/dot-config/nvim-old/lazyvim.json new file mode 100644 index 0000000..ef7d917 --- /dev/null +++ b/dot-config/nvim-old/lazyvim.json @@ -0,0 +1,15 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.mini-comment", + "lazyvim.plugins.extras.coding.mini-surround", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.elixir", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.python" + ], + "install_version": 8, + "news": { + "NEWS.md": "11866" + }, + "version": 8 +}
\ No newline at end of file diff --git a/dot-config/nvim-old/lua/config/autocmds.lua b/dot-config/nvim-old/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/dot-config/nvim-old/lua/config/autocmds.lua @@ -0,0 +1,8 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/dot-config/nvim-old/lua/config/keymaps.lua b/dot-config/nvim-old/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/dot-config/nvim-old/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/dot-config/nvim-old/lua/config/lazy.lua b/dot-config/nvim-old/lua/config/lazy.lua new file mode 100644 index 0000000..d73bfa1 --- /dev/null +++ b/dot-config/nvim-old/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/dot-config/nvim-old/lua/config/options.lua b/dot-config/nvim-old/lua/config/options.lua new file mode 100644 index 0000000..332d2af --- /dev/null +++ b/dot-config/nvim-old/lua/config/options.lua @@ -0,0 +1,24 @@ +-- 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 + +-- For clipboard over ssh +-- see https://github.com/LazyVim/LazyVim/discussions/2715#discussioncomment-11857449 +vim.opt.clipboard = "unnamedplus" + +vim.g.clipboard = { + name = "OSC 52", + copy = { + ["+"] = require("vim.ui.clipboard.osc52").copy("+"), + ["*"] = require("vim.ui.clipboard.osc52").copy("*"), + }, + paste = { + ["+"] = require("vim.ui.clipboard.osc52").paste("+"), + ["*"] = require("vim.ui.clipboard.osc52").paste("*"), + }, +} + +-- Python: use ruff instead of pyright +-- don't want a full LSP, just linting and formatting +-- see https://www.lazyvim.org/extras/lang/python +vim.g.lazyvim_python_lsp = "ruff" diff --git a/dot-config/nvim-old/lua/plugins/example.lua b/dot-config/nvim-old/lua/plugins/example.lua new file mode 100644 index 0000000..17f53d6 --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/example.lua @@ -0,0 +1,197 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "<leader>fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?> + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/handlebars.lua b/dot-config/nvim-old/lua/plugins/handlebars.lua new file mode 100644 index 0000000..b09dc3c --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/handlebars.lua @@ -0,0 +1,26 @@ +-- add language support for handlebars (.hbs) + +return { + + -- glimmer is the treesitter parser for handlebars + -- see https://github.com/nvim-treesitter/nvim-treesitter + { + "nvim-treesitter/nvim-treesitter", + opts = { ensure_installed = { "glimmer" } }, + }, + + -- we can use djLint to format handlebars + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + handlebars = { "djlint" }, + }, + formatters = { + djlint = { + prepend_args = { "--preserve-blank-lines" }, + }, + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/hardtime.lua b/dot-config/nvim-old/lua/plugins/hardtime.lua new file mode 100644 index 0000000..8e8078a --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/hardtime.lua @@ -0,0 +1,16 @@ +-- https://github.com/m4xshen/hardtime.nvim +return { + "m4xshen/hardtime.nvim", + lazy = false, + dependencies = { "MunifTanjim/nui.nvim" }, + opts = { + -- re-enable <up> <down> <left> <right> + -- for use with mutlicursor.nvim + disabled_keys = { + ["<Up>"] = false, + ["<Down>"] = false, + ["<Left>"] = false, + ["<Right>"] = false, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/hledger.lua b/dot-config/nvim-old/lua/plugins/hledger.lua new file mode 100644 index 0000000..240d0a6 --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/hledger.lua @@ -0,0 +1,18 @@ +-- add language support for hledger +-- based on options from https://www.lazyvim.org/extras/lang/astro + +return { + { + "nvim-treesitter/nvim-treesitter", + opts = { ensure_installed = { "ledger" } }, + }, + + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + ledger = { "hledger-fmt" }, + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/lualine.lua b/dot-config/nvim-old/lua/plugins/lualine.lua new file mode 100644 index 0000000..d71612a --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/lualine.lua @@ -0,0 +1,16 @@ +local wc = require("wordcount") + +return { + "nvim-lualine/lualine.nvim", + opts = { + sections = { + lualine_y = { + -- Add wordcount + { wc.wordcount, cond = wc.is_available }, + -- Existing conf + { "progress", separator = " ", padding = { left = 1, right = 0 } }, + { "location", padding = { left = 0, right = 1 } }, + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/markdown.lua b/dot-config/nvim-old/lua/plugins/markdown.lua new file mode 100644 index 0000000..48c957d --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/markdown.lua @@ -0,0 +1,37 @@ +return { + { + -- Disable linting + "mfussenegger/nvim-lint", + optional = true, + opts = { + linters_by_ft = { + markdown = {}, + }, + }, + }, + { + "MeanderingProgrammer/render-markdown.nvim", + opts = { + html = { + comment = { + -- Turn on / off HTML comment concealing. + conceal = false, + }, + }, + code = { + -- Whether to conceal nodes at the top and bottom of code blocks. + conceal_delimiters = false, + -- Width of the code block background. + -- | block | width of the code block | + -- | full | full width of the window | + width = "block", + -- Determines how the top / bottom of code block are rendered. + -- | none | do not render a border | + -- | thick | use the same highlight as the code body | + -- | thin | when lines are empty overlay the above & below icons | + -- | hide | conceal lines unless language name or icon is added | + border = "thick", + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/multicursor.lua b/dot-config/nvim-old/lua/plugins/multicursor.lua new file mode 100644 index 0000000..6e81074 --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/multicursor.lua @@ -0,0 +1,85 @@ +-- this is the example config shown at https://github.com/jake-stewart/multicursor.nvim/blob/main/readme.md +-- with the additional changes necessary to work with LazyVIm + +return { + "jake-stewart/multicursor.nvim", + branch = "1.0", + + -- the following changes are necessary to work with LazyVim + -- see https://github.com/jake-stewart/multicursor.nvim/issues/107 + keys = { "<up>", "<down>" }, -- explicitly tell LazyVim used keys to avoid replace + lazy = false, -- avoid lazy trying to lazy load based on those keys + + config = function() + local mc = require("multicursor-nvim") + mc.setup() + + local set = vim.keymap.set + + -- Add or skip cursor above/below the main cursor. + set({ "n", "x" }, "<up>", function() + mc.lineAddCursor(-1) + end) + set({ "n", "x" }, "<down>", function() + mc.lineAddCursor(1) + end) + set({ "n", "x" }, "<leader><up>", function() + mc.lineSkipCursor(-1) + end) + set({ "n", "x" }, "<leader><down>", function() + mc.lineSkipCursor(1) + end) + + -- Add or skip adding a new cursor by matching word/selection + set({ "n", "x" }, "<leader>n", function() + mc.matchAddCursor(1) + end) + set({ "n", "x" }, "<leader>s", function() + mc.matchSkipCursor(1) + end) + set({ "n", "x" }, "<leader>N", function() + mc.matchAddCursor(-1) + end) + set({ "n", "x" }, "<leader>S", function() + mc.matchSkipCursor(-1) + end) + + -- Add and remove cursors with control + left click. + set("n", "<c-leftmouse>", mc.handleMouse) + set("n", "<c-leftdrag>", mc.handleMouseDrag) + set("n", "<c-leftrelease>", mc.handleMouseRelease) + + -- Disable and enable cursors. + set({ "n", "x" }, "<c-q>", mc.toggleCursor) + + -- Mappings defined in a keymap layer only apply when there are + -- multiple cursors. This lets you have overlapping mappings. + mc.addKeymapLayer(function(layerSet) + -- Select a different cursor as the main one. + layerSet({ "n", "x" }, "<left>", mc.prevCursor) + layerSet({ "n", "x" }, "<right>", mc.nextCursor) + + -- Delete the main cursor. + layerSet({ "n", "x" }, "<leader>x", mc.deleteCursor) + + -- Enable and clear cursors using escape. + layerSet("n", "<esc>", function() + if not mc.cursorsEnabled() then + mc.enableCursors() + else + mc.clearCursors() + end + end) + end) + + -- Customize how cursors look. + local hl = vim.api.nvim_set_hl + hl(0, "MultiCursorCursor", { reverse = true }) + hl(0, "MultiCursorVisual", { link = "Visual" }) + hl(0, "MultiCursorSign", { link = "SignColumn" }) + hl(0, "MultiCursorMatchPreview", { link = "Search" }) + hl(0, "MultiCursorDisabledCursor", { reverse = true }) + hl(0, "MultiCursorDisabledVisual", { link = "Visual" }) + hl(0, "MultiCursorDisabledSign", { link = "SignColumn" }) + end, +} diff --git a/dot-config/nvim-old/lua/plugins/theme.lua b/dot-config/nvim-old/lua/plugins/theme.lua new file mode 100644 index 0000000..166c3a9 --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/theme.lua @@ -0,0 +1,227 @@ +return { + -- gruvbox material + -- https://github.com/sainnhe/gruvbox-material + { + "sainnhe/gruvbox-material", + lazy = false, + priority = 1000, + config = function() + vim.g.gruvbox_material_transparent_background = 2 + end, + }, + + { + "sainnhe/everforest", + lazy = false, + priority = 1000, + config = function() + vim.g.everforest_transparent_background = 2 + end, + }, + + { + "webhooked/kanso.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + }, + }, + + { + "vague2k/vague.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + }, + }, + + { + "AlexvZyl/nordic.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = { + bg = true, + float = true, + }, + }, + }, + + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + transparent_background = true, + float = { + transparent = true, + }, + color_overrides = { + frappe = { + -- colors from https://primer.style/product/getting-started/foundations/color-usage/ + -- see https://primer.style/primitives/storybook/?path=/story/color-base-scales--all-scales&globals=theme%3Adark_high_contrast + rosewater = "#91cbff", + flamingo = "#addcff", + pink = "#addcff", + mauve = "#ff9492", + red = "#ff9492", + maroon = "#ffffff", + peach = "#addcff", + yellow = "#f0b72f", + green = "#addcff", + teal = "#91cbff", + sky = "#91cbff", + sapphire = "#91cbff", + blue = "#dbb7ff", + lavender = "#ffffff", + text = "#ffffff", + subtext1 = "#d1d7e0", + subtext0 = "#b7bdc8", + overlay2 = "#9198a1", + overlay1 = "#656c76", + overlay0 = "#3d444d", + surface2 = "#3d444d", + surface1 = "#2f3742", + surface0 = "#2a313c", + base = "#000000", + mantle = "#000000", + crust = "#000000", + }, + }, + no_italic = true, + }, + }, + + { + "rose-pine/neovim", + name = "rose-pine", + priority = 1000, + opts = { + styles = { + transparency = true, + }, + }, + }, + + { + "sainnhe/sonokai", + lazy = false, + priority = 1000, + config = function() + vim.g.sonokai_transparent_background = 2 + end, + }, + + { + "sainnhe/edge", + lazy = false, + priority = 1000, + config = function() + vim.g.edge_transparent_background = 2 + end, + }, + + { + "projekt0n/github-nvim-theme", + lazy = false, + priority = 1000, + config = function() + require("github-theme").setup({ + options = { + transparent = true, + }, + }) + end, + }, + + { + "bluz71/vim-moonfly-colors", + name = "moonfly", + lazy = false, + priority = 1000, + config = function() + vim.g.moonflyTransparent = true + end, + }, + + { + "miikanissi/modus-themes.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + line_nr_column_background = false, + }, + }, + + { + "scottmckendry/cyberdream.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + }, + }, + + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + }, + }, + + { + "Mofiqul/vscode.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + }, + }, + + { + "EdenEast/nightfox.nvim", + lazy = false, + priority = 1000, + opts = { + options = { + transparent = true, + }, + }, + }, + + { + "nyoom-engineering/oxocarbon.nvim", + name = "oxocarbon", + lazy = false, + priority = 1000, + config = function() + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) + end, + }, + + { + "wtfox/jellybeans.nvim", + lazy = false, + priority = 1000, + opts = { + transparent = true, + italics = false, + bold = false, + flat_ui = true, -- toggles "flat UI" for pickers + }, + }, + + { + "LazyVim/LazyVim", + opts = { + colorscheme = "jellybeans-default", + }, + }, +} diff --git a/dot-config/nvim-old/lua/plugins/yaml.lua b/dot-config/nvim-old/lua/plugins/yaml.lua new file mode 100644 index 0000000..c14f04d --- /dev/null +++ b/dot-config/nvim-old/lua/plugins/yaml.lua @@ -0,0 +1,10 @@ +return { + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + yaml = { "prettier" }, + }, + }, + }, +} diff --git a/dot-config/nvim-old/lua/wordcount.lua b/dot-config/nvim-old/lua/wordcount.lua new file mode 100644 index 0000000..92944e5 --- /dev/null +++ b/dot-config/nvim-old/lua/wordcount.lua @@ -0,0 +1,33 @@ +-- Wordcount in markdown +-- +-- Credits +-- https://github.com/nvim-lualine/lualine.nvim/issues/328#issuecomment-982672253 +-- https://github.com/skwee357/nvim-prose + +local M = {} + +local config = { + filetypes = { "markdown", "text", "typst" }, +} + +function M.wordcount() + local wc = vim.fn.wordcount() + + if wc.visual_words then + return tostring(wc.visual_words) .. " words" + end + + return tostring(wc.words) .. " words" +end + +function M.is_available() + for _, ft in ipairs(config.filetypes) do + if ft == vim.bo.filetype then + return true + end + end + + return false +end + +return M diff --git a/dot-config/nvim-old/stylua.toml b/dot-config/nvim-old/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/dot-config/nvim-old/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120
\ No newline at end of file |