neovim

commit 1a05e4faab47ceb4930d18c8c62e7f1ec319d03e
parent dbbdbf7268669042b85a6512bd66b42bf7f51d6e
Author: Tomas Nemec <owl@gtms.dev>
Date:   Wed,  2 Oct 2024 06:44:32 +0200

update

Diffstat:
M
after/plugin/cmp.lua
 | 
6
+++---
D
after/plugin/codeium.lua
 | 
33
---------------------------------
A
after/plugin/neocodeium.lua
 | 
32
++++++++++++++++++++++++++++++++
A
after/plugin/quicker.lua
 | 
5
+++++
M
after/plugin/telescope.lua
 | 
1
+
M
colors/tms.lua
 | 
2
+-
M
lua/plugins.lua
 | 
3
++-
D
lua/tms/p/codeium.lua
 | 
37
-------------------------------------

8 files changed, 44 insertions(+), 75 deletions(-)
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
@@ -46,9 +46,9 @@ local Codeium = require('tms.p.codeium')
 -- cmp.register_source('exe', require('tms.p.cmp.exe_source').new())
 local function close()
   return function(fallback)
-    if Codeium.Completions() then
-      fallback = Codeium.Clear
-    end
+    -- if Codeium.Completions() then
+    --   fallback = Codeium.Clear
+    -- end
 
     if not cmp.close() then
       fallback()
diff --git a/after/plugin/codeium.lua b/after/plugin/codeium.lua
@@ -1,33 +0,0 @@
--- vim.g.codeium_enabled = false
--- vim.g.codeium_manual = true
-vim.g.codeium_disable_bindings = true
-vim.g.codeium_no_map_tab = true
-
-local codeium = require('tms.p.codeium')
-vim.keymap.set('i', '<c-y>', codeium.Accept, { expr = true, desc = 'Codeium Accept' })
-vim.keymap.set('i', '<c-e>', codeium.Clear, { desc = 'Codeium Clear' })
-vim.keymap.set('i', '<c-n>', codeium.Next, { desc = 'Codeium Next' })
-vim.keymap.set('i', '<c-p>', codeium.Prev, { desc = 'Codeium Prev' })
-
-local toggle = require('tms.toggle')
-toggle.fn('p', function()
-  if codeium.isEnabled() then
-    vim.g.codeium_manual = true
-  else
-    vim.g.codeium_manual = false
-  end
-end, 'Codeium Toggle')
-
--- if pcall(require, 'cmp') then
---   local cmp = require('cmp')
---   cmp.event:on('menu_opened', function()
---     Codeium.DisableBuffer()
---     if Codeium.Completions() then
---       Codeium.Clear()
---     end
---   end)
---   cmp.event:on('menu_closed', function()
---     Codeium.EnableBuffer()
---     Codeium.Complete();
---   end)
--- end
diff --git a/after/plugin/neocodeium.lua b/after/plugin/neocodeium.lua
@@ -0,0 +1,32 @@
+if not pcall(require, 'neocodeium') then
+  return
+end
+
+local codeium = require('neocodeium')
+codeium.setup {}
+
+vim.keymap.set('i', '<c-y>', codeium.accept, { expr = true, desc = 'Codeium Accept' })
+vim.keymap.set('i', '<c-l>', codeium.accept_line, { expr = true, desc = 'Codeium Accept Line' })
+vim.keymap.set('i', '<c-e>', codeium.clear, { desc = 'Codeium Clear' })
+vim.keymap.set('i', '<c-n>', function() codeium.cycle(1) end, { desc = 'Codeium Next' })
+vim.keymap.set('i', '<c-p>', function() codeium.cycle(-1) end, { desc = 'Codeium Prev' })
+
+
+-- local cmp = require("cmp")
+-- local commands = require("neocodeium.commands")
+
+-- cmp.event:on("menu_opened", function()
+--   codeium.clear()
+-- end)
+
+-- codeium.setup({
+--   filter = function()
+--     return not cmp.visible()
+--   end,
+-- })
+
+-- cmp.setup({
+--     completion = {
+--         autocomplete = false,
+--     },
+-- })
diff --git a/after/plugin/quicker.lua b/after/plugin/quicker.lua
@@ -0,0 +1,5 @@
+if not pcall(require, 'quicker') then
+  return
+end
+
+require('quicker').setup {}
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -11,6 +11,7 @@ require 'telescope'.setup {
     mappings = {
       i = {
         ["<c-y>"] = require('telescope.actions').select_default,
+        ["<c-e>"] = require('telescope.actions').close,
       },
       n = {
         ["<c-y>"] = require('telescope.actions').select_default,
diff --git a/colors/tms.lua b/colors/tms.lua
@@ -322,7 +322,7 @@ vim.api.nvim_set_hl(0, 'GitGutterChange', { fg = gui0D, bg = gui00 })
 vim.api.nvim_set_hl(0, 'GitGutterDelete', { fg = gui08, bg = gui00 })
 vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', { fg = gui0E, bg = gui00 })
 
-vim.api.nvim_set_hl(0, 'CodeiumSuggestion', { link = 'Comment' })
+vim.api.nvim_set_hl(0, 'NeoCodeiumSuggestion', { link = 'Comment' })
 
 vim.api.nvim_set_hl(0, 'LspReferenceText', { underline = true })
 vim.api.nvim_set_hl(0, 'LspReferenceRead', { undercurl = true })
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -28,6 +28,7 @@ return require('paq') {
   -- { 'nvim-neorg/neorg', requires = { 'nvim-lua/plenary.nvim' } }
   'mickael-menu/zk-nvim',
   'kevinhwang91/nvim-bqf',
+  'stevearc/quicker.nvim',
   'shortcuts/no-neck-pain.nvim',
   'nagy135/typebreak.nvim',
   'm4xshen/hardtime.nvim',
@@ -69,7 +70,7 @@ return require('paq') {
   'folke/lazydev.nvim',
   -- { 'jose-elias-alvarez/null-ls.nvim', requires = { 'nvim-lua/plenary.nvim' } },
   'stevearc/conform.nvim',
-  'Exafunction/codeium.vim',
+  'monkoose/neocodeium',
   'mfussenegger/nvim-dap',
   'leoluz/nvim-dap-go',
   'nvim-neotest/nvim-nio',
diff --git a/lua/tms/p/codeium.lua b/lua/tms/p/codeium.lua
@@ -1,37 +0,0 @@
-local M = {}
-
-M.Accept = vim.fn['codeium#Accept']
-
-M.Clear = vim.fn['codeium#Clear']
-
-M.Next = vim.fn['codeium#CycleOrComplete']
-
-function M.Prev()
-  vim.fn['codeium#CycleCompletions'](-1)
-end
-
-function M.Disable()
-  vim.cmd.Codeium('Disable')
-end
-
-function M.DisableBuffer()
-  vim.cmd.Codeium('DisableBuffer')
-end
-
-function M.Enable()
-  vim.cmd.Codeium('Enable')
-end
-
-function M.EnableBuffer()
-  vim.cmd.Codeium('EnableBuffer')
-end
-
-function M.Completions()
-  return vim.b['_codeium_completions']
-end
-
-M.isEnabled = vim.fn['codeium#Enabled']
-
-M.Complete = vim.fn['codeium#Complete']
-
-return M