Compare commits
3 Commits
c525ca5047
...
4da766706a
Author | SHA1 | Date | |
---|---|---|---|
4da766706a | |||
4a318e0c36 | |||
c1459b8ec1 |
@ -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.0.4
|
ENV DO_VERSION 28.1.1
|
||||||
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.35.0
|
ENV DC_VERSION v2.36.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.22.0
|
ENV BX_VERSION v0.23.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 d350db2449da40df003c40d440f909d74e2d4e70
|
ENV NEOVIM_KICKSTART_VERSION 6ba2408cdf5eb7a0e4b62c7d6fab63b64dd720f6
|
||||||
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 \
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
"aqua:ajeetdsouza/zoxide" = "0.9.7"
|
"aqua:ajeetdsouza/zoxide" = "0.9.7"
|
||||||
"aqua:alexellis/k3sup" = "0.13.8"
|
"aqua:alexellis/k3sup" = "0.13.8"
|
||||||
"aqua:astral-sh/uv" = "0.7.3"
|
"aqua:astral-sh/uv" = "0.7.3"
|
||||||
"aqua:aws/aws-cli" = "2.27.12"
|
"aqua:aws/aws-cli" = "2.27.13"
|
||||||
"aqua:bitwarden/clients" = "cli-v2025.2.0"
|
"aqua:bitwarden/clients" = "cli-v2025.2.0"
|
||||||
"aqua:dagger/dagger" = "0.18.6"
|
"aqua:dagger/dagger" = "0.18.6"
|
||||||
"aqua:derailed/k9s" = "0.50.6"
|
"aqua:derailed/k9s" = "0.50.6"
|
||||||
"aqua:eksctl-io/eksctl" = "0.207.0"
|
"aqua:eksctl-io/eksctl" = "0.208.0"
|
||||||
"aqua:evilmartians/lefthook" = "1.11.12"
|
"aqua:evilmartians/lefthook" = "1.11.12"
|
||||||
"aqua:eza-community/eza" = "0.21.3"
|
"aqua:eza-community/eza" = "0.21.3"
|
||||||
"aqua:github-cli" = "2.72.0"
|
"aqua:github-cli" = "2.72.0"
|
||||||
@ -29,7 +29,7 @@
|
|||||||
"aqua:tilt-dev/tilt" = "0.34.2"
|
"aqua:tilt-dev/tilt" = "0.34.2"
|
||||||
"aqua:xo/usql" = "0.19.23"
|
"aqua:xo/usql" = "0.19.23"
|
||||||
"go:github.com/bloznelis/typioca" = "3.1.0"
|
"go:github.com/bloznelis/typioca" = "3.1.0"
|
||||||
"npm:@anthropic-ai/claude-code" = "0.2.107"
|
"npm:@anthropic-ai/claude-code" = "0.2.108"
|
||||||
"pipx:aider-chat" = { version = "0.83.1", uvx_args = "--python 3.12.10 --with google-generativeai" }
|
"pipx:aider-chat" = { version = "0.83.1", uvx_args = "--python 3.12.10 --with google-generativeai" }
|
||||||
"pipx:vectorcode" = { version = "0.6.6", uvx_args = "--python 3.13.3", extras = "mcp" }
|
"pipx:vectorcode" = { version = "0.6.6", uvx_args = "--python 3.13.3", extras = "mcp" }
|
||||||
"ubi:Samyak2/toipe" = "0.5.0"
|
"ubi:Samyak2/toipe" = "0.5.0"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git a/init.lua b/init.lua
|
diff --git a/init.lua b/init.lua
|
||||||
index 776c687..6ae630e 100644
|
index b98ffc6..f0cf036 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 776c687..6ae630e 100644
|
|||||||
+vim.g.have_nerd_font = true
|
+vim.g.have_nerd_font = true
|
||||||
|
|
||||||
-- [[ Setting options ]]
|
-- [[ Setting options ]]
|
||||||
-- See `:help vim.opt`
|
-- See `:help vim.o`
|
||||||
@@ -102,10 +102,10 @@ vim.g.have_nerd_font = false
|
@@ -102,10 +102,10 @@ vim.g.have_nerd_font = false
|
||||||
vim.opt.number = true
|
vim.o.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.opt.relativenumber = true
|
--- vim.o.relativenumber = true
|
||||||
+vim.opt.relativenumber = true
|
+vim.o.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.opt.mouse = 'a'
|
-vim.o.mouse = 'a'
|
||||||
+vim.opt.mouse = ''
|
+vim.o.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.opt.showmode = false
|
vim.o.showmode = false
|
||||||
@@ -161,6 +161,14 @@ vim.opt.scrolloff = 10
|
@@ -166,6 +166,14 @@ vim.o.scrolloff = 10
|
||||||
-- See `:help 'confirm'`
|
-- See `:help 'confirm'`
|
||||||
vim.opt.confirm = true
|
vim.o.confirm = true
|
||||||
|
|
||||||
+-- Set foldmethod
|
+-- Set foldmethod
|
||||||
+-- See `:help foldmethod`
|
+-- See `:help foldmethod`
|
||||||
@ -39,7 +39,7 @@ index 776c687..6ae630e 100644
|
|||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- See `:help vim.keymap.set()`
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
@@ -632,9 +640,9 @@ require('lazy').setup({
|
@@ -640,9 +648,9 @@ require('lazy').setup({
|
||||||
[vim.diagnostic.severity.HINT] = ' ',
|
[vim.diagnostic.severity.HINT] = ' ',
|
||||||
},
|
},
|
||||||
} or {},
|
} or {},
|
||||||
@ -52,7 +52,7 @@ index 776c687..6ae630e 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,
|
||||||
@@ -644,6 +652,7 @@ require('lazy').setup({
|
@@ -652,6 +660,7 @@ require('lazy').setup({
|
||||||
}
|
}
|
||||||
return diagnostic_message[diagnostic.severity]
|
return diagnostic_message[diagnostic.severity]
|
||||||
end,
|
end,
|
||||||
@ -60,7 +60,7 @@ index 776c687..6ae630e 100644
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -676,6 +685,28 @@ require('lazy').setup({
|
@@ -684,6 +693,28 @@ require('lazy').setup({
|
||||||
-- ts_ls = {},
|
-- ts_ls = {},
|
||||||
--
|
--
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ index 776c687..6ae630e 100644
|
|||||||
lua_ls = {
|
lua_ls = {
|
||||||
-- cmd = { ... },
|
-- cmd = { ... },
|
||||||
-- filetypes = { ... },
|
-- filetypes = { ... },
|
||||||
@@ -690,6 +721,32 @@ require('lazy').setup({
|
@@ -698,6 +729,32 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -122,7 +122,7 @@ index 776c687..6ae630e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Ensure the servers and tools above are installed
|
-- Ensure the servers and tools above are installed
|
||||||
@@ -721,6 +778,33 @@ require('lazy').setup({
|
@@ -729,6 +786,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,7 +156,7 @@ index 776c687..6ae630e 100644
|
|||||||
require('lspconfig')[server_name].setup(server)
|
require('lspconfig')[server_name].setup(server)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
@@ -801,6 +885,8 @@ require('lazy').setup({
|
@@ -809,6 +893,8 @@ require('lazy').setup({
|
||||||
opts = {},
|
opts = {},
|
||||||
},
|
},
|
||||||
'folke/lazydev.nvim',
|
'folke/lazydev.nvim',
|
||||||
@ -165,7 +165,7 @@ index 776c687..6ae630e 100644
|
|||||||
},
|
},
|
||||||
--- @module 'blink.cmp'
|
--- @module 'blink.cmp'
|
||||||
--- @type blink.cmp.Config
|
--- @type blink.cmp.Config
|
||||||
@@ -846,9 +932,15 @@ require('lazy').setup({
|
@@ -854,9 +940,15 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
|
|
||||||
sources = {
|
sources = {
|
||||||
@ -182,7 +182,7 @@ index 776c687..6ae630e 100644
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -874,19 +966,39 @@ require('lazy').setup({
|
@@ -882,19 +974,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',
|
||||||
@ -228,7 +228,7 @@ index 776c687..6ae630e 100644
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -936,7 +1048,39 @@ require('lazy').setup({
|
@@ -944,7 +1056,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 = {
|
||||||
@ -269,7 +269,7 @@ index 776c687..6ae630e 100644
|
|||||||
-- Autoinstall languages that are not installed
|
-- Autoinstall languages that are not installed
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
@@ -966,17 +1110,17 @@ require('lazy').setup({
|
@@ -974,17 +1118,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',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user