diff --git a/_saved/neovim/init.lua b/_saved/neovim/ftpd/init.lua similarity index 100% rename from _saved/neovim/init.lua rename to _saved/neovim/ftpd/init.lua diff --git a/_saved/neovim/init.vim b/_saved/neovim/ftpd/init.vim similarity index 100% rename from _saved/neovim/init.vim rename to _saved/neovim/ftpd/init.vim diff --git a/config/nvim/.stylua.toml b/_saved/neovim/nvchad/.stylua.toml similarity index 100% rename from config/nvim/.stylua.toml rename to _saved/neovim/nvchad/.stylua.toml diff --git a/_saved/neovim/nvchad/init.lua b/_saved/neovim/nvchad/init.lua new file mode 100644 index 0000000..1152335 --- /dev/null +++ b/_saved/neovim/nvchad/init.lua @@ -0,0 +1,39 @@ +vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" +vim.g.mapleader = " " + +-- bootstrap lazy and all plugins +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" + +if not vim.loop.fs_stat(lazypath) then + local repo = "https://github.com/folke/lazy.nvim.git" + vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } +end + +vim.opt.rtp:prepend(lazypath) + +local lazy_config = require "configs.lazy" + +-- load plugins +require("lazy").setup({ + { + "NvChad/NvChad", + lazy = false, + branch = "v2.5", + import = "nvchad.plugins", + config = function() + require "options" + end, + }, + + { import = "plugins" }, +}, lazy_config) + +-- load theme +dofile(vim.g.base46_cache .. "defaults") +dofile(vim.g.base46_cache .. "statusline") + +require "nvchad.autocmds" + +vim.schedule(function() + require "mappings" +end) diff --git a/config/nvim/lua/chadrc.lua b/_saved/neovim/nvchad/lua/chadrc.lua similarity index 100% rename from config/nvim/lua/chadrc.lua rename to _saved/neovim/nvchad/lua/chadrc.lua diff --git a/config/nvim/lua/configs/conform.lua b/_saved/neovim/nvchad/lua/configs/conform.lua similarity index 100% rename from config/nvim/lua/configs/conform.lua rename to _saved/neovim/nvchad/lua/configs/conform.lua diff --git a/config/nvim/lua/configs/lazy.lua b/_saved/neovim/nvchad/lua/configs/lazy.lua similarity index 100% rename from config/nvim/lua/configs/lazy.lua rename to _saved/neovim/nvchad/lua/configs/lazy.lua diff --git a/config/nvim/lua/configs/lspconfig.lua b/_saved/neovim/nvchad/lua/configs/lspconfig.lua similarity index 100% rename from config/nvim/lua/configs/lspconfig.lua rename to _saved/neovim/nvchad/lua/configs/lspconfig.lua diff --git a/config/nvim/lua/init.lua b/_saved/neovim/nvchad/lua/init.lua similarity index 100% rename from config/nvim/lua/init.lua rename to _saved/neovim/nvchad/lua/init.lua diff --git a/config/nvim/lua/mappings.lua b/_saved/neovim/nvchad/lua/mappings.lua similarity index 100% rename from config/nvim/lua/mappings.lua rename to _saved/neovim/nvchad/lua/mappings.lua diff --git a/config/nvim/lua/options.lua b/_saved/neovim/nvchad/lua/options.lua similarity index 100% rename from config/nvim/lua/options.lua rename to _saved/neovim/nvchad/lua/options.lua diff --git a/_saved/neovim/nvchad/lua/plugins/init.lua b/_saved/neovim/nvchad/lua/plugins/init.lua new file mode 100644 index 0000000..f2977d4 --- /dev/null +++ b/_saved/neovim/nvchad/lua/plugins/init.lua @@ -0,0 +1,71 @@ +return { + { + "nvim-lua/plenary.nvim", + { + "nvchad/ui", + config = function() + require "nvchad" + end + }, + { + "nvchad/base46", + lazy = true, + build = function() + require("base46").load_all_highlights() + end, + }, + "nvchad/volt", + }, + { + "stevearc/conform.nvim", + -- event = 'BufWritePre', -- uncomment for format on save + config = function() + require "configs.conform" + end, + }, + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "lua", + "markdown", + "markdown_inline", + "python", + "terraform", + "vim", + }, + }, + }, + { + "neovim/nvim-lspconfig", + config = function() + require "configs.lspconfig" + end, + }, +} + + -- These are some examples, uncomment them if you want to see them work! + + -- Install a plugin + -- { + -- "max397574/better-escape.nvim", + -- event = "InsertEnter", + -- config = function() + -- require("better_escape").setup() + -- end + -- }, + + -- To make a plugin not be loaded + -- { + -- "NvChad/nvim-colorizer.lua", + -- enabled = false + -- }, + + -- All NvChad plugins are lazy-loaded by default + -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` + -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example + -- { + -- "mg979/vim-visual-multi", + -- lazy = false, + -- } diff --git a/config/nvim/.gitignore b/config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/config/nvim/.neoconf.json b/config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/config/nvim/LICENSE b/config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/config/nvim/README.md b/config/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 1152335..2514f9e 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,39 +1,2 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -vim.g.mapleader = " " - --- bootstrap lazy and all plugins -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" - -if not vim.loop.fs_stat(lazypath) then - local repo = "https://github.com/folke/lazy.nvim.git" - vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } -end - -vim.opt.rtp:prepend(lazypath) - -local lazy_config = require "configs.lazy" - --- load plugins -require("lazy").setup({ - { - "NvChad/NvChad", - lazy = false, - branch = "v2.5", - import = "nvchad.plugins", - config = function() - require "options" - end, - }, - - { import = "plugins" }, -}, lazy_config) - --- load theme -dofile(vim.g.base46_cache .. "defaults") -dofile(vim.g.base46_cache .. "statusline") - -require "nvchad.autocmds" - -vim.schedule(function() - require "mappings" -end) +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json new file mode 100644 index 0000000..82e173e --- /dev/null +++ b/config/nvim/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "10960" + }, + "version": 7 +} \ No newline at end of file diff --git a/config/nvim/lua/config/autocmds.lua b/config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..5f0a655 --- /dev/null +++ b/config/nvim/lua/config/autocmds.lua @@ -0,0 +1,25 @@ +-- 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") + +vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { + pattern = { "*.gotmpl" }, + callback = function() + vim.cmd("set filetype=yaml") + end, +}) + +vim.api.nvim_create_autocmd({ "BufReadPre" }, { + callback = function() + vim.api.nvim_set_hl(0, "ColorColumn", { bg = "#770000" }) + vim.api.nvim_set_hl(0, "DiffChange", { bg = "NONE", fg = "#e7c547" }) + vim.api.nvim_set_hl(0, "DiffText", { bg = "NONE", fg = "#ff8700" }) + vim.api.nvim_set_hl(0, "SpellBad", { bg = "#770000", fg = "#ffffff" }) + vim.api.nvim_set_hl(0, "Visual", { bg = "#0094d8", fg = "#ffffff" }) + end, +}) diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..36484f2 --- /dev/null +++ b/config/nvim/lua/config/keymaps.lua @@ -0,0 +1,76 @@ +-- 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 nomap = vim.keymap.del + +map("i", "", "I") +map("i", "", "A") + +map("n", "", "wq!", { desc = "save and exit", remap = true }) +map("n", "", "w", { desc = "switch pane", remap = true }) +map("n", "-", "s", { desc = "split horizontally", remap = true }) +map("n", "|", "v", { desc = "split vertically", remap = true }) +map("n", "/", "gcc", { desc = "toggle comments", remap = true }) + +map("n", "ff", LazyVim.pick("files", { root = false }), { desc = "find files (cwd", remap = true }) +map("n", "fF", LazyVim.pick("files"), { desc = "find files (root)", remap = true }) +map("n", "h", "set hlsearch!", { desc = "toggle hlsearch", remap = true }) +map( + "n", + "m", + 'execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")', + { desc = "toggle column", remap = true } +) +map( + "n", + "n", + 'set number!execute "set signcolumn=" . (&signcolumn == "yes" ? "no" : "yes")', + { desc = "toggle decorations", remap = true } +) +map("v", "/", "gc", { desc = "toggle comments", remap = true }) + +nomap("n", "") +nomap("n", ",") +nomap("n", ".") +nomap("n", ":") +nomap("n", "?") +nomap("n", "K") +nomap("n", "l") +nomap("n", "L") +nomap("n", "S") +nomap("n", "`") + +nomap("n", "bD") +nomap("n", "bP") +nomap("n", "bb") +nomap("n", "bd") +nomap("n", "be") +nomap("n", "bl") +nomap("n", "bo") +nomap("n", "bp") +nomap("n", "br") + +nomap("n", "fb") +nomap("n", "fc") +nomap("n", "fe") +nomap("n", "fE") +nomap("n", "fg") +nomap("n", "fn") +nomap("n", "fr") +nomap("n", "fR") +nomap("n", "ft") +nomap("n", "fT") + +nomap("n", "gb") +nomap("n", "gB") +nomap("n", "gc") +nomap("n", "ge") +nomap("n", "gs") +nomap("n", "gY") + +nomap("n", "qq") + +nomap("n", "xl") +nomap("n", "xq") diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..285d95d --- /dev/null +++ b/config/nvim/lua/config/lazy.lua @@ -0,0 +1,52 @@ +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 + }, + 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/lua/config/options.lua b/config/nvim/lua/config/options.lua new file mode 100644 index 0000000..7736b91 --- /dev/null +++ b/config/nvim/lua/config/options.lua @@ -0,0 +1,16 @@ +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +local o = vim.o +o.gdefault = true +o.hlsearch = false +o.inccommand = "split" +o.relativenumber = false +o.shiftround = true +o.termguicolors = true +o.wrap = true +o.writebackup = false + +o.clipboard = "" +o.foldcolumn = "0" +o.mouse = "" +o.whichwrap = "" +o.statuscolumn = "" diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index f2977d4..450c0e4 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -1,71 +1,124 @@ return { + { "MagickDuck/grug-far.nvim", enabled = false }, + { "catppuccin/nvim", enabled = false }, + { "folke/persistence.nvim", enabled = false }, + { "folke/todo-comments.nvim", enabled = false }, + { "folke/tokyonight.nvim", enabled = false }, + { "folke/trouble.nvim", enabled = false }, + { "windwp/nvim-ts-autotag", enabled = false }, + { - "nvim-lua/plenary.nvim", - { - "nvchad/ui", - config = function() - require "nvchad" - end + "folke/snacks.nvim", + opts = { + dashboard = { enabled = false }, }, - { - "nvchad/base46", - lazy = true, - build = function() - require("base46").load_all_highlights() - end, - }, - "nvchad/volt", }, + { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - config = function() - require "configs.conform" - end, + "loctvl842/monokai-pro.nvim", + opts = { + filter = "classic", + }, }, + + { + "LazyVim/LazyVim", + opts = { + colorscheme = "monokai-pro", + }, + }, + + { + "nvim-lualine/lualine.nvim", + opts = { + options = { + theme = "powerline", + section_separators = "", + component_separators = "", + }, + sections = { + lualine_c = { + { + "diagnostics", + symbols = { + error = LazyVim.config.icons.diagnostics.Error, + warn = LazyVim.config.icons.diagnostics.Warn, + info = LazyVim.config.icons.diagnostics.Info, + hint = LazyVim.config.icons.diagnostics.Hint, + }, + }, + { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } }, + { "filename", file_status = true, path = 1 }, + }, + lualine_x = { + { + "diff", + symbols = { + added = LazyVim.config.icons.git.added, + modified = LazyVim.config.icons.git.modified, + removed = LazyVim.config.icons.git.removed, + }, + }, + }, + lualine_z = {}, + }, + }, + }, + + { + "nvim-neo-tree/neo-tree.nvim", + keys = { + { + "e", + function() + require("neo-tree.command").execute({ toggle = true, dir = vim.uv.cwd() }) + end, + desc = "explorer (cwd)", + remap = true, + }, + { + "E", + function() + require("neo-tree.command").execute({ toggle = true, dir = LazyVim.root() }) + end, + desc = "explorer (root)", + remap = true, + }, + }, + opts = { + filesystem = { + filtered_items = { + visible = true, + }, + }, + }, + }, + { "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { + opts = function(_, opts) + opts.ensure_installed = { "bash", + "diff", + "json", "lua", "markdown", "markdown_inline", "python", "terraform", "vim", + } + end, + }, + + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "lua-language-server", + "terraform-ls", + "tflint", }, }, }, - { - "neovim/nvim-lspconfig", - config = function() - require "configs.lspconfig" - end, - }, } - - -- These are some examples, uncomment them if you want to see them work! - - -- Install a plugin - -- { - -- "max397574/better-escape.nvim", - -- event = "InsertEnter", - -- config = function() - -- require("better_escape").setup() - -- end - -- }, - - -- To make a plugin not be loaded - -- { - -- "NvChad/nvim-colorizer.lua", - -- enabled = false - -- }, - - -- All NvChad plugins are lazy-loaded by default - -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` - -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example - -- { - -- "mg979/vim-visual-multi", - -- lazy = false, - -- } diff --git a/config/nvim/stylua.toml b/config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file