update system

2 files changed, 49 insertions, 47 deletions

diff --git a/mut/neovim/lua/my/init.lua b/mut/neovim/lua/my/init.lua
index 6b368fe..993519f 100644
--- a/mut/neovim/lua/my/init.lua
+++ b/mut/neovim/lua/my/init.lua
@@ -434,53 +434,53 @@ require("my.packages")
 --         file_types = { "markdown", "Avante" },
 --       },
 --       ft = { "markdown", "Avante" },})
-require('avante_lib').load()
--- require('copilot').setup {}
-require('avante').setup ({
-  provider = "openai",
-  openai = {
-    model = "gpt-4o",
-  },
-  behaviour = {
-    auto_suggestions = false,
-    auto_set_highlight_group = true,
-    auto_set_keymaps = true,
-    auto_apply_diff_after_generation = false,
-    support_paste_from_clipboard = false,
-  },
-  mappings = {
-    --- @class AvanteConflictMappings
-    diff = {
-      ours = "co",
-      theirs = "ct",
-      all_theirs = "ca",
-      both = "cb",
-      cursor = "cc",
-      next = "]x",
-      prev = "[x",
-    },
-    suggestion = {
-      accept = "<M-l>",
-      next = "<M-]>",
-      prev = "<M-[>",
-      dismiss = "<C-]>",
-    },
-    jump = {
-      next = "]]",
-      prev = "[[",
-    },
-    submit = {
-      normal = "<CR>",
-      insert = "<C-s>",
-    },
-    sidebar = {
-      apply_all = "A",
-      apply_cursor = "a",
-      switch_windows = "<Tab>",
-      reverse_switch_windows = "<S-Tab>",
-    },
-  },
-})
+-- require('avante_lib').load()
+-- -- require('copilot').setup {}
+-- require('avante').setup ({
+--   provider = "openai",
+--   openai = {
+--     model = "gpt-4o",
+--   },
+--   behaviour = {
+--     auto_suggestions = false,
+--     auto_set_highlight_group = true,
+--     auto_set_keymaps = true,
+--     auto_apply_diff_after_generation = false,
+--     support_paste_from_clipboard = false,
+--   },
+--   mappings = {
+--     --- @class AvanteConflictMappings
+--     diff = {
+--       ours = "co",
+--       theirs = "ct",
+--       all_theirs = "ca",
+--       both = "cb",
+--       cursor = "cc",
+--       next = "]x",
+--       prev = "[x",
+--     },
+--     suggestion = {
+--       accept = "<M-l>",
+--       next = "<M-]>",
+--       prev = "<M-[>",
+--       dismiss = "<C-]>",
+--     },
+--     jump = {
+--       next = "]]",
+--       prev = "[[",
+--     },
+--     submit = {
+--       normal = "<CR>",
+--       insert = "<C-s>",
+--     },
+--     sidebar = {
+--       apply_all = "A",
+--       apply_cursor = "a",
+--       switch_windows = "<Tab>",
+--       reverse_switch_windows = "<S-Tab>",
+--     },
+--   },
+-- })
 
 require("quicker").setup({
   keys = {
diff --git a/mut/neovim/lua/my/settings.lua b/mut/neovim/lua/my/settings.lua
index 560fa18..a3c5144 100644
--- a/mut/neovim/lua/my/settings.lua
+++ b/mut/neovim/lua/my/settings.lua
@@ -63,3 +63,5 @@ vim.opt.winbar = ""
 vim.opt.hlsearch = false
 vim.opt.showtabline = 1
 vim.opt.cmdheight = 1
+
+vim.opt.shellpipe = "out+err>"