my personal dotfiles
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

chore: update jj config & zshrc

+68 -1
+12
.zshrc
··· 14 14 15 15 # cat replacement 16 16 alias cat='bat' 17 + 18 + # jj 19 + alias jjp='jj git push' 20 + alias jja='jj log -r "all()"' 21 + 22 + # pnpm 23 + export PNPM_HOME="/Users/daniel/Library/pnpm" 24 + case ":$PATH:" in 25 + *":$PNPM_HOME:"*) ;; 26 + *) export PATH="$PNPM_HOME:$PATH" ;; 27 + esac 28 + # pnpm end
+56 -1
jj.config.toml
··· 5 5 6 6 [ui] 7 7 default-command = "log" 8 - pager = "less -FRX" 8 + pager = "delta" 9 9 diff.format = "git" 10 + 11 + [git] 12 + write-change-id-header = true 10 13 11 14 [signing] 12 15 behavior = "own" ··· 18 21 19 22 [remotes.origin] 20 23 auto-track-bookmarks = "glob:*" 24 + 25 + 26 + [template-aliases] 27 + "format_timestamp(timestamp)" = "timestamp.ago()" 28 + 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 + 42 + log = ''' 43 + if(root, 44 + format_root_commit(self), 45 + label(if(current_working_copy, "working_copy"), 46 + concat( 47 + separate(" ", 48 + change_id.short(), 49 + if(empty, label("empty", "(empty)")), 50 + if(description, 51 + description.first_line(), 52 + label(if(empty, "empty"), description_placeholder), 53 + ), 54 + bookmarks, 55 + if(conflict, label("conflict", "conflict")), 56 + ) ++ "\n", 57 + ), 58 + ) 59 + ) 60 + ''' 61 + 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", "@-"]