Merge remote-tracking branch 'origin/main'

dot_config/alacritty/alacritty.toml.tmpl

@@ -37,6 +37,8 @@ TERM = "xterm-256color"
 size = 15.5
 {{ else if eq .chezmoi.hostname "mercutio" -}}
 size = 20.0
+{{ else if eq .chezmoi.hostname "rosencrantz" -}}
+size = 15.0
 {{ else -}}
 size = 19.0
 {{ end }}
@@ -101,8 +103,11 @@ key = "P"
 mode = "Vi|~Search"
 
 [[keyboard.bindings]]
+{{if eq .chezmoi.hostname "rosencrantz" -}}
+action = "ToggleFullscreen"
+{{ else -}}
 action = "ToggleMaximized"
-#action = "ToggleFullscreen"
+{{ end }}
 key = "Return"
 mods = "Alt"
 

dot_config/fish/config.fish

@@ -12,6 +12,7 @@ set fish_greeting ""
 set EDITOR vi
 set -x GOPATH ~/.go
 set -x BROWSER xdg-open
+set -gx LANG en_US.UTF-8
 
 if test -e $HOME/.asdf/asdf.fish
   . ~/.asdf/asdf.fish

dot_vim/lua/avante_setup.lua

@@ -1,37 +1,19 @@
 require("avante_lib").load()
 require("avante").setup({
-	provider = "ollama",
-	auto_suggestions_provider = "ollama",
-	behavior = {
-		auto_suggestions = false,
-	},
-	hints = {
-		enabled = false,
-	},
-	vendors = {
-		---@type AvanteProvider
-		ollama = {
-			["local"] = true,
-			endpoint = "127.0.0.1:11434/v1",
-			model = "qwen2.5-coder:7b",
-			parse_curl_args = function(opts, code_opts)
-				return {
-					url = opts.endpoint .. "/chat/completions",
-					headers = {
-						["Accept"] = "application/json",
-						["Content-Type"] = "application/json",
-					},
-					body = {
-						model = opts.model,
-						messages = require("avante.providers").copilot.parse_message(code_opts), -- you can make your own message, but this is very advanced
-						max_tokens = 2048,
-						stream = true,
-					},
-				}
-			end,
-			parse_response_data = function(data_stream, event_state, opts)
-				require("avante.providers").openai.parse_response(data_stream, event_state, opts)
-			end,
-		},
-	},
+  provider = "ollama",
+  auto_suggestions_provider = "ollama",
+  behavior = {
+    auto_suggestions = false,
+  },
+  hints = {
+    enabled = false,
+  },
+  vendors = {
+    ollama = {
+      endpoint = "http://127.0.0.1:11434/v1",
+      model = "qwen2.5-coder:7b",
+      __inherited_from = "openai",
+      api_key_name = "",
+    },
+  },
 })

dot_vim/nvim.lua

@@ -211,7 +211,7 @@ require('go').setup({
   iferr_vertical_shift = 2
 })
 
-require('telescope').load_extension('goimpl')
+--require('telescope').load_extension('goimpl')
 
 function org_imports(wait_ms)
   local params = vim.lsp.util.make_range_params()