🔒 Backup for my config files
dotfiles
add jj description to starship prompt
+24
-12
-4
.config/jj/config.toml
-4
.config/jj/config.toml
···
59
59
[templates]
60
60
git_push_bookmark = '"kacaii/push-" ++ change_id.short()'
61
61
62
-
[revsets]
63
-
log = "current_work"
64
-
65
62
[revset-aliases]
66
63
"stack()" = "ancestors(reachable(@, mutable()), 2)"
67
64
"stack(x)" = "ancestors(reachable(x, mutable()), 2)"
68
65
"stack(x, n)" = "ancestors(reachable(x, mutable()), n)"
69
-
"current_work" = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)"
70
66
71
67
[aliases]
72
68
d = ["diff"]
+24
-8
.config/starship.toml
+24
-8
.config/starship.toml
···
7
7
$directory\
8
8
${custom.jj_bookmarks}\
9
9
${custom.jj_change}\
10
-
${custom.jj_conflict}\
10
+
${custom.jj_icon}\
11
11
${custom.jj_op}\
12
+
${custom.jj_description}\
12
13
$line_break\
13
14
$jobs\
14
15
$character
···
41
42
-T 'bookmarks' --ignore-working-copy
42
43
"""
43
44
44
-
[custom.jj_conflict]
45
+
[custom.icon]
45
46
ignore_timeout = true
46
-
description = "Whether the current jj worktree has conflicts"
47
+
description = "Icon for the current jj change"
47
48
detect_folders = [".jj"]
48
-
when = "jj resolve -l --ignore-working-copy"
49
+
command = """
50
+
jj op log --no-graph --color never --ignore-working-copy \
51
+
-T concat(
52
+
if(conflict, ""),
53
+
if(divergent, ""),
54
+
if(hidden, ""),
55
+
if(immutable, ""),
56
+
),
57
+
"""
49
58
50
59
[custom.jj_op]
51
60
ignore_timeout = true
52
61
description = "The current jj operation"
53
-
when = "jj root --ignore-working-copy"
62
+
detect_folders = [".jj"]
54
63
command = """
55
-
echo -n ' '
56
-
jj op log -T 'id.short(6)' --limit 1 --no-graph \
57
-
--color always --ignore-working-copy
64
+
jj op log --limit 1 --no-graph --color always --ignore-working-copy \
65
+
-T 'separate(" ", " ", id.short(6))'\
58
66
"""
59
67
68
+
[custom.jj_description]
69
+
ignore_timeout = true
70
+
description = "The current jj operation"
71
+
detect_folders = [".jj"]
72
+
command = """
73
+
jj log -r @ --no-graph --color never --ignore-working-copy \
74
+
-T 'truncate_end(29, description.first_line(), "…")'
75
+
"""
60
76
61
77
# Catppuccin ----------------------------------------------------------------
62
78