Skip to content

Commit a0976ac

Browse files
committed
Lombok requires env variable, the library seems to be downloaded with mason, added env var to zshrc. Added descriptions for custom key bindings
1 parent 395a769 commit a0976ac

File tree

4 files changed

+29
-67
lines changed

4 files changed

+29
-67
lines changed

.zshrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export SDKMAN_DIR="$HOME/.sdkman"
118118
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
119119
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
120120

121+
export JDTLS_JVM_ARGS="-javaagent:$HOME/.local/share/nvim/mason/packages/jdtls/lombok.jar"
121122

122123
if [ -f ~/.bash_aliases ]; then
123124
. ~/.bash_aliases

init.lua

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,3 @@
1-
--[[
2-
3-
=====================================================================
4-
==================== READ THIS BEFORE CONTINUING ====================
5-
=====================================================================
6-
7-
Kickstart.nvim is *not* a distribution.
8-
9-
Kickstart.nvim is a template for your own configuration.
10-
The goal is that you can read every line of code, top-to-bottom, understand
11-
what your configuration is doing, and modify it to suit your needs.
12-
13-
Once you've done that, you should start exploring, configuring and tinkering to
14-
explore Neovim!
15-
16-
If you don't know anything about Lua, I recommend taking some time to read through
17-
a guide. One possible example:
18-
- https://learnxinyminutes.com/docs/lua/
19-
20-
21-
And then you can explore or search through `:help lua-guide`
22-
- https://neovim.io/doc/user/lua-guide.html
23-
24-
25-
Kickstart Guide:
26-
27-
I have left several `:help X` comments throughout the init.lua
28-
You should run that command and read that help section for more information.
29-
30-
In addition, I have some `NOTE:` items throughout the file.
31-
These are for you, the reader to help understand what is happening. Feel free to delete
32-
them once you know what you're doing, but they should serve as a guide for when you
33-
are first encountering a few different constructs in your nvim config.
34-
35-
I hope you enjoy your Neovim journey,
36-
- TJ
37-
38-
P.S. You can delete this when you're done too. It's your config now :)
39-
--]]
40-
-- Set <space> as the leader key
411
-- See `:help mapleader`
422
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
433
vim.g.mapleader = ' '
@@ -333,7 +293,7 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
333293
vim.defer_fn(function()
334294
require('nvim-treesitter.configs').setup {
335295
-- Add languages to be installed here that you want installed for treesitter
336-
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
296+
ensure_installed = { 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
337297

338298
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
339299
auto_install = false,
@@ -430,8 +390,8 @@ local on_attach = function(_, bufnr)
430390
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
431391

432392
-- See `:help K` for why this keymap
433-
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
434-
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
393+
nmap('<leader>cd', vim.lsp.buf.hover, '[C]ode [D]ocumentation')
394+
nmap('<leader>cs', vim.lsp.buf.signature_help, '[C]ode [S]ignature Documentation')
435395

436396
-- Lesser used LSP functionality
437397
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
@@ -501,6 +461,7 @@ mason_lspconfig.setup {
501461
ensure_installed = vim.tbl_keys(servers),
502462
}
503463

464+
504465
mason_lspconfig.setup_handlers {
505466
function(server_name)
506467
require('lspconfig')[server_name].setup {

lazy-lock.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
22
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3-
"LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" },
3+
"LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" },
44
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
55
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
66
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
77
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
8-
"gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
9-
"indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" },
10-
"lazy.nvim": { "branch": "main", "commit": "c7298a10db9b9ef975472827e5898b0c494b70bd" },
11-
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
12-
"mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
13-
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
14-
"neodev.nvim": { "branch": "main", "commit": "24b403eabde652904077f84fd55441744e77a109" },
15-
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
16-
"nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
8+
"gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
9+
"indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
10+
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
11+
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
12+
"mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" },
13+
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
14+
"neodev.nvim": { "branch": "main", "commit": "20f1e5d3c143333bdf5ea48729f7b50660135cb3" },
15+
"nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
16+
"nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" },
1717
"nvim-tmux-navigation": { "branch": "main", "commit": "543f090a45cef28156162883d2412fffecb6b750" },
18-
"nvim-tree.lua": { "branch": "master", "commit": "7e3c0bee7b246ca835d5f7453db6fa19de359bab" },
19-
"nvim-treesitter": { "branch": "master", "commit": "9c4fc86b67c1d68141cef57846d24cbee9b74fb0" },
20-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "78c49ca7d2f7ccba2115c11422c037713c978ad1" },
21-
"onedark.nvim": { "branch": "master", "commit": "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1" },
18+
"nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" },
19+
"nvim-treesitter": { "branch": "master", "commit": "04a9a90c2a60c86aa9451c539586326b337b03e5" },
20+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" },
21+
"onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" },
2222
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
2323
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
2424
"telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
25-
"vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
25+
"vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
2626
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
2727
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
28-
"which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" }
28+
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
2929
}

lua/custom/plugins/init.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ return {
1313
disable_when_zoomed = true -- defaults to false
1414
}
1515

16-
vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft)
17-
vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown)
18-
vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp)
19-
vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight)
20-
vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive)
21-
vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext)
16+
vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft, { desc = 'Navigate Left' })
17+
vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown, { desc = 'Navigate Down' })
18+
vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp, { desc = 'Navigate Up' })
19+
vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight, { desc = 'Navigate Right' })
20+
vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive, { desc = 'Navigate Last Active' })
21+
vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext, { desc = 'Navigate Next' })
2222

2323
end
2424
},
@@ -34,10 +34,10 @@ return {
3434
require("nvim-tree").setup({
3535
view = {
3636
side = 'left',
37-
width = 60
37+
width = 40
3838
}
3939
})
40-
vim.keymap.set('n', '<C-n>', ':NvimTreeFindFileToggle<CR>')
40+
vim.keymap.set('n', '<C-n>', ':NvimTreeFindFileToggle<CR>', { desc = 'Toggle File Tree' })
4141
end
4242
}
4343
}

0 commit comments

Comments
 (0)