summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorchristianchiarulli <chrisatmachine@gmail.com>2021-12-21 17:52:58 -0500
committerchristianchiarulli <chrisatmachine@gmail.com>2021-12-21 17:52:58 -0500
commit4b0d085006724b6f5a1d6db5b980800db44e0e88 (patch)
treef11d40da0810690b65871b2e000a08afa98f113b /lua
parent94f160d1bda6c8a62caad92a1abd2c2582f2c9be (diff)
udpate
Diffstat (limited to 'lua')
-rw-r--r--lua/user/keymaps.lua5
-rw-r--r--lua/user/lsp/settings/jsonls.lua17
-rw-r--r--lua/user/plugins.lua2
-rw-r--r--lua/user/telescope.lua8
4 files changed, 15 insertions, 17 deletions
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", "<C-h>", "<C-\\><C-N><C-w>h", term_opts)
keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", term_opts)
keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", term_opts)
keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", term_opts)
+
+-- keymap("n", "<leader>f", "<cmd>Telescope find_files<cr>", opts)
+keymap("n", "<leader>f", "<cmd>lua require'telescope.builtin'.find_files(require('telescope.themes').get_dropdown({ previewer = false }))<cr>", opts)
+keymap("n", "<c-t>", "<cmd>Telescope live_grep<cr>", 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,