From 74c9b868a62eb1babce2cc6dac9d5a412969fa66 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Sun, 20 Nov 2022 19:23:45 +0100 Subject: [PATCH] chore(brew): update Brewfile --- Brewfile | 6 ++++-- nvim/after/plugin/cmp.lua | 36 +++++++++++++++++++++++++++++++++++ nvim/after/plugin/copilot.lua | 9 --------- 3 files changed, 40 insertions(+), 11 deletions(-) delete mode 100644 nvim/after/plugin/copilot.lua diff --git a/Brewfile b/Brewfile index 3dc0769..893a7e3 100644 --- a/Brewfile +++ b/Brewfile @@ -134,8 +134,6 @@ brew "jpeg", link: true brew "zeromq" # Play, record, convert, and stream audio and video brew "ffmpeg" -# GNU compiler collection -brew "gcc" # Static type checker for JavaScript brew "flow" # Command-line outline and bitmap font editor/converter @@ -144,6 +142,8 @@ brew "fontforge" brew "fpp" # Command-line fuzzy finder written in Go brew "fzf" +# GNU compiler collection +brew "gcc" # GitHub command-line tool brew "gh" # Distributed revision control system @@ -461,6 +461,8 @@ cask "ipfs" cask "iterm2" # Menu bar calendar cask "itsycal" +# Jellyfin desktop client +cask "jellyfin-media-player" # Spot and merge differences in text and image files or folders cask "kaleidoscope" # Keyboard customizer diff --git a/nvim/after/plugin/cmp.lua b/nvim/after/plugin/cmp.lua index 2e3dbc6..d64012f 100644 --- a/nvim/after/plugin/cmp.lua +++ b/nvim/after/plugin/cmp.lua @@ -97,6 +97,11 @@ cmp.setup({ format = function(entry, vim_item) -- Kind icons vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + + if entry.source.name == "copilot" then + vim_item.kind = icons.git.Octoface + vim_item.kind_hl_group = "CmpItemKindCopilot" + end -- vim_item.kind = string.format("%s %s", kind_icons[vim_item.kind], vim_item.kind) -- This concatenates the icons with the name of the item kind vim_item.menu = ({ nvim_lsp = "[LSP]", @@ -113,6 +118,37 @@ cmp.setup({ end, }, sources = { + { + name = "copilot", + -- keyword_length = 0, + max_item_count = 3, + trigger_characters = { + { + ".", + ":", + "(", + "'", + '"', + "[", + ",", + "#", + "*", + "@", + "|", + "=", + "-", + "{", + "/", + "\\", + "+", + "?", + " ", + -- "\t", + -- "\n", + }, + }, + group_index = 2, + }, { name = "nvim_lsp" }, { name = "nvim_lsp_signature_help" }, { name = "luasnip" }, diff --git a/nvim/after/plugin/copilot.lua b/nvim/after/plugin/copilot.lua deleted file mode 100644 index 295bd10..0000000 --- a/nvim/after/plugin/copilot.lua +++ /dev/null @@ -1,9 +0,0 @@ --- https://github.com/github/copilot.vim -local status_ok = pcall(require, "copilot") -if not status_ok then - return -end - -vim.g.copilot_no_tab_map = true -vim.g.copilot_assume_mapped = true -vim.g.copilot_tab_fallback = ""