Lombok requires env variable, the library seems to be downloaded with mason, added env var to zshrc. Added descriptions for custom key bindings
This commit is contained in:
		
							parent
							
								
									395a7693d7
								
							
						
					
					
						commit
						a0976ac735
					
				
							
								
								
									
										1
									
								
								.zshrc
								
								
								
								
							
							
						
						
									
										1
									
								
								.zshrc
								
								
								
								
							| 
						 | 
				
			
			@ -118,6 +118,7 @@ export SDKMAN_DIR="$HOME/.sdkman"
 | 
			
		|||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 | 
			
		||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 | 
			
		||||
 | 
			
		||||
export JDTLS_JVM_ARGS="-javaagent:$HOME/.local/share/nvim/mason/packages/jdtls/lombok.jar"
 | 
			
		||||
 | 
			
		||||
if [ -f ~/.bash_aliases ]; then
 | 
			
		||||
    . ~/.bash_aliases
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										47
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										47
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -1,43 +1,3 @@
 | 
			
		|||
--[[
 | 
			
		||||
 | 
			
		||||
=====================================================================
 | 
			
		||||
==================== READ THIS BEFORE CONTINUING ====================
 | 
			
		||||
=====================================================================
 | 
			
		||||
 | 
			
		||||
Kickstart.nvim is *not* a distribution.
 | 
			
		||||
 | 
			
		||||
Kickstart.nvim is a template for your own configuration.
 | 
			
		||||
  The goal is that you can read every line of code, top-to-bottom, understand
 | 
			
		||||
  what your configuration is doing, and modify it to suit your needs.
 | 
			
		||||
 | 
			
		||||
  Once you've done that, you should start exploring, configuring and tinkering to
 | 
			
		||||
  explore Neovim!
 | 
			
		||||
 | 
			
		||||
  If you don't know anything about Lua, I recommend taking some time to read through
 | 
			
		||||
  a guide. One possible example:
 | 
			
		||||
  - https://learnxinyminutes.com/docs/lua/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  And then you can explore or search through `:help lua-guide`
 | 
			
		||||
  - https://neovim.io/doc/user/lua-guide.html
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Kickstart Guide:
 | 
			
		||||
 | 
			
		||||
I have left several `:help X` comments throughout the init.lua
 | 
			
		||||
You should run that command and read that help section for more information.
 | 
			
		||||
 | 
			
		||||
In addition, I have some `NOTE:` items throughout the file.
 | 
			
		||||
These are for you, the reader to help understand what is happening. Feel free to delete
 | 
			
		||||
them once you know what you're doing, but they should serve as a guide for when you
 | 
			
		||||
are first encountering a few different constructs in your nvim config.
 | 
			
		||||
 | 
			
		||||
I hope you enjoy your Neovim journey,
 | 
			
		||||
- TJ
 | 
			
		||||
 | 
			
		||||
P.S. You can delete this when you're done too. It's your config now :)
 | 
			
		||||
--]]
 | 
			
		||||
-- Set <space> as the leader key
 | 
			
		||||
-- See `:help mapleader`
 | 
			
		||||
--  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
 | 
			
		||||
vim.g.mapleader = ' '
 | 
			
		||||
| 
						 | 
				
			
			@ -333,7 +293,7 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
 | 
			
		|||
vim.defer_fn(function()
 | 
			
		||||
  require('nvim-treesitter.configs').setup {
 | 
			
		||||
    -- Add languages to be installed here that you want installed for treesitter
 | 
			
		||||
    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
 | 
			
		||||
    ensure_installed = { 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
 | 
			
		||||
 | 
			
		||||
    -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
 | 
			
		||||
    auto_install = false,
 | 
			
		||||
| 
						 | 
				
			
			@ -430,8 +390,8 @@ local on_attach = function(_, bufnr)
 | 
			
		|||
  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 | 
			
		||||
 | 
			
		||||
  -- See `:help K` for why this keymap
 | 
			
		||||
  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
 | 
			
		||||
  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
 | 
			
		||||
  nmap('<leader>cd', vim.lsp.buf.hover, '[C]ode [D]ocumentation')
 | 
			
		||||
  nmap('<leader>cs', vim.lsp.buf.signature_help, '[C]ode [S]ignature Documentation')
 | 
			
		||||
 | 
			
		||||
  -- Lesser used LSP functionality
 | 
			
		||||
  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
 | 
			
		||||
| 
						 | 
				
			
			@ -501,6 +461,7 @@ mason_lspconfig.setup {
 | 
			
		|||
  ensure_installed = vim.tbl_keys(servers),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
mason_lspconfig.setup_handlers {
 | 
			
		||||
  function(server_name)
 | 
			
		||||
    require('lspconfig')[server_name].setup {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,29 +1,29 @@
 | 
			
		|||
{
 | 
			
		||||
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
 | 
			
		||||
  "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" },
 | 
			
		||||
  "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" },
 | 
			
		||||
  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
 | 
			
		||||
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
 | 
			
		||||
  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
 | 
			
		||||
  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
 | 
			
		||||
  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
 | 
			
		||||
  "indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" },
 | 
			
		||||
  "lazy.nvim": { "branch": "main", "commit": "c7298a10db9b9ef975472827e5898b0c494b70bd" },
 | 
			
		||||
  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
 | 
			
		||||
  "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
 | 
			
		||||
  "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
 | 
			
		||||
  "neodev.nvim": { "branch": "main", "commit": "24b403eabde652904077f84fd55441744e77a109" },
 | 
			
		||||
  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
 | 
			
		||||
  "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
 | 
			
		||||
  "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
 | 
			
		||||
  "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
 | 
			
		||||
  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
 | 
			
		||||
  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
 | 
			
		||||
  "mason-lspconfig.nvim": { "branch": "main", "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" },
 | 
			
		||||
  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
 | 
			
		||||
  "neodev.nvim": { "branch": "main", "commit": "20f1e5d3c143333bdf5ea48729f7b50660135cb3" },
 | 
			
		||||
  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
 | 
			
		||||
  "nvim-lspconfig": { "branch": "master", "commit": "b0852218bc5fa6514a71a9da6d5cfa63a263c83d" },
 | 
			
		||||
  "nvim-tmux-navigation": { "branch": "main", "commit": "543f090a45cef28156162883d2412fffecb6b750" },
 | 
			
		||||
  "nvim-tree.lua": { "branch": "master", "commit": "7e3c0bee7b246ca835d5f7453db6fa19de359bab" },
 | 
			
		||||
  "nvim-treesitter": { "branch": "master", "commit": "9c4fc86b67c1d68141cef57846d24cbee9b74fb0" },
 | 
			
		||||
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "78c49ca7d2f7ccba2115c11422c037713c978ad1" },
 | 
			
		||||
  "onedark.nvim": { "branch": "master", "commit": "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1" },
 | 
			
		||||
  "nvim-tree.lua": { "branch": "master", "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" },
 | 
			
		||||
  "nvim-treesitter": { "branch": "master", "commit": "04a9a90c2a60c86aa9451c539586326b337b03e5" },
 | 
			
		||||
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" },
 | 
			
		||||
  "onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" },
 | 
			
		||||
  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
 | 
			
		||||
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
 | 
			
		||||
  "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
 | 
			
		||||
  "vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
 | 
			
		||||
  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
 | 
			
		||||
  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
 | 
			
		||||
  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
 | 
			
		||||
  "which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" }
 | 
			
		||||
  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -13,12 +13,12 @@ return {
 | 
			
		|||
                disable_when_zoomed = true -- defaults to false
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft)
 | 
			
		||||
            vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown)
 | 
			
		||||
            vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp)
 | 
			
		||||
            vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight)
 | 
			
		||||
            vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive)
 | 
			
		||||
            vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext)
 | 
			
		||||
            vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft, { desc = 'Navigate Left' })
 | 
			
		||||
            vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown, { desc = 'Navigate Down' })
 | 
			
		||||
            vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp, { desc = 'Navigate Up' })
 | 
			
		||||
            vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight, { desc = 'Navigate Right' })
 | 
			
		||||
            vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive, { desc = 'Navigate Last Active' })
 | 
			
		||||
            vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext, { desc = 'Navigate Next' })
 | 
			
		||||
 | 
			
		||||
        end
 | 
			
		||||
    },
 | 
			
		||||
| 
						 | 
				
			
			@ -34,10 +34,10 @@ return {
 | 
			
		|||
            require("nvim-tree").setup({
 | 
			
		||||
                view = {
 | 
			
		||||
                    side = 'left',
 | 
			
		||||
                    width = 60
 | 
			
		||||
                    width = 40
 | 
			
		||||
                }
 | 
			
		||||
            })
 | 
			
		||||
            vim.keymap.set('n', '<C-n>', ':NvimTreeFindFileToggle<CR>')
 | 
			
		||||
            vim.keymap.set('n', '<C-n>', ':NvimTreeFindFileToggle<CR>', { desc = 'Toggle File Tree' })
 | 
			
		||||
        end
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue