copilot when blink suggest

lua/plugins/astroui.lua

@@ -12,6 +12,7 @@ return {
     colorscheme = "bamboo",
     -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
     highlights = require "plugins.configs.ui.highlights",
+
     -- Icons can be configured throughout the interface
     icons = require "plugins.configs.ui.icons",
     status = require "plugins.configs.ui.status",

lua/plugins/cmps.lua

@@ -6,10 +6,13 @@ return {
       vim.api.nvim_set_keymap("i", "<C-f>", 'copilot#Accept("\\<CR>")', { expr = true, silent = true })
     end,
   },
-
   {
   "Saghen/blink.cmp",
   opts = {
+    keymap = {
+        preset = "default",
+        ["<C-f>"] = false,
+      },
     completion = {
       list = { selection = { preselect = true, auto_insert = true } },
       ghost_text = {
@@ -31,7 +34,6 @@ return {
                 return hl
               end,
             },
-            
           },
         },
       },

lua/plugins/configs/ui/heirline.lua

@@ -30,7 +30,7 @@ M.statusline = {
     },
   },
   status.component.git_branch {
-    padding = { left = 0, right = 1 },
+    padding = { left = 1, right = 1 },
     surround = {
       separator = "none",
       color = "bg",
@@ -52,7 +52,7 @@ M.statusline = {
     },
   },
   status.component.git_diff {
-    padding = { left = 1 },
+    padding = { left = 0 },
     surround = {
       separator = "none",
       color = "bg",

lua/plugins/configs/ui/icons.lua

@@ -16,9 +16,9 @@ return {
   -- Git
   Github = "   ",
   GitAdd = " ",
-  GitBranch = " ",
+  GitBranch = "",
   GitChange = " ",
-  GitConflict = " ",
+  GitConflict = "",
   GitDelete = " ",
   GitIgnored = " ",
   GitRenamed = " ",

lua/plugins/configs/ui/indent.lua

@@ -0,0 +1,25 @@
+return {
+  priority = 1,
+  enabled = true, -- enable indent guides
+  only_scope = true, -- only show indent guides of the scope
+  only_current = false, -- only show indent guides in the current window
+  hl = "SnacksIndent", ---@type string|string[] hl groups for indent guides
+
+  animate = {
+    enabled = vim.fn.has("nvim-0.10") == 1,
+    style = "up_down",
+    easing = "linear",
+    duration = {
+      step = 50, -- ms per step
+      total = 500, -- maximum duration
+    },
+  },
+  scope = {
+    enabled = true, -- enable highlighting the current scope
+    priority = 200,
+    char = "󰥓",
+    underline = false, -- underline the start of the scope
+    only_current = false, -- only show scope in the current window
+    hl = "SnacksIndentScope", ---@type string|string[] hl group for scopes
+  },
+}

lua/plugins/developments.lua

@@ -85,7 +85,6 @@ return {
       end
     end,
   },
-  
   -- DAP Virtual Text (disabled)
   {
     "theHamsta/nvim-dap-virtual-text",
@@ -99,8 +98,4 @@ return {
       virt_text_pos = "eol",
     },
   },
-  
-  -- Disabled development plugins
-  { "mfussenegger/nvim-dap", enabled = false },
-  { "jay-babu/mason-nvim-dap.nvim", enabled = false },
 }

lua/plugins/disabled.lua

@@ -0,0 +1,17 @@
+return {
+  { "Wansmer/treesj", enabled = false },
+
+    -- You can disable default plugins as follows:
+  { "max397574/better-escape.nvim", enabled = false },
+  { "andweeb/presence.nvim", enabled = false },
+
+  -- Disabled formatting plugins
+  { "rafamadriz/friendly-snippets", enabled = false },
+  { "JoosepAlviste/nvim-ts-context-commentstring", enabled = false },
+  { "windwp/nvim-ts-autotag", enabled = false },
+
+  -- Disabled development plugins
+  { "mfussenegger/nvim-dap", enabled = false },
+  { "jay-babu/mason-nvim-dap.nvim", enabled = false },
+}
+

lua/plugins/motions.lua

@@ -120,8 +120,4 @@ return {
       },
     },
   },
- 
-  -- Disabled motion plugins
-  { "Wansmer/treesj", enabled = false },
-
 }

lua/plugins/none-ls.lua

@@ -17,8 +17,4 @@ return {
     end,
   },
   
-  -- Disabled formatting plugins
-  { "rafamadriz/friendly-snippets", enabled = false },
-  { "JoosepAlviste/nvim-ts-context-commentstring", enabled = false },
-  { "windwp/nvim-ts-autotag", enabled = false },
 }

lua/plugins/user.lua

@@ -29,38 +29,10 @@ return {
           keys = {},
         },
       },
-
+      indent = require( "plugins.configs.ui.indent" ),
-      indent = {
-        priority = 1,
-        enabled = true, -- enable indent guides
-        -- char = "l",
-        only_scope = true, -- only show indent guides of the scope
-        only_current = false, -- only show indent guides in the current window
-        hl = "SnacksIndent", ---@type string|string[] hl groups for indent guides
-
-      	animate = {
-        	enabled = vim.fn.has("nvim-0.10") == 1,
-        	style = "out",
-        	easing = "linear",
-        	duration = {
-          	step = 10, -- ms per step
-          	total = 500, -- maximum duration
-        	},
-      	},
-      	scope = {
-        	enabled = true, -- enable highlighting the current scope
-        	priority = 200,
-        	char = "󰥓",
-        	underline = false, -- underline the start of the scope
-        	only_current = false, -- only show scope in the current window
-        	hl = "SnacksIndentScope", ---@type string|string[] hl group for scopes
-      	},
-      },
     },
   },
 
-  -- You can disable default plugins as follows:
-  { "max397574/better-escape.nvim", enabled = false },
 
   -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
   {
@@ -77,7 +49,7 @@ return {
 	{
 		"altermo/ultimate-autopair.nvim",
 		event = "InsertEnter",
-		branch = "v0.6",
+		-- branch = "v0.6",
 		opts = {
 			cmap = false,
 			extensions = {