diff --git a/nvim/lazynvim/.gitignore b/nvim/lazynvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/nvim/lazynvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/nvim/lazynvim/.neoconf.json b/nvim/lazynvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/nvim/lazynvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/nvim/lazynvim/LICENSE b/nvim/lazynvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/nvim/lazynvim/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/nvim/lazynvim/README.md b/nvim/lazynvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/nvim/lazynvim/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/nvim/lazynvim/init.lua b/nvim/lazynvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/nvim/lazynvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/nvim/lazynvim/lazyvim.json b/nvim/lazynvim/lazyvim.json new file mode 100644 index 0000000..8de841b --- /dev/null +++ b/nvim/lazynvim/lazyvim.json @@ -0,0 +1,14 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.luasnip", + "lazyvim.plugins.extras.editor.harpoon2", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.ansible", + "lazyvim.plugins.extras.lang.clangd", + "lazyvim.plugins.extras.lang.docker" + ], + "news": { + "NEWS.md": "10960" + }, + "version": 7 +} \ No newline at end of file diff --git a/nvim/lazynvim/lua/config/autocmds.lua b/nvim/lazynvim/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/nvim/lazynvim/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/nvim/lazynvim/lua/config/keymaps.lua b/nvim/lazynvim/lua/config/keymaps.lua new file mode 100644 index 0000000..f795808 --- /dev/null +++ b/nvim/lazynvim/lua/config/keymaps.lua @@ -0,0 +1,46 @@ +-- 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 keymap = vim.keymap.set +local default_options = { noremap = true, silent = true } +local wk = require("which-key") + +local wk_add = function(mode, keymaps) + wk.add(keymaps, { mode = mode, silent = true }) +end + +keymap("i", "jk", "", default_options) + +-------------------------------------------------------------------------------- +-- Normal Mode +-------------------------------------------------------------------------------- +wk_add("n", { + { "", ":vertical resize +1", desc = "Resize Pane Left" }, + { "", ":vertical resize -1", desc = "Resize Pane Right" }, + { "", "resize -1", desc = "Resize Pane Up" }, + { "", "resize +1", desc = "Resize Pane Down" }, + + { "n", ":noh", desc = "[N]o highlighting" }, + { "s", ":set spell!", desc = "[S]pell check toggle" }, + { "", ":write", desc = "[S]ave" }, + + { "J", ":move .+1==", desc = "Move line down" }, + { "K", ":move .-2==", desc = "Move line up" }, + + { "z", ":ZenMode", desc = "[Z]en Mode" }, +}) + +-------------------------------------------------------------------------------- +-- Visual Mode +-------------------------------------------------------------------------------- + +vim.keymap.set("v", "K", ":move '<-2gv=gv", { desc = "Move selected block up.", silent = true, noremap = true }) +vim.keymap.set("v", "J", ":move '>+1gv=gv", { desc = "Move selected block up.", silent = true, noremap = true }) + +-- Toggle term key maps, that get attached when terminal is opened. +function _G.set_terminal_keymaps() + local opts = { buffer = 0 } + keymap("t", "", [[]], opts) +end +vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") diff --git a/nvim/lazynvim/lua/config/lazy.lua b/nvim/lazynvim/lua/config/lazy.lua new file mode 100644 index 0000000..d73bfa1 --- /dev/null +++ b/nvim/lazynvim/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/nvim/lazynvim/lua/config/options.lua b/nvim/lazynvim/lua/config/options.lua new file mode 100644 index 0000000..fd90ad3 --- /dev/null +++ b/nvim/lazynvim/lua/config/options.lua @@ -0,0 +1,72 @@ +-- 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 o = vim.opt +local wo = vim.wo +local fn = vim.fn + +vim.cmd.set("inccommand=split") +o.filetype = "on" +o.updatetime = 500 -- faster completion +o.timeoutlen = 800 -- time to wait for a mapped sequence to complete (in milliseconds) +o.ttimeoutlen = 300 -- Time in milliseconds to wait for a key code sequence to complete +o.backup = false -- creates a backup file +o.swapfile = false -- enable/disable swap file creation +o.dir = fn.stdpath("data") .. "/swp" -- swap file directory +o.undofile = false -- enable/disable undo file creation +o.undodir = fn.stdpath("data") .. "/undodir" -- set undo directory +o.history = 500 -- Use the 'history' option to set the number of lines from command mode that are remembered. +o.hidden = true -- required to keep multiple buffers and open multiple buffers +o.clipboard = "unnamedplus" -- allows neovim to access the system clipboard +o.fileencoding = "utf-8" -- the encoding written to a file +o.conceallevel = 0 -- so that `` is visible in markdown files +o.number = true -- set numbered lines +o.relativenumber = true -- set relative numbered lines +o.cmdheight = 1 -- space for displaying messages/commands +o.showmode = false -- we don't need to see things like -- INSERT -- anymore +o.showtabline = 2 -- always show tabs +o.laststatus = 2 -- The value of this option influences when the last window will have a status line (2 always) +o.smartcase = true -- smart case +o.smartindent = true -- make indenting smarter again +o.splitbelow = true -- force all horizontal splits to go below current window +o.splitright = true -- force all vertical splits to go to the right of current window +o.autoindent = true -- turn on auto indent. +o.expandtab = true -- convert tabs to spaces +o.smarttab = true -- turn on smart tab +o.shiftwidth = 2 -- the number of spaces inserted for each indentation +o.tabstop = 2 -- how many columns a tab counts for +o.termguicolors = true -- set term gui colors (most terminals support this) +o.cursorline = true -- highlight the current line +o.scrolloff = 8 -- Minimal number of screen lines to keep above and below the cursor +o.sidescrolloff = 5 -- The minimal number of columns to scroll horizontally +o.hlsearch = false -- highlight all matches on previous search pattern +o.ignorecase = true -- ignore case in search patterns +o.foldenable = false -- disable folding; enable with zi +o.foldmethod = "expr" +o.foldexpr = "nvim_treesitter#foldexpr()" +vim.cmd.set("nolist") -- don't show listchars. +-- o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<" +o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:␣" +o.shortmess = o.shortmess + "c" -- prevent "pattern not found" messages +wo.colorcolumn = "99999" +o.wildmode = "full" +o.lazyredraw = false -- do not redraw screen while running macros +o.grepprg = "rg --hidden --vimgrep --smart-case --" +o.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- A comma separated list of options for Insert mode completion +o.wildignorecase = true -- When set case is ignored when completing file names and directories +o.wildignore = [[ +.git,.hg,.svn +*.aux,*.out,*.toc +*.o,*.obj,*.exe,*.dll,*.manifest,*.rbc,*.class +*.ai,*.bmp,*.gif,*.ico,*.jpg,*.jpeg,*.png,*.psd,*.webp +*.avi,*.divx,*.mp4,*.webm,*.mov,*.m2ts,*.mkv,*.vob,*.mpg,*.mpeg +*.mp3,*.oga,*.ogg,*.wav,*.flac +*.eot,*.otf,*.ttf,*.woff +*.doc,*.pdf,*.cbr,*.cbz +*.zip,*.tar.gz,*.tar.bz2,*.rar,*.tar.xz,*.kgb +*.swp,.lock,.DS_Store,._* +*/tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**" +]] +o.viminfo = "" -- disable viminfo from copying information from current session, for security. +vim.g.snacks_animate = false diff --git a/nvim/lazynvim/lua/plugins/colorscheme.lua b/nvim/lazynvim/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..e964eb0 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/colorscheme.lua @@ -0,0 +1,9 @@ +return { + { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin", + }, + }, +} diff --git a/nvim/lazynvim/lua/plugins/disabled.lua b/nvim/lazynvim/lua/plugins/disabled.lua new file mode 100644 index 0000000..c89afc2 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/disabled.lua @@ -0,0 +1,3 @@ +return { + { "nvim-neo-tree/neo-tree.nvim", enabled = false }, +} diff --git a/nvim/lazynvim/lua/plugins/example.lua b/nvim/lazynvim/lua/plugins/example.lua new file mode 100644 index 0000000..17f53d6 --- /dev/null +++ b/nvim/lazynvim/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 + { + "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", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + 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/nvim/lazynvim/lua/plugins/fidget.lua b/nvim/lazynvim/lua/plugins/fidget.lua new file mode 100644 index 0000000..9adf66a --- /dev/null +++ b/nvim/lazynvim/lua/plugins/fidget.lua @@ -0,0 +1,23 @@ +return { + "j-hui/fidget.nvim", + event = "VeryLazy", + config = function() + local fidget = require("fidget") + fidget.setup({ + notification = { + window = { + normal_hl = "String", -- Base highlight group in the notification window + winblend = 0, -- Background color opacity in the notification window + border = "rounded", -- Border around the notification window + zindex = 45, -- Stacking priority of the notification window + max_width = 0, -- Maximum width of the notification window + max_height = 0, -- Maximum height of the notification window + x_padding = 1, -- Padding from right edge of window boundary + y_padding = 1, -- Padding from bottom edge of window boundary + align = "bottom", -- How to align the notification window + relative = "editor", -- What the notification window position is relative to + }, + }, + }) + end, +} diff --git a/nvim/lazynvim/lua/plugins/harpoon.lua b/nvim/lazynvim/lua/plugins/harpoon.lua new file mode 100644 index 0000000..878756b --- /dev/null +++ b/nvim/lazynvim/lua/plugins/harpoon.lua @@ -0,0 +1,78 @@ +return { + { + "ThePrimeagen/harpoon", + branch = "harpoon2", + opts = { + settings = { + save_on_toggle = true, + sync_on_ui_close = true, + }, + }, + keys = { + { + "", + function() + require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) + end, + desc = "Open Harpoon window.", + }, + { + "a", + function() + require("harpoon"):list():add() + end, + desc = "[A]dd to the harpoon list.", + }, + { + "", + function() + require("harpoon"):list():select(1) + end, + desc = "Select first harpoon buffer.", + }, + { + "", + function() + require("harpoon"):list():select(2) + end, + desc = "Select second harpoon buffer.", + }, + { + "", + function() + require("harpoon"):list():select(3) + end, + desc = "Select third harpoon buffer.", + }, + { + "", + function() + require("harpoon"):list():select(4) + end, + desc = "Select fourth harpoon buffer.", + }, + { + "", + function() + require("harpoon"):list():prev() + end, + desc = "Previous harpoon buffer.", + }, + { + "", + function() + require("harpoon"):list():next() + end, + desc = "Next harpoon buffer.", + }, + -- Extensions + require("harpoon"):extend({ + UI_CREATE = function(cx) + vim.keymap.set("n", "", function() + require("harpoon").ui:select_menu_item({ vsplit = true }) + end, { buffer = cx.buffer, desc = "Open in [V]split" }) + end, + }), + }, + }, +} diff --git a/nvim/lazynvim/lua/plugins/init.lua b/nvim/lazynvim/lua/plugins/init.lua new file mode 100644 index 0000000..91999f2 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/init.lua @@ -0,0 +1,31 @@ +-- Plugins that don't require much configuration are in here. +-- +return { + { import = "lazyvim.plugins.extras.lang.ansible" }, + { import = "lazyvim.plugins.extras.lang.cmake" }, + { import = "lazyvim.plugins.extras.lang.docker" }, + { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.lang.markdown" }, + { import = "lazyvim.plugins.extras.lang.yaml" }, + { + import = "lazyvim.plugins.extras.editor.mini-files", + opts = { + options = { + use_as_default_explorer = true, + }, + }, + }, + { + "folke/snacks.nvim", + opts = { + indent = { enabled = false }, + }, + }, + { + import = "lazyvim.plugins.extras.coding.blink", + keymap = { + preset = "enter", + [""] = { "select_and_accept" }, + }, + }, +} diff --git a/nvim/lazynvim/lua/plugins/lsp.lua b/nvim/lazynvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..feaf8af --- /dev/null +++ b/nvim/lazynvim/lua/plugins/lsp.lua @@ -0,0 +1,100 @@ +-- The language servers to setup. +local lsp_servers = { + "bashls", + "clangd", + "dockerls", + "gopls", + "jsonls", + "lua_ls", + "marksman", + "sourcekit", + "yamlls", +} + +return { + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "hrsh7th/cmp-nvim-lsp", + { "antosha417/nvim-lsp-file-operations", config = true }, + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", + { + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + { path = "${3rd}/luv/library", words = { "vim%.uv" } }, + }, + }, + }, + }, + config = function() + require("mason").setup() + require("mason-lspconfig").setup({ + opts = { + ensure_installed = lsp_servers, + }, + }) + local lspconfig = require("lspconfig") + local cmp_nvim_lsp = require("cmp_nvim_lsp") + local capabilities = cmp_nvim_lsp.default_capabilities() + local opts = { noremap = true, silent = true } + local on_attach = function(_, bufnr) + opts.buffer = bufnr + + opts.desc = "Show line diagnostics" + vim.keymap.set("n", "d", vim.diagnostic.open_float, opts) + + opts.desc = "Show diagnostics in Telescope" + vim.keymap.set("n", "d", "Telescope diagnostics bufnr=0", opts) + + opts.desc = "Show documentation for what is under cursor" + vim.keymap.set("n", "", vim.lsp.buf.hover, opts) + + opts.desc = "[G]oto [D]efinition" + vim.keymap.set("n", "gd", "Telescope lsp_definitions trim_text=true", opts) + + opts.desc = "[G]oto [D]eclaration" + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) + + opts.desc = "LSP [C]ode [A]ction" + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, opts) + + --opts.desc = "[R]e-[N]ame" + --vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) + + opts.desc = "[R]eload or start LSP" + vim.keymap.set("n", "rl", ":LspRestart | :LspStart", opts) + + opts.desc = "Goto previous diagnostic" + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) + + opts.desc = "Goto next diagnostic" + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) + end + + for _, lsp in ipairs(lsp_servers) do + lspconfig[lsp].setup({ + capabilities = capabilities, + on_attach = on_attach, + on_init = function(client) + -- HACK: to fix some issues with LSP + -- more details: https://github.com/neovim/neovim/issues/19237#issuecomment-2237037154 + client.offset_encoding = "utf-8" + end, + cmd = lsp == "sourcekit" and { vim.trim(vim.fn.system("xcrun -f sourcekit-lsp")) } or nil, + }) + end + + -- nice icons + local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " } + for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) + end + + -- For some reason I was having trouble getting this to work inside the on-attach, so it's here. + vim.keymap.set("n", "rn", vim.lsp.buf.rename, { desc = "[R]e-[N]ame" }) + end, +} diff --git a/nvim/lazynvim/lua/plugins/telescope.lua b/nvim/lazynvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..8b30b87 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/telescope.lua @@ -0,0 +1,10 @@ +return { + { + import = "lazyvim.plugins.extras.editor.telescope", + opts = { + ensure_installed = { + "swift", + }, + }, + }, +} diff --git a/nvim/lazynvim/lua/plugins/todo-comment.lua b/nvim/lazynvim/lua/plugins/todo-comment.lua new file mode 100644 index 0000000..f798321 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/todo-comment.lua @@ -0,0 +1,14 @@ +return { + "folke/todo-comments.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "folke/trouble.nvim", + }, + keys = { + { "xt", false }, + { "xT", false }, + { "tq", "Trouble todo toggle", desc = "[T]odo [Q]uick fix list." }, + { "t", "TodoTelescope", desc = "[T]odo telescope list." }, + { "tl", "TodoLocList", desc = "[T]odo [L]ocation list." }, + }, +} diff --git a/nvim/lazynvim/lua/plugins/xcodebuild.lua b/nvim/lazynvim/lua/plugins/xcodebuild.lua new file mode 100644 index 0000000..2553511 --- /dev/null +++ b/nvim/lazynvim/lua/plugins/xcodebuild.lua @@ -0,0 +1,72 @@ +local progress_handle + +return { + "wojciech-kulik/xcodebuild.nvim", + dependencies = { + "nvim-telescope/telescope.nvim", + "MunifTanjim/nui.nvim", + }, + opts = { + show_build_progress_bar = false, + logs = { + auto_open_on_success_tests = false, + auto_open_on_failed_tests = false, + auto_open_on_success_build = false, + auto_open_on_failed_build = false, + auto_focus = false, + auto_close_on_app_launch = true, + only_summary = true, + notify = function(message, severity) + local fidget = require("fidget") + if progress_handle then + progress_handle.message = message + if not message:find("Loading") then + progress_handle:finish() + progress_handle = nil + if vim.trim(message) ~= "" then + fidget.notify(message, severity) + end + end + else + fidget.notify(message, severity) + end + end, + notify_progress = function(message) + local progress = require("fidget.progress") + + if progress_handle then + progress_handle.title = "" + progress_handle.message = message + else + progress_handle = progress.handle.create({ + message = message, + lsp_client = { name = "xcodebuild.nvim" }, + }) + end + end, + }, + code_coverage = { + enabled = true, + }, + }, + keys = { + { "X", "XcodebuildPicker", desc = "Show Xcodebuild Actions" }, + { "xf", "XcodebuildProjectManager", desc = "Show Project Manager Actions" }, + { "xb", "XcodebuildBuild", desc = "Build Project" }, + { "xB", "XcodebuildBuildForTesting", desc = "Build For Testing" }, + { "xr", "XcodebuildBuildRun", desc = "Build & Run Project" }, + { "xt", "XcodebuildTest", desc = "Run Tests" }, + { "xt", "XcodebuildTestSelected", desc = "Run Selected Tests" }, + { "xT", "XcodebuildTestClass", desc = "Run This Test Class" }, + { "xl", "XcodebuildToggleLogs", desc = "Toggle Xcodebuild Logs" }, + { "xc", "XcodebuildToggleCodeCoverage", desc = "Toggle Code Coverage" }, + { "xC", "XcodebuildShowCodeCoverageReport", desc = "Show Code Coverage Report" }, + { "xe", "XcodebuildTestExplorerToggle", desc = "Toggle Test Explorer" }, + { "xs", "XcodebuildFailingSnapshots", desc = "Show Failing Snapshots" }, + { "xd", "XcodebuildSelectDevice", desc = "Select Device" }, + { "xp", "XcodebuildSelectTestPlan", desc = "Select Test Plan" }, + { "xq", "Telescope quickfixxx", "XcodebuildQuickfixLine", desc = "Quickfix Line" }, + { "xa", "XcodebuildCodeActions", desc = "Show Code Actions" }, + }, +} diff --git a/nvim/lazynvim/stylua.toml b/nvim/lazynvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/nvim/lazynvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file