From 0918edd0657e4cf3e4070e2e89a036ccac31fa80 Mon Sep 17 00:00:00 2001 From: vx-clutch Date: Sat, 4 Jan 2025 09:24:35 -0500 Subject: [PATCH] save --- nvim/.config/nvim/lazy-lock.json | 2 +- nvim/.config/nvim/lua/vxclutch/init.lua | 15 ++++++++++++--- nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 7660a8d..0eb191b 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -15,9 +15,9 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, - "mini.pick": { "branch": "main", "commit": "eb8fad053935dd6e4861c7b65b0d3f70785d8f42" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-treesitter": { "branch": "master", "commit": "fae21737be2846a04ae06a41d70b7fc8ad4bf9eb" }, "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/nvim/.config/nvim/lua/vxclutch/init.lua b/nvim/.config/nvim/lua/vxclutch/init.lua index 772a85f..f721ed2 100644 --- a/nvim/.config/nvim/lua/vxclutch/init.lua +++ b/nvim/.config/nvim/lua/vxclutch/init.lua @@ -1,5 +1,14 @@ vim.g.mapleader = " " -require("vxclutch.set") -require("vxclutch.lazy_init") -require("vxclutch.remap") +-- https://github.com/vx-clutch/ftl +vim.api.nvim_create_autocmd({"BufNewFile", "BufRead"}, { + pattern = "*.ftl", + callback = function() + vim.bo.filetype = "c" + end, +}) + + +require "vxclutch.set" +require "vxclutch.lazy_init" +require "vxclutch.remap" diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua b/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua index 2a65f87..50e498a 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua @@ -11,10 +11,10 @@ return { require("telescope").setup {} local builtin = require "telescope.builtin" - vim.keymap.set("n", "sf", builtin.find_files, {}) + vim.keymap.set("n", "", builtin.find_files, {}) vim.keymap.set("n", "", builtin.git_files, {}) vim.keymap.set("n", "vh", builtin.help_tags, {}) - vim.keymap.set("n", "", function() + vim.keymap.set("n", "sg", function() builtin.live_grep { grep_open_files = true, prompt_title = "Live Grep in Open Files",