From d0e6ce3d2a6049cfa204919e9b8d46580a4a1d0d Mon Sep 17 00:00:00 2001 From: 2pac Date: Sun, 5 Nov 2023 23:11:51 +0100 Subject: [PATCH] chore: lfg? --- init.lua | 6 ++++-- lua/custom/plugins/autoformat.lua | 2 ++ lua/custom/plugins/filetree.lua | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 9a61dc3a..bdfe221a 100644 --- a/init.lua +++ b/init.lua @@ -100,8 +100,6 @@ require('lazy').setup({ }, { - -- Set lualine as statusline - -- See `:help lualine.txt` 'nvim-lualine/lualine.nvim', opts = { options = { @@ -265,10 +263,13 @@ vim.keymap.set('n', '/', function() }) end, { desc = '[/] Fuzzily search in current buffer' }) +-- From old config vim.keymap.set('n', 'o', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) vim.keymap.set('n', 'O', [[:tabnewrequire('telescope.builtin').git_files()]], { desc = 'Search [G]it [F]iles' }) +vim.keymap.set('n', 'rg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) +-- New with more semantic meaning XD vim.keymap.set('n', 'gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) @@ -404,6 +405,7 @@ local servers = { pyright = {}, rust_analyzer = {}, tsserver = {}, + eslint = { filetypes = { 'javascript', 'typescript', 'typescriptreact' } }, html = { filetypes = { 'html', 'twig', 'hbs' } }, lua_ls = { Lua = { diff --git a/lua/custom/plugins/autoformat.lua b/lua/custom/plugins/autoformat.lua index bc56b15b..754b55d7 100644 --- a/lua/custom/plugins/autoformat.lua +++ b/lua/custom/plugins/autoformat.lua @@ -46,6 +46,8 @@ return { -- Tsserver usually works poorly. Sorry you work with bad languages -- You can remove this line if you know what you're doing :) + -- + -- Using the `eslint` instead now. if client.name == 'tsserver' then return end diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua index 84e392dc..d65821f1 100644 --- a/lua/custom/plugins/filetree.lua +++ b/lua/custom/plugins/filetree.lua @@ -12,6 +12,7 @@ return { config = function() require('neo-tree').setup {} - vim.keymap.set('n', 'a', [[:Neotree toggle reveal_force_cwd]]) + vim.keymap.set('n', 'a', [[:Neotree reveal_force_cwd]]) + vim.keymap.set('n', 'A', [[:Neotree toggle reveal_force_cwd]]) end, }