update jj and fish for modern

This commit is contained in:
Barak Michener 2025-06-28 14:44:57 -07:00
parent 406f904367
commit fc8a72ebaf
3 changed files with 19 additions and 18 deletions

View file

@ -1,4 +1,4 @@
set PATH ~/bin ~/.local/bin ~/.go/bin ~/.cargo/bin /opt/homebrew/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin ~/.ghcup/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin ~/.rye/shims $PATH set PATH ~/bin ~/.local/bin ~/.go/bin ~/.cargo/bin /opt/homebrew/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin ~/.ghcup/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin ~/.rye/shims ~/.local/share/uv/tools $PATH
if command -vq flatpak if command -vq flatpak
set -ga fish_user_paths ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bin set -ga fish_user_paths ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bin

View file

@ -19,7 +19,6 @@ log = "nearby(8) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ boo
"diff token" = { underline = false } "diff token" = { underline = false }
[git] [git]
subprocess = true
push-bookmark-prefix = "barakmich/" 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"
@ -28,6 +27,8 @@ 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", "heads(::@- & bookmarks())", "--to", "@"]
pull = ["git", "fetch"] pull = ["git", "fetch"]
fetch = ["git", "fetch"] fetch = ["git", "fetch"]
push = ["git", "push"] push = ["git", "push"]

View file

@ -644,11 +644,11 @@ require("lualine_setup")
--model = "gemma3:12b-it-qat", --model = "gemma3:12b-it-qat",
--init = nil, --init = nil,
--}) --})
require("smear_cursor").setup({ --require("smear_cursor").setup({
--stiffness = 0.8, --stiffness = 0.8,
--trailing_stiffness = 0.5, --trailing_stiffness = 0.5,
--distance_stop_animating= 0.5, --distance_stop_animating= 0.5,
}) --})
require("parrot").setup({ require("parrot").setup({
providers = { providers = {