🔒 Backup for my config files
dotfiles
copy config from: https://tangled.org/strings/oppi.li/3m5lr67yogs22
+114
-25
+113
-24
.config/jj/config.toml
+113
-24
.config/jj/config.toml
···
1
1
#:schema https://jj-vcs.github.io/jj/latest/config-schema.json
2
2
3
3
[user]
4
-
name = "Kacaii"
4
+
name = "kacaii"
5
5
email = "kacaii.privado@gmail.com"
6
6
7
7
[remotes.origin]
···
9
9
10
10
[git]
11
11
write-change-id-header = true
12
+
subprocess = true
13
+
14
+
[ui]
15
+
default-command = "status"
16
+
diff-formatter = ["difft", "--color=always", "$left", "$right"]
17
+
diff-tool = "difft"
18
+
editor = "nvim"
19
+
graph.style = "curved"
12
20
13
21
[template-aliases]
14
22
"format_short_signature(signature)" = "signature.name()"
23
+
"format_short_id(id)" = "id.shortest()"
24
+
25
+
"abbreviate_timestamp_suffix(s, suffix, abbr)" = '''
26
+
if(
27
+
s.ends_with(suffix),
28
+
s.remove_suffix(suffix) ++ label("timestamp", abbr)
29
+
)
30
+
'''
31
+
32
+
"abbreviate_relative_timestamp(s)" = '''
33
+
coalesce(
34
+
abbreviate_timestamp_suffix(s, " millisecond", "ms"),
35
+
abbreviate_timestamp_suffix(s, " second", "s"),
36
+
abbreviate_timestamp_suffix(s, " minute", "m"),
37
+
abbreviate_timestamp_suffix(s, " hour", "h"),
38
+
abbreviate_timestamp_suffix(s, " day", "d"),
39
+
abbreviate_timestamp_suffix(s, " week", "w"),
40
+
abbreviate_timestamp_suffix(s, " month", "mo"),
41
+
abbreviate_timestamp_suffix(s, " year", "y"),
42
+
s
43
+
)
44
+
'''
45
+
46
+
"format_timestamp(timestamp)" = '''
47
+
coalesce(
48
+
if(timestamp.after("1 minute ago"), label("timestamp", "<1m")),
49
+
abbreviate_relative_timestamp(timestamp.ago().remove_suffix(' ago').remove_suffix('s'))
50
+
)
51
+
'''
52
+
53
+
[templates]
54
+
log = '''
55
+
if(root,
56
+
format_root_commit(self),
57
+
label(if(current_working_copy, "working_copy"),
58
+
separate(" ",
59
+
format_short_change_id_with_hidden_and_divergent_info(self),
60
+
if(empty, label("empty", "(empty)")),
61
+
if(description,
62
+
description.first_line(),
63
+
label(if(empty, "empty"), description_placeholder),
64
+
),
65
+
bookmarks,
66
+
tags,
67
+
working_copies,
68
+
if(git_head, label("git_head", "HEAD")),
69
+
if(conflict, label("conflict", "conflict")),
70
+
format_timestamp(commit_timestamp(self)),
71
+
) ++ "\n",
72
+
)
73
+
)
74
+
'''
75
+
76
+
log_node = '''
77
+
label("node",
78
+
coalesce(
79
+
if(!self, label("elided", "~")),
80
+
if(current_working_copy, label("working_copy", "@")),
81
+
if(conflict, label("conflict", "×")),
82
+
if(immutable, label("immutable", "•")),
83
+
label("normal", "·")
84
+
)
85
+
)
86
+
'''
87
+
88
+
draft_commit_description = '''
89
+
concat(
90
+
coalesce(description, default_commit_description, "\n"),
91
+
surround(
92
+
"\nJJ: This commit contains the following changes:\n", "",
93
+
indent("JJ: ", diff.stat(72)),
94
+
),
95
+
"\nJJ: ignore-rest\n",
96
+
diff.git(),
97
+
)
98
+
'''
99
+
100
+
git_push_bookmark = '''"op/" ++ change_id.short()'''
15
101
16
102
[revset-aliases]
17
-
"stack()" = "ancestors(mutable() & (..@ | @::), 2)"
18
-
"stack(x)" = "ancestors(mutable() & (..x | x::), 2)"
19
-
"stack(x, n)" = "ancestors(mutable() & (..x | x::), n)"
103
+
"stack()" = "ancestors(reachable(@, mutable()), 2)"
104
+
"stack(x)" = "ancestors(reachable(x, mutable()), 2)"
105
+
"stack(x, n)" = "ancestors(reachable(x, mutable()), n)"
106
+
"current_work" = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)"
20
107
21
108
[aliases]
109
+
d = ["diff"]
110
+
l = ["log"]
111
+
ll = ["log", "-r", "::@"]
22
112
fetch = ["git", "fetch"]
23
113
init = ["git", "init", "--colocate"]
24
-
all = ["log", "-r", "::@"]
25
114
mm = ["bookmark", "move", "main", "--to", "@-"]
26
115
mark = ["bookmark", "set", "-r", "@"]
27
116
track = ["bookmark", "track"]
28
117
push = ["git", "push"]
29
-
s = ["stack"]
30
-
stack = ["log", "-r", "stack()"]
31
-
32
-
33
-
[ui]
34
-
default-command = "log"
35
-
diff-formatter = ["difft", "--color=always", "$left", "$right"]
36
-
diff-tool = "difft"
37
-
editor = "nvim"
38
118
39
119
[colors]
40
-
"author" = { fg = "magenta", dim = true }
41
-
"bookmarks" = { fg = "red" }
42
-
"change_id" = { italic = true }
43
-
"commit_id" = { fg = "yellow" }
120
+
change_id = "cyan"
121
+
author = { fg = "magenta", dim = true }
122
+
bookmarks = { fg = "red" }
123
+
commit_id = { fg = "magenta" }
124
+
timestamp = { fg = "blue", dim = true }
44
125
"diff token" = { underline = false }
45
-
"node immutable" = { fg = "white", bold = true }
46
-
"timestamp" = { fg = "blue", dim = true }
47
126
"description placeholder" = { fg = "bright black" }
48
127
"empty description placeholder" = { fg = "bright black" }
49
128
129
+
node = { bold = false }
130
+
"node normal" = { bold = false }
131
+
"node elided" = "yellow"
132
+
"node working_copy" = "green"
133
+
"node conflict" = "red"
134
+
"node immutable" = { fg = "white", bold = true }
135
+
136
+
prefix = { bold = true, fg = "cyan" }
137
+
rest = { bold = false, fg = "bright black" }
138
+
working_copy = { bold = true }
50
139
"working_copy author" = { fg = "magenta", underline = true }
51
140
"working_copy commit_id prefix" = { fg = "yellow", underline = true }
52
141
"working_copy commit_id" = { fg = "red", underline = true }
53
142
"working_copy timestamp" = { fg = "blue", underline = true }
54
-
"working_copy empty" = { fg = "bright black" }
143
+
"working_copy empty" = "green"
144
+
"working_copy placeholder" = "red"
55
145
"working_copy description" = { fg = "yellow", bold = false }
56
-
"working_copy empty description placeholder" = { fg = "bright black" }
57
-
"working_copy description placeholder" = { fg = "bright black" }
58
-
"working_copy" = { bold = true }
146
+
"working_copy description placeholder" = "yellow"
147
+
"working_copy empty description placeholder" = "green"