this repo has no description
wip
Signed-off-by: Seongmin Lee <git@boltless.me>
+46
-8
+1
-1
ghostty/config
+1
-1
ghostty/config
+3
git/config
+3
git/config
···
23
23
lg = log --branches --remotes --tags --graph --decorate
24
24
ll = log --branches --remotes --tags --graph --decorate --oneline
25
25
find = !sh -c 'git-repo-search \"$@\" | fzf | awk \"{print \\$NF}\" --
26
+
[http "https://knot.tngl.boltless.dev/"]
27
+
# sslCAInfo = /Users/boltless/repo/tangled/nix/vm-data/caddy/.local/share/caddy/pki/authorities/local/root.crt
28
+
sslCAPath = /Users/boltless/repo/tangled/nix/vm-data/caddy/.local/share/caddy/pki/authorities/local/
26
29
27
30
# vim:ft=gitconfig
+34
-3
jj/config.toml
+34
-3
jj/config.toml
···
5
5
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
6
6
# mega-merge pull
7
7
mp = ["rebase", "-b", "MM", "-d", "heads(MM- | trunk())"]
8
+
mm = ["util", "exec", "--", "bash", "-c", """#!/usr/bin/env bash
9
+
set -euo pipefail
10
+
11
+
COMMAND="${1:-}"
12
+
shift # remove the subcommand from the arg list
13
+
14
+
case "$COMMAND" in
15
+
add|a)
16
+
[ $# -ne 2 ] && {
17
+
echo "Add <dest> to <target>"
18
+
echo
19
+
echo "Usage: jj mm add <target> <dest>"
20
+
exit 1
21
+
}
22
+
jj rebase -s $1 -o "heads($1-) | $2"
23
+
;;
24
+
del|d)
25
+
[ $# -ne 2 ] && { echo "Usage: jj mm del <target> <dest>"; exit 1; }
26
+
jj rebase -s $1 -o "heads($1-) ~ $2"
27
+
;;
28
+
clean)
29
+
[ $# -ne 1 ] && { echo "Usage: jj mm clean <target>"; exit 1; }
30
+
jj rebase -s $1 -o "heads($1-)"
31
+
;;
32
+
*)
33
+
echo "Error: Unknown subcommand '$COMMAND'"
34
+
echo "Usage: jj mm [add|del]"
35
+
exit 1
36
+
;;
37
+
esac
38
+
""", ""]
8
39
9
40
[ui]
10
41
default-command = ["log", "--no-pager", "-r", "@ | coalesce(mega_merge(), default()) | trunk()"]
11
42
should-sign-off = true
12
-
diff-formatter = ["difft", "--color=always", "--syntax-highlight=off", "$left", "$right"]
43
+
# diff-formatter = ["difft", "--color=always", "--syntax-highlight=off", "$left", "$right"]
13
44
# diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
14
45
# merge-editor = "vimdiff"
15
46
# conflict-marker-style = "git"
···
25
56
26
57
[git]
27
58
write-change-id-header = true
28
-
private-commits = "description(glob:'wip:*') | description(glob:'private:*')"
59
+
# private-commits = "description(glob:'wip:*') | description(glob:'private:*')"
29
60
30
61
[revset-aliases]
31
-
'MM' = "description('[mega-merge]')"
62
+
'MM' = "description(glob:'\\[mega-merge\\]*')"
32
63
'FP' = "fork_point(MM-)"
33
64
'wip' = "description(glob:'wip:*')"
34
65
'default()' = "@ | ancestors(immutable_heads().., 2) | trunk()"
+3
-3
nix/flake.lock
+3
-3
nix/flake.lock
···
39
39
},
40
40
"nixpkgs-unstable": {
41
41
"locked": {
42
-
"lastModified": 1756696532,
43
-
"narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
42
+
"lastModified": 1767364772,
43
+
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
44
44
"owner": "NixOS",
45
45
"repo": "nixpkgs",
46
-
"rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f",
46
+
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
47
47
"type": "github"
48
48
},
49
49
"original": {
+3
-1
nix/flake.nix
+3
-1
nix/flake.nix
···
88
88
pkgs.tmux
89
89
pkgs.tree
90
90
pkgs.typescript-language-server
91
-
pkgs.typst
91
+
pkgs-unstable.typst
92
92
pkgs.unixtools.watch
93
93
pkgs.vim
94
94
pkgs.zellij
95
+
pkgs.llvmPackages_17.clang-tools
95
96
pkgs-unstable.jujutsu
96
97
pkgs-unstable.neovim
97
98
(pkgs-unstable.lua5_1.withPackages (ps: with ps; [luarocks]))
···
113
114
pkgs.anki-bin
114
115
pkgs.brave
115
116
pkgs.iina
117
+
pkgs.imagemagick
116
118
pkgs.macmon
117
119
pkgs.docker
118
120
pkgs.slack
+1
sqlite3/sqliterc
+1
sqlite3/sqliterc
···
1
+
.mode columns