From 9b2131222a6724ec34af4fefc2cc2a540cdd7773 Mon Sep 17 00:00:00 2001 From: Mike Vink <59492084+ivi-vink@users.noreply.github.com> Date: Tue, 31 Dec 2024 18:34:27 +0100 Subject: update system --- mut/ghostty/config | 5 +- mut/lf/icons | 2 +- mut/neovim/lua/my/init.lua | 94 +++++++++++++++--------------- mut/neovim/lua/my/settings.lua | 2 + mut/neovim/pack/plugins/start/blink.cmp | 1 + mut/neovim/pack/plugins/start/quicker.nvim | 1 + 6 files changed, 55 insertions(+), 50 deletions(-) create mode 160000 mut/neovim/pack/plugins/start/blink.cmp create mode 160000 mut/neovim/pack/plugins/start/quicker.nvim (limited to 'mut') diff --git a/mut/ghostty/config b/mut/ghostty/config index 259a616..dafa2b7 100644 --- a/mut/ghostty/config +++ b/mut/ghostty/config @@ -1,7 +1,7 @@ keybind = alt+k=scroll_page_fractional:-0.4 keybind = alt+j=scroll_page_fractional:+0.4 -keybind = alt+b=scroll_page_up -keybind = alt+f=scroll_page_down +# keybind = alt+b=scroll_page_up +# keybind = alt+f=scroll_page_down keybind = alt+c=copy_to_clipboard keybind = alt+v=paste_from_clipboard keybind = alt+shift+k=increase_font_size:1 @@ -10,3 +10,4 @@ keybind = alt+shift+j=decrease_font_size:1 keybind = ctrl+zero=unbind theme=GruvboxLuke window-decoration=false +confirm-close-surface=false diff --git a/mut/lf/icons b/mut/lf/icons index 147b137..42ddab4 120000 --- a/mut/lf/icons +++ b/mut/lf/icons @@ -1 +1 @@ -/nix/store/znw7za4drsyyarhvzp2gjy1aaz4iwnl1-home-manager-files/.config/lf/icons \ No newline at end of file +/nix/store/n1xbv1dwkvsv7v96kbril3lys6aq7x63-home-manager-files/.config/lf/icons \ No newline at end of file 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 = "", - next = "", - prev = "", - dismiss = "", - }, - jump = { - next = "]]", - prev = "[[", - }, - submit = { - normal = "", - insert = "", - }, - sidebar = { - apply_all = "A", - apply_cursor = "a", - switch_windows = "", - reverse_switch_windows = "", - }, - }, -}) +-- 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 = "", +-- next = "", +-- prev = "", +-- dismiss = "", +-- }, +-- jump = { +-- next = "]]", +-- prev = "[[", +-- }, +-- submit = { +-- normal = "", +-- insert = "", +-- }, +-- sidebar = { +-- apply_all = "A", +-- apply_cursor = "a", +-- switch_windows = "", +-- reverse_switch_windows = "", +-- }, +-- }, +-- }) 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>" diff --git a/mut/neovim/pack/plugins/start/blink.cmp b/mut/neovim/pack/plugins/start/blink.cmp new file mode 160000 index 0000000..5f44268 --- /dev/null +++ b/mut/neovim/pack/plugins/start/blink.cmp @@ -0,0 +1 @@ +Subproject commit 5f442681df24fe705d1ee7ce5b4d435aa4b4dee4 diff --git a/mut/neovim/pack/plugins/start/quicker.nvim b/mut/neovim/pack/plugins/start/quicker.nvim new file mode 160000 index 0000000..87dae0f --- /dev/null +++ b/mut/neovim/pack/plugins/start/quicker.nvim @@ -0,0 +1 @@ +Subproject commit 87dae0f25733b7bd79b600a70ca38040db68ec0b -- cgit v1.2.3