From e3c38b2da9bbee2daa1480dd4e1fd6a2232d6949 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Wed, 9 Oct 2024 22:15:00 +0300 Subject: [PATCH] upgrade packages, add oil blank remap --- init.lua | 1 + lazy-lock.json | 4 ++-- lua/crentist/filetype.lua | 18 +++++++++++++----- lua/crentist/lazy/iconpicker.lua | 1 + lua/crentist/lazy/lsp.lua | 2 +- lua/crentist/lazy/telescope.lua | 2 -- lua/crentist/remap.lua | 3 ++- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index a612708..9fcf4ff 100644 --- a/init.lua +++ b/init.lua @@ -1 +1,2 @@ require("crentist") + diff --git a/lazy-lock.json b/lazy-lock.json index 60fb8d3..adc4b6d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,11 +23,11 @@ "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" }, + "nvim-lspconfig": { "branch": "master", "commit": "ff69ecca55d83ffc70657f260a799f79a5637831" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" }, + "nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" }, "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/lua/crentist/filetype.lua b/lua/crentist/filetype.lua index 8512fe2..501077b 100644 --- a/lua/crentist/filetype.lua +++ b/lua/crentist/filetype.lua @@ -1,12 +1,20 @@ vim.filetype.add({ extension = { - ["tf"] = "terraform", + ['tf'] = 'terraform', }, pattern = { - [".*/playbooks/.*%.ya?ml"] = "yaml.ansible", - [".*/roles/.*%.ya?ml"] = "yaml.ansible", - [".*/tasks/.*%.ya?ml"] = "yaml.ansible", - [".*/plays/.*%.ya?ml"] = "yaml.ansible", + ['.*/playbooks/.*%.ya?ml'] = 'yaml.ansible', + ['.*/roles/.*%.ya?ml'] = 'yaml.ansible', + ['.*/tasks/.*%.ya?ml'] = 'yaml.ansible', + ['.*/plays/.*%.ya?ml'] = 'yaml.ansible', }, }) +vim.filetype.add({ + extension = { + j2 = 'jinja', + jinja = 'jinja', + jinja2 = 'jinja', + } +}) + diff --git a/lua/crentist/lazy/iconpicker.lua b/lua/crentist/lazy/iconpicker.lua index 97c0dab..4304d65 100644 --- a/lua/crentist/lazy/iconpicker.lua +++ b/lua/crentist/lazy/iconpicker.lua @@ -10,3 +10,4 @@ return { vim.keymap.set("i", "", "IconPickerInsert", opts) end } + diff --git a/lua/crentist/lazy/lsp.lua b/lua/crentist/lazy/lsp.lua index 156130b..dc413e7 100644 --- a/lua/crentist/lazy/lsp.lua +++ b/lua/crentist/lazy/lsp.lua @@ -39,7 +39,7 @@ return { 'yamlls', 'ansiblels', 'terraformls', - 'helm_ls' + 'helm_ls', }, handlers = { function(server_name) diff --git a/lua/crentist/lazy/telescope.lua b/lua/crentist/lazy/telescope.lua index 14d2600..f77ff89 100644 --- a/lua/crentist/lazy/telescope.lua +++ b/lua/crentist/lazy/telescope.lua @@ -5,8 +5,6 @@ return { 'nvim-telescope/telescope.nvim', }, - version = '0.1.6', - config = function() local telescope = require('telescope') local telescopeConfig = require('telescope.config') diff --git a/lua/crentist/remap.lua b/lua/crentist/remap.lua index c77ad3e..e2370f9 100644 --- a/lua/crentist/remap.lua +++ b/lua/crentist/remap.lua @@ -1,5 +1,6 @@ vim.g.mapleader = " " -vim.keymap.set("n", "pv", ":Oil .") +vim.keymap.set("n", "Pv", ":Oil .") +vim.keymap.set("n", "pv", ":Oil") vim.keymap.set("n", "", "zz") vim.keymap.set("n", "", "zz")