Compare commits

..

3 commits

Author SHA1 Message Date
813283badf
fix jj detection 2024-11-19 11:51:11 -06:00
e0d15ecf4b
make jj segment 2024-11-19 09:01:54 -06:00
5d9dd00df2
update lua 2024-11-19 09:01:50 -06:00
2 changed files with 25 additions and 21 deletions

View file

@ -1,8 +1,10 @@
return {
{
"nvimdev/dashboard-nvim",
opts = function(_, opts)
local logo = [[
"folke/snacks.nvim",
opts = {
dashboard = {
preset = {
header = [[
@ -22,21 +24,24 @@ return {
]]
-- TODO::
-- originally used to set highlight group to change header color in alpha
-- now would need to maybe use an AutoCmd to change DashboardHeader
-- math.randomseed(os.time())
-- local function pick_color()
-- local colors = { "String", "Identifier", "Keyword", "Number" }
-- return colors[math.random(#colors)]
-- end
--
opts.config.header = vim.split(logo, "\n")
return opts
end,
]],
-- stylua: ignore
---@type snacks.dashboard.Item[]
keys = {
{ icon = "", key = "f", desc = "Find File", action = ":lua Snacks.dashboard.pick('files')" },
{ icon = "", key = "n", desc = "New File", action = ":ene | startinsert" },
{ icon = "", key = "g", desc = "Find Text", action = ":lua Snacks.dashboard.pick('live_grep')" },
{ icon = "", key = "r", desc = "Recent Files", action = ":lua Snacks.dashboard.pick('oldfiles')" },
{ icon = "", key = "c", desc = "Config", action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})" },
{ icon = "", key = "s", desc = "Restore Session", section = "session" },
{ icon = "", key = "x", desc = "Lazy Extras", action = ":LazyExtras" },
{ icon = "󰒲 ", key = "l", desc = "Lazy", action = ":Lazy" },
{ icon = "", key = "q", desc = "Quit", action = ":qa" },
},
},
},
},
},
{
"folke/edgy.nvim",

View file

@ -373,7 +373,7 @@
function my_git_formatter() {
emulate -L zsh
if ! [[ $(_p9k_upglob '.jj/') ]] then
if ! _p9k_upglob '.jj/*'; then
typeset -g my_git_format=""
return
fi
@ -1673,9 +1673,8 @@
concat(
separate(" ",
format_short_change_id_with_hidden_and_divergent_info(self),
format_short_commit_id(commit_id),
if(conflict, label("conflict", "conflict")),
if(empty, label("empty", "(empty)")),
if(empty, label("empty", "(E)")),
if(description, description.first_line(),label(if(empty, "empty"), description_placeholder),
)))'