barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update jj config to also have 'p' as a shortcut, and jj diff

Browse source
This commit is contained in:
Barak Michener 2025-10-29 11:46:00 -07:00
parent 46ac775d64
commit 16fddec80c
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dot_config/alacritty/alacritty.toml.tmpl
View file

@ -40,7 +40,7 @@ size = 19.0
{{ else if eq .chezmoi.hostname "rosencrantz" -}} {{ else if eq .chezmoi.hostname "rosencrantz" -}}
size = 15.0 size = 15.0
{{ else if eq .chezmoi.hostname "altair" -}} {{ else if eq .chezmoi.hostname "altair" -}}
size = 20.5 size = 22
{{ else -}} {{ else -}}
size = 19.0 size = 19.0
{{ end }} {{ end }}
@ -82,9 +82,13 @@ key = "U"
mods = "Control|Shift" mods = "Control|Shift"
[[hints.enabled]] [[hints.enabled]]
command = "xdg-open"
post_processing = true post_processing = true
regex = "(magnet:|mailto:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-Ÿ<>\"\\s{-}\\^⟨⟩`]+" regex = "(magnet:|mailto:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-Ÿ<>\"\\s{-}\\^⟨⟩`]+"
{{if eq .chezmoi.os "darwin" -}}
command = "open"
{{ else -}}
command = "xdg-open"
{{ end }}
[hints.enabled.binding] [hints.enabled.binding]
key = "L" key = "L"

13
dot_config/jj/config.toml
View file

@ -6,10 +6,12 @@ email = "me@barakmich.com"
editor = "nvim" editor = "nvim"
#default-command = ["log", "--reversed"] #default-command = ["log", "--reversed"]
default-command = ["util", "exec", "--", "bash", "-c", "jj log --reversed --no-pager && jj diff -s"] default-command = ["util", "exec", "--", "bash", "-c", "jj log --reversed --no-pager && jj diff -s"]
diff-formatter = ":git" diff-formatter = ["difft", "--display=inline", "--color=always", "$left", "$right"]
#diff-formatter = ":git"
[revset-aliases] [revset-aliases]
'nearby(x)' = 'descendants(ancestors(@, x))::' 'nearby(x)' = 'descendants(ancestors(@, x))::'
'closest_bookmark(to)' = "heads(::to & bookmarks())"
[revsets] [revsets]
log = "nearby(8) | @..main@origin | main@origin::@ | @:: | (visible_heads() & mine())" log = "nearby(8) | @..main@origin | main@origin::@ | @:: | (visible_heads() & mine())"
@ -18,8 +20,10 @@ log = "nearby(8) | @..main@origin | main@origin::@ | @:: | (visible_heads() & mi
[colors] [colors]
"diff token" = { underline = false } "diff token" = { underline = false }
[templates]
git_push_bookmark = '"barakmich/" ++ change_id.short()'
[git] [git]
push-bookmark-prefix = "barakmich/"
push-new-bookmarks = true push-new-bookmarks = true
# Prevent pushing work in progress or anything explicitly labeled "private" # Prevent pushing work in progress or anything explicitly labeled "private"
private-commits = "description(glob:'wip:*') | description(glob:'private:*') | description(glob:'XXX*')" private-commits = "description(glob:'wip:*') | description(glob:'private:*') | description(glob:'XXX*')"
@ -27,10 +31,11 @@ private-commits = "description(glob:'wip:*') | description(glob:'private:*') | d
[aliases] [aliases]
bm = ["bookmark", "move", "--to"] bm = ["bookmark", "move", "--to"]
"bm." = ["bookmark", "move", "--to", "@"] "bm." = ["bookmark", "move", "--to", "@"]
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"]
"tug." = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@"] "tug." = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@"]
pull = ["git", "fetch"] pull = ["git", "fetch"]
fetch = ["git", "fetch"] fetch = ["git", "fetch"]
push = ["git", "push"] push = ["git", "push"]
p = ["git", "push", "-r", "closest_bookmark(@-)"]
d = ["describe", "-m"] d = ["describe", "-m"]
drop = ["abandon"] drop = ["abandon"]

2
dot_vimrc
View file

@ -189,7 +189,7 @@ Plug 'frankroeder/parrot.nvim'
Plug 'edolphin-ydf/goimpl.nvim' Plug 'edolphin-ydf/goimpl.nvim'
Plug 'stevearc/quicker.nvim' Plug 'stevearc/quicker.nvim'
Plug 'sphamba/smear-cursor.nvim' Plug 'rafikdraoui/jj-diffconflicts'
call plug#end() call plug#end()