rootiest/neovim-config
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: simplify data variable usage across multiple modules

Browse Source
This commit is contained in:
rootiest
2024-08-24 16:32:29 -04:00
parent ac9397a703
commit c02ba52ff1
8 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/plugins/ai.lua
+3 -1
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ AI Tools │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{
-- Neocodeium
@@ -11,7 +13,7 @@ return {
silent = true,
debounce = false,
},
keys = require("data.keys").neocodeium,
keys = data.keys.neocodeium,
},
{ -- Copilot
import = "lazyvim.plugins.extras.coding.copilot",
lua/plugins/cmp.lua
+3 -1
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Auto Completion │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{
"hrsh7th/nvim-cmp",
@@ -153,7 +155,7 @@ return {
})
-- List of filetypes to disable completion
local disabled_filetypes = require("data.types").cmp
local disabled_filetypes = data.types.cmp
for _, filetype in ipairs(disabled_filetypes) do
cmp.setup.filetype(filetype, {
sources = {},
lua/plugins/coding.lua
+7 -13
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Coding │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Mason-lspconfig
"williamboman/mason-lspconfig.nvim",
@@ -17,14 +19,6 @@ return {
{ -- VSCode
import = "lazyvim.plugins.extras.vscode",
},
{ -- Ollama Copilot
"Faywyn/llama-copilot.nvim",
lazy = false,
dependencies = {
"nvim-lua/plenary.nvim",
},
opts = require("data.types").ollama_copilot,
},
{ -- G-code
"wilriker/gcode.vim",
},
@@ -38,8 +32,8 @@ return {
{ -- Alternate
"ton/vim-alternate",
lazy = true,
ft = require("data.types").alternate,
keys = require("data.keys").alternate,
ft = data.types.alternate,
keys = data.keys.alternate,
},
{ -- Highlight colors
"brenoprata10/nvim-highlight-colors",
@@ -57,14 +51,14 @@ return {
{ -- Substitute
"gbprod/substitute.nvim",
lazy = true,
opts = require("data.types").substitute,
keys = require("data.keys").substitute,
opts = data.types.substitute,
keys = data.keys.substitute,
},
{ -- mini.splitjoin
"echasnovski/mini.splitjoin",
event = "InsertEnter",
opts = {
mappings = require("data.keys").splitjoin,
mappings = data.keys.splitjoin,
},
},
}
lua/plugins/core.lua
+3 -1
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Core │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- LazyVim
"LazyVim/LazyVim",
@@ -18,7 +20,7 @@ return {
{ -- Bufferline
"akinsho/bufferline.nvim",
opts = {
options = require("data.types").bufferline,
options = data.types.bufferline,
},
},
{ -- Which-Key
lua/plugins/dashboard.lua
+3 -1
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Dashboard │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
-- Dashboard
enabled = false,
@@ -62,7 +64,7 @@ return {
file_height = logo_dimensions.height,
},
config = {
center = require("data.dash").choices,
center = data.dash.choices,
footer = function()
local stats = require("lazy").stats()
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
lua/plugins/editor.lua
+9 -7
View File
@@ -1,6 +1,8 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Editor │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Aerial
import = "lazyvim.plugins.extras.editor.aerial",
@@ -25,7 +27,7 @@ return {
},
{ -- Arrow
"otavioschwanck/arrow.nvim",
opts = require("data.types").arrow,
opts = data.types.arrow,
},
{ -- indent-blankline
"lukas-reineke/indent-blankline.nvim",
@@ -34,16 +36,16 @@ return {
{ -- FoldNav
"domharries/foldnav.nvim",
lazy = true,
keys = require("data.keys").foldnav,
keys = data.keys.foldnav,
},
---@module "neominimap.config.meta"
{ -- NeoMiniMap
"Isrothy/neominimap.nvim",
enabled = true,
lazy = false,
keys = require("data.keys").minimap,
init = require("data.types").minimap.init(),
cond = require("data.types").minimap.cond(),
keys = data.keys.minimap,
init = data.types.minimap.init(),
cond = data.types.minimap.cond(),
},
{ -- Persistence
"folke/persistence.nvim",
@@ -58,13 +60,13 @@ return {
"tris203/precognition.nvim",
lazy = true,
opts = {},
keys = require("data.keys").precog,
keys = data.keys.precog,
},
{ -- Zen Mode
"folke/zen-mode.nvim",
lazy = true,
opts = {},
keys = require("data.keys").zen,
keys = data.keys.zen,
},
{ -- SmoothCursor
"gen740/SmoothCursor.nvim",
lua/plugins/git.lua
+16 -15
View File
@@ -1,6 +1,7 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Git Plugins │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Git UI
@@ -12,20 +13,20 @@ return {
{ -- DiffView
"sindrets/diffview.nvim",
lazy = true,
cmd = require("data.cmd").diffview,
cmd = data.cmd.diffview,
},
{ -- Gist Tools
"Rawnly/gist.nvim",
lazy = true,
cmd = require("data.cmd").gist,
keys = require("data.keys").gist,
cmd = data.cmd.gist,
keys = data.keys.gist,
config = true,
},
{ -- LazyGit
"kdheepak/lazygit.nvim",
lazy = true,
cmd = require("data.cmd").lazygit,
keys = require("data.keys").lazygit,
cmd = data.cmd.lazygit,
keys = data.keys.lazygit,
dependencies = {
"nvim-telescope/telescope.nvim",
"nvim-lua/plenary.nvim",
@@ -37,7 +38,7 @@ return {
{ -- Thanks/github-stars
"jsongerber/thanks.nvim",
lazy = true,
cmd = require("data.cmd").thanks,
cmd = data.cmd.thanks,
opts = {
star_on_install = false,
},
@@ -45,9 +46,9 @@ return {
{ -- GitLinker
"linrongbin16/gitlinker.nvim",
lazy = true,
cmd = require("data.cmd").gitlinker,
cmd = data.cmd.gitlinker,
opts = {},
keys = require("data.keys").gitlinker,
keys = data.keys.gitlinker,
},
{ -- Git Blame
"f-person/git-blame.nvim",
@@ -71,16 +72,16 @@ return {
-- Apply the lualine configuration
require("lualine").setup(config)
-- Return the git-blame options
return require("data.types").gitblame
return data.types.gitblame
end,
},
{ -- Git Graph
"isakbm/gitgraph.nvim",
opts = {
symbols = require("data.types").gitgraph.symbols(),
symbols = data.types.gitgraph.symbols(),
format = {
timestamp = require("data.types").gitgraph.timestamp,
fields = require("data.types").gitgraph.fields,
timestamp = data.types.gitgraph.timestamp,
fields = data.types.gitgraph.fields,
},
hooks = {
-- Check diff of a commit
@@ -95,7 +96,7 @@ return {
end,
},
},
keys = require("data.keys").gitgraph,
keys = data.keys.gitgraph,
},
{ -- FuGit
"SuperBo/fugit2.nvim",
@@ -110,7 +111,7 @@ return {
dependencies = { "stevearc/dressing.nvim" },
},
},
cmd = require("data.cmd").fugit,
keys = require("data.keys").fugit,
cmd = data.cmd.fugit,
keys = data.keys.fugit,
},
}
lua/plugins/terminal.lua
+15 -15
View File
@@ -10,15 +10,17 @@ package.path = package.path
.. vim.fn.expand("$HOME")
.. "/.luarocks/share/lua/5.1/?.lua"
local data = require("data")
return {
{ -- Smart-Splits
"mrjones2014/smart-splits.nvim",
lazy = false,
build = "./kitty/install-kittens.bash",
build = data.types.smart_splits.build(),
},
{ -- Image Renderer
"3rd/image.nvim",
ft = require("data.types").image,
ft = data.types.image,
config = function()
require("image").setup()
end,
@@ -27,51 +29,49 @@ return {
{ -- ToggleTerm
"akinsho/toggleterm.nvim",
event = "VeryLazy",
keys = require("data.keys").toggleterm,
keys = data.keys.toggleterm,
config = function()
require("toggleterm").setup(require("data.types").toggleterm)
require("toggleterm").setup(data.types.toggleterm)
end,
},
{ -- Kitty-Runner
"jghauser/kitty-runner.nvim",
cond = require("data.func").is_kitty(),
cond = data.func.is_kitty(),
},
{ -- Kitty-Scrollback
"mikesmithgh/kitty-scrollback.nvim",
enabled = true,
lazy = true,
cmd = require("data.cmd").kitty_scrollback,
cmd = data.cmd.kitty_scrollback,
event = { "User KittyScrollbackLaunch" },
version = "*",
config = function() -- Using Kitty-Scrollback
if vim.env.KITTY_SCROLLBACK_NVIM == "true" then
if data.func.is_kitty_scrollback() then
require("kitty-scrollback").setup()
end
end,
cond = data.func.is_kitty_scrollback(),
},
{ -- Nekifoch
"NeViRAIDE/nekifoch.nvim",
lazy = true,
cmd = require("data.cmd").nekifoch,
cmd = data.cmd.nekifoch,
opts = {
kitty_conf_path = vim.env.HOME .. "/.kittyoverrides",
},
keys = require("data.keys").nekifoch,
cond = require("data.func").is_kitty(),
keys = data.keys.nekifoch,
cond = data.func.is_kitty(),
},
{ -- WezTerm
"willothy/wezterm.nvim",
config = true,
cond = function() -- Using WezTerm
local wterm = os.getenv("TERM_PROGRAM")
return wterm and string.find(wterm, "WezTerm")
end,
cond = data.func.is_wezterm(),
},
{ -- Tmux
"aserowy/tmux.nvim",
config = function()
return require("tmux").setup()
end,
cond = require("data.func").is_tmux(),
cond = data.func.is_tmux(),
},
}