diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish index 589cc80..ef88a2f 100644 --- a/dot_config/fish/config.fish +++ b/dot_config/fish/config.fish @@ -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 set -ga fish_user_paths ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bin diff --git a/dot_config/jj/config.toml b/dot_config/jj/config.toml index a6c59ee..0c8d8e9 100644 --- a/dot_config/jj/config.toml +++ b/dot_config/jj/config.toml @@ -19,7 +19,6 @@ log = "nearby(8) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ boo "diff token" = { underline = false } [git] -subprocess = true push-bookmark-prefix = "barakmich/" push-new-bookmarks = true # Prevent pushing work in progress or anything explicitly labeled "private" @@ -28,6 +27,8 @@ private-commits = "description(glob:'wip:*') | description(glob:'private:*') | d [aliases] 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"] fetch = ["git", "fetch"] push = ["git", "push"] diff --git a/dot_vim/nvim.lua b/dot_vim/nvim.lua index 4007c04..ad0742a 100644 --- a/dot_vim/nvim.lua +++ b/dot_vim/nvim.lua @@ -340,17 +340,17 @@ require('trouble').setup { jump = { "o", "" }, -- jump to the diagnostic or open / close folds --open_split = { "" }, -- open buffer in new split --open_vsplit = { "" }, -- open buffer in new vsplit - open_tab = {}, -- open buffer in new tab - jump_close = { "" }, -- jump to the diagnostic and close the list - toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode - toggle_preview = "P", -- toggle auto_preview - hover = "K", -- opens a small popup with the full multiline message - preview = "p", -- preview the diagnostic location + open_tab = {}, -- open buffer in new tab + jump_close = { "" }, -- jump to the diagnostic and close the list + toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode + toggle_preview = "P", -- toggle auto_preview + hover = "K", -- opens a small popup with the full multiline message + preview = "p", -- preview the diagnostic location 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 - previous = "k", -- previous item - next = "j" -- next item + previous = "k", -- previous item + next = "j" -- next item }, } @@ -507,7 +507,7 @@ require 'nvim-treesitter.configs'.setup({ playground = { enable = true, 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 keybindings = { toggle_query_editor = 'o', @@ -644,11 +644,11 @@ require("lualine_setup") --model = "gemma3:12b-it-qat", --init = nil, --}) -require("smear_cursor").setup({ - --stiffness = 0.8, - --trailing_stiffness = 0.5, - --distance_stop_animating= 0.5, -}) +--require("smear_cursor").setup({ +--stiffness = 0.8, +--trailing_stiffness = 0.5, +--distance_stop_animating= 0.5, +--}) require("parrot").setup({ providers = { @@ -670,7 +670,7 @@ require("parrot").setup({ {{selection}} ``` - Goal: {{command}} + Goal: {{command}} Respond just with the snippet of code that should be inserted.