From 4b0d085006724b6f5a1d6db5b980800db44e0e88 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 21 Dec 2021 17:52:58 -0500 Subject: [PATCH] udpate --- init.lua | 1 + lua/user/keymaps.lua | 5 +++++ lua/user/lsp/settings/jsonls.lua | 17 +---------------- lua/user/plugins.lua | 2 +- lua/user/telescope.lua | 8 ++++++++ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/init.lua b/init.lua index 1b3f3e8..8c14215 100644 --- a/init.lua +++ b/init.lua @@ -5,3 +5,4 @@ require "user.colorscheme" require "user.cmp" require "user.lsp" require "user.telescope" + diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index fb8fdb4..28718bb 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -68,3 +68,8 @@ keymap("t", "", "h", term_opts) keymap("t", "", "j", term_opts) keymap("t", "", "k", term_opts) keymap("t", "", "l", term_opts) + +-- keymap("n", "f", "Telescope find_files", opts) +keymap("n", "f", "lua require'telescope.builtin'.find_files(require('telescope.themes').get_dropdown({ previewer = false }))", opts) +keymap("n", "", "Telescope live_grep", opts) + diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua index 1fffa68..8ee9544 100644 --- a/lua/user/lsp/settings/jsonls.lua +++ b/lua/user/lsp/settings/jsonls.lua @@ -1,9 +1,3 @@ -local default_schemas = nil -local status_ok, jsonls_settings = pcall(require, "nlspsettings.jsonls") -if status_ok then - default_schemas = jsonls_settings.get_default_schemas() -end - local schemas = { { description = "TypeScript compiler configuration file", @@ -168,19 +162,10 @@ local schemas = { }, } -local function extend(tab1, tab2) - for _, value in ipairs(tab2) do - table.insert(tab1, value) - end - return tab1 -end - -local extended_schemas = extend(schemas, default_schemas) - local opts = { settings = { json = { - schemas = extended_schemas, + schemas = schemas, }, }, setup = { diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index c8a32cb..b173f9b 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -64,10 +64,10 @@ return packer.startup(function(use) -- LSP use "neovim/nvim-lspconfig" -- enable LSP use "williamboman/nvim-lsp-installer" -- simple to use language server installer - use "tamago324/nlsp-settings.nvim" -- language server settings defined in json for -- Telescope use "nvim-telescope/telescope.nvim" + use 'nvim-telescope/telescope-media-files.nvim' -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/lua/user/telescope.lua b/lua/user/telescope.lua index 0706b51..d4bf410 100644 --- a/lua/user/telescope.lua +++ b/lua/user/telescope.lua @@ -3,6 +3,8 @@ if not status_ok then return end +telescope.load_extension('media_files') + local actions = require "telescope.actions" telescope.setup { @@ -87,6 +89,12 @@ telescope.setup { -- builtin picker }, extensions = { + media_files = { + -- filetypes whitelist + -- defaults to {"png", "jpg", "mp4", "webm", "pdf"} + filetypes = {"png", "webp", "jpg", "jpeg"}, + find_cmd = "rg" -- find command (defaults to `fd`) + } -- Your extension configuration goes here: -- extension_name = { -- extension_config_key = value,