home/private_dot_config/nvim/lua/plugins/ui.lua

@@ -1,10 +1,8 @@
 return {
   {
-    "folke/snacks.nvim",
-    opts = {
-      dashboard = {
-        preset = {
-          header = [[
+    "nvimdev/dashboard-nvim",
+    opts = function(_, opts)
+      local logo = [[
   ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⡤⠴⠶⠶⠶⠶⠦⢤⣤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
   ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⠶⠛⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠛⠶⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
   ⠀⠀⠀⠀⠀⠀⠀⣠⠞⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⠳⣄⠀⠀⠀⠀⠀⠀⠀
@@ -24,24 +22,21 @@ return {
   ⠀⠀⠀⠀⠀⠙⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡴⠋⠀⠀⠀⠀⠀
   ⠀⠀⠀⠀⠀⠀⠀⠙⢦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⡴⠋⠀⠀⠀⠀⠀⠀⠀
   ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠶⣤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⠶⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀
-  ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠛⠓⠲⠶⠶⠶⠶⠖⠚⠛⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-  ]],
-        -- 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" },
-        },
-        },
-      },
-    },
+  ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠛⠓⠲⠶⠶⠶⠶⠖⠚⠛⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀]]
+
+      -- 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,
   },
   {
     "folke/edgy.nvim",

home/private_dot_config/zsh/themes/dot_p10k.zsh

@@ -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,8 +1673,9 @@
     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", "(E)")),
+      if(empty, label("empty", "(empty)")),
       if(description, description.first_line(),label(if(empty, "empty"), description_placeholder),
     )))'