๐Ÿ”’ Backup for my config files
dotfiles
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

change jj node icons and default command

+30 -20
+3 -1
.config/jj/conf.d/colors.toml
··· 2 2 3 3 [colors] 4 4 commit_id = { fg = "blue" } 5 - change_id = { fg = "magenta", bold = true } 5 + change_id = { fg = "magenta" } 6 6 rest = { fg = "bright black", bold = false } 7 7 8 8 node = { bold = false } 9 9 "node elided" = { fg = "yellow" } 10 10 "node working_copy" = { fg = "green" } 11 11 "node conflict" = { fg = "red" } 12 + "node immutable" = { fg = "red" } 13 + "node normal" = { bold = false }
+14
.config/jj/conf.d/templates.toml
··· 1 1 #:schema https://jj-vcs.github.io/jj/latest/config-schema.json 2 2 [template-aliases] 3 + "format_short_id(id)" = "id.shortest(6)" 4 + 3 5 "abbreviate_timestamp_suffix(s, suffix, abbr)" = ''' 4 6 if( 5 7 s.ends_with(suffix), ··· 30 32 31 33 [templates] 32 34 git_push_bookmark = '"kacaii/push-" ++ change_id.short()' 35 + log_node = ''' 36 + label("node", 37 + coalesce( 38 + if(!self, label("elided", "~")), 39 + if(current_working_copy, label("working_copy", "@")), 40 + if(conflict, label("conflict", "ร—")), 41 + 42 + if(immutable, label("immutable", "*")), 43 + label("normal", "ยท") 44 + ) 45 + ) 46 + '''
+13 -19
.config/jj/config.toml
··· 18 18 key = "~/.ssh/tangled.pub" 19 19 20 20 [ui] 21 - default-command = "status" 21 + default-command = "log" 22 22 diff-formatter = ["difft", "--color=always", "$left", "$right"] 23 23 diff-tool = "difft" 24 24 editor = "nvim" 25 25 graph.style = "curved" 26 26 27 - [revset-aliases] 28 - "closest_merge(to)" = "heads(::to & merges())" 29 - 30 - # tug 31 - 'closest_bookmark(to)' = 'heads(::to & bookmarks())' 32 - 'closest_pushable(to)' = 'heads(::to & ~description(exact:"") & (~empty() | merges()))' 33 - 34 27 [aliases] 28 + d = ["diff"] 29 + l = ["log"] 30 + ll = ["log", "-r", ".."] 31 + tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] 35 32 36 - # Show detailed log 37 - ll = ["log", "-T", "builtin_log_detailed"] 33 + [revset-aliases] 34 + current_work = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)" 38 35 39 - # Find the closest bookmark in history to advance it forward (edit workflow compatible) 40 - tug = [ 41 - "bookmark", 42 - "move", 43 - "--from", 44 - "closest_bookmark(@)", 45 - "--to", 46 - "closest_pushable(@)", 47 - ] 36 + "stack()" = "ancestors(reachable(@, mutable()), 2)" 37 + "stack(x)" = "ancestors(reachable(x, mutable()), 2)" 38 + "stack(x, n)" = "ancestors(reachable(x, mutable()), n)" 39 + 40 + [revsets] 41 + log = "current_work"