diff --git a/Dockerfile b/Dockerfile index 0071db8..6ed2f69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -185,45 +185,18 @@ COPY ./patch/kickstart.nvim/updates.patch /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 \ && cd ${XDG_CONFIG_HOME}/nvim \ - && git reset --hard 8d1ef972bc32faa86fee21a57f9033b41f612ebb \ + && git reset --hard 5bdde24dfb353d365d908c5dd700f412ed2ffb17 \ && git apply /tmp/updates.patch \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && nvim --headless "+Lazy! sync" +qa # install mise plugins RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ - age \ - awscli \ - bat \ - bitwarden \ - circleci-cli \ - ctlptl \ - dagger \ - eksctl \ - eza \ - fzf \ - github-cli \ - helm \ - k3d \ - k3sup \ - k9s \ - kind \ - kubectl \ - kubie \ - lefthook \ lua \ luajit \ poetry \ r \ - ripgrep \ - starship \ - task \ - terraform \ - tilt \ - usage \ - usql \ - yarn \ - zoxide + yarn # configure git ARG GIT_USER_EMAIL diff --git a/config/mise/config.toml b/config/mise/config.toml index 54847cf..230f090 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -1,43 +1,47 @@ [tools] -age = "1.2.1" -awscli = "2.23.1" -bat = "0.25.0" -bitwarden = "2025.1.0" -circleci-cli = "0.1.31151" -ctlptl = "0.8.37" -dagger = "0.15.2" -eksctl = "0.201.0" -elixir = "1.18.1" -erlang = "27.2" -eza = "0.20.16" -fzf = "0.57.0" -github-cli = "2.65.0" -go = "1.23.5" -helm = "3.17.0" -k3d = "5.7.5" -k3sup = "0.13.7" -k9s = "0.32.7" -kind = "0.26.0" -kubectl = "1.32.1" -kubie = "0.24.1" -lefthook = "1.10.7" +"aqua:BurntSushi/ripgrep" = "14.1.1" +"aqua:CircleCI-Public/circleci-cli" = "0.1.31425" +"aqua:FiloSottile/age" = "1.2.1" +"aqua:ajeetdsouza/zoxide" = "0.9.6" +"aqua:alexellis/k3sup" = "0.13.8" +"aqua:astral-sh/uv" = "0.5.25" +"aqua:aws/aws-cli" = "2.23.9" +"aqua:bitwarden/clients" = "cli-v2025.1.2" +"aqua:dagger/dagger" = "0.15.3" +"aqua:derailed/k9s" = "0.32.7" +"aqua:eksctl-io/eksctl" = "0.202.0" +"aqua:evilmartians/lefthook" = "1.10.10" +"aqua:eza-community/eza" = "0.20.19" +"aqua:github-cli" = "2.66.0" +"aqua:go-task/task" = "3.41.0" +"aqua:hashicorp/terraform" = "1.10.5" +"aqua:helm/helm" = "3.17.0" +"aqua:junegunn/fzf" = "0.58.0" +"aqua:k3d-io/k3d" = "5.8.1" +"aqua:kubernetes-sigs/kind" = "0.26.0" +"aqua:kubernetes/kubectl" = "1.32.1" +"aqua:sbstp/kubie" = "0.24.1" +"aqua:sharkdp/bat" = "0.25.0" +"aqua:starship/starship" = "1.22.1" +"aqua:tilt-dev/ctlptl" = "0.8.38" +"aqua:tilt-dev/tilt" = "0.33.22" +"aqua:xo/usql" = "0.19.16" +"pipx:aider-chat" = { version = "0.72.3", uvx_args = "--python 3.12.7" } +"ubi:jdx/usage" = "2.0.3" +elixir = "1.18.2" +erlang = "27.2.2" +go = "1.23.6" lua = "5.4.7" luajit = "2.0.5" -node = "22.13.0" +node = "22.13.1" poetry = "2.0.1" -python = "3.13.1" +python = "3.13.2" r = "4.4.2" -ripgrep = "14.1.1" -rust = "1.84.0" -starship = "1.22.1" -task = "3.40.1" -terraform = "1.10.4" -tilt = "0.33.22" -usage = "2.0.3" -usql = "0.19.12" +rust = "1.84.1" yarn = "1.22.22" -zoxide = "0.9.6" [settings] experimental = true python_compile = true + +[env] diff --git a/config/nvim/lua/custom/plugins/init.lua b/config/nvim/lua/custom/plugins/init.lua index 3b40caa..83800e7 100644 --- a/config/nvim/lua/custom/plugins/init.lua +++ b/config/nvim/lua/custom/plugins/init.lua @@ -264,4 +264,14 @@ return { }, }, }, + { + 'supermaven-inc/supermaven-nvim', + opts = { + keymaps = { + accept_suggestion = '', + clear_suggestion = '', + accept_word = '', + }, + }, + }, } diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index 2fe1aaa..595d1a1 100644 --- a/patch/kickstart.nvim/updates.patch +++ b/patch/kickstart.nvim/updates.patch @@ -1,5 +1,5 @@ diff --git a/init.lua b/init.lua -index 08717d5..96c1e03 100644 +index 4eae8e7..f2609ec 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -24,7 +24,7 @@ index 08717d5..96c1e03 100644 -- Don't show the mode, since it's already in the status line vim.opt.showmode = false -@@ -157,6 +157,14 @@ vim.opt.cursorline = true +@@ -156,6 +156,14 @@ vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. vim.opt.scrolloff = 10 @@ -39,7 +39,7 @@ index 08717d5..96c1e03 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -628,6 +636,27 @@ require('lazy').setup({ +@@ -629,6 +637,27 @@ require('lazy').setup({ -- ts_ls = {}, -- @@ -65,9 +65,9 @@ index 08717d5..96c1e03 100644 + }, + }, lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, -@@ -642,6 +671,32 @@ require('lazy').setup({ + -- cmd = { ... }, + -- filetypes = { ... }, +@@ -643,6 +672,32 @@ require('lazy').setup({ }, }, }, @@ -100,7 +100,7 @@ index 08717d5..96c1e03 100644 } -- Ensure the servers and tools above are installed -@@ -668,6 +723,33 @@ require('lazy').setup({ +@@ -672,6 +727,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -134,7 +134,36 @@ index 08717d5..96c1e03 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -898,7 +980,39 @@ require('lazy').setup({ +@@ -830,6 +912,7 @@ require('lazy').setup({ + -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it + group_index = 0, + }, ++ { name = 'supermavem' }, + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, +@@ -844,12 +927,19 @@ require('lazy').setup({ + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'folke/tokyonight.nvim', ++ dependencies = { ++ 'drewxs/ash.nvim', ++ 'wnkz/monoglow.nvim', ++ }, + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. +- vim.cmd.colorscheme 'tokyonight-night' ++ -- For monoglow the following variants area available: ++ -- 'monoglow-z', 'monoglow-lack', or 'monoglow-void'. ++ -- vim.cmd.colorscheme 'tokyonight-night' ++ vim.cmd.colorscheme 'ash' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' +@@ -902,7 +992,39 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { @@ -175,7 +204,7 @@ index 08717d5..96c1e03 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -928,17 +1042,17 @@ require('lazy').setup({ +@@ -932,17 +1054,17 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug',