diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl
index 7a73800..cd481e1 100644
--- a/nvim/.config/nvim/fnl/dots/keybinds.fnl
+++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl
@@ -36,20 +36,15 @@
 
 (utils.keymap :n :<Backspace> "<cmd>HopChar2<CR>")
 
-(utils.keymap :i :<C-l><C-j> "<Plug>(copilot-suggest)")
-(utils.keymap :i :<C-l><C-d> "<Plug>(copilot-dismiss)")
-(utils.keymap :i :<C-l><C-n> "<Plug>(copilot-next)")
-(utils.keymap :i :<C-l><C-p> "<Plug>(copilot-previous)")
-(utils.keymap :i :<C-l><C-o> "<cmd>Copilot panel<cr>")
+;(utils.keymap :i :<C-l><C-j> "<Plug>(copilot-suggest)")
+;(utils.keymap :i :<C-l><C-d> "<Plug>(copilot-dismiss)")
+;(utils.keymap :i :<C-l><C-n> "<Plug>(copilot-next)")
+;(utils.keymap :i :<C-l><C-p> "<Plug>(copilot-previous)")
+;(utils.keymap :i :<C-l><C-o> "<cmd>Copilot panel<cr>")
 
 (utils.keymap :n :<a-s-j> "<cmd>RustMoveItemDown<cr>j")
 (utils.keymap :n :<a-s-k> "<cmd>RustMoveItemUp<cr>k")
 
-(utils.keymap :i :<C-l><C-j> "<Plug>(copilot-suggest)")
-(utils.keymap :i :<C-l><C-d> "<Plug>(copilot-dismiss)")
-(utils.keymap :i :<C-l><C-n> "<Plug>(copilot-next)")
-(utils.keymap :i :<C-l><C-p> "<Plug>(copilot-previous)")
-(utils.keymap :i :<C-l><C-o> "<cmd>Copilot panel<cr>")
 
 
 ; Fix keybinds in linewrapped mode
diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl
index 5bcd1cd..2b709f0 100644
--- a/nvim/.config/nvim/fnl/dots/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins.fnl
@@ -203,7 +203,10 @@
   ; >>>
 
   ; code-related ----------------------------------------- <<<
-  :github/copilot.vim {:cmd ["Copilot"]}
+  ;:github/copilot.vim {:cmd ["Copilot"]}
+  :zbirenbaum/copilot.lua {:cmd "Copilot"
+                           :event "InsertEnter"
+                           :config #(require "dots.plugins.copilot")}
 
   :tpope/vim-sleuth {}
   :editorconfig/editorconfig-vim {}
diff --git a/nvim/.config/nvim/fnl/dots/plugins/copilot.fnl b/nvim/.config/nvim/fnl/dots/plugins/copilot.fnl
new file mode 100644
index 0000000..5740aee
--- /dev/null
+++ b/nvim/.config/nvim/fnl/dots/plugins/copilot.fnl
@@ -0,0 +1,11 @@
+(module dots.plugins.copilot
+  {autoload {copilot copilot}
+   require-macros [macros]})
+
+(copilot.setup 
+  {:panel {:enabled false}
+   :suggestion {:enabled true
+                :auto_trigger :true
+                :keymap {:accept "<tab>"
+                         :next "<C-l><C-n>"}}})
+ 
diff --git a/nvim/.config/nvim/fnl/dots/plugins/noice.fnl b/nvim/.config/nvim/fnl/dots/plugins/noice.fnl
index 5748bfc..3b85acc 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/noice.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/noice.fnl
@@ -39,7 +39,6 @@
             {:view "cmdline_output"
              :filter {:error true :min_height 6}}]})
 
-(+ 1 b)
 (defn- setup-noice-theme []
   (utils.highlight-add :NoicePopupmenu {:bg colors.dark0_hard})
   (utils.highlight-add :NoiceCmdline {:bg "#1f2324"})
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 88ba52a..6fac136 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -20,7 +20,7 @@
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "conjure": { "branch": "master", "commit": "82cdd72049fc729854d69747be2673bc8ba8d97f" },
-  "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" },
+  "copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" },
   "crates.nvim": { "branch": "main", "commit": "c33aae75745877ee1ef16f5781478f4f2f120623" },
   "diffview.nvim": { "branch": "main", "commit": "ffeff288c47739a1fcb411343716b993bfaa48e5" },
   "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },