From 97ccdab2a80da7621936685732f0eafc39413836 Mon Sep 17 00:00:00 2001 From: Nydragon <6582485n@proton.me> Date: Mon, 1 Apr 2024 20:07:18 +0900 Subject: [PATCH] refacto: migrate from packer to lazy for plugin management --- nvim/lua/ale-config.lua | 22 ++- nvim/lua/autoclose-config.lua | 6 +- nvim/lua/barbar-config.lua | 22 +-- nvim/lua/commander-config.lua demete | 8 -- nvim/lua/formatter-config.lua | 48 ++++--- nvim/lua/haskell-config.lua | 34 ++--- nvim/lua/image-config.lua | 52 +++---- nvim/lua/nightfox-config.lua | 16 +-- nvim/lua/nvim-cmp-config.lua | 144 ++++++++++---------- nvim/lua/nvim-lsp-config.lua | 65 ++++----- nvim/lua/nvim-tree-config.lua | 6 - nvim/lua/plugins.lua | 197 +++++++++++++++------------ nvim/lua/telescope-config.lua | 9 -- 13 files changed, 318 insertions(+), 311 deletions(-) delete mode 100644 nvim/lua/commander-config.lua demete diff --git a/nvim/lua/ale-config.lua b/nvim/lua/ale-config.lua index b66a162..4d307ae 100644 --- a/nvim/lua/ale-config.lua +++ b/nvim/lua/ale-config.lua @@ -1,16 +1,14 @@ - vim.g.ale_fixers = { - ['*'] = { - 'remove_trailing_lines', - 'trim_whitespace' - }, - ["lua"] = { - "lua-format" - }, - ["rust"] = { - "rustfmt" - } + ["*"] = { + "remove_trailing_lines", + "trim_whitespace", + }, + ["lua"] = { + "lua-format", + }, + ["rust"] = { + "rustfmt", + }, } - vim.g.ale_fix_on_save = 1 diff --git a/nvim/lua/autoclose-config.lua b/nvim/lua/autoclose-config.lua index 1dd36b0..a6e0133 100644 --- a/nvim/lua/autoclose-config.lua +++ b/nvim/lua/autoclose-config.lua @@ -1,5 +1,4 @@ -require('autoclose').setup( - { +return { keys = { ["("] = { escape = false, close = true, pair = "()" }, ["["] = { escape = false, close = true, pair = "[]" }, @@ -22,5 +21,4 @@ require('autoclose').setup( auto_indent = true, disable_command_mode = false, }, - } -) +} diff --git a/nvim/lua/barbar-config.lua b/nvim/lua/barbar-config.lua index 11c04e1..33ce35a 100644 --- a/nvim/lua/barbar-config.lua +++ b/nvim/lua/barbar-config.lua @@ -2,15 +2,15 @@ local map = vim.api.nvim_set_keymap local opts = { noremap = true, silent = true } -- Move to previous/next -map('n', '', 'BufferPrevious', opts) +map("n", "", "BufferPrevious", opts) -- Goto buffer in position... -map('n', '', 'BufferGoto 1', opts) -map('n', '', 'BufferGoto 2', opts) -map('n', '', 'BufferGoto 3', opts) -map('n', '', 'BufferGoto 4', opts) -map('n', '', 'BufferGoto 5', opts) -map('n', '', 'BufferGoto 6', opts) -map('n', '', 'BufferGoto 7', opts) -map('n', '', 'BufferGoto 8', opts) -map('n', '', 'BufferGoto 9', opts) -map('n', '', 'BufferLast', opts) +map("n", "", "BufferGoto 1", opts) +map("n", "", "BufferGoto 2", opts) +map("n", "", "BufferGoto 3", opts) +map("n", "", "BufferGoto 4", opts) +map("n", "", "BufferGoto 5", opts) +map("n", "", "BufferGoto 6", opts) +map("n", "", "BufferGoto 7", opts) +map("n", "", "BufferGoto 8", opts) +map("n", "", "BufferGoto 9", opts) +map("n", "", "BufferLast", opts) diff --git a/nvim/lua/commander-config.lua demete b/nvim/lua/commander-config.lua demete deleted file mode 100644 index 59d97de..0000000 --- a/nvim/lua/commander-config.lua demete +++ /dev/null @@ -1,8 +0,0 @@ - integration = { - telescope = { - enable = true, - -- Optional, you can use any telescope supported theme - theme = require("telescope.themes").commander, - }, - }, -}) diff --git a/nvim/lua/formatter-config.lua b/nvim/lua/formatter-config.lua index a58a29a..9d8f839 100644 --- a/nvim/lua/formatter-config.lua +++ b/nvim/lua/formatter-config.lua @@ -1,23 +1,31 @@ local util = require("formatter.util") -require("formatter").setup({ - logging = true, - log_level = vim.log.levels.WARN, - filetype = { - lua = { - require("formatter.filetypes.lua").stylua, +local M = {} + +local function build() + return { + logging = true, + log_level = vim.log.levels.WARN, + filetype = { + lua = { + require("formatter.filetypes.lua").stylua, + }, + rust = { + function() + return { + exe = "rustfmt", + args = { "--edition 2021" }, + stdin = true, + } + end, + }, + ["*"] = { + require("formatter.filetypes.any").remove_trailing_whitespace, + }, }, - rust = { - function() - return { - exe = "rustfmt", - args = { "--edition 2021" }, - stdin = true, - } - end, - }, - ["*"] = { - require("formatter.filetypes.any").remove_trailing_whitespace, - }, - }, -}) + } +end + +M.build = build + +return M diff --git a/nvim/lua/haskell-config.lua b/nvim/lua/haskell-config.lua index 98acd7a..30a0999 100644 --- a/nvim/lua/haskell-config.lua +++ b/nvim/lua/haskell-config.lua @@ -1,21 +1,21 @@ -local ht = require('haskell-tools') -local def_opts = { noremap = true, silent = true, } -ht.setup { - hls = { - on_attach = function(client, bufnr) - local opts = vim.tbl_extend('keep', def_opts, { buffer = bufnr, }) - -- haskell-language-server relies heavily on codeLenses, - -- so auto-refresh (see advanced configuration) is enabled by default - vim.keymap.set('n', 'ca', vim.lsp.codelens.run, opts) - vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) - end, - }, -} +local ht = require("haskell-tools") +local def_opts = { noremap = true, silent = true } +ht.setup({ + hls = { + on_attach = function(client, bufnr) + local opts = vim.tbl_extend("keep", def_opts, { buffer = bufnr }) + -- haskell-language-server relies heavily on codeLenses, + -- so auto-refresh (see advanced configuration) is enabled by default + vim.keymap.set("n", "ca", vim.lsp.codelens.run, opts) + vim.keymap.set("n", "hs", ht.hoogle.hoogle_signature, opts) + end, + }, +}) -- Suggested keymaps that do not depend on haskell-language-server -- Toggle a GHCi repl for the current package -vim.keymap.set('n', 'rr', ht.repl.toggle, def_opts) +vim.keymap.set("n", "rr", ht.repl.toggle, def_opts) -- Toggle a GHCi repl for the current buffer -vim.keymap.set('n', 'rf', function() - ht.repl.toggle(vim.api.nvim_buf_get_name(0)) +vim.keymap.set("n", "rf", function() + ht.repl.toggle(vim.api.nvim_buf_get_name(0)) end, def_opts) -vim.keymap.set('n', 'rq', ht.repl.quit, def_opts) +vim.keymap.set("n", "rq", ht.repl.quit, def_opts) diff --git a/nvim/lua/image-config.lua b/nvim/lua/image-config.lua index e47b252..3828157 100644 --- a/nvim/lua/image-config.lua +++ b/nvim/lua/image-config.lua @@ -1,29 +1,29 @@ -- default config require("image").setup({ - backend = "kitty", - integrations = { - markdown = { - enabled = true, - clear_in_insert_mode = false, - download_remote_images = true, - only_render_image_at_cursor = false, - filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here - }, - neorg = { - enabled = true, - clear_in_insert_mode = false, - download_remote_images = true, - only_render_image_at_cursor = false, - filetypes = { "norg" }, - }, - }, - max_width = nil, - max_height = nil, - max_width_window_percentage = nil, - max_height_window_percentage = 50, - window_overlap_clear_enabled = false, -- toggles images when windows are overlapped - window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "" }, - editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus - tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off) - hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp" }, -- render image files as images when opened + backend = "kitty", + integrations = { + markdown = { + enabled = true, + clear_in_insert_mode = false, + download_remote_images = true, + only_render_image_at_cursor = false, + filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here + }, + neorg = { + enabled = true, + clear_in_insert_mode = false, + download_remote_images = true, + only_render_image_at_cursor = false, + filetypes = { "norg" }, + }, + }, + max_width = nil, + max_height = nil, + max_width_window_percentage = nil, + max_height_window_percentage = 50, + window_overlap_clear_enabled = false, -- toggles images when windows are overlapped + window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "" }, + editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus + tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off) + hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp" }, -- render image files as images when opened }) diff --git a/nvim/lua/nightfox-config.lua b/nvim/lua/nightfox-config.lua index 3256b66..9ea185b 100644 --- a/nvim/lua/nightfox-config.lua +++ b/nvim/lua/nightfox-config.lua @@ -1,11 +1,11 @@ -require('nightfox').setup({ - options = { - styles = { - comments = "italic", - keywords = "bold", - types = "italic,bold", - } - } +require("nightfox").setup({ + options = { + styles = { + comments = "italic", + keywords = "bold", + types = "italic,bold", + }, + }, }) vim.cmd("colorscheme carbonfox") diff --git a/nvim/lua/nvim-cmp-config.lua b/nvim/lua/nvim-cmp-config.lua index 8ad3920..bf8aa5b 100644 --- a/nvim/lua/nvim-cmp-config.lua +++ b/nvim/lua/nvim-cmp-config.lua @@ -1,92 +1,92 @@ local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil end -local cmp = require 'cmp' +local cmp = require("cmp") cmp.setup({ - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. - -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - -- require('snippy').expand_snippet(args.body) -- For `snippy` users. - -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. - end, - }, - window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }, + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. + -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. + -- require('snippy').expand_snippet(args.body) -- For `snippy` users. + -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. + end, + }, + window = { + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Insert, + select = true, + }), - [''] = function(fallback) - if not cmp.select_next_item() then - if vim.bo.buftype ~= 'prompt' and has_words_before() then - cmp.complete() - else - fallback() - end - end - end, + [""] = function(fallback) + if not cmp.select_next_item() then + if vim.bo.buftype ~= "prompt" and has_words_before() then + cmp.complete() + else + fallback() + end + end + end, - [''] = function(fallback) - if not cmp.select_prev_item() then - if vim.bo.buftype ~= 'prompt' and has_words_before() then - cmp.complete() - else - fallback() - end - end - end, - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'vsnip' }, -- For vsnip users. - -- { name = 'luasnip' }, -- For luasnip users. - -- { name = 'ultisnips' }, -- For ultisnips users. - -- { name = 'snippy' }, -- For snippy users. - }, { - { name = 'buffer' }, - }) + [""] = function(fallback) + if not cmp.select_prev_item() then + if vim.bo.buftype ~= "prompt" and has_words_before() then + cmp.complete() + else + fallback() + end + end + end, + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "vsnip" }, -- For vsnip users. + -- { name = 'luasnip' }, -- For luasnip users. + -- { name = 'ultisnips' }, -- For ultisnips users. + -- { name = 'snippy' }, -- For snippy users. + }, { + { name = "buffer" }, + }), }) -- Set configuration for specific filetype. -cmp.setup.filetype('gitcommit', { - sources = cmp.config.sources({ - { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. - }, { - { name = 'buffer' }, - }) +cmp.setup.filetype("gitcommit", { + sources = cmp.config.sources({ + { name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it. + }, { + { name = "buffer" }, + }), }) -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). -cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' } - } +cmp.setup.cmdline({ "/", "?" }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, }) -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). -cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) +cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { name = "cmdline" }, + }), }) -- Set up lspconfig. -local capabilities = require('cmp_nvim_lsp').default_capabilities() +local capabilities = require("cmp_nvim_lsp").default_capabilities() -- Replace with each lsp server you've enabled. -require('lspconfig')['pyright'].setup { - capabilities = capabilities -} +require("lspconfig")["pyright"].setup({ + capabilities = capabilities, +}) diff --git a/nvim/lua/nvim-lsp-config.lua b/nvim/lua/nvim-lsp-config.lua index cf1fffc..e974ade 100644 --- a/nvim/lua/nvim-lsp-config.lua +++ b/nvim/lua/nvim-lsp-config.lua @@ -1,45 +1,46 @@ -- Mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions local opts = { noremap = true, silent = true } -vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) +vim.keymap.set("n", "e", vim.diagnostic.open_float, opts) +vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) +vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) +vim.keymap.set("n", "q", vim.diagnostic.setloclist, opts) -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts) + vim.keymap.set("n", "", vim.lsp.buf.signature_help, bufopts) + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) + vim.keymap.set("n", "f", function() + vim.lsp.buf.format({ async = true }) + end, bufopts) end - local lsp_flags = { - -- This is the default in Nvim 0.7+ - debounce_text_changes = 150, -} -require('lspconfig')['pyright'].setup { - on_attach = on_attach, - flags = lsp_flags, + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, } +require("lspconfig")["pyright"].setup({ + on_attach = on_attach, + flags = lsp_flags, +}) -require 'lspconfig'.clangd.setup {} +require("lspconfig").clangd.setup({}) diff --git a/nvim/lua/nvim-tree-config.lua b/nvim/lua/nvim-tree-config.lua index 0c4cb31..4245741 100644 --- a/nvim/lua/nvim-tree-config.lua +++ b/nvim/lua/nvim-tree-config.lua @@ -1,12 +1,6 @@ vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 -require("nvim-tree").setup({ - filters = { - dotfiles = false, - git_ignored = false, - }, -}) local function open_nvim_tree(data) -- buffer is a real file on the disk diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 8495e8b..1e67856 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -1,104 +1,129 @@ -local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) - vim.cmd([[packadd packer.nvim]]) - return true - end - return false +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end +vim.opt.rtp:prepend(lazypath) -local packer_bootstrap = ensure_packer() -require("keybinding") -return require("packer").startup(function(use) - use("wbthomason/packer.nvim") - - use({ +require("lazy").setup({ + { "nvim-tree/nvim-tree.lua", - requires = { + dependencies = { "nvim-tree/nvim-web-devicons", -- optional, for file icons }, - }) - - use({ - "nvim-lualine/lualine.nvim", - requires = { + init = function() + require("nvim-tree-config") + end, + opts = { + filters = { + dotfiles = false, + git_ignored = false, + }, + }, + }, + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons", -- optional, for file icons }, - }) - - use({ + init = function() + require("nvim-tree-config") + end, + }, + { "romgrk/barbar.nvim", - requires = { "nvim-web-devicons", "lewis6991/gitsigns.nvim" }, - }) - - use("nvim-treesitter/nvim-treesitter") - - use("neovim/nvim-lspconfig") -- Configurations for Nvim LSP - use("simrat39/rust-tools.nvim") - - -- (batch)commenting tool - use("preservim/nerdcommenter") - use("m4xshen/autoclose.nvim") - use("lukas-reineke/indent-blankline.nvim") - - -- themeing - use("EdenEast/nightfox.nvim") - - -- thin bar indicating an arbitray character limit - use("lukas-reineke/virt-column.nvim") - - -- fuzzy file finder - use("nvim-telescope/telescope.nvim") - - -- autocompletion engine, plugs into lsp - use({ + dependencies = { + "nvim-tree/nvim-web-devicons", -- optional, for file icons + "lewis6991/gitsigns.nvim", + }, + init = function() + require("barbar-config") + end, + }, + "nvim-treesitter/nvim-treesitter", + { + "neovim/nvim-lspconfig", -- Configurations for Nvim LSP + init = function() + require("nvim-lsp-config") + end, + }, + "simrat39/rust-tools.nvim", + "preservim/nerdcommenter", -- (batch)commenting tool + { + "m4xshen/autoclose.nvim", + opts = require("autoclose-config"), + }, + "lukas-reineke/indent-blankline.nvim", + { + "EdenEast/nightfox.nvim", -- themeing + init = function() + vim.cmd("colorscheme carbonfox") + end, + opts = { + options = { + styles = { + comments = "italic", + keywords = "bold", + types = "italic,bold", + }, + }, + }, + }, + "lukas-reineke/virt-column.nvim", -- thin bar indicating an arbitray character limit + { + "nvim-telescope/telescope.nvim", -- fuzzy file finder + opts = { + pickers = { + find_files = { + -- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d. + find_command = { "rg", "--files", "--hidden", "--no-ignore", "--glob", "!**/.git/*" }, + }, + }, + }, + init = function() + require("telescope-config") + end, + }, + { "hrsh7th/nvim-cmp", - requires = { + dependencies = { "hrsh7th/cmp-buffer", "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-cmdline", "hrsh7th/cmp-path", "hrsh7th/cmp-nvim-lua", }, - }) - - --use 'dense-analysis/ale' - use("mhartington/formatter.nvim") - - use({ + init = function() + require("nvim-cmp-config") + end, + }, + { + "mhartington/formatter.nvim", + config = function() + opts = require("formatter-config").build() + require("formatter").setup(opts) + end, + }, + { "sudormrfbin/cheatsheet.nvim", - - requires = { - { "nvim-telescope/telescope.nvim" }, - { "nvim-lua/popup.nvim" }, - { "nvim-lua/plenary.nvim" }, + dependencies = { + "nvim-telescope/telescope.nvim", + "nvim-lua/popup.nvim", + "nvim-lua/plenary.nvim", }, - }) + }, +}) - vim.cmd([[ - augroup packer_user_config - autocmd! - autocmd BufWritePost plugins.lua source | PackerCompile - augroup end - ]]) - - -- init configs - require("nightfox-config") - require("nvim-lsp-config") - require("nvim-tree-config") - require("nvim-cmp-config") - require("autoclose-config") - require("barbar-config") - --require("image-config") - require("telescope-config") - -- require('ale-config') - require("formatter-config") - require("lualine").setup() - require("virt-column").setup() - - if packer_bootstrap then - require("packer").sync() - end -end) +local augroup = vim.api.nvim_create_augroup +local autocmd = vim.api.nvim_create_autocmd +augroup("__formatter__", { clear = true }) +autocmd("BufWritePost", { + group = "__formatter__", + command = ":FormatWrite", +}) diff --git a/nvim/lua/telescope-config.lua b/nvim/lua/telescope-config.lua index d4997ce..35b1fd4 100644 --- a/nvim/lua/telescope-config.lua +++ b/nvim/lua/telescope-config.lua @@ -1,12 +1,3 @@ -require("telescope").setup({ - pickers = { - find_files = { - -- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d. - find_command = { "rg", "--files", "--hidden", "--no-ignore", "--glob", "!**/.git/*" }, - }, - }, -}) - local builtin = require("telescope.builtin") vim.keymap.set("n", "ff", builtin.find_files, {})