diff --git a/home/apps/nvim/init.lua b/home/apps/nvim/init.lua index 2514f9e..55b8979 100644 --- a/home/apps/nvim/init.lua +++ b/home/apps/nvim/init.lua @@ -1,2 +1 @@ --- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") diff --git a/home/apps/nvim/lua/config/autocmds.lua b/home/apps/nvim/lua/config/autocmds.lua deleted file mode 100644 index 27e9e06..0000000 --- a/home/apps/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- Add any additional autocmds here diff --git a/home/apps/nvim/lua/config/lazy.lua b/home/apps/nvim/lua/config/lazy.lua index 23285f6..3aa5bb6 100644 --- a/home/apps/nvim/lua/config/lazy.lua +++ b/home/apps/nvim/lua/config/lazy.lua @@ -19,15 +19,11 @@ require("lazy").setup({ }, defaults = { 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 }, install = { colorscheme = { "catppuccin" } }, - change_detection = { - notify = false, - }, - checker = { enabled = true }, -- automatically check for plugin updates + change_detection = { notify = false }, + checker = { enabled = true }, performance = { rtp = { disabled_plugins = { diff --git a/home/apps/nvim/lua/config/options.lua b/home/apps/nvim/lua/config/options.lua index 124e560..a883077 100644 --- a/home/apps/nvim/lua/config/options.lua +++ b/home/apps/nvim/lua/config/options.lua @@ -1,6 +1,5 @@ -- 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 vim.opt.conceallevel = 0 vim.opt.clipboard = "" diff --git a/home/apps/nvim/lua/plugins/colourscheme.lua b/home/apps/nvim/lua/plugins/colourscheme.lua index 88e4f89..01e0c4b 100644 --- a/home/apps/nvim/lua/plugins/colourscheme.lua +++ b/home/apps/nvim/lua/plugins/colourscheme.lua @@ -3,8 +3,8 @@ return { "catppuccin/nvim", name = "catppuccin", opts = { - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { "italic" }, -- Change the style of comments + styles = { + comments = { "italic" }, }, integrations = { navic = { diff --git a/home/apps/nvim/lua/plugins/editor.lua b/home/apps/nvim/lua/plugins/editor.lua index 52faea0..22eadcd 100644 --- a/home/apps/nvim/lua/plugins/editor.lua +++ b/home/apps/nvim/lua/plugins/editor.lua @@ -35,19 +35,13 @@ return { { "nvim-neo-tree/neo-tree.nvim", opts = { - window = { - mappings = { - ["o"] = "open", - }, - }, + window = { mappings = { ["o"] = "open" } }, }, }, { "stevearc/dressing.nvim", opts = { - input = { - insert_only = false, - }, + input = { insert_only = false }, }, }, { diff --git a/home/apps/nvim/lua/plugins/lsp.lua b/home/apps/nvim/lua/plugins/lsp.lua index 3079d4a..c09f74a 100644 --- a/home/apps/nvim/lua/plugins/lsp.lua +++ b/home/apps/nvim/lua/plugins/lsp.lua @@ -1,4 +1,14 @@ return { + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + if type(opts.ensure_installed) == "table" then + vim.list_extend(opts.ensure_installed, { + "nix", + }) + end + end, + }, { "neovim/nvim-lspconfig", ---@class PluginLspOpts @@ -24,23 +34,15 @@ return { keys[#keys + 1] = { "gl", vim.diagnostic.open_float, "Line Diagnostics" } end, opts = { - diagnostics = { - underline = false, - }, - inlay_hints = { - enabled = true, - }, + diagnostics = { underline = false }, + inlay_hints = { enabled = true }, autoformat = false, ---@type lspconfig.options servers = { lua_ls = { ---@type LazyKeys[] settings = { - Lua = { - telemetry = { - enabled = false, - }, - }, + Lua = { telemetry = { enabled = false } }, }, }, }, @@ -64,16 +66,7 @@ return { end end, }, - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { - "nix", - }) - end - end, - }, + { "hrsh7th/nvim-cmp", dependencies = { @@ -90,6 +83,7 @@ return { local luasnip = require("luasnip") local cmp = require("cmp") + opts.experimental.ghost_text = false opts.mapping = vim.tbl_extend("force", opts.mapping, { [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), @@ -119,23 +113,8 @@ return { end end, { "i", "s" }), }) - - opts.experimental.ghost_text = false end, }, - { - "simrat39/rust-tools.nvim", - opts = { - tools = { - inlay_hints = { - auto = false, - }, - }, - }, - }, - { - "lervag/vimtex", - }, { "echasnovski/mini.surround", opts = { @@ -150,4 +129,11 @@ return { }, }, }, + { + "simrat39/rust-tools.nvim", + opts = { + tools = { inlay_hints = { auto = false } }, + }, + }, + { "lervag/vimtex" }, }