diff --git a/.config/nvim/lua/tsousa/plugins/init.lua b/.config/nvim/lua/tsousa/plugins/init.lua
index 69f8fc6..6789e2b 100644
--- a/.config/nvim/lua/tsousa/plugins/init.lua
+++ b/.config/nvim/lua/tsousa/plugins/init.lua
@@ -2,6 +2,5 @@ return {
     "stevearc/dressing.nvim",
     "nvim-lua/plenary.nvim",
     "tpope/vim-surround",
-    "github/copilot.vim",
     "laytan/cloak.nvim",
 }
diff --git a/.config/nvim/lua/tsousa/plugins/lsp.lua b/.config/nvim/lua/tsousa/plugins/lsp.lua
index 231929c..e52c432 100644
--- a/.config/nvim/lua/tsousa/plugins/lsp.lua
+++ b/.config/nvim/lua/tsousa/plugins/lsp.lua
@@ -1,6 +1,6 @@
 return {
     {
-        "hrsh7th/nvim-cmp",
+        'hrsh7th/nvim-cmp',
         dependencies = {
             'hrsh7th/cmp-nvim-lsp',                -- lsp
             'hrsh7th/cmp-nvim-lua',                -- Nvim API completions
@@ -11,6 +11,8 @@ return {
             'saadparwaiz1/cmp_luasnip',
             'L3MON4D3/LuaSnip',
             'onsails/lspkind.nvim',
+            'zbirenbaum/copilot.lua',
+            'zbirenbaum/copilot-cmp',
         },
         config = function()
             local cmp_status_ok, cmp = pcall(require, "cmp")
@@ -28,6 +30,13 @@ return {
                 return
             end
 
+            -- this is to make copilot-cmp work better
+            require("copilot").setup({
+                suggestion = { enabled = false },
+                panel = { enabled = false },
+            })
+            require("copilot_cmp").setup()
+
             lspkind.init {
                 symbol_map = {
                     Copilot = "",
@@ -89,6 +98,7 @@ return {
                         menu = {
                             buffer = "[buf]",
                             nvim_lsp = "[lsp]",
+                            copilot = "[cop]",
                             luasnip = "[snip]",
                             nvim_lsp_signature_help = "[sig]",
                             nvim_lua = "[lua]",
@@ -114,6 +124,7 @@ return {
                     {
                         { name = "nvim_lsp", },
                         { name = 'nvim_lua' },
+                        { name = "copilot" },
                         { name = 'luasnip' },
                         --{ name = 'nvim_lsp_signature_help' },
                         { name = 'orgmode' }
@@ -163,7 +174,7 @@ return {
 
                 -- },
                 experimental = {
-                    ghost_text = false,
+                    ghost_text = true,
                     native_menu = false,
                 },
             }
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 6b1d856..9837fa3 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -7,6 +7,7 @@ bind-key C-a send-prefix
 set -g status-style 'bg=#181926 fg=#cad3f5'
 set-option -g status-position top
 set -g status-left-length 20
+set-option -sg escape-time 10
 
 bind r source-file ~/.config/tmux/tmux.conf
 set -g base-index 1