From 964aa49ff2d3dcccd7093de714deaafa779a3aa3 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 20 May 2025 15:54:32 +0200 Subject: [PATCH 1/1] profile cleanup --- .config/lazyvim/after/ftplugin/mail.lua | 3 +- .config/lazyvim/lazy-lock.json | 2 +- .../lazyvim/lua/plugins/blink-cmp-emoji.lua | 19 ++++++++++ .config/lazyvim/lua/plugins/emoji.lua | 35 ------------------- .gitignore.d/lazyvim | 2 +- 5 files changed, 22 insertions(+), 39 deletions(-) create mode 100644 .config/lazyvim/lua/plugins/blink-cmp-emoji.lua delete mode 100644 .config/lazyvim/lua/plugins/emoji.lua diff --git a/.config/lazyvim/after/ftplugin/mail.lua b/.config/lazyvim/after/ftplugin/mail.lua index 8513a6d..52dc767 100644 --- a/.config/lazyvim/after/ftplugin/mail.lua +++ b/.config/lazyvim/after/ftplugin/mail.lua @@ -91,7 +91,7 @@ local function profile_keymap(key, profile) ) end -profile_keymap("F1", "official") +profile_keymap("F1", "main") profile_keymap("F2", "pobox") profile_keymap("F3", "tahi") profile_keymap("F4", "toni") @@ -101,7 +101,6 @@ profile_keymap("F7", "siby") profile_keymap("F8", "debian") profile_keymap("F9", "uniwh") profile_keymap("F10", "mtfk") -profile_keymap("F11", "sudetia") profile_keymap("F12", "default") -- }}} profiles diff --git a/.config/lazyvim/lazy-lock.json b/.config/lazyvim/lazy-lock.json index 36fbdb9..c05bb2a 100644 --- a/.config/lazyvim/lazy-lock.json +++ b/.config/lazyvim/lazy-lock.json @@ -1,5 +1,6 @@ { "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, + "blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" }, "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, @@ -7,7 +8,6 @@ "cmp-lbdb": { "branch": "master", "commit": "5e24dd3f0da5a871407966eb130b7be4de40b759" }, "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" }, "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" }, - "emoji.nvim": { "branch": "main", "commit": "a79e45d35853bb6446638f4d74c6f778ddebd8e3" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "ee0606259ee5d5dd40398be26755048e8965086e" }, diff --git a/.config/lazyvim/lua/plugins/blink-cmp-emoji.lua b/.config/lazyvim/lua/plugins/blink-cmp-emoji.lua new file mode 100644 index 0000000..34dce33 --- /dev/null +++ b/.config/lazyvim/lua/plugins/blink-cmp-emoji.lua @@ -0,0 +1,19 @@ +return { + "moyiz/blink-emoji.nvim", + dependencies = { + "saghen/blink.cmp", + opts = { + sources = { + default = { "emoji" }, + providers = { + emoji = { + module = "blink-emoji", + name = "emoji", + score_offset = 15, -- Tune by preference + opts = { insert = true }, -- Insert emoji (default) or complete its name + }, + }, + }, + }, + }, +} diff --git a/.config/lazyvim/lua/plugins/emoji.lua b/.config/lazyvim/lua/plugins/emoji.lua deleted file mode 100644 index e595e71..0000000 --- a/.config/lazyvim/lua/plugins/emoji.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - { - "allaman/emoji.nvim", - ft = "markdown", - dependencies = { - "saghen/blink.cmp", - }, - opts = { - enable_cmp_integration = true, - }, - }, - { - "saghen/blink.cmp", - optional = true, - dependencies = { "allaman/emoji.nvim", "saghen/blink.compat" }, - opts = { - sources = { - default = { "emoji" }, - providers = { - emoji = { - name = "emoji", - module = "blink.compat.source", - transform_items = function(_, items) - local kind = require("blink.cmp.types").CompletionItemKind.Text - for i = 1, #items do - items[i].kind = kind - end - return items - end, - }, - }, - }, - }, - }, -} diff --git a/.gitignore.d/lazyvim b/.gitignore.d/lazyvim index ee74051..00876f9 100644 --- a/.gitignore.d/lazyvim +++ b/.gitignore.d/lazyvim @@ -17,6 +17,7 @@ !/.config/lazyvim/lua/config/keymaps.lua !/.config/lazyvim/lua/config/lazy.lua !/.config/lazyvim/lua/config/options.lua +!/.config/lazyvim/lua/plugins/blink-cmp-emoji.lua !/.config/lazyvim/lua/plugins/blink-cmp-keymaps.lua !/.config/lazyvim/lua/plugins/blink-cmp-manual.lua !/.config/lazyvim/lua/plugins/blink-compat-lbdb.lua @@ -30,7 +31,6 @@ !/.config/lazyvim/lua/plugins/disable-snacks-scroll.lua !/.config/lazyvim/lua/plugins/disable-tokyonight.lua !/.config/lazyvim/lua/plugins/disable-treesitter-indenting.lua -!/.config/lazyvim/lua/plugins/emoji.lua !/.config/lazyvim/lua/plugins/example.lua !/.config/lazyvim/lua/plugins/hardtime.lua !/.config/lazyvim/lua/plugins/markdown-in-mailbody.lua -- 2.39.5