Compare commits

...

16 Commits

Author SHA1 Message Date
392dc89c92 chore(deps): update dependency elixir to v1.17.3 2024-09-18 12:52:05 +00:00
dcda21f824 feat(nvim): migrate from toggleterm to slimux (#73)
Instead of using the native terminal available in `neovim` and the [toggleterm][0] extension, I'm migrating to [slimux][1] and `tmux` to share commands between terminals.

Co-authored-by: Joao P Dubas <joao.dubas@gmail.com>
Reviewed-on: #73

[0]: https://github.com/akinsho/toggleterm.nvim
[1]: https://github.com/EvWilson/slimux.nvim
Co-authored-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
Co-committed-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
2024-09-17 11:32:59 +00:00
9f362ad837 chore(deps): update dependency kubectl to v1.31.1 (#70)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [kubectl](https://github.com/kubernetes/kubernetes) | patch | `1.31.0` -> `1.31.1` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #70
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-16 12:13:57 +00:00
52f31ae879 chore(deps): update dependency helm to v3.16.1 (#69)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [helm](https://github.com/helm/helm) | minor | `3.15.4` -> `3.16.1` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #69
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-16 12:13:17 +00:00
b2c046d2ac chore(deps): update dependency awscli to v2.17.51 (#68)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [awscli](https://github.com/aws/aws-cli) | patch | `2.17.48` -> `2.17.51` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #68
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-16 12:12:04 +00:00
288118f55f chore(deps): update dependency python to v3.12.6 (#67)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [python](https://github.com/python/cpython) | patch | `3.12.5` -> `3.12.6` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #67
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-11 11:43:30 +00:00
787c35c03e chore(deps): update dependency rust to v1.81.0 (#66)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [rust](https://github.com/rust-lang/rust) | minor | `1.80.1` -> `1.81.0` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #66
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-11 11:42:43 +00:00
d52d736d22 chore(deps): update dependency go to v1.23.1 (#65)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [go](https://github.com/golang/go) | patch | `1.23.0` -> `1.23.1` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #65
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-11 11:41:41 +00:00
9c3370c372 chore(deps): update dependency awscli to v2.17.48 (#64)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [awscli](https://github.com/aws/aws-cli) | patch | `2.17.42` -> `2.17.48` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #64
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-11 11:40:57 +00:00
919d31159b chore(deps): update dependency node to v22.8.0 (#63)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [node](https://nodejs.org) ([source](https://github.com/nodejs/node)) | minor | `22.7.0` -> `22.8.0` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #63
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-03 14:06:25 +00:00
97fa52f18b chore(deps): update dependency awscli to v2.17.42 (#62)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [awscli](https://github.com/aws/aws-cli) | patch | `2.17.39` -> `2.17.42` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #62
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-03 13:00:22 +00:00
8cf795a1ab chore(deps): update dependency node to v22.7.0 (#60)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [node](https://nodejs.org) ([source](https://github.com/nodejs/node)) | minor | `22.6.0` -> `22.7.0` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #60
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-09-03 12:56:15 +00:00
5017189932 chore(deps): update dependency awscli to v2.17.39 (#59)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [awscli](https://github.com/aws/aws-cli) | patch | `2.17.33` -> `2.17.39` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #59
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-08-28 14:03:09 +00:00
eb3622dfab chore(deps): update dependency terraform to v1.9.5 (#58)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [terraform](https://github.com/hashicorp/terraform) | patch | `1.9.4` -> `1.9.5` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #58
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-08-27 20:56:14 +00:00
f059ce2079 feat(starship): add two folders to represent directory (#61)
This overrides the git truncation, which shows only the path and makes it easier to work with git worktrees.

Reviewed-on: #61
Co-authored-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
Co-committed-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
2024-08-22 18:21:33 +00:00
b5ce962e65 chore(deps): update dependency awscli to v2.17.33 (#55)
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [awscli](https://github.com/aws/aws-cli) | patch | `2.17.31` -> `2.17.33` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #55
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>
2024-08-19 23:37:08 +00:00
5 changed files with 53 additions and 125 deletions

View File

@ -183,7 +183,7 @@ 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 186018483039b20dc39d7991e4fb28090dd4750e \
&& git reset --hard 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \
&& git apply /tmp/updates.patch \
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
&& nvim --headless "+Lazy! sync" +qa

View File

@ -1,36 +1,36 @@
[tools]
age = "1.2.0"
awscli = "2.17.31"
awscli = "2.17.51"
bat = "0.24.0"
bitwarden = "2024.7.2"
circleci-cli = "0.1.30549"
ctlptl = "0.8.31"
dagger = "0.12.5"
eksctl = "0.188.0"
elixir = "1.17.2-otp-27"
elixir = "1.17.3"
erlang = "27.0.1"
eza = "0.19.0"
fzf = "0.53.0"
go = "1.23.0"
helm = "3.15.4"
go = "1.23.1"
helm = "3.16.1"
k3d = "5.7.3"
k3sup = "0.13.7"
k9s = "0.32.5"
kind = "0.24.0"
kubectl = "1.31.0"
kubectl = "1.31.1"
kubie = "0.23.1"
lefthook = "1.7.13"
lua = "5.1.5"
luajit = "2.0.5--2.4.4"
node = "22.6.0"
node = "22.8.0"
poetry = "1.8.3"
python = "3.12.5"
python = "3.12.6"
r = "4.4.1"
ripgrep = "14.1.0"
rust = "1.80.1"
rust = "1.81.0"
starship = "1.20.1"
task = "3.38.0"
terraform = "1.9.4"
terraform = "1.9.5"
tilt = "0.33.19"
tmux = "3.4"
usage = "0.3.0"

View File

@ -104,82 +104,19 @@ return {
priority = 1000,
config = true,
},
-- {
-- 'rest-nvim/rest.nvim',
-- dependencies = { 'luarocks.nvim' },
-- ft = {
-- 'http',
-- 'rest',
-- },
-- config = function()
-- require('rest-nvim').setup {
-- client = 'curl',
-- custom_dynamic_variables = {},
-- encode_url = true,
-- env_file = '.env',
-- skip_ssl_verification = false,
-- highlight = {
-- enable = true,
-- timeout = 15,
-- },
-- result = {
-- behavior = {
-- decode_url = true,
-- formatters = {
-- json = 'jq',
-- html = false,
-- },
-- show_info = {
-- curl_command = true,
-- headers = true,
-- http_info = true,
-- url = true,
-- },
-- statistics = {
-- enable = true,
-- stats = {
-- { 'total_time', title = 'Time taken:' },
-- { 'size_download_t', title = 'Download size:' },
-- },
-- },
-- },
-- split = {
-- horizontal = false,
-- in_place = false,
-- },
-- },
-- }
-- end,
-- keys = function()
-- local status_ok, which_key = pcall(require, 'which-key')
-- if status_ok then
-- which_key.register {
-- ['<leader>t'] = { name = 'Res[t]', _ = 'which_key_ignore' },
-- }
-- end
-- return {
-- { '<leader>tr', '<cmd>Rest run<cr>', desc = 'Run the request under cursor' },
-- {
-- '<leader>tp',
-- '<Plug>RestNvimPreview',
-- desc = 'Preview the curl command for the request under cursor',
-- },
-- { '<leader>tl', '<cmd>Rest run last<cr>', desc = 'Re-run the last request' },
-- }
-- end,
-- },
{
'akinsho/toggleterm.nvim',
opts = {
size = vim.o.lines * 0.75,
open_mapping = [[<c-\>]],
hide_numbers = true,
shade_filetypes = {},
shade_terminals = true,
shading_factor = 2,
direction = 'horizontal',
shell = vim.o.shell,
},
'EvWilson/slimux.nvim',
lazy = true,
opts = function()
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,
keys = function()
local status_ok, which_key = pcall(require, 'which-key')
if status_ok then
@ -187,38 +124,22 @@ return {
{ '<leader>m', group = 'Toggle ter[m]inal' },
}
end
vim.api.nvim_create_autocmd('TermOpen', {
group = vim.api.nvim_create_augroup('kickstart-custom-term-open-mapping', { clear = true }),
callback = function(args)
local bufnr = args.buf
local opts = { buffer = bufnr }
vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
vim.keymap.set('t', '<C-h>', [[<cmd>wincmd h<cr>]], opts)
vim.keymap.set('t', '<C-j>', [[<cmd>wincmd j<cr>]], opts)
vim.keymap.set('t', '<C-k>', [[<cmd>wincmd k<cr>]], opts)
vim.keymap.set('t', '<C-l>', [[<cmd>wincmd l<cr>]], opts)
vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
end,
})
local slimux_status_ok, slimux = pcall(require, 'slimux')
if not slimux_status_ok then
return {}
end
return {
{
'<leader>mh',
'<cmd>ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.75) .. '<cr>',
desc = 'Open ter[m]inal [h]orizontally',
noremap = true,
'<leader>xr',
slimux.send_highlighted_text,
mode = 'v',
desc = 'Send currently highlighted text to configured tmux pane',
},
{
'<leader>mv',
'<cmd>ToggleTerm direction=vertical size=' .. tostring(vim.o.columns * 0.5) .. '<cr>',
desc = 'Open ter[m]inal [v]ertically',
noremap = true,
},
{
'<leader>mc',
'<cmd>ToggleTermSendCurrentLine<cr>',
desc = 'Send [c]urrent line under the cursor',
noremap = true,
'<leader>r',
slimux.send_paragraph_text,
mode = 'n',
desc = 'Send paragraph under cursor to configured tmux pane',
},
}
end,

View File

@ -1,3 +1,5 @@
"$schema" = 'https://starship.rs/config-schema.json'
format = """
$username\
$hostname\
@ -8,7 +10,12 @@ $git_status\
$line_break\
$kubernetes\
$line_break\
$character"""
$character
"""
[directory]
truncation_length = 2
truncate_to_repo = false
[git_branch]
format = "[$branch]($style)"

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua
index 220d304..62a9702 100644
index ea86b79..93250ab 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@ -39,8 +39,8 @@ index 220d304..62a9702 100644
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
@@ -582,6 +590,28 @@ require('lazy').setup({
-- tsserver = {},
@@ -618,6 +626,28 @@ require('lazy').setup({
-- ts_ls = {},
--
+ cuelsp = {},
@ -68,7 +68,7 @@ index 220d304..62a9702 100644
lua_ls = {
-- cmd = {...},
-- filetypes = { ...},
@@ -596,6 +626,33 @@ require('lazy').setup({
@@ -632,6 +662,33 @@ require('lazy').setup({
},
},
},
@ -76,7 +76,7 @@ index 220d304..62a9702 100644
+ r_language_server = {},
+ templ = {},
+ terraformls = {},
+ tsserver = {},
+ ts_ls = {},
+ yamlls = {
+ settings = {
+ yaml = {
@ -102,9 +102,9 @@ index 220d304..62a9702 100644
}
-- Ensure the servers and tools above are installed
@@ -622,6 +679,33 @@ require('lazy').setup({
@@ -658,6 +715,33 @@ require('lazy').setup({
-- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for tsserver)
-- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+ -- overwrite elixirls for older versions of elixir
+ -- * elixir 1.11 use version 0.12.0
@ -136,9 +136,9 @@ index 220d304..62a9702 100644
require('lspconfig')[server_name].setup(server)
end,
},
@@ -844,7 +928,39 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
@@ -888,7 +972,39 @@ require('lazy').setup({
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = {
- ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
+ ensure_installed = {
@ -177,7 +177,7 @@ index 220d304..62a9702 100644
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {
@@ -881,18 +997,18 @@ require('lazy').setup({
@@ -918,18 +1034,18 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',