From 3edd79f922f9102f46cad1650c1f4040e24f4a12 Mon Sep 17 00:00:00 2001 From: Marcel Schneider Date: Thu, 27 Jul 2023 09:16:46 +0200 Subject: [PATCH] Fix octo.nvim config --- init.vim | 2 +- vim/lua/octo.lua | 128 ----------------------------------- vim/lua/octoconfig.lua | 147 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 129 deletions(-) delete mode 100644 vim/lua/octo.lua create mode 100644 vim/lua/octoconfig.lua diff --git a/init.vim b/init.vim index d71b2d3..b2b4fb9 100644 --- a/init.vim +++ b/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 diff --git a/vim/lua/octo.lua b/vim/lua/octo.lua deleted file mode 100644 index fe84bd4..0000000 --- a/vim/lua/octo.lua +++ /dev/null @@ -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 = "ic", -- close issue - reopen_issue = "io", -- reopen issue - list_issues = "il", -- list open issues on same repo - reload = "", -- reload issue - open_in_browser = "", -- open issue in browser - copy_url = "", -- copy url to system clipboard - add_assignee = "aa", -- add assignee - remove_assignee = "ad", -- remove assignee - create_label = "lc", -- create label - add_label = "la", -- add label - remove_label = "ld", -- remove label - goto_issue = "gi", -- navigate to a local repo issue - add_comment = "ca", -- add comment - delete_comment = "cd", -- delete comment - next_comment = "]c", -- go to next comment - prev_comment = "[c", -- go to previous comment - react_hooray = "rp", -- add/remove 🎉 reaction - react_heart = "rh", -- add/remove ❤️ reaction - react_eyes = "re", -- add/remove 👀 reaction - react_thumbs_up = "r+", -- add/remove 👍 reaction - react_thumbs_down = "r-", -- add/remove 👎 reaction - react_rocket = "rr", -- add/remove 🚀 reaction - react_laugh = "rl", -- add/remove 😄 reaction - react_confused = "rc", -- add/remove 😕 reaction - }, - pull_request = { - checkout_pr = "po", -- checkout PR - merge_pr = "pm", -- merge PR - list_commits = "pc", -- list PR commits - list_changed_files = "pf", -- list PR changed files - show_pr_diff = "pd", -- show PR diff - add_reviewer = "va", -- add reviewer - remove_reviewer = "vd", -- remove reviewer request - close_issue = "ic", -- close PR - reopen_issue = "io", -- reopen PR - list_issues = "il", -- list open issues on same repo - reload = "", -- reload PR - open_in_browser = "", -- open PR in browser - copy_url = "", -- copy url to system clipboard - add_assignee = "aa", -- add assignee - remove_assignee = "ad", -- remove assignee - create_label = "lc", -- create label - add_label = "la", -- add label - remove_label = "ld", -- remove label - goto_issue = "gi", -- navigate to a local repo issue - add_comment = "ca", -- add comment - delete_comment = "cd", -- delete comment - next_comment = "]c", -- go to next comment - prev_comment = "[c", -- go to previous comment - react_hooray = "rp", -- add/remove 🎉 reaction - react_heart = "rh", -- add/remove ❤️ reaction - react_eyes = "re", -- add/remove 👀 reaction - react_thumbs_up = "r+", -- add/remove 👍 reaction - react_thumbs_down = "r-", -- add/remove 👎 reaction - react_rocket = "rr", -- add/remove 🚀 reaction - react_laugh = "rl", -- add/remove 😄 reaction - react_confused = "rc", -- add/remove 😕 reaction - }, - review_thread = { - goto_issue = "gi", -- navigate to a local repo issue - add_comment = "ca", -- add comment - add_suggestion = "sa", -- add suggestion - delete_comment = "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 = "", -- close review tab - react_hooray = "rp", -- add/remove 🎉 reaction - react_heart = "rh", -- add/remove ❤️ reaction - react_eyes = "re", -- add/remove 👀 reaction - react_thumbs_up = "r+", -- add/remove 👍 reaction - react_thumbs_down = "r-", -- add/remove 👎 reaction - react_rocket = "rr", -- add/remove 🚀 reaction - react_laugh = "rl", -- add/remove 😄 reaction - react_confused = "rc", -- add/remove 😕 reaction - }, - submit_win = { - approve_review = "", -- approve review - comment_review = "", -- comment review - request_changes = "", -- request changes review - close_review_tab = "", -- close review tab - }, - review_diff = { - add_review_comment = "ca", -- add a new review comment - add_review_suggestion = "sa", -- add a new review suggestion - focus_files = "e", -- move focus to changed file panel - toggle_files = "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 = "", -- close review tab - toggle_viewed = "", -- toggle viewer viewed state - }, - file_panel = { - next_entry = "j", -- move to next changed file - prev_entry = "k", -- move to previous changed file - select_entry = "", -- show selected changed file diffs - refresh_files = "R", -- refresh changed files panel - focus_files = "e", -- move focus to changed file panel - toggle_files = "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 = "", -- close review tab - toggle_viewed = "", -- toggle viewer viewed state - } - } -}) - diff --git a/vim/lua/octoconfig.lua b/vim/lua/octoconfig.lua new file mode 100644 index 0000000..17e02c7 --- /dev/null +++ b/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 = "ic", desc = "close issue" }, + reopen_issue = { lhs = "io", desc = "reopen issue" }, + list_issues = { lhs = "il", desc = "list open issues on same repo" }, + reload = { lhs = "", desc = "reload issue" }, + open_in_browser = { lhs = "", desc = "open issue in browser" }, + copy_url = { lhs = "", desc = "copy url to system clipboard" }, + add_assignee = { lhs = "aa", desc = "add assignee" }, + remove_assignee = { lhs = "ad", desc = "remove assignee" }, + create_label = { lhs = "lc", desc = "create label" }, + add_label = { lhs = "la", desc = "add label" }, + remove_label = { lhs = "ld", desc = "remove label" }, + goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, + add_comment = { lhs = "ca", desc = "add comment" }, + delete_comment = { lhs = "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 = "rp", desc = "add/remove 🎉 reaction" }, + react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, + react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, + react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, + react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, + react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, + react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, + react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, + }, + pull_request = { + checkout_pr = { lhs = "po", desc = "checkout PR" }, + merge_pr = { lhs = "pm", desc = "merge commit PR" }, + squash_and_merge_pr = { lhs = "psm", desc = "squash and merge PR" }, + list_commits = { lhs = "pc", desc = "list PR commits" }, + list_changed_files = { lhs = "pf", desc = "list PR changed files" }, + show_pr_diff = { lhs = "pd", desc = "show PR diff" }, + add_reviewer = { lhs = "va", desc = "add reviewer" }, + remove_reviewer = { lhs = "vd", desc = "remove reviewer request" }, + close_issue = { lhs = "ic", desc = "close PR" }, + reopen_issue = { lhs = "io", desc = "reopen PR" }, + list_issues = { lhs = "il", desc = "list open issues on same repo" }, + reload = { lhs = "", desc = "reload PR" }, + open_in_browser = { lhs = "", desc = "open PR in browser" }, + copy_url = { lhs = "", desc = "copy url to system clipboard" }, + goto_file = { lhs = "gf", desc = "go to file" }, + add_assignee = { lhs = "aa", desc = "add assignee" }, + remove_assignee = { lhs = "ad", desc = "remove assignee" }, + create_label = { lhs = "lc", desc = "create label" }, + add_label = { lhs = "la", desc = "add label" }, + remove_label = { lhs = "ld", desc = "remove label" }, + goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, + add_comment = { lhs = "ca", desc = "add comment" }, + delete_comment = { lhs = "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 = "rp", desc = "add/remove 🎉 reaction" }, + react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, + react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, + react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, + react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, + react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, + react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, + react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, + }, + review_thread = { + goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, + add_comment = { lhs = "ca", desc = "add comment" }, + add_suggestion = { lhs = "sa", desc = "add suggestion" }, + delete_comment = { lhs = "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 = "", desc = "close review tab" }, + react_hooray = { lhs = "rp", desc = "add/remove 🎉 reaction" }, + react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, + react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, + react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, + react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, + react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, + react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, + react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, + }, + submit_win = { + approve_review = { lhs = "", desc = "approve review" }, + comment_review = { lhs = "", desc = "comment review" }, + request_changes = { lhs = "", desc = "request changes review" }, + close_review_tab = { lhs = "", desc = "close review tab" }, + }, + review_diff = { + add_review_comment = { lhs = "ca", desc = "add a new review comment" }, + add_review_suggestion = { lhs = "sa", desc = "add a new review suggestion" }, + focus_files = { lhs = "e", desc = "move focus to changed file panel" }, + toggle_files = { lhs = "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 = "", desc = "close review tab" }, + toggle_viewed = { lhs = "", 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 = "", desc = "show selected changed file diffs" }, + refresh_files = { lhs = "R", desc = "refresh changed files panel" }, + focus_files = { lhs = "e", desc = "move focus to changed file panel" }, + toggle_files = { lhs = "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 = "", desc = "close review tab" }, + toggle_viewed = { lhs = "", desc = "toggle viewer viewed state" }, + } + } +})