From df3953fda988083874936d9ad8688d4869e988c9 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sat, 19 Oct 2024 17:00:46 +0200 Subject: [PATCH 1/6] [nvim] change theme variation --- .config/nvim/lua/plugins/colorscheme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index 92a97d5..ef6a9c2 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -4,7 +4,7 @@ return { name = "catppuccin", priority = 1000, config = function() - vim.cmd.colorscheme "catppuccin-macchiato" + vim.cmd.colorscheme "catppuccin-mocha" end } } From 345d5e3759fb37a8010aaf288f9ba1b312b11ad1 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sat, 19 Oct 2024 17:02:12 +0200 Subject: [PATCH 2/6] [nvim] move grammalect config --- .config/nvim/init.lua | 1 - .config/nvim/lua/plugins/grammalect.lua | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index aba9afb..aa7b691 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -24,7 +24,6 @@ map('n', 'gc', ':Telescope git_commits', options) map('n', '', ':Telescope buffers', options) map('n', 't', ':TagbarToggle', options) -vim.g.grammalecte_cli_py = "~/Grammalecte-fr/grammalecte-cli.py" -------------------------------------------------- diff --git a/.config/nvim/lua/plugins/grammalect.lua b/.config/nvim/lua/plugins/grammalect.lua index 2db8d13..2f65c61 100644 --- a/.config/nvim/lua/plugins/grammalect.lua +++ b/.config/nvim/lua/plugins/grammalect.lua @@ -1,3 +1,6 @@ return { "dpelle/vim-Grammalecte", + config = function() + vim.g.grammalecte_cli_py = "~/Grammalecte-fr/grammalecte-cli.py" + end } From 9236a4c0242380701a1e62390ed1700cb1d4c0b0 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sat, 19 Oct 2024 17:03:04 +0200 Subject: [PATCH 3/6] [nvim] add fzf-vim --- .config/nvim/lua/plugins/telescope.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index bf1514a..f5349a4 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,5 +1,11 @@ return { - 'nvim-telescope/telescope.nvim', - tag = '0.1.8', - dependencies = { 'nvim-lua/plenary.nvim' } + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.8', + dependencies = { 'nvim-lua/plenary.nvim' }, + }, + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make' + }, } From 70a4d4a8ef5bd4dc51e0723db19f0998b9b5bcf1 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sat, 19 Oct 2024 17:03:44 +0200 Subject: [PATCH 4/6] [nvim] add small Telescope option and live_grep shortcut --- .config/nvim/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index aa7b691..8fe1c56 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -21,10 +21,19 @@ options = { noremap = true } map('n', 'ff', ':Telescope find_files', options) map('n', 'fg', ':Telescope git_files', options) map('n', 'gc', ':Telescope git_commits', options) +map('n', 'fl', ':Telescope live_grep', options) map('n', '', ':Telescope buffers', options) map('n', 't', ':TagbarToggle', options) +-------------------------------------------------- +-- Telescope +-------------------------------------------------- +require('telescope').setup{ + defaults = { + prompt_prefix = "> ", + } +} -------------------------------------------------- -- LSP From c5d8d03fd25a70b26be244c3518ac08222802589 Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sun, 20 Oct 2024 10:22:53 +0200 Subject: [PATCH 5/6] [nvim] Better indent --- .config/nvim/lua/plugins/colorscheme.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index ef6a9c2..ffe0b76 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -1,10 +1,10 @@ return { - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - config = function() - vim.cmd.colorscheme "catppuccin-mocha" - end - } + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + config = function() + vim.cmd.colorscheme "catppuccin-mocha" + end + }, } From 09c261979711c06c8403fe01b2f75adb6d7f983e Mon Sep 17 00:00:00 2001 From: Gregory Trolliet Date: Sun, 20 Oct 2024 10:24:04 +0200 Subject: [PATCH 6/6] [nvim] Add some Telescope commands --- .config/nvim/init.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8fe1c56..9deb399 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -20,11 +20,17 @@ require("core.options") options = { noremap = true } map('n', 'ff', ':Telescope find_files', options) map('n', 'fg', ':Telescope git_files', options) -map('n', 'gc', ':Telescope git_commits', options) +map('n', 'fc', ':Telescope git_commits', options) map('n', 'fl', ':Telescope live_grep', options) map('n', '', ':Telescope buffers', options) map('n', 't', ':TagbarToggle', options) +map('n', 'nv', ':Telescope find_files cwd=~/.config/nvim', options) +map('n', 'nc', ':Telescope find_files cwd=~/.config', options) +map('n', 'gd', ':Telescope lsp_definitions', options) +map('n', 'gr', ':Telescope lsp_references', options) +map('n', 'gs', ':Telescope lsp_workspace_symbols', options) +map('n', 'gS', ':Telescope lsp_dynamic_workspace_symbols', options) -------------------------------------------------- -- Telescope @@ -59,11 +65,11 @@ vim.api.nvim_create_autocmd('LspAttach', { local opts = {buffer = event.buf} vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) - vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + --vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) + --vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) vim.keymap.set({'n', 'x'}, '', 'lua vim.lsp.buf.format({async = true})', opts)