diff --git a/bootstrap.sh b/bootstrap.sh index e2d026d..dcc8bad 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -45,8 +45,6 @@ test -d $HOME/.config/nvim/lua || mkdir -p $HOME/.config/nvim/lua test -L $HOME/.config/nvim/lua/config || ln -f -s $BASEDIR/neovim/config $HOME/.config/nvim/lua/config test -d $HOME/.config/nvim/lsp || mkdir -p $HOME/.config/nvim/lsp test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpactor.lua $HOME/.config/nvim/lsp/phpactor.lua -test -d $HOME/.config/nvim/after || mkdir -p $HOME/.config/nvim/after -test -L $HOME/.config/nvim/after/ftplugin || ln -f -s $BASEDIR/neovim/after/ftplugin $HOME/.config/nvim/after/ftplugin # Claude Code statusline test -d $HOME/.claude || mkdir $HOME/.claude diff --git a/neovim/after/ftplugin/markdown.lua b/neovim/after/ftplugin/markdown.lua deleted file mode 100644 index bc1c9e9..0000000 --- a/neovim/after/ftplugin/markdown.lua +++ /dev/null @@ -1,4 +0,0 @@ --- Hard-wrap prose at 80, the markdownlint/prettier default. +1 puts the guide --- just past the limit, so a line touching it is still fine. -vim.bo.textwidth = 80 -vim.wo.colorcolumn = '+1' diff --git a/neovim/config/plugins/init.lua b/neovim/config/plugins/init.lua index 8fd9d54..ea9535b 100644 --- a/neovim/config/plugins/init.lua +++ b/neovim/config/plugins/init.lua @@ -4,6 +4,5 @@ require('config.plugins.codediff') require('config.plugins.fzf-lua') require('config.plugins.gitsigns') require('config.plugins.nvim-tree') -require('config.plugins.review') require('config.plugins.web-devicons') require('config.plugins.which-key') diff --git a/neovim/config/plugins/review.lua b/neovim/config/plugins/review.lua deleted file mode 100644 index 68649fe..0000000 --- a/neovim/config/plugins/review.lua +++ /dev/null @@ -1,26 +0,0 @@ --- Typed review comments on top of codediff, exported as markdown for an agent. --- nui.nvim draws the comment popup. -vim.pack.add({ - 'https://github.com/MunifTanjim/nui.nvim', - 'https://github.com/georgeguimaraes/review.nvim', -}) - -require('review').setup({ - -- base = nil: origin's cached HEAD, then main or master. The codediff - -- mappings (gm, gR) keep the fuller remote fallback for - -- repos where origin has no cached HEAD. - branch = { base = nil }, - export = { - -- Clipboard is the whole loop: q exports, then paste into Claude Code. - clipboard = true, - }, -}) - -local function map(mode, lhs, rhs, desc) - vim.keymap.set(mode, lhs, rhs, { desc = desc }) -end - -map('n', 'rr', 'Review', 'Review working tree') -map('n', 'rb', 'Review branch', 'Review branch') -map('n', 'rc', 'Review commits', 'Review commits') -map({ 'n', 'v' }, 'rn', 'Review note', 'Review note') diff --git a/neovim/config/plugins/which-key.lua b/neovim/config/plugins/which-key.lua index 8463cb9..a663754 100644 --- a/neovim/config/plugins/which-key.lua +++ b/neovim/config/plugins/which-key.lua @@ -10,6 +10,5 @@ wk.add({ { 'f', group = 'find' }, { 'g', group = 'diff' }, { 'h', group = 'hunks' }, - { 'r', group = 'review' }, { 't', group = 'toggles' }, }) diff --git a/neovim/nvim-pack-lock.json b/neovim/nvim-pack-lock.json index 551914b..9508372 100644 --- a/neovim/nvim-pack-lock.json +++ b/neovim/nvim-pack-lock.json @@ -5,33 +5,25 @@ "src": "https://github.com/catppuccin/nvim" }, "codediff.nvim": { - "rev": "09d9ebef2cc5a5c04db7a349cd6c61bdf84ecc8e", + "rev": "e08a35a56a52c290398ebfaec33c34cfcf2d0f3c", "src": "https://github.com/esmuellert/codediff.nvim" }, "fzf-lua": { - "rev": "5b88d6f0af7fcb41d4a8bb340bf70d7e3824ee9d", + "rev": "8671012a7b2a1648595952c655039d51fb301c14", "src": "https://github.com/ibhagwan/fzf-lua" }, "gitsigns.nvim": { - "rev": "d4854fa9a94b5c8b37dd209fb4a19e98e764186f", + "rev": "31d6fb2d618bca1482b9f274751ead5f03461408", "src": "https://github.com/lewis6991/gitsigns.nvim" }, - "nui.nvim": { - "rev": "10fc361835c856ba4233ef5ea135b919bf3dce97", - "src": "https://github.com/MunifTanjim/nui.nvim" - }, "nvim-tree.lua": { - "rev": "3be8cad084e79e84833ef98cef88116c26a224ff", + "rev": "b2aadda94b107480c48e548d6db51c6840b7b33c", "src": "https://github.com/nvim-tree/nvim-tree.lua" }, "nvim-web-devicons": { - "rev": "ec309a0eaff6ea967e58c275996155ab5c16938d", + "rev": "2ae6958df7ced50baac5035cec0c15799eedfbf7", "src": "https://github.com/nvim-tree/nvim-web-devicons" }, - "review.nvim": { - "rev": "0a379fae01709645956005f76c4650b7740931a3", - "src": "https://github.com/georgeguimaraes/review.nvim" - }, "which-key.nvim": { "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a", "src": "https://github.com/folke/which-key.nvim"