Nixfiles! :3
Seem to have upgraded my jj config quite a bit? Or I made a grave mistake
Signed-off-by: MLC Bloeiman <mar@strawmelonjuice.com>
MLC Bloeiman
(Jul 15, 2026, 2:37 PM +0200)
bd3b2e42
20838491
+40
-20
+39
-12
home/modules/development/vcs.nix
+39
-12
home/modules/development/vcs.nix
···
32
32
"$right"
33
33
];
34
34
ui = {
35
-
editor = "nvim";
35
+
editor = "${pkgs.helix}/bin/hx";
36
36
streampager.wrapping = "none";
37
37
movement.edit = true;
38
38
default-command = "status";
39
39
show-cryptographic-signatures = true;
40
40
};
41
+
revsets.bookmark-advance-to = "coalesce(@ & ~empty(), @-)";
42
+
templates.draft_commit_description = ''
43
+
concat(
44
+
"feat:|fix:|refactor:|style:|test:|docs:|build:|perf:|chore:|test:|ops: [what?]",
45
+
"\n\n[tell me more? :3]\n\n",
46
+
"\nSigned-off-by: ",
47
+
self.author().name(),
48
+
" <", self.author().email(), ">\n",
49
+
"\nJJ: ignore-rest\n",
50
+
diff.git(),
51
+
)
52
+
'';
41
53
aliases = {
42
54
# Always using the git backend to clone so why not.
43
55
clone = [
···
45
57
"clone"
46
58
];
47
59
48
-
# Moves bookmarks from the previous commit to your current one
49
-
tug = [
50
-
"bookmark"
51
-
"move"
52
-
"--from"
53
-
"heads(::@- & bookmarks())"
54
-
"--to"
55
-
"coalesce(@ & ~empty(), @-)"
60
+
# Fetch and rebase onto trunk
61
+
tt = [
62
+
"util"
63
+
"exec"
64
+
"--"
65
+
"sh"
66
+
"-c"
67
+
"jj git fetch && jj rebase --onto 'trunk()'"
68
+
];
69
+
70
+
# Advance bookmark, then push it
71
+
ap = [ "autopush" ];
72
+
autopush = [
73
+
"util"
74
+
"exec"
75
+
"--"
76
+
"sh"
77
+
"-c"
78
+
"jj bookmark advance && jj git push"
56
79
];
57
-
# JJ tug-push, or JJ teleport or JJ take-and-push whatever is funnier to you.
58
-
tp = [
80
+
81
+
# Describe a change, sign it and then create a new change on top
82
+
ds = [
59
83
"util"
60
84
"exec"
61
85
"--"
62
86
"sh"
63
87
"-c"
64
-
"jj tug && jj git push"
88
+
"jj describe && jj sign && jj new"
65
89
];
66
90
67
91
# Bit more history
···
92
116
"trunk()"
93
117
"--skip-emptied"
94
118
];
119
+
95
120
# Lists items with '[TODO]'
96
121
todo-list = [
97
122
"log"
···
102
127
"--reversed"
103
128
"--no-pager"
104
129
];
130
+
105
131
# Finds the latest '[TODO]' commit and edits it.
106
132
todo-edit-latest = [
107
133
"edit"
108
134
"--ignore-immutable"
109
135
"latest(description(substring:'[TODO]') & mine())"
110
136
];
137
+
111
138
# Toggles '[TODO]' on current commit.
112
139
todo-toggle = [
113
140
"util"
+1
-8
home/modules/shell/zsh.nix
+1
-8
home/modules/shell/zsh.nix
···
55
55
# JJ-related
56
56
jje = "jj edit";
57
57
jjd = "jj desc @";
58
-
# jjd (in editor) and sign
59
-
jjds = ''
60
-
jj desc @ -m "
61
-
62
-
63
-
Signed-off-by: $(git config user.name) <$(git config user.email)>" && jj desc @ && jj sign -r @
64
-
'';
65
58
jjda = ''jj describe @ -m "$(date)"'';
66
59
jjs = "jj show";
67
60
jjn = "jj next --edit";
···
79
72
# Have to have ssh-agent running now for yubikey sk-ed25519
80
73
eval $(ssh-agent)
81
74
clear
82
-
hyfetch
75
+
${pkgs.hyfetch}/bin/hyfetch
83
76
'';
84
77
zshConfig = lib.mkOrder 1000 ''
85
78
# Completion styling ------------------------------------------------------------