From 5492f24b52109080d007c9020dfe19225603519a Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 24 Feb 2026 15:32:23 -0500 Subject: [PATCH] more stuff --- config/nvim/after/ftplugin/typst.lua | 2 +- config/nvim/lazy-lock.json | 2 +- config/nvim/lua/plugins/git.lua | 16 ++++++++++++++++ config/nvim/lua/plugins/nvim.lua | 3 +++ home/modules/git.nix | 2 ++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config/nvim/after/ftplugin/typst.lua b/config/nvim/after/ftplugin/typst.lua index cc9548e..bc0b0ef 100644 --- a/config/nvim/after/ftplugin/typst.lua +++ b/config/nvim/after/ftplugin/typst.lua @@ -24,5 +24,5 @@ vim.keymap.set('n', 't', function() end end end - vim.system({ 'sioyek', pdf }) + vim.system({ 'sioyek', '--new-instance', pdf }) end, { buffer = true }) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index ac31720..01d4d97 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -5,7 +5,6 @@ "blink-cmp-ssh": { "branch": "main", "commit": "4d6c8e0c0983acb74bf7a2988307ab867ce231a9" }, "blink-cmp-tmux": { "branch": "main", "commit": "c0c59d1e5771a8de25b547dc18eb274cbce2438c" }, "blink.cmp": { "branch": "main", "commit": "b650e976a927be6b46487a0a610b75af111376c5" }, - "canola.nvim": { "branch": "main", "commit": "60bfbe05da1a0adb0b3ed28ac055cd23528b764e" }, "cp.nvim": { "branch": "main", "commit": "e989897c7767b8d9c9a1be4ca5c0618b13a18ea4" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, "diffs.nvim": { "branch": "main", "commit": "dfebc68a1fc3e93dae5b6d49133243ec1886cb19" }, @@ -30,6 +29,7 @@ "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" }, + "pending.nvim": { "branch": "main", "commit": "0727a03d4109200ed2780dccf7dcd9f2b459a5d1" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 616d22c..7b6da5c 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -211,6 +211,22 @@ return { forge.browse_root() end), }, + { + 'gd', + function() + require('fzf-lua').fzf_exec( + 'git branch -a --format="%(refname:short)"', + { + prompt = 'Git diff> ', + actions = { + ['default'] = function(selected) + vim.cmd('Git diff ' .. selected[1]) + end, + }, + } + ) + end, + }, { 'gi', function() diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index cb55028..95fbf0a 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -439,4 +439,7 @@ return { }, }, }, + { + 'barrettruth/pending.nvim' + } } diff --git a/home/modules/git.nix b/home/modules/git.nix index b6d4f7a..c1ddaf4 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -40,6 +40,8 @@ ".mypy_cache/" "result" "result-*" + ".direnv" + ".envrc" ]; signing = {