From b031d6ac1cb0c599b5243a13d4ebb318dec2b438 Mon Sep 17 00:00:00 2001 From: James Dixon Date: Sat, 30 Aug 2025 19:15:20 -0400 Subject: [PATCH] rename plugins dir, try to fix vim global messages in lua --- config/nvim/.config/nvim/init.lua | 6 +-- config/nvim/.config/nvim/lua/config/local.lua | 5 ++- .../{plugin-config => config/plugins}/cmp.lua | 0 .../plugins}/colorscheme.lua | 0 .../plugins}/discord-presence.lua | 0 .../{plugin-config => config/plugins}/fzf.lua | 0 .../plugins}/gitsigns.lua | 0 .../.config/nvim/lua/config/plugins/init.lua | 27 +++++++++++ .../{plugin-config => config/plugins}/lsp.lua | 45 +++++++++---------- .../plugins}/nvim-treesitter.lua | 0 .../{plugin-config => config/plugins}/oil.lua | 0 .../plugins}/vim-fugitive.lua | 0 .../nvim/.config/nvim/lua/config/settings.lua | 2 +- .../.config/nvim/lua/plugin-config/init.lua | 27 ----------- 14 files changed, 54 insertions(+), 58 deletions(-) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/cmp.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/colorscheme.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/discord-presence.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/fzf.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/gitsigns.lua (100%) create mode 100644 config/nvim/.config/nvim/lua/config/plugins/init.lua rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/lsp.lua (77%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/nvim-treesitter.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/oil.lua (100%) rename config/nvim/.config/nvim/lua/{plugin-config => config/plugins}/vim-fugitive.lua (100%) delete mode 100644 config/nvim/.config/nvim/lua/plugin-config/init.lua diff --git a/config/nvim/.config/nvim/init.lua b/config/nvim/.config/nvim/init.lua index 7c10e2d..a1df2c7 100644 --- a/config/nvim/.config/nvim/init.lua +++ b/config/nvim/.config/nvim/init.lua @@ -1,13 +1,11 @@ --- init.lua -- - -- general vim settings require('config.settings') -- general vim settings require('config.keymaps') -- general vim keymaps require('config.platform_specific') -- platform specific settings (Win32, Mac, Linux) -- plugin configurations -require('config.lazy') -- nvim plugins -require('plugin-config') -- plugin specific configurations +require('config.lazy') -- nvim plugin mgmt +require('config.plugins') -- plugin specific configurations -- local config require('config.local') diff --git a/config/nvim/.config/nvim/lua/config/local.lua b/config/nvim/.config/nvim/lua/config/local.lua index 8a230d9..c9b01c3 100644 --- a/config/nvim/.config/nvim/lua/config/local.lua +++ b/config/nvim/.config/nvim/lua/config/local.lua @@ -1,3 +1,6 @@ -- source local rc file local local_rc = vim.fn.expand("~/.local/.nvimrc") -if (vim.fn.filereadable(local_rc)) then vim.cmd.source(local_rc) end +if (vim.fn.filereadable(local_rc)) then + vim.cmd.source(local_rc) +end + diff --git a/config/nvim/.config/nvim/lua/plugin-config/cmp.lua b/config/nvim/.config/nvim/lua/config/plugins/cmp.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/cmp.lua rename to config/nvim/.config/nvim/lua/config/plugins/cmp.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua b/config/nvim/.config/nvim/lua/config/plugins/colorscheme.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua rename to config/nvim/.config/nvim/lua/config/plugins/colorscheme.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/discord-presence.lua b/config/nvim/.config/nvim/lua/config/plugins/discord-presence.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/discord-presence.lua rename to config/nvim/.config/nvim/lua/config/plugins/discord-presence.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/fzf.lua b/config/nvim/.config/nvim/lua/config/plugins/fzf.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/fzf.lua rename to config/nvim/.config/nvim/lua/config/plugins/fzf.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/gitsigns.lua b/config/nvim/.config/nvim/lua/config/plugins/gitsigns.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/gitsigns.lua rename to config/nvim/.config/nvim/lua/config/plugins/gitsigns.lua diff --git a/config/nvim/.config/nvim/lua/config/plugins/init.lua b/config/nvim/.config/nvim/lua/config/plugins/init.lua new file mode 100644 index 0000000..d9dde8e --- /dev/null +++ b/config/nvim/.config/nvim/lua/config/plugins/init.lua @@ -0,0 +1,27 @@ +-- config/plugins/init.lua + +-- * LSP, Completion and TreeSitter * -- +-- lsp +require('config.plugins.lsp') +-- completion +require('config.plugins.cmp') +-- treesitter (tree based syntax highlighting) +require('config.plugins.nvim-treesitter') + +-- * File explorer and Fuzzy Finder * -- +-- nvim-tree +require('config.plugins.oil') +-- fzf (fuzzy finder) +require('config.plugins.fzf') + +-- * Git Integration * -- +-- gitsigns +require('config.plugins.gitsigns') +-- vim-fugitive (git plugins) +require('config.plugins.vim-fugitive') + +-- * Discord Presence * -- +-- require('config.plugins-config.discord-presence') + +-- colorscheme +require('config.plugins.colorscheme') diff --git a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua b/config/nvim/.config/nvim/lua/config/plugins/lsp.lua similarity index 77% rename from config/nvim/.config/nvim/lua/plugin-config/lsp.lua rename to config/nvim/.config/nvim/lua/config/plugins/lsp.lua index 16807a6..a92cfd3 100644 --- a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua +++ b/config/nvim/.config/nvim/lua/config/plugins/lsp.lua @@ -1,9 +1,10 @@ --- Diagnostic keymaps +-- -- Diagnostic keymaps vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) vim.keymap.set('n', ']d', vim.diagnostic.goto_next) vim.keymap.set('n', 'e', vim.diagnostic.open_float) vim.keymap.set('n', 'q', vim.diagnostic.setloclist) +-- set keymaps for LSP servers on attach to buffer local on_attach = function(_, bufnr) local nmap = function(keys, func, desc) if desc then @@ -37,8 +38,10 @@ local on_attach = function(_, bufnr) end, { desc = 'Format current buffer with LSP' }) end --- mason - package manager for lsp servers -require('mason').setup() +-- nvim-cmp - extend capabilities of LSP (for text completions) +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) + local servers = { 'clangd', 'rust_analyzer', @@ -50,11 +53,10 @@ local servers = { 'lua_ls', 'bashls' } -require('mason-lspconfig').setup({ ensure_installed = servers }) --- nvim-cmp - extend capabilities -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) +-- mason - package manager for lsp servers +require('mason').setup() +require('mason-lspconfig').setup({ ensure_installed = servers }) -- loop through servers, adding keymaps and capabilities for _, lsp in ipairs(servers) do @@ -63,32 +65,25 @@ for _, lsp in ipairs(servers) do capabilities = capabilities, } end - --- fidget - for lsp status above statusline +-- -- fidget - for lsp status above statusline require('fidget').setup() --- lua lsp config --- Make runtime files discoverable to the server -local runtime_path = vim.split(package.path, ';') -table.insert(runtime_path, 'lua/?.lua') -table.insert(runtime_path, 'lua/?/init.lua') +-- -- lua lsp config +-- -- Make runtime files discoverable to the server +-- local runtime_path = vim.split(package.path, ';') +-- table.insert(runtime_path, 'lua/?.lua') +-- table.insert(runtime_path, 'lua/?/init.lua') -require('lspconfig').lua_ls.setup { +local lspconfig = require('lspconfig') + +lspconfig.lua_ls.setup { on_attach = on_attach, capabilities = capabilities, settings = { Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT) - version = 'LuaJIT', - -- Setup your lua path - path = runtime_path, - }, - diagnostics = { - globals = { 'vim' }, - }, + runtime = { version = 'LuaJIT', path = runtime_path, }, + diagnostics = { globals = { 'vim', 'require' } }, workspace = { library = vim.api.nvim_get_runtime_file('', true), checkThirdParty = false, }, - -- Do not send telemetry data containing a randomized but unique identifier telemetry = { enable = false }, }, }, diff --git a/config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua b/config/nvim/.config/nvim/lua/config/plugins/nvim-treesitter.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua rename to config/nvim/.config/nvim/lua/config/plugins/nvim-treesitter.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/oil.lua b/config/nvim/.config/nvim/lua/config/plugins/oil.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/oil.lua rename to config/nvim/.config/nvim/lua/config/plugins/oil.lua diff --git a/config/nvim/.config/nvim/lua/plugin-config/vim-fugitive.lua b/config/nvim/.config/nvim/lua/config/plugins/vim-fugitive.lua similarity index 100% rename from config/nvim/.config/nvim/lua/plugin-config/vim-fugitive.lua rename to config/nvim/.config/nvim/lua/config/plugins/vim-fugitive.lua diff --git a/config/nvim/.config/nvim/lua/config/settings.lua b/config/nvim/.config/nvim/lua/config/settings.lua index 52d47d5..4f0a13b 100644 --- a/config/nvim/.config/nvim/lua/config/settings.lua +++ b/config/nvim/.config/nvim/lua/config/settings.lua @@ -1,5 +1,5 @@ -- settings.lua --- general settings +-- general settings for basic vim -- encoding/format vim.opt.encoding = 'utf-8' diff --git a/config/nvim/.config/nvim/lua/plugin-config/init.lua b/config/nvim/.config/nvim/lua/plugin-config/init.lua deleted file mode 100644 index 3bbf3af..0000000 --- a/config/nvim/.config/nvim/lua/plugin-config/init.lua +++ /dev/null @@ -1,27 +0,0 @@ --- plugin-config/init.lua - --- * LSP, Completion and TreeSitter * -- --- lsp -require('plugin-config.lsp') --- completion -require('plugin-config.cmp') --- treesitter (tree based syntax highlighting) -require('plugin-config.nvim-treesitter') - --- * File explorer and Fuzzy Finder * -- --- nvim-tree -require('plugin-config.oil') --- fzf (fuzzy finder) -require('plugin-config.fzf') - --- * Git Integration * -- --- gitsigns -require('plugin-config.gitsigns') --- vim-fugitive (git plugin) -require('plugin-config.vim-fugitive') - --- * Discord Presence * -- --- require('plugin-config.discord-presence') - --- colorscheme -require('plugin-config.colorscheme')