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

🧹 refactor(data): require data modules directly

Browse Source 
require data modules directly throughout config. No longer user
require("data") as a parent module
This commit is contained in:
rootiest
2024-11-08 12:39:30 -05:00
parent 6f98bdb344
commit 823e113276
18 changed files with 199 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/config/keymaps.lua
+18 -18
View File
@@ -9,68 +9,68 @@
-- This allows both plugin and general keybinds to
-- be defined in a single central location
-- Load data module
local data = require("data")
-- Add keymapper function
local add_keymap = data.func.add_keymap
local add_keymap = require("data.func").add_keymap
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━ Group Keybinds ━━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for menu groups
for _, item in ipairs(data.keys.groups) do
for _, item in ipairs(require("data.keys").groups) do
add_keymap(item)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━ General Keybinds ━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for miscellaneous keybinds
for _, item in ipairs(data.keys.misc) do
for _, item in ipairs(require("data.keys").misc) do
add_keymap(item)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━━ Telescope Keybinds ━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for telescope symbols
for _, item in ipairs(data.keys.telescope.symbols) do
for _, item in ipairs(require("data.keys").telescope.symbols) do
add_keymap(item)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━ Resizing splits ━━━━━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for resizing splits
for _, map in ipairs(data.keys.splits.resize) do
add_keymap(map[1], map[2], map[3], data.types.all_modes)
for _, map in ipairs(require("data.keys").splits.resize) do
add_keymap(map[1], map[2], map[3], require("data.types").all_modes)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━ Moving between splits ━━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for moving between splits
for _, map in ipairs(data.keys.splits.move) do
add_keymap(map[1], map[2], map[3], data.types.all_modes)
for _, map in ipairs(require("data.keys").splits.move) do
add_keymap(map[1], map[2], map[3], require("data.types").all_modes)
end
-- ━━━━━━━━━━━━━━━━━━ Swapping buffers between windows ━━━━━━━━━━━━━━━
-- Add keymaps for swapping buffers
for _, map in ipairs(data.keys.splits.swap) do
add_keymap(map[1], map[2], map[3], data.types.all_modes)
for _, map in ipairs(require("data.keys").splits.swap) do
add_keymap(map[1], map[2], map[3], require("data.types").all_modes)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ MultiCursor ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for multicursor
for _, item in ipairs(data.keys.multicursor) do
for _, item in ipairs(require("data.keys").multicursor) do
add_keymap(item)
end
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Overrides ━━━━━━━━━━━━━━━━━━━━━━━━━━
-- Add keymaps for overrides
add_keymap(data.keys.overrides)
add_keymap(require("data.keys").overrides)
-- Replace '...' with '…' (ellipsis) on InsertLeave
data.func.setup_replace_ellipsis(true)
require("data.func").setup_replace_ellipsis(true)
-- Search selected text in visual mode
add_keymap("/", "*<Esc>", "Search selected text", "v")
-- Use modern cipher instead of rot13
add_keymap(data.keys.cipher.hex)
add_keymap(require("data.keys").cipher.hex)
-- Help keybinds
for _, item in ipairs(data.keys.help) do
for _, item in ipairs(require("data.keys").help) do
add_keymap(item)
end
-- Remap Command Mode List
require("data.keys").cmd_mode()
lua/plugins/ai.lua
+20 -21
View File
@@ -3,61 +3,60 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ AI Tools │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Neocodeium
"monkoose/neocodeium",
event = "VeryLazy",
opts = data.types.neocodeium.opts,
keys = data.keys.neocodeium,
cond = data.cond.neocodeium,
opts = require("data.types").neocodeium.opts,
keys = require("data.keys").neocodeium,
cond = require("data.cond").neocodeium,
},
{ -- Codeium
import = "lazyvim.plugins.extras.coding.codeium",
cond = data.cond.codeium,
cond = require("data.cond").codeium,
},
{ -- Copilot
import = "lazyvim.plugins.extras.coding.copilot",
cond = data.cond.copilot,
cond = require("data.cond").copilot,
},
{ -- Tabnine
import = "lazyvim.plugins.extras.coding.tabnine",
cond = data.cond.tabnine,
cond = require("data.cond").tabnine,
},
{ -- Minuet-AI
"milanglacier/minuet-ai.nvim",
dependencies = data.deps.minuet,
dependencies = require("data.deps").minuet,
opts = { provider = "openai" },
cond = data.cond.minuet,
cond = require("data.cond").minuet,
},
{ -- ChatGPT
"jackMort/ChatGPT.nvim",
event = "VeryLazy",
cond = data.cond.chatgpt,
keys = data.keys.chatgpt.func,
opts = data.types.chatgpt,
dependencies = data.deps.chatgpt,
cond = require("data.cond").chatgpt,
keys = require("data.keys").chatgpt.func,
opts = require("data.types").chatgpt,
dependencies = require("data.deps").chatgpt,
},
{ -- GP
"robitx/gp.nvim",
cond = data.cond.gp,
cond = require("data.cond").gp,
lazy = false,
opts = data.types.gp,
keys = data.keys.gp.func,
opts = require("data.types").gp,
keys = require("data.keys").gp.func,
},
{ -- Avante
"yetone/avante.nvim",
cond = data.cond.avante,
cond = require("data.cond").avante,
event = "VeryLazy",
lazy = false,
opts = data.types.avante,
opts = require("data.types").avante,
build = "make",
dependencies = data.deps.avante,
dependencies = require("data.deps").avante,
keys = function()
-- Add keymaps for Avante group
for _, item in ipairs(data.keys.group.avante) do
data.func.add_keymap(item)
for _, item in ipairs(require("data.keys").group.avante) do
require("data.func").add_keymap(item)
end
end,
},
lua/plugins/cmp.lua
+4 -5
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Auto Completion │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
local perf = vim.g.cmp_performance_enabled or false
--- Function to return the cmp provider
---@param performance? boolean Whether to use the experimental cmp performance fork
@@ -31,17 +30,17 @@ return { -- cmp
branch = cmp_repo.branch,
dev = cmp_repo.dev,
event = "VeryLazy",
dependencies = data.deps.cmp,
dependencies = require("data.deps").cmp,
config = function()
local cmp = require("cmp")
local luasnip = require("luasnip")
cmp.event:on("menu_opened", function()
if data.cond.neocodeium() == true then
if require("data.cond").neocodeium() == true then
require("neocodeium").clear()
end
end)
cmp.event:on("menu_closed", function()
if data.cond.neocodeium() == true then
if require("data.cond").neocodeium() == true then
require("neocodeium.commands").enable()
require("neocodeium").cycle_or_complete()
end
@@ -197,7 +196,7 @@ return { -- cmp
end, cmp.get_config().sources),
})
-- List of filetypes to disable completion
local disabled_filetypes = data.types.cmp
local disabled_filetypes = require("data.types").cmp
for _, filetype in ipairs(disabled_filetypes) do
cmp.setup.filetype(filetype, {
sources = {},
lua/plugins/coding.lua
+12 -13
View File
@@ -3,23 +3,22 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Coding │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Mason-lspconfig
"williamboman/mason-lspconfig.nvim",
opts = data.types.mason_lsp_config.opts,
opts = require("data.types").mason_lsp_config.opts,
},
{ -- luasnip
import = "lazyvim.plugins.extras.coding.luasnip",
},
{ -- nvim-treesitter
"nvim-treesitter/nvim-treesitter",
opts = data.types.treesitter.opts,
opts = require("data.types").treesitter.opts,
},
{ -- nvim-lspconfig
"neovim/nvim-lspconfig",
opts = data.types.lspconfig.opts,
opts = require("data.types").lspconfig.opts,
},
{ -- Yanky
import = "lazyvim.plugins.extras.coding.yanky",
@@ -27,8 +26,8 @@ return {
{ -- Yanky
"gbprod/yanky.nvim",
requires = { "kkharji/sqlite.lua" },
opts = data.types.yanky,
keys = data.keys.yanky,
opts = require("data.types").yanky,
keys = require("data.keys").yanky,
},
{ -- Neogen
import = "lazyvim.plugins.extras.coding.neogen",
@@ -52,24 +51,24 @@ return {
{ -- Alternate
"ton/vim-alternate",
lazy = true,
ft = data.types.alternate,
keys = data.keys.alternate,
ft = require("data.types").alternate,
keys = require("data.keys").alternate,
},
{ -- Tailwind
"luckasRanarison/tailwind-tools.nvim",
lazy = true,
dependencies = data.deps.needs_treesitter,
dependencies = require("data.deps").needs_treesitter,
opts = {},
},
{ -- Substitute
"gbprod/substitute.nvim",
lazy = true,
opts = data.types.substitute,
keys = data.keys.substitute,
opts = require("data.types").substitute,
keys = require("data.keys").substitute,
},
{ -- Comment
"numToStr/Comment.nvim",
opts = data.types.comment,
opts = require("data.types").comment,
},
{ -- Fast Action
"Chaitanyabsprip/fastaction.nvim",
@@ -84,7 +83,7 @@ return {
},
{ -- EasyAlign
"junegunn/vim-easy-align",
keys = data.keys.easyalign,
keys = require("data.keys").easyalign,
},
{ -- Vim-Shebang
"vitalk/vim-shebang",
lua/plugins/core.lua
+4 -5
View File
@@ -3,23 +3,22 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Core │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
-- require("config.rocks").plugin_spec,
{ -- LazyVim
"LazyVim/LazyVim",
priority = 900,
opts = data.types.lazyvim.opts,
opts = require("data.types").lazyvim.opts,
},
{ -- Bufferline
"akinsho/bufferline.nvim",
cond = data.types.bufferline.enabled,
opts = data.types.bufferline.opts,
cond = require("data.types").bufferline.enabled,
opts = require("data.types").bufferline.opts,
},
{ -- Which-Key
"folke/which-key.nvim",
lazy = true,
opts = data.types.whichkey.opts,
opts = require("data.types").whichkey.opts,
},
}
lua/plugins/debug.lua
+2 -3
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Debug │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- DAP Core
@@ -21,9 +20,9 @@ return {
{ -- Neotest
"nvim-neotest/neotest",
opts = {
adapters = data.deps.neotest.adapters,
adapters = require("data.deps").neotest.adapters,
},
dependencies = data.deps.neotest.deps,
dependencies = require("data.deps").neotest.deps,
},
{ -- Profiling
"stevearc/profile.nvim",
lua/plugins/editor.lua
+29 -30
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Editor │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Aerial
@@ -32,21 +31,21 @@ return {
},
{ -- Trouble
"folke/trouble.nvim",
cmd = data.cmd.trouble,
opts = data.types.trouble.opts,
cmd = require("data.cmd").trouble,
opts = require("data.types").trouble.opts,
},
{ -- Flash
"folke/flash.nvim",
opts = data.types.flash,
keys = data.keys.flash,
opts = require("data.types").flash,
keys = require("data.keys").flash,
},
{ -- NeoTree
"nvim-neo-tree/neo-tree.nvim",
opts = data.types.neotree.opts,
opts = require("data.types").neotree.opts,
},
{ -- Arrow
"otavioschwanck/arrow.nvim",
opts = data.types.arrow,
opts = require("data.types").arrow,
},
{ -- indent-blankline
"lukas-reineke/indent-blankline.nvim",
@@ -56,9 +55,9 @@ return {
{ -- NeoMiniMap
"Isrothy/neominimap.nvim",
lazy = false,
keys = data.keys.minimap.func,
init = data.types.minimap.init(),
cond = data.types.minimap.cond(),
keys = require("data.keys").minimap.func,
init = require("data.types").minimap.init(),
cond = require("data.types").minimap.cond(),
},
{ -- Persistence
"folke/persistence.nvim",
@@ -68,37 +67,37 @@ return {
{ -- DeadColumn
"Bekaboo/deadcolumn.nvim",
event = "BufEnter",
cond = data.func.check_global_var("dead_column", true, true),
cond = require("data.func").check_global_var("dead_column", true, true),
},
{ -- Precognition
"tris203/precognition.nvim",
lazy = true,
opts = {},
keys = data.keys.precog,
keys = require("data.keys").precog,
},
{ -- Zen Mode
"folke/zen-mode.nvim",
lazy = true,
opts = data.types.zen,
keys = data.keys.zen,
opts = require("data.types").zen,
keys = require("data.keys").zen,
},
{ -- SmoothCursor
"gen740/SmoothCursor.nvim",
event = "BufEnter",
-- lazy = true,
opts = data.types.smoothcursor,
opts = require("data.types").smoothcursor,
enabled = false,
},
{ -- Smart Scrolloff
"tonymajestro/smart-scrolloff.nvim",
event = "VeryLazy",
cond = data.func.check_global_var("smart_scrolloff", true, true),
opts = data.types.smartscrolloff,
cond = require("data.func").check_global_var("smart_scrolloff", true, true),
opts = require("data.types").smartscrolloff,
},
{ -- Recorder
"chrisgrieser/nvim-recorder",
event = "VeryLazy",
dependencies = data.deps.recorder,
dependencies = require("data.deps").recorder,
opts = {},
},
{ -- Comment Box
@@ -106,8 +105,8 @@ return {
},
{ -- Todo Comments
"folke/todo-comments.nvim",
opts = data.types.todo.opts,
cond = data.cond.todo,
opts = require("data.types").todo.opts,
cond = require("data.cond").todo,
enabled = true,
},
{ -- Rainbow Delimeters
@@ -117,34 +116,34 @@ return {
"nvim-zh/colorful-winsep.nvim",
enabled = false,
lazy = true,
opts = data.types.winsep,
opts = require("data.types").winsep,
event = { "WinLeave" },
},
{ -- Auto Cursorline
"delphinus/auto-cursorline.nvim",
cond = data.func.check_global_var("auto_cursorline", true, true),
opts = data.types.autocursorline,
cond = require("data.func").check_global_var("auto_cursorline", true, true),
opts = require("data.types").autocursorline,
},
{ -- Bars N Lines
"OXY2DEV/bars-N-lines.nvim",
cond = data.types.barsNlines.enabled,
cond = require("data.types").barsNlines.enabled,
lazy = false,
config = data.types.barsNlines.config,
config = require("data.types").barsNlines.config,
},
{ -- UndoTree
"mbbill/undotree",
lazy = false,
config = data.types.undotree,
keys = data.keys.undotree,
config = require("data.types").undotree,
keys = require("data.keys").undotree,
},
{ -- Noice
"folke/noice.nvim",
optional = true,
opts = data.types.noice,
opts = require("data.types").noice,
},
{ -- Duck
"tamton-aquib/duck.nvim",
config = data.types.duck,
config = require("data.types").duck,
},
{ -- Volt
"rootiest/volt",
@@ -156,7 +155,7 @@ return {
},
{
"folke/twilight.nvim",
opts = data.types.twilight,
opts = require("data.types").twilight,
},
-- { -- vim-footprints
-- "axlebedev/vim-footprints",
lua/plugins/git.lua
+12 -13
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Git Plugins │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Octo plugin
@@ -12,16 +11,16 @@ return {
{ -- Gist Tools
"Rawnly/gist.nvim",
lazy = true,
cmd = data.cmd.gist,
keys = data.keys.gist.func,
cmd = require("data.cmd").gist,
keys = require("data.keys").gist.func,
config = true,
},
{ -- LazyGit
"kdheepak/lazygit.nvim",
lazy = true,
cmd = data.cmd.lazygit,
keys = data.keys.lazygit,
dependencies = data.deps.lazygit,
cmd = require("data.cmd").lazygit,
keys = require("data.keys").lazygit,
dependencies = require("data.deps").lazygit,
config = function()
require("telescope").load_extension("lazygit")
end,
@@ -29,25 +28,25 @@ return {
{ -- Thanks/github-stars
"jsongerber/thanks.nvim",
lazy = true,
cmd = data.cmd.thanks,
opts = data.types.thanks.opts,
cmd = require("data.cmd").thanks,
opts = require("data.types").thanks.opts,
},
{ -- GitLinker
"linrongbin16/gitlinker.nvim",
lazy = true,
cmd = data.cmd.gitlinker,
cmd = require("data.cmd").gitlinker,
opts = {},
keys = data.keys.gitlinker,
keys = require("data.keys").gitlinker,
},
{ -- Git Blame
"f-person/git-blame.nvim",
event = "VeryLazy",
opts = data.types.gitblame.opts,
opts = require("data.types").gitblame.opts,
},
{ -- Git Graph
"isakbm/gitgraph.nvim",
opts = data.types.gitgraph.opts,
keys = data.keys.gitgraph,
opts = require("data.types").gitgraph.opts,
keys = require("data.keys").gitgraph,
},
{ -- Diffview
"sindrets/diffview.nvim",
lua/plugins/mini.lua
+6 -7
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Mini │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- mini.animate
@@ -19,8 +18,8 @@ return {
},
{ -- Mini Indentscope
"echasnovski/mini.indentscope",
opts = data.types.miniindentscope.opts,
init = data.types.miniindentscope.init,
opts = require("data.types").miniindentscope.opts,
init = require("data.types").miniindentscope.init,
},
{ -- mini.align
"echasnovski/mini.align",
@@ -33,7 +32,7 @@ return {
"echasnovski/mini.splitjoin",
event = "InsertEnter",
opts = {
mappings = data.keys.splitjoin,
mappings = require("data.keys").splitjoin,
},
},
{ -- mini.surround
@@ -42,9 +41,9 @@ return {
},
{ -- mini.files
"echasnovski/mini.files",
opts = data.types.minifiles.opts,
keys = data.keys.minifiles,
config = data.types.minifiles.config,
opts = require("data.types").minifiles.opts,
keys = require("data.keys").minifiles,
config = require("data.types").minifiles.config,
},
{ -- mini.icons
"echasnovski/mini.icons",
lua/plugins/nvim_updater.lua
+5 -3
View File
@@ -1,4 +1,6 @@
local data = require("data")
-- ╭─────────────────────────────────────────────────────────╮
-- │ Nvim-Updater │
-- ╰─────────────────────────────────────────────────────────╯
return { -- Neovim Updater
"rootiest/nvim-updater.nvim",
@@ -15,9 +17,9 @@ return { -- Neovim Updater
},
keys = function()
-- Add Neovim Updater menu
data.func.add_keymap(data.keys.group.nvimup)
require("data.func").add_keymap(require("data.keys").group.nvimup)
-- Add Neovim Updater keys
return data.keys.nvimup
return require("data.keys").nvimup
end,
dev = vim.g.rootiest_dev or false,
}
lua/plugins/statusline/heirline.lua
+5 -3
View File
@@ -7,12 +7,14 @@
-- │ Heirline │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{
"rebelot/heirline.nvim",
cond = data.func.check_global_var("statusline", "heirline", "lualine"),
cond = require("data.func").check_global_var(
"statusline",
"heirline",
"lualine"
),
event = "UIEnter",
opts = {},
},
lua/plugins/statusline/lualine.lua
+22 -20
View File
@@ -9,8 +9,6 @@
local wakatime_stats = require("utils.wakatime_stats")
local music_stats = require("utils.music_stats")
local data = require("data")
local funcs = data.func
-- Setup NeoMiniMap extension
-- local minimap_extension = require("neominimap.statusline").lualine_default
@@ -103,9 +101,13 @@ vim.api.nvim_create_autocmd("User", {
return { -- Lualine
"nvim-lualine/lualine.nvim",
cond = data.func.check_global_var("statusline", "lualine", "lualine"),
cond = require("data.func").check_global_var(
"statusline",
"lualine",
"lualine"
),
dependencies = data.deps.lualine,
dependencies = require("data.deps").lualine,
init = function()
vim.g.lualine_laststatus = vim.o.laststatus
if vim.fn.argc(-1) > 0 then
@@ -132,7 +134,7 @@ return { -- Lualine
if not status then
todos_component = nil -- Set to nil if the plugin is not loaded
else
todos_component = todos.component(data.types.todo.lualine())
todos_component = todos.component(require("data.types").todo.lualine())
end
local opts = {
@@ -149,21 +151,21 @@ return { -- Lualine
lualine_a = {
{ -- Mode
function()
return data.types.mode.current.lualine()
return require("data.types").mode.current.lualine()
end,
padding = { left = 1, right = 0 },
separator = { left = "", right = "" },
},
{ -- MultiCursors
function()
return data.func.mc_statusline().count
.. data.func.mc_statusline().icon
return require("data.func").mc_statusline().count
.. require("data.func").mc_statusline().icon
end,
cond = function()
return data.func.mc_statusline().cursors > 1
return require("data.func").mc_statusline().cursors > 1
end,
color = function()
return data.func.mc_statusline().color
return require("data.func").mc_statusline().color
end,
padding = { left = 1, right = 0 },
separator = { left = "", right = "" },
@@ -178,7 +180,7 @@ return { -- Lualine
{ -- Todo
todos_component,
cond = function()
return funcs.is_window_wide_enough(100)
return require("data.func").is_window_wide_enough(100)
end,
padding = { left = 1, right = 0 },
on_click = function()
@@ -190,7 +192,7 @@ return { -- Lualine
return require("arrow.statusline").text_for_statusline_with_icons()
end,
cond = function()
return funcs.is_window_wide_enough(100)
return require("data.func").is_window_wide_enough(100)
and pcall(require, "arrow")
end,
padding = { left = 1, right = 0 },
@@ -290,7 +292,7 @@ return { -- Lualine
end
end,
cond = function()
return funcs.is_window_wide_enough(200)
return require("data.func").is_window_wide_enough(200)
end,
padding = { left = 0, right = 0 },
on_click = function()
@@ -308,7 +310,7 @@ return { -- Lualine
return wakatime_stats.get_color()
end,
cond = function()
return funcs.is_window_wide_enough(100)
return require("data.func").is_window_wide_enough(100)
end,
padding = { left = 0, right = 1 },
},
@@ -317,7 +319,7 @@ return { -- Lualine
return music_stats.get_icon_with_text()
end,
cond = function()
return funcs.is_window_wide_enough(100)
return require("data.func").is_window_wide_enough(100)
end,
padding = { left = 0, right = 1 },
},
@@ -356,7 +358,7 @@ return { -- Lualine
end,
icon = "",
cond = function()
return funcs.is_window_wide_enough(80)
return require("data.func").is_window_wide_enough(80)
end,
padding = { left = 0, right = 1 },
on_click = function()
@@ -368,7 +370,7 @@ return { -- Lualine
separator = "",
padding = { left = 0, right = 1 },
cond = function()
return funcs.is_window_wide_enough(60)
return require("data.func").is_window_wide_enough(60)
end,
icon = "",
on_click = function()
@@ -379,7 +381,7 @@ return { -- Lualine
"location",
padding = { left = 0, right = 1 },
cond = function()
return funcs.is_window_wide_enough(40)
return require("data.func").is_window_wide_enough(40)
end,
on_click = function()
vim.cmd("Telescope grep_string")
@@ -388,14 +390,14 @@ return { -- Lualine
{ -- Selection
"selection_count",
cond = function()
return funcs.is_window_wide_enough(120)
return require("data.func").is_window_wide_enough(120)
end,
padding = { left = 0, right = 1 },
},
{ -- Filesize
"filesize",
cond = function()
return funcs.is_window_wide_enough(100)
return require("data.func").is_window_wide_enough(100)
end,
padding = { left = 0, right = 1 },
icon = "",
lua/plugins/telescope.lua
+6 -7
View File
@@ -4,8 +4,6 @@
---@module "plugins.telescope"
--- This module defines the telescope plugins specs for the Neovim configuration.
local data = require("data")
local P = { -- Define Telescope Plugins Specs
{ -- Telescope All Recent
"prochri/telescope-all-recent.nvim",
@@ -42,11 +40,11 @@ local P = { -- Define Telescope Plugins Specs
{ -- Telescope Spell checker
"matkrin/telescope-spell-errors.nvim",
lazy = true,
cmd = data.cmd.spell_errors,
cmd = require("data.cmd").spell_errors,
config = function()
require("telescope").load_extension("spell_errors")
end,
dependencies = data.deps.needs_telescope,
dependencies = require("data.deps").needs_telescope,
},
{ -- Telescope Toggleterm
"ryanmsnyder/toggleterm-manager.nvim",
@@ -56,12 +54,12 @@ local P = { -- Define Telescope Plugins Specs
"nvim-lua/plenary.nvim", -- only needed because it's a dependency of telescope
},
config = true,
keys = data.keys.telescope.toggleterm,
keys = require("data.keys").telescope.toggleterm,
},
{ -- Telescope Lazy
"nvim-telescope/telescope.nvim",
dependencies = "tsakirist/telescope-lazy.nvim",
keys = data.keys.telescope.lazy,
keys = require("data.keys").telescope.lazy,
},
{ -- Telescope Luasnip
"benfowler/telescope-luasnip.nvim",
@@ -78,6 +76,7 @@ local P = { -- Define Telescope Plugins Specs
dependencies = {
"nvim-lua/plenary.nvim",
"debugloop/telescope-undo.nvim",
"jonarrien/telescope-cmdline.nvim",
},
opts = function()
require("telescope").load_extension("undo")
@@ -111,7 +110,7 @@ local P = { -- Define Telescope Plugins Specs
config = function()
require("telescope").load_extension("file_browser")
end,
keys = data.keys.telescope.filebrowser,
keys = require("data.keys").telescope.filebrowser,
},
{ -- Cheatsheet
"doctorfree/cheatsheet.nvim",
lua/plugins/terminal.lua
+13 -14
View File
@@ -3,17 +3,16 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Terminals │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Smart-Splits
"mrjones2014/smart-splits.nvim",
lazy = false,
build = data.types.smart_splits.build(),
build = require("data.types").smart_splits.build(),
},
{ -- Image Renderer
"3rd/image.nvim",
ft = data.types.image,
ft = require("data.types").image,
config = function()
require("image").setup({
backend = "kitty", -- Kitty will provide the best experience, but you need a compatible terminal
@@ -76,49 +75,49 @@ return {
{ -- ToggleTerm
"akinsho/toggleterm.nvim",
event = "VeryLazy",
keys = data.keys.toggleterm,
keys = require("data.keys").toggleterm,
config = function()
require("toggleterm").setup(data.types.toggleterm)
require("toggleterm").setup(require("data.types").toggleterm)
end,
},
{ -- Kitty-Runner
"jghauser/kitty-runner.nvim",
cond = data.func.is_kitty(),
cond = require("data.func").is_kitty(),
},
{ -- Kitty-Scrollback
"mikesmithgh/kitty-scrollback.nvim",
enabled = true,
lazy = true,
cmd = data.cmd.kitty_scrollback,
cmd = require("data.cmd").kitty_scrollback,
event = { "User KittyScrollbackLaunch" },
version = "*",
config = function() -- Using Kitty-Scrollback
if data.func.is_kitty_scrollback() then
if require("data.func").is_kitty_scrollback() then
require("kitty-scrollback").setup()
end
end,
cond = data.func.is_kitty_scrollback(),
cond = require("data.func").is_kitty_scrollback(),
},
{ -- Nekifoch
"NeViRAIDE/nekifoch.nvim",
lazy = true,
cmd = data.cmd.nekifoch,
cmd = require("data.cmd").nekifoch,
opts = {
kitty_conf_path = vim.env.HOME .. "/.kittyoverrides",
},
keys = data.keys.nekifoch,
cond = data.func.is_kitty(),
keys = require("data.keys").nekifoch,
cond = require("data.func").is_kitty(),
},
{ -- WezTerm
"willothy/wezterm.nvim",
config = true,
cond = data.func.is_wezterm(),
cond = require("data.func").is_wezterm(),
},
{ -- Tmux
"aserowy/tmux.nvim",
config = function()
return require("tmux").setup()
end,
cond = data.func.is_tmux(),
cond = require("data.func").is_tmux(),
},
}
lua/plugins/themes.lua
+7 -8
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Themes │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Tokyonight
@@ -19,7 +18,7 @@ return {
lazy = false, -- Override
priority = 1000,
name = "catppuccin",
opts = data.types.catppuccin,
opts = require("data.types").catppuccin,
},
{ -- Ayu
"Shatur/neovim-ayu",
@@ -100,24 +99,24 @@ return {
"zenbones-theme/zenbones.nvim",
name = "zenbones",
lazy = true,
dependencies = data.deps.zenbones,
dependencies = require("data.deps").zenbones,
},
-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ UTILITIES ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
{ -- Transparent
"xiyaowong/transparent.nvim",
lazy = true,
keys = data.keys.transparent,
cmd = data.cmd.transparent,
keys = require("data.keys").transparent,
cmd = require("data.cmd").transparent,
},
{ -- Auto Dark Mode
"f-person/auto-dark-mode.nvim",
lazy = true,
opts = data.types.auto_dark_mode,
cond = data.cond.auto_dark_mode,
opts = require("data.types").auto_dark_mode,
cond = require("data.cond").auto_dark_mode,
},
{ -- Highlight colors
"brenoprata10/nvim-highlight-colors",
event = "BufReadPre",
opts = data.types.hightlight_colors,
opts = require("data.types").hightlight_colors,
},
}
lua/plugins/util.lua
+23 -24
View File
@@ -3,7 +3,6 @@
-- ╭─────────────────────────────────────────────────────────╮
-- │ Utilities │
-- ╰─────────────────────────────────────────────────────────╯
local data = require("data")
return {
{ -- Chezmoi
@@ -33,19 +32,19 @@ return {
{ -- Link following
"chrishrb/gx.nvim",
lazy = true,
cmd = data.cmd.gx,
keys = data.keys.gx,
cmd = require("data.cmd").gx,
keys = require("data.keys").gx,
init = function()
vim.g.netrw_nogx = 1
end,
dependencies = data.deps.gx,
dependencies = require("data.deps").gx,
config = true,
},
{ -- Ripgrep substitute
"chrisgrieser/nvim-rip-substitute",
event = "InsertEnter",
cmd = data.cmd.ripsub,
keys = data.keys.ripsub,
cmd = require("data.cmd").ripsub,
keys = require("data.keys").ripsub,
},
{ -- Unception
"samjwill/nvim-unception",
@@ -55,21 +54,21 @@ return {
},
{ -- Codesnap
"mistricky/codesnap.nvim",
cond = data.func.check_global_var("codesnap", true, true),
cond = require("data.func").check_global_var("codesnap", true, true),
lazy = true,
build = "make",
opts = data.types.codesnap,
cmd = data.cmd.codesnap,
keys = data.keys.codesnap,
opts = require("data.types").codesnap,
cmd = require("data.cmd").codesnap,
keys = require("data.keys").codesnap,
},
{ -- Kulala
"mistweaverco/kulala.nvim",
ft = data.types.kulala.ft,
ft = require("data.types").kulala.ft,
opts = {},
},
{ -- Hardtime
"m4xshen/hardtime.nvim",
dependencies = data.deps.hardtime,
dependencies = require("data.deps").hardtime,
opts = function()
return { enabled = vim.g.usehardtime }
end,
@@ -78,20 +77,20 @@ return {
"dmtrKovalenko/caps-word.nvim",
lazy = true,
opts = {},
keys = data.keys.capsword,
keys = require("data.keys").capsword,
},
{ -- Music Controls
"AntonVanAssche/music-controls.nvim",
cond = data.func.check_global_var("usemusic", true, true),
dependencies = data.deps.musiccontrols,
cond = require("data.func").check_global_var("usemusic", true, true),
dependencies = require("data.deps").musiccontrols,
opts = {
default_player = "YoutubeMusic",
},
},
{ -- Qalc
"Apeiros-46B/qalc.nvim",
cmd = data.cmd.qalc,
keys = data.keys.qalc,
cmd = require("data.cmd").qalc,
keys = require("data.keys").qalc,
opts = {
bufname = "qalc",
set_ft = "qalc",
@@ -109,32 +108,32 @@ return {
"amitds1997/remote-nvim.nvim",
lazy = true,
version = "*", -- Pin to GitHub releases
dependencies = data.deps.remotenvim,
dependencies = require("data.deps").remotenvim,
config = true,
},
{ -- Encourage
"r-cha/encourage.nvim",
cond = data.func.check_global_var("encourage", true, true),
cond = require("data.func").check_global_var("encourage", true, true),
config = true,
},
{ -- Helpview
"OXY2DEV/helpview.nvim",
ft = "help",
dependencies = data.deps.needs_treesitter,
dependencies = require("data.deps").needs_treesitter,
},
{ -- Suda
"lambdalisue/vim-suda",
cmd = data.cmd.suda,
config = data.types.suda,
cmd = require("data.cmd").suda,
config = require("data.types").suda,
},
-- { -- Pigeon
-- "Pheon-Dev/pigeon",
-- config = data.types.pigeon,
-- config = require('data.types').pigeon,
-- },
{ -- Discord Presence
"IogaMaster/neocord",
event = "VeryLazy",
cond = data.func.check_global_var("usediscord", true, true),
cond = require("data.func").check_global_var("usediscord", true, true),
opts = {
logo = "https://raw.githubusercontent.com/rootiest/rootiest-nvim/b949af32e72db9fc35c18e14e2088710dc36dd15/logo/icon.png",
main_image = "logo",
lua/utils/highlight.lua
+9 -12
View File
@@ -6,12 +6,9 @@
local M = {}
-- Load utils
local data = require("data")
local funcs = data.func
-- Readability functions
local get_bg_color = funcs.get_bg_color
local get_fg_color = funcs.get_fg_color
local get_bg_color = require("data.func").get_bg_color
local get_fg_color = require("data.func").get_fg_color
local set_hl = vim.api.nvim_set_hl
local sign_def = vim.fn.sign_define
@@ -90,16 +87,16 @@ function M.setup_indent_highlight()
if vim.g.tab_char then
tab_char = vim.g.tab_char
elseif vim.g.tab_char_name then
tab_char = data.types.ibl.char[vim.g.tab_char_name]
tab_char = require("data.types").ibl.char[vim.g.tab_char_name]
else
tab_char = data.types.ibl.char.none
tab_char = require("data.types").ibl.char.none
end
if vim.g.indent_char then
indent_char = vim.g.indent_char
elseif vim.g.indent_char_name then
indent_char = data.types.ibl.char[vim.g.indent_char_name]
indent_char = require("data.types").ibl.char[vim.g.indent_char_name]
else
indent_char = data.types.ibl.char.none
indent_char = require("data.types").ibl.char.none
end
-- Configure the indent-blankline plugin
@@ -115,7 +112,7 @@ function M.setup_indent_highlight()
enabled = false,
},
exclude = {
filetypes = data.types.highlights.exclude,
filetypes = require("data.types").highlights.exclude,
},
})
end
@@ -206,7 +203,7 @@ end
--- Function to set up transparency of the editor
---@return nil
function M.setup_transparency()
if data.func.is_kitty() and not vim.g.disable_transparency then
if require("data.func").is_kitty() and not vim.g.disable_transparency then
vim.cmd("TransparentEnable")
else
vim.cmd("TransparentDisable")
@@ -254,7 +251,7 @@ function M.setup_autocommands()
local autocmd = vim.api.nvim_create_autocmd
-- List of filetypes to exclude
local excluded_filetypes = data.types.highlights.exclude
local excluded_filetypes = require("data.types").highlights.exclude
-- Create a new augroup for the IndentHighlight
local IndentGroup = autogrp("IndentHighlight", { clear = true })
lua/utils/indentor.lua
+2 -4
View File
@@ -53,11 +53,9 @@ end
--- Create keymaps for the module
---@return nil
function M.setup()
-- Load the data module
local data = require("data")
-- Create keymaps
for _, map in ipairs(data.keys.indentor) do
data.func.add_keymap(map[1], map[2], map[3], map[4])
for _, map in ipairs(require("data.keys").indentor) do
require("data.func").add_keymap(map[1], map[2], map[3], map[4])
end
end