Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generalize plugin enable/disable API #260

Merged
merged 1 commit into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ globals = {
"_HTOP_TOGGLE",
"vim",
"C",
"packer_plugins",
}

-- Rerun tests only if their modification time changed
Expand Down
6 changes: 3 additions & 3 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ utils.bootstrap()

local sources = {
"core.options",
"core.autocmds",
"core.plugins",
"core.autocmds",
"core.mappings",
}

for _, source in ipairs(sources) do
local status_ok, fault = pcall(require, source)
if not status_ok then
error("Failed to load " .. source .. "\n\n" .. fault)
elseif source == "core.plugins" then
utils.compiled()
end
end

Expand All @@ -32,8 +34,6 @@ if status_ok then
end
end

utils.compiled()

local polish = utils.user_plugin_opts "polish"
if type(polish) == "function" then
polish()
Expand Down
3 changes: 1 addition & 2 deletions lua/core/autocmds.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
local M = {}

local utils = require "core.utils"
local config = utils.user_settings()

vim.cmd [[
augroup packer_user_config
Expand All @@ -18,7 +17,7 @@ vim.cmd [[
augroup end
]]

if config.enabled.dashboard and config.enabled.bufferline then
if utils.is_available "dashboard-nvim" and utils.is_available "bufferline.nvim" then
vim.cmd [[
augroup dashboard_settings
autocmd!
Expand Down
16 changes: 8 additions & 8 deletions lua/core/mappings.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local M = {}

local config = require("core.utils").user_settings()
local utils = require "core.utils"

local opts = { noremap = true, silent = true }
local map = vim.api.nvim_set_keymap
Expand All @@ -24,7 +24,7 @@ map("n", "<C-Left>", "<cmd>lua require'smart-splits'.resize_left(2)<cr>", opts)
map("n", "<C-Right>", "<cmd>lua require'smart-splits'.resize_right(2)<cr>", opts)

-- Navigate buffers
if config.enabled.bufferline then
if utils.is_available "bufferline.nvim" then
map("n", "<S-l>", "<cmd>BufferLineCycleNext<cr>", opts)
map("n", "<S-h>", "<cmd>BufferLineCyclePrev<cr>", opts)
map("n", "}", "<cmd>BufferLineMoveNext<cr>", opts)
Expand Down Expand Up @@ -57,13 +57,13 @@ map("n", "<leader>li", "<cmd>LspInfo<cr>", opts)
map("n", "<leader>lI", "<cmd>LspInstallInfo<cr>", opts)

-- NeoTree
if config.enabled.neo_tree then
if utils.is_available "neo-tree.nvim" then
map("n", "<leader>e", "<cmd>Neotree toggle<CR>", opts)
map("n", "<leader>o", "<cmd>Neotree focus<CR>", opts)
end

-- Dashboard
if config.enabled.dashboard then
if utils.is_available "dashboard-nvim" then
map("n", "<leader>d", "<cmd>Dashboard<CR>", opts)
map("n", "<leader>fn", "<cmd>DashboardNewFile<CR>", opts)
map("n", "<leader>db", "<cmd>Dashboard<CR>", opts)
Expand All @@ -73,7 +73,7 @@ if config.enabled.dashboard then
end

-- GitSigns
if config.enabled.gitsigns then
if utils.is_available "gitsigns.nvim" then
map("n", "<leader>gj", "<cmd>lua require 'gitsigns'.next_hunk()<cr>", opts)
map("n", "<leader>gk", "<cmd>lua require 'gitsigns'.prev_hunk()<cr>", opts)
map("n", "<leader>gl", "<cmd>lua require 'gitsigns'.blame_line()<cr>", opts)
Expand Down Expand Up @@ -123,7 +123,7 @@ map("n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
map("n", "<leader>ld", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)

-- Comment
if config.enabled.comment then
if utils.is_available "Comment.nvim" then
map("n", "<leader>/", "<cmd>lua require('Comment.api').toggle_current_linewise()<cr>", opts)
map("v", "<leader>/", "<esc><cmd>lua require('Comment.api').toggle_linewise_op(vim.fn.visualmode())<CR>", opts)
end
Expand All @@ -135,7 +135,7 @@ map("n", "<C-s>", "<cmd>w!<CR>", opts)
map("n", "<C-q>", "<cmd>q!<CR>", opts)

-- Terminal
if config.enabled.toggle_term then
if utils.is_available "nvim-toggleterm.lua" then
map("n", "<C-\\>", "<cmd>ToggleTerm<CR>", opts)
map("n", "<leader>gg", "<cmd>lua require('core.utils').toggle_term_cmd('lazygit')<CR>", opts)
map("n", "<leader>tn", "<cmd>lua require('core.utils').toggle_term_cmd('node')<CR>", opts)
Expand All @@ -149,7 +149,7 @@ if config.enabled.toggle_term then
end

-- SymbolsOutline
if config.enabled.symbols_outline then
if utils.is_available "symbols-outline.nvim" then
map("n", "<leader>lS", "<cmd>SymbolsOutline<CR>", opts)
end

Expand Down
4 changes: 4 additions & 0 deletions lua/core/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ function M.label_plugins(plugins)
return labelled
end

function M.is_available(plugin)
return packer_plugins ~= nil and packer_plugins[plugin] ~= nil
end

function M.update()
local Job = require "plenary.job"

Expand Down