Compare commits

..

No commits in common. "3dd0fa6c5b0933d9a395e2492de69c151831c66e" and "b51065b1a8218ebc988d3d773e4b552841c09476" have entirely different histories.

6 changed files with 44 additions and 7 deletions

View File

@ -5,7 +5,7 @@ return {
ui = { ui = {
icons = { icons = {
ft = "", ft = "",
lazy = "󰂠 ", lazy = " ",
loaded = "", loaded = "",
not_loaded = "", not_loaded = "",
}, },

View File

@ -6,8 +6,8 @@ local options = {
ui = { ui = {
icons = { icons = {
package_pending = "", package_pending = "",
package_installed = "󰄳 ", package_installed = " ",
package_uninstalled = " 󰚌", package_uninstalled = " ",
}, },
keymaps = { keymaps = {

View File

@ -48,10 +48,10 @@ local options = {
}, },
glyphs = { glyphs = {
default = "󰈚", default = "",
symlink = "", symlink = "",
folder = { folder = {
default = "󰉋", default = "",
empty = "", empty = "",
empty_open = "", empty_open = "",
open = "", open = "",

View File

@ -53,7 +53,7 @@ M.gitsigns = {
signs = { signs = {
add = { hl = "DiffAdd", text = "", numhl = "GitSignsAddNr" }, add = { hl = "DiffAdd", text = "", numhl = "GitSignsAddNr" },
change = { hl = "DiffChange", text = "", numhl = "GitSignsChangeNr" }, change = { hl = "DiffChange", text = "", numhl = "GitSignsChangeNr" },
delete = { hl = "DiffDelete", text = "󰍵", numhl = "GitSignsDeleteNr" }, delete = { hl = "DiffDelete", text = "", numhl = "GitSignsDeleteNr" },
topdelete = { hl = "DiffDelete", text = "", numhl = "GitSignsDeleteNr" }, topdelete = { hl = "DiffDelete", text = "", numhl = "GitSignsDeleteNr" },
changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" }, changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
untracked = { hl = "GitSignsAdd", text = "", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" }, untracked = { hl = "GitSignsAdd", text = "", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },

View File

@ -0,0 +1,31 @@
local options = {
icons = {
breadcrumb = "»", -- symbol used in the command line area that shows your active key combo
separator = "", -- symbol used between a key and it's label
group = "+", -- symbol prepended to a group
},
popup_mappings = {
scroll_down = "<c-d>", -- binding to scroll down inside the popup
scroll_up = "<c-u>", -- binding to scroll up inside the popup
},
window = {
border = "none", -- none/single/double/shadow
},
layout = {
spacing = 6, -- spacing between columns
},
hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " },
triggers_blacklist = {
-- list of mode / prefixes that should never be hooked by WhichKey
i = { "j", "k" },
v = { "j", "k" },
},
}
return options

View File

@ -95,7 +95,7 @@ local default_plugins = {
-- git stuff -- git stuff
{ {
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
ft = { "gitcommit", "diff" }, ft = "gitcommit",
init = function() init = function()
-- load gitsigns only when a git file is opened -- load gitsigns only when a git file is opened
vim.api.nvim_create_autocmd({ "BufRead" }, { vim.api.nvim_create_autocmd({ "BufRead" }, {
@ -190,6 +190,7 @@ local default_plugins = {
"hrsh7th/cmp-path", "hrsh7th/cmp-path",
}, },
}, },
opts = function() opts = function()
return require "plugins.configs.cmp" return require "plugins.configs.cmp"
end, end,
@ -232,9 +233,11 @@ local default_plugins = {
init = function() init = function()
require("core.utils").load_mappings "telescope" require("core.utils").load_mappings "telescope"
end, end,
opts = function() opts = function()
return require "plugins.configs.telescope" return require "plugins.configs.telescope"
end, end,
config = function(_, opts) config = function(_, opts)
dofile(vim.g.base46_cache .. "telescope") dofile(vim.g.base46_cache .. "telescope")
local telescope = require "telescope" local telescope = require "telescope"
@ -254,6 +257,9 @@ local default_plugins = {
init = function() init = function()
require("core.utils").load_mappings "whichkey" require("core.utils").load_mappings "whichkey"
end, end,
opts = function()
return require "plugins.configs.whichkey"
end,
config = function(_, opts) config = function(_, opts)
dofile(vim.g.base46_cache .. "whichkey") dofile(vim.g.base46_cache .. "whichkey")
require("which-key").setup(opts) require("which-key").setup(opts)