Compare commits

..

1 Commits

Author SHA1 Message Date
2881aa8960 chore(deps): update dependency lua to v5.4.7 2025-05-12 12:01:20 +00:00
11 changed files with 96 additions and 344 deletions

View File

@ -1,28 +0,0 @@
root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[Makefile]
indent_style = tab
indent_size = 4
[*.lua]
indent_style = space
indent_size = 2
quote_style = single
[*.md]
trim_trailing_whitespace = false
max_line_length = 80
[*.sh]
indent_style = tab
indent_size = 4
[*.yml]
indent_style = space
indent_size = 2

View File

@ -105,11 +105,11 @@ RUN apt-get update \
&& echo 'permit persist :wheel as root' > /etc/doas.conf && echo 'permit persist :wheel as root' > /etc/doas.conf
# command line utilities # command line utilities
ENV DO_VERSION 28.1.1 ENV DO_VERSION 28.0.4
ENV DO_URL https://download.docker.com/linux/static/stable/x86_64/docker-${DO_VERSION}.tgz ENV DO_URL https://download.docker.com/linux/static/stable/x86_64/docker-${DO_VERSION}.tgz
ENV DC_VERSION v2.36.0 ENV DC_VERSION v2.35.0
ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-linux-x86_64 ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-linux-x86_64
ENV BX_VERSION v0.23.0 ENV BX_VERSION v0.22.0
ENV BX_URL https://github.com/docker/buildx/releases/download/${BX_VERSION}/buildx-${BX_VERSION}.linux-amd64 ENV BX_URL https://github.com/docker/buildx/releases/download/${BX_VERSION}/buildx-${BX_VERSION}.linux-amd64
ENV EXERCISM_VERSION 3.5.4 ENV EXERCISM_VERSION 3.5.4
ENV EXERCISM_FILE exercism-${EXERCISM_VERSION}-linux-x86_64.tar.gz ENV EXERCISM_FILE exercism-${EXERCISM_VERSION}-linux-x86_64.tar.gz
@ -194,7 +194,7 @@ RUN fish -c true \
&& echo 'alias nh="nvim --listen 0.0.0.0:6666 --headless &> /dev/null"' >> ${XDG_CONFIG_HOME}/fish/config.fish && echo 'alias nh="nvim --listen 0.0.0.0:6666 --headless &> /dev/null"' >> ${XDG_CONFIG_HOME}/fish/config.fish
# git configuration # git configuration
ENV NEOVIM_KICKSTART_VERSION 3338d3920620861f8313a2745fd5d2be39f39534 ENV NEOVIM_KICKSTART_VERSION d350db2449da40df003c40d440f909d74e2d4e70
COPY ./patch/kickstart.nvim/updates.patch /tmp COPY ./patch/kickstart.nvim/updates.patch /tmp
COPY ./config/nvim/lua/custom/plugins/init.lua /tmp COPY ./config/nvim/lua/custom/plugins/init.lua /tmp
RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \

View File

@ -1,13 +1,10 @@
--- ---
reasoning-effort: medium model: gemini/gemini-2.5-pro-preview-03-25
thinking-tokens: 8k
model: gemini/gemini-2.5-pro-preview-05-06
weak-model: gemini/gemini-2.0-flash-001 weak-model: gemini/gemini-2.0-flash-001
editor-model: gemini/gemini-2.5-pro-preview-05-06 editor-model: gemini/gemini-2.5-pro-preview-03-25
editor: nvim editor: nvim
git: true git: true
gitignore: true gitignore: true
auto-commits: false auto-commits: false
read: read:
- CONVENTIONS.md - CONVENTIONS.md
- CLAUDE.md

View File

@ -1,43 +0,0 @@
ANTHROPIC_HOST: https://api.anthropic.com
GOOSE_PROVIDER: google
GOOSE_MODEL: gemini-2.5-pro-preview-05-06
extensions:
computercontroller:
bundled: true
display_name: Computer Controller
enabled: true
name: computercontroller
timeout: 600
type: builtin
context7:
args:
- dlx
- '@upstash/context7-mcp@latest'
bundled: null
cmd: pnpm
description: null
enabled: true
env_keys: []
envs: {}
name: context7
timeout: 600
type: stdio
developer:
bundled: true
display_name: Developer Tools
enabled: true
name: developer
timeout: 600
type: builtin
git:
args:
- mcp-server-git
bundled: null
cmd: uvx
description: null
enabled: true
env_keys: []
envs: {}
name: git
timeout: 600
type: stdio

View File

@ -1,54 +1,53 @@
[tools] [tools]
"aqua:BurntSushi/ripgrep" = "14.1.1" "aqua:BurntSushi/ripgrep" = "14.1.1"
"aqua:CircleCI-Public/circleci-cli" = "0.1.32067" "aqua:CircleCI-Public/circleci-cli" = "0.1.31632"
"aqua:FiloSottile/age" = "1.2.1" "aqua:FiloSottile/age" = "1.2.1"
"aqua:ajeetdsouza/zoxide" = "0.9.8" "aqua:ajeetdsouza/zoxide" = "0.9.7"
"aqua:alexellis/k3sup" = "0.13.9" "aqua:alexellis/k3sup" = "0.13.8"
"aqua:astral-sh/uv" = "0.7.8" "aqua:astral-sh/uv" = "0.7.2"
"aqua:aws/aws-cli" = "2.27.23" "aqua:aws/aws-cli" = "2.27.9"
"aqua:bitwarden/clients" = "cli-v2025.2.0" "aqua:bitwarden/clients" = "cli-v2025.2.0"
"aqua:dagger/dagger" = "0.18.9" "aqua:dagger/dagger" = "0.18.6"
"aqua:derailed/k9s" = "0.50.6" "aqua:derailed/k9s" = "0.50.4"
"aqua:eksctl-io/eksctl" = "0.208.0" "aqua:eksctl-io/eksctl" = "0.207.0"
"aqua:evilmartians/lefthook" = "1.11.13" "aqua:evilmartians/lefthook" = "1.11.12"
"aqua:eza-community/eza" = "0.21.3" "aqua:eza-community/eza" = "0.21.3"
"aqua:github-cli" = "2.73.0" "aqua:github-cli" = "2.72.0"
"aqua:go-task/task" = "3.43.3" "aqua:go-task/task" = "3.43.3"
"aqua:hashicorp/terraform" = "1.12.1" "aqua:hashicorp/terraform" = "1.11.4"
"aqua:helm/helm" = "3.18.0" "aqua:helm/helm" = "3.17.3"
"aqua:jj-vcs/jj" = "0.29.0" "aqua:jj-vcs/jj" = "0.28.2"
"aqua:junegunn/fzf" = "0.62.0" "aqua:junegunn/fzf" = "0.62.0"
"aqua:k3d-io/k3d" = "5.8.3" "aqua:k3d-io/k3d" = "5.8.3"
"aqua:kubernetes-sigs/kind" = "0.29.0" "aqua:kubernetes-sigs/kind" = "0.27.0"
"aqua:kubernetes/kubectl" = "1.33.1" "aqua:kubernetes/kubectl" = "1.33.0"
"aqua:pnpm/pnpm" = "10.11.0" "aqua:pnpm/pnpm" = "10.10.0"
"aqua:sbstp/kubie" = "0.25.2" "aqua:sbstp/kubie" = "0.25.2"
"aqua:sharkdp/bat" = "0.25.0" "aqua:sharkdp/bat" = "0.25.0"
"aqua:starship/starship" = "1.23.0" "aqua:starship/starship" = "1.23.0"
"aqua:tilt-dev/ctlptl" = "0.8.42" "aqua:tilt-dev/ctlptl" = "0.8.40"
"aqua:tilt-dev/tilt" = "0.34.4" "aqua:tilt-dev/tilt" = "0.34.2"
"aqua:xo/usql" = "0.19.24" "aqua:xo/usql" = "0.19.21"
"go:github.com/bloznelis/typioca" = "3.1.0" "go:github.com/bloznelis/typioca" = "3.1.0"
"npm:@anthropic-ai/claude-code" = "1.0.4" "npm:@anthropic-ai/claude-code" = "0.2.103"
"pipx:aider-chat" = { version = "0.83.2", uvx_args = "--python 3.12.10 --with google-generativeai" } "pipx:aider-chat" = { version = "0.82.3", uvx_args = "--python 3.12.10 --with google-generativeai" }
"pipx:vectorcode" = { version = "0.6.9", uvx_args = "--python 3.13.3", extras = "mcp" } "pipx:vectorcode" = { version = "0.6.5", uvx_args = "--python 3.13.3", extras = "mcp" }
"ubi:Samyak2/toipe" = "0.5.0" "ubi:Samyak2/toipe" = "0.5.0"
"ubi:block/goose" = "1.0.24"
"ubi:hlsxx/tukai" = "0.2.2" "ubi:hlsxx/tukai" = "0.2.2"
"ubi:jdx/usage" = "2.1.1" "ubi:jdx/usage" = "2.1.1"
"ubi:max-niederman/ttyper" = "1.6.0" "ubi:max-niederman/ttyper" = "1.6.0"
"ubi:supabase/cli" = { version = "2.23.4", exe = "supabase" } "ubi:supabase/cli" = { version = "2.22.12", exe = "supabase" }
"ubi:wagoodman/dive" = "0.13.1" "ubi:wagoodman/dive" = "0.13.1"
elixir = "1.18.4" elixir = "1.18.3"
erlang = "28.0" erlang = "27.3.4"
go = "1.24.4" go = "1.24.3"
lua = "5.4.7" lua = "5.4.7"
luajit = "2.0.5" luajit = "2.0.5"
node = "22.16.0" node = "22.15.0"
poetry = "2.1.3" poetry = "2.1.3"
python = "3.13.5" python = "3.13.3"
r = "4.5.0" r = "4.5.0"
rust = "1.87.0" rust = "1.86.0"
yarn = "1.22.22" yarn = "1.22.22"
[settings] [settings]

View File

@ -105,23 +105,43 @@ return {
config = true, config = true,
}, },
{ {
'jpalardy/vim-slime', 'EvWilson/slimux.nvim',
init = function() lazy = true,
vim.g.slime_target = 'tmux' opts = function()
vim.g.slime_no_mappings = true local status_ok, slimux = pcall(require, 'slimux')
if not status_ok then
return {}
end
return {
target_socket = slimux.get_tmux_socket(),
target_pane = string.format('%s.1', slimux.get_tmux_window()),
}
end, end,
keys = { keys = function()
{ '<leader>xr', '<Plug>SlimeMotionSend', mode = 'n', desc = 'Slime send motion' }, local status_ok, which_key = pcall(require, 'which-key')
{ '<leader>xz', ":<C-u>'<,'>SlimeSend<CR>", mode = 'v', desc = 'Slime send currently highlighted text' }, if status_ok then
{ '<leader>xz', '<Plug>SlimeLineSend', mode = 'n', desc = 'Slime send line' }, which_key.add {
{ '<leader>xc', '<Plug>SlimeConfig', mode = 'n', desc = 'Slime configuration' }, { '<leader>m', group = 'Toggle ter[m]inal' },
}, }
config = function() end
vim.g.slime_input_pid = false local slimux_status_ok, slimux = pcall(require, 'slimux')
vim.g.slime_suggest_default = true if not slimux_status_ok then
vim.g.slime_menu_config = false return {}
vim.g.slime_neovim_ignore_unlisted = false end
vim.g.slime_bracketed_paste = true return {
{
'<leader>xr',
slimux.send_highlighted_text,
mode = 'v',
desc = 'Send currently highlighted text to configured tmux pane',
},
{
'<leader>r',
slimux.send_paragraph_text,
mode = 'n',
desc = 'Send paragraph under cursor to configured tmux pane',
},
}
end, end,
}, },
{ {
@ -214,7 +234,7 @@ return {
name = 'gemini_pro', name = 'gemini_pro',
schema = { schema = {
model = { model = {
default = 'gemini-2.5-pro-preview-05-06', default = 'gemini-2.5-pro-exp-03-25',
}, },
}, },
}) })
@ -290,178 +310,6 @@ return {
}, },
}, },
}, },
{
'azorng/goose.nvim',
dependencies = {
'nvim-lua/plenary.nvim',
{
'MeanderingProgrammer/render-markdown.nvim',
opts = {
file_types = { 'markdown', 'goose' },
anti_conceal = { enabled = false },
},
},
},
opts = {
prefered_picker = 'telescope',
default_global_keymaps = false,
ui = {
window_widht = 0.3,
input_height = 0.2,
fullscreen = false,
layout = 'right',
floating_height = 0.9,
display_model = true,
display_goose_mode = true,
},
providers = {
anthropic = {
'claude-sonnet-4-20250514',
},
gemini = {
'gemini-2.5-pro-preview-05-06',
'gemini-2.5-flash-preview-05-20',
'gemini-2.0-flash',
},
groq = {
'deepseek-r1-distill-llama-70b',
'qwen-qwq-32b',
},
},
},
keys = {
{ '<leader>gg', '<cmd>Goose<cr>', mode = 'n', desc = 'Toggle goose' },
{ '<leader>gi', '<cmd>GooseOpenInput<cr>', mode = 'n', desc = 'Open goose input' },
{ '<leader>gI', '<cmd>GooseOpenInputNewSession<cr>', mode = 'n', desc = 'Open goose input in new session' },
{ '<leader>go', '<cmd>GooseOpenOutput<cr>', mode = 'n', desc = 'Open goose output' },
{ '<leader>gt', '<cmd>GooseToggleFocus<cr>', mode = 'n', desc = 'Toggle focus between goose and last window' },
{ '<leader>gq', '<cmd>GooseClose<cr>', mode = 'n', desc = 'Close goose' },
{ '<leader>gf', '<cmd>GooseToggleFullscreen<cr>', mode = 'n', desc = 'Toggle goose fullscreen' },
{ '<leader>gsn', '<cmd>GooseSelectSession<cr>', mode = 'n', desc = 'Select and load a goose session' },
-- { '<leader>gmc', '<cmd>GooseModeChat<cr>', mode = 'n', desc = 'Set goose mode to `chat`' },
-- { '<leader>gma', '<cmd>GooseModeAuto<cr>', mode = 'n', desc = 'Set goose mode to `auto`' },
{ '<leader>gp', '<cmd>GooseConfigureProvider<cr>', mode = 'n', desc = 'Quick provider and model switch from predefined list' },
{ '<leader>gd', '<cmd>GooseDiff<cr>', mode = 'n', desc = 'Opens a diff tab of a modified file since the last goose prompt' },
{ '<leader>g]', '<cmd>GooseDiffNext<cr>', mode = 'n', desc = 'Navigate to next file diff' },
{ '<leader>g[', '<cmd>GooseDiffPrev<cr>', mode = 'n', desc = 'Navigate to previous file diff' },
{ '<leader>gc', '<cmd>GooseDiffClose<cr>', mode = 'n', desc = 'Close diff view tab and return to normal editing' },
{ '<leader>gra', '<cmd>GooseDiffRevertAll<cr>', mode = 'n', desc = 'Revert all file changes since the last goose prompt' },
{ '<leader>grt', '<cmd>GooseDiffRevertThis<cr>', mode = 'n', desc = 'Revert current file changes since the last goose prompt' },
},
},
{
'yetone/avante.nvim',
build = 'make',
event = 'VeryLazy',
version = false,
dependencies = {
'nvim-treesitter/nvim-treesitter',
'stevearc/dressing.nvim',
'nvim-lua/plenary.nvim',
'MunifTanjim/nui.nvim',
'nvim-telescope/telescope.nvim',
'nvim-tree/nvim-web-devicons',
{
-- support for image pasting
'HakonHarnes/img-clip.nvim',
event = 'VeryLazy',
opts = {
-- recommended settings
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
-- required for Windows users
use_absolute_path = true,
},
},
},
{
'MeanderingProgrammer/render-markdown.nvim',
opts = {
file_types = { 'markdown', 'Avante' },
},
ft = { 'markdown', 'Avante' },
},
},
opts = {
mappings = {
ask = '<leader>ua',
edit = '<leader>ue',
refresh = '<leader>ur',
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>',
},
},
-- The custom_tools type supports both a list and a function that returns a list. Using a function here prevents requiring mcphub before it's loaded
custom_tools = function()
return {
require('mcphub.extensions.avante').mcp_tool(),
}
end,
hints = { enabled = true },
provider = 'gemini-pro',
-- The system_prompt type supports both a string and a function that returns a string. Using a function here allows dynamically updating the prompt with `mcphub`
system_prompt = function()
local hub = require('mcphub').get_hub_instance()
return hub and hub:get_active_servers_prompt() or ''
end,
vendors = {
['gemini-pro'] = {
__inherited_from = 'gemini',
model = 'gemini-2.5-pro-preview-05-06',
timeout = 600000,
max_tokens = 40960,
},
['gemini-flash'] = {
__inherited_from = 'gemini',
model = 'gemini-2.0-flash',
timeout = 600000,
max_tokens = 20480,
},
['claude-sonnet-4'] = {
__inherited_from = 'claude',
model = 'claude-sonnet-4-20250514',
timeout = 600000,
max_tokens = 20480,
},
groq = {
__inherited_from = 'openai',
api_key_name = 'GROQ_API_KEY',
endpoint = 'https://api.groq.com/openai/v1/',
model = 'deepseek-r1-distill-llama-70b',
},
},
},
},
{ {
'sphamba/smear-cursor.nvim', 'sphamba/smear-cursor.nvim',
opts = { opts = {

View File

@ -1,14 +0,0 @@
---
session_name: rpi
start_directory: /opt/personal
windows:
- window_name: rpi
focus: true
layout: tiled
start_directory: labs
panes:
- focus: true
shell_command: ssh rpi00
- shell_command: ssh rpi01
- shell_command: ssh rpi02
- shell_command: ssh rpi03

View File

@ -14,13 +14,13 @@ services:
entrypoint: sleep entrypoint: sleep
command: infinity command: infinity
environment: environment:
ANTHROPIC_API_KEY: ${NVIM_ANTHROPIC_API_KEY:-no-api}
GH_TOKEN: &github_token ${NVIM_GH_TOKEN:-no-token} GH_TOKEN: &github_token ${NVIM_GH_TOKEN:-no-token}
GITHUB_TOKEN: *github_token GITHUB_TOKEN: *github_token
COMPOSE_BAKE: 'true' COMPOSE_BAKE: 'true'
volumes: volumes:
- './config/atuin:/home/coder/.config/atuin' - './config/atuin:/home/coder/.config/atuin'
- './config/git:/home/coder/.config/git' - './config/git:/home/coder/.config/git'
- './config/goose:/home/coder/.config/goose'
- './config/mcphub:/home/coder/.config/mcphub' - './config/mcphub:/home/coder/.config/mcphub'
- './config/mise:/home/coder/.config/mise' - './config/mise:/home/coder/.config/mise'
- './config/nvim/lua/custom:/home/coder/.config/nvim/lua/custom' - './config/nvim/lua/custom:/home/coder/.config/nvim/lua/custom'
@ -32,10 +32,9 @@ services:
- 'home_local_share:/home/coder/.local/share' - 'home_local_share:/home/coder/.local/share'
- 'home_local_state:/home/coder/.local/state' - 'home_local_state:/home/coder/.local/state'
- 'home_plugins_tmux:/home/coder/.config/tmux/plugins' - 'home_plugins_tmux:/home/coder/.config/tmux/plugins'
- 'home_supermaven:/home/coder/.supermaven'
chroma: chroma:
image: 'ghcr.io/chroma-core/chroma:1.0.12' image: 'ghcr.io/chroma-core/chroma:1.0.8'
init: true init: true
restart: unless-stopped restart: unless-stopped
hostname: chroma hostname: chroma
@ -52,5 +51,4 @@ volumes:
home_local_share: {} home_local_share: {}
home_local_state: {} home_local_state: {}
home_plugins_tmux: {} home_plugins_tmux: {}
home_supermaven: {}
chroma_data: {} chroma_data: {}

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index b98ffc6..8013e25 100644 index 776c687..6ae630e 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@ -10,23 +10,23 @@ index b98ffc6..8013e25 100644
+vim.g.have_nerd_font = true +vim.g.have_nerd_font = true
-- [[ Setting options ]] -- [[ Setting options ]]
-- See `:help vim.o` -- See `:help vim.opt`
@@ -102,10 +102,10 @@ vim.g.have_nerd_font = false @@ -102,10 +102,10 @@ vim.g.have_nerd_font = false
vim.o.number = true vim.opt.number = true
-- You can also add relative line numbers, to help with jumping. -- You can also add relative line numbers, to help with jumping.
-- Experiment for yourself to see if you like it! -- Experiment for yourself to see if you like it!
--- vim.o.relativenumber = true --- vim.opt.relativenumber = true
+vim.o.relativenumber = true +vim.opt.relativenumber = true
-- Enable mouse mode, can be useful for resizing splits for example! -- Enable mouse mode, can be useful for resizing splits for example!
-vim.o.mouse = 'a' -vim.opt.mouse = 'a'
+vim.o.mouse = '' +vim.opt.mouse = ''
-- Don't show the mode, since it's already in the status line -- Don't show the mode, since it's already in the status line
vim.o.showmode = false vim.opt.showmode = false
@@ -166,6 +166,14 @@ vim.o.scrolloff = 10 @@ -161,6 +161,14 @@ vim.opt.scrolloff = 10
-- See `:help 'confirm'` -- See `:help 'confirm'`
vim.o.confirm = true vim.opt.confirm = true
+-- Set foldmethod +-- Set foldmethod
+-- See `:help foldmethod` +-- See `:help foldmethod`
@ -39,7 +39,7 @@ index b98ffc6..8013e25 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
@@ -640,9 +648,9 @@ require('lazy').setup({ @@ -632,9 +640,9 @@ require('lazy').setup({
[vim.diagnostic.severity.HINT] = '󰌶 ', [vim.diagnostic.severity.HINT] = '󰌶 ',
}, },
} or {}, } or {},
@ -52,7 +52,7 @@ index b98ffc6..8013e25 100644
format = function(diagnostic) format = function(diagnostic)
local diagnostic_message = { local diagnostic_message = {
[vim.diagnostic.severity.ERROR] = diagnostic.message, [vim.diagnostic.severity.ERROR] = diagnostic.message,
@@ -652,6 +660,7 @@ require('lazy').setup({ @@ -644,6 +652,7 @@ require('lazy').setup({
} }
return diagnostic_message[diagnostic.severity] return diagnostic_message[diagnostic.severity]
end, end,
@ -60,7 +60,7 @@ index b98ffc6..8013e25 100644
}, },
} }
@@ -684,6 +693,28 @@ require('lazy').setup({ @@ -676,6 +685,28 @@ require('lazy').setup({
-- ts_ls = {}, -- ts_ls = {},
-- --
@ -89,7 +89,7 @@ index b98ffc6..8013e25 100644
lua_ls = { lua_ls = {
-- cmd = { ... }, -- cmd = { ... },
-- filetypes = { ... }, -- filetypes = { ... },
@@ -698,6 +729,32 @@ require('lazy').setup({ @@ -690,6 +721,32 @@ require('lazy').setup({
}, },
}, },
}, },
@ -122,7 +122,7 @@ index b98ffc6..8013e25 100644
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -729,6 +786,33 @@ require('lazy').setup({ @@ -721,6 +778,33 @@ require('lazy').setup({
-- by the server configuration above. Useful when disabling -- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for ts_ls) -- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
@ -156,28 +156,23 @@ index b98ffc6..8013e25 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -809,6 +893,9 @@ require('lazy').setup({ @@ -801,6 +885,8 @@ require('lazy').setup({
opts = {}, opts = {},
}, },
'folke/lazydev.nvim', 'folke/lazydev.nvim',
+ 'saghen/blink.compat', + 'saghen/blink.compat',
+ 'supermaven-inc/supermaven-nvim', + 'supermaven-inc/supermaven-nvim',
+ 'Kaiser-Yang/blink-cmp-avante',
}, },
--- @module 'blink.cmp' --- @module 'blink.cmp'
--- @type blink.cmp.Config --- @type blink.cmp.Config
@@ -854,9 +941,19 @@ require('lazy').setup({ @@ -846,9 +932,15 @@ require('lazy').setup({
}, },
sources = { sources = {
- default = { 'lsp', 'path', 'snippets', 'lazydev' }, - default = { 'lsp', 'path', 'snippets', 'lazydev' },
+ default = { 'avante', 'lsp', 'path', 'snippets', 'lazydev', 'supermaven' }, + default = { 'lsp', 'path', 'snippets', 'lazydev', 'supermaven' },
providers = { providers = {
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
+ avante = {
+ name = 'avante',
+ module = 'blink-cmp-avante',
+ },
+ supermaven = { + supermaven = {
+ name = 'supermanve', + name = 'supermanve',
+ module = 'blink.compat.source', + module = 'blink.compat.source',
@ -187,7 +182,7 @@ index b98ffc6..8013e25 100644
}, },
}, },
@@ -882,19 +979,39 @@ require('lazy').setup({ @@ -874,19 +966,39 @@ require('lazy').setup({
-- --
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
'folke/tokyonight.nvim', 'folke/tokyonight.nvim',
@ -233,7 +228,7 @@ index b98ffc6..8013e25 100644
end, end,
}, },
@@ -944,7 +1061,39 @@ require('lazy').setup({ @@ -936,7 +1048,39 @@ require('lazy').setup({
main = 'nvim-treesitter.configs', -- Sets main module to use for opts main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter` -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = { opts = {
@ -274,7 +269,7 @@ index b98ffc6..8013e25 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -974,17 +1123,17 @@ require('lazy').setup({ @@ -966,17 +1110,17 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim). -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- --
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',

View File

@ -23,7 +23,7 @@ resetOutput()
# $red $green and $blue are integers # $red $green and $blue are integers
# ranging between 0 and 255 inclusive # ranging between 0 and 255 inclusive
rainbowColor() rainbowColor()
{ {
let h=$1/43 let h=$1/43
let f=$1-43*$h let f=$1-43*$h
let t=$f*255/43 let t=$f*255/43