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

View file

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