Compare commits
35 Commits
56eefd52bb
...
d4dc64df66
Author | SHA1 | Date | |
---|---|---|---|
d4dc64df66 | |||
a20fb43d9f | |||
966d23f24b | |||
5a08d09bb0 | |||
d737210692 | |||
2158c8a0f7 | |||
e1e66ddb96 | |||
5a6fc102ae | |||
cbfb6ef9e6 | |||
de705cacd4 | |||
0a381447e3 | |||
f1243fdde3 | |||
2e4bb33f1f | |||
fe303336ba | |||
848e5e5b2d | |||
47fd283e2b | |||
0c9c6a2ff4 | |||
709cfc3029 | |||
2d32451759 | |||
a2330cec9c | |||
438be54382 | |||
c0e116844b | |||
83a7edf9a1 | |||
13badf66fa | |||
395767492c | |||
6d8cbedab0 | |||
b3ba49ec4b | |||
ad916e5832 | |||
2b1b86e761 | |||
2c272ff42a | |||
1a7198fbad | |||
92a1408a65 | |||
9ea35893fa | |||
d0c65762fd | |||
adda80d896 |
@ -69,6 +69,7 @@ RUN apt-get update \
|
|||||||
locales \
|
locales \
|
||||||
m4 \
|
m4 \
|
||||||
make \
|
make \
|
||||||
|
ncal \
|
||||||
neovim \
|
neovim \
|
||||||
net-tools \
|
net-tools \
|
||||||
openjdk-17-jdk \
|
openjdk-17-jdk \
|
||||||
@ -184,7 +185,7 @@ 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 \
|
||||||
&& cd ${XDG_CONFIG_HOME}/nvim \
|
&& cd ${XDG_CONFIG_HOME}/nvim \
|
||||||
&& git reset --hard 4120893b8a1f31a0957f2f891f7fbef73ddfb9b1 \
|
&& git reset --hard 8d1ef972bc32faa86fee21a57f9033b41f612ebb \
|
||||||
&& git apply /tmp/updates.patch \
|
&& git apply /tmp/updates.patch \
|
||||||
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
|
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
|
||||||
&& nvim --headless "+Lazy! sync" +qa
|
&& nvim --headless "+Lazy! sync" +qa
|
||||||
|
@ -1,37 +1,37 @@
|
|||||||
[tools]
|
[tools]
|
||||||
age = "1.2.0"
|
age = "1.2.0"
|
||||||
awscli = "2.22.7"
|
awscli = "2.23.0"
|
||||||
bat = "0.24.0"
|
bat = "0.24.0"
|
||||||
bitwarden = "2024.11.1"
|
bitwarden = "2024.11.1"
|
||||||
circleci-cli = "0.1.31151"
|
circleci-cli = "0.1.31151"
|
||||||
ctlptl = "0.8.36"
|
ctlptl = "0.8.36"
|
||||||
dagger = "0.14.0"
|
dagger = "0.14.0"
|
||||||
eksctl = "0.194.0"
|
eksctl = "0.194.0"
|
||||||
elixir = "1.17.3"
|
elixir = "1.18.1"
|
||||||
erlang = "27.1.2"
|
erlang = "27.2"
|
||||||
eza = "0.20.10"
|
eza = "0.20.10"
|
||||||
fzf = "0.56.3"
|
fzf = "0.56.3"
|
||||||
github-cli = "2.63.0"
|
github-cli = "2.65.0"
|
||||||
go = "1.23.3"
|
go = "1.23.4"
|
||||||
helm = "3.16.3"
|
helm = "3.17.0"
|
||||||
k3d = "5.7.5"
|
k3d = "5.7.5"
|
||||||
k3sup = "0.13.7"
|
k3sup = "0.13.7"
|
||||||
k9s = "0.32.7"
|
k9s = "0.32.7"
|
||||||
kind = "0.25.0"
|
kind = "0.26.0"
|
||||||
kubectl = "1.31.3"
|
kubectl = "1.32.1"
|
||||||
kubie = "0.24.0"
|
kubie = "0.24.0"
|
||||||
lefthook = "1.8.4"
|
lefthook = "1.8.4"
|
||||||
lua = "5.1.5"
|
lua = "5.4.7"
|
||||||
luajit = "2.0.5--3.11.1"
|
luajit = "2.0.5--3.11.1"
|
||||||
node = "22.11.0"
|
node = "22.13.0"
|
||||||
poetry = "1.8.4"
|
poetry = "2.0.1"
|
||||||
python = "3.13.0"
|
python = "3.13.1"
|
||||||
r = "4.4.2"
|
r = "4.4.2"
|
||||||
ripgrep = "14.1.1"
|
ripgrep = "14.1.1"
|
||||||
rust = "1.83.0"
|
rust = "1.84.0"
|
||||||
starship = "1.21.1"
|
starship = "1.21.1"
|
||||||
task = "3.40.0"
|
task = "3.40.0"
|
||||||
terraform = "1.10.0"
|
terraform = "1.10.4"
|
||||||
tilt = "0.33.21"
|
tilt = "0.33.21"
|
||||||
usage = "1.3.3"
|
usage = "1.3.3"
|
||||||
usql = "0.19.12"
|
usql = "0.19.12"
|
||||||
|
@ -144,4 +144,124 @@ return {
|
|||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'yetone/avante.nvim',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
lazy = false,
|
||||||
|
version = false,
|
||||||
|
opts = {
|
||||||
|
provider = 'claude',
|
||||||
|
auto_suggestion_provider = 'claude',
|
||||||
|
claude = {
|
||||||
|
endpoint = 'https://api.anthropic.com',
|
||||||
|
model = 'claude-3-5-sonnet-20241022',
|
||||||
|
temperature = 0,
|
||||||
|
max_tokens = 4096,
|
||||||
|
},
|
||||||
|
behaviour = {
|
||||||
|
auto_suggestions = false,
|
||||||
|
auto_set_highlight_group = true,
|
||||||
|
aute_set_keymaps = true,
|
||||||
|
auto_apply_diff_after_generation = true,
|
||||||
|
support_paste_from_clipboard = false,
|
||||||
|
minimize_diff = true,
|
||||||
|
},
|
||||||
|
mappings = {
|
||||||
|
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>',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
hints = { enabled = true },
|
||||||
|
windows = {
|
||||||
|
position = 'right',
|
||||||
|
wrap = true,
|
||||||
|
width = 30,
|
||||||
|
sidebar_header = {
|
||||||
|
enabled = true,
|
||||||
|
align = 'center',
|
||||||
|
rounded = true,
|
||||||
|
},
|
||||||
|
input = {
|
||||||
|
prefix = '> ',
|
||||||
|
height = 8,
|
||||||
|
},
|
||||||
|
edit = {
|
||||||
|
border = 'rounded',
|
||||||
|
start_insert = true,
|
||||||
|
},
|
||||||
|
ask = {
|
||||||
|
floating = false,
|
||||||
|
start_insert = true,
|
||||||
|
border = 'rounded',
|
||||||
|
focus_on_apply = 'ours',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
highlights = {
|
||||||
|
diff = {
|
||||||
|
current = 'DiffText',
|
||||||
|
incoming = 'DiffAdd',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
diff = {
|
||||||
|
autojump = true,
|
||||||
|
list_opener = 'copen',
|
||||||
|
override_timeoutlen = 500,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
build = 'make',
|
||||||
|
dependencies = {
|
||||||
|
'stevearc/dressing.nvim',
|
||||||
|
'nvim-lua/plenary.nvim',
|
||||||
|
'MunifTanjim/nui.nvim',
|
||||||
|
'hrsh7th/nvim-cmp',
|
||||||
|
'nvim-tree/nvim-web-devicons',
|
||||||
|
{
|
||||||
|
'HakonHarnes/img-clip.nvim',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
opts = {
|
||||||
|
default = {
|
||||||
|
embed_image_as_base64 = false,
|
||||||
|
prompt_for_file_name = false,
|
||||||
|
drag_and_drop = {
|
||||||
|
insert_mode = true,
|
||||||
|
},
|
||||||
|
use_absolute_path = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'MeanderingProgrammer/render-markdown.nvim',
|
||||||
|
opts = {
|
||||||
|
file_types = { 'markdown', 'Avante' },
|
||||||
|
},
|
||||||
|
ft = { 'markdown', 'Avante' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,20 @@
|
|||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
nvim:
|
nvim:
|
||||||
build: .
|
build:
|
||||||
|
context: .
|
||||||
|
args:
|
||||||
|
GIT_USER_EMAIL: ${NVIM_GIT_USER_EMAIL:-nobody@example.com}
|
||||||
|
GIT_USER_NAME: ${NVIM_GIT_USER_NAME:-noboby}
|
||||||
image: 'joaodubas/nvim:${NVIM_TAG:-latest}'
|
image: 'joaodubas/nvim:${NVIM_TAG:-latest}'
|
||||||
init: true
|
init: true
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
hostname: local
|
hostname: local
|
||||||
entrypoint: sleep
|
entrypoint: sleep
|
||||||
command: infinity
|
command: infinity
|
||||||
|
environment:
|
||||||
|
ANTHROPIC_API_KEY: ${NVIM_ANTHROPIC_API_KEY:-no-api}
|
||||||
|
GH_TOKEN: ${NVIM_GH_TOKEN:-no-token}
|
||||||
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'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git a/init.lua b/init.lua
|
diff --git a/init.lua b/init.lua
|
||||||
index ea86b79..7323a7f 100644
|
index 08717d5..96c1e03 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 = ' '
|
||||||
@ -39,7 +39,7 @@ index ea86b79..7323a7f 100644
|
|||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- See `:help vim.keymap.set()`
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
@@ -618,6 +626,27 @@ require('lazy').setup({
|
@@ -628,6 +636,27 @@ require('lazy').setup({
|
||||||
-- ts_ls = {},
|
-- ts_ls = {},
|
||||||
--
|
--
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ index ea86b79..7323a7f 100644
|
|||||||
lua_ls = {
|
lua_ls = {
|
||||||
-- cmd = {...},
|
-- cmd = {...},
|
||||||
-- filetypes = { ...},
|
-- filetypes = { ...},
|
||||||
@@ -632,6 +661,32 @@ require('lazy').setup({
|
@@ -642,6 +671,32 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -100,7 +100,7 @@ index ea86b79..7323a7f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Ensure the servers and tools above are installed
|
-- Ensure the servers and tools above are installed
|
||||||
@@ -658,6 +713,33 @@ require('lazy').setup({
|
@@ -668,6 +723,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 {})
|
||||||
@ -134,7 +134,7 @@ index ea86b79..7323a7f 100644
|
|||||||
require('lspconfig')[server_name].setup(server)
|
require('lspconfig')[server_name].setup(server)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
@@ -888,7 +970,39 @@ require('lazy').setup({
|
@@ -898,7 +980,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 = {
|
||||||
@ -175,7 +175,7 @@ index ea86b79..7323a7f 100644
|
|||||||
-- Autoinstall languages that are not installed
|
-- Autoinstall languages that are not installed
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
@@ -918,18 +1032,18 @@ require('lazy').setup({
|
@@ -928,17 +1042,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',
|
||||||
@ -191,9 +191,8 @@ index ea86b79..7323a7f 100644
|
|||||||
-- This is the easiest way to modularize your config.
|
-- This is the easiest way to modularize your config.
|
||||||
--
|
--
|
||||||
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
||||||
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
|
||||||
- -- { import = 'custom.plugins' },
|
- -- { import = 'custom.plugins' },
|
||||||
+ { import = 'custom.plugins' },
|
+ { import = 'custom.plugins' },
|
||||||
}, {
|
--
|
||||||
ui = {
|
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
|
||||||
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
-- Or use telescope!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user