this repo has no description
Configure some fix formatters for JJ
+21
-7
+21
-7
modules/jj.nix
+21
-7
modules/jj.nix
···
1
-
{ pkgs, ... }: {
1
+
{pkgs, ...}: {
2
2
programs.jujutsu = {
3
3
enable = true;
4
4
···
31
31
commit implements:
32
32
PROMPT
33
33
'';
34
+
};
35
+
36
+
fix.tools = {
37
+
mix-format = {
38
+
command = ["mix" "format" "--stdin-filename" "$path"];
39
+
patterns = ["glob:**/*.ex" "glob:**/*.exs"];
40
+
};
41
+
42
+
nix-fmt = {
43
+
command = ["nix" "fmt"];
44
+
patterns = ["glob:**/*.nix"];
45
+
};
34
46
};
35
47
36
48
aliases = {
···
39
51
push = ["git" "push"];
40
52
sync = [
41
53
"rebase"
42
-
"--source" "roots(trunk()..mutable())"
43
-
"--destination" "trunk()"
54
+
"--source"
55
+
"roots(trunk()..mutable())"
56
+
"--destination"
57
+
"trunk()"
44
58
];
45
59
46
60
# Put changes from `@` into another change
···
53
67
54
68
# 'jj sandwich xyz' to move xyz into the megamerge in parallel to everything
55
69
# else. See notes on 'megamerge()' above for how it's resolved.
56
-
sandwich = [ "rebase" "-B" "megamerge()" "-A" "trunk()" "-r"];
70
+
sandwich = ["rebase" "-B" "megamerge()" "-A" "trunk()" "-r"];
57
71
};
58
72
59
73
revset-aliases = {
···
84
98
# they're custom and will never go upstream, but are correctly published as part
85
99
# of the fork; Tn is where the main bookmark points. Finally, we have changes P1
86
100
# ... Pn which are private and should never be pushed upstream at all.
87
-
#
101
+
#
88
102
# In this case, sandwich will fail because 'reachable(stack(), merges())' will
89
103
# resolve to {M1, M2}, which is an invalid argument for 'rebase -B' due to not
90
104
# having an all: prefix modifier. So to handle that case, we allow the user
···
141
155
),
142
156
)
143
157
)
144
-
'';
158
+
'';
145
159
};
146
160
147
161
templates = {
148
-
draft_commit_description =''
162
+
draft_commit_description = ''
149
163
concat(
150
164
coalesce(description, default_commit_description, "\n"),
151
165
surround(