From c5ec9c908e16dc93bd2ecbd9d691c05ed309f4fd Mon Sep 17 00:00:00 2001 From: Declan Chidlow Date: Thu, 11 Jul 2024 20:12:33 +0800 Subject: [PATCH] Update Neovim conf --- Baud/.config/nvim/ftplugin/html.lua | 3 - Baud/.config/nvim/ftplugin/php.lua | 3 - Baud/.config/nvim/init.lua | 6 +- Baud/.config/nvim/lazy-lock.json | 40 ++++++------- Baud/.config/nvim/lua/main/keymaps.lua | 9 +-- Baud/.config/nvim/lua/main/plugins.lua | 42 +++++++------ Baud/.config/nvim/lua/main/settings.lua | 60 ++++++++++++++----- Baud/.config/nvim/lua/plugins/ccc.lua | 19 ------ Baud/.config/nvim/lua/plugins/conform.lua | 52 +++++++++------- .../plugins/{telescope.lua => fzf-lua.lua} | 4 +- Baud/.config/nvim/lua/plugins/gitsigns.lua | 9 --- Baud/.config/nvim/lua/plugins/lsp/LuaSnip.lua | 3 - .../nvim/lua/plugins/lsp/cmp-buffer.lua | 6 -- .../nvim/lua/plugins/lsp/cmp-nerdfont.lua | 6 -- .../nvim/lua/plugins/lsp/cmp-nvim-lsp.lua | 6 -- .../.config/nvim/lua/plugins/lsp/cmp-path.lua | 6 -- .../nvim/lua/plugins/lsp/cmp_luasnip.lua | 6 -- .../.config/nvim/lua/plugins/lsp/nvim-cmp.lua | 9 ++- .../nvim/lua/plugins/lsp/nvim-lspconfig.lua | 52 +++++++++++++++- Baud/.config/nvim/lua/plugins/lualine.lua | 24 -------- .../lua/plugins/mason/mason-lspconfig.lua | 17 ------ .../plugins/mason/mason-tool-installer.lua | 30 ---------- Baud/.config/nvim/lua/plugins/mason/mason.lua | 15 ----- Baud/.config/nvim/lua/plugins/mini-diff.lua | 13 ++++ Baud/.config/nvim/lua/plugins/mini-git.lua | 9 +++ Baud/.config/nvim/lua/plugins/mini-icons.lua | 9 +++ Baud/.config/nvim/lua/plugins/mini-move.lua | 23 +++++++ Baud/.config/nvim/lua/plugins/mini-notify.lua | 14 +++++ .../nvim/lua/plugins/mini-statusline.lua | 9 +++ .../lua/plugins/nvim-highlight-colors.lua | 12 ++++ Baud/.config/nvim/lua/plugins/nvim-notify.lua | 21 ------- .../nvim/lua/plugins/nvim-web-devicons.lua | 6 -- Baud/.config/nvim/lua/plugins/srcery.lua | 7 +-- .../nvim/lua/plugins/todo-comments.lua | 11 ++-- .../treesitter/nvim-treesitter-context.lua | 3 +- .../plugins/treesitter/nvim-treesitter.lua | 18 ++---- 36 files changed, 285 insertions(+), 297 deletions(-) delete mode 100755 Baud/.config/nvim/ftplugin/html.lua delete mode 100755 Baud/.config/nvim/ftplugin/php.lua delete mode 100755 Baud/.config/nvim/lua/plugins/ccc.lua rename Baud/.config/nvim/lua/plugins/{telescope.lua => fzf-lua.lua} (96%) delete mode 100755 Baud/.config/nvim/lua/plugins/gitsigns.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lsp/cmp-buffer.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lsp/cmp-nerdfont.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lsp/cmp-nvim-lsp.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lsp/cmp-path.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lsp/cmp_luasnip.lua delete mode 100755 Baud/.config/nvim/lua/plugins/lualine.lua delete mode 100644 Baud/.config/nvim/lua/plugins/mason/mason-lspconfig.lua delete mode 100644 Baud/.config/nvim/lua/plugins/mason/mason-tool-installer.lua delete mode 100644 Baud/.config/nvim/lua/plugins/mason/mason.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-diff.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-git.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-icons.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-move.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-notify.lua create mode 100755 Baud/.config/nvim/lua/plugins/mini-statusline.lua create mode 100755 Baud/.config/nvim/lua/plugins/nvim-highlight-colors.lua delete mode 100755 Baud/.config/nvim/lua/plugins/nvim-notify.lua delete mode 100755 Baud/.config/nvim/lua/plugins/nvim-web-devicons.lua diff --git a/Baud/.config/nvim/ftplugin/html.lua b/Baud/.config/nvim/ftplugin/html.lua deleted file mode 100755 index 4d848dc..0000000 --- a/Baud/.config/nvim/ftplugin/html.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Smaller tabs -vim.o.tabstop = 2 -vim.o.shiftwidth = 2 diff --git a/Baud/.config/nvim/ftplugin/php.lua b/Baud/.config/nvim/ftplugin/php.lua deleted file mode 100755 index 4d848dc..0000000 --- a/Baud/.config/nvim/ftplugin/php.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Smaller tabs -vim.o.tabstop = 2 -vim.o.shiftwidth = 2 diff --git a/Baud/.config/nvim/init.lua b/Baud/.config/nvim/init.lua index 77605de..36ac4f8 100755 --- a/Baud/.config/nvim/init.lua +++ b/Baud/.config/nvim/init.lua @@ -1,7 +1,7 @@ --- Declan "Vale" Chidlow's personal configuration file for NeoVim +-- Personal configuration for Neovim -- https://github.com/DeclanChidlow/dotfiles -- https://vale.rocks require("main.settings") -- lua/main/settings.lua -require("main.keymaps") -- lua/main/keymaps.lua -require("main.plugins") -- lua/main/plugins.lua +require("main.keymaps") -- lua/main/keymaps.lua +require("main.plugins") -- lua/main/plugins.lua diff --git a/Baud/.config/nvim/lazy-lock.json b/Baud/.config/nvim/lazy-lock.json index da971e6..4f05df5 100755 --- a/Baud/.config/nvim/lazy-lock.json +++ b/Baud/.config/nvim/lazy-lock.json @@ -1,27 +1,25 @@ { - "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, - "ccc.nvim": { "branch": "main", "commit": "f388f1981d222967c741fe9927edf9ba5fa3bcbe" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "55619bcb306a1a37d487ed31b360a41c343ee74a" }, - "dropbar.nvim": { "branch": "master", "commit": "9fc10fa1a34ec3e55b470962e4e94644611bd209" }, - "fzf-lua": { "branch": "main", "commit": "a9e5755721c0f24cd1635ea4ff181df5b1bd5dd4" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, - "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lspconfig": { "branch": "master", "commit": "eadcee1573ca9d0e0cd36a49f620186a8dfdc607" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "30de5e7e9486fb1b1b8c2a1e71052b13f94f1cb0" }, - "nvim-treesitter-context": { "branch": "master", "commit": "55e29081e73d2e4b2d62fb4dc3eebe21bf66a1e2" }, - "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, - "srcery-vim": { "branch": "master", "commit": "7439a86e19714adaf1d4ae2c69ada19d5c779526" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" } + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, + "fzf-lua": { "branch": "main", "commit": "975534f4861e2575396716225c1202572645583d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "f918318d21956b0874a65ab35ce3d94d9057aabf" }, + "mini-git": { "branch": "main", "commit": "9c34f43846a7d82a9140a07c8454ff57e0587db7" }, + "mini.diff": { "branch": "main", "commit": "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6" }, + "mini.icons": { "branch": "main", "commit": "6dd65c0d89f0fe423d8f26e6a8f1c91fbf3bf4e3" }, + "mini.move": { "branch": "main", "commit": "cde3747eec9bb3941296e6fa1d874e0da5a10256" }, + "mini.notify": { "branch": "main", "commit": "a6101a5fa7eff7bdfbfc887ad9a331305729f0ec" }, + "mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, + "nvim-treesitter": { "branch": "master", "commit": "465840f8c14126e5193d777bbff94036eb875bd5" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, + "srcery-vim": { "branch": "master", "commit": "c7398b0b32009406cf3918a655c364c44d7ab99b" }, + "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" } } \ No newline at end of file diff --git a/Baud/.config/nvim/lua/main/keymaps.lua b/Baud/.config/nvim/lua/main/keymaps.lua index 9e549d1..29504fc 100755 --- a/Baud/.config/nvim/lua/main/keymaps.lua +++ b/Baud/.config/nvim/lua/main/keymaps.lua @@ -18,9 +18,6 @@ map({ "n", "v" }, "", "gj") map("i", "", "gk") map("i", "", "gj") --- Move lines vertically -map({ "i", "n" }, "", ":m .-2==") -map({ "i", "n" }, "", ":m .+1==") - --- Format file -map({ "n", "v" }, "f", ':lua require("conform").format()') +-- Add empty lines +map('n', 'O', "O") +map('n', 'o', "o") diff --git a/Baud/.config/nvim/lua/main/plugins.lua b/Baud/.config/nvim/lua/main/plugins.lua index 2cd292f..dc5aaa9 100755 --- a/Baud/.config/nvim/lua/main/plugins.lua +++ b/Baud/.config/nvim/lua/main/plugins.lua @@ -1,36 +1,34 @@ -local lazy = {} local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) +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({ - { import = "plugins" }, - { import = "plugins/lsp" }, - { import = "plugins/mason" }, - { import = "plugins/treesitter" }, - lazy.opts, -}) - -lazy.opts = { - ui = { - border = "rounded", + spec = { + { import = "plugins" }, + { import = "plugins/lsp" }, + { import = "plugins/treesitter" }, }, install = { missing = true, - colorscheme = { "nightly" }, + }, + ui = { + border = "rounded", }, change_detection = { enabled = true, notify = true, }, -} +}) diff --git a/Baud/.config/nvim/lua/main/settings.lua b/Baud/.config/nvim/lua/main/settings.lua index 882efbb..a7399fb 100755 --- a/Baud/.config/nvim/lua/main/settings.lua +++ b/Baud/.config/nvim/lua/main/settings.lua @@ -1,4 +1,6 @@ +local g = vim.g local o = vim.o +local a = vim.api local wo = vim.wo local bo = vim.bo @@ -11,18 +13,25 @@ o.cursorlineopt = "screenline" o.cursorcolumn = true -- Disable 'How to Disable Mouse' -vim.cmd([[aunmenu PopUp.How-to\ disable\ mouse]]) -vim.cmd([[aunmenu PopUp.-1-]]) +a.nvim_command('aunmenu PopUp.How-to\\ disable\\ mouse') +a.nvim_command('aunmenu PopUp.-1-') -- Show line number and dynamically activate relative line numbers o.number = true -vim.cmd([[ - augroup numbertoggle - autocmd! - autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu && mode() != "i" | set rnu | endif - autocmd BufLeave,FocusLost,InsertEnter,WinLeave * if &nu | set nornu | endif - augroup END -]]) +a.nvim_create_autocmd( + { "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, + { + pattern = "*", + command = "if &nu && mode() != 'i' | set rnu | endif", + } +) +a.nvim_create_autocmd( + { "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, + { + pattern = "*", + command = "if &nu | set nornu | endif", + } +) -- No line wrap and better scrolling o.wrap = false @@ -43,8 +52,7 @@ o.hlsearch = false -- Shows the effects of a substitution in another panel o.inccommand = "split" --- Allow code folding -o.foldmethod = "indent" +-- Allow code folding (mostly configured with treesitter) o.foldlevel = 3 -- Better indents @@ -53,8 +61,8 @@ o.breakindent = true o.copyindent = true -- Better tabs -o.tabstop = 4 -o.shiftwidth = 4 +o.tabstop = 2 +o.shiftwidth = 2 -- Spell check o.spelllang = "en_au" @@ -71,11 +79,33 @@ o.timeoutlen = 300 o.pumheight = 5 -- Highlight on yank -local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true }) -vim.api.nvim_create_autocmd("TextYankPost", { +local highlight_group = a.nvim_create_augroup("YankHighlight", { clear = true }) +a.nvim_create_autocmd("TextYankPost", { callback = function() vim.highlight.on_yank() end, group = highlight_group, pattern = "*", }) + +-- Improve netrw +g.netrw_liststyle = 3 +g.netrw_winsize = -30 + +-- Disable unused features +local disabled_built_ins = { + "netrwFileHandlers", + "getscript", + "getscriptPlugin", + "vimball", + "vimballPlugin", + "2html_plugin", + "logipat", + "rrhelper", + "spellfile_plugin", + "matchit" +} + +for _, plugin in pairs(disabled_built_ins) do + vim.g["loaded_" .. plugin] = 1 +end diff --git a/Baud/.config/nvim/lua/plugins/ccc.lua b/Baud/.config/nvim/lua/plugins/ccc.lua deleted file mode 100755 index 9fd9ce4..0000000 --- a/Baud/.config/nvim/lua/plugins/ccc.lua +++ /dev/null @@ -1,19 +0,0 @@ --- Colour code creator and displayer --- https://github.com/uga-rosa/ccc.nvim - -return { - "uga-rosa/ccc.nvim", - init = function() - local ccc = require("ccc") - local mapping = ccc.mapping - ccc.setup({ - point_char = "◆", - highlighter = { - auto_enable = true, - }, - mappings = { - [""] = mapping.quit, - }, - }) - end, -} diff --git a/Baud/.config/nvim/lua/plugins/conform.lua b/Baud/.config/nvim/lua/plugins/conform.lua index a6b9099..4e427b2 100755 --- a/Baud/.config/nvim/lua/plugins/conform.lua +++ b/Baud/.config/nvim/lua/plugins/conform.lua @@ -3,26 +3,34 @@ return { "stevearc/conform.nvim", - init = function() - require("conform").setup({ - lsp_fallback = true, - formatters_by_ft = { - json = { { "prettierd", "prettier" } }, - bash = { "beautysh" }, - css = { { "prettierd", "prettier" } }, - scss = { { "prettierd", "prettier" } }, - less = { { "prettierd", "prettier" } }, - html = { { "prettierd", "prettier" } }, - markdown = { { "prettierd", "prettier" } }, - php = { { "prettierd", "prettier" } }, - python = { "ruff" }, - javascript = { { "prettierd", "prettier" } }, - javascriptreact = { { "prettierd", "prettier" } }, - typescript = { { "prettierd", "prettier" } }, - typescriptreact = { { "prettierd", "prettier" } }, - yaml = { { "prettierd", "prettier" } }, - toml = { "taplo" }, - }, - }) - end, + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + keys = { + { + "f", + function() + require("conform").format({ async = true, lsp_format = "fallback" }) + end, + mode = "", + desc = "Format buffer", + }, + }, + opts = { + formatters_by_ft = { + json = { "prettierd" }, + css = { "prettierd" }, + scss = { "prettierd" }, + less = { "prettierd" }, + html = { "prettierd" }, + markdown = { "prettierd" }, + php = { "prettierd" }, + python = { "ruff" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + yaml = { "prettierd" }, + toml = { "taplo" }, + }, + }, } diff --git a/Baud/.config/nvim/lua/plugins/telescope.lua b/Baud/.config/nvim/lua/plugins/fzf-lua.lua similarity index 96% rename from Baud/.config/nvim/lua/plugins/telescope.lua rename to Baud/.config/nvim/lua/plugins/fzf-lua.lua index ba47d6c..9111137 100755 --- a/Baud/.config/nvim/lua/plugins/telescope.lua +++ b/Baud/.config/nvim/lua/plugins/fzf-lua.lua @@ -4,13 +4,13 @@ return { "ibhagwan/fzf-lua", - init = function() + init = function() vim.keymap.set("n", "g", "lua require('fzf-lua').grep()") vim.keymap.set("n", "g/", "lua require('fzf-lua').grep_cword()") vim.keymap.set("n", "ss", "lua require('fzf-lua').spell_suggest()") vim.keymap.set("n", "ft", "lua require('fzf-lua').filetypes()") vim.keymap.set("n", "km", "lua require('fzf-lua').keymaps()") - + -- LSP specific vim.keymap.set("n", "lr", "lua require('fzf-lua').lsp_references()") vim.keymap.set("n", "li", "lua require('fzf-lua').lsp_implementations()") diff --git a/Baud/.config/nvim/lua/plugins/gitsigns.lua b/Baud/.config/nvim/lua/plugins/gitsigns.lua deleted file mode 100755 index 6801a53..0000000 --- a/Baud/.config/nvim/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,9 +0,0 @@ --- Git decorations --- https://github.com/lewis6991/gitsigns.nvim - -return { - "lewis6991/gitsigns.nvim", - init = function() - require("gitsigns").setup() - end, -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/LuaSnip.lua b/Baud/.config/nvim/lua/plugins/lsp/LuaSnip.lua index 421d6f8..07bd9d4 100755 --- a/Baud/.config/nvim/lua/plugins/lsp/LuaSnip.lua +++ b/Baud/.config/nvim/lua/plugins/lsp/LuaSnip.lua @@ -3,7 +3,4 @@ return { "L3MON4D3/LuaSnip", - dependencies = { - "saadparwaiz1/cmp_luasnip", - }, } diff --git a/Baud/.config/nvim/lua/plugins/lsp/cmp-buffer.lua b/Baud/.config/nvim/lua/plugins/lsp/cmp-buffer.lua deleted file mode 100755 index 2c18ade..0000000 --- a/Baud/.config/nvim/lua/plugins/lsp/cmp-buffer.lua +++ /dev/null @@ -1,6 +0,0 @@ --- nvim-cmp source for buffer words --- https://github.com/hrsh7th/cmp-buffer - -return { - "hrsh7th/cmp-buffer", -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/cmp-nerdfont.lua b/Baud/.config/nvim/lua/plugins/lsp/cmp-nerdfont.lua deleted file mode 100755 index e3cbe2c..0000000 --- a/Baud/.config/nvim/lua/plugins/lsp/cmp-nerdfont.lua +++ /dev/null @@ -1,6 +0,0 @@ --- nvim-cmp source for Nerdfont icons --- https://github.com/chrisgrieser/cmp-nerdfont - -return { - "chrisgrieser/cmp-nerdfont", -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/cmp-nvim-lsp.lua b/Baud/.config/nvim/lua/plugins/lsp/cmp-nvim-lsp.lua deleted file mode 100755 index 8428a5c..0000000 --- a/Baud/.config/nvim/lua/plugins/lsp/cmp-nvim-lsp.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Complete for snippet engine --- https://github.com/hrsh7th/cmp-nvim-lsp - -return { - "hrsh7th/cmp-nvim-lsp", -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/cmp-path.lua b/Baud/.config/nvim/lua/plugins/lsp/cmp-path.lua deleted file mode 100755 index aa4496e..0000000 --- a/Baud/.config/nvim/lua/plugins/lsp/cmp-path.lua +++ /dev/null @@ -1,6 +0,0 @@ --- nvim-cmp source for filesystem paths --- https://github.com/hrsh7th/cmp-path - -return { - "hrsh7th/cmp-path", -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/cmp_luasnip.lua b/Baud/.config/nvim/lua/plugins/lsp/cmp_luasnip.lua deleted file mode 100755 index 944d3ef..0000000 --- a/Baud/.config/nvim/lua/plugins/lsp/cmp_luasnip.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Integrates LuaSnip with Nvim-cmp --- https://github.com/saadparwaiz1/cmp_luasnip - -return { - "saadparwaiz1/cmp_luasnip", -} diff --git a/Baud/.config/nvim/lua/plugins/lsp/nvim-cmp.lua b/Baud/.config/nvim/lua/plugins/lsp/nvim-cmp.lua index 26452d4..764be7f 100755 --- a/Baud/.config/nvim/lua/plugins/lsp/nvim-cmp.lua +++ b/Baud/.config/nvim/lua/plugins/lsp/nvim-cmp.lua @@ -18,7 +18,7 @@ return { [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), + [""] = cmp.mapping.abort(), [""] = cmp.mapping.confirm({ select = true }), }), sources = cmp.config.sources({ @@ -26,12 +26,17 @@ return { { name = "luasnip" }, }, { { name = "nerdfont" }, - { name = "buffer" }, { name = "path" }, }), + formatting = { + format = require("nvim-highlight-colors").format + } }) end, dependencies = { "hrsh7th/cmp-nvim-lsp", + "saadparwaiz1/cmp_luasnip", + "chrisgrieser/cmp-nerdfont", + "hrsh7th/cmp-path", }, } diff --git a/Baud/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua b/Baud/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua index 29af190..369e58e 100755 --- a/Baud/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua +++ b/Baud/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua @@ -1,6 +1,56 @@ --- Configure language server protocol +-- Configure language server protocols -- https://github.com/neovim/nvim-lspconfig return { "neovim/nvim-lspconfig", + init = function() + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + local servers = { + bashls = {}, + emmet_language_server = {}, + cssls = { capabilities = capabilities }, + html = { capabilities = capabilities }, + yamlls = {}, + tailwindcss = {}, + tsserver = {}, + rust_analyzer = { + settings = { + ['rust-analyzer'] = { + diagnostics = { + enable = false, + } + } + } + }, + lua_ls = { + on_init = function(client) + local path = client.workspace_folders[1].name + if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then + return + end + + client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME + } + } + }) + end, + settings = { + Lua = {} + } + }, + phpactor = {}, + ruff = {}, + taplo = {}, + } + + for server, config in pairs(servers) do + require("lspconfig")[server].setup(config) + end + end, } diff --git a/Baud/.config/nvim/lua/plugins/lualine.lua b/Baud/.config/nvim/lua/plugins/lualine.lua deleted file mode 100755 index 2c9befb..0000000 --- a/Baud/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,24 +0,0 @@ --- Statusline generator --- https://github.com/nvim-lualine/lualine.nvim - -return { - "nvim-lualine/lualine.nvim", - config = function() - vim.opt.showmode = false - require("lualine").setup({ - options = { - component_separators = "|", - section_separators = "", - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", "diff", "diagnostics" }, - lualine_c = { "hostname", "filename" }, - lualine_d = { "searchcount" }, - lualine_x = { "encoding", "filesize", "filetype" }, - lualine_y = { "progress" }, - lualine_z = { "selectioncount", "location" }, - }, - }, - }) - end, -} diff --git a/Baud/.config/nvim/lua/plugins/mason/mason-lspconfig.lua b/Baud/.config/nvim/lua/plugins/mason/mason-lspconfig.lua deleted file mode 100644 index 9602420..0000000 --- a/Baud/.config/nvim/lua/plugins/mason/mason-lspconfig.lua +++ /dev/null @@ -1,17 +0,0 @@ --- Bridges mason.nvim with the lspconfig plugin --- https://github.com/williamboman/mason-lspconfig.nvim - -return { - "williamboman/mason-lspconfig", - init = function() - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - require("mason-lspconfig").setup_handlers({ - function(server_name) - require("lspconfig")[server_name].setup({ - capabilities = capabilities, - }) - end, - }) - end, -} diff --git a/Baud/.config/nvim/lua/plugins/mason/mason-tool-installer.lua b/Baud/.config/nvim/lua/plugins/mason/mason-tool-installer.lua deleted file mode 100644 index 2fce561..0000000 --- a/Baud/.config/nvim/lua/plugins/mason/mason-tool-installer.lua +++ /dev/null @@ -1,30 +0,0 @@ --- Install and upgrade third party tools automatically --- https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim - -return { - "WhoIsSethDaniel/mason-tool-installer.nvim", - init = function() - require("mason-tool-installer").setup({ - ensure_installed = { - -- LSPs - "bashls", - "cssls", - "tailwindcss", - "emmet_language_server", - "html", - "jsonls", - "phpactor", - "pylsp", - "rust_analyzer", - "taplo", - "tsserver", - "yamlls", - -- Formatters - "beautysh", - "prettier", - "prettierd", - "ruff", - }, - }) - end, -} diff --git a/Baud/.config/nvim/lua/plugins/mason/mason.lua b/Baud/.config/nvim/lua/plugins/mason/mason.lua deleted file mode 100644 index 1cd9326..0000000 --- a/Baud/.config/nvim/lua/plugins/mason/mason.lua +++ /dev/null @@ -1,15 +0,0 @@ --- Portable package manager (installs LSP servers) --- https://github.com/williamboman/mason.nvim - -return { - "williamboman/mason.nvim", - init = function() - require("mason").setup() - - -- mason-lspconfig is referenced here for correct loading order - require("mason-lspconfig").setup({ - automatic_installation = true, - }) - end, - lazy = false, -} diff --git a/Baud/.config/nvim/lua/plugins/mini-diff.lua b/Baud/.config/nvim/lua/plugins/mini-diff.lua new file mode 100755 index 0000000..2c1b2bf --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-diff.lua @@ -0,0 +1,13 @@ +-- Git diff signs +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-diff.md + +return { + "echasnovski/mini.diff", + init = function() + require("mini.diff").setup({ + view = { + style = "sign", + }, + }) + end, +} diff --git a/Baud/.config/nvim/lua/plugins/mini-git.lua b/Baud/.config/nvim/lua/plugins/mini-git.lua new file mode 100755 index 0000000..8073bcc --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-git.lua @@ -0,0 +1,9 @@ +-- Git functionality +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-git.md + +return { + "echasnovski/mini-git", + init = function() + require("mini.git").setup() + end, +} diff --git a/Baud/.config/nvim/lua/plugins/mini-icons.lua b/Baud/.config/nvim/lua/plugins/mini-icons.lua new file mode 100755 index 0000000..1024433 --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-icons.lua @@ -0,0 +1,9 @@ +-- Add icons to many plugins +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-icons.md + +return { + "echasnovski/mini.icons", + init = function() + require('mini.icons').setup() + end, +} diff --git a/Baud/.config/nvim/lua/plugins/mini-move.lua b/Baud/.config/nvim/lua/plugins/mini-move.lua new file mode 100755 index 0000000..60ee750 --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-move.lua @@ -0,0 +1,23 @@ +-- Move text or code +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-move.md + +return { + "echasnovski/mini.move", + init = function() + require('mini.move').setup({ + mappings = { + -- Move visual selection + left = '', + right = '', + down = '', + up = '', + + -- Move line in normal mode + line_left = '', + line_right = '', + line_down = '', + line_up = '', + }, + }) + end, +} diff --git a/Baud/.config/nvim/lua/plugins/mini-notify.lua b/Baud/.config/nvim/lua/plugins/mini-notify.lua new file mode 100755 index 0000000..c05079b --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-notify.lua @@ -0,0 +1,14 @@ +-- Notifications +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-notify.md + +return { + "echasnovski/mini.notify", + config = function() + require('mini.notify').setup({ + window = { + max_width_share = 0.5, + } + }) + vim.notify = require('mini.notify').make_notify() + end, +} diff --git a/Baud/.config/nvim/lua/plugins/mini-statusline.lua b/Baud/.config/nvim/lua/plugins/mini-statusline.lua new file mode 100755 index 0000000..e4bc623 --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/mini-statusline.lua @@ -0,0 +1,9 @@ +-- Statusline +-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-statusline.md + +return { + "echasnovski/mini.statusline", + config = function() + require("mini.statusline").setup() + end, +} diff --git a/Baud/.config/nvim/lua/plugins/nvim-highlight-colors.lua b/Baud/.config/nvim/lua/plugins/nvim-highlight-colors.lua new file mode 100755 index 0000000..3226e38 --- /dev/null +++ b/Baud/.config/nvim/lua/plugins/nvim-highlight-colors.lua @@ -0,0 +1,12 @@ +-- Highlight colours +-- https://github.com/brenoprata10/nvim-highlight-colors +-- (referenced in nvim-cmp config) + +return { + "brenoprata10/nvim-highlight-colors", + config = function() + require('nvim-highlight-colors').setup({ + enable_tailwind = false, + }) + end, +} diff --git a/Baud/.config/nvim/lua/plugins/nvim-notify.lua b/Baud/.config/nvim/lua/plugins/nvim-notify.lua deleted file mode 100755 index fd3537a..0000000 --- a/Baud/.config/nvim/lua/plugins/nvim-notify.lua +++ /dev/null @@ -1,21 +0,0 @@ --- Notifications --- https://github.com/rcarriga/nvim-notify - -return { - "rcarriga/nvim-notify", - init = function() - vim.notify = require("notify") - end, - opts = { - stages = "static", - render = "wrapped-compact", - background_colour = vim.g.terminal_color_background, - minimum_width = 15, - max_height = function() - return math.floor(vim.o.lines * 0.75) - end, - max_width = function() - return math.floor(vim.o.columns * 0.75) - end, - }, -} diff --git a/Baud/.config/nvim/lua/plugins/nvim-web-devicons.lua b/Baud/.config/nvim/lua/plugins/nvim-web-devicons.lua deleted file mode 100755 index c1e65ca..0000000 --- a/Baud/.config/nvim/lua/plugins/nvim-web-devicons.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Add icons to many plugins --- https://github.com/nvim-tree/nvim-web-devicons - -return { - "nvim-tree/nvim-web-devicons", -} diff --git a/Baud/.config/nvim/lua/plugins/srcery.lua b/Baud/.config/nvim/lua/plugins/srcery.lua index d377fb1..15a0d3e 100755 --- a/Baud/.config/nvim/lua/plugins/srcery.lua +++ b/Baud/.config/nvim/lua/plugins/srcery.lua @@ -1,11 +1,10 @@ --- Srcery colour scheme +-- Colour scheme -- https://github.com/srcery-colors/srcery-vim return { "srcery-colors/srcery-vim", config = function() - vim.cmd([[colorscheme srcery]]) - vim.cmd([[highlight Normal ctermbg=none guibg=none]]) + vim.cmd("colorscheme srcery") + vim.cmd("highlight Normal ctermbg=none guibg=none") end, - lazy = false, } diff --git a/Baud/.config/nvim/lua/plugins/todo-comments.lua b/Baud/.config/nvim/lua/plugins/todo-comments.lua index a20bc94..ace4330 100755 --- a/Baud/.config/nvim/lua/plugins/todo-comments.lua +++ b/Baud/.config/nvim/lua/plugins/todo-comments.lua @@ -4,7 +4,6 @@ return { "folke/todo-comments.nvim", config = function() - vim.opt.showmode = false require("todo-comments").setup({ keywords = { TODO = { icon = "󰄬 ", color = "info", alt = { "TO-DO", "TASK" } }, @@ -32,11 +31,11 @@ return { IDEA = { icon = "󰌵 ", color = "info", alt = { "IDEA", "CONCEPT" } }, }, colors = { - error = { "DiagnosticError", "#DC2626" }, - warning = { "DiagnosticWarn", "#FBBF24" }, - info = { "DiagnosticInfo", "#2563EB" }, - hint = { "DiagnosticHint", "#10B981" }, - default = { "Identifier", "#7C3AED" }, + error = { "DiagnosticError", "#F13731" }, + warning = { "DiagnosticWarn", "#FFAD1F" }, + info = { "DiagnosticInfo", "#3578C1" }, + hint = { "DiagnosticHint", "#58A551" }, + default = { "Identifier", "#532ca5" }, }, }) end, diff --git a/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter-context.lua b/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter-context.lua index cc93763..eb80624 100755 --- a/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter-context.lua +++ b/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter-context.lua @@ -1,4 +1,5 @@ --- Treesitter context +-- Shows the context of currently visible buffer contents +-- https://github.com/nvim-treesitter/nvim-treesitter-context return { "nvim-treesitter/nvim-treesitter-context", diff --git a/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter.lua b/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter.lua index c76031b..ed081b1 100755 --- a/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter.lua +++ b/Baud/.config/nvim/lua/plugins/treesitter/nvim-treesitter.lua @@ -3,16 +3,8 @@ return { "nvim-treesitter/nvim-treesitter", - - init = function() - require("nvim-treesitter.install").update({ - with_sync = true, - }) - + config = function() require("nvim-treesitter.configs").setup({ - highlight = { - enable = true, - }, ensure_installed = { "bash", "css", @@ -35,9 +27,11 @@ return { "gitcommit", "gitignore", }, + auto_install = true, + highlight = { enable = true, }, + indent = { enable = true }, }) + vim.opt.foldmethod = "expr" + vim.opt.foldexpr = "nvim_treesitter#foldexpr()" end, - dependencies = { - "nvim-treesitter/nvim-treesitter-context", - }, } -- 2.51.2