Fix octo.nvim config

init.vim

@@ -329,7 +329,7 @@ let g:nv_default_extension = '.md'
 let g:nv_main_directory = '~/notes'
 
 " Octo.nvim
-"lua require('octo')
+lua require('octoconfig')
 
 " ALE {{{
 let g:airline#extensions#ale#enabled = 1

vim/lua/octo.lua

@@ -1,128 +0,0 @@
--- Config file for octo.nvim
-
-require"octo".setup({
-    default_remote = {"upstream", "origin"}; -- order to try remotes
-    reaction_viewer_hint_icon = "";         -- marker for user reactions
-    user_icon = " ";                        -- user icon
-    timeline_marker = "";                   -- timeline marker
-    timeline_indent = "2";                   -- timeline indentation
-    right_bubble_delimiter = "";            -- Bubble delimiter
-    left_bubble_delimiter = "";             -- Bubble delimiter
-    github_hostname = "";                    -- GitHub Enterprise host
-    snippet_context_lines = 4;               -- number or lines around commented lines
-    file_panel = {
-        size = 10,                             -- changed files panel rows
-        use_icons = true                       -- use web-devicons in file panel
-    },
-    mappings = {
-        issue = {
-            close_issue = "<space>ic",           -- close issue
-            reopen_issue = "<space>io",          -- reopen issue
-            list_issues = "<space>il",           -- list open issues on same repo
-            reload = "<C-r>",                    -- reload issue
-            open_in_browser = "<C-b>",           -- open issue in browser
-            copy_url = "<C-y>",                  -- copy url to system clipboard
-            add_assignee = "<space>aa",          -- add assignee
-            remove_assignee = "<space>ad",       -- remove assignee
-            create_label = "<space>lc",          -- create label
-            add_label = "<space>la",             -- add label
-            remove_label = "<space>ld",          -- remove label
-            goto_issue = "<space>gi",            -- navigate to a local repo issue
-            add_comment = "<space>ca",           -- add comment
-            delete_comment = "<space>cd",        -- delete comment
-            next_comment = "]c",                 -- go to next comment
-            prev_comment = "[c",                 -- go to previous comment
-            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
-            react_heart = "<space>rh",           -- add/remove ❤️ reaction
-            react_eyes = "<space>re",            -- add/remove 👀 reaction
-            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
-            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
-            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
-            react_laugh = "<space>rl",           -- add/remove 😄 reaction
-            react_confused = "<space>rc",        -- add/remove 😕 reaction
-        },
-        pull_request = {
-            checkout_pr = "<space>po",           -- checkout PR
-            merge_pr = "<space>pm",              -- merge PR
-            list_commits = "<space>pc",          -- list PR commits
-            list_changed_files = "<space>pf",    -- list PR changed files
-            show_pr_diff = "<space>pd",          -- show PR diff
-            add_reviewer = "<space>va",          -- add reviewer
-            remove_reviewer = "<space>vd",       -- remove reviewer request
-            close_issue = "<space>ic",           -- close PR
-            reopen_issue = "<space>io",          -- reopen PR
-            list_issues = "<space>il",           -- list open issues on same repo
-            reload = "<C-r>",                    -- reload PR
-            open_in_browser = "<C-b>",           -- open PR in browser
-            copy_url = "<C-y>",                  -- copy url to system clipboard
-            add_assignee = "<space>aa",          -- add assignee
-            remove_assignee = "<space>ad",       -- remove assignee
-            create_label = "<space>lc",          -- create label
-            add_label = "<space>la",             -- add label
-            remove_label = "<space>ld",          -- remove label
-            goto_issue = "<space>gi",            -- navigate to a local repo issue
-            add_comment = "<space>ca",           -- add comment
-            delete_comment = "<space>cd",        -- delete comment
-            next_comment = "]c",                 -- go to next comment
-            prev_comment = "[c",                 -- go to previous comment
-            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
-            react_heart = "<space>rh",           -- add/remove ❤️ reaction
-            react_eyes = "<space>re",            -- add/remove 👀 reaction
-            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
-            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
-            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
-            react_laugh = "<space>rl",           -- add/remove 😄 reaction
-            react_confused = "<space>rc",        -- add/remove 😕 reaction
-        },
-        review_thread = {
-            goto_issue = "<space>gi",            -- navigate to a local repo issue
-            add_comment = "<space>ca",           -- add comment
-            add_suggestion = "<space>sa",        -- add suggestion
-            delete_comment = "<space>cd",        -- delete comment
-            next_comment = "]c",                 -- go to next comment
-            prev_comment = "[c",                 -- go to previous comment
-            select_next_entry = "]q",            -- move to previous changed file
-            select_prev_entry = "[q",            -- move to next changed file
-            close_review_tab = "<C-c>",          -- close review tab
-            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
-            react_heart = "<space>rh",           -- add/remove ❤️ reaction
-            react_eyes = "<space>re",            -- add/remove 👀 reaction
-            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
-            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
-            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
-            react_laugh = "<space>rl",           -- add/remove 😄 reaction
-            react_confused = "<space>rc",        -- add/remove 😕 reaction
-        },
-        submit_win = {
-            approve_review = "<C-a>",            -- approve review
-            comment_review = "<C-m>",            -- comment review
-            request_changes = "<C-r>",           -- request changes review
-            close_review_tab = "<C-c>",          -- close review tab
-        },
-        review_diff = {
-            add_review_comment = "<space>ca",    -- add a new review comment
-            add_review_suggestion = "<space>sa", -- add a new review suggestion
-            focus_files = "<leader>e",           -- move focus to changed file panel
-            toggle_files = "<leader>b",          -- hide/show changed files panel
-            next_thread = "]t",                  -- move to next thread
-            prev_thread = "[t",                  -- move to previous thread
-            select_next_entry = "]q",            -- move to previous changed file
-            select_prev_entry = "[q",            -- move to next changed file
-            close_review_tab = "<C-c>",          -- close review tab
-            toggle_viewed = "<leader><space>",   -- toggle viewer viewed state
-        },
-        file_panel = {
-            next_entry = "j",                    -- move to next changed file
-            prev_entry = "k",                    -- move to previous changed file
-            select_entry = "<cr>",               -- show selected changed file diffs
-            refresh_files = "R",                 -- refresh changed files panel
-            focus_files = "<leader>e",           -- move focus to changed file panel
-            toggle_files = "<leader>b",          -- hide/show changed files panel
-            select_next_entry = "]q",            -- move to previous changed file
-            select_prev_entry = "[q",            -- move to next changed file
-            close_review_tab = "<C-c>",          -- close review tab
-            toggle_viewed = "<leader><space>",   -- toggle viewer viewed state
-        }
-    }
-})
-

vim/lua/octoconfig.lua

@@ -0,0 +1,147 @@
+-- Config file for octo.nvim
+require"octo".setup({
+  default_remote = {"upstream", "origin"}; -- order to try remotes
+  ssh_aliases = {},                        -- SSH aliases. e.g. `ssh_aliases = {["github.com-work"] = "github.com"}`
+  reaction_viewer_hint_icon = "";         -- marker for user reactions
+  user_icon = " ";                        -- user icon
+  timeline_marker = "";                   -- timeline marker
+  timeline_indent = "2";                   -- timeline indentation
+  right_bubble_delimiter = "";            -- bubble delimiter
+  left_bubble_delimiter = "";             -- bubble delimiter
+  github_hostname = "";                    -- GitHub Enterprise host
+  snippet_context_lines = 4;               -- number or lines around commented lines
+  gh_env = {},                             -- extra environment variables to pass on to GitHub CLI, can be a table or function returning a table
+  timeout = 5000,                          -- timeout for requests between the remote server
+  ui = {
+    use_signcolumn = true,                 -- show "modified" marks on the sign column
+  },
+  issues = {
+    order_by = {                           -- criteria to sort results of `Octo issue list`
+      field = "CREATED_AT",                -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield)
+      direction = "DESC"                   -- either DESC or ASC (https://docs.github.com/en/graphql/reference/enums#orderdirection)
+    }
+  },
+  pull_requests = {
+    order_by = {                           -- criteria to sort the results of `Octo pr list`
+      field = "CREATED_AT",                -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield)
+      direction = "DESC"                   -- either DESC or ASC (https://docs.github.com/en/graphql/reference/enums#orderdirection)
+    },
+    always_select_remote_on_create = "false" -- always give prompt to select base remote repo when creating PRs
+  },
+  file_panel = {
+    size = 10,                             -- changed files panel rows
+    use_icons = true                       -- use web-devicons in file panel (if false, nvim-web-devicons does not need to be installed)
+  },
+  mappings = {
+    issue = {
+      close_issue = { lhs = "<space>ic", desc = "close issue" },
+      reopen_issue = { lhs = "<space>io", desc = "reopen issue" },
+      list_issues = { lhs = "<space>il", desc = "list open issues on same repo" },
+      reload = { lhs = "<C-r>", desc = "reload issue" },
+      open_in_browser = { lhs = "<C-b>", desc = "open issue in browser" },
+      copy_url = { lhs = "<C-y>", desc = "copy url to system clipboard" },
+      add_assignee = { lhs = "<space>aa", desc = "add assignee" },
+      remove_assignee = { lhs = "<space>ad", desc = "remove assignee" },
+      create_label = { lhs = "<space>lc", desc = "create label" },
+      add_label = { lhs = "<space>la", desc = "add label" },
+      remove_label = { lhs = "<space>ld", desc = "remove label" },
+      goto_issue = { lhs = "<space>gi", desc = "navigate to a local repo issue" },
+      add_comment = { lhs = "<space>ca", desc = "add comment" },
+      delete_comment = { lhs = "<space>cd", desc = "delete comment" },
+      next_comment = { lhs = "]c", desc = "go to next comment" },
+      prev_comment = { lhs = "[c", desc = "go to previous comment" },
+      react_hooray = { lhs = "<space>rp", desc = "add/remove 🎉 reaction" },
+      react_heart = { lhs = "<space>rh", desc = "add/remove ❤️ reaction" },
+      react_eyes = { lhs = "<space>re", desc = "add/remove 👀 reaction" },
+      react_thumbs_up = { lhs = "<space>r+", desc = "add/remove 👍 reaction" },
+      react_thumbs_down = { lhs = "<space>r-", desc = "add/remove 👎 reaction" },
+      react_rocket = { lhs = "<space>rr", desc = "add/remove 🚀 reaction" },
+      react_laugh = { lhs = "<space>rl", desc = "add/remove 😄 reaction" },
+      react_confused = { lhs = "<space>rc", desc = "add/remove 😕 reaction" },
+    },
+    pull_request = {
+      checkout_pr = { lhs = "<space>po", desc = "checkout PR" },
+      merge_pr = { lhs = "<space>pm", desc = "merge commit PR" },
+      squash_and_merge_pr = { lhs = "<space>psm", desc = "squash and merge PR" },
+      list_commits = { lhs = "<space>pc", desc = "list PR commits" },
+      list_changed_files = { lhs = "<space>pf", desc = "list PR changed files" },
+      show_pr_diff = { lhs = "<space>pd", desc = "show PR diff" },
+      add_reviewer = { lhs = "<space>va", desc = "add reviewer" },
+      remove_reviewer = { lhs = "<space>vd", desc = "remove reviewer request" },
+      close_issue = { lhs = "<space>ic", desc = "close PR" },
+      reopen_issue = { lhs = "<space>io", desc = "reopen PR" },
+      list_issues = { lhs = "<space>il", desc = "list open issues on same repo" },
+      reload = { lhs = "<C-r>", desc = "reload PR" },
+      open_in_browser = { lhs = "<C-b>", desc = "open PR in browser" },
+      copy_url = { lhs = "<C-y>", desc = "copy url to system clipboard" },
+      goto_file = { lhs = "gf", desc = "go to file" },
+      add_assignee = { lhs = "<space>aa", desc = "add assignee" },
+      remove_assignee = { lhs = "<space>ad", desc = "remove assignee" },
+      create_label = { lhs = "<space>lc", desc = "create label" },
+      add_label = { lhs = "<space>la", desc = "add label" },
+      remove_label = { lhs = "<space>ld", desc = "remove label" },
+      goto_issue = { lhs = "<space>gi", desc = "navigate to a local repo issue" },
+      add_comment = { lhs = "<space>ca", desc = "add comment" },
+      delete_comment = { lhs = "<space>cd", desc = "delete comment" },
+      next_comment = { lhs = "]c", desc = "go to next comment" },
+      prev_comment = { lhs = "[c", desc = "go to previous comment" },
+      react_hooray = { lhs = "<space>rp", desc = "add/remove 🎉 reaction" },
+      react_heart = { lhs = "<space>rh", desc = "add/remove ❤️ reaction" },
+      react_eyes = { lhs = "<space>re", desc = "add/remove 👀 reaction" },
+      react_thumbs_up = { lhs = "<space>r+", desc = "add/remove 👍 reaction" },
+      react_thumbs_down = { lhs = "<space>r-", desc = "add/remove 👎 reaction" },
+      react_rocket = { lhs = "<space>rr", desc = "add/remove 🚀 reaction" },
+      react_laugh = { lhs = "<space>rl", desc = "add/remove 😄 reaction" },
+      react_confused = { lhs = "<space>rc", desc = "add/remove 😕 reaction" },
+    },
+    review_thread = {
+      goto_issue = { lhs = "<space>gi", desc = "navigate to a local repo issue" },
+      add_comment = { lhs = "<space>ca", desc = "add comment" },
+      add_suggestion = { lhs = "<space>sa", desc = "add suggestion" },
+      delete_comment = { lhs = "<space>cd", desc = "delete comment" },
+      next_comment = { lhs = "]c", desc = "go to next comment" },
+      prev_comment = { lhs = "[c", desc = "go to previous comment" },
+      select_next_entry = { lhs = "]q", desc = "move to previous changed file" },
+      select_prev_entry = { lhs = "[q", desc = "move to next changed file" },
+      close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
+      react_hooray = { lhs = "<space>rp", desc = "add/remove 🎉 reaction" },
+      react_heart = { lhs = "<space>rh", desc = "add/remove ❤️ reaction" },
+      react_eyes = { lhs = "<space>re", desc = "add/remove 👀 reaction" },
+      react_thumbs_up = { lhs = "<space>r+", desc = "add/remove 👍 reaction" },
+      react_thumbs_down = { lhs = "<space>r-", desc = "add/remove 👎 reaction" },
+      react_rocket = { lhs = "<space>rr", desc = "add/remove 🚀 reaction" },
+      react_laugh = { lhs = "<space>rl", desc = "add/remove 😄 reaction" },
+      react_confused = { lhs = "<space>rc", desc = "add/remove 😕 reaction" },
+    },
+    submit_win = {
+      approve_review = { lhs = "<C-a>", desc = "approve review" },
+      comment_review = { lhs = "<C-m>", desc = "comment review" },
+      request_changes = { lhs = "<C-r>", desc = "request changes review" },
+      close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
+    },
+    review_diff = {
+      add_review_comment = { lhs = "<space>ca", desc = "add a new review comment" },
+      add_review_suggestion = { lhs = "<space>sa", desc = "add a new review suggestion" },
+      focus_files = { lhs = "<leader>e", desc = "move focus to changed file panel" },
+      toggle_files = { lhs = "<leader>b", desc = "hide/show changed files panel" },
+      next_thread = { lhs = "]t", desc = "move to next thread" },
+      prev_thread = { lhs = "[t", desc = "move to previous thread" },
+      select_next_entry = { lhs = "]q", desc = "move to previous changed file" },
+      select_prev_entry = { lhs = "[q", desc = "move to next changed file" },
+      close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
+      toggle_viewed = { lhs = "<leader><space>", desc = "toggle viewer viewed state" },
+    },
+    file_panel = {
+      next_entry = { lhs = "j", desc = "move to next changed file" },
+      prev_entry = { lhs = "k", desc = "move to previous changed file" },
+      select_entry = { lhs = "<cr>", desc = "show selected changed file diffs" },
+      refresh_files = { lhs = "R", desc = "refresh changed files panel" },
+      focus_files = { lhs = "<leader>e", desc = "move focus to changed file panel" },
+      toggle_files = { lhs = "<leader>b", desc = "hide/show changed files panel" },
+      select_next_entry = { lhs = "]q", desc = "move to previous changed file" },
+      select_prev_entry = { lhs = "[q", desc = "move to next changed file" },
+      close_review_tab = { lhs = "<C-c>", desc = "close review tab" },
+      toggle_viewed = { lhs = "<leader><space>", desc = "toggle viewer viewed state" },
+    }
+  }
+})