From ab34d4d7f33230f2063cf0d7737c384751a782e2 Mon Sep 17 00:00:00 2001
From: Tovi <tovi@codium.com.au>
Date: Thu, 7 Mar 2024 14:46:27 +1030
Subject: [PATCH] feat: replace copilot with lua version so tab disable works

---
 .../lua/tovi/plugins/cellular-automaton.lua   |  6 ++
 .config/nvim/lua/tovi/plugins/copilot.lua     | 78 ++++++++++++++-----
 .config/nvim/lua/tovi/plugins/duck.lua        |  5 ++
 .config/nvim/lua/tovi/plugins/fugitive.lua    | 14 ++--
 .../lua/tovi/plugins/indent-blankline.lua     |  5 ++
 .config/nvim/lua/tovi/plugins/lazygit.lua     |  1 +
 6 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 .config/nvim/lua/tovi/plugins/cellular-automaton.lua
 create mode 100644 .config/nvim/lua/tovi/plugins/duck.lua
 create mode 100644 .config/nvim/lua/tovi/plugins/indent-blankline.lua

diff --git a/.config/nvim/lua/tovi/plugins/cellular-automaton.lua b/.config/nvim/lua/tovi/plugins/cellular-automaton.lua
new file mode 100644
index 0000000..a2451d7
--- /dev/null
+++ b/.config/nvim/lua/tovi/plugins/cellular-automaton.lua
@@ -0,0 +1,6 @@
+return {
+    'eandrju/cellular-automaton.nvim',
+    config = function()
+        vim.keymap.set("n", "<leader>fml", "<cmd>CellularAutomaton make_it_rain<CR>")
+    end
+}
diff --git a/.config/nvim/lua/tovi/plugins/copilot.lua b/.config/nvim/lua/tovi/plugins/copilot.lua
index eb76e67..96f6544 100644
--- a/.config/nvim/lua/tovi/plugins/copilot.lua
+++ b/.config/nvim/lua/tovi/plugins/copilot.lua
@@ -1,20 +1,62 @@
-return {
-	"github/copilot.vim",
-	config = function()
-		vim.api.nvim_set_keymap(
-            "i",
-            ",,",
-            'copilot#Accept("<CR>")',
-            { expr = true, silent = true }
-        )
-
-		vim.api.nvim_set_keymap(
-            "n",
-            "<leader>cs",
-            "<cmd>Copilot panel<CR>",
-            { noremap = true }
-        )
+-- return {
+-- 	"github/copilot.vim",
+-- 	config = function()
+--         vim.g.copilot_no_tab_map = true
+--
+-- 		vim.api.nvim_set_keymap(
+--             "i",
+--             ",,",
+--             'copilot#Accept("<CR>")',
+--             { expr = true, silent = true }
+--         )
+--
+-- 		vim.api.nvim_set_keymap(
+--             "n",
+--             "<leader>cs",
+--             "<cmd>Copilot panel<CR>",
+--             { noremap = true }
+--         )
+-- 	end,
+-- }
 
-        vim.g.copilot_no_tab_map = true
-	end,
+return {
+    'zbirenbaum/copilot.lua',
+    cmd = "Copilot",
+    event = "InsertEnter",
+    config = function()
+        require("copilot").setup({
+            panel = {
+                enabled = true,
+                auto_refresh = false,
+                keymap = {
+                    jump_prev = "[[",
+                    jump_next = "]]",
+                    accept = "<CR>",
+                    refresh = "gr",
+                    open = "<M-CR>"
+                },
+                layout = {
+                    position = "bottom", -- | top | left | right
+                    ratio = 0.4
+                },
+            },
+            suggestion = {
+                enabled = true,
+                auto_trigger = true,
+                debounce = 75,
+                keymap = {
+                    accept = ",,",
+                    accept_word = false,
+                    accept_line = false,
+                    next = "<C-n>",
+                    prev = "<C-p>",
+                    dismiss = "<C-]>",
+                },
+            },
+            filetypes = {
+            },
+            copilot_node_command = 'node', -- Node.js version must be > 18.x
+            server_opts_overrides = {},
+        })
+    end,
 }
diff --git a/.config/nvim/lua/tovi/plugins/duck.lua b/.config/nvim/lua/tovi/plugins/duck.lua
new file mode 100644
index 0000000..a24af03
--- /dev/null
+++ b/.config/nvim/lua/tovi/plugins/duck.lua
@@ -0,0 +1,5 @@
+return {
+    'tamton-aquib/duck.nvim',
+    config = function()
+    end
+}
diff --git a/.config/nvim/lua/tovi/plugins/fugitive.lua b/.config/nvim/lua/tovi/plugins/fugitive.lua
index 8894718..b2f915d 100644
--- a/.config/nvim/lua/tovi/plugins/fugitive.lua
+++ b/.config/nvim/lua/tovi/plugins/fugitive.lua
@@ -26,12 +26,14 @@ return {
             vim.cmd(string.format('Git show %s', gitBlame({vim.fn.line('.'), vim.fn.line('.')})))
         end)
 
+        local options = { noremap = true, silent = true }
 
-        -- vim.keymap.set('n', '<leader>gp', '<cmd>Git push<CR>', options)
-        -- vim.keymap.set('n', '<leader>gP', '<cmd>Git pull<CR>', options)
-        -- vim.keymap.set('n', '<leader>ga', '<cmd>Git add .<CR>', options)
-        -- vim.keymap.set('n', '<leader>gA', '<cmd>Git add<CR>', options)
-        -- vim.keymap.set('n', '<leader>gc', '<cmd>Git commit<CR>', options)
-        -- vim.keymap.set('n', '<leader>gC', '<cmd>Git commit -a<CR>', options)
+        vim.keymap.set('n', '<leader>gg', '<cmd>Git<CR>', options)
+        vim.keymap.set('n', '<leader>gp', '<cmd>Git push<CR>', options)
+        vim.keymap.set('n', '<leader>gP', '<cmd>Git pull<CR>', options)
+        vim.keymap.set('n', '<leader>ga', '<cmd>Git add .<CR>', options)
+        vim.keymap.set('n', '<leader>gA', '<cmd>Git add<CR>', options)
+        vim.keymap.set('n', '<leader>gc', '<cmd>Git commit<CR>', options)
+        vim.keymap.set('n', '<leader>gC', '<cmd>Git commit -a<CR>', options)
 	end,
 }
diff --git a/.config/nvim/lua/tovi/plugins/indent-blankline.lua b/.config/nvim/lua/tovi/plugins/indent-blankline.lua
new file mode 100644
index 0000000..4568fc1
--- /dev/null
+++ b/.config/nvim/lua/tovi/plugins/indent-blankline.lua
@@ -0,0 +1,5 @@
+return {
+    "lukas-reineke/indent-blankline.nvim",
+    main = "ibl",
+    opts = {}
+}
diff --git a/.config/nvim/lua/tovi/plugins/lazygit.lua b/.config/nvim/lua/tovi/plugins/lazygit.lua
index cb2b905..8f0dbf0 100644
--- a/.config/nvim/lua/tovi/plugins/lazygit.lua
+++ b/.config/nvim/lua/tovi/plugins/lazygit.lua
@@ -1,5 +1,6 @@
 return {
     "kdheepak/lazygit.nvim",
+    enabled = false,
     -- optional for floating window border decoration
     dependencies = {
         "nvim-lua/plenary.nvim",