joao.dubas/ide
1
0
Fork 0
Code Issues 1 Pull Requests 3 Packages Projects Releases Wiki Activity

feat(nvim): upgrade to latest commit (#48)

Browse Source 
Also, use `gitsigns` shortcuts delivered in `kickstart` repo.

Reviewed-on: #48
Co-authored-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
Co-committed-by: Joao P Dubas <joao.dubas+gitea@gmail.com>
This commit is contained in:
João Paulo Dubas
2024-05-09 00:15:44 +00:00
committed by João Paulo Dubas
parent 544fb06424
commit 746be1e73c
3 changed files with 15 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patch/kickstart.nvim/updates.patch
View File

@@ -1,11 +1,11 @@
diff --git a/init.lua b/init.lua
index 496f45b..c667dc3 100644
index 88658ef..d9e96ee 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
-- Set to true if you have a Nerd Font installed
-- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = false
+vim.g.have_nerd_font = true
@@ -39,15 +39,7 @@ index 496f45b..c667dc3 100644
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
@@ -283,6 +291,7 @@ require('lazy').setup({
require('which-key').register {
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+ ['<leader>h'] = { name = 'Git [h]unk', _ = 'which_key_ignore' },
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
@@ -551,6 +560,18 @@ require('lazy').setup({
@@ -578,6 +586,18 @@ require('lazy').setup({
-- tsserver = {},
--
@@ -66,7 +58,7 @@ index 496f45b..c667dc3 100644
lua_ls = {
-- cmd = {...},
-- filetypes = { ...},
@@ -565,6 +586,10 @@ require('lazy').setup({
@@ -592,6 +612,10 @@ require('lazy').setup({
},
},
},
@@ -77,7 +69,7 @@ index 496f45b..c667dc3 100644
}
-- Ensure the servers and tools above are installed
@@ -591,6 +616,33 @@ require('lazy').setup({
@@ -618,6 +642,33 @@ require('lazy').setup({
-- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for tsserver)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
@@ -111,15 +103,16 @@ index 496f45b..c667dc3 100644
require('lspconfig')[server_name].setup(server)
end,
},
@@ -802,7 +854,37 @@ require('lazy').setup({
@@ -835,7 +886,38 @@ require('lazy').setup({
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
opts = {
- ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
- ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
+ ensure_installed = {
+ 'bash',
+ 'c',
+ 'css',
+ 'diff',
+ 'dockerfile',
+ 'eex',
+ 'elixir',
@@ -150,16 +143,20 @@ index 496f45b..c667dc3 100644
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {
@@ -839,7 +921,7 @@ require('lazy').setup({
@@ -874,18 +956,18 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug',
- -- require 'kickstart.plugins.indent_line',
+ require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.autopairs',
-- require 'kickstart.plugins.neo-tree',
- -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
+ require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
@@ -847,7 +929,7 @@ require('lazy').setup({
-- This is the easiest way to modularize your config.
--
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`