From 203aeadad8efa6177d1e5905ed5b53c4d5635ea8 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <tyler@hallada.net>
Date: Fri, 31 Jul 2026 12:24:32 -0400
Subject: [PATCH] Fix keymap and plugin spec bugs

- Move fugitive force-push from <leader>gf to <leader>gF; <leader>gf is
  LazyVim's read-only "Git Current File History"
- octo.nvim used `opt` instead of `opts`, so the PR comment mappings were
  silently dropped; also drop the spec duplicated by the util.octo extra
- oil's `-` keymap had `desc` nested in a third table, so lazy.nvim ignored it

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 lua/plugins/fugitive.lua |  2 +-
 lua/plugins/octo.lua     | 11 +----------
 lua/plugins/oil.lua      |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua
index 1b5ea73..51e5bd5 100644
--- a/lua/plugins/fugitive.lua
+++ b/lua/plugins/fugitive.lua
@@ -14,7 +14,7 @@ return {
     { "<leader>gc", [[<Cmd>Git commit<CR>]], desc = "[G]it [C]ommit" },
     { "<leader>gb", [[<Cmd>Git blame -C<CR>]], desc = "[G]it [B]lame" },
     { "<leader>gp", [[<Cmd>Git push<CR>]], desc = "[G]it [P]ush" },
-    { "<leader>gf", [[<Cmd>Git push --force<CR>]], desc = "[G]it [F]orce push" },
+    { "<leader>gF", [[<Cmd>Git push --force<CR>]], desc = "[G]it [F]orce push" },
     { "<leader>gu", [[<Cmd>Git pull<CR>]], desc = "[G]it p[U]ll" },
     {
       "<leader>gh",
diff --git a/lua/plugins/octo.lua b/lua/plugins/octo.lua
index a864538..e50fb26 100644
--- a/lua/plugins/octo.lua
+++ b/lua/plugins/octo.lua
@@ -1,15 +1,6 @@
 return {
   "pwntester/octo.nvim",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    "nvim-telescope/telescope.nvim",
-    -- OR 'ibhagwan/fzf-lua',
-    "nvim-tree/nvim-web-devicons",
-  },
-  cmd = {
-    "Octo",
-  },
-  opt = {
+  opts = {
     mappings = {
       pull_request = {
         next_comment = { lhs = "<space>]c", desc = "go to next comment" },
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index 58eb1d3..0be4598 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -25,6 +25,6 @@ return {
   },
   dependencies = { "nvim-tree/nvim-web-devicons" },
   keys = {
-    { "-", "<cmd>Oil<cr>", { desc = "Open parent directory in current buffer" } },
+    { "-", "<cmd>Oil<cr>", desc = "Open parent directory in current buffer" },
   },
 }