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

update jj and fish for modern

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
dot_config/fish/config.fish
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

3
dot_config/jj/config.toml
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"]

32
dot_vim/nvim.lua
View file

@ -340,17 +340,17 @@ require('trouble').setup {
jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds
--open_split = { "<c-x>" }, -- open buffer in new split --open_split = { "<c-x>" }, -- open buffer in new split
--open_vsplit = { "<c-v>" }, -- open buffer in new vsplit --open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
open_tab = {}, -- open buffer in new tab open_tab = {}, -- open buffer in new tab
jump_close = { "<cr>" }, -- jump to the diagnostic and close the list jump_close = { "<cr>" }, -- jump to the diagnostic and close the list
toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
toggle_preview = "P", -- toggle auto_preview toggle_preview = "P", -- toggle auto_preview
hover = "K", -- opens a small popup with the full multiline message hover = "K", -- opens a small popup with the full multiline message
preview = "p", -- preview the diagnostic location preview = "p", -- preview the diagnostic location
close_folds = { "zM", "zm" }, -- close all folds close_folds = { "zM", "zm" }, -- close all folds
open_folds = { "zR", "zr" }, -- open all folds open_folds = { "zR", "zr" }, -- open all folds
toggle_fold = { "zA", "za" }, -- toggle fold of current file toggle_fold = { "zA", "za" }, -- toggle fold of current file
previous = "k", -- previous item previous = "k", -- previous item
next = "j" -- next item next = "j" -- next item
}, },
} }
@ -507,7 +507,7 @@ require 'nvim-treesitter.configs'.setup({
playground = { playground = {
enable = true, enable = true,
disable = {}, disable = {},
updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
persist_queries = false, -- Whether the query persists across vim sessions persist_queries = false, -- Whether the query persists across vim sessions
keybindings = { keybindings = {
toggle_query_editor = 'o', toggle_query_editor = 'o',
@ -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 = {
@ -670,7 +670,7 @@ require("parrot").setup({
{{selection}} {{selection}}
``` ```
Goal: {{command}} Goal: {{command}}
Respond just with the snippet of code that should be inserted. Respond just with the snippet of code that should be inserted.