my personal dotfiles
feat: update config files
+86
-100
+1
-1
.gitallowedsigners
+1
-1
.gitallowedsigners
···
1
-
daniel@danieldaum.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAVwC6JAlpdvuyLJE+PvIkbBesM+P5yeyLfeDwP5CSndFPYPsznRWlu7cyn2kh1EoSevPXhP30QBXanWpnyvQvc= coruscant@secretive.coruscant.local
1
+
daniel@danieldaum.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC+8q3HyMfBSLDTRjrHvXcH49947NPsNHq6TYwh+GzAtO0dF7ROZOmatuhvN5jXH/b9ybTJwIGyQweCZNTmuVJg= Coruscant@secretive.coruscant.local
+27
-1
.gitconfig
+27
-1
.gitconfig
···
1
1
[user]
2
2
name = daniel daum
3
3
email = daniel@danieldaum.net
4
-
signingkey = /Users/daniel/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/7a42c4933fb6cbb7d73547a75e757882.pub
4
+
signingkey = /Users/daniel/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/de7dcf62affac3514c9b45b3da139182.pub
5
5
[push]
6
6
autoSetupRemote = true
7
7
[commit]
···
31
31
32
32
# cleanup
33
33
sweep = "!git branch --merged | grep -v '\\*\\|main\\|master' | xargs -n 1 git branch -d"
34
+
35
+
[core]
36
+
pager = delta
37
+
38
+
[interactive]
39
+
diffFilter = delta --color-only
40
+
41
+
[delta]
42
+
navigate = true # use n and N to move between diff sections
43
+
dark = true # or light = true, or omit for auto-detection
44
+
45
+
[merge]
46
+
conflictStyle = zdiff3
47
+
48
+
[diff]
49
+
tool = difftastic
50
+
51
+
[difftool "difftastic"]
52
+
cmd = difft "$LOCAL" "$REMOTE"
53
+
54
+
[difftool]
55
+
prompt = false
56
+
57
+
[pager]
58
+
difftool = less -R
59
+
34
60
[filter "lfs"]
35
61
clean = git-lfs clean -- %f
36
62
smudge = git-lfs smudge -- %f
+9
-5
.zshrc
+9
-5
.zshrc
···
15
15
# cat replacement
16
16
alias cat='bat'
17
17
18
-
# jj
19
-
alias jjp='jj git push'
20
-
alias jja='jj log -r "all()"'
21
-
22
18
# pnpm
23
19
export PNPM_HOME="/Users/daniel/Library/pnpm"
24
20
case ":$PATH:" in
25
21
*":$PNPM_HOME:"*) ;;
26
22
*) export PATH="$PNPM_HOME:$PATH" ;;
27
23
esac
28
-
# pnpm end
24
+
25
+
# jj commit
26
+
jj() {
27
+
if [[ "$1" == "commit" ]]; then
28
+
command jj new && command jj tug && command jj push
29
+
else
30
+
command jj "$@"
31
+
fi
32
+
}
+7
-20
Brewfile
+7
-20
Brewfile
···
1
1
tap "macos-fuse-t/cask"
2
2
brew "antidote"
3
-
brew "git-lfs"
4
-
brew "httpd"
3
+
brew "difftastic"
4
+
brew "git-delta"
5
+
brew "helix"
6
+
brew "jjui"
5
7
brew "jq"
8
+
brew "just"
6
9
brew "mas"
7
10
brew "mise"
8
11
cask "alt-tab"
9
12
cask "anytype"
10
-
cask "balenaetcher"
11
13
cask "blender"
12
14
cask "bloom"
13
15
cask "bruno"
14
16
cask "calibre"
15
17
cask "claude"
18
+
cask "claude-code"
16
19
cask "cork"
17
20
cask "crossover"
18
21
cask "cryptomator"
19
22
cask "dbngin"
20
23
cask "discord"
21
-
cask "downie"
22
-
cask "firefox"
23
24
cask "font-geist-mono"
24
25
cask "fuse-t"
25
26
cask "macos-fuse-t/cask/fuse-t-sshfs"
26
27
cask "godot"
27
28
cask "gpg-suite"
28
-
cask "greenfoot"
29
-
cask "halloy"
30
29
cask "iina"
31
-
cask "linear-linear"
32
30
cask "little-snitch"
33
31
cask "mac-mouse-fix"
34
-
cask "mullvad-vpn"
35
32
cask "orbstack"
36
-
cask "pearcleaner"
37
-
cask "permute"
38
33
cask "pgadmin4"
39
-
cask "proton-drive"
40
34
cask "proton-mail"
41
35
cask "proton-pass"
42
36
cask "qgis"
···
45
39
cask "secretive"
46
40
cask "signal"
47
41
cask "slack"
48
-
cask "spotify"
49
42
cask "steam"
50
43
cask "tailscale-app"
51
44
cask "voiceink"
52
45
cask "warp"
53
46
cask "yubico-authenticator"
54
47
cask "zed"
55
-
mas "Aeronaut", id: 6670275450
56
-
mas "Anybox", id: 1593408455
57
48
mas "Brother iPrint&Scan", id: 1193539993
58
-
mas "Consent-O-Matic", id: 1606897889
49
+
mas "Developer", id: 640199958
59
50
mas "Dropover", id: 1355679052
60
-
mas "Goodnotes", id: 1444383602
61
51
mas "Kagi for Safari", id: 1622835804
62
52
mas "Keynote", id: 361285480
63
53
mas "LiquidFetch", id: 6757637185
64
-
mas "Mapper", id: 1589391989
65
54
mas "Numbers", id: 361304891
66
55
mas "Pages", id: 361309726
67
56
mas "Panels", id: 1236567663
68
-
mas "Photomator", id: 1444636541
69
57
mas "Pixelmator Pro", id: 1289583905
70
58
mas "Scrap Paper", id: 1448441317
71
-
mas "Sink It", id: 6449873635
72
59
mas "SnippetsLab", id: 1006087419
73
60
mas "TestFlight", id: 899247664
74
61
mas "Wipr", id: 1662217862
+5
-1
README.md
+5
-1
README.md
+29
-37
jj.config.toml
+29
-37
jj.config.toml
···
4
4
email = "daniel@danieldaum.net"
5
5
6
6
[ui]
7
+
pager = "delta" # pipe all output through delta for syntax-highlighted diffs
8
+
diff.format = "git" # use unified git-style diffs (required for delta to render correctly)
9
+
diff.tool = "difftastic" # use difftastic as the diff engine for structural, syntax-aware diffs
7
10
default-command = "log"
8
-
pager = "delta"
9
-
diff.format = "git"
10
11
11
12
[git]
12
-
write-change-id-header = true
13
+
write-change-id-header = true # embed jj change-id in git commit object; enables change tracking across force pushes on Tangled
14
+
sign-on-push = true # sign commits at push time only
13
15
14
16
[signing]
15
-
behavior = "own"
16
-
backend = "ssh"
17
-
key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAVwC6JAlpdvuyLJE+PvIkbBesM+P5yeyLfeDwP5CSndFPYPsznRWlu7cyn2kh1EoSevPXhP30QBXanWpnyvQvc= coruscant@secretive.coruscant.local" # from Secretive
17
+
behavior = "drop" # drop signatures on rewrite; rely solely on sign-on-push
18
+
backend = "ssh" # use SSH for commit signing
19
+
key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC+8q3HyMfBSLDTRjrHvXcH49947NPsNHq6TYwh+GzAtO0dF7ROZOmatuhvN5jXH/b9ybTJwIGyQweCZNTmuVJg= Coruscant@secretive.coruscant.local" # public key from Secretive
18
20
19
21
[signing.backends.ssh]
20
-
allowed-signers = "/Users/daniel/.gitallowedsigners"
22
+
allowed-signers = "/Users/daniel/.gitallowedsigners" # file used to verify incoming SSH-signed commits
21
23
22
-
[remotes.origin]
23
-
auto-track-bookmarks = "glob:*"
24
-
25
-
24
+
# renders all timestamps as relative time e.g. "3 hours ago"
26
25
[template-aliases]
27
26
"format_timestamp(timestamp)" = "timestamp.ago()"
28
27
29
-
[templates]
30
-
log_node = '''
31
-
label("node",
32
-
coalesce(
33
-
if(!self, label("elided", "~")),
34
-
if(current_working_copy, label("working_copy", "@")),
35
-
if(conflict, label("conflict", "×")),
36
-
if(immutable, label("immutable", "*")),
37
-
label("normal", "·")
38
-
)
39
-
)
40
-
'''
41
28
29
+
# [remotes.origin]
30
+
# auto-track-bookmarks = ["glob:danieldaum/*", "main"]
31
+
32
+
# [templates]
33
+
# git_push_bookmark = '"danieldaum/" ++ change_id.short()'
34
+
35
+
# my aliases
36
+
[aliases]
37
+
init = ["git", "init"]
38
+
push = ["git", "push"]
39
+
pull = ["git", "fetch"]
40
+
clone = ["git", "clone"]
41
+
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
42
+
43
+
# compact single-line log: change ID, description, bookmarks, conflict flag; no author or timestamp
44
+
[templates]
42
45
log = '''
43
46
if(root,
44
47
format_root_commit(self),
···
59
62
)
60
63
'''
61
64
62
-
draft_commit_description = '''
63
-
concat(
64
-
coalesce(description, default_commit_description, "\n"),
65
-
surround(
66
-
"\nJJ: This commit contains the following changes:\n", "",
67
-
indent("JJ: ", diff.stat(72)),
68
-
),
69
-
"\nJJ: ignore-rest\n",
70
-
diff.git(),
71
-
)
72
-
'''
73
-
74
-
[aliases]
75
-
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
65
+
[merge-tools.difftastic]
66
+
program = "difft"
67
+
diff-args = ["--color=always", "--display=side-by-side", "$left", "$right"] # always colorize, side-by-side layout
-1
test-access.txt
-1
test-access.txt
···
1
-
testing if i lost ssh-push access
+8
-34
zed_settings.json
+8
-34
zed_settings.json
···
8
8
// command palette (cmd-shift-p / ctrl-shift-p)
9
9
{
10
10
// practical
11
-
"ssh_connections": [
12
-
{
13
-
"host": "dxun",
14
-
"username": "maliciouspickle",
15
-
"args": [],
16
-
"projects": [
17
-
{
18
-
"paths": [
19
-
"/home/maliciouspickle/starforge"
20
-
]
21
-
}
22
-
]
23
-
},
24
-
{
25
-
"host": "narshaddaa",
26
-
"username": "maliciouspickle",
27
-
"args": [],
28
-
"projects": [
29
-
{
30
-
"paths": [
31
-
"/home/maliciouspickle/starforge"
32
-
]
33
-
}
34
-
]
35
-
}
36
-
],
37
11
"terminal": {
38
-
"shell": "system",
12
+
"shell": "system"
39
13
},
40
14
"gutter": {
41
-
"line_numbers": true,
15
+
"line_numbers": true
42
16
},
43
17
"redact_private_values": false,
44
18
"agent": {
45
19
"play_sound_when_agent_done": true,
46
20
"default_profile": "write",
47
-
"model_parameters": [],
21
+
"model_parameters": []
48
22
},
49
23
"autosave": {
50
24
"after_delay": {
51
-
"milliseconds": 1000,
52
-
},
25
+
"milliseconds": 1000
26
+
}
53
27
},
54
28
"ensure_final_newline_on_save": true,
55
29
"remove_trailing_whitespace_on_save": true,
···
68
42
"show_background": false,
69
43
"edit_debounce_ms": 700,
70
44
"scroll_debounce_ms": 50,
71
-
"toggle_on_modifiers_press": null,
45
+
"toggle_on_modifiers_press": null
72
46
},
73
47
74
48
// visual
75
49
"theme": {
76
50
"mode": "dark",
77
51
"light": "Gruvbox Light Hard",
78
-
"dark": "Violet One Dark",
52
+
"dark": "Violet One Dark"
79
53
},
80
54
"icon_theme": {
81
55
"light": "Zed (Default)",
82
-
"dark": "Material Icon Theme",
56
+
"dark": "Material Icon Theme"
83
57
},
84
58
85
59
"buffer_font_family": "Geist Mono",