plugin upgrades and fuckery.
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
],
|
],
|
||||||
"install_version": 8,
|
"install_version": 8,
|
||||||
"news": {
|
"news": {
|
||||||
"NEWS.md": "10960"
|
"NEWS.md": "11866"
|
||||||
},
|
},
|
||||||
"version": 8
|
"version": 8
|
||||||
}
|
}
|
@@ -7,29 +7,28 @@ return {
|
|||||||
-- for example
|
-- for example
|
||||||
provider = "ollama",
|
provider = "ollama",
|
||||||
mode = "legacy",
|
mode = "legacy",
|
||||||
disable_tools = true,
|
auto_suggestions_provider = nil,
|
||||||
behaviour = {
|
memory_summary_provider = nil,
|
||||||
enable_cursor_planning_mode = true, -- enable cursor planning mode!
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
ollama = {
|
ollama = {
|
||||||
endpoint = "http://gpu.dighist.geschichte.hu-berlin.de:11434",
|
endpoint = "http://gpu.dighist.geschichte.hu-berlin.de:11434",
|
||||||
model = "cogito:32b", -- your desired model (or use gpt-4o, etc.)
|
model = "qwen3:30b",
|
||||||
timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models
|
timeout = 300000, -- Timeout in milliseconds, increase this for reasoning models
|
||||||
temperature = 0,
|
extra_request_body = {
|
||||||
max_completion_tokens = 40000, -- Increase this to include reasoning tokens (for reasoning models)
|
stream = false,
|
||||||
stream = true,
|
think = false,
|
||||||
thinking = true,
|
keep_alive = -1,
|
||||||
disable_tools = true,
|
options = {
|
||||||
|
keep_alive = -1,
|
||||||
|
temperature = 0.75,
|
||||||
|
num_ctx = 40000,
|
||||||
|
},
|
||||||
|
},
|
||||||
--system_prompt = "Enable deep thinking subroutine.",
|
--system_prompt = "Enable deep thinking subroutine.",
|
||||||
-- reasoning_effort = "high", -- low|medium|high, only used for reasoning models
|
-- reasoning_effort = "high", -- low|medium|high, only used for reasoning models
|
||||||
},
|
is_env_set = function()
|
||||||
deepthink = {
|
return true
|
||||||
__inherited_from = "ollama",
|
end,
|
||||||
model = "qwen3:32b",
|
|
||||||
max_completion_tokens = 40000,
|
|
||||||
reasoning_effort = "high",
|
|
||||||
disable_tools = true,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
rag_service = {
|
rag_service = {
|
||||||
@@ -40,6 +39,13 @@ return {
|
|||||||
embed_model = "nomic-embed-text", -- The embedding model to use for RAG service
|
embed_model = "nomic-embed-text", -- The embedding model to use for RAG service
|
||||||
endpoint = "http://gpu.dighist.geschichte.hu-berlin.de:11434", -- The API endpoint for RAG service
|
endpoint = "http://gpu.dighist.geschichte.hu-berlin.de:11434", -- The API endpoint for RAG service
|
||||||
},
|
},
|
||||||
|
selector = {
|
||||||
|
provider = "snacks",
|
||||||
|
},
|
||||||
|
input = {
|
||||||
|
provider = "snacks",
|
||||||
|
},
|
||||||
|
disabled_tools = { "web_search" },
|
||||||
},
|
},
|
||||||
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
|
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
|
||||||
build = "make",
|
build = "make",
|
||||||
@@ -50,7 +56,7 @@ return {
|
|||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
--- The below dependencies are optional,
|
--- The below dependencies are optional,
|
||||||
"echasnovski/mini.pick", -- for file_selector provider mini.pick
|
"nvim-mini/mini.pick", -- for file_selector provider mini.pick
|
||||||
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
|
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
|
||||||
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
|
"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
|
||||||
"ibhagwan/fzf-lua", -- for file_selector provider fzf
|
"ibhagwan/fzf-lua", -- for file_selector provider fzf
|
||||||
|
@@ -1,37 +1,22 @@
|
|||||||
return {
|
return {
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
-- "Kaiser-Yang/blink-cmp-avante",
|
"Kaiser-Yang/blink-cmp-avante",
|
||||||
-- ... Other dependencies
|
{ "L3MON4D3/LuaSnip", version = "v2.*" },
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
signature = { enabled = true },
|
signature = { enabled = true },
|
||||||
fuzzy = { implementation = "prefer_rust" },
|
fuzzy = { implementation = "prefer_rust" },
|
||||||
keymap = {
|
snippets = { preset = "luasnip" },
|
||||||
["<A-y>"] = {
|
|
||||||
function(cmp)
|
|
||||||
cmp.show({ providers = { "minuet" } })
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
sources = {
|
sources = {
|
||||||
default = { "lsp", "path", "buffer", "minuet" },
|
default = { "lsp", "path", "avante", "snippets", "buffer" },
|
||||||
providers = {
|
providers = {
|
||||||
-- avante = {
|
avante = {
|
||||||
-- module = "blink-cmp-avante",
|
module = "blink-cmp-avante",
|
||||||
-- name = "Avante",
|
name = "Avante",
|
||||||
-- opts = {
|
opts = {
|
||||||
-- -- options for blink-cmp-avante
|
-- options for blink-cmp-avante
|
||||||
-- },
|
},
|
||||||
-- },
|
|
||||||
minuet = {
|
|
||||||
name = "minuet",
|
|
||||||
module = "minuet.blink",
|
|
||||||
async = true,
|
|
||||||
-- Should match minuet.config.request_timeout * 1000,
|
|
||||||
-- since minuet.config.request_timeout is in seconds
|
|
||||||
timeout_ms = 10000,
|
|
||||||
score_offset = 50, -- Gives minuet higher priority among suggestions
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@@ -1,18 +0,0 @@
|
|||||||
return {
|
|
||||||
"mrcjkb/haskell-snippets.nvim",
|
|
||||||
ft = { "haskell", "lhaskell", "cabal" },
|
|
||||||
dependencies = { "L3MON4D3/LuaSnip" },
|
|
||||||
-- falls Lazy mal falsch cached: lade LuaSnip aktiv vorher
|
|
||||||
init = function()
|
|
||||||
if not package.loaded["luasnip"] then
|
|
||||||
local ok, lazy = pcall(require, "lazy")
|
|
||||||
if ok then
|
|
||||||
lazy.load({ plugins = { "LuaSnip" } })
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
-- lade nur, wenn require("luasnip") wirklich klappt
|
|
||||||
cond = function()
|
|
||||||
return package.loaded["luasnip"] or pcall(require, "luasnip")
|
|
||||||
end,
|
|
||||||
}
|
|
@@ -1,9 +1,11 @@
|
|||||||
return {
|
return {
|
||||||
"mrcjkb/haskell-tools.nvim",
|
"mrcjkb/haskell-tools.nvim",
|
||||||
ft = { "haskell", "lhaskell", "cabal" },
|
ft = { "haskell", "lhaskell", "cabal" },
|
||||||
|
dependencies = { "L3MON4D3/LuaSnip", "nvim-treesitter/nvim-treesitter" },
|
||||||
opts = {
|
opts = {
|
||||||
|
|
||||||
hls = {
|
hls = {
|
||||||
|
cmd = { "haskell-language-server-wrapper", "--lsp" },
|
||||||
settings = {
|
settings = {
|
||||||
haskell = {
|
haskell = {
|
||||||
formattingProvider = "fourmolu",
|
formattingProvider = "fourmolu",
|
||||||
@@ -21,5 +23,18 @@ return {
|
|||||||
client.server_capabilities.documentFormattingProvider = false
|
client.server_capabilities.documentFormattingProvider = false
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
-- falls Lazy mal falsch cached: lade LuaSnip aktiv vorher
|
||||||
|
init = function()
|
||||||
|
if not package.loaded["luasnip"] then
|
||||||
|
local ok, lazy = pcall(require, "lazy")
|
||||||
|
if ok then
|
||||||
|
lazy.load({ plugins = { "LuaSnip" } })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
-- lade nur, wenn require("luasnip") wirklich klappt
|
||||||
|
cond = function()
|
||||||
|
return package.loaded["luasnip"] or pcall(require, "luasnip")
|
||||||
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@@ -1,27 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"nvim-lualine/lualine.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
config = function(_, opts)
|
|
||||||
require("lualine").setup({
|
|
||||||
sections = {
|
|
||||||
lualine_x = {
|
|
||||||
{
|
|
||||||
require("minuet.lualine"),
|
|
||||||
-- the follwing is the default configuration
|
|
||||||
-- the name displayed in the lualine. Set to "provider", "model" or "both"
|
|
||||||
-- display_name = 'both',
|
|
||||||
-- separator between provider and model name for option "both"
|
|
||||||
-- provider_model_separator = ':',
|
|
||||||
-- whether show display_name when no completion requests are active
|
|
||||||
-- display_on_idle = false,
|
|
||||||
},
|
|
||||||
"encoding",
|
|
||||||
"fileformat",
|
|
||||||
"filetype",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
22
nvim-config/lua/plugins/mason-exclude-hls.lua
Normal file
22
nvim-config/lua/plugins/mason-exclude-hls.lua
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"mason-org/mason-lspconfig.nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- nichts automatisch installieren für HLS
|
||||||
|
opts.automatic_installation = true -- für alle anderen weiterhin an
|
||||||
|
local list = opts.ensure_installed or {}
|
||||||
|
local keep = {}
|
||||||
|
for _, name in ipairs(list) do
|
||||||
|
if name ~= "hls" and name ~= "haskell_language_server" then
|
||||||
|
table.insert(keep, name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
opts.ensure_installed = keep
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
-- Mason soll PATH nicht voranstellen
|
||||||
|
{
|
||||||
|
"mason-org/mason.nvim",
|
||||||
|
opts = { PATH = "append" },
|
||||||
|
},
|
||||||
|
}
|
@@ -1,7 +1,7 @@
|
|||||||
local function get_text_fn(json)
|
local function get_text_fn(json)
|
||||||
return json.response
|
return json.response
|
||||||
end
|
end
|
||||||
|
--[[
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"milanglacier/minuet-ai.nvim",
|
"milanglacier/minuet-ai.nvim",
|
||||||
@@ -120,3 +120,5 @@ return {
|
|||||||
},
|
},
|
||||||
{ "nvim-lua/plenary.nvim" },
|
{ "nvim-lua/plenary.nvim" },
|
||||||
}
|
}
|
||||||
|
]]
|
||||||
|
return {}
|
||||||
|
13
nvim-config/lua/plugins/no-haskell-lsp.lua
Normal file
13
nvim-config/lua/plugins/no-haskell-lsp.lua
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
opts = {
|
||||||
|
servers = {
|
||||||
|
haskell_language_server = false,
|
||||||
|
haskell_language_server_wrapper = false,
|
||||||
|
hls = false,
|
||||||
|
hie = false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
@@ -1,25 +1,27 @@
|
|||||||
local opts = {
|
|
||||||
ensure_installed = {
|
|
||||||
'c',
|
|
||||||
'lua',
|
|
||||||
'vim',
|
|
||||||
'bash',
|
|
||||||
'regex',
|
|
||||||
'vimdoc',
|
|
||||||
'query',
|
|
||||||
'markdown',
|
|
||||||
'markdown_inline',
|
|
||||||
},
|
|
||||||
highlight = {
|
|
||||||
enable = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
local function config()
|
|
||||||
require('nvim-treesitter.configs').setup(opts)
|
|
||||||
end
|
|
||||||
return {
|
return {
|
||||||
'nvim-treesitter/nvim-treesitter',
|
{
|
||||||
config = config,
|
"nvim-treesitter/nvim-treesitter",
|
||||||
build = ':TSUpdate',
|
version = false,
|
||||||
|
lazy = false, -- <- wichtig: vor FileType-Kram geladen
|
||||||
|
priority = 1000, -- <- noch davor
|
||||||
|
build = ":TSUpdate",
|
||||||
|
main = "nvim-treesiter.configs",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.ensure_installed = vim.tbl_extend("force", opts.ensure_installed or {}, {
|
||||||
|
"haskell",
|
||||||
|
"lua",
|
||||||
|
"vim",
|
||||||
|
"bash",
|
||||||
|
"regex",
|
||||||
|
"vimdoc",
|
||||||
|
"query",
|
||||||
|
"markdown",
|
||||||
|
"markdown_inline",
|
||||||
|
})
|
||||||
|
opts.highlight = opts.highlight or {}
|
||||||
|
opts.highlight.enable = true
|
||||||
|
return opts
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
@@ -1,21 +1,23 @@
|
|||||||
return {
|
return {
|
||||||
"L3MON4D3/LuaSnip",
|
{
|
||||||
version = "v2.*",
|
"L3MON4D3/LuaSnip",
|
||||||
lazy = false, -- früh laden
|
version = "v2.*",
|
||||||
priority = 1000, -- vor anderem Zeug
|
lazy = false, -- früh laden
|
||||||
dependencies = { "rafamadriz/friendly-snippets" },
|
priority = 1000, -- vor anderem Zeug
|
||||||
build = (function()
|
dependencies = { "rafamadriz/friendly-snippets" },
|
||||||
return (vim.fn.executable("make") == 1) and "make install_jsregexp" or nil
|
build = (function()
|
||||||
end)(),
|
return (vim.fn.executable("make") == 1) and "make install_jsregexp" or nil
|
||||||
config = function()
|
end)(),
|
||||||
require("luasnip").config.set_config({
|
config = function()
|
||||||
history = true,
|
require("luasnip").config.set_config({
|
||||||
updateevents = "TextChanged,TextChangedI",
|
history = true,
|
||||||
enable_autosnippets = true,
|
updateevents = "TextChanged,TextChangedI",
|
||||||
})
|
enable_autosnippets = true,
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
})
|
||||||
require("luasnip.loaders.from_lua").lazy_load({
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
paths = vim.fn.stdpath("config") .. "/lua/snippets",
|
require("luasnip.loaders.from_lua").lazy_load({
|
||||||
})
|
paths = vim.fn.stdpath("config") .. "/lua/snippets",
|
||||||
end,
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user