Upgrade IDE deps #96

Merged
joao.dubas merged 5 commits from jpd-chore-upgrade-kickstart into main 2024-10-22 19:02:19 +00:00
5 changed files with 30 additions and 48 deletions

View File

@ -96,7 +96,7 @@ RUN apt-get update \
&& useradd \ && useradd \
--uid ${USER_UID} \ --uid ${USER_UID} \
--gid coder \ --gid coder \
--groups docker,wheel \ --groups docker,wheel,sudo \
--shell $(which fish) \ --shell $(which fish) \
--home-dir /home/coder \ --home-dir /home/coder \
--create-home \ --create-home \
@ -184,7 +184,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 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \ && git reset --hard 4120893b8a1f31a0957f2f891f7fbef73ddfb9b1 \
&& 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
@ -203,6 +203,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
erlang \ erlang \
eza \ eza \
fzf \ fzf \
github-cli \
helm \ helm \
k3d \ k3d \
k3sup \ k3sup \
@ -221,7 +222,6 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \
task \ task \
terraform \ terraform \
tilt \ tilt \
tmux \
usage \ usage \
usql \ usql \
yarn \ yarn \

View File

@ -2,41 +2,41 @@
age = "1.2.0" age = "1.2.0"
awscli = "2.18.10" awscli = "2.18.10"
bat = "0.24.0" bat = "0.24.0"
bitwarden = "2024.7.2" bitwarden = "2024.9.0"
circleci-cli = "0.1.30549" circleci-cli = "0.1.30995"
ctlptl = "0.8.31" ctlptl = "0.8.34"
dagger = "0.12.5" dagger = "0.13.5"
eksctl = "0.188.0" eksctl = "0.193.0"
elixir = "1.17.3" elixir = "1.17.3"
erlang = "27.1.2" erlang = "27.1.2"
eza = "0.19.0" eza = "0.20.4"
fzf = "0.53.0" fzf = "0.55.0"
github-cli = "2.59.0"
go = "1.23.2" go = "1.23.2"
helm = "3.16.2" helm = "3.16.2"
k3d = "5.7.3" k3d = "5.7.4"
k3sup = "0.13.7" k3sup = "0.13.7"
k9s = "0.32.5" k9s = "0.32.5"
kind = "0.24.0" kind = "0.24.0"
kubectl = "1.31.1" kubectl = "1.31.1"
kubie = "0.23.1" kubie = "0.24.0"
lefthook = "1.7.13" lefthook = "1.8.0"
lua = "5.1.5" lua = "5.1.5"
luajit = "2.0.5--2.4.4" luajit = "2.0.5--2.4.4"
node = "22.10.0" node = "22.10.0"
poetry = "1.8.4" poetry = "1.8.4"
python = "3.13.0" python = "3.13.0"
r = "4.4.1" r = "4.4.1"
ripgrep = "14.1.0" ripgrep = "14.1.1"
rust = "1.82.0" rust = "1.82.0"
starship = "1.20.1" starship = "1.21.1"
task = "3.38.0" task = "3.39.2"
terraform = "1.9.8" terraform = "1.9.8"
tilt = "0.33.19" tilt = "0.33.20"
tmux = "3.4" usage = "0.11.0"
usage = "0.3.0" usql = "0.19.4"
usql = "0.19.3"
yarn = "1.22.22" yarn = "1.22.22"
zoxide = "0.9.4" zoxide = "0.9.6"
[settings] [settings]
experimental = true experimental = true

View File

@ -40,7 +40,6 @@ set -s escape-time 0
# Status bar styling and content # Status bar styling and content
set -g status-bg black set -g status-bg black
set -g status-fg white set -g status-fg white
# set -g status-left "#$"
# Don't prompt to kill panes/windows # Don't prompt to kill panes/windows
bind-key x kill-pane bind-key x kill-pane
@ -69,5 +68,8 @@ set -g @plugin 'fabioluciano/tmux-tokyo-night'
set -g @plugin 'Morantron/tmux-fingers' set -g @plugin 'Morantron/tmux-fingers'
set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-yank'
# tokyo night configuration
set -g @theme_plugins 'datetime'
# load/install plugins # load/install plugins
run '~/.config/tmux/plugins/tpm/tpm' run '~/.config/tmux/plugins/tpm/tpm'

View File

@ -8,21 +8,3 @@ windows:
panes: panes:
- focus: true - focus: true
- pane - pane
- window_name: support
layout: even-vertical
start_directory: support
panes:
- shell_command:
- docker compose exec pgcli bash
- pane
- window_name: local
layout: even-vertical
start_directory: local
panes:
- pane
- pane
- window_name: remote
layout: even-vertical
panes:
- pane
- pane

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index ea86b79..93250ab 100644 index ea86b79..7323a7f 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..93250ab 100644
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
@@ -618,6 +626,28 @@ require('lazy').setup({ @@ -618,6 +626,27 @@ require('lazy').setup({
-- ts_ls = {}, -- ts_ls = {},
-- --
@ -55,7 +55,6 @@ index ea86b79..93250ab 100644
+ gopls = {}, + gopls = {},
+ helm_ls = {}, + helm_ls = {},
+ html = { filetypes = { 'html', 'twig', 'hbs' } }, + html = { filetypes = { 'html', 'twig', 'hbs' } },
+ htmx = {},
+ jsonls = { + jsonls = {
+ settings = { + settings = {
+ json = { + json = {
@ -68,12 +67,11 @@ index ea86b79..93250ab 100644
lua_ls = { lua_ls = {
-- cmd = {...}, -- cmd = {...},
-- filetypes = { ...}, -- filetypes = { ...},
@@ -632,6 +662,33 @@ require('lazy').setup({ @@ -632,6 +661,32 @@ require('lazy').setup({
}, },
}, },
}, },
+ pyright = {}, + pyright = {},
+ r_language_server = {},
+ templ = {}, + templ = {},
+ terraformls = {}, + terraformls = {},
+ ts_ls = {}, + ts_ls = {},
@ -102,7 +100,7 @@ index ea86b79..93250ab 100644
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -658,6 +715,33 @@ require('lazy').setup({ @@ -658,6 +713,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 {})
@ -136,7 +134,7 @@ index ea86b79..93250ab 100644
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end,
}, },
@@ -888,7 +972,39 @@ require('lazy').setup({ @@ -888,7 +970,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 = {
@ -177,7 +175,7 @@ index ea86b79..93250ab 100644
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -918,18 +1034,18 @@ require('lazy').setup({ @@ -918,18 +1032,18 @@ 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',